From 05b2edad405eb47a5f36ee09f705f0da04df0793 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 03:49:25 +0100
Subject: [PATCH 01/46] Add notes to script.c

---
 include/script.h     |  14 +-
 include/structures.h |   8 +-
 src/npc/ezloCap.c    |   2 +-
 src/npc/goron.c      |   3 +-
 src/npc/postman.c    |  10 +-
 src/npc/zelda.c      |   3 +-
 src/script.c         | 622 +++++++++++++++++++++++++++----------------
 7 files changed, 424 insertions(+), 238 deletions(-)

diff --git a/include/script.h b/include/script.h
index 9abc5291..416485b5 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,14 +3,24 @@
 
 #include "global.h"
 
+typedef struct 
+{
+    u16 command;
+    u16 metadata;
+} ScriptCommand;
+
+
 typedef struct {
-    u16* unk_00;
+    union {
+        u16* raw;
+        ScriptCommand* commands; // list of commands to execute
+    } unk_00;
     u32 unk_04;
     u32 unk_08;
     u8 unk_0C[0x4]; // unused
     u16 unk_10;
     u16 unk_12;
-    u32 unk_14;
+    u32 compareResult; // result of a compare script command
     u8 unk_18;
     u8 unk_19;
     u8 unk_1A;
diff --git a/include/structures.h b/include/structures.h
index 59811d6f..f6108ad6 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -119,11 +119,15 @@ typedef struct {
 
 extern struct_02024490 gUnk_02024490;
 
+
+// Some kind of ScriptInterpreter state?
 typedef struct {
     u32 unk_00;
-    u16 unk_04;
+    u16 operationId;
     u8 unk_06;
-    u8 unk_07;
+    // bit 0 is reset before each script execution
+    // execution is continued if bit 0 or bit 1 are true, so bit 1 can be set to execute until someone unsets bit 1
+    u8 continueScriptExecutionFlags;
     u8 unk_08;
 } struct_02033280;
 
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index 13ecd8f9..201c0e4e 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -172,7 +172,7 @@ void sub_0806DAAC(Entity* this, u32* param_2) {
     u32 uVar1;
     uVar1 = CheckKinstoneFused(sub_0806DA3C(this));
     param_2[5] = uVar1;
-    gUnk_02033280.unk_07 |= 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
 // maybe actually execute the kinstone fusion?
diff --git a/src/npc/goron.c b/src/npc/goron.c
index 0203969c..2bd99575 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -97,9 +97,10 @@ u32 sub_08069480(Entity* this) {
     return (sub_0801E99C(this) << 24) >> 24;
 }
 
+// TODO param_1 possibly ScriptExecutionContext?
 void sub_0806948C(Entity* this, u32* param_1) {
     param_1[5] = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
-    gUnk_02033280.unk_07 |= 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
 void sub_080694B0(Entity* this) {
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 532f129f..7306b69b 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -201,13 +201,13 @@ void sub_080606D8(Entity* this) {
     ShowNPCDialogue(this, &gUnk_0810AA30[index]);
 }
 
-void sub_08060700(Entity* entity, ScriptExecutionContext* context) {
-    s8* var0 = gUnk_0810A918[(s8)entity->field_0x68.HALF.LO];
-    Coords16* coords = &gUnk_0810A66C[var0[(s8)entity->field_0x68.HALF.HI]];
+void sub_08060700(Entity* this, ScriptExecutionContext* context) {
+    s8* var0 = gUnk_0810A918[(s8)this->field_0x68.HALF.LO];
+    Coords16* coords = &gUnk_0810A66C[var0[(s8)this->field_0x68.HALF.HI]];
     u32 x = coords->x + gRoomControls.roomOriginX;
     u32 y = coords->y + gRoomControls.roomOriginY;
-    sub_0807DEDC(entity, context, x, y);
-    gUnk_02033280.unk_07 |= 1;
+    sub_0807DEDC(this, context, x, y);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
 void sub_0806075C(Entity* this) {
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 90a40fc0..0b1e44f9 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -128,6 +128,7 @@ void sub_08066E68(Entity* ent) {
     ent->field_0x80.HWORD = ent->animIndex;
 }
 
+// TODO param_2 possibly ScriptExecutionContext?
 void sub_08066E80(Entity* ent, u8* param_2) {
     switch (param_2[0x18]) {
         case 0:
@@ -164,7 +165,7 @@ void sub_08066E80(Entity* ent, u8* param_2) {
         case 4:
             UpdateAnimationSingleFrame(ent);
             if (ent->frames.b.f3) {
-                gUnk_02033280.unk_07 |= 1;
+                gUnk_02033280.continueScriptExecutionFlags |= 1;
                 return;
             }
     }
diff --git a/src/script.c b/src/script.c
index 494e0ae5..495a01d5 100644
--- a/src/script.c
+++ b/src/script.c
@@ -154,30 +154,147 @@ void sub_0807F0C8(Entity*, ScriptExecutionContext*);
 extern void CreateSpeechBubbleExclamationMark(Entity*, u32, u32);
 extern void CreateSpeechBubbleQuestionMark(Entity*, u32, u32);
 extern void sub_0801C4A0(u32);
-
-void (*const gUnk_0811E524[])() = {
-    nullsub_507,  sub_0807E004, sub_0807E014, sub_0807E024, sub_0807E050, sub_0807E064, sub_0807E078, sub_0807E0A0,
-    sub_0807E0B8, sub_0807E0CC, sub_0807E0E0, sub_0807E10C, sub_0807E124, sub_0807E148, sub_0807E158, sub_0807E188,
-    sub_0807E1D8,
-    sub_0807E4AC, // defined out of order
-    sub_0807E200, sub_0807E220, sub_0807E240, sub_0807E260, sub_0807E280, sub_0807E2A8, sub_0807E2E4, sub_0807E30C,
-    sub_0807E390, sub_0807E3BC, sub_0807E3E8, sub_0807E40C, sub_0807E42C, sub_0807E48C, sub_0807E4CC, sub_0807E4EC,
-    sub_0807E514, sub_0807E538, sub_0807E564, sub_0807E584, sub_0807E5A0, sub_0807E5CC, sub_0807E5F8, sub_0807E610,
-    sub_0807E628, sub_0807E634, sub_0807E644, sub_0807E650, sub_0807E65C, sub_0807E668, sub_0807E674, sub_0807E680,
-    sub_0807E690, sub_0807E6AC, sub_0807E6DC, sub_0807E700, sub_0807E72C, sub_0807E75C, sub_0807E778, sub_0807E788,
-    sub_0807E79C, nullsub_508,  sub_0807E7B0, sub_0807E7C4, sub_0807E7D8, sub_0807E7EC, sub_0807E800, sub_0807E80C,
-    sub_0807E858, sub_0807E864, sub_0807E878, sub_0807E888, sub_0807E898, sub_0807E8C4, sub_0807E8D4, sub_0807E8E4,
-    sub_0807E8E4, // duplicate
-    sub_0807E8E4, // duplicate
-    sub_0807E8E4, // duplicate
-    sub_0807E908, sub_0807E914, sub_0807E924, sub_0807E930, sub_0807E944, sub_0807E974, sub_0807E9D4, sub_0807E9DC,
-    sub_0807E9E4, sub_0807E9F0, sub_0807EA4C, sub_0807EA88, sub_0807EA94, sub_0807EAB4, sub_0807EAC0, sub_0807EAD0,
-    sub_0807EAF0, sub_0807EB18, sub_0807EB28, sub_0807EB38, sub_0807EB44, sub_0807EB4C, sub_0807EB74, sub_0807EB8C,
-    sub_0807EBA8, sub_0807EBB0, sub_0807EBC0, sub_0807EBC8, sub_0807EBD8, sub_0807EBF4, sub_0807EC08, nullsub_509,
-    sub_0807EC1C, sub_0807EC64, sub_0807EC94, sub_0807ECC4, sub_0807ECF4, sub_0807ED24, sub_0807EDD4, sub_0807EE04,
-    sub_0807EE30, sub_0807EEB4, sub_0807EEF4, sub_0807EF3C, sub_0807EF80, sub_0807EF90, sub_0807EFA0, sub_0807EFAC,
-    sub_0807EFD4, sub_0807EFE4, sub_0807EFF4, sub_0807F004, sub_0807F010, sub_0807F034, sub_0807F050, sub_0807F060,
-    sub_0807F078, sub_0807F088, sub_0807F098, sub_0807F0A4, sub_0807F0B4, sub_0807F0C8
+// size: 139
+void (*const scriptOperations[])() = {
+    nullsub_507,  // 0
+    sub_0807E004, // 1
+    sub_0807E014, // 2
+    sub_0807E024, // 3
+    sub_0807E050, // 4
+    sub_0807E064, // 5
+    sub_0807E078, // 6
+    sub_0807E0A0, // 7
+    sub_0807E0B8, // 8
+    sub_0807E0CC, // 9
+    sub_0807E0E0, // 10
+    sub_0807E10C, // 11
+    sub_0807E124, // 12
+    sub_0807E148, // 13
+    sub_0807E158, // 14
+    sub_0807E188, // 15
+    sub_0807E1D8, // 16
+    sub_0807E4AC, // defined out of order 17
+    sub_0807E200, // 18
+    sub_0807E220, // 19
+    sub_0807E240, // 20
+    sub_0807E260, // 21
+    sub_0807E280, // 22
+    sub_0807E2A8, // 23
+    sub_0807E2E4, // 24
+    sub_0807E30C, // 25
+    sub_0807E390, // 26
+    sub_0807E3BC, // 27
+    sub_0807E3E8, // 28
+    sub_0807E40C, // 29
+    sub_0807E42C, // 30
+    sub_0807E48C, // 31
+    sub_0807E4CC, // 32
+    sub_0807E4EC, // 33
+    sub_0807E514, // 34
+    sub_0807E538, // 35
+    sub_0807E564, // 36
+    sub_0807E584, // 37
+    sub_0807E5A0, // 38
+    sub_0807E5CC, // 39
+    sub_0807E5F8, // 40
+    sub_0807E610, // 41
+    sub_0807E628, // 42
+    sub_0807E634, // 43
+    sub_0807E644, // 44
+    sub_0807E650, // 45
+    sub_0807E65C, // 46
+    sub_0807E668, // 47
+    sub_0807E674, // 48
+    sub_0807E680, // 49
+    sub_0807E690, // 50
+    sub_0807E6AC, // 51
+    sub_0807E6DC, // 52
+    sub_0807E700, // 53
+    sub_0807E72C, // 54
+    sub_0807E75C, // 55
+    sub_0807E778, // 56
+    sub_0807E788, // 57
+    sub_0807E79C, // 58
+    nullsub_508,  // 59
+    sub_0807E7B0, // 60
+    sub_0807E7C4, // 61
+    sub_0807E7D8, // 62
+    sub_0807E7EC, // 63
+    sub_0807E800, // 64
+    sub_0807E80C, // 65
+    sub_0807E858, // 66
+    sub_0807E864, // 67
+    sub_0807E878, // 68
+    sub_0807E888, // 69
+    sub_0807E898, // 70
+    sub_0807E8C4, // 71
+    sub_0807E8D4, // 72
+    sub_0807E8E4, // 73
+    sub_0807E8E4, // 74// duplicate
+    sub_0807E8E4, // 75// duplicate
+    sub_0807E8E4, // 76// duplicate
+    sub_0807E908, // 77
+    sub_0807E914, // 78
+    sub_0807E924, // 79
+    sub_0807E930, // 80
+    sub_0807E944, // 81
+    sub_0807E974, // 82
+    sub_0807E9D4, // 83
+    sub_0807E9DC, // 84
+    sub_0807E9E4, // 85
+    sub_0807E9F0, // 86
+    sub_0807EA4C, // 87
+    sub_0807EA88, // 88
+    sub_0807EA94, // 89
+    sub_0807EAB4, // 90
+    sub_0807EAC0, // 91
+    sub_0807EAD0, // 92
+    sub_0807EAF0, // 93
+    sub_0807EB18, // 94
+    sub_0807EB28, // 95
+    sub_0807EB38, // 96
+    sub_0807EB44, // 97
+    sub_0807EB4C, // 98
+    sub_0807EB74, // 99
+    sub_0807EB8C, // 100
+    sub_0807EBA8, // 101
+    sub_0807EBB0, // 102
+    sub_0807EBC0, // 103
+    sub_0807EBC8, // 104
+    sub_0807EBD8, // 105
+    sub_0807EBF4, // 106
+    sub_0807EC08, // 107
+    nullsub_509,  // 108
+    sub_0807EC1C, // 109
+    sub_0807EC64, // 110
+    sub_0807EC94, // 111
+    sub_0807ECC4, // 112
+    sub_0807ECF4, // 113
+    sub_0807ED24, // 114
+    sub_0807EDD4, // 115
+    sub_0807EE04, // 116
+    sub_0807EE30, // 117
+    sub_0807EEB4, // 118
+    sub_0807EEF4, // 119
+    sub_0807EF3C, // 120
+    sub_0807EF80, // 121
+    sub_0807EF90, // 122
+    sub_0807EFA0, // 123
+    sub_0807EFAC, // 124
+    sub_0807EFD4, // 125
+    sub_0807EFE4, // 126
+    sub_0807EFF4, // 127
+    sub_0807F004, // 128
+    sub_0807F010, // 129
+    sub_0807F034, // 130
+    sub_0807F050, // 131
+    sub_0807F060, // 132
+    sub_0807F078, // 133
+    sub_0807F088, // 134
+    sub_0807F098, // 135
+    sub_0807F0A4, // 136
+    sub_0807F0B4, // 137
+    sub_0807F0C8  // 138
 };
 
 extern const u16 gUnk_08016984;
@@ -198,7 +315,7 @@ ScriptExecutionContext* CreateScriptExecutionContext(void) {
 
     context = gScriptExecutionContextArray;
     do {
-        if (context->unk_00 == 0) {
+        if (context->unk_00.raw == 0) {
             return context;
         }
         context++;
@@ -210,20 +327,21 @@ void DestroyScriptExecutionContext(ScriptExecutionContext* context) {
     MemClear32(context, sizeof(ScriptExecutionContext));
 }
 
-ScriptExecutionContext* StartCutscene(Entity* entity, u16* unk_2) {
+ScriptExecutionContext* StartCutscene(Entity* entity, u16* scriptCode) {
     ScriptExecutionContext* context;
 
     context = CreateScriptExecutionContext();
     if (context) {
-        sub_0807DAF0(entity, context, unk_2);
+        sub_0807DAF0(entity, context, scriptCode);
     }
     return context;
 }
 
-void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u16* unk1) {
+// start script on entity
+void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u16* scriptCode) {
     entity->flags = entity->flags | 2;
     *(ScriptExecutionContext**)&entity->cutsceneBeh = context;
-    sub_0807DB88(context, unk1);
+    sub_0807DB88(context, scriptCode);
 }
 
 void UnloadCutsceneData(Entity* entity) {
@@ -238,7 +356,7 @@ void StartPlayerScript(u16* unk1) {
     Entity* player;
 
     MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
-    gPlayerScriptExecutionContext.unk_00 = unk1;
+    gPlayerScriptExecutionContext.unk_00.raw = unk1;
     player = &gPlayerEntity;
     *(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext;
     gPlayerState.playerAction = 0x1c;
@@ -254,14 +372,15 @@ ScriptExecutionContext* sub_0807DB68(Entity* entity, u16* unk1) {
     if (context) {
         entity->flags |= 2;
         *(ScriptExecutionContext**)&entity->field_0x3c = context;
-        context->unk_00 = unk1;
+        context->unk_00.raw = unk1;
     }
     return context;
 }
 
-void sub_0807DB88(ScriptExecutionContext* context, u16* unk1) {
+// reset ScriptExecutionContext and set new commands?
+void sub_0807DB88(ScriptExecutionContext* context, u16* scriptCode) {
     MemClear32(context, sizeof(ScriptExecutionContext));
-    context->unk_00 = unk1;
+    context->unk_00.raw = scriptCode;
 }
 
 void sub_0807DB98(Entity* entity, ScriptExecutionContext* context) {
@@ -350,8 +469,9 @@ void sub_0807DD64(Entity* entity) {
     entity->field_0x82.HWORD = 0;
 }
 
-void sub_0807DD80(Entity* entity, u16* unk1) {
-    sub_0807DB88(*(ScriptExecutionContext**)&entity->cutsceneBeh, unk1);
+// Special script start for windTribespeople?
+void sub_0807DD80(Entity* entity, u16* scriptCode) {
+    sub_0807DB88(*(ScriptExecutionContext**)&entity->cutsceneBeh, scriptCode);
     sub_0807DD64(entity);
 }
 
@@ -361,16 +481,17 @@ void sub_0807DD94(Entity* entity, void (*function)(Entity*, ScriptExecutionConte
     sub_0807DE80(entity);
 }
 
+// executeScript commandset, then call the function (or sub_0807DB98 if NULL), then delete if no next entity
 void sub_0807DDAC(Entity* entity, void (*function)(Entity*, ScriptExecutionContext*)) {
-    ScriptExecutionContext** piVar1;
+    ScriptExecutionContext** context;
 
-    piVar1 = (ScriptExecutionContext**)&entity->cutsceneBeh;
-    if (*piVar1) {
-        ExecuteScriptCommandSet(entity, *piVar1);
+    context = (ScriptExecutionContext**)&entity->cutsceneBeh;
+    if (*context) {
+        ExecuteScriptCommandSet(entity, *context);
         if (function) {
-            function(entity, *piVar1);
+            function(entity, *context);
         } else {
-            sub_0807DB98(entity, *piVar1);
+            sub_0807DB98(entity, *context);
         }
         if (!entity->next) {
             DeleteThisEntity();
@@ -452,7 +573,7 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 arg2, u32
 
     context->unk_19 = 8;
     context->unk_08 |= 2;
-    context->unk_14 = 0;
+    context->compareResult = 0;
     context->unk_1C.HALF.HI = arg2;
     context->unk_20.HALF.HI = arg3;
     t0 = context->unk_1C.HALF.HI - entity->x.HALF.HI;
@@ -482,123 +603,140 @@ void sub_0807DF50(void) {
 }
 
 void ExecuteScriptCommandSet(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_00)
+    if (!unk2->unk_00.raw)
         return;
     if (unk2->unk_10) {
         unk2->unk_10--;
     } else {
         struct_02033280* tmp2 = &gUnk_02033280;
-        tmp2->unk_07 = 0;
+        // unk_07 bit 1 is being reset in each iteration
+        // but bit 2 is also tested, so it can be set to continue execution until you reset it
+
+        tmp2->continueScriptExecutionFlags = 0;
         do {
-            u32 cmd = GetNextScriptCommandHalfword(unk2->unk_00);
+            u32 cmd = GetNextScriptCommandHalfword(unk2->unk_00.raw);
             u16* tmp;
             if (cmd == 0xFFFF)
                 return;
+            // after cutting of 10 bits, this is the amount to advance the unk_00 pointer of ScriptExecutionContext unk2
             tmp2->unk_06 = cmd >> 0xA;
-            tmp2->unk_04 = cmd & 0x3FF;
-            tmp = unk2->unk_00;
-            tmp2->unk_07 &= ~1;
-            gUnk_0811E524[tmp2->unk_04](unk1, unk2);
-            unk2->unk_00 += tmp2->unk_06;
-            if (tmp != unk2->unk_00) {
+            // lower 10 bits are the operationId (index to scriptOperations pointer array)
+            tmp2->operationId = cmd & 0x3FF;
+            tmp = unk2->unk_00.raw;
+            tmp2->continueScriptExecutionFlags &= ~1;
+            scriptOperations[tmp2->operationId](unk1, unk2);
+            unk2->unk_00.raw += tmp2->unk_06;
+            if (tmp != unk2->unk_00.raw) { // unk_00 was changed by tmp->unk_06 or the executed function -> set a flag
+                                           // to execute the next instruction or something?
                 unk2->unk_18 = 0;
             }
-        } while (tmp2->unk_07 & 3);
+        } while (tmp2->continueScriptExecutionFlags & 3);
     }
 }
 
 void nullsub_507(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
+// Start executing scripts
 void sub_0807E004(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_07 |= 2;
+    gUnk_02033280.continueScriptExecutionFlags |= 2;
 }
 
+// Stop executing scripts
 void sub_0807E014(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_07 &= ~2;
+    gUnk_02033280.continueScriptExecutionFlags &= ~2;
 }
 
 void sub_0807E024(Entity* unk1, ScriptExecutionContext* unk2) {
     s16 tmp;
-    unk2->unk_00++;
-    tmp = GetNextScriptCommandHalfword(unk2->unk_00);
-    unk2->unk_00 += (tmp / 2);
+    // get metadata -> tmp
+    unk2->unk_00.raw++;
+    tmp = GetNextScriptCommandHalfword(unk2->unk_00.raw);
+    unk2->unk_00.raw += (tmp / 2);
     gUnk_02033280.unk_06 = 0;
 }
 
+// if
 void sub_0807E050(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_14) {
+    if (unk2->compareResult) {
         sub_0807E024(unk1, unk2);
     }
 }
 
+// if not
 void sub_0807E064(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_14) {
+    if (!unk2->compareResult) {
         sub_0807E024(unk1, unk2);
     }
 }
 
 void sub_0807E078(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gUnk_02033280.unk_06 > unk2->unk_04) {
-        unk2->unk_00 += unk2->unk_04;
+        unk2->unk_00.raw += unk2->unk_04;
         sub_0807E024(unk1, unk2);
     }
 }
 
 void sub_0807E0A0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_00 = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    unk2->unk_00.raw = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
     gUnk_02033280.unk_06 = 0;
 }
 
+// if
 void sub_0807E0B8(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_14) {
+    if (unk2->compareResult) {
         sub_0807E0A0(unk1, unk2);
     }
 }
 
+// if not
 void sub_0807E0CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_14) {
+    if (!unk2->compareResult) {
         sub_0807E0A0(unk1, unk2);
     }
 }
 
 void sub_0807E0E0(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gUnk_02033280.unk_06 > (unk2->unk_04 << 1) + 1) {
-        unk2->unk_00 += unk2->unk_04 << 1;
+        unk2->unk_00.raw += unk2->unk_04 << 1;
         sub_0807E0A0(unk1, unk2);
     }
 }
 
+// Execute function via pointer
 void sub_0807E10C(Entity* unk1, ScriptExecutionContext* unk2) {
-    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00))(unk1,
-                                                                                                             unk2);
+    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw))(unk1,
+                                                                                                                 unk2);
 }
 
+// Execute function via pointer but set context->unk_04 to some meta/cmd before?
 void sub_0807E124(Entity* unk1, ScriptExecutionContext* unk2) {
     void (*tmp)(Entity*, ScriptExecutionContext*) =
-        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
-    unk2->unk_04 = GetNextScriptCommandWord(unk2->unk_00 + 3);
+        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    unk2->unk_04 = GetNextScriptCommandWord(unk2->unk_00.raw + 3);
     tmp(unk1, unk2);
 }
 
 void sub_0807E148(Entity* unk1, ScriptExecutionContext* unk2) {
-    LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
+    LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw));
 }
 
+// compare ???
 void sub_0807E158(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
     u32 tmp2 = 0;
     u32 tmp3 = gUnk_02033280.unk_00;
     if ((tmp3 & tmp) == tmp)
         tmp2 = 1;
-    unk2->unk_14 = tmp2;
+    unk2->compareResult = tmp2;
     gUnk_02033280.unk_00 = tmp3 & ~tmp;
-    gUnk_02033280.unk_07 |= 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// different compare functions (dungeon map, dungeon compass, dungeon big key, dungeon small keys, inventory value)
 void sub_0807E188(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp;
-    u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00);
+    u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw);
     switch (tmp2) {
         case 0x53:
             tmp = sub_08052734();
@@ -615,66 +753,75 @@ void sub_0807E188(Entity* unk1, ScriptExecutionContext* unk2) {
         default:
             tmp = GetInventoryValue(tmp2);
     }
-    unk2->unk_14 = tmp;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = tmp;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare GetInventoryValue(meta) == 2
 void sub_0807E1D8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = GetInventoryValue(unk2->unk_00[1]) == 2;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = GetInventoryValue(unk2->unk_00.raw[1]) == 2;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare CheckLocalFlag
 void sub_0807E200(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckLocalFlag(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = CheckLocalFlag(unk2->unk_00.raw[1]);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare CheckLocalFlagByOffset(metadata1, metadata2)
 void sub_0807E220(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckLocalFlagByOffset(unk2->unk_00[1], unk2->unk_00[2]);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = CheckLocalFlagByOffset(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare CheckGlobalFlag
 void sub_0807E240(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00));
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw));
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare CheckRoomFlag
 void sub_0807E260(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckRoomFlag(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = CheckRoomFlag(unk2->unk_00.raw[1]);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare checkPlayerInRegion  (square?)
 void sub_0807E280(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 x, y, width, height;
-    width = unk2->unk_00[3];
+    width = unk2->unk_00.raw[3];
     height = width >> 8;
     width &= 0xFF;
-    x = unk2->unk_00[1];
-    y = unk2->unk_00[2];
-    unk2->unk_14 = CheckPlayerInRegion(x, y, width, height);
-    gUnk_02033280.unk_07 |= 1;
+    x = unk2->unk_00.raw[1];
+    y = unk2->unk_00.raw[2];
+    unk2->compareResult = CheckPlayerInRegion(x, y, width, height);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare CheckPlayerInRegion (room?)
 void sub_0807E2A8(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 x, y, width, height;
-    width = unk2->unk_00[1] & 0xFF;
-    height = unk2->unk_00[1] >> 8;
+    width = unk2->unk_00.raw[1] & 0xFF;
+    height = unk2->unk_00.raw[1] >> 8;
     x = unk1->x.HALF.HI - gRoomControls.roomOriginX;
     y = unk1->y.HALF.HI - gRoomControls.roomOriginY;
-    unk2->unk_14 = CheckPlayerInRegion(x, y, width, height);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = CheckPlayerInRegion(x, y, width, height);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare and reset Entity->interactType
 void sub_0807E2E4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (unk1->interactType) {
         unk1->interactType = 0;
-        unk2->unk_14 = 1;
+        unk2->compareResult = 1;
     } else {
-        unk2->unk_14 = 0;
+        unk2->compareResult = 0;
     }
-    gUnk_02033280.unk_07 |= 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare and reset interactType while setting animationState ??
 void sub_0807E30C(Entity* unk1, ScriptExecutionContext* unk2) {
     if ((unk2->unk_1A & 0xF) == 0 && (gPlayerState.flags.all & 0x80) == 0 &&
         sub_080041A0(unk1, &gPlayerEntity, 0x28, 0x28)) {
@@ -683,160 +830,175 @@ void sub_0807E30C(Entity* unk1, ScriptExecutionContext* unk2) {
     unk2->unk_1A++;
     if (unk1->interactType) {
         unk1->interactType = 0;
-        unk2->unk_14 = 1;
+        unk2->compareResult = 1;
         unk1->animationState = sub_0806F5B0(GetFacingDirection(unk1, &gPlayerEntity));
     } else {
-        unk2->unk_14 = 0;
+        unk2->compareResult = 0;
     }
-    gUnk_02033280.unk_07 |= 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare enough rupees
 void sub_0807E390(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = (unk2->unk_00[1] <= gSave.stats.rupees);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = (unk2->unk_00.raw[1] <= gSave.stats.rupees);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare enough ???
 void sub_0807E3BC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = (unk2->unk_00[1] <= gSave.stats.field_0x1a);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = (unk2->unk_00.raw[1] <= gSave.stats.field_0x1a);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare ???
 void sub_0807E3E8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !gUnk_02000040.unk_01;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = !gUnk_02000040.unk_01;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare CheckKinstoneFused
 void sub_0807E40C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckKinstoneFused(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = CheckKinstoneFused(unk2->unk_00.raw[1]);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare enough rupees and remove rupees ??
 void sub_0807E42C(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp, tmp2;
     s32 tmp3;
-    tmp = unk2->unk_00[1];
-    tmp2 = unk2->unk_00[2];
+    tmp = unk2->unk_00.raw[1];
+    tmp2 = unk2->unk_00.raw[2];
     if (!tmp) {
         tmp = gRoomVars.itemForSaleIndex;
         tmp2 = gRoomVars.field_0x7;
     }
     tmp3 = sub_08053FE0(tmp);
-    unk2->unk_14 = (tmp3 <= gSave.stats.rupees);
-    if (unk2->unk_14) {
+    unk2->compareResult = (tmp3 <= gSave.stats.rupees);
+    if (unk2->compareResult) {
         ModRupees(-tmp3);
         sub_080A7C18(tmp, tmp2, 0);
         gRoomVars.itemForSaleIndex = 0;
         gRoomVars.field_0x7 = 0;
     }
-    gUnk_02033280.unk_07 |= 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare ??
 void sub_0807E48C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = sub_080544DC(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = sub_080544DC(unk2->unk_00.raw[1]);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare itemForSaleIndex??
 void sub_0807E4AC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !!gRoomVars.itemForSaleIndex;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = !!gRoomVars.itemForSaleIndex;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare ??
 void sub_0807E4CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !!(unk2->unk_04 & unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = !!(unk2->unk_04 & unk2->unk_00.raw[1]);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare meta & unk_04 ??
 void sub_0807E4EC(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = unk2->unk_00[1];
-    unk2->unk_14 = tmp == (tmp & unk2->unk_04);
-    gUnk_02033280.unk_07 |= 1;
+    u32 tmp = unk2->unk_00.raw[1];
+    unk2->compareResult = tmp == (tmp & unk2->unk_04);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare meta == unk_04 ??
 void sub_0807E514(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = unk2->unk_00[1];
-    unk2->unk_14 = tmp == unk2->unk_04;
-    gUnk_02033280.unk_07 |= 1;
+    u32 tmp = unk2->unk_00.raw[1];
+    unk2->compareResult = tmp == unk2->unk_04;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare player state flags ???
 void sub_0807E538(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !!(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00) & gPlayerState.flags.all);
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = !!(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw) & gPlayerState.flags.all);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare player state flags ???
 void sub_0807E564(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = (gPlayerState.flags.all >> 7) & 1;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = (gPlayerState.flags.all >> 7) & 1;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare entity height != 0
 void sub_0807E584(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = unk1->height.WORD != 0;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = unk1->height.WORD != 0;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare meta == player.action
 void sub_0807E5A0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = unk2->unk_00[1] == gPlayerEntity.action;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = unk2->unk_00.raw[1] == gPlayerEntity.action;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// compare meta == player.animationState
 void sub_0807E5CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = unk2->unk_00[1] == gPlayerEntity.animationState;
-    gUnk_02033280.unk_07 |= 1;
+    unk2->compareResult = unk2->unk_00.raw[1] == gPlayerEntity.animationState;
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
 void sub_0807E5F8(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
 }
 
 void sub_0807E610(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    gUnk_02033280.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
 }
 
 void sub_0807E628(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetLocalFlag(unk2->unk_00[1]);
+    SetLocalFlag(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E634(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetLocalFlagByOffset(unk2->unk_00[1], unk2->unk_00[2]);
+    SetLocalFlagByOffset(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
 }
 
 void sub_0807E644(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearLocalFlag(unk2->unk_00[1]);
+    ClearLocalFlag(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E650(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetGlobalFlag(unk2->unk_00[1]);
+    SetGlobalFlag(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E65C(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearGlobalFlag(unk2->unk_00[1]);
+    ClearGlobalFlag(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E668(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetRoomFlag(unk2->unk_00[1]);
+    SetRoomFlag(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E674(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearRoomFlag(unk2->unk_00[1]);
+    ClearRoomFlag(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E680(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_10 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00);
+    unk2->unk_10 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw);
 }
 
 void sub_0807E690(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
     if ((gUnk_02033280.unk_00 & tmp) != tmp) {
         gUnk_02033280.unk_06 = 0;
     }
 }
 
 void sub_0807E6AC(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
     if ((gUnk_02033280.unk_00 & tmp) != tmp) {
         gUnk_02033280.unk_06 = 0;
     } else {
         gUnk_02033280.unk_00 &= ~tmp;
-        gUnk_02033280.unk_07 |= 1;
+        gUnk_02033280.continueScriptExecutionFlags |= 1;
     }
 }
 
@@ -850,7 +1012,7 @@ void sub_0807E6DC(Entity* unk1, ScriptExecutionContext* unk2) {
 
 void sub_0807E700(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gPlayerEntity.action != 0x17) {
-        gUnk_02033280.unk_07 |= 1;
+        gUnk_02033280.continueScriptExecutionFlags |= 1;
     } else {
         gUnk_02033280.unk_06 = 0;
     }
@@ -860,7 +1022,7 @@ void sub_0807E72C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gRoomControls.unk6 & 4) {
         gUnk_02033280.unk_06 = 0;
     } else {
-        gUnk_02033280.unk_07 |= 1;
+        gUnk_02033280.continueScriptExecutionFlags |= 1;
     }
 }
 
@@ -871,11 +1033,11 @@ void sub_0807E75C(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E778(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_08 = unk2->unk_00[1];
+    gUnk_02033280.unk_08 = unk2->unk_00.raw[1];
 }
 
 void sub_0807E788(Entity* unk1, ScriptExecutionContext* unk2) {
-    gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
 }
 
 void sub_0807E79C(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -923,7 +1085,7 @@ void sub_0807E818(u32 unk1) {
 }
 
 void sub_0807E858(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08050038(unk2->unk_00[1]);
+    sub_08050038(unk2->unk_00.raw[1]);
 }
 
 void sub_0807E864(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -940,7 +1102,7 @@ void sub_0807E888(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E898(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
     gPlayerState.playerAction = tmp;
     gPlayerState.field_0x38 = tmp >> 8;
     gPlayerState.field_0x39 = tmp >> 0x10;
@@ -948,26 +1110,26 @@ void sub_0807E898(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E8C4(Entity* unk1, ScriptExecutionContext* unk2) {
-    StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
+    StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw));
 }
 
 void sub_0807E8D4(Entity* unk1, ScriptExecutionContext* unk2) {
-    gPlayerState.field_0x8 = unk2->unk_00[1];
+    gPlayerState.field_0x8 = unk2->unk_00.raw[1];
 }
 
 void sub_0807E8E4(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp = (gUnk_08016984 & 0x3FF);
     u32 tmp2;
-    gPlayerEntity.animationState = tmp2 = (unk2->unk_00[0] - tmp) << 1;
+    gPlayerEntity.animationState = tmp2 = (unk2->unk_00.raw[0] - tmp) << 1;
 }
 
 void sub_0807E908(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->action = unk2->unk_00[1];
+    unk1->action = unk2->unk_00.raw[1];
     unk1->previousActionFlag = 0;
 }
 
 void sub_0807E914(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    unk2->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
 }
 
 void sub_0807E924(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -976,14 +1138,14 @@ void sub_0807E924(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E930(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->field_0x80.HWORD = unk2->unk_00[1];
-    InitAnimationForceUpdate(unk1, unk2->unk_00[1]);
+    unk1->field_0x80.HWORD = unk2->unk_00.raw[1];
+    InitAnimationForceUpdate(unk1, unk2->unk_00.raw[1]);
 }
 
 void sub_0807E944(Entity* unk1, ScriptExecutionContext* unk2) {
     if (unk1->interactType) {
         unk1->interactType = 0;
-        gUnk_02033280.unk_07 |= 1;
+        gUnk_02033280.continueScriptExecutionFlags |= 1;
     } else {
         gUnk_02033280.unk_06 = 0;
     }
@@ -1000,7 +1162,7 @@ void sub_0807E974(Entity* unk1, ScriptExecutionContext* unk2) {
                 break;
             unk1->interactType = 0;
             unk2->unk_18++;
-            TextboxNoOverlapFollow(unk2->unk_00[1]);
+            TextboxNoOverlapFollow(unk2->unk_00.raw[1]);
             break;
         case 1:
             if (gTextBox.doTextBox & 0x7F)
@@ -1021,9 +1183,10 @@ void sub_0807E9DC(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E9E4(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078784(unk1, unk2->unk_00[1]);
+    sub_08078784(unk1, unk2->unk_00.raw[1]);
 }
 
+// compare and do stuff?
 void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp;
     sub_0801E00C();
@@ -1032,10 +1195,10 @@ void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
         case 2:
             gPlayerState.field_0x8b = 3;
             gUnk_02034490[0] = tmp;
-            unk2->unk_14 = tmp;
+            unk2->compareResult = tmp;
             break;
         case 1:
-            unk2->unk_14 = 0;
+            unk2->compareResult = 0;
             break;
         default:
             goto lbl;
@@ -1053,14 +1216,14 @@ void sub_0807EA4C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (unk1->interactType == 2) {
         sub_0801DFB4(unk1, 0, 0, 0);
         unk1->interactType = 0;
-        gUnk_02033280.unk_07 |= 1;
+        gUnk_02033280.continueScriptExecutionFlags |= 1;
     } else {
         gUnk_02033280.unk_06 = 0;
     }
 }
 
 void sub_0807EA88(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078790(unk1, unk2->unk_00[1]);
+    sub_08078790(unk1, unk2->unk_00.raw[1]);
 }
 
 void sub_0807EA94(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1070,22 +1233,22 @@ void sub_0807EA94(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EAB4(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlapFollow(unk2->unk_00[1]);
+    TextboxNoOverlapFollow(unk2->unk_00.raw[1]);
 }
 
 void sub_0807EAC0(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlap(unk2->unk_00[1], unk1);
+    TextboxNoOverlap(unk2->unk_00.raw[1], unk1);
 }
 
 void sub_0807EAD0(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlapFollow(unk2->unk_00[1]);
+    TextboxNoOverlapFollow(unk2->unk_00.raw[1]);
     gTextBox.textWindowPosX = 1;
-    gTextBox.textWindowPosY = unk2->unk_00[2];
+    gTextBox.textWindowPosY = unk2->unk_00.raw[2];
 }
 
 void sub_0807EAF0(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gUnk_02033280.unk_06 > unk2->unk_04) {
-        u16* tmp = unk2->unk_00 + unk2->unk_04;
+        u16* tmp = unk2->unk_00.raw + unk2->unk_04;
         TextboxNoOverlapFollow(tmp[1]);
     } else {
         TextboxNoOverlapFollow(0);
@@ -1097,7 +1260,7 @@ void sub_0807EB18(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EB28(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078AA8(unk2->unk_00[1], 0);
+    sub_08078AA8(unk2->unk_00.raw[1], 0);
 }
 
 void sub_0807EB38(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1105,12 +1268,12 @@ void sub_0807EB38(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EB44(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = unk2->unk_00[1];
+    unk1->animationState = unk2->unk_00.raw[1];
 }
 
 void sub_0807EB4C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = sub_0806F5B0(
-        sub_080045B4(unk1, unk2->unk_00[1] + gRoomControls.roomOriginX, unk2->unk_00[2] + gRoomControls.roomOriginY));
+    unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00.raw[1] + gRoomControls.roomOriginX,
+                                                     unk2->unk_00.raw[2] + gRoomControls.roomOriginY));
 }
 
 void sub_0807EB74(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1122,30 +1285,30 @@ void sub_0807EB8C(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EBA8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->direction = unk2->unk_00[1];
+    unk1->direction = unk2->unk_00.raw[1];
 }
 
 void sub_0807EBB0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->direction = unk2->unk_00[1];
+    unk1->direction = unk2->unk_00.raw[1];
     unk1->animationState = unk1->direction / 4;
 }
 
 void sub_0807EBC0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->nonPlanarMovement = unk2->unk_00[1];
+    unk1->nonPlanarMovement = unk2->unk_00.raw[1];
 }
 
 void sub_0807EBC8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    unk1->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
 }
 
 void sub_0807EBD8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->x.HALF.HI = gRoomControls.roomOriginX + unk2->unk_00[1];
-    unk1->y.HALF.HI = gRoomControls.roomOriginY + unk2->unk_00[2];
+    unk1->x.HALF.HI = gRoomControls.roomOriginX + unk2->unk_00.raw[1];
+    unk1->y.HALF.HI = gRoomControls.roomOriginY + unk2->unk_00.raw[2];
 }
 
 void sub_0807EBF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->x.HALF.HI += unk2->unk_00[1];
-    unk1->y.HALF.HI += unk2->unk_00[2];
+    unk1->x.HALF.HI += unk2->unk_00.raw[1];
+    unk1->y.HALF.HI += unk2->unk_00.raw[2];
 }
 
 void sub_0807EC08(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1158,7 +1321,7 @@ void nullsub_509(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EC1C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
+        unk2->unk_12 = unk2->unk_00.raw[1];
         unk2->unk_08 |= 2;
     }
     sub_0807EC44(unk1, unk2);
@@ -1174,7 +1337,7 @@ void sub_0807EC44(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EC64(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
+        unk2->unk_12 = unk2->unk_00.raw[1];
         unk1->animationState = 0;
         unk1->direction = 0;
         unk2->unk_08 |= 2;
@@ -1185,7 +1348,7 @@ void sub_0807EC64(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EC94(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
+        unk2->unk_12 = unk2->unk_00.raw[1];
         unk1->animationState = 2;
         unk1->direction = 8;
         unk2->unk_08 |= 2;
@@ -1196,7 +1359,7 @@ void sub_0807EC94(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807ECC4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
+        unk2->unk_12 = unk2->unk_00.raw[1];
         unk1->animationState = 4;
         unk1->direction = 0x10;
         unk2->unk_08 |= 2;
@@ -1207,7 +1370,7 @@ void sub_0807ECC4(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807ECF4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
+        unk2->unk_12 = unk2->unk_00.raw[1];
         unk1->animationState = 6;
         unk1->direction = 0x18;
         unk2->unk_08 |= 2;
@@ -1219,20 +1382,20 @@ void sub_0807ED24(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         s32 tmp, tmp2, tmp3;
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[3];
-        tmp = unk2->unk_00[1];
+        unk2->unk_12 = unk2->unk_00.raw[3];
+        tmp = unk2->unk_00.raw[1];
         tmp2 = unk1->x.HALF.HI - gRoomControls.roomOriginX;
         unk2->unk_1C.WORD = ((tmp - tmp2) << 0x10) / unk2->unk_12;
-        tmp = unk2->unk_00[2];
+        tmp = unk2->unk_00.raw[2];
         tmp3 = unk1->y.HALF.HI - gRoomControls.roomOriginY;
         unk2->unk_20.WORD = ((tmp - tmp3) << 0x10) / unk2->unk_12;
-        unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00[1] + gRoomControls.roomOriginX,
-                                                         unk2->unk_00[2] + gRoomControls.roomOriginY));
+        unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00.raw[1] + gRoomControls.roomOriginX,
+                                                         unk2->unk_00.raw[2] + gRoomControls.roomOriginY));
         unk2->unk_08 |= 2;
     } else {
         if (!--unk2->unk_12) {
-            unk1->x.HALF.HI = unk2->unk_00[1] + gRoomControls.roomOriginX;
-            unk1->y.HALF.HI = unk2->unk_00[2] + gRoomControls.roomOriginY;
+            unk1->x.HALF.HI = unk2->unk_00.raw[1] + gRoomControls.roomOriginX;
+            unk1->y.HALF.HI = unk2->unk_00.raw[2] + gRoomControls.roomOriginY;
             return;
         }
         unk1->x.WORD += unk2->unk_1C.WORD;
@@ -1241,22 +1404,25 @@ void sub_0807ED24(Entity* unk1, ScriptExecutionContext* unk2) {
     gUnk_02033280.unk_06 = 0;
 }
 
+// something else and an if not
 void sub_0807EDD4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
         sub_0807EE04(unk1, unk2);
     }
     sub_0807EE30(unk1, unk2);
-    if (!unk2->unk_14) {
+    if (!unk2->compareResult) {
         gUnk_02033280.unk_06 = 0;
     }
 }
 
 void sub_0807EE04(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_0807DEDC(unk1, unk2, unk2->unk_00[1] + gRoomControls.roomOriginX, unk2->unk_00[2] + gRoomControls.roomOriginY);
-    gUnk_02033280.unk_07 |= 1;
+    sub_0807DEDC(unk1, unk2, unk2->unk_00.raw[1] + gRoomControls.roomOriginX,
+                 unk2->unk_00.raw[2] + gRoomControls.roomOriginY);
+    gUnk_02033280.continueScriptExecutionFlags |= 1;
 }
 
+// something else and a compare
 void sub_0807EE30(Entity* unk1, ScriptExecutionContext* unk2) {
     s32 tmp, tmp2;
     if (!--unk2->unk_19) {
@@ -1271,30 +1437,33 @@ void sub_0807EE30(Entity* unk1, ScriptExecutionContext* unk2) {
     if (tmp <= 0 && tmp2 <= 0) {
         unk1->x.HALF.HI = unk2->unk_1C.HALF.HI;
         unk1->y.HALF.HI = unk2->unk_20.HALF.HI;
-        unk2->unk_14 = 1;
+        unk2->compareResult = 1;
     } else {
-        unk2->unk_14 = 0;
+        unk2->compareResult = 0;
     }
 }
 
+// another if not and ???
 void sub_0807EEB4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
+    if (!unk2->unk_18) { // TODO unk_18 another compare flag?
         unk2->unk_18 = 1;
         sub_0807DEDC(unk1, unk2, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI);
     }
     sub_0807EE30(unk1, unk2);
-    if (!unk2->unk_14) {
-        gUnk_02033280.unk_06 = 0;
+    if (!unk2->compareResult) {
+        gUnk_02033280.unk_06 = 0; // TODO research unk_06
     }
 }
 
+// another if not ???
 void sub_0807EEF4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        sub_0807DEDC(unk1, unk2, unk1->x.HALF.HI + ((s16)unk2->unk_00[1]), unk1->y.HALF.HI + ((s16)unk2->unk_00[2]));
+        sub_0807DEDC(unk1, unk2, unk1->x.HALF.HI + ((s16)unk2->unk_00.raw[1]),
+                     unk1->y.HALF.HI + ((s16)unk2->unk_00.raw[2]));
     }
     sub_0807EE30(unk1, unk2);
-    if (!unk2->unk_14) {
+    if (!unk2->compareResult) {
         gUnk_02033280.unk_06 = 0;
     }
 }
@@ -1302,8 +1471,8 @@ void sub_0807EEF4(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk1->field_0x20 = ((s16)unk2->unk_00[1]) << 8;
-        unk2->unk_1C.HALF.LO = unk2->unk_00[2] << 8;
+        unk1->field_0x20 = ((s16)unk2->unk_00.raw[1]) << 8;
+        unk2->unk_1C.HALF.LO = unk2->unk_00.raw[2] << 8;
         sub_08003FC4(unk1, (u16)unk2->unk_1C.HALF.LO);
     } else {
         if (!sub_08003FC4(unk1, (u16)unk2->unk_1C.HALF.LO))
@@ -1313,27 +1482,27 @@ void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EF80(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_08 |= 1 << unk2->unk_00[1];
+    unk2->unk_08 |= 1 << unk2->unk_00.raw[1];
 }
 
 void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_08 |= 1 << unk2->unk_00[1];
+    unk2->unk_08 |= 1 << unk2->unk_00.raw[1];
 }
 
 void sub_0807EFA0(Entity* unk1, ScriptExecutionContext* unk2) {
-    SoundReq(unk2->unk_00[1]);
+    SoundReq(unk2->unk_00.raw[1]);
 }
 
 void sub_0807EFAC(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_00[1] >= 100) {
+    if (unk2->unk_00.raw[1] >= 100) {
         SoundReq(gArea.musicIndex);
     } else {
-        SoundReq(unk2->unk_00[1]);
+        SoundReq(unk2->unk_00.raw[1]);
     }
 }
 
 void sub_0807EFD4(Entity* unk1, ScriptExecutionContext* unk2) {
-    SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
+    SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw));
 }
 
 void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1341,11 +1510,11 @@ void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EFF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    ModRupees((s16)unk2->unk_00[1]);
+    ModRupees((s16)unk2->unk_00.raw[1]);
 }
 
 void sub_0807F004(Entity* unk1, ScriptExecutionContext* unk2) {
-    ModHealth(unk2->unk_00[1]);
+    ModHealth(unk2->unk_00.commands[0].metadata);
 }
 
 void sub_0807F010(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1355,27 +1524,28 @@ void sub_0807F010(Entity* unk1, ScriptExecutionContext* unk2) {
 
 void sub_0807F034(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp = 0;
-    if (unk2->unk_00[1] == 0x3F) {
+    if (unk2->unk_00.raw[1] == 0x3F) {
         tmp = unk2->unk_04;
     }
-    sub_080A7C18(unk2->unk_00[1], tmp, 0);
+    sub_080A7C18(unk2->unk_00.raw[1], tmp, 0);
 }
 
 void sub_0807F050(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080A7C18(0x5C, unk2->unk_00[1], 0);
+    sub_080A7C18(0x5C, unk2->unk_00.raw[1], 0);
 }
 
+// get inventory value and compare ??
 void sub_0807F060(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = GetInventoryValue(unk2->unk_00[1]);
-    unk2->unk_14 = unk2->unk_04 != 0;
+    unk2->unk_04 = GetInventoryValue(unk2->unk_00.raw[1]);
+    unk2->compareResult = unk2->unk_04 != 0;
 }
 
 void sub_0807F078(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_0807CAA0(unk2->unk_00[1], unk2->unk_00[2]);
+    sub_0807CAA0(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
 }
 
 void sub_0807F088(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080A7C18(unk2->unk_00[1], 0, 3);
+    sub_080A7C18(unk2->unk_00.raw[1], 0, 3);
 }
 
 void sub_0807F098(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1387,9 +1557,9 @@ void sub_0807F0A4(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807F0B4(Entity* unk1, ScriptExecutionContext* unk2) {
-    gRoomControls.unk5 = unk2->unk_00[1] & 7;
+    gRoomControls.unk5 = unk2->unk_00.raw[1] & 7;
 }
 
 void sub_0807F0C8(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08080964(unk2->unk_00[1], unk2->unk_00[2]);
+    sub_08080964(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
 }

From 654434c74baea77656738fbba7627dae150e5ca7 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 05:56:13 +0100
Subject: [PATCH 02/46] Start building macros for scripts

---
 asm/code_0800857C.s        | 203 ------------------------------------
 asm/code_rest.s            | 206 +++++++++++++++++++++++++++++++++++++
 linker.ld                  |   2 +
 src/script.c               |   2 +
 src/scripts/npc4e_fusion.c |  38 +++++++
 5 files changed, 248 insertions(+), 203 deletions(-)
 create mode 100644 asm/code_rest.s
 create mode 100644 src/scripts/npc4e_fusion.c

diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s
index cb5c54a0..7f97b584 100644
--- a/asm/code_0800857C.s
+++ b/asm/code_0800857C.s
@@ -3923,206 +3923,3 @@ gUnk_08015FC0:: @ 08015FC0
 gUnk_08016021:: @ 08016021
 	.incbin "baserom.gba", 0x016021, 0x000000F
 
-gUnk_08016030:: @ 08016030
-	.incbin "baserom.gba", 0x016030, 0x000003C
-
-gUnk_0801606C:: @ 0801606C
-	.incbin "baserom.gba", 0x01606C, 0x000003C
-
-gUnk_080160A8:: @ 080160A8
-	.incbin "baserom.gba", 0x0160A8, 0x0000042
-
-gUnk_080160EA:: @ 080160EA
-	.incbin "baserom.gba", 0x0160EA, 0x0000052
-
-gUnk_0801613C:: @ 0801613C
-	.incbin "baserom.gba", 0x01613C, 0x0000054
-
-gUnk_08016190:: @ 08016190
-	.incbin "baserom.gba", 0x016190, 0x0000058
-
-gUnk_080161E8:: @ 080161E8
-	.incbin "baserom.gba", 0x0161E8, 0x0000174
-
-gUnk_0801635C:: @ 0801635C
-	.incbin "baserom.gba", 0x01635C, 0x0000021
-
-gUnk_0801637D:: @ 0801637D
-	.incbin "baserom.gba", 0x01637D, 0x0000007
-
-gUnk_08016384:: @ 08016384
-	.incbin "baserom.gba", 0x016384, 0x0000084
-
-gUnk_08016408:: @ 08016408
-	.incbin "baserom.gba", 0x016408, 0x00001F0
-
-gUnk_080165F8:: @ 080165F8
-	.incbin "baserom.gba", 0x0165F8, 0x0000014
-
-gUnk_0801660C:: @ 0801660C
-	.incbin "baserom.gba", 0x01660C, 0x000001C
-
-gUnk_08016628:: @ 08016628
-	.incbin "baserom.gba", 0x016628, 0x000001C
-
-gUnk_08016644:: @ 08016644
-	.incbin "baserom.gba", 0x016644, 0x0000028
-
-gUnk_0801666C:: @ 0801666C
-	.incbin "baserom.gba", 0x01666C, 0x000004C
-
-gUnk_080166B8:: @ 080166B8
-	.incbin "baserom.gba", 0x0166B8, 0x0000044
-
-gUnk_080166FC:: @ 080166FC
-	.incbin "baserom.gba", 0x0166FC, 0x000009C
-
-gUnk_08016798:: @ 08016798
-	.incbin "baserom.gba", 0x016798, 0x00000AC
-
-gUnk_08016844:: @ 08016844
-	.incbin "baserom.gba", 0x016844, 0x000009C
-
-gUnk_080168E0:: @ 080168E0
-	.incbin "baserom.gba", 0x0168E0, 0x0000014
-
-gUnk_080168F4:: @ 080168F4
-	.incbin "baserom.gba", 0x0168F4, 0x0000090
-
-gUnk_08016984:: @ 08016984
-	.incbin "baserom.gba", 0x016984, 0x0000002
-
-	.text
-
-	non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
-GetNextScriptCommandHalfword: @ 0x08016986
-	ldrh r0, [r0]
-	bx lr
-
-	non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
-GetNextScriptCommandHalfwordAfterCommandMetadata: @ 0x0801698A
-	ldrh r0, [r0, #2]
-	bx lr
-
-	non_word_aligned_thumb_func_start GetNextScriptCommandWord
-GetNextScriptCommandWord: @ 0x0801698E
-	ldrh r1, [r0]
-	ldrh r0, [r0, #2]
-	lsls r0, r0, #0x10
-	orrs r0, r1
-	bx lr
-
-	thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
-GetNextScriptCommandWordAfterCommandMetadata: @ 0x08016998
-	ldrh r1, [r0, #2]
-	ldrh r0, [r0, #4]
-	lsls r0, r0, #0x10
-	orrs r0, r1
-	bx lr
-	.align 2, 0
-
-gUnk_080169A4::
-	.byte 0x01, 0xFF, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x00
-	.byte 0xFF, 0x01, 0x00, 0x00, 0x02, 0xFF, 0x01, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0xFF, 0x02
-	.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x02, 0xFE, 0xFE, 0x02, 0xFF, 0x03, 0xFD, 0xFF, 0xFE, 0x01
-	.byte 0x01, 0xFD, 0xFF, 0xFF, 0x03, 0xFE, 0x02, 0x00, 0x00, 0xFF, 0xFE, 0x03, 0xFD, 0x02, 0xFF, 0x00
-	.byte 0x00, 0xFD, 0x02, 0x00, 0x00, 0xFF, 0x00, 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02
-	.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
-	.byte 0x00, 0x00, 0x01, 0x00
-
-	thumb_func_start UpdateSpriteForCollisionLayer
-UpdateSpriteForCollisionLayer: @ 0x08016A04
-	movs r1, #0x38
-	ldrb r1, [r0, r1]
-	lsls r1, r1, #1
-	add r3, pc, #0x1C
-	adds r1, r1, r3
-	movs r3, #0xc0
-	ldrb r2, [r0, #0x19]
-	bics r2, r3
-	ldrb r3, [r1]
-	orrs r2, r3
-	strb r2, [r0, #0x19]
-	movs r3, #0xc0
-	ldrb r2, [r0, #0x1b]
-	bics r2, r3
-	ldrb r3, [r1, #1]
-	orrs r2, r3
-	strb r2, [r0, #0x1b]
-	bx lr
-_08016A28:
-	.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
-
-	thumb_func_start sub_08016A30
-sub_08016A30: @ 0x08016A30
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	movs r5, #0x38
-	ldrb r0, [r4, r5]
-	cmp r0, #0
-	bne _08016A64
-	ldrh r0, [r4, #0x2e]
-	ldrh r1, [r4, #0x32]
-	movs r2, #2
-	bl GetTileTypeByPos
-	movs r3, #1
-	cmp r0, #0
-	beq _08016A62
-	bl sub_080002E4
-	movs r3, #2
-	add r1, pc, #0x40
-_08016A54:
-	adds r1, #4
-	ldrh r2, [r1]
-	cmp r2, #0
-	beq _08016A62
-	cmp r0, r2
-	bne _08016A54
-	ldrb r3, [r1, #3]
-_08016A62:
-	strb r3, [r4, r5]
-_08016A64:
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08016A6C
-sub_08016A6C: @ 0x08016A6C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_080002B8
-	add r1, pc, #0x38
-_08016A76:
-	adds r1, #4
-	ldrh r2, [r1]
-	cmp r2, #0
-	beq _08016A90
-	cmp r2, r0
-	bne _08016A76
-	movs r2, #0x38
-	ldrb r3, [r4, r2]
-	ldrb r5, [r1, #2]
-	cmp r3, r5
-	beq _08016A90
-	ldrb r5, [r1, #3]
-	strb r5, [r4, r2]
-_08016A90:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08016A94:
-	.byte 0x2A, 0x00, 0x03, 0x03, 0x2D, 0x00, 0x03, 0x03, 0x2B, 0x00, 0x03, 0x03
-	.byte 0x2C, 0x00, 0x03, 0x03, 0x4C, 0x00, 0x03, 0x03, 0x4E, 0x00, 0x03, 0x03, 0x4D, 0x00, 0x03, 0x03
-	.byte 0x4F, 0x00, 0x03, 0x03, 0x0A, 0x00, 0x02, 0x01, 0x09, 0x00, 0x02, 0x01, 0x0C, 0x00, 0x01, 0x02
-	.byte 0x0B, 0x00, 0x01, 0x02, 0x52, 0x00, 0x03, 0x03, 0x27, 0x00, 0x03, 0x03, 0x26, 0x00, 0x03, 0x03
-	.byte 0x00, 0x00
-
-	non_word_aligned_thumb_func_start sub_08016AD2
-sub_08016AD2: @ 0x08016AD2
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08016A6C
-	push {r0}
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-	pop {r0, r4, pc}
-
diff --git a/asm/code_rest.s b/asm/code_rest.s
new file mode 100644
index 00000000..d7e1df3b
--- /dev/null
+++ b/asm/code_rest.s
@@ -0,0 +1,206 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+gUnk_0801606C:: @ 0801606C
+	.incbin "baserom.gba", 0x01606C, 0x000003C
+
+gUnk_080160A8:: @ 080160A8
+	.incbin "baserom.gba", 0x0160A8, 0x0000042
+
+gUnk_080160EA:: @ 080160EA
+	.incbin "baserom.gba", 0x0160EA, 0x0000052
+
+gUnk_0801613C:: @ 0801613C
+	.incbin "baserom.gba", 0x01613C, 0x0000054
+
+gUnk_08016190:: @ 08016190
+	.incbin "baserom.gba", 0x016190, 0x0000058
+
+gUnk_080161E8:: @ 080161E8
+	.incbin "baserom.gba", 0x0161E8, 0x0000174
+
+gUnk_0801635C:: @ 0801635C
+	.incbin "baserom.gba", 0x01635C, 0x0000021
+
+gUnk_0801637D:: @ 0801637D
+	.incbin "baserom.gba", 0x01637D, 0x0000007
+
+gUnk_08016384:: @ 08016384
+	.incbin "baserom.gba", 0x016384, 0x0000084
+
+gUnk_08016408:: @ 08016408
+	.incbin "baserom.gba", 0x016408, 0x00001F0
+
+gUnk_080165F8:: @ 080165F8
+	.incbin "baserom.gba", 0x0165F8, 0x0000014
+
+gUnk_0801660C:: @ 0801660C
+	.incbin "baserom.gba", 0x01660C, 0x000001C
+
+gUnk_08016628:: @ 08016628
+	.incbin "baserom.gba", 0x016628, 0x000001C
+
+gUnk_08016644:: @ 08016644
+	.incbin "baserom.gba", 0x016644, 0x0000028
+
+gUnk_0801666C:: @ 0801666C
+	.incbin "baserom.gba", 0x01666C, 0x000004C
+
+gUnk_080166B8:: @ 080166B8
+	.incbin "baserom.gba", 0x0166B8, 0x0000044
+
+gUnk_080166FC:: @ 080166FC
+	.incbin "baserom.gba", 0x0166FC, 0x000009C
+
+gUnk_08016798:: @ 08016798
+	.incbin "baserom.gba", 0x016798, 0x00000AC
+
+gUnk_08016844:: @ 08016844
+	.incbin "baserom.gba", 0x016844, 0x000009C
+
+gUnk_080168E0:: @ 080168E0
+	.incbin "baserom.gba", 0x0168E0, 0x0000014
+
+gUnk_080168F4:: @ 080168F4
+	.incbin "baserom.gba", 0x0168F4, 0x0000090
+
+gUnk_08016984:: @ 08016984
+	.incbin "baserom.gba", 0x016984, 0x0000002
+
+	.text
+
+	non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
+GetNextScriptCommandHalfword: @ 0x08016986
+	ldrh r0, [r0]
+	bx lr
+
+	non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
+GetNextScriptCommandHalfwordAfterCommandMetadata: @ 0x0801698A
+	ldrh r0, [r0, #2]
+	bx lr
+
+	non_word_aligned_thumb_func_start GetNextScriptCommandWord
+GetNextScriptCommandWord: @ 0x0801698E
+	ldrh r1, [r0]
+	ldrh r0, [r0, #2]
+	lsls r0, r0, #0x10
+	orrs r0, r1
+	bx lr
+
+	thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
+GetNextScriptCommandWordAfterCommandMetadata: @ 0x08016998
+	ldrh r1, [r0, #2]
+	ldrh r0, [r0, #4]
+	lsls r0, r0, #0x10
+	orrs r0, r1
+	bx lr
+	.align 2, 0
+
+gUnk_080169A4::
+	.byte 0x01, 0xFF, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x00
+	.byte 0xFF, 0x01, 0x00, 0x00, 0x02, 0xFF, 0x01, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0xFF, 0x02
+	.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x02, 0xFE, 0xFE, 0x02, 0xFF, 0x03, 0xFD, 0xFF, 0xFE, 0x01
+	.byte 0x01, 0xFD, 0xFF, 0xFF, 0x03, 0xFE, 0x02, 0x00, 0x00, 0xFF, 0xFE, 0x03, 0xFD, 0x02, 0xFF, 0x00
+	.byte 0x00, 0xFD, 0x02, 0x00, 0x00, 0xFF, 0x00, 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02
+	.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
+	.byte 0x00, 0x00, 0x01, 0x00
+
+	thumb_func_start UpdateSpriteForCollisionLayer
+UpdateSpriteForCollisionLayer: @ 0x08016A04
+	movs r1, #0x38
+	ldrb r1, [r0, r1]
+	lsls r1, r1, #1
+	add r3, pc, #0x1C
+	adds r1, r1, r3
+	movs r3, #0xc0
+	ldrb r2, [r0, #0x19]
+	bics r2, r3
+	ldrb r3, [r1]
+	orrs r2, r3
+	strb r2, [r0, #0x19]
+	movs r3, #0xc0
+	ldrb r2, [r0, #0x1b]
+	bics r2, r3
+	ldrb r3, [r1, #1]
+	orrs r2, r3
+	strb r2, [r0, #0x1b]
+	bx lr
+_08016A28:
+	.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
+
+	thumb_func_start sub_08016A30
+sub_08016A30: @ 0x08016A30
+	push {r4, r5, lr}
+	adds r4, r0, #0
+	movs r5, #0x38
+	ldrb r0, [r4, r5]
+	cmp r0, #0
+	bne _08016A64
+	ldrh r0, [r4, #0x2e]
+	ldrh r1, [r4, #0x32]
+	movs r2, #2
+	bl GetTileTypeByPos
+	movs r3, #1
+	cmp r0, #0
+	beq _08016A62
+	bl sub_080002E4
+	movs r3, #2
+	add r1, pc, #0x40
+_08016A54:
+	adds r1, #4
+	ldrh r2, [r1]
+	cmp r2, #0
+	beq _08016A62
+	cmp r0, r2
+	bne _08016A54
+	ldrb r3, [r1, #3]
+_08016A62:
+	strb r3, [r4, r5]
+_08016A64:
+	adds r0, r4, #0
+	bl UpdateSpriteForCollisionLayer
+	pop {r4, r5, pc}
+
+	thumb_func_start sub_08016A6C
+sub_08016A6C: @ 0x08016A6C
+	push {r4, r5, lr}
+	adds r4, r0, #0
+	bl sub_080002B8
+	add r1, pc, #0x38
+_08016A76:
+	adds r1, #4
+	ldrh r2, [r1]
+	cmp r2, #0
+	beq _08016A90
+	cmp r2, r0
+	bne _08016A76
+	movs r2, #0x38
+	ldrb r3, [r4, r2]
+	ldrb r5, [r1, #2]
+	cmp r3, r5
+	beq _08016A90
+	ldrb r5, [r1, #3]
+	strb r5, [r4, r2]
+_08016A90:
+	pop {r4, r5, pc}
+	.align 2, 0
+_08016A94:
+	.byte 0x2A, 0x00, 0x03, 0x03, 0x2D, 0x00, 0x03, 0x03, 0x2B, 0x00, 0x03, 0x03
+	.byte 0x2C, 0x00, 0x03, 0x03, 0x4C, 0x00, 0x03, 0x03, 0x4E, 0x00, 0x03, 0x03, 0x4D, 0x00, 0x03, 0x03
+	.byte 0x4F, 0x00, 0x03, 0x03, 0x0A, 0x00, 0x02, 0x01, 0x09, 0x00, 0x02, 0x01, 0x0C, 0x00, 0x01, 0x02
+	.byte 0x0B, 0x00, 0x01, 0x02, 0x52, 0x00, 0x03, 0x03, 0x27, 0x00, 0x03, 0x03, 0x26, 0x00, 0x03, 0x03
+	.byte 0x00, 0x00
+
+	non_word_aligned_thumb_func_start sub_08016AD2
+sub_08016AD2: @ 0x08016AD2
+	push {r4, lr}
+	adds r4, r0, #0
+	bl sub_08016A6C
+	push {r0}
+	adds r0, r4, #0
+	bl UpdateSpriteForCollisionLayer
+	pop {r0, r4, pc}
+
diff --git a/linker.ld b/linker.ld
index 423c5cc5..29fd6003 100644
--- a/linker.ld
+++ b/linker.ld
@@ -295,6 +295,8 @@ SECTIONS {
         asm/code_080043E8.o(.text);
         data/data_08007DF4.o(.rodata);
         asm/code_0800857C.o(.text);
+        src/scripts/npc4e_fusion.o(.rodata);
+        asm/code_rest.o(.text);
         asm/sub_08016AE4.o(.text);
 
 
diff --git a/src/script.c b/src/script.c
index 495a01d5..6d136b5a 100644
--- a/src/script.c
+++ b/src/script.c
@@ -981,6 +981,7 @@ void sub_0807E674(Entity* unk1, ScriptExecutionContext* unk2) {
     ClearRoomFlag(unk2->unk_00.raw[1]);
 }
 
+// set unk2->unk_10 to meta
 void sub_0807E680(Entity* unk1, ScriptExecutionContext* unk2) {
     unk2->unk_10 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw);
 }
@@ -1293,6 +1294,7 @@ void sub_0807EBB0(Entity* unk1, ScriptExecutionContext* unk2) {
     unk1->animationState = unk1->direction / 4;
 }
 
+// set nonPlanarMovement
 void sub_0807EBC0(Entity* unk1, ScriptExecutionContext* unk2) {
     unk1->nonPlanarMovement = unk2->unk_00.raw[1];
 }
diff --git a/src/scripts/npc4e_fusion.c b/src/scripts/npc4e_fusion.c
new file mode 100644
index 00000000..ad010b1c
--- /dev/null
+++ b/src/scripts/npc4e_fusion.c
@@ -0,0 +1,38 @@
+// macro helpers
+#define WORD_TO_SHORTS(word, b) word, b
+
+// script commands
+#define START_EXECUTING_SCRIPTS() 0x0401,
+#define STOP_EXECUTING_SCRIPTS() 0x0402,
+#define CHECK_KINSTONE_FUSED(id) 0x081d, id,
+#define JUMP_IF_TRUE(offset) 0x0804, offset,
+#define sub_0807E6AC(word, b) 0x0c33, WORD_TO_SHORTS(word, b),
+#define sub_0807EF80(param) 0x0879, param,
+#define sub_0807E680(param) 0x0831, param,
+#define sub_0807EBC0(param) 0x0867, param,
+#define sub_0807ECF4(param) 0x0871, param,
+#define sub_0807E680(param) 0x0831, param,
+#define sub_0807EF80(param) 0x0879, param,
+#define sub_0807E5F8(a, b) 0x0c28, a, b,
+const unsigned short gUnk_08016030[] = {
+    // clang-format off
+    START_EXECUTING_SCRIPTS()
+    CHECK_KINSTONE_FUSED(9)
+    JUMP_IF_TRUE(0x2a)
+    STOP_EXECUTING_SCRIPTS()
+    sub_0807E6AC(0x0001,0x0000)
+    sub_0807EF80(0x0010)
+    sub_0807E680(0x003c)
+    sub_0807EBC0(0x0020)
+    sub_0807ECF4(0x0080)
+    sub_0807E680(0x001e)
+    sub_0807EF80(0x0010)
+    sub_0807E5F8(0x0008, 0x0000)
+    // clang-format on
+    0xffff,
+    0x0c6a,
+    0xfff0,
+    0x0000,
+    0xffff,
+    0x0000
+};

From 40a3d866b12f6947ce23eb33d4b3ebd9bc27caca Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 07:21:24 +0100
Subject: [PATCH 03/46] Split off second script

---
 asm/code_0800857C.s                  | 377 +-------------------------
 asm/code_08012AB0.s                  | 384 +++++++++++++++++++++++++++
 asm/{code_rest.s => code_0801606C.s} |   0
 linker.ld                            |   4 +-
 src/npc/ezloCap.c                    |   2 +-
 src/script.c                         |   4 +
 src/scripts/ezlo_angry.c             |  14 +
 src/scripts/npc4e_fusion.c           |  12 +-
 8 files changed, 414 insertions(+), 383 deletions(-)
 create mode 100644 asm/code_08012AB0.s
 rename asm/{code_rest.s => code_0801606C.s} (100%)
 create mode 100644 src/scripts/ezlo_angry.c

diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s
index 7f97b584..0e9c1fc4 100644
--- a/asm/code_0800857C.s
+++ b/asm/code_0800857C.s
@@ -3542,384 +3542,9 @@ gUnk_08012430:: @ 08012430
 gUnk_08012480:: @ 08012480
 	.incbin "baserom.gba", 0x012480, 0x000027C
 
-gUnk_080126FC:: @ 080126FC
-	.incbin "baserom.gba", 0x0126FC, 0x00003B4
 
-gUnk_08012AB0:: @ 08012AB0
-	.incbin "baserom.gba", 0x012AB0, 0x00000F8
 
-gUnk_08012BA8:: @ 08012BA8
-	.incbin "baserom.gba", 0x012BA8, 0x0000050
+@	.incbin "baserom.gba", 0x0126FC, 0x00003B4
 
-gUnk_08012BF8:: @ 08012BF8
-	.incbin "baserom.gba", 0x012BF8, 0x0000014
 
-gUnk_08012C0C:: @ 08012C0C
-	.incbin "baserom.gba", 0x012C0C, 0x000003C
-
-gUnk_08012C48:: @ 08012C48
-	.incbin "baserom.gba", 0x012C48, 0x0000050
-
-gUnk_08012C98:: @ 08012C98
-	.incbin "baserom.gba", 0x012C98, 0x0000040
-
-gUnk_08012CD8:: @ 08012CD8
-	.incbin "baserom.gba", 0x012CD8, 0x0000040
-
-gUnk_08012D18:: @ 08012D18
-	.incbin "baserom.gba", 0x012D18, 0x0000058
-
-gUnk_08012D70:: @ 08012D70
-	.incbin "baserom.gba", 0x012D70, 0x0000031
-
-gUnk_08012DA1:: @ 08012DA1
-	.incbin "baserom.gba", 0x012DA1, 0x000000F
-
-gUnk_08012DB0:: @ 08012DB0
-	.incbin "baserom.gba", 0x012DB0, 0x0000028
-
-gUnk_08012DD8:: @ 08012DD8
-	.incbin "baserom.gba", 0x012DD8, 0x0000048
-
-gUnk_08012E20:: @ 08012E20
-	.incbin "baserom.gba", 0x012E20, 0x0000024
-
-gUnk_08012E44:: @ 08012E44
-	.incbin "baserom.gba", 0x012E44, 0x0000044
-
-gUnk_08012E88:: @ 08012E88
-	.incbin "baserom.gba", 0x012E88, 0x0000038
-
-gUnk_08012EC0:: @ 08012EC0
-	.incbin "baserom.gba", 0x012EC0, 0x000004C
-
-gUnk_08012F0C:: @ 08012F0C
-	.incbin "baserom.gba", 0x012F0C, 0x00000F5
-
-gUnk_08013001:: @ 08013001
-	.incbin "baserom.gba", 0x013001, 0x0000002
-
-gUnk_08013003:: @ 08013003
-	.incbin "baserom.gba", 0x013003, 0x0000008
-
-gUnk_0801300B:: @ 0801300B
-	.incbin "baserom.gba", 0x01300B, 0x0000031
-
-gUnk_0801303C:: @ 0801303C
-	.incbin "baserom.gba", 0x01303C, 0x0000034
-
-gUnk_08013070:: @ 08013070
-	.incbin "baserom.gba", 0x013070, 0x0000011
-
-gUnk_08013081:: @ 08013081
-	.incbin "baserom.gba", 0x013081, 0x000000F
-
-gUnk_08013090:: @ 08013090
-	.incbin "baserom.gba", 0x013090, 0x0000084
-
-gUnk_08013114:: @ 08013114
-	.incbin "baserom.gba", 0x013114, 0x0000074
-
-gUnk_08013188:: @ 08013188
-	.incbin "baserom.gba", 0x013188, 0x0000024
-
-gUnk_080131AC:: @ 080131AC
-	.incbin "baserom.gba", 0x0131AC, 0x0000138
-
-gUnk_080132E4:: @ 080132E4
-	.incbin "baserom.gba", 0x0132E4, 0x000004C
-
-gUnk_08013330:: @ 08013330
-	.incbin "baserom.gba", 0x013330, 0x000001C
-
-gUnk_0801334C:: @ 0801334C
-	.incbin "baserom.gba", 0x01334C, 0x000002C
-
-gUnk_08013378:: @ 08013378
-	.incbin "baserom.gba", 0x013378, 0x000004C
-
-gUnk_080133C4:: @ 080133C4
-	.incbin "baserom.gba", 0x0133C4, 0x0000034
-
-gUnk_080133F8:: @ 080133F8
-	.incbin "baserom.gba", 0x0133F8, 0x00000E4
-
-gUnk_080134DC:: @ 080134DC
-	.incbin "baserom.gba", 0x0134DC, 0x00001FC
-
-gUnk_080136D8:: @ 080136D8
-	.incbin "baserom.gba", 0x0136D8, 0x0000048
-
-gUnk_08013720:: @ 08013720
-	.incbin "baserom.gba", 0x013720, 0x00000BA
-
-gUnk_080137DA:: @ 080137DA
-	.incbin "baserom.gba", 0x0137DA, 0x00000DA
-
-gUnk_080138B4:: @ 080138B4
-	.incbin "baserom.gba", 0x0138B4, 0x0000264
-
-gUnk_08013B18:: @ 08013B18
-	.incbin "baserom.gba", 0x013B18, 0x0000058
-
-gUnk_08013B70:: @ 08013B70
-	.incbin "baserom.gba", 0x013B70, 0x0000038
-
-gUnk_08013BA8:: @ 08013BA8
-	.incbin "baserom.gba", 0x013BA8, 0x0000040
-
-gUnk_08013BE8:: @ 08013BE8
-	.incbin "baserom.gba", 0x013BE8, 0x00000BC
-
-gUnk_08013CA4:: @ 08013CA4
-	.incbin "baserom.gba", 0x013CA4, 0x0000160
-
-gUnk_08013E04:: @ 08013E04
-	.incbin "baserom.gba", 0x013E04, 0x0000048
-
-gUnk_08013E4C:: @ 08013E4C
-	.incbin "baserom.gba", 0x013E4C, 0x0000024
-
-gUnk_08013E70:: @ 08013E70
-	.incbin "baserom.gba", 0x013E70, 0x0000024
-
-gUnk_08013E94:: @ 08013E94
-	.incbin "baserom.gba", 0x013E94, 0x000001C
-
-gUnk_08013EB0:: @ 08013EB0
-	.incbin "baserom.gba", 0x013EB0, 0x000001C
-
-gUnk_08013ECC:: @ 08013ECC
-	.incbin "baserom.gba", 0x013ECC, 0x000001C
-
-gUnk_08013EE8:: @ 08013EE8
-	.incbin "baserom.gba", 0x013EE8, 0x000001C
-
-gUnk_08013F04:: @ 08013F04
-	.incbin "baserom.gba", 0x013F04, 0x0000030
-
-gUnk_08013F34:: @ 08013F34
-	.incbin "baserom.gba", 0x013F34, 0x0000030
-
-gUnk_08013F64:: @ 08013F64
-	.incbin "baserom.gba", 0x013F64, 0x0000030
-
-gUnk_08013F94:: @ 08013F94
-	.incbin "baserom.gba", 0x013F94, 0x0000054
-
-gUnk_08013FE8:: @ 08013FE8
-	.incbin "baserom.gba", 0x013FE8, 0x000006C
-
-gUnk_08014054:: @ 08014054
-	.incbin "baserom.gba", 0x014054, 0x0000020
-
-gUnk_08014074:: @ 08014074
-	.incbin "baserom.gba", 0x014074, 0x0000020
-
-gUnk_08014094:: @ 08014094
-	.incbin "baserom.gba", 0x014094, 0x0000048
-
-gUnk_080140DC:: @ 080140DC
-	.incbin "baserom.gba", 0x0140DC, 0x000001C
-
-gUnk_080140F8:: @ 080140F8
-	.incbin "baserom.gba", 0x0140F8, 0x0000020
-
-gUnk_08014118:: @ 08014118
-	.incbin "baserom.gba", 0x014118, 0x000003C
-
-gUnk_08014154:: @ 08014154
-	.incbin "baserom.gba", 0x014154, 0x0000088
-
-gUnk_080141DC:: @ 080141DC
-	.incbin "baserom.gba", 0x0141DC, 0x0000034
-
-gUnk_08014210:: @ 08014210
-	.incbin "baserom.gba", 0x014210, 0x0000064
-
-gUnk_08014274:: @ 08014274
-	.incbin "baserom.gba", 0x014274, 0x000003C
-
-gUnk_080142B0:: @ 080142B0
-	.incbin "baserom.gba", 0x0142B0, 0x00000D4
-
-gUnk_08014384:: @ 08014384
-	.incbin "baserom.gba", 0x014384, 0x000003C
-
-gUnk_080143C0:: @ 080143C0
-	.incbin "baserom.gba", 0x0143C0, 0x0000042
-
-gUnk_08014402:: @ 08014402
-	.incbin "baserom.gba", 0x014402, 0x000004E
-
-gUnk_08014450:: @ 08014450
-	.incbin "baserom.gba", 0x014450, 0x00000BC
-
-gUnk_0801450C:: @ 0801450C
-	.incbin "baserom.gba", 0x01450C, 0x000003C
-
-gUnk_08014548:: @ 08014548
-	.incbin "baserom.gba", 0x014548, 0x0000058
-
-gUnk_080145A0:: @ 080145A0
-	.incbin "baserom.gba", 0x0145A0, 0x0000010
-
-gUnk_080145B0:: @ 080145B0
-	.incbin "baserom.gba", 0x0145B0, 0x0000038
-
-gUnk_080145E8:: @ 080145E8
-	.incbin "baserom.gba", 0x0145E8, 0x0000040
-
-gUnk_08014628:: @ 08014628
-	.incbin "baserom.gba", 0x014628, 0x00001DC
-
-gUnk_08014804:: @ 08014804
-	.incbin "baserom.gba", 0x014804, 0x00000EC
-
-gUnk_080148F0:: @ 080148F0
-	.incbin "baserom.gba", 0x0148F0, 0x0000068
-
-gUnk_08014958:: @ 08014958
-	.incbin "baserom.gba", 0x014958, 0x000003C
-
-gUnk_08014994:: @ 08014994
-	.incbin "baserom.gba", 0x014994, 0x0000038
-
-gUnk_080149CC:: @ 080149CC
-	.incbin "baserom.gba", 0x0149CC, 0x000005C
-
-gUnk_08014A28:: @ 08014A28
-	.incbin "baserom.gba", 0x014A28, 0x000002C
-
-gUnk_08014A54:: @ 08014A54
-	.incbin "baserom.gba", 0x014A54, 0x000002C
-
-gUnk_08014A80:: @ 08014A80
-	.incbin "baserom.gba", 0x014A80, 0x0000044
-
-gUnk_08014AC4:: @ 08014AC4
-	.incbin "baserom.gba", 0x014AC4, 0x0000070
-
-gUnk_08014B34:: @ 08014B34
-	.incbin "baserom.gba", 0x014B34, 0x00000F8
-
-gUnk_08014C2C:: @ 08014C2C
-	.incbin "baserom.gba", 0x014C2C, 0x0000068
-
-gUnk_08014C94:: @ 08014C94
-	.incbin "baserom.gba", 0x014C94, 0x0000048
-
-gUnk_08014CDC:: @ 08014CDC
-	.incbin "baserom.gba", 0x014CDC, 0x00000F0
-
-gUnk_08014DCC:: @ 08014DCC
-	.incbin "baserom.gba", 0x014DCC, 0x0000048
-
-gUnk_08014E14:: @ 08014E14
-	.incbin "baserom.gba", 0x014E14, 0x000003C
-
-gUnk_08014E50:: @ 08014E50
-	.incbin "baserom.gba", 0x014E50, 0x000007C
-
-gUnk_08014ECC:: @ 08014ECC
-	.incbin "baserom.gba", 0x014ECC, 0x000002C
-
-gUnk_08014EF8:: @ 08014EF8
-	.incbin "baserom.gba", 0x014EF8, 0x0000038
-
-gUnk_08014F30:: @ 08014F30
-	.incbin "baserom.gba", 0x014F30, 0x000008C
-
-gUnk_08014FBC:: @ 08014FBC
-	.incbin "baserom.gba", 0x014FBC, 0x0000045
-
-gUnk_08015001:: @ 08015001
-	.incbin "baserom.gba", 0x015001, 0x0000086
-
-gUnk_08015087:: @ 08015087
-	.incbin "baserom.gba", 0x015087, 0x0000068
-
-gUnk_080150EF:: @ 080150EF
-	.incbin "baserom.gba", 0x0150EF, 0x0000145
-
-gUnk_08015234:: @ 08015234
-	.incbin "baserom.gba", 0x015234, 0x0000080
-
-gUnk_080152B4:: @ 080152B4
-	.incbin "baserom.gba", 0x0152B4, 0x00000DC
-
-gUnk_08015390:: @ 08015390
-	.incbin "baserom.gba", 0x015390, 0x000005C
-
-gUnk_080153EC:: @ 080153EC
-	.incbin "baserom.gba", 0x0153EC, 0x0000120
-
-gUnk_0801550C:: @ 0801550C
-	.incbin "baserom.gba", 0x01550C, 0x000010C
-
-gUnk_08015618:: @ 08015618
-	.incbin "baserom.gba", 0x015618, 0x000006C
-
-gUnk_08015684:: @ 08015684
-	.incbin "baserom.gba", 0x015684, 0x000001C
-
-gUnk_080156A0:: @ 080156A0
-	.incbin "baserom.gba", 0x0156A0, 0x00000B4
-
-gUnk_08015754:: @ 08015754
-	.incbin "baserom.gba", 0x015754, 0x0000058
-
-gUnk_080157AC:: @ 080157AC
-	.incbin "baserom.gba", 0x0157AC, 0x000014C
-
-gUnk_080158F8:: @ 080158F8
-	.incbin "baserom.gba", 0x0158F8, 0x0000040
-
-gUnk_08015938:: @ 08015938
-	.incbin "baserom.gba", 0x015938, 0x0000020
-
-gUnk_08015958:: @ 08015958
-	.incbin "baserom.gba", 0x015958, 0x000016C
-
-gUnk_08015AC4:: @ 08015AC4
-	.incbin "baserom.gba", 0x015AC4, 0x0000050
-
-gUnk_08015B14:: @ 08015B14
-	.incbin "baserom.gba", 0x015B14, 0x0000020
-
-gUnk_08015B34:: @ 08015B34
-	.incbin "baserom.gba", 0x015B34, 0x0000050
-
-gUnk_08015B84:: @ 08015B84
-	.incbin "baserom.gba", 0x015B84, 0x0000024
-
-gUnk_08015BA8:: @ 08015BA8
-	.incbin "baserom.gba", 0x015BA8, 0x0000040
-
-gUnk_08015BE8:: @ 08015BE8
-	.incbin "baserom.gba", 0x015BE8, 0x00000EC
-
-gUnk_08015CD4:: @ 08015CD4
-	.incbin "baserom.gba", 0x015CD4, 0x000011C
-
-gUnk_08015DF0:: @ 08015DF0
-	.incbin "baserom.gba", 0x015DF0, 0x0000068
-
-gUnk_08015E58:: @ 08015E58
-	.incbin "baserom.gba", 0x015E58, 0x00000B0
-
-gUnk_08015F08:: @ 08015F08
-	.incbin "baserom.gba", 0x015F08, 0x0000034
-
-gUnk_08015F3C:: @ 08015F3C
-	.incbin "baserom.gba", 0x015F3C, 0x0000068
-
-gUnk_08015FA4:: @ 08015FA4
-	.incbin "baserom.gba", 0x015FA4, 0x000001C
-
-gUnk_08015FC0:: @ 08015FC0
-	.incbin "baserom.gba", 0x015FC0, 0x0000061
-
-gUnk_08016021:: @ 08016021
-	.incbin "baserom.gba", 0x016021, 0x000000F
 
diff --git a/asm/code_08012AB0.s b/asm/code_08012AB0.s
new file mode 100644
index 00000000..cbe339f3
--- /dev/null
+++ b/asm/code_08012AB0.s
@@ -0,0 +1,384 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+gUnk_08012AB0:: @ 08012AB0
+	.incbin "baserom.gba", 0x012AB0, 0x00000F8
+
+gUnk_08012BA8:: @ 08012BA8
+	.incbin "baserom.gba", 0x012BA8, 0x0000050
+
+gUnk_08012BF8:: @ 08012BF8
+	.incbin "baserom.gba", 0x012BF8, 0x0000014
+
+gUnk_08012C0C:: @ 08012C0C
+	.incbin "baserom.gba", 0x012C0C, 0x000003C
+
+gUnk_08012C48:: @ 08012C48
+	.incbin "baserom.gba", 0x012C48, 0x0000050
+
+gUnk_08012C98:: @ 08012C98
+	.incbin "baserom.gba", 0x012C98, 0x0000040
+
+gUnk_08012CD8:: @ 08012CD8
+	.incbin "baserom.gba", 0x012CD8, 0x0000040
+
+gUnk_08012D18:: @ 08012D18
+	.incbin "baserom.gba", 0x012D18, 0x0000058
+
+gUnk_08012D70:: @ 08012D70
+	.incbin "baserom.gba", 0x012D70, 0x0000031
+
+gUnk_08012DA1:: @ 08012DA1
+	.incbin "baserom.gba", 0x012DA1, 0x000000F
+
+gUnk_08012DB0:: @ 08012DB0
+	.incbin "baserom.gba", 0x012DB0, 0x0000028
+
+gUnk_08012DD8:: @ 08012DD8
+	.incbin "baserom.gba", 0x012DD8, 0x0000048
+
+gUnk_08012E20:: @ 08012E20
+	.incbin "baserom.gba", 0x012E20, 0x0000024
+
+gUnk_08012E44:: @ 08012E44
+	.incbin "baserom.gba", 0x012E44, 0x0000044
+
+gUnk_08012E88:: @ 08012E88
+	.incbin "baserom.gba", 0x012E88, 0x0000038
+
+gUnk_08012EC0:: @ 08012EC0
+	.incbin "baserom.gba", 0x012EC0, 0x000004C
+
+gUnk_08012F0C:: @ 08012F0C
+	.incbin "baserom.gba", 0x012F0C, 0x00000F5
+
+gUnk_08013001:: @ 08013001
+	.incbin "baserom.gba", 0x013001, 0x0000002
+
+gUnk_08013003:: @ 08013003
+	.incbin "baserom.gba", 0x013003, 0x0000008
+
+gUnk_0801300B:: @ 0801300B
+	.incbin "baserom.gba", 0x01300B, 0x0000031
+
+gUnk_0801303C:: @ 0801303C
+	.incbin "baserom.gba", 0x01303C, 0x0000034
+
+gUnk_08013070:: @ 08013070
+	.incbin "baserom.gba", 0x013070, 0x0000011
+
+gUnk_08013081:: @ 08013081
+	.incbin "baserom.gba", 0x013081, 0x000000F
+
+gUnk_08013090:: @ 08013090
+	.incbin "baserom.gba", 0x013090, 0x0000084
+
+gUnk_08013114:: @ 08013114
+	.incbin "baserom.gba", 0x013114, 0x0000074
+
+gUnk_08013188:: @ 08013188
+	.incbin "baserom.gba", 0x013188, 0x0000024
+
+gUnk_080131AC:: @ 080131AC
+	.incbin "baserom.gba", 0x0131AC, 0x0000138
+
+gUnk_080132E4:: @ 080132E4
+	.incbin "baserom.gba", 0x0132E4, 0x000004C
+
+gUnk_08013330:: @ 08013330
+	.incbin "baserom.gba", 0x013330, 0x000001C
+
+gUnk_0801334C:: @ 0801334C
+	.incbin "baserom.gba", 0x01334C, 0x000002C
+
+gUnk_08013378:: @ 08013378
+	.incbin "baserom.gba", 0x013378, 0x000004C
+
+gUnk_080133C4:: @ 080133C4
+	.incbin "baserom.gba", 0x0133C4, 0x0000034
+
+gUnk_080133F8:: @ 080133F8
+	.incbin "baserom.gba", 0x0133F8, 0x00000E4
+
+gUnk_080134DC:: @ 080134DC
+	.incbin "baserom.gba", 0x0134DC, 0x00001FC
+
+gUnk_080136D8:: @ 080136D8
+	.incbin "baserom.gba", 0x0136D8, 0x0000048
+
+gUnk_08013720:: @ 08013720
+	.incbin "baserom.gba", 0x013720, 0x00000BA
+
+gUnk_080137DA:: @ 080137DA
+	.incbin "baserom.gba", 0x0137DA, 0x00000DA
+
+gUnk_080138B4:: @ 080138B4
+	.incbin "baserom.gba", 0x0138B4, 0x0000264
+
+gUnk_08013B18:: @ 08013B18
+	.incbin "baserom.gba", 0x013B18, 0x0000058
+
+gUnk_08013B70:: @ 08013B70
+	.incbin "baserom.gba", 0x013B70, 0x0000038
+
+gUnk_08013BA8:: @ 08013BA8
+	.incbin "baserom.gba", 0x013BA8, 0x0000040
+
+gUnk_08013BE8:: @ 08013BE8
+	.incbin "baserom.gba", 0x013BE8, 0x00000BC
+
+gUnk_08013CA4:: @ 08013CA4
+	.incbin "baserom.gba", 0x013CA4, 0x0000160
+
+gUnk_08013E04:: @ 08013E04
+	.incbin "baserom.gba", 0x013E04, 0x0000048
+
+gUnk_08013E4C:: @ 08013E4C
+	.incbin "baserom.gba", 0x013E4C, 0x0000024
+
+gUnk_08013E70:: @ 08013E70
+	.incbin "baserom.gba", 0x013E70, 0x0000024
+
+gUnk_08013E94:: @ 08013E94
+	.incbin "baserom.gba", 0x013E94, 0x000001C
+
+gUnk_08013EB0:: @ 08013EB0
+	.incbin "baserom.gba", 0x013EB0, 0x000001C
+
+gUnk_08013ECC:: @ 08013ECC
+	.incbin "baserom.gba", 0x013ECC, 0x000001C
+
+gUnk_08013EE8:: @ 08013EE8
+	.incbin "baserom.gba", 0x013EE8, 0x000001C
+
+gUnk_08013F04:: @ 08013F04
+	.incbin "baserom.gba", 0x013F04, 0x0000030
+
+gUnk_08013F34:: @ 08013F34
+	.incbin "baserom.gba", 0x013F34, 0x0000030
+
+gUnk_08013F64:: @ 08013F64
+	.incbin "baserom.gba", 0x013F64, 0x0000030
+
+gUnk_08013F94:: @ 08013F94
+	.incbin "baserom.gba", 0x013F94, 0x0000054
+
+gUnk_08013FE8:: @ 08013FE8
+	.incbin "baserom.gba", 0x013FE8, 0x000006C
+
+gUnk_08014054:: @ 08014054
+	.incbin "baserom.gba", 0x014054, 0x0000020
+
+gUnk_08014074:: @ 08014074
+	.incbin "baserom.gba", 0x014074, 0x0000020
+
+gUnk_08014094:: @ 08014094
+	.incbin "baserom.gba", 0x014094, 0x0000048
+
+gUnk_080140DC:: @ 080140DC
+	.incbin "baserom.gba", 0x0140DC, 0x000001C
+
+gUnk_080140F8:: @ 080140F8
+	.incbin "baserom.gba", 0x0140F8, 0x0000020
+
+gUnk_08014118:: @ 08014118
+	.incbin "baserom.gba", 0x014118, 0x000003C
+
+gUnk_08014154:: @ 08014154
+	.incbin "baserom.gba", 0x014154, 0x0000088
+
+gUnk_080141DC:: @ 080141DC
+	.incbin "baserom.gba", 0x0141DC, 0x0000034
+
+gUnk_08014210:: @ 08014210
+	.incbin "baserom.gba", 0x014210, 0x0000064
+
+gUnk_08014274:: @ 08014274
+	.incbin "baserom.gba", 0x014274, 0x000003C
+
+gUnk_080142B0:: @ 080142B0
+	.incbin "baserom.gba", 0x0142B0, 0x00000D4
+
+gUnk_08014384:: @ 08014384
+	.incbin "baserom.gba", 0x014384, 0x000003C
+
+gUnk_080143C0:: @ 080143C0
+	.incbin "baserom.gba", 0x0143C0, 0x0000042
+
+gUnk_08014402:: @ 08014402
+	.incbin "baserom.gba", 0x014402, 0x000004E
+
+gUnk_08014450:: @ 08014450
+	.incbin "baserom.gba", 0x014450, 0x00000BC
+
+gUnk_0801450C:: @ 0801450C
+	.incbin "baserom.gba", 0x01450C, 0x000003C
+
+gUnk_08014548:: @ 08014548
+	.incbin "baserom.gba", 0x014548, 0x0000058
+
+gUnk_080145A0:: @ 080145A0
+	.incbin "baserom.gba", 0x0145A0, 0x0000010
+
+gUnk_080145B0:: @ 080145B0
+	.incbin "baserom.gba", 0x0145B0, 0x0000038
+
+gUnk_080145E8:: @ 080145E8
+	.incbin "baserom.gba", 0x0145E8, 0x0000040
+
+gUnk_08014628:: @ 08014628
+	.incbin "baserom.gba", 0x014628, 0x00001DC
+
+gUnk_08014804:: @ 08014804
+	.incbin "baserom.gba", 0x014804, 0x00000EC
+
+gUnk_080148F0:: @ 080148F0
+	.incbin "baserom.gba", 0x0148F0, 0x0000068
+
+gUnk_08014958:: @ 08014958
+	.incbin "baserom.gba", 0x014958, 0x000003C
+
+gUnk_08014994:: @ 08014994
+	.incbin "baserom.gba", 0x014994, 0x0000038
+
+gUnk_080149CC:: @ 080149CC
+	.incbin "baserom.gba", 0x0149CC, 0x000005C
+
+gUnk_08014A28:: @ 08014A28
+	.incbin "baserom.gba", 0x014A28, 0x000002C
+
+gUnk_08014A54:: @ 08014A54
+	.incbin "baserom.gba", 0x014A54, 0x000002C
+
+gUnk_08014A80:: @ 08014A80
+	.incbin "baserom.gba", 0x014A80, 0x0000044
+
+gUnk_08014AC4:: @ 08014AC4
+	.incbin "baserom.gba", 0x014AC4, 0x0000070
+
+gUnk_08014B34:: @ 08014B34
+	.incbin "baserom.gba", 0x014B34, 0x00000F8
+
+gUnk_08014C2C:: @ 08014C2C
+	.incbin "baserom.gba", 0x014C2C, 0x0000068
+
+gUnk_08014C94:: @ 08014C94
+	.incbin "baserom.gba", 0x014C94, 0x0000048
+
+gUnk_08014CDC:: @ 08014CDC
+	.incbin "baserom.gba", 0x014CDC, 0x00000F0
+
+gUnk_08014DCC:: @ 08014DCC
+	.incbin "baserom.gba", 0x014DCC, 0x0000048
+
+gUnk_08014E14:: @ 08014E14
+	.incbin "baserom.gba", 0x014E14, 0x000003C
+
+gUnk_08014E50:: @ 08014E50
+	.incbin "baserom.gba", 0x014E50, 0x000007C
+
+gUnk_08014ECC:: @ 08014ECC
+	.incbin "baserom.gba", 0x014ECC, 0x000002C
+
+gUnk_08014EF8:: @ 08014EF8
+	.incbin "baserom.gba", 0x014EF8, 0x0000038
+
+gUnk_08014F30:: @ 08014F30
+	.incbin "baserom.gba", 0x014F30, 0x000008C
+
+gUnk_08014FBC:: @ 08014FBC
+	.incbin "baserom.gba", 0x014FBC, 0x0000045
+
+gUnk_08015001:: @ 08015001
+	.incbin "baserom.gba", 0x015001, 0x0000086
+
+gUnk_08015087:: @ 08015087
+	.incbin "baserom.gba", 0x015087, 0x0000068
+
+gUnk_080150EF:: @ 080150EF
+	.incbin "baserom.gba", 0x0150EF, 0x0000145
+
+gUnk_08015234:: @ 08015234
+	.incbin "baserom.gba", 0x015234, 0x0000080
+
+gUnk_080152B4:: @ 080152B4
+	.incbin "baserom.gba", 0x0152B4, 0x00000DC
+
+gUnk_08015390:: @ 08015390
+	.incbin "baserom.gba", 0x015390, 0x000005C
+
+gUnk_080153EC:: @ 080153EC
+	.incbin "baserom.gba", 0x0153EC, 0x0000120
+
+gUnk_0801550C:: @ 0801550C
+	.incbin "baserom.gba", 0x01550C, 0x000010C
+
+gUnk_08015618:: @ 08015618
+	.incbin "baserom.gba", 0x015618, 0x000006C
+
+gUnk_08015684:: @ 08015684
+	.incbin "baserom.gba", 0x015684, 0x000001C
+
+gUnk_080156A0:: @ 080156A0
+	.incbin "baserom.gba", 0x0156A0, 0x00000B4
+
+gUnk_08015754:: @ 08015754
+	.incbin "baserom.gba", 0x015754, 0x0000058
+
+gUnk_080157AC:: @ 080157AC
+	.incbin "baserom.gba", 0x0157AC, 0x000014C
+
+gUnk_080158F8:: @ 080158F8
+	.incbin "baserom.gba", 0x0158F8, 0x0000040
+
+gUnk_08015938:: @ 08015938
+	.incbin "baserom.gba", 0x015938, 0x0000020
+
+gUnk_08015958:: @ 08015958
+	.incbin "baserom.gba", 0x015958, 0x000016C
+
+gUnk_08015AC4:: @ 08015AC4
+	.incbin "baserom.gba", 0x015AC4, 0x0000050
+
+gUnk_08015B14:: @ 08015B14
+	.incbin "baserom.gba", 0x015B14, 0x0000020
+
+gUnk_08015B34:: @ 08015B34
+	.incbin "baserom.gba", 0x015B34, 0x0000050
+
+gUnk_08015B84:: @ 08015B84
+	.incbin "baserom.gba", 0x015B84, 0x0000024
+
+gUnk_08015BA8:: @ 08015BA8
+	.incbin "baserom.gba", 0x015BA8, 0x0000040
+
+gUnk_08015BE8:: @ 08015BE8
+	.incbin "baserom.gba", 0x015BE8, 0x00000EC
+
+gUnk_08015CD4:: @ 08015CD4
+	.incbin "baserom.gba", 0x015CD4, 0x000011C
+
+gUnk_08015DF0:: @ 08015DF0
+	.incbin "baserom.gba", 0x015DF0, 0x0000068
+
+gUnk_08015E58:: @ 08015E58
+	.incbin "baserom.gba", 0x015E58, 0x00000B0
+
+gUnk_08015F08:: @ 08015F08
+	.incbin "baserom.gba", 0x015F08, 0x0000034
+
+gUnk_08015F3C:: @ 08015F3C
+	.incbin "baserom.gba", 0x015F3C, 0x0000068
+
+gUnk_08015FA4:: @ 08015FA4
+	.incbin "baserom.gba", 0x015FA4, 0x000001C
+
+gUnk_08015FC0:: @ 08015FC0
+	.incbin "baserom.gba", 0x015FC0, 0x0000061
+
+gUnk_08016021:: @ 08016021
+	.incbin "baserom.gba", 0x016021, 0x000000F
+
diff --git a/asm/code_rest.s b/asm/code_0801606C.s
similarity index 100%
rename from asm/code_rest.s
rename to asm/code_0801606C.s
diff --git a/linker.ld b/linker.ld
index 29fd6003..a91e8495 100644
--- a/linker.ld
+++ b/linker.ld
@@ -295,8 +295,10 @@ SECTIONS {
         asm/code_080043E8.o(.text);
         data/data_08007DF4.o(.rodata);
         asm/code_0800857C.o(.text);
+        src/scripts/ezlo_angry.o(.rodata);
+        asm/code_08012AB0.o(.text);
         src/scripts/npc4e_fusion.o(.rodata);
-        asm/code_rest.o(.text);
+        asm/code_0801606C.o(.text);
         asm/sub_08016AE4.o(.text);
 
 
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index 201c0e4e..8b959949 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -52,7 +52,7 @@ typedef struct {
     u8 unk_20[2];
     u16 field_22;
 } paramStruct;
-
+// This is a ScriptExecutionContext TODO
 void sub_0806D8A0(Entity* this, paramStruct* param_2) {
     s32 xOffset;
     s32 yOffset;
diff --git a/src/script.c b/src/script.c
index 6d136b5a..bef65e05 100644
--- a/src/script.c
+++ b/src/script.c
@@ -647,6 +647,7 @@ void sub_0807E014(Entity* unk1, ScriptExecutionContext* unk2) {
     gUnk_02033280.continueScriptExecutionFlags &= ~2;
 }
 
+// Jump by offset
 void sub_0807E024(Entity* unk1, ScriptExecutionContext* unk2) {
     s16 tmp;
     // get metadata -> tmp
@@ -677,6 +678,7 @@ void sub_0807E078(Entity* unk1, ScriptExecutionContext* unk2) {
     }
 }
 
+// repoint the execution somewhere else
 void sub_0807E0A0(Entity* unk1, ScriptExecutionContext* unk2) {
     unk2->unk_00.raw = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
     gUnk_02033280.unk_06 = 0;
@@ -1483,10 +1485,12 @@ void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) {
     gUnk_02033280.unk_06 = 0;
 }
 
+// set one bit in unk_08
 void sub_0807EF80(Entity* unk1, ScriptExecutionContext* unk2) {
     unk2->unk_08 |= 1 << unk2->unk_00.raw[1];
 }
 
+// set one bit in unk_08
 void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) {
     unk2->unk_08 |= 1 << unk2->unk_00.raw[1];
 }
diff --git a/src/scripts/ezlo_angry.c b/src/scripts/ezlo_angry.c
new file mode 100644
index 00000000..38cb04b0
--- /dev/null
+++ b/src/scripts/ezlo_angry.c
@@ -0,0 +1,14 @@
+#define START_SCRIPT(name) const unsigned short name[] = {
+#define END_SCRIPT() \
+    }                \
+    ;
+
+/*const unsigned char test[] = {
+     0x01, 0x04, 0x67, 0x08, 0x40, 0x00, 0x79, 0x08, 0x07, 0x00, 0x02, 0x04, 0x50, 0x08, 0x20, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x02, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x03, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x11, 0x00, 0x50, 0x08, 0x1c, 0x00, 0x5c, 0x0c, 0x05, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x06, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x07, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x08, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x09, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x15, 0x08, 0x00, 0x00, 0x04, 0x08, 0x28, 0x00, 0x18, 0x04, 0x05, 0x08, 0xf0, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x14, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x44, 0x04, 0x03, 0x08, 0xd0, 0xff, 0x43, 0x04, 0x54, 0x04, 0x0c, 0x14, 0xb1, 0xf5, 0x07, 0x08, 0x3c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0xd1, 0x91, 0x07, 0x08, 0x02, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x0b, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0a, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0b, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0c, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0d, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0e, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x10, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0f, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x10, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x50, 0x08, 0x18, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x7e, 0x04, 0x79, 0x08, 0x0b, 0x00, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x11, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0xa1, 0xd8, 0x06, 0x08, 0x75, 0x04, 0x05, 0x08, 0xfc, 0xff, 0x50, 0x08, 0x1f, 0x00, 0x59, 0x04, 0x47, 0x0c, 0x18, 0x2b, 0x01, 0x08, 0x0b, 0x0c, 0xa5, 0xd9, 0x06, 0x08, 0x79, 0x08, 0x08, 0x00, 0x31, 0x08, 0x78, 0x00, 0x7c, 0x08, 0x0e, 0x00, 0x01, 0x04, 0x4b, 0x04, 0x5f, 0x08, 0x12, 0x11, 0x02, 0x04, 0x59, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x79, 0x08, 0x06, 0x00, 0xff, 0xff 
+};*/
+
+// clang-format off
+START_SCRIPT(gUnk_080126FC)
+0x0401, 0x0867, 0x0040, 0x0879, 0x0007, 0x0402, 0x0850, 0x0020, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1102, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1103, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0011, 0x0850, 0x001c, 0x0c5c, 0x1105, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1106, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1107, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1108, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1109, 0x000c, 0x0459, 0x0850, 0x0020, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0402, 0x0401, 0x0815, 0x0000, 0x0804, 0x0028, 0x0418, 0x0805, 0xfff0, 0x0402, 0x0443, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1114, 0x000c, 0x0459, 0x0850, 0x0020, 0x0444, 0x0803, 0xffd0, 0x0443, 0x0454, 0x140c, 0xf5b1, 0x0807, 0x003c, 0x0000, 0x0c0b, 0x91d1, 0x0807, 0x0402, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x000b, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110a, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110b, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0850, 0x0010, 0x0c5c, 0x110c, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110d, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110e, 0x000c, 0x0459, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0010, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110f, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1110, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0850, 0x0018, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x047e, 0x0879, 0x000b, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1111, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd8a1, 0x0806, 0x0475, 0x0805, 0xfffc, 0x0850, 0x001f, 0x0459, 0x0c47, 0x2b18, 0x0801, 0x0c0b, 0xd9a5, 0x0806, 0x0879, 0x0008, 0x0831, 0x0078, 0x087c, 0x000e, 0x0401, 0x044b, 0x085f, 0x1112, 0x0402, 0x0459, 0x0c28, 0x0008, 0x0000, 0x0879, 0x0006, 0xffff
+END_SCRIPT()
+    // clang-format on
\ No newline at end of file
diff --git a/src/scripts/npc4e_fusion.c b/src/scripts/npc4e_fusion.c
index ad010b1c..ad07d84e 100644
--- a/src/scripts/npc4e_fusion.c
+++ b/src/scripts/npc4e_fusion.c
@@ -1,33 +1,35 @@
 // macro helpers
-#define WORD_TO_SHORTS(word, b) word, b
+#define WORD_TO_SHORTS(word) (unsigned short)word & 0x00ff,(unsigned short)word >> 16,
 
 // script commands
 #define START_EXECUTING_SCRIPTS() 0x0401,
 #define STOP_EXECUTING_SCRIPTS() 0x0402,
 #define CHECK_KINSTONE_FUSED(id) 0x081d, id,
 #define JUMP_IF_TRUE(offset) 0x0804, offset,
-#define sub_0807E6AC(word, b) 0x0c33, WORD_TO_SHORTS(word, b),
+#define sub_0807E6AC(word) 0x0c33, WORD_TO_SHORTS(word)
 #define sub_0807EF80(param) 0x0879, param,
 #define sub_0807E680(param) 0x0831, param,
 #define sub_0807EBC0(param) 0x0867, param,
 #define sub_0807ECF4(param) 0x0871, param,
 #define sub_0807E680(param) 0x0831, param,
 #define sub_0807EF80(param) 0x0879, param,
-#define sub_0807E5F8(a, b) 0x0c28, a, b,
+#define sub_0807E5F8(word) 0x0c28, WORD_TO_SHORTS(word)
+
+
 const unsigned short gUnk_08016030[] = {
     // clang-format off
     START_EXECUTING_SCRIPTS()
     CHECK_KINSTONE_FUSED(9)
     JUMP_IF_TRUE(0x2a)
     STOP_EXECUTING_SCRIPTS()
-    sub_0807E6AC(0x0001,0x0000)
+    sub_0807E6AC(0x00000001)
     sub_0807EF80(0x0010)
     sub_0807E680(0x003c)
     sub_0807EBC0(0x0020)
     sub_0807ECF4(0x0080)
     sub_0807E680(0x001e)
     sub_0807EF80(0x0010)
-    sub_0807E5F8(0x0008, 0x0000)
+    sub_0807E5F8(0x0000008)
     // clang-format on
     0xffff,
     0x0c6a,

From 3336b91812c09255e307a9f66dd1ae30aabe027f Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 15:47:07 +0100
Subject: [PATCH 04/46] Add first draft for a script disassembler

---
 include/scriptMacros.h                        |  54 +++
 src/scripts/ezlo_angry.c                      | 381 +++++++++++++++++-
 .../script_disassembler.py                    | 306 ++++++++++++++
 3 files changed, 734 insertions(+), 7 deletions(-)
 create mode 100644 include/scriptMacros.h
 create mode 100644 tools/script_disassembler/script_disassembler.py

diff --git a/include/scriptMacros.h b/include/scriptMacros.h
new file mode 100644
index 00000000..0663059d
--- /dev/null
+++ b/include/scriptMacros.h
@@ -0,0 +1,54 @@
+#ifndef SCRIPT_MACROS_H
+#define SCRIPT_MACROS_H
+
+// Generated by disassemble_script.py
+#define START_SCRIPT(name) const unsigned short name[] = {
+#define END_SCRIPT() };
+#define WORD_TO_SHORTS(word) (unsigned short)(word & 0xffff),(unsigned short)(word >> 16)
+
+#define nullsub_507() 0x0400, 
+#define sub_0807E004() 0x0401, 
+#define sub_0807E014() 0x0402, 
+#define sub_0807E024(s) 0x0803, s,
+#define sub_0807E050(s) 0x0804, s,
+#define sub_0807E064(s) 0x0805, s,
+#define sub_0807E078(s) 0x0806, s,
+#define sub_0807E0A0(w) 0x0c07, WORD_TO_SHORTS(w),
+#define sub_0807E0B8(w) 0x0c08, WORD_TO_SHORTS(w),
+#define sub_0807E0CC(w) 0x0c09, WORD_TO_SHORTS(w),
+#define sub_0807E0E0(w) 0x0c0a, WORD_TO_SHORTS(w),
+#define sub_0807E10C(w) 0x0c0b, WORD_TO_SHORTS(w),
+#define sub_0807E124(a,b) 0x140c, WORD_TO_SHORTS(a), WORD_TO_SHORTS(b),
+#define sub_0807E148(w) 0x0c0d, WORD_TO_SHORTS(w),
+#define sub_0807E158(w) 0x0c0e, WORD_TO_SHORTS(w),
+#define sub_0807E188(s) 0x080f, s,
+#define sub_0807E1D8(s) 0x0810, s,
+#define sub_0807E4AC(s) 0x0811, s,
+#define sub_0807E260(s) 0x0815, s,
+#define sub_0807E2A8(s) 0x0817, s,
+#define sub_0807E2E4() 0x0418, 
+#define sub_0807E5F8(w) 0x0c28, WORD_TO_SHORTS(w),
+#define sub_0807E680(s) 0x0831, s,
+#define sub_0807E6AC(w) 0x0c33, WORD_TO_SHORTS(w),
+#define sub_0807E864() 0x0443, 
+#define sub_0807E878() 0x0444, 
+#define sub_0807E8C4(w) 0x0c47, WORD_TO_SHORTS(w),
+#define sub_0807E8E4() 0x0449, 
+#define sub_0807E8E4a() 0x044a, 
+#define sub_0807E8E4b() 0x044b, 
+#define sub_0807E8E4c() 0x044c, 
+#define sub_0807E930(s) 0x0850, s,
+#define sub_0807E9D4() 0x0453, 
+#define sub_0807E9DC() 0x0454, 
+#define sub_0807EA94() 0x0459, 
+#define sub_0807EAD0(a,b) 0x0c5c, a,b,
+#define sub_0807EB28(s) 0x085f, s,
+#define sub_0807EB8C() 0x0464, 
+#define sub_0807EBC0(s) 0x0867, s,
+#define sub_0807EC1C(s) 0x086d, s,
+#define sub_0807EE30() 0x0475, 
+#define sub_0807EF80(s) 0x0879, s,
+#define sub_0807EFAC(s) 0x087c, s,
+#define sub_0807EFE4() 0x047e, 
+
+#endif
diff --git a/src/scripts/ezlo_angry.c b/src/scripts/ezlo_angry.c
index 38cb04b0..b841a754 100644
--- a/src/scripts/ezlo_angry.c
+++ b/src/scripts/ezlo_angry.c
@@ -1,14 +1,381 @@
-#define START_SCRIPT(name) const unsigned short name[] = {
-#define END_SCRIPT() \
-    }                \
-    ;
+#include "scriptMacros.h"
+#include "functions.h"
 
 /*const unsigned char test[] = {
      0x01, 0x04, 0x67, 0x08, 0x40, 0x00, 0x79, 0x08, 0x07, 0x00, 0x02, 0x04, 0x50, 0x08, 0x20, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x02, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x03, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x11, 0x00, 0x50, 0x08, 0x1c, 0x00, 0x5c, 0x0c, 0x05, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x06, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x07, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x08, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x09, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x15, 0x08, 0x00, 0x00, 0x04, 0x08, 0x28, 0x00, 0x18, 0x04, 0x05, 0x08, 0xf0, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x14, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x44, 0x04, 0x03, 0x08, 0xd0, 0xff, 0x43, 0x04, 0x54, 0x04, 0x0c, 0x14, 0xb1, 0xf5, 0x07, 0x08, 0x3c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0xd1, 0x91, 0x07, 0x08, 0x02, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x0b, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0a, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0b, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0c, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0d, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0e, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x10, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0f, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x10, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x50, 0x08, 0x18, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x7e, 0x04, 0x79, 0x08, 0x0b, 0x00, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x11, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0xa1, 0xd8, 0x06, 0x08, 0x75, 0x04, 0x05, 0x08, 0xfc, 0xff, 0x50, 0x08, 0x1f, 0x00, 0x59, 0x04, 0x47, 0x0c, 0x18, 0x2b, 0x01, 0x08, 0x0b, 0x0c, 0xa5, 0xd9, 0x06, 0x08, 0x79, 0x08, 0x08, 0x00, 0x31, 0x08, 0x78, 0x00, 0x7c, 0x08, 0x0e, 0x00, 0x01, 0x04, 0x4b, 0x04, 0x5f, 0x08, 0x12, 0x11, 0x02, 0x04, 0x59, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x79, 0x08, 0x06, 0x00, 0xff, 0xff 
 };*/
 
 // clang-format off
+extern void sub_0807F3C8();
+
 START_SCRIPT(gUnk_080126FC)
-0x0401, 0x0867, 0x0040, 0x0879, 0x0007, 0x0402, 0x0850, 0x0020, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1102, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1103, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0011, 0x0850, 0x001c, 0x0c5c, 0x1105, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1106, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1107, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1108, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1109, 0x000c, 0x0459, 0x0850, 0x0020, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0402, 0x0401, 0x0815, 0x0000, 0x0804, 0x0028, 0x0418, 0x0805, 0xfff0, 0x0402, 0x0443, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1114, 0x000c, 0x0459, 0x0850, 0x0020, 0x0444, 0x0803, 0xffd0, 0x0443, 0x0454, 0x140c, 0xf5b1, 0x0807, 0x003c, 0x0000, 0x0c0b, 0x91d1, 0x0807, 0x0402, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x000b, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110a, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110b, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0850, 0x0010, 0x0c5c, 0x110c, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110d, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110e, 0x000c, 0x0459, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0010, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110f, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1110, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0850, 0x0018, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x047e, 0x0879, 0x000b, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1111, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd8a1, 0x0806, 0x0475, 0x0805, 0xfffc, 0x0850, 0x001f, 0x0459, 0x0c47, 0x2b18, 0x0801, 0x0c0b, 0xd9a5, 0x0806, 0x0879, 0x0008, 0x0831, 0x0078, 0x087c, 0x000e, 0x0401, 0x044b, 0x085f, 0x1112, 0x0402, 0x0459, 0x0c28, 0x0008, 0x0000, 0x0879, 0x0006, 0xffff
-END_SCRIPT()
-    // clang-format on
\ No newline at end of file
+//0x0401, 0x0867, 0x0040, 0x0879, 0x0007, 0x0402, 0x0850, 0x0020, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1102, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1103, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0011, 0x0850, 0x001c, 0x0c5c, 0x1105, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1106, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1107, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1108, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1109, 0x000c, 0x0459, 0x0850, 0x0020, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0402, 0x0401, 0x0815, 0x0000, 0x0804, 0x0028, 0x0418, 0x0805, 0xfff0, 0x0402, 0x0443, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1114, 0x000c, 0x0459, 0x0850, 0x0020, 0x0444, 0x0803, 0xffd0, 0x0443, 0x0454, 0x140c, 0xf5b1, 0x0807, 0x003c, 0x0000, 0x0c0b, 0x91d1, 0x0807, 0x0402, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x000b, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110a, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110b, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0850, 0x0010, 0x0c5c, 0x110c, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110d, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110e, 0x000c, 0x0459, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0010, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110f, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1110, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0850, 0x0018, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x047e, 0x0879, 0x000b, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1111, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd8a1, 0x0806, 0x0475, 0x0805, 0xfffc, 0x0850, 0x001f, 0x0459, 0x0c47, 0x2b18, 0x0801, 0x0c0b, 0xd9a5, 0x0806, 0x0879, 0x0008, 0x0831, 0x0078, 0x087c, 0x000e, 0x0401, 0x044b, 0x085f, 0x1112, 0x0402, 0x0459, 0x0c28, 0x0008, 0x0000, 0x0879, 0x0006, 0xffff
+sub_0807E004()
+sub_0807EBC0(0x0040)
+sub_0807EF80(0x0007)
+sub_0807E014()
+sub_0807E930(0x0020)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0022)
+sub_0807E10C((unsigned int)(void (* const)()) sub_0807F3C8)
+END_SCRIPT() 
+//const void (*const TEST2)() = (const void (*const)())sub_0807F3C8;
+
+//void (*const TEST[])() = {
+    //(void (*const)()) sub_0807F3C8
+//};
+//
+
+//
+const unsigned char test[] = {
+     0x5c, 0x0c, 0x02, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x03, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x11, 0x00, 0x50, 0x08, 0x1c, 0x00, 0x5c, 0x0c, 0x05, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x06, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x07, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x08, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x09, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x15, 0x08, 0x00, 0x00, 0x04, 0x08, 0x28, 0x00, 0x18, 0x04, 0x05, 0x08, 0xf0, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x14, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x44, 0x04, 0x03, 0x08, 0xd0, 0xff, 0x43, 0x04, 0x54, 0x04, 0x0c, 0x14, 0xb1, 0xf5, 0x07, 0x08, 0x3c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0xd1, 0x91, 0x07, 0x08, 0x02, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x0b, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0a, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0b, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0c, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0d, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0e, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x10, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0f, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x10, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x50, 0x08, 0x18, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x7e, 0x04, 0x79, 0x08, 0x0b, 0x00, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x11, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0xa1, 0xd8, 0x06, 0x08, 0x75, 0x04, 0x05, 0x08, 0xfc, 0xff, 0x50, 0x08, 0x1f, 0x00, 0x59, 0x04, 0x47, 0x0c, 0x18, 0x2b, 0x01, 0x08, 0x0b, 0x0c, 0xa5, 0xd9, 0x06, 0x08, 0x79, 0x08, 0x08, 0x00, 0x31, 0x08, 0x78, 0x00, 0x7c, 0x08, 0x0e, 0x00, 0x01, 0x04, 0x4b, 0x04, 0x5f, 0x08, 0x12, 0x11, 0x02, 0x04, 0x59, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x79, 0x08, 0x06, 0x00, 0xff, 0xff 
+};
+/*
+sub_0807EAD0(0x1102,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0020)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0021)
+sub_0807E10C(0x0807f3c9)
+sub_0807EAD0(0x1103,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0020)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807EF80(0x0004)
+sub_0807E680(0x003c)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807EF80(0x0011)
+sub_0807E930(0x001c)
+sub_0807EAD0(0x1105,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0020)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0022)
+sub_0807E10C(0x0807f3c9)
+sub_0807EAD0(0x1106,0x000c)
+sub_0807EA94()
+sub_0807E930(0x001c)
+sub_0807E10C(0x0806d96d)
+sub_0807EAD0(0x1107,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0020)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0021)
+sub_0807E10C(0x0807f3c9)
+sub_0807EAD0(0x1108,0x000c)
+sub_0807EA94()
+sub_0807E930(0x001c)
+sub_0807E10C(0x0806d96d)
+sub_0807EAD0(0x1109,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0020)
+sub_0807EF80(0x000a)
+sub_0807E9D4()
+sub_0807E5F8(0x00000008)
+sub_0807E014()
+sub_0807E004()
+sub_0807E260(0x0000)
+sub_0807E050(0x0028)
+sub_0807E2E4()
+sub_0807E064(0xfff0)
+sub_0807E014()
+sub_0807E864()
+sub_0807E10C(0x0806d945)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x1114,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0020)
+sub_0807E878()
+sub_0807E024(0xffd0)
+sub_0807E864()
+sub_0807E9DC()
+sub_0807E124(0x0807f5b1,0x0000003c)
+sub_0807E10C(0x080791d1)
+sub_0807E014()
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807EF80(0x000b)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E10C(0x0806d945)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x110a,0x000c)
+sub_0807EA94()
+sub_0807E930(0x001f)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x110b,0x000c)
+sub_0807EA94()
+sub_0807E930(0x001f)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807EF80(0x0004)
+sub_0807E680(0x003c)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x110c,0x000c)
+sub_0807EA94()
+sub_0807E930(0x001f)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x110d,0x000c)
+sub_0807EA94()
+sub_0807E930(0x001f)
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x110e,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0018)
+sub_0807EBC0(0x0080)
+sub_0807E10C(0x0806d909)
+sub_0807EC1C(0x0010)
+sub_0807EF80(0x000a)
+sub_0807E9D4()
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E014()
+sub_0807E004()
+sub_0807E10C(0x0806d945)
+sub_0807E2E4()
+sub_0807E050(0x000e)
+sub_0807E2A8(0x3030)
+sub_0807E064(0x0020)
+sub_0807E024(0xffe6)
+sub_0807E864()
+sub_0807E930(0x0010)
+sub_0807E014()
+sub_0807EAD0(0x1115,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0018)
+sub_0807E878()
+sub_0807E024(0xffcc)
+sub_0807E014()
+sub_0807E864()
+sub_0807E10C(0x0807f9a5)
+sub_0807E10C(0x0807df29)
+sub_0807EB8C()
+sub_0807E10C(0x0806d945)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x110f,0x000c)
+sub_0807E930(0x0018)
+sub_0807EBC0(0x0080)
+sub_0807E10C(0x0806d909)
+sub_0807EC1C(0x0050)
+sub_0807EA94()
+sub_0807E10C(0x0807df51)
+sub_0807E878()
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E014()
+sub_0807E004()
+sub_0807E10C(0x0806d945)
+sub_0807E2E4()
+sub_0807E050(0x000e)
+sub_0807E2A8(0x3030)
+sub_0807E064(0x0020)
+sub_0807E024(0xffe6)
+sub_0807E864()
+sub_0807E930(0x0010)
+sub_0807E014()
+sub_0807EAD0(0x1115,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0018)
+sub_0807E878()
+sub_0807E024(0xffcc)
+sub_0807E014()
+sub_0807E864()
+sub_0807E10C(0x0807f9a5)
+sub_0807E10C(0x0807df29)
+sub_0807EB8C()
+sub_0807E10C(0x0806d945)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x1110,0x000c)
+sub_0807E930(0x0018)
+sub_0807EBC0(0x0080)
+sub_0807E10C(0x0806d909)
+sub_0807EC1C(0x0050)
+sub_0807E930(0x0018)
+sub_0807EA94()
+sub_0807E10C(0x0807df51)
+sub_0807E878()
+sub_0807E5F8(0x00000008)
+sub_0807E6AC(0x00000004)
+sub_0807E014()
+sub_0807E004()
+sub_0807E10C(0x0806d945)
+sub_0807E2E4()
+sub_0807E050(0x000e)
+sub_0807E2A8(0x3030)
+sub_0807E064(0x0020)
+sub_0807E024(0xffe6)
+sub_0807E864()
+sub_0807E930(0x0010)
+sub_0807E014()
+sub_0807EAD0(0x1115,0x000c)
+sub_0807EA94()
+sub_0807E930(0x0018)
+sub_0807E878()
+sub_0807E024(0xffcc)
+sub_0807E014()
+sub_0807E864()
+sub_0807E10C(0x0807f9a5)
+sub_0807E10C(0x0807df29)
+sub_0807EFE4()
+sub_0807EF80(0x000b)
+sub_0807EB8C()
+sub_0807E10C(0x0806d945)
+sub_0807E930(0x0010)
+sub_0807EAD0(0x1111,0x000c)
+sub_0807E930(0x0018)
+sub_0807EBC0(0x0080)
+sub_0807E10C(0x0806d8a1)
+sub_0807EE30()
+sub_0807E064(0xfffc)
+sub_0807E930(0x001f)
+sub_0807EA94()
+sub_0807E8C4(0x08012b18)
+sub_0807E10C(0x0806d9a5)
+sub_0807EF80(0x0008)
+sub_0807E680(0x0078)
+sub_0807EFAC(0x000e)
+sub_0807E004()
+sub_0807E8E4()
+sub_0807EB28(0x1112)
+sub_0807E014()
+sub_0807EA94()
+sub_0807E5F8(0x00000008)
+sub_0807EF80(0x0006)
+0xffff,
+0x0402,
+0x0861,
+0x0002,
+0x0831,
+0x000a,
+0x0861,
+0x0006,
+0x0831,
+0x000a,
+0x0803,
+0xffee,
+0x0000,
+0x0401,
+0x0867,
+0x0080,
+0x0402,
+0x0861,
+0x0000,
+0x0879,
+0x0000,
+0x0879,
+0x0004,
+0x0831,
+0x003c,
+0x0c28,
+0x0001,
+0x0000,
+0x0c0b,
+0x91bd,
+0x0807,
+0xffff,
+0x0000,
+0x0401,
+0x0867,
+0x0100,
+0x0402,
+0x0879,
+0x0001,
+0x0c73,
+0x0388,
+0x0180,
+0x0861,
+0x0000,
+0x0879,
+0x0000,
+0x0c28,
+0x0001,
+0x0000,
+0x0c0b,
+0x91bd,
+0x0807,
+0xffff,
+0x0879,
+0x0015,
+0x0c0b,
+0x91bd,
+0x0807,
+0xffff,
+0x0401,
+0x0867,
+0x0100,
+0x0861,
+0x0004,
+0x0402,
+0x0879,
+0x0001,
+0x0870,
+0x0008,
+0x0c28,
+0x0002,
+0x0000,
+0x140c,
+0xfb65,
+0x0807,
+0xffe2,
+0xffff,
+0x0c0b,
+0x91bd,
+0x0807,
+0xffff,
+0x0401,
+0x0867,
+0x0100,
+0x0861,
+0x0000,
+0x0402,
+0x0879,
+0x0001,
+0x086e,
+0x0008,
+0x0c28,
+0x0002,
+0x0000,
+0x140c,
+0xfb65,
+0x0807,
+0xffe2,
+0xffff,
+0x0c0b,
+0x91bd,
+0x0807,
+0xffff,
+0x0401,
+0x0867,
+0x0100,
+0x0861,
+0x0002,
+0x0402,
+0x0879,
+0x0001,
+0x086f,
+0x0008,
+0x0c28,
+0x0002,
+0x0000,
+0x140c,
+0xfb65,
+0x0807,
+0xffe2,
+0xffff,
+0x0c0b,
+0x91bd,
+0x0807,
+0xffff
+END_SCRIPT()*/
+// clang-format on
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
new file mode 100644
index 00000000..39390241
--- /dev/null
+++ b/tools/script_disassembler/script_disassembler.py
@@ -0,0 +1,306 @@
+from dataclasses import dataclass
+import struct
+
+# Disassembler for tmc scripts
+# Input 'macros' to generate the macros for the script commands
+# Input the script bytes as hex to disassemble the script
+
+@dataclass
+class Context:
+    ptr: int
+    data: bytes
+
+def u16_to_hex(value):
+    return '0x' + (struct.pack('>H', value).hex())
+
+def barray_to_u16_hex(barray):
+    count = len(barray)//2
+    integers = struct.unpack('H'*count, barray)
+    return [u16_to_hex(x) for x in integers]
+
+def u32_to_hex(value):
+    return '0x' + (struct.pack('>I', value).hex())
+
+def barray_to_u32_hex(barray):
+    count = len(barray)//4
+    integers = struct.unpack('I'*count, barray)
+    return [u32_to_hex(x) for x in integers]
+
+"""
+def GetNextScriptCommandWordAfterCommandMetadata(ctx):
+    return struct.unpack('I', ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
+
+
+def sub_0807E10C(ctx):
+    meta = GetNextScriptCommandWordAfterCommandMetadata(ctx)
+    print('function', hex(meta))
+
+
+def sub_0807E5F8(ctx):
+    curPtr = start + ctx.ptr
+    print('current', hex(curPtr))
+    # gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    meta = GetNextScriptCommandWordAfterCommandMetadata(ctx)
+    print('meta', meta)
+    newPtr = curPtr | meta
+    print('Start next script at: ', hex(newPtr))
+"""
+
+commands = [
+    {'fun': 'nullsub_507', 'params': ''},
+    {'fun': 'sub_0807E004', 'params': '', 'name': 'start executing scripts'},
+    {'fun': 'sub_0807E014', 'params': '', 'name': 'stop executing scripts'},
+    {'fun': 'sub_0807E024', 'params': 's', 'name': 'jump by offset'},
+    {'fun': 'sub_0807E050', 'params': 's', 'name': 'jump if'},
+    {'fun': 'sub_0807E064', 'params': 's', 'name': 'jump if not'},
+    {'fun': 'sub_0807E078', 'params': 's'},
+    {'fun': 'sub_0807E0A0', 'params': 'w','name': 'abs jump' },
+    {'fun': 'sub_0807E0B8', 'params': 'w', 'name': 'abs jump if'},
+    {'fun': 'sub_0807E0CC', 'params': 'w', 'name': 'abs jump if not'},
+    {'fun': 'sub_0807E0E0', 'params': 'w'},
+    {'fun': 'sub_0807E10C', 'params':'w', 'name': 'Execute function via pointer'},# 'exec': sub_0807E10C},
+    {'fun': 'sub_0807E124', 'params': 'ww'},
+    {'fun': 'sub_0807E148', 'params': 'w'},
+    {'fun': 'sub_0807E158', 'params': 'w'},
+    {'fun': 'sub_0807E188', 'params': 's'},
+    {'fun': 'sub_0807E1D8', 'params': 's'},
+    {'fun': 'sub_0807E4AC', 'params': 's'},
+    {'fun': 'sub_0807E200'},
+    {'fun': 'sub_0807E220'},
+    {'fun': 'sub_0807E240'},
+    {'fun': 'sub_0807E260', 'params': 's'},
+    {'fun': 'sub_0807E280'},
+    {'fun': 'sub_0807E2A8', 'params': 's'},
+    {'fun': 'sub_0807E2E4', 'params': ''},
+    {'fun': 'sub_0807E30C'},
+    {'fun': 'sub_0807E390'},
+    {'fun': 'sub_0807E3BC'},
+    {'fun': 'sub_0807E3E8'},
+    {'fun': 'sub_0807E40C'},
+    {'fun': 'sub_0807E42C'},
+    {'fun': 'sub_0807E48C'},
+    {'fun': 'sub_0807E4CC'},
+    {'fun': 'sub_0807E4EC'},
+    {'fun': 'sub_0807E514'},
+    {'fun': 'sub_0807E538'},
+    {'fun': 'sub_0807E564'},
+    {'fun': 'sub_0807E584'},
+    {'fun': 'sub_0807E5A0'},
+    {'fun': 'sub_0807E5CC'},
+    {'fun': 'sub_0807E5F8', 'params': 'w'},# 'exec': sub_0807E5F8},
+    {'fun': 'sub_0807E610'},
+    {'fun': 'sub_0807E628'},
+    {'fun': 'sub_0807E634'},
+    {'fun': 'sub_0807E644'},
+    {'fun': 'sub_0807E650'},
+    {'fun': 'sub_0807E65C'},
+    {'fun': 'sub_0807E668'},
+    {'fun': 'sub_0807E674'},
+    {'fun': 'sub_0807E680', 'params': 's'},
+    {'fun': 'sub_0807E690'},
+    {'fun': 'sub_0807E6AC', 'params': 'w'},
+    {'fun': 'sub_0807E6DC'},
+    {'fun': 'sub_0807E700'},
+    {'fun': 'sub_0807E72C'},
+    {'fun': 'sub_0807E75C'},
+    {'fun': 'sub_0807E778'},
+    {'fun': 'sub_0807E788'},
+    {'fun': 'sub_0807E79C'},
+    {'fun': 'nullsub_508'},
+    {'fun': 'sub_0807E7B0'},
+    {'fun': 'sub_0807E7C4'},
+    {'fun': 'sub_0807E7D8'},
+    {'fun': 'sub_0807E7EC'},
+    {'fun': 'sub_0807E800'},
+    {'fun': 'sub_0807E80C'},
+    {'fun': 'sub_0807E858'},
+    {'fun': 'sub_0807E864', 'params': ''},
+    {'fun': 'sub_0807E878', 'params': ''},
+    {'fun': 'sub_0807E888'},
+    {'fun': 'sub_0807E898'},
+    {'fun': 'sub_0807E8C4', 'params': 'w'},
+    {'fun': 'sub_0807E8D4'},
+    {'fun': 'sub_0807E8E4', 'params': ''},
+    {'fun': 'sub_0807E8E4', 'params': ''},
+    {'fun': 'sub_0807E8E4', 'params': ''},
+    {'fun': 'sub_0807E8E4', 'params': ''},
+    {'fun': 'sub_0807E908'},
+    {'fun': 'sub_0807E914'},
+    {'fun': 'sub_0807E924'},
+    {'fun': 'sub_0807E930', 'params': 's'},
+    {'fun': 'sub_0807E944'},
+    {'fun': 'sub_0807E974'},
+    {'fun': 'sub_0807E9D4', 'params': ''},
+    {'fun': 'sub_0807E9DC', 'params': ''},
+    {'fun': 'sub_0807E9E4'},
+    {'fun': 'sub_0807E9F0'},
+    {'fun': 'sub_0807EA4C'},
+    {'fun': 'sub_0807EA88'},
+    {'fun': 'sub_0807EA94', 'params': ''},
+    {'fun': 'sub_0807EAB4'},
+    {'fun': 'sub_0807EAC0'},
+    {'fun': 'sub_0807EAD0', 'params': 'ss'},
+    {'fun': 'sub_0807EAF0'},
+    {'fun': 'sub_0807EB18'},
+    {'fun': 'sub_0807EB28', 'params': 's'},
+    {'fun': 'sub_0807EB38'},
+    {'fun': 'sub_0807EB44'},
+    {'fun': 'sub_0807EB4C'},
+    {'fun': 'sub_0807EB74'},
+    {'fun': 'sub_0807EB8C', 'params': ''},
+    {'fun': 'sub_0807EBA8'},
+    {'fun': 'sub_0807EBB0'},
+    {'fun': 'sub_0807EBC0', 'params': 's'},
+    {'fun': 'sub_0807EBC8'},
+    {'fun': 'sub_0807EBD8'},
+    {'fun': 'sub_0807EBF4'},
+    {'fun': 'sub_0807EC08'},
+    {'fun': 'nullsub_509'},
+    {'fun': 'sub_0807EC1C', 'params': 's'},
+    {'fun': 'sub_0807EC64'},
+    {'fun': 'sub_0807EC94'},
+    {'fun': 'sub_0807ECC4'},
+    {'fun': 'sub_0807ECF4'},
+    {'fun': 'sub_0807ED24'},
+    {'fun': 'sub_0807EDD4'},
+    {'fun': 'sub_0807EE04'},
+    {'fun': 'sub_0807EE30', 'params': ''},
+    {'fun': 'sub_0807EEB4'},
+    {'fun': 'sub_0807EEF4'},
+    {'fun': 'sub_0807EF3C'},
+    {'fun': 'sub_0807EF80', 'params': 's'},
+    {'fun': 'sub_0807EF90'},
+    {'fun': 'sub_0807EFA0'},
+    {'fun': 'sub_0807EFAC', 'params': 's'},
+    {'fun': 'sub_0807EFD4'},
+    {'fun': 'sub_0807EFE4', 'params': ''},
+    {'fun': 'sub_0807EFF4'},
+    {'fun': 'sub_0807F004'},
+    {'fun': 'sub_0807F010'},
+    {'fun': 'sub_0807F034'},
+    {'fun': 'sub_0807F050'},
+    {'fun': 'sub_0807F060'},
+    {'fun': 'sub_0807F078'},
+    {'fun': 'sub_0807F088'},
+    {'fun': 'sub_0807F098'},
+    {'fun': 'sub_0807F0A4'},
+    {'fun': 'sub_0807F0B4'},
+    {'fun': 'sub_0807F0C8'}
+]
+
+# definitions for parameters
+parameters = {
+    '': {
+        'length':0,
+        'param': '',
+        'expr': '',
+        'read': lambda ctx: ''
+    },
+    's': {
+        'length': 1,
+        'param': 's',
+        'expr': 's,',
+        'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0]
+    },
+    'w': {
+        'length': 2,
+        'param': 'w',
+        'expr': 'WORD_TO_SHORTS(w),',
+        'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
+    },
+    'ss': {
+        'length': 2,
+        'param': 'a,b',
+        'expr': 'a,b,',
+        'read': lambda ctx: ','.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+    },
+    'ww': {
+        'length': 4,
+        'param': 'a,b',
+        'expr': 'WORD_TO_SHORTS(a), WORD_TO_SHORTS(b),',
+        'read': lambda ctx: ','.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
+    },
+}
+
+
+def ExecuteScriptCommandSet(ctx: Context):
+    cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
+    if cmd == 0 or cmd ==0xffff:
+        return 0
+
+    unk_06 = cmd >> 0xA
+    operationId = cmd & 0x3FF
+    #print(cmd)
+    #print('advance by', unk_06)
+    #print('command id', operationId)
+    command = commands[operationId]
+    #print(command)
+    param_length = unk_06 - 1 
+    if unk_06 > 1:
+        meta = struct.unpack(
+            'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06])
+        #print('meta', meta)
+
+    # Handle parameters
+    if not 'params' in command:
+        raise Exception('Parameters not defined for ' + command['fun'] + '   Should be of length ' + str(param_length))
+    if not command['params'] in parameters:
+        raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+    params = parameters[command['params']]
+    if unk_06-1 != params['length']:
+        raise Exception('Call with ' + (unk_06-1) +' length, while length of ' + params['length']+' defined')
+
+
+    print(command['fun'] + '(' + params['read'](ctx) + ')')
+
+    # Execute script
+    ctx.ptr += unk_06*2
+    return 1
+
+
+def disassemble_script(input_data):
+    input_bytes = bytearray.fromhex(input_data)
+
+    ctx = Context(0, input_bytes)
+
+    while True:
+        if not ExecuteScriptCommandSet(ctx):
+            break
+
+
+    # Print rest (did not manage to get there)
+
+    print(',\n'.join(barray_to_u16_hex(ctx.data[ctx.ptr:])))
+
+def generate_macros():
+    print('#ifndef SCRIPT_MACROS_H')
+    print('#define SCRIPT_MACROS_H')
+    print('// Generated by disassemble_script.py')
+    print('#define START_SCRIPT(name) const unsigned short name[] = {')
+    print('#define END_SCRIPT() };')
+    print('#define WORD_TO_SHORTS(word) (unsigned short)word & 0xffff,(unsigned short)word >> 16')
+    print('')
+    for num, command in enumerate(commands):
+        if not 'params' in command:
+            #raise Exception('Parameters not defined for ' + command['fun'] + '   Should be of length ' + str(param_length))
+            continue # TODO
+        if not command['params'] in parameters:
+            raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+
+        params = parameters[command['params']]
+        id = ((params['length']+1) << 0xA) + num
+        print('#define ' + command['fun'] + '(' + params['param'] + ') '+u16_to_hex(id)+', ' + params['expr'])
+
+    print ('#endif')
+
+def main():
+
+    # Read input
+    input_data = input()
+
+    if input_data.strip() == 'macros':
+        generate_macros()
+        return
+    disassemble_script(input_data)
+    
+main()
\ No newline at end of file

From 174694a99b646040b93dec1a6d432f453ae9b7e5 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 17:29:56 +0100
Subject: [PATCH 05/46] Generate using inline assembly

---
 include/scriptMacros.h                        |  97 ++++----
 src/scripts/ezlo_angry.c                      | 219 ++++--------------
 .../script_disassembler.py                    |  24 +-
 3 files changed, 101 insertions(+), 239 deletions(-)

diff --git a/include/scriptMacros.h b/include/scriptMacros.h
index 0663059d..fabc19f9 100644
--- a/include/scriptMacros.h
+++ b/include/scriptMacros.h
@@ -1,54 +1,51 @@
 #ifndef SCRIPT_MACROS_H
 #define SCRIPT_MACROS_H
-
 // Generated by disassemble_script.py
-#define START_SCRIPT(name) const unsigned short name[] = {
-#define END_SCRIPT() };
-#define WORD_TO_SHORTS(word) (unsigned short)(word & 0xffff),(unsigned short)(word >> 16)
+#define START_SCRIPT(name) asm(".globl "#name); asm(".section .rodata"); asm(#name":");
+#define END_SCRIPT() asm(".short 0xffff");
 
-#define nullsub_507() 0x0400, 
-#define sub_0807E004() 0x0401, 
-#define sub_0807E014() 0x0402, 
-#define sub_0807E024(s) 0x0803, s,
-#define sub_0807E050(s) 0x0804, s,
-#define sub_0807E064(s) 0x0805, s,
-#define sub_0807E078(s) 0x0806, s,
-#define sub_0807E0A0(w) 0x0c07, WORD_TO_SHORTS(w),
-#define sub_0807E0B8(w) 0x0c08, WORD_TO_SHORTS(w),
-#define sub_0807E0CC(w) 0x0c09, WORD_TO_SHORTS(w),
-#define sub_0807E0E0(w) 0x0c0a, WORD_TO_SHORTS(w),
-#define sub_0807E10C(w) 0x0c0b, WORD_TO_SHORTS(w),
-#define sub_0807E124(a,b) 0x140c, WORD_TO_SHORTS(a), WORD_TO_SHORTS(b),
-#define sub_0807E148(w) 0x0c0d, WORD_TO_SHORTS(w),
-#define sub_0807E158(w) 0x0c0e, WORD_TO_SHORTS(w),
-#define sub_0807E188(s) 0x080f, s,
-#define sub_0807E1D8(s) 0x0810, s,
-#define sub_0807E4AC(s) 0x0811, s,
-#define sub_0807E260(s) 0x0815, s,
-#define sub_0807E2A8(s) 0x0817, s,
-#define sub_0807E2E4() 0x0418, 
-#define sub_0807E5F8(w) 0x0c28, WORD_TO_SHORTS(w),
-#define sub_0807E680(s) 0x0831, s,
-#define sub_0807E6AC(w) 0x0c33, WORD_TO_SHORTS(w),
-#define sub_0807E864() 0x0443, 
-#define sub_0807E878() 0x0444, 
-#define sub_0807E8C4(w) 0x0c47, WORD_TO_SHORTS(w),
-#define sub_0807E8E4() 0x0449, 
-#define sub_0807E8E4a() 0x044a, 
-#define sub_0807E8E4b() 0x044b, 
-#define sub_0807E8E4c() 0x044c, 
-#define sub_0807E930(s) 0x0850, s,
-#define sub_0807E9D4() 0x0453, 
-#define sub_0807E9DC() 0x0454, 
-#define sub_0807EA94() 0x0459, 
-#define sub_0807EAD0(a,b) 0x0c5c, a,b,
-#define sub_0807EB28(s) 0x085f, s,
-#define sub_0807EB8C() 0x0464, 
-#define sub_0807EBC0(s) 0x0867, s,
-#define sub_0807EC1C(s) 0x086d, s,
-#define sub_0807EE30() 0x0475, 
-#define sub_0807EF80(s) 0x0879, s,
-#define sub_0807EFAC(s) 0x087c, s,
-#define sub_0807EFE4() 0x047e, 
-
-#endif
+#define nullsub_507() asm(".short 0x0400");
+#define sub_0807E004() asm(".short 0x0401");
+#define sub_0807E014() asm(".short 0x0402");
+#define sub_0807E024(s) asm(".short 0x0803");asm(".short " #s);
+#define sub_0807E050(s) asm(".short 0x0804");asm(".short " #s);
+#define sub_0807E064(s) asm(".short 0x0805");asm(".short " #s);
+#define sub_0807E078(s) asm(".short 0x0806");asm(".short " #s);
+#define sub_0807E0A0(w) asm(".short 0x0c07");asm(".word " #w);
+#define sub_0807E0B8(w) asm(".short 0x0c08");asm(".word " #w);
+#define sub_0807E0CC(w) asm(".short 0x0c09");asm(".word " #w);
+#define sub_0807E0E0(w) asm(".short 0x0c0a");asm(".word " #w);
+#define sub_0807E10C(w) asm(".short 0x0c0b");asm(".word " #w);
+#define sub_0807E124(a,b) asm(".short 0x140c");asm(".word " #a);asm(".word " #b);
+#define sub_0807E148(w) asm(".short 0x0c0d");asm(".word " #w);
+#define sub_0807E158(w) asm(".short 0x0c0e");asm(".word " #w);
+#define sub_0807E188(s) asm(".short 0x080f");asm(".short " #s);
+#define sub_0807E1D8(s) asm(".short 0x0810");asm(".short " #s);
+#define sub_0807E4AC(s) asm(".short 0x0811");asm(".short " #s);
+#define sub_0807E260(s) asm(".short 0x0815");asm(".short " #s);
+#define sub_0807E2A8(s) asm(".short 0x0817");asm(".short " #s);
+#define sub_0807E2E4() asm(".short 0x0418");
+#define sub_0807E5F8(w) asm(".short 0x0c28");asm(".word " #w);
+#define sub_0807E680(s) asm(".short 0x0831");asm(".short " #s);
+#define sub_0807E6AC(w) asm(".short 0x0c33");asm(".word " #w);
+#define sub_0807E864() asm(".short 0x0443");
+#define sub_0807E878() asm(".short 0x0444");
+#define sub_0807E8C4(w) asm(".short 0x0c47");asm(".word " #w);
+#define sub_0807E8E4_0() asm(".short 0x0449");
+#define sub_0807E8E4_1() asm(".short 0x044a");
+#define sub_0807E8E4_2() asm(".short 0x044b");
+#define sub_0807E8E4_3() asm(".short 0x044c");
+#define sub_0807E930(s) asm(".short 0x0850");asm(".short " #s);
+#define sub_0807E9D4() asm(".short 0x0453");
+#define sub_0807E9DC() asm(".short 0x0454");
+#define sub_0807EA94() asm(".short 0x0459");
+#define sub_0807EAD0(a,b) asm(".short 0x0c5c");asm(".short " #a);asm(".short " #b);
+#define sub_0807EB28(s) asm(".short 0x085f");asm(".short " #s);
+#define sub_0807EB8C() asm(".short 0x0464");
+#define sub_0807EBC0(s) asm(".short 0x0867");asm(".short " #s);
+#define sub_0807EC1C(s) asm(".short 0x086d");asm(".short " #s);
+#define sub_0807EE30() asm(".short 0x0475");
+#define sub_0807EF80(s) asm(".short 0x0879");asm(".short " #s);
+#define sub_0807EFAC(s) asm(".short 0x087c");asm(".short " #s);
+#define sub_0807EFE4() asm(".short 0x047e");
+#endif
\ No newline at end of file
diff --git a/src/scripts/ezlo_angry.c b/src/scripts/ezlo_angry.c
index b841a754..52458403 100644
--- a/src/scripts/ezlo_angry.c
+++ b/src/scripts/ezlo_angry.c
@@ -1,15 +1,18 @@
 #include "scriptMacros.h"
 #include "functions.h"
-
-/*const unsigned char test[] = {
-     0x01, 0x04, 0x67, 0x08, 0x40, 0x00, 0x79, 0x08, 0x07, 0x00, 0x02, 0x04, 0x50, 0x08, 0x20, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x02, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x03, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x11, 0x00, 0x50, 0x08, 0x1c, 0x00, 0x5c, 0x0c, 0x05, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x06, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x07, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x08, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x09, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x15, 0x08, 0x00, 0x00, 0x04, 0x08, 0x28, 0x00, 0x18, 0x04, 0x05, 0x08, 0xf0, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x14, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x44, 0x04, 0x03, 0x08, 0xd0, 0xff, 0x43, 0x04, 0x54, 0x04, 0x0c, 0x14, 0xb1, 0xf5, 0x07, 0x08, 0x3c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0xd1, 0x91, 0x07, 0x08, 0x02, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x0b, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0a, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0b, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0c, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0d, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0e, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x10, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0f, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x10, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x50, 0x08, 0x18, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x7e, 0x04, 0x79, 0x08, 0x0b, 0x00, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x11, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0xa1, 0xd8, 0x06, 0x08, 0x75, 0x04, 0x05, 0x08, 0xfc, 0xff, 0x50, 0x08, 0x1f, 0x00, 0x59, 0x04, 0x47, 0x0c, 0x18, 0x2b, 0x01, 0x08, 0x0b, 0x0c, 0xa5, 0xd9, 0x06, 0x08, 0x79, 0x08, 0x08, 0x00, 0x31, 0x08, 0x78, 0x00, 0x7c, 0x08, 0x0e, 0x00, 0x01, 0x04, 0x4b, 0x04, 0x5f, 0x08, 0x12, 0x11, 0x02, 0x04, 0x59, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x79, 0x08, 0x06, 0x00, 0xff, 0xff 
-};*/
-
+#include "script.h"
+extern void sub_0807F3C8(Entity*, ScriptExecutionContext*);
+extern void sub_0807F5B0(Entity*, ScriptExecutionContext*);
+extern void sub_0806D96C(Entity*, ScriptExecutionContext*);
+extern void sub_0806D944(Entity*, ScriptExecutionContext*);
+extern void sub_0806D908(Entity*, ScriptExecutionContext*);
+extern void sub_0807F9A4(Entity*, ScriptExecutionContext*);
+extern void sub_0807DF28(Entity*, ScriptExecutionContext*);
+extern void sub_0807DF50(Entity*, ScriptExecutionContext*);
+extern void sub_0806D8A0(Entity*, ScriptExecutionContext*);
+extern void sub_0806D9A4(Entity*, ScriptExecutionContext*);
 // clang-format off
-extern void sub_0807F3C8();
-
 START_SCRIPT(gUnk_080126FC)
-//0x0401, 0x0867, 0x0040, 0x0879, 0x0007, 0x0402, 0x0850, 0x0020, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1102, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1103, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0011, 0x0850, 0x001c, 0x0c5c, 0x1105, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1106, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1107, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1108, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1109, 0x000c, 0x0459, 0x0850, 0x0020, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0402, 0x0401, 0x0815, 0x0000, 0x0804, 0x0028, 0x0418, 0x0805, 0xfff0, 0x0402, 0x0443, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1114, 0x000c, 0x0459, 0x0850, 0x0020, 0x0444, 0x0803, 0xffd0, 0x0443, 0x0454, 0x140c, 0xf5b1, 0x0807, 0x003c, 0x0000, 0x0c0b, 0x91d1, 0x0807, 0x0402, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x000b, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110a, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110b, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0850, 0x0010, 0x0c5c, 0x110c, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110d, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110e, 0x000c, 0x0459, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0010, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110f, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1110, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0850, 0x0018, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x047e, 0x0879, 0x000b, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1111, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd8a1, 0x0806, 0x0475, 0x0805, 0xfffc, 0x0850, 0x001f, 0x0459, 0x0c47, 0x2b18, 0x0801, 0x0c0b, 0xd9a5, 0x0806, 0x0879, 0x0008, 0x0831, 0x0078, 0x087c, 0x000e, 0x0401, 0x044b, 0x085f, 0x1112, 0x0402, 0x0459, 0x0c28, 0x0008, 0x0000, 0x0879, 0x0006, 0xffff
 sub_0807E004()
 sub_0807EBC0(0x0040)
 sub_0807EF80(0x0007)
@@ -17,27 +20,14 @@ sub_0807E014()
 sub_0807E930(0x0020)
 sub_0807E6AC(0x00000004)
 sub_0807E930(0x0022)
-sub_0807E10C((unsigned int)(void (* const)()) sub_0807F3C8)
-END_SCRIPT() 
-//const void (*const TEST2)() = (const void (*const)())sub_0807F3C8;
-
-//void (*const TEST[])() = {
-    //(void (*const)()) sub_0807F3C8
-//};
-//
-
-//
-const unsigned char test[] = {
-     0x5c, 0x0c, 0x02, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x03, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x11, 0x00, 0x50, 0x08, 0x1c, 0x00, 0x5c, 0x0c, 0x05, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x06, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x07, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x08, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x09, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x15, 0x08, 0x00, 0x00, 0x04, 0x08, 0x28, 0x00, 0x18, 0x04, 0x05, 0x08, 0xf0, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x14, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x44, 0x04, 0x03, 0x08, 0xd0, 0xff, 0x43, 0x04, 0x54, 0x04, 0x0c, 0x14, 0xb1, 0xf5, 0x07, 0x08, 0x3c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0xd1, 0x91, 0x07, 0x08, 0x02, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x0b, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0a, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0b, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0c, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0d, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0e, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x10, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0f, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x10, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x50, 0x08, 0x18, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x7e, 0x04, 0x79, 0x08, 0x0b, 0x00, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x11, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0xa1, 0xd8, 0x06, 0x08, 0x75, 0x04, 0x05, 0x08, 0xfc, 0xff, 0x50, 0x08, 0x1f, 0x00, 0x59, 0x04, 0x47, 0x0c, 0x18, 0x2b, 0x01, 0x08, 0x0b, 0x0c, 0xa5, 0xd9, 0x06, 0x08, 0x79, 0x08, 0x08, 0x00, 0x31, 0x08, 0x78, 0x00, 0x7c, 0x08, 0x0e, 0x00, 0x01, 0x04, 0x4b, 0x04, 0x5f, 0x08, 0x12, 0x11, 0x02, 0x04, 0x59, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x79, 0x08, 0x06, 0x00, 0xff, 0xff 
-};
-/*
+sub_0807E10C(sub_0807F3C8)
 sub_0807EAD0(0x1102,0x000c)
 sub_0807EA94()
 sub_0807E930(0x0020)
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807E930(0x0021)
-sub_0807E10C(0x0807f3c9)
+sub_0807E10C(sub_0807F3C8)
 sub_0807EAD0(0x1103,0x000c)
 sub_0807EA94()
 sub_0807E930(0x0020)
@@ -55,22 +45,22 @@ sub_0807E930(0x0020)
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807E930(0x0022)
-sub_0807E10C(0x0807f3c9)
+sub_0807E10C(sub_0807F3C8)
 sub_0807EAD0(0x1106,0x000c)
 sub_0807EA94()
 sub_0807E930(0x001c)
-sub_0807E10C(0x0806d96d)
+sub_0807E10C(sub_0806D96C) // Ezlo Angry FX 
 sub_0807EAD0(0x1107,0x000c)
 sub_0807EA94()
 sub_0807E930(0x0020)
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807E930(0x0021)
-sub_0807E10C(0x0807f3c9)
+sub_0807E10C(sub_0807F3C8) // Ezlo Angry FX 
 sub_0807EAD0(0x1108,0x000c)
 sub_0807EA94()
 sub_0807E930(0x001c)
-sub_0807E10C(0x0806d96d)
+sub_0807E10C(sub_0806D96C)// Ezlo Angry FX 
 sub_0807EAD0(0x1109,0x000c)
 sub_0807EA94()
 sub_0807E930(0x0020)
@@ -85,7 +75,7 @@ sub_0807E2E4()
 sub_0807E064(0xfff0)
 sub_0807E014()
 sub_0807E864()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944)  // Ezlo look at player
 sub_0807E930(0x0010)
 sub_0807EAD0(0x1114,0x000c)
 sub_0807EA94()
@@ -94,15 +84,15 @@ sub_0807E878()
 sub_0807E024(0xffd0)
 sub_0807E864()
 sub_0807E9DC()
-sub_0807E124(0x0807f5b1,0x0000003c)
-sub_0807E10C(0x080791d1)
+sub_0807E124(sub_0807F5B0,0x0000003c)
+sub_0807E10C(sub_080791D0) 
 sub_0807E014()
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807EF80(0x000b)
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944)// Ezlo look at player
 sub_0807E930(0x0010)
 sub_0807EAD0(0x110a,0x000c)
 sub_0807EA94()
@@ -134,7 +124,7 @@ sub_0807EAD0(0x110e,0x000c)
 sub_0807EA94()
 sub_0807E930(0x0018)
 sub_0807EBC0(0x0080)
-sub_0807E10C(0x0806d909)
+sub_0807E10C(sub_0806D908) 
 sub_0807EC1C(0x0010)
 sub_0807EF80(0x000a)
 sub_0807E9D4()
@@ -142,7 +132,7 @@ sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807E014()
 sub_0807E004()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944) // Ezlo look at player
 sub_0807E2E4()
 sub_0807E050(0x000e)
 sub_0807E2A8(0x3030)
@@ -158,24 +148,24 @@ sub_0807E878()
 sub_0807E024(0xffcc)
 sub_0807E014()
 sub_0807E864()
-sub_0807E10C(0x0807f9a5)
-sub_0807E10C(0x0807df29)
+sub_0807E10C(sub_0807F9A4)
+sub_0807E10C(sub_0807DF28)
 sub_0807EB8C()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944) // Ezlo look at player
 sub_0807E930(0x0010)
 sub_0807EAD0(0x110f,0x000c)
 sub_0807E930(0x0018)
 sub_0807EBC0(0x0080)
-sub_0807E10C(0x0806d909)
+sub_0807E10C(sub_0806D908)
 sub_0807EC1C(0x0050)
 sub_0807EA94()
-sub_0807E10C(0x0807df51)
+sub_0807E10C(sub_0807DF50) 
 sub_0807E878()
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807E014()
 sub_0807E004()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944) // Ezlo look at player
 sub_0807E2E4()
 sub_0807E050(0x000e)
 sub_0807E2A8(0x3030)
@@ -191,25 +181,25 @@ sub_0807E878()
 sub_0807E024(0xffcc)
 sub_0807E014()
 sub_0807E864()
-sub_0807E10C(0x0807f9a5)
-sub_0807E10C(0x0807df29)
+sub_0807E10C(sub_0807F9A4) 
+sub_0807E10C(sub_0807DF28) 
 sub_0807EB8C()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944)  // Ezlo look at player
 sub_0807E930(0x0010)
 sub_0807EAD0(0x1110,0x000c)
 sub_0807E930(0x0018)
 sub_0807EBC0(0x0080)
-sub_0807E10C(0x0806d909)
+sub_0807E10C(sub_0806D908) 
 sub_0807EC1C(0x0050)
 sub_0807E930(0x0018)
 sub_0807EA94()
-sub_0807E10C(0x0807df51)
+sub_0807E10C(sub_0807DF50) 
 sub_0807E878()
 sub_0807E5F8(0x00000008)
 sub_0807E6AC(0x00000004)
 sub_0807E014()
 sub_0807E004()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944)  // Ezlo look at player
 sub_0807E2E4()
 sub_0807E050(0x000e)
 sub_0807E2A8(0x3030)
@@ -225,157 +215,32 @@ sub_0807E878()
 sub_0807E024(0xffcc)
 sub_0807E014()
 sub_0807E864()
-sub_0807E10C(0x0807f9a5)
-sub_0807E10C(0x0807df29)
+sub_0807E10C(sub_0807F9A4) 
+sub_0807E10C(sub_0807DF28) 
 sub_0807EFE4()
 sub_0807EF80(0x000b)
 sub_0807EB8C()
-sub_0807E10C(0x0806d945)
+sub_0807E10C(sub_0806D944)  // Ezlo look at player
 sub_0807E930(0x0010)
 sub_0807EAD0(0x1111,0x000c)
 sub_0807E930(0x0018)
 sub_0807EBC0(0x0080)
-sub_0807E10C(0x0806d8a1)
+sub_0807E10C(sub_0806D8A0) 
 sub_0807EE30()
 sub_0807E064(0xfffc)
 sub_0807E930(0x001f)
 sub_0807EA94()
 sub_0807E8C4(0x08012b18)
-sub_0807E10C(0x0806d9a5)
+sub_0807E10C(sub_0806D9A4) 
 sub_0807EF80(0x0008)
 sub_0807E680(0x0078)
 sub_0807EFAC(0x000e)
 sub_0807E004()
-sub_0807E8E4()
+sub_0807E8E4_2()
 sub_0807EB28(0x1112)
 sub_0807E014()
 sub_0807EA94()
 sub_0807E5F8(0x00000008)
 sub_0807EF80(0x0006)
-0xffff,
-0x0402,
-0x0861,
-0x0002,
-0x0831,
-0x000a,
-0x0861,
-0x0006,
-0x0831,
-0x000a,
-0x0803,
-0xffee,
-0x0000,
-0x0401,
-0x0867,
-0x0080,
-0x0402,
-0x0861,
-0x0000,
-0x0879,
-0x0000,
-0x0879,
-0x0004,
-0x0831,
-0x003c,
-0x0c28,
-0x0001,
-0x0000,
-0x0c0b,
-0x91bd,
-0x0807,
-0xffff,
-0x0000,
-0x0401,
-0x0867,
-0x0100,
-0x0402,
-0x0879,
-0x0001,
-0x0c73,
-0x0388,
-0x0180,
-0x0861,
-0x0000,
-0x0879,
-0x0000,
-0x0c28,
-0x0001,
-0x0000,
-0x0c0b,
-0x91bd,
-0x0807,
-0xffff,
-0x0879,
-0x0015,
-0x0c0b,
-0x91bd,
-0x0807,
-0xffff,
-0x0401,
-0x0867,
-0x0100,
-0x0861,
-0x0004,
-0x0402,
-0x0879,
-0x0001,
-0x0870,
-0x0008,
-0x0c28,
-0x0002,
-0x0000,
-0x140c,
-0xfb65,
-0x0807,
-0xffe2,
-0xffff,
-0x0c0b,
-0x91bd,
-0x0807,
-0xffff,
-0x0401,
-0x0867,
-0x0100,
-0x0861,
-0x0000,
-0x0402,
-0x0879,
-0x0001,
-0x086e,
-0x0008,
-0x0c28,
-0x0002,
-0x0000,
-0x140c,
-0xfb65,
-0x0807,
-0xffe2,
-0xffff,
-0x0c0b,
-0x91bd,
-0x0807,
-0xffff,
-0x0401,
-0x0867,
-0x0100,
-0x0861,
-0x0002,
-0x0402,
-0x0879,
-0x0001,
-0x086f,
-0x0008,
-0x0c28,
-0x0002,
-0x0000,
-0x140c,
-0xfb65,
-0x0807,
-0xffe2,
-0xffff,
-0x0c0b,
-0x91bd,
-0x0807,
-0xffff
-END_SCRIPT()*/
+END_SCRIPT()
 // clang-format on
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 39390241..62f85f4c 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -120,10 +120,10 @@ commands = [
     {'fun': 'sub_0807E898'},
     {'fun': 'sub_0807E8C4', 'params': 'w'},
     {'fun': 'sub_0807E8D4'},
-    {'fun': 'sub_0807E8E4', 'params': ''},
-    {'fun': 'sub_0807E8E4', 'params': ''},
-    {'fun': 'sub_0807E8E4', 'params': ''},
-    {'fun': 'sub_0807E8E4', 'params': ''},
+    {'fun': 'sub_0807E8E4_0', 'params': ''}, # duplicate
+    {'fun': 'sub_0807E8E4_1', 'params': ''}, # duplicate
+    {'fun': 'sub_0807E8E4_2', 'params': ''}, # duplicate
+    {'fun': 'sub_0807E8E4_3', 'params': ''}, # duplicate
     {'fun': 'sub_0807E908'},
     {'fun': 'sub_0807E914'},
     {'fun': 'sub_0807E924'},
@@ -199,25 +199,25 @@ parameters = {
     's': {
         'length': 1,
         'param': 's',
-        'expr': 's,',
+        'expr': 'asm(".short " #s);',
         'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0]
     },
     'w': {
         'length': 2,
         'param': 'w',
-        'expr': 'WORD_TO_SHORTS(w),',
+        'expr': 'asm(".word " #w);',
         'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
     },
     'ss': {
         'length': 2,
         'param': 'a,b',
-        'expr': 'a,b,',
+        'expr': 'asm(".short " #a);asm(".short " #b);',
         'read': lambda ctx: ','.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
     },
     'ww': {
         'length': 4,
         'param': 'a,b',
-        'expr': 'WORD_TO_SHORTS(a), WORD_TO_SHORTS(b),',
+        'expr': 'asm(".word " #a);asm(".word " #b);',
         'read': lambda ctx: ','.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
     },
 }
@@ -276,9 +276,9 @@ def generate_macros():
     print('#ifndef SCRIPT_MACROS_H')
     print('#define SCRIPT_MACROS_H')
     print('// Generated by disassemble_script.py')
-    print('#define START_SCRIPT(name) const unsigned short name[] = {')
-    print('#define END_SCRIPT() };')
-    print('#define WORD_TO_SHORTS(word) (unsigned short)word & 0xffff,(unsigned short)word >> 16')
+    print('#define START_SCRIPT(name) asm(".globl "#name); asm(".section .rodata"); asm(#name":");')
+    print('#define END_SCRIPT()')
+    #print('#define WORD_TO_SHORTS(word) (unsigned short)word & 0xffff,(unsigned short)word >> 16')
     print('')
     for num, command in enumerate(commands):
         if not 'params' in command:
@@ -289,7 +289,7 @@ def generate_macros():
 
         params = parameters[command['params']]
         id = ((params['length']+1) << 0xA) + num
-        print('#define ' + command['fun'] + '(' + params['param'] + ') '+u16_to_hex(id)+', ' + params['expr'])
+        print('#define ' + command['fun'] + '(' + params['param'] + ') asm(".short '+u16_to_hex(id)+'");' + params['expr'])
 
     print ('#endif')
 

From 223cf98a5181a5eeed412b5c3570f4d369ed3735 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 19:26:20 +0100
Subject: [PATCH 06/46] Use assembly macros instead

---
 asm/macros/script.inc                         | 217 ++++++++++++++++
 data/scripts/ezlo_angry.s                     | 233 +++++++++++++++++
 linker.ld                                     |   1 +
 src/scripts/ezlo_angry.c                      | 234 +-----------------
 .../script_disassembler.py                    |  41 ++-
 5 files changed, 482 insertions(+), 244 deletions(-)
 create mode 100644 asm/macros/script.inc
 create mode 100644 data/scripts/ezlo_angry.s

diff --git a/asm/macros/script.inc b/asm/macros/script.inc
new file mode 100644
index 00000000..cfe4328f
--- /dev/null
+++ b/asm/macros/script.inc
@@ -0,0 +1,217 @@
+@ All the macro functions for scripts
+@ Generated by disassemble_script.py
+.macro SCRIPT_START name
+        .globl \name
+        .section .rodata
+\name:
+.endm
+
+.macro SCRIPT_END
+        .short 0xffff
+.endm
+
+.macro nullsub_507 
+        .short 0x0400
+.endm
+
+.macro sub_0807E004 
+        .short 0x0401
+.endm
+
+.macro sub_0807E014 
+        .short 0x0402
+.endm
+
+.macro sub_0807E024 s
+        .short 0x0803
+        .short \s
+.endm
+
+.macro sub_0807E050 s
+        .short 0x0804
+        .short \s
+.endm
+
+.macro sub_0807E064 s
+        .short 0x0805
+        .short \s
+.endm
+
+.macro sub_0807E078 s
+        .short 0x0806
+        .short \s
+.endm
+
+.macro sub_0807E0A0 w
+        .short 0x0c07
+        .word \w
+.endm
+
+.macro sub_0807E0B8 w
+        .short 0x0c08
+        .word \w
+.endm
+
+.macro sub_0807E0CC w
+        .short 0x0c09
+        .word \w
+.endm
+
+.macro sub_0807E0E0 w
+        .short 0x0c0a
+        .word \w
+.endm
+
+.macro sub_0807E10C w
+        .short 0x0c0b
+        .word \w
+.endm
+
+.macro sub_0807E124 a,b
+        .short 0x140c
+        .word \a
+        .word \b
+.endm
+
+.macro sub_0807E148 w
+        .short 0x0c0d
+        .word \w
+.endm
+
+.macro sub_0807E158 w
+        .short 0x0c0e
+        .word \w
+.endm
+
+.macro sub_0807E188 s
+        .short 0x080f
+        .short \s
+.endm
+
+.macro sub_0807E1D8 s
+        .short 0x0810
+        .short \s
+.endm
+
+.macro sub_0807E4AC s
+        .short 0x0811
+        .short \s
+.endm
+
+.macro sub_0807E260 s
+        .short 0x0815
+        .short \s
+.endm
+
+.macro sub_0807E2A8 s
+        .short 0x0817
+        .short \s
+.endm
+
+.macro sub_0807E2E4 
+        .short 0x0418
+.endm
+
+.macro sub_0807E5F8 w
+        .short 0x0c28
+        .word \w
+.endm
+
+.macro sub_0807E680 s
+        .short 0x0831
+        .short \s
+.endm
+
+.macro sub_0807E6AC w
+        .short 0x0c33
+        .word \w
+.endm
+
+.macro sub_0807E864 
+        .short 0x0443
+.endm
+
+.macro sub_0807E878 
+        .short 0x0444
+.endm
+
+.macro sub_0807E8C4 w
+        .short 0x0c47
+        .word \w
+.endm
+
+.macro sub_0807E8E4_0 
+        .short 0x0449
+.endm
+
+.macro sub_0807E8E4_1 
+        .short 0x044a
+.endm
+
+.macro sub_0807E8E4_2 
+        .short 0x044b
+.endm
+
+.macro sub_0807E8E4_3 
+        .short 0x044c
+.endm
+
+.macro sub_0807E930 s
+        .short 0x0850
+        .short \s
+.endm
+
+.macro sub_0807E9D4 
+        .short 0x0453
+.endm
+
+.macro sub_0807E9DC 
+        .short 0x0454
+.endm
+
+.macro sub_0807EA94 
+        .short 0x0459
+.endm
+
+.macro sub_0807EAD0 a,b
+        .short 0x0c5c
+        .short \a
+        .short \b
+.endm
+
+.macro sub_0807EB28 s
+        .short 0x085f
+        .short \s
+.endm
+
+.macro sub_0807EB8C 
+        .short 0x0464
+.endm
+
+.macro sub_0807EBC0 param
+        .short 0x0867
+        .short \param
+.endm
+
+.macro sub_0807EC1C s
+        .short 0x086d
+        .short \s
+.endm
+
+.macro sub_0807EE30 
+        .short 0x0475
+.endm
+
+.macro sub_0807EF80 s
+        .short 0x0879
+        .short \s
+.endm
+
+.macro sub_0807EFAC s
+        .short 0x087c
+        .short \s
+.endm
+
+.macro sub_0807EFE4 
+        .short 0x047e
+.endm
diff --git a/data/scripts/ezlo_angry.s b/data/scripts/ezlo_angry.s
new file mode 100644
index 00000000..b8a3f705
--- /dev/null
+++ b/data/scripts/ezlo_angry.s
@@ -0,0 +1,233 @@
+.include "asm/macros/script.inc"
+
+SCRIPT_START gUnk_080126FC
+sub_0807E004
+sub_0807EBC0 0x0040
+sub_0807EF80 0x0007
+sub_0807E014
+sub_0807E930 0x0020
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0022
+sub_0807E10C sub_0807F3C8
+sub_0807EAD0 0x1102, 0x000c
+sub_0807EA94 
+sub_0807E930 0x0020
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0021
+sub_0807E10C sub_0807F3C8
+sub_0807EAD0 0x1103,0x000c
+sub_0807EA94 
+sub_0807E930 0x0020
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807EF80 0x0004
+sub_0807E680 0x003c
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807EF80 0x0011
+sub_0807E930 0x001c
+sub_0807EAD0 0x1105,0x000c
+sub_0807EA94 
+sub_0807E930 0x0020
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0022
+sub_0807E10C sub_0807F3C8
+sub_0807EAD0 0x1106,0x000c
+sub_0807EA94 
+sub_0807E930 0x001c
+sub_0807E10C sub_0806D96C // Ezlo Angry FX 
+sub_0807EAD0 0x1107,0x000c
+sub_0807EA94 
+sub_0807E930 0x0020
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0021
+sub_0807E10C sub_0807F3C8 // Ezlo Angry FX 
+sub_0807EAD0 0x1108,0x000c
+sub_0807EA94 
+sub_0807E930 0x001c
+sub_0807E10C sub_0806D96C// Ezlo Angry FX 
+sub_0807EAD0 0x1109,0x000c
+sub_0807EA94 
+sub_0807E930 0x0020
+sub_0807EF80 0x000a
+sub_0807E9D4 
+sub_0807E5F8 0x00000008
+sub_0807E014 
+sub_0807E004 
+sub_0807E260 0x0000
+sub_0807E050 0x0028
+sub_0807E2E4 
+sub_0807E064 0xfff0
+sub_0807E014 
+sub_0807E864 
+sub_0807E10C sub_0806D944  // Ezlo look at player
+sub_0807E930 0x0010
+sub_0807EAD0 0x1114,0x000c
+sub_0807EA94 
+sub_0807E930 0x0020
+sub_0807E878 
+sub_0807E024 0xffd0
+sub_0807E864 
+sub_0807E9DC 
+sub_0807E124 sub_0807F5B0,0x0000003c
+sub_0807E10C sub_080791D0 
+sub_0807E014 
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807EF80 0x000b
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E10C sub_0806D944// Ezlo look at player
+sub_0807E930 0x0010
+sub_0807EAD0 0x110a,0x000c
+sub_0807EA94 
+sub_0807E930 0x001f
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0010
+sub_0807EAD0 0x110b,0x000c
+sub_0807EA94 
+sub_0807E930 0x001f
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807EF80 0x0004
+sub_0807E680 0x003c
+sub_0807E930 0x0010
+sub_0807EAD0 0x110c,0x000c
+sub_0807EA94 
+sub_0807E930 0x001f
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0010
+sub_0807EAD0 0x110d,0x000c
+sub_0807EA94 
+sub_0807E930 0x001f
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E930 0x0010
+sub_0807EAD0 0x110e,0x000c
+sub_0807EA94 
+sub_0807E930 0x0018
+sub_0807EBC0 0x0080
+sub_0807E10C sub_0806D908 
+sub_0807EC1C 0x0010
+sub_0807EF80 0x000a
+sub_0807E9D4 
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E014 
+sub_0807E004 
+sub_0807E10C sub_0806D944 // Ezlo look at player
+sub_0807E2E4 
+sub_0807E050 0x000e
+sub_0807E2A8 0x3030
+sub_0807E064 0x0020
+sub_0807E024 0xffe6
+sub_0807E864 
+sub_0807E930 0x0010
+sub_0807E014 
+sub_0807EAD0 0x1115,0x000c
+sub_0807EA94 
+sub_0807E930 0x0018
+sub_0807E878 
+sub_0807E024 0xffcc
+sub_0807E014 
+sub_0807E864 
+sub_0807E10C sub_0807F9A4
+sub_0807E10C sub_0807DF28
+sub_0807EB8C 
+sub_0807E10C sub_0806D944 // Ezlo look at player
+sub_0807E930 0x0010
+sub_0807EAD0 0x110f,0x000c
+sub_0807E930 0x0018
+sub_0807EBC0 0x0080
+sub_0807E10C sub_0806D908
+sub_0807EC1C 0x0050
+sub_0807EA94 
+sub_0807E10C sub_0807DF50 
+sub_0807E878 
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E014 
+sub_0807E004 
+sub_0807E10C sub_0806D944 // Ezlo look at player
+sub_0807E2E4 
+sub_0807E050 0x000e
+sub_0807E2A8 0x3030
+sub_0807E064 0x0020
+sub_0807E024 0xffe6
+sub_0807E864 
+sub_0807E930 0x0010
+sub_0807E014 
+sub_0807EAD0 0x1115,0x000c
+sub_0807EA94 
+sub_0807E930 0x0018
+sub_0807E878 
+sub_0807E024 0xffcc
+sub_0807E014 
+sub_0807E864 
+sub_0807E10C sub_0807F9A4 
+sub_0807E10C sub_0807DF28 
+sub_0807EB8C 
+sub_0807E10C sub_0806D944  // Ezlo look at player
+sub_0807E930 0x0010
+sub_0807EAD0 0x1110,0x000c
+sub_0807E930 0x0018
+sub_0807EBC0 0x0080
+sub_0807E10C sub_0806D908 
+sub_0807EC1C 0x0050
+sub_0807E930 0x0018
+sub_0807EA94 
+sub_0807E10C sub_0807DF50 
+sub_0807E878 
+sub_0807E5F8 0x00000008
+sub_0807E6AC 0x00000004
+sub_0807E014 
+sub_0807E004 
+sub_0807E10C sub_0806D944  // Ezlo look at player
+sub_0807E2E4 
+sub_0807E050 0x000e
+sub_0807E2A8 0x3030
+sub_0807E064 0x0020
+sub_0807E024 0xffe6
+sub_0807E864 
+sub_0807E930 0x0010
+sub_0807E014 
+sub_0807EAD0 0x1115,0x000c
+sub_0807EA94 
+sub_0807E930 0x0018
+sub_0807E878 
+sub_0807E024 0xffcc
+sub_0807E014 
+sub_0807E864 
+sub_0807E10C sub_0807F9A4 
+sub_0807E10C sub_0807DF28 
+sub_0807EFE4 
+sub_0807EF80 0x000b
+sub_0807EB8C 
+sub_0807E10C sub_0806D944  // Ezlo look at player
+sub_0807E930 0x0010
+sub_0807EAD0 0x1111,0x000c
+sub_0807E930 0x0018
+sub_0807EBC0 0x0080
+sub_0807E10C sub_0806D8A0 
+sub_0807EE30 
+sub_0807E064 0xfffc
+sub_0807E930 0x001f
+sub_0807EA94 
+sub_0807E8C4 0x08012b18
+sub_0807E10C sub_0806D9A4 
+sub_0807EF80 0x0008
+sub_0807E680 0x0078
+sub_0807EFAC 0x000e
+sub_0807E004 
+sub_0807E8E4_2 
+sub_0807EB28 0x1112
+sub_0807E014 
+sub_0807EA94 
+sub_0807E5F8 0x00000008
+sub_0807EF80 0x0006
+SCRIPT_END
\ No newline at end of file
diff --git a/linker.ld b/linker.ld
index a91e8495..0b0082c8 100644
--- a/linker.ld
+++ b/linker.ld
@@ -295,6 +295,7 @@ SECTIONS {
         asm/code_080043E8.o(.text);
         data/data_08007DF4.o(.rodata);
         asm/code_0800857C.o(.text);
+        data/scripts/ezlo_angry.o(.rodata);
         src/scripts/ezlo_angry.o(.rodata);
         asm/code_08012AB0.o(.text);
         src/scripts/npc4e_fusion.o(.rodata);
diff --git a/src/scripts/ezlo_angry.c b/src/scripts/ezlo_angry.c
index 52458403..ffaab375 100644
--- a/src/scripts/ezlo_angry.c
+++ b/src/scripts/ezlo_angry.c
@@ -12,235 +12,7 @@ extern void sub_0807DF50(Entity*, ScriptExecutionContext*);
 extern void sub_0806D8A0(Entity*, ScriptExecutionContext*);
 extern void sub_0806D9A4(Entity*, ScriptExecutionContext*);
 // clang-format off
-START_SCRIPT(gUnk_080126FC)
-sub_0807E004()
-sub_0807EBC0(0x0040)
-sub_0807EF80(0x0007)
-sub_0807E014()
-sub_0807E930(0x0020)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0022)
-sub_0807E10C(sub_0807F3C8)
-sub_0807EAD0(0x1102,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0020)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0021)
-sub_0807E10C(sub_0807F3C8)
-sub_0807EAD0(0x1103,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0020)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807EF80(0x0004)
-sub_0807E680(0x003c)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807EF80(0x0011)
-sub_0807E930(0x001c)
-sub_0807EAD0(0x1105,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0020)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0022)
-sub_0807E10C(sub_0807F3C8)
-sub_0807EAD0(0x1106,0x000c)
-sub_0807EA94()
-sub_0807E930(0x001c)
-sub_0807E10C(sub_0806D96C) // Ezlo Angry FX 
-sub_0807EAD0(0x1107,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0020)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0021)
-sub_0807E10C(sub_0807F3C8) // Ezlo Angry FX 
-sub_0807EAD0(0x1108,0x000c)
-sub_0807EA94()
-sub_0807E930(0x001c)
-sub_0807E10C(sub_0806D96C)// Ezlo Angry FX 
-sub_0807EAD0(0x1109,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0020)
-sub_0807EF80(0x000a)
-sub_0807E9D4()
-sub_0807E5F8(0x00000008)
-sub_0807E014()
-sub_0807E004()
-sub_0807E260(0x0000)
-sub_0807E050(0x0028)
-sub_0807E2E4()
-sub_0807E064(0xfff0)
-sub_0807E014()
-sub_0807E864()
-sub_0807E10C(sub_0806D944)  // Ezlo look at player
-sub_0807E930(0x0010)
-sub_0807EAD0(0x1114,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0020)
-sub_0807E878()
-sub_0807E024(0xffd0)
-sub_0807E864()
-sub_0807E9DC()
-sub_0807E124(sub_0807F5B0,0x0000003c)
-sub_0807E10C(sub_080791D0) 
-sub_0807E014()
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807EF80(0x000b)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E10C(sub_0806D944)// Ezlo look at player
-sub_0807E930(0x0010)
-sub_0807EAD0(0x110a,0x000c)
-sub_0807EA94()
-sub_0807E930(0x001f)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0010)
-sub_0807EAD0(0x110b,0x000c)
-sub_0807EA94()
-sub_0807E930(0x001f)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807EF80(0x0004)
-sub_0807E680(0x003c)
-sub_0807E930(0x0010)
-sub_0807EAD0(0x110c,0x000c)
-sub_0807EA94()
-sub_0807E930(0x001f)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0010)
-sub_0807EAD0(0x110d,0x000c)
-sub_0807EA94()
-sub_0807E930(0x001f)
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E930(0x0010)
-sub_0807EAD0(0x110e,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0018)
-sub_0807EBC0(0x0080)
-sub_0807E10C(sub_0806D908) 
-sub_0807EC1C(0x0010)
-sub_0807EF80(0x000a)
-sub_0807E9D4()
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E014()
-sub_0807E004()
-sub_0807E10C(sub_0806D944) // Ezlo look at player
-sub_0807E2E4()
-sub_0807E050(0x000e)
-sub_0807E2A8(0x3030)
-sub_0807E064(0x0020)
-sub_0807E024(0xffe6)
-sub_0807E864()
-sub_0807E930(0x0010)
-sub_0807E014()
-sub_0807EAD0(0x1115,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0018)
-sub_0807E878()
-sub_0807E024(0xffcc)
-sub_0807E014()
-sub_0807E864()
-sub_0807E10C(sub_0807F9A4)
-sub_0807E10C(sub_0807DF28)
-sub_0807EB8C()
-sub_0807E10C(sub_0806D944) // Ezlo look at player
-sub_0807E930(0x0010)
-sub_0807EAD0(0x110f,0x000c)
-sub_0807E930(0x0018)
-sub_0807EBC0(0x0080)
-sub_0807E10C(sub_0806D908)
-sub_0807EC1C(0x0050)
-sub_0807EA94()
-sub_0807E10C(sub_0807DF50) 
-sub_0807E878()
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E014()
-sub_0807E004()
-sub_0807E10C(sub_0806D944) // Ezlo look at player
-sub_0807E2E4()
-sub_0807E050(0x000e)
-sub_0807E2A8(0x3030)
-sub_0807E064(0x0020)
-sub_0807E024(0xffe6)
-sub_0807E864()
-sub_0807E930(0x0010)
-sub_0807E014()
-sub_0807EAD0(0x1115,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0018)
-sub_0807E878()
-sub_0807E024(0xffcc)
-sub_0807E014()
-sub_0807E864()
-sub_0807E10C(sub_0807F9A4) 
-sub_0807E10C(sub_0807DF28) 
-sub_0807EB8C()
-sub_0807E10C(sub_0806D944)  // Ezlo look at player
-sub_0807E930(0x0010)
-sub_0807EAD0(0x1110,0x000c)
-sub_0807E930(0x0018)
-sub_0807EBC0(0x0080)
-sub_0807E10C(sub_0806D908) 
-sub_0807EC1C(0x0050)
-sub_0807E930(0x0018)
-sub_0807EA94()
-sub_0807E10C(sub_0807DF50) 
-sub_0807E878()
-sub_0807E5F8(0x00000008)
-sub_0807E6AC(0x00000004)
-sub_0807E014()
-sub_0807E004()
-sub_0807E10C(sub_0806D944)  // Ezlo look at player
-sub_0807E2E4()
-sub_0807E050(0x000e)
-sub_0807E2A8(0x3030)
-sub_0807E064(0x0020)
-sub_0807E024(0xffe6)
-sub_0807E864()
-sub_0807E930(0x0010)
-sub_0807E014()
-sub_0807EAD0(0x1115,0x000c)
-sub_0807EA94()
-sub_0807E930(0x0018)
-sub_0807E878()
-sub_0807E024(0xffcc)
-sub_0807E014()
-sub_0807E864()
-sub_0807E10C(sub_0807F9A4) 
-sub_0807E10C(sub_0807DF28) 
-sub_0807EFE4()
-sub_0807EF80(0x000b)
-sub_0807EB8C()
-sub_0807E10C(sub_0806D944)  // Ezlo look at player
-sub_0807E930(0x0010)
-sub_0807EAD0(0x1111,0x000c)
-sub_0807E930(0x0018)
-sub_0807EBC0(0x0080)
-sub_0807E10C(sub_0806D8A0) 
-sub_0807EE30()
-sub_0807E064(0xfffc)
-sub_0807E930(0x001f)
-sub_0807EA94()
-sub_0807E8C4(0x08012b18)
-sub_0807E10C(sub_0806D9A4) 
-sub_0807EF80(0x0008)
-sub_0807E680(0x0078)
-sub_0807EFAC(0x000e)
-sub_0807E004()
-sub_0807E8E4_2()
-sub_0807EB28(0x1112)
-sub_0807E014()
-sub_0807EA94()
-sub_0807E5F8(0x00000008)
-sub_0807EF80(0x0006)
-END_SCRIPT()
+//START_SCRIPT(gUnk_080126FC)
+asm(".section .rodata");
+
 // clang-format on
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 62f85f4c..bb0dbce3 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -199,25 +199,25 @@ parameters = {
     's': {
         'length': 1,
         'param': 's',
-        'expr': 'asm(".short " #s);',
+        'expr': '	.short \s',
         'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0]
     },
     'w': {
         'length': 2,
         'param': 'w',
-        'expr': 'asm(".word " #w);',
+        'expr': '	.word \w',
         'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
     },
     'ss': {
         'length': 2,
         'param': 'a,b',
-        'expr': 'asm(".short " #a);asm(".short " #b);',
+        'expr': '	.short \\a\n	.short \\b',
         'read': lambda ctx: ','.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
     },
     'ww': {
         'length': 4,
         'param': 'a,b',
-        'expr': 'asm(".word " #a);asm(".word " #b);',
+        'expr': '	.word \\a\n	.word \\b',
         'read': lambda ctx: ','.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
     },
 }
@@ -251,7 +251,7 @@ def ExecuteScriptCommandSet(ctx: Context):
         raise Exception('Call with ' + (unk_06-1) +' length, while length of ' + params['length']+' defined')
 
 
-    print(command['fun'] + '(' + params['read'](ctx) + ')')
+    print(command['fun'] + ' ' + params['read'](ctx))
 
     # Execute script
     ctx.ptr += unk_06*2
@@ -271,14 +271,22 @@ def disassemble_script(input_data):
     # Print rest (did not manage to get there)
 
     print(',\n'.join(barray_to_u16_hex(ctx.data[ctx.ptr:])))
+    
 
 def generate_macros():
-    print('#ifndef SCRIPT_MACROS_H')
-    print('#define SCRIPT_MACROS_H')
-    print('// Generated by disassemble_script.py')
-    print('#define START_SCRIPT(name) asm(".globl "#name); asm(".section .rodata"); asm(#name":");')
-    print('#define END_SCRIPT()')
-    #print('#define WORD_TO_SHORTS(word) (unsigned short)word & 0xffff,(unsigned short)word >> 16')
+    print('@ All the macro functions for scripts')
+    print('@ Generated by disassemble_script.py')
+
+    print('.macro SCRIPT_START name')
+    print('	.globl \\name')
+    print('	.section .rodata')
+    print('\\name:')
+    print('.endm')
+
+    print('.macro SCRIPT_END')
+    print('	.short 0xffff')
+    print('.endm')
+
     print('')
     for num, command in enumerate(commands):
         if not 'params' in command:
@@ -289,9 +297,16 @@ def generate_macros():
 
         params = parameters[command['params']]
         id = ((params['length']+1) << 0xA) + num
-        print('#define ' + command['fun'] + '(' + params['param'] + ') asm(".short '+u16_to_hex(id)+'");' + params['expr'])
 
-    print ('#endif')
+        print(f'.macro {command["fun"]} {params["param"]}')
+        print(f'	.short {u16_to_hex(id)}')
+        if params['expr'] != '':
+            print(params['expr'])
+        print('.endm')
+        print('')
+
+        #print('#define ' + command['fun'] + '(' + params['param'] + ') asm(".short '+u16_to_hex(id)+'");' + params['expr'])
+    print('')
 
 def main():
 

From e94df6de4adbd708b888d8bfef1649f5b0f5a711 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 21:11:00 +0100
Subject: [PATCH 07/46] Move all scripts to data/scripts.s

---
 asm/code_0800857C.s                           | 2764 --------------
 asm/code_08012AB0.s                           |  384 --
 asm/{code_0801606C.s => code_08016984.s}      |   62 -
 asm/macros/script.inc                         |   76 +-
 data/scripts.s                                | 3214 +++++++++++++++++
 data/scripts/{ezlo_angry.s => ezlo_angry.inc} |    2 -
 data/scripts/npc4e_fusion.inc                 |   19 +
 linker.ld                                     |    8 +-
 src/scripts/ezlo_angry.c                      |   18 -
 .../script_disassembler.py                    |   40 +-
 10 files changed, 3328 insertions(+), 3259 deletions(-)
 delete mode 100644 asm/code_08012AB0.s
 rename asm/{code_0801606C.s => code_08016984.s} (69%)
 create mode 100644 data/scripts.s
 rename data/scripts/{ezlo_angry.s => ezlo_angry.inc} (99%)
 create mode 100644 data/scripts/npc4e_fusion.inc
 delete mode 100644 src/scripts/ezlo_angry.c

diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s
index 0e9c1fc4..3522fc17 100644
--- a/asm/code_0800857C.s
+++ b/asm/code_0800857C.s
@@ -782,2769 +782,5 @@ _08008B50: .4byte 0x00004000
 _08008B54: .4byte gUnk_08007CAC
 _08008B58: .4byte gPlayerEntity
 
-gUnk_08008B5C:: @ 08008B5C
-	.incbin "baserom.gba", 0x008B5C, 0x0000034
-
-gUnk_08008B90:: @ 08008B90
-	.incbin "baserom.gba", 0x008B90, 0x0000030
-
-gUnk_08008BC0:: @ 08008BC0
-	.incbin "baserom.gba", 0x008BC0, 0x000008E
-
-gUnk_08008C4E:: @ 08008C4E
-	.incbin "baserom.gba", 0x008C4E, 0x0000016
-
-gUnk_08008C64:: @ 08008C64
-	.incbin "baserom.gba", 0x008C64, 0x0000009
-
-gUnk_08008C6D:: @ 08008C6D
-	.incbin "baserom.gba", 0x008C6D, 0x0000011
-
-gUnk_08008C7E:: @ 08008C7E
-	.incbin "baserom.gba", 0x008C7E, 0x000003B
-
-gUnk_08008CB9:: @ 08008CB9
-	.incbin "baserom.gba", 0x008CB9, 0x0000097
-
-gUnk_08008D50:: @ 08008D50
-	.incbin "baserom.gba", 0x008D50, 0x000003C
-
-gUnk_08008D8C:: @ 08008D8C
-	.incbin "baserom.gba", 0x008D8C, 0x0000034
-
-gUnk_08008DC0:: @ 08008DC0
-	.incbin "baserom.gba", 0x008DC0, 0x0000048
-
-gUnk_08008E08:: @ 08008E08
-	.incbin "baserom.gba", 0x008E08, 0x0000002
-
-gUnk_08008E0A:: @ 08008E0A
-	.incbin "baserom.gba", 0x008E0A, 0x0000102
-
-gUnk_08008F0C:: @ 08008F0C
-	.incbin "baserom.gba", 0x008F0C, 0x000000A
-
-gUnk_08008F16:: @ 08008F16
-	.incbin "baserom.gba", 0x008F16, 0x0000010
-
-gUnk_08008F26:: @ 08008F26
-	.incbin "baserom.gba", 0x008F26, 0x000006A
-
-gUnk_08008F90:: @ 08008F90
-	.incbin "baserom.gba", 0x008F90, 0x0000030
-
-gUnk_08008FC0:: @ 08008FC0
-	.incbin "baserom.gba", 0x008FC0, 0x0000011
-
-gUnk_08008FD1:: @ 08008FD1
-	.incbin "baserom.gba", 0x008FD1, 0x000002B
-
-gUnk_08008FFC:: @ 08008FFC
-	.incbin "baserom.gba", 0x008FFC, 0x000000C
-
-gUnk_08009008:: @ 08009008
-	.incbin "baserom.gba", 0x009008, 0x0000017
-
-gUnk_0800901F:: @ 0800901F
-	.incbin "baserom.gba", 0x00901F, 0x000001D
-
-gUnk_0800903C:: @ 0800903C
-	.incbin "baserom.gba", 0x00903C, 0x0000044
-
-gUnk_08009080:: @ 08009080
-	.incbin "baserom.gba", 0x009080, 0x000005B
-
-gUnk_080090DB:: @ 080090DB
-	.incbin "baserom.gba", 0x0090DB, 0x00000BD
-
-gUnk_08009198:: @ 08009198
-	.incbin "baserom.gba", 0x009198, 0x000006F
-
-gUnk_08009207:: @ 08009207
-	.incbin "baserom.gba", 0x009207, 0x000006D
-
-gUnk_08009274:: @ 08009274
-	.incbin "baserom.gba", 0x009274, 0x0000034
-
-gUnk_080092A8:: @ 080092A8
-	.incbin "baserom.gba", 0x0092A8, 0x000002C
-
-gUnk_080092D4:: @ 080092D4
-	.incbin "baserom.gba", 0x0092D4, 0x000001C
-
-gUnk_080092F0:: @ 080092F0
-	.incbin "baserom.gba", 0x0092F0, 0x0000018
-
-gUnk_08009308:: @ 08009308
-	.incbin "baserom.gba", 0x009308, 0x0000010
-
-gUnk_08009318:: @ 08009318
-	.incbin "baserom.gba", 0x009318, 0x0000008
-
-gUnk_08009320:: @ 08009320
-	.incbin "baserom.gba", 0x009320, 0x0000020
-
-gUnk_08009340:: @ 08009340
-	.incbin "baserom.gba", 0x009340, 0x0000008
-
-gUnk_08009348:: @ 08009348
-	.incbin "baserom.gba", 0x009348, 0x000004B
-
-gUnk_08009393:: @ 08009393
-	.incbin "baserom.gba", 0x009393, 0x0000044
-
-gUnk_080093D7:: @ 080093D7
-	.incbin "baserom.gba", 0x0093D7, 0x0000030
-
-gUnk_08009407:: @ 08009407
-	.incbin "baserom.gba", 0x009407, 0x000007F
-
-gUnk_08009486:: @ 08009486
-	.incbin "baserom.gba", 0x009486, 0x000001E
-
-gUnk_080094A4:: @ 080094A4
-	.incbin "baserom.gba", 0x0094A4, 0x0000028
-
-gUnk_080094CC:: @ 080094CC
-	.incbin "baserom.gba", 0x0094CC, 0x000000B
-
-gUnk_080094D7:: @ 080094D7
-	.incbin "baserom.gba", 0x0094D7, 0x0000025
-
-gUnk_080094FC:: @ 080094FC
-	.incbin "baserom.gba", 0x0094FC, 0x0000007
-
-gUnk_08009503:: @ 08009503
-	.incbin "baserom.gba", 0x009503, 0x0000005
-
-gUnk_08009508:: @ 08009508
-	.incbin "baserom.gba", 0x009508, 0x0000030
-
-gUnk_08009538:: @ 08009538
-	.incbin "baserom.gba", 0x009538, 0x000003C
-
-gUnk_08009574:: @ 08009574
-	.incbin "baserom.gba", 0x009574, 0x0000058
-
-gUnk_080095CC:: @ 080095CC
-	.incbin "baserom.gba", 0x0095CC, 0x0000060
-
-gUnk_0800962C:: @ 0800962C
-	.incbin "baserom.gba", 0x00962C, 0x000006C
-
-gUnk_08009698:: @ 08009698
-	.incbin "baserom.gba", 0x009698, 0x000006C
-
-gUnk_08009704:: @ 08009704
-	.incbin "baserom.gba", 0x009704, 0x0000002
-
-gUnk_08009706:: @ 08009706
-	.incbin "baserom.gba", 0x009706, 0x000003A
-
-gUnk_08009740:: @ 08009740
-	.incbin "baserom.gba", 0x009740, 0x0000038
-
-gUnk_08009778:: @ 08009778
-	.incbin "baserom.gba", 0x009778, 0x000000E
-
-gUnk_08009786:: @ 08009786
-	.incbin "baserom.gba", 0x009786, 0x000001B
-
-gUnk_080097A1:: @ 080097A1
-	.incbin "baserom.gba", 0x0097A1, 0x000004F
-
-gUnk_080097F0:: @ 080097F0
-	.incbin "baserom.gba", 0x0097F0, 0x0000048
-
-gUnk_08009838:: @ 08009838
-	.incbin "baserom.gba", 0x009838, 0x000009C
-
-gUnk_080098D4:: @ 080098D4
-	.incbin "baserom.gba", 0x0098D4, 0x0000044
-
-gUnk_08009918:: @ 08009918
-	.incbin "baserom.gba", 0x009918, 0x0000028
-
-gUnk_08009940:: @ 08009940
-	.incbin "baserom.gba", 0x009940, 0x0000010
-
-gUnk_08009950:: @ 08009950
-	.incbin "baserom.gba", 0x009950, 0x000008C
-
-gUnk_080099DC:: @ 080099DC
-	.incbin "baserom.gba", 0x0099DC, 0x0000028
-
-gUnk_08009A04:: @ 08009A04
-	.incbin "baserom.gba", 0x009A04, 0x0000003
-
-gUnk_08009A07:: @ 08009A07
-	.incbin "baserom.gba", 0x009A07, 0x0000025
-
-gUnk_08009A2C:: @ 08009A2C
-	.incbin "baserom.gba", 0x009A2C, 0x0000008
-
-gUnk_08009A34:: @ 08009A34
-	.incbin "baserom.gba", 0x009A34, 0x000001C
-
-gUnk_08009A50:: @ 08009A50
-	.incbin "baserom.gba", 0x009A50, 0x0000027
-
-gUnk_08009A77:: @ 08009A77
-	.incbin "baserom.gba", 0x009A77, 0x000000A
-
-gUnk_08009A81:: @ 08009A81
-	.incbin "baserom.gba", 0x009A81, 0x0000003
-
-gUnk_08009A84:: @ 08009A84
-	.incbin "baserom.gba", 0x009A84, 0x0000037
-
-gUnk_08009ABB:: @ 08009ABB
-	.incbin "baserom.gba", 0x009ABB, 0x000003D
-
-gUnk_08009AF8:: @ 08009AF8
-	.incbin "baserom.gba", 0x009AF8, 0x0000038
-
-gUnk_08009B30:: @ 08009B30
-	.incbin "baserom.gba", 0x009B30, 0x0000033
-
-gUnk_08009B63:: @ 08009B63
-	.incbin "baserom.gba", 0x009B63, 0x0000015
-
-gUnk_08009B78:: @ 08009B78
-	.incbin "baserom.gba", 0x009B78, 0x00000F0
-
-gUnk_08009C68:: @ 08009C68
-	.incbin "baserom.gba", 0x009C68, 0x0000017
-
-gUnk_08009C7F:: @ 08009C7F
-	.incbin "baserom.gba", 0x009C7F, 0x000001F
-
-gUnk_08009C9E:: @ 08009C9E
-	.incbin "baserom.gba", 0x009C9E, 0x0000062
-
-gUnk_08009D00:: @ 08009D00
-	.incbin "baserom.gba", 0x009D00, 0x000006C
-
-gUnk_08009D6C:: @ 08009D6C
-	.incbin "baserom.gba", 0x009D6C, 0x000000B
-
-gUnk_08009D77:: @ 08009D77
-	.incbin "baserom.gba", 0x009D77, 0x0000039
-
-gUnk_08009DB0:: @ 08009DB0
-	.incbin "baserom.gba", 0x009DB0, 0x000003C
-
-gUnk_08009DEC:: @ 08009DEC
-	.incbin "baserom.gba", 0x009DEC, 0x000004C
-
-gUnk_08009E38:: @ 08009E38
-	.incbin "baserom.gba", 0x009E38, 0x0000020
-
-gUnk_08009E58:: @ 08009E58
-	.incbin "baserom.gba", 0x009E58, 0x0000030
-
-gUnk_08009E88:: @ 08009E88
-	.incbin "baserom.gba", 0x009E88, 0x0000016
-
-gUnk_08009E9E:: @ 08009E9E
-	.incbin "baserom.gba", 0x009E9E, 0x000000B
-
-gUnk_08009EA9:: @ 08009EA9
-	.incbin "baserom.gba", 0x009EA9, 0x000000E
-
-gUnk_08009EB7:: @ 08009EB7
-	.incbin "baserom.gba", 0x009EB7, 0x0000015
-
-gUnk_08009ECC:: @ 08009ECC
-	.incbin "baserom.gba", 0x009ECC, 0x0000024
-
-gUnk_08009EF0:: @ 08009EF0
-	.incbin "baserom.gba", 0x009EF0, 0x0000017
-
-gUnk_08009F07:: @ 08009F07
-	.incbin "baserom.gba", 0x009F07, 0x000000D
-
-gUnk_08009F14:: @ 08009F14
-	.incbin "baserom.gba", 0x009F14, 0x0000025
-
-gUnk_08009F39:: @ 08009F39
-	.incbin "baserom.gba", 0x009F39, 0x0000039
-
-gUnk_08009F72:: @ 08009F72
-	.incbin "baserom.gba", 0x009F72, 0x00000F2
-
-gUnk_0800A064:: @ 0800A064
-	.incbin "baserom.gba", 0x00A064, 0x000001D
-
-gUnk_0800A081:: @ 0800A081
-	.incbin "baserom.gba", 0x00A081, 0x0000033
-
-gUnk_0800A0B4:: @ 0800A0B4
-	.incbin "baserom.gba", 0x00A0B4, 0x0000048
-
-gUnk_0800A0FC:: @ 0800A0FC
-	.incbin "baserom.gba", 0x00A0FC, 0x000000E
-
-gUnk_0800A10A:: @ 0800A10A
-	.incbin "baserom.gba", 0x00A10A, 0x0000005
-
-gUnk_0800A10F:: @ 0800A10F
-	.incbin "baserom.gba", 0x00A10F, 0x0000015
-
-gUnk_0800A124:: @ 0800A124
-	.incbin "baserom.gba", 0x00A124, 0x0000010
-
-gUnk_0800A134:: @ 0800A134
-	.incbin "baserom.gba", 0x00A134, 0x0000080
-
-gUnk_0800A1B4:: @ 0800A1B4
-	.incbin "baserom.gba", 0x00A1B4, 0x0000024
-
-gUnk_0800A1D8:: @ 0800A1D8
-	.incbin "baserom.gba", 0x00A1D8, 0x000004C
-
-gUnk_0800A224:: @ 0800A224
-	.incbin "baserom.gba", 0x00A224, 0x000003C
-
-gUnk_0800A260:: @ 0800A260
-	.incbin "baserom.gba", 0x00A260, 0x00000E0
-
-gUnk_0800A340:: @ 0800A340
-	.incbin "baserom.gba", 0x00A340, 0x0000063
-
-gUnk_0800A3A3:: @ 0800A3A3
-	.incbin "baserom.gba", 0x00A3A3, 0x0000006
-
-gUnk_0800A3A9:: @ 0800A3A9
-	.incbin "baserom.gba", 0x00A3A9, 0x0000001
-
-gUnk_0800A3AA:: @ 0800A3AA
-	.incbin "baserom.gba", 0x00A3AA, 0x000002E
-
-gUnk_0800A3D8:: @ 0800A3D8
-	.incbin "baserom.gba", 0x00A3D8, 0x0000128
-
-gUnk_0800A500:: @ 0800A500
-	.incbin "baserom.gba", 0x00A500, 0x0000090
-
-gUnk_0800A590:: @ 0800A590
-	.incbin "baserom.gba", 0x00A590, 0x0000016
-
-gUnk_0800A5A6:: @ 0800A5A6
-	.incbin "baserom.gba", 0x00A5A6, 0x00000B6
-
-gUnk_0800A65C:: @ 0800A65C
-	.incbin "baserom.gba", 0x00A65C, 0x0000022
-
-gUnk_0800A67E:: @ 0800A67E
-	.incbin "baserom.gba", 0x00A67E, 0x0000002
-
-gUnk_0800A680:: @ 0800A680
-	.incbin "baserom.gba", 0x00A680, 0x0000024
-
-gUnk_0800A6A4:: @ 0800A6A4
-	.incbin "baserom.gba", 0x00A6A4, 0x0000007
-
-gUnk_0800A6AB:: @ 0800A6AB
-	.incbin "baserom.gba", 0x00A6AB, 0x0000029
-
-gUnk_0800A6D4:: @ 0800A6D4
-	.incbin "baserom.gba", 0x00A6D4, 0x0000030
-
-gUnk_0800A704:: @ 0800A704
-	.incbin "baserom.gba", 0x00A704, 0x0000030
-
-gUnk_0800A734:: @ 0800A734
-	.incbin "baserom.gba", 0x00A734, 0x0000016
-
-gUnk_0800A74A:: @ 0800A74A
-	.incbin "baserom.gba", 0x00A74A, 0x000001A
-
-gUnk_0800A764:: @ 0800A764
-	.incbin "baserom.gba", 0x00A764, 0x0000080
-
-gUnk_0800A7E4:: @ 0800A7E4
-	.incbin "baserom.gba", 0x00A7E4, 0x0000004
-
-gUnk_0800A7E8:: @ 0800A7E8
-	.incbin "baserom.gba", 0x00A7E8, 0x000002E
-
-gUnk_0800A816:: @ 0800A816
-	.incbin "baserom.gba", 0x00A816, 0x000000A
-
-gUnk_0800A820:: @ 0800A820
-	.incbin "baserom.gba", 0x00A820, 0x000003C
-
-gUnk_0800A85C:: @ 0800A85C
-	.incbin "baserom.gba", 0x00A85C, 0x000003C
-
-gUnk_0800A898:: @ 0800A898
-	.incbin "baserom.gba", 0x00A898, 0x000003C
-
-gUnk_0800A8D4:: @ 0800A8D4
-	.incbin "baserom.gba", 0x00A8D4, 0x0000034
-
-gUnk_0800A908:: @ 0800A908
-	.incbin "baserom.gba", 0x00A908, 0x0000008
-
-gUnk_0800A910:: @ 0800A910
-	.incbin "baserom.gba", 0x00A910, 0x0000054
-
-gUnk_0800A964:: @ 0800A964
-	.incbin "baserom.gba", 0x00A964, 0x0000024
-
-gUnk_0800A988:: @ 0800A988
-	.incbin "baserom.gba", 0x00A988, 0x0000024
-
-gUnk_0800A9AC:: @ 0800A9AC
-	.incbin "baserom.gba", 0x00A9AC, 0x0000024
-
-gUnk_0800A9D0:: @ 0800A9D0
-	.incbin "baserom.gba", 0x00A9D0, 0x0000024
-
-gUnk_0800A9F4:: @ 0800A9F4
-	.incbin "baserom.gba", 0x00A9F4, 0x000000F
-
-gUnk_0800AA03:: @ 0800AA03
-	.incbin "baserom.gba", 0x00AA03, 0x0000045
-
-gUnk_0800AA48:: @ 0800AA48
-	.incbin "baserom.gba", 0x00AA48, 0x0000024
-
-gUnk_0800AA6C:: @ 0800AA6C
-	.incbin "baserom.gba", 0x00AA6C, 0x0000024
-
-gUnk_0800AA90:: @ 0800AA90
-	.incbin "baserom.gba", 0x00AA90, 0x0000024
-
-gUnk_0800AAB4:: @ 0800AAB4
-	.incbin "baserom.gba", 0x00AAB4, 0x0000024
-
-gUnk_0800AAD8:: @ 0800AAD8
-	.incbin "baserom.gba", 0x00AAD8, 0x0000030
-
-gUnk_0800AB08:: @ 0800AB08
-	.incbin "baserom.gba", 0x00AB08, 0x000001B
-
-gUnk_0800AB23:: @ 0800AB23
-	.incbin "baserom.gba", 0x00AB23, 0x000002C
-
-gUnk_0800AB4F:: @ 0800AB4F
-	.incbin "baserom.gba", 0x00AB4F, 0x00000A1
-
-gUnk_0800ABF0:: @ 0800ABF0
-	.incbin "baserom.gba", 0x00ABF0, 0x0000034
-
-gUnk_0800AC24:: @ 0800AC24
-	.incbin "baserom.gba", 0x00AC24, 0x0000049
-
-gUnk_0800AC6D:: @ 0800AC6D
-	.incbin "baserom.gba", 0x00AC6D, 0x0000048
-
-gUnk_0800ACB5:: @ 0800ACB5
-	.incbin "baserom.gba", 0x00ACB5, 0x0000007
-
-gUnk_0800ACBC:: @ 0800ACBC
-	.incbin "baserom.gba", 0x00ACBC, 0x0000024
-
-gUnk_0800ACE0:: @ 0800ACE0
-	.incbin "baserom.gba", 0x00ACE0, 0x0000074
-
-gUnk_0800AD54:: @ 0800AD54
-	.incbin "baserom.gba", 0x00AD54, 0x0000020
-
-gUnk_0800AD74:: @ 0800AD74
-	.incbin "baserom.gba", 0x00AD74, 0x0000033
-
-gUnk_0800ADA7:: @ 0800ADA7
-	.incbin "baserom.gba", 0x00ADA7, 0x000000D
-
-gUnk_0800ADB4:: @ 0800ADB4
-	.incbin "baserom.gba", 0x00ADB4, 0x00000F0
-
-gUnk_0800AEA4:: @ 0800AEA4
-	.incbin "baserom.gba", 0x00AEA4, 0x0000038
-
-gUnk_0800AEDC:: @ 0800AEDC
-	.incbin "baserom.gba", 0x00AEDC, 0x000003C
-
-gUnk_0800AF18:: @ 0800AF18
-	.incbin "baserom.gba", 0x00AF18, 0x000002C
-
-gUnk_0800AF44:: @ 0800AF44
-	.incbin "baserom.gba", 0x00AF44, 0x0000024
-
-gUnk_0800AF68:: @ 0800AF68
-	.incbin "baserom.gba", 0x00AF68, 0x0000016
-
-gUnk_0800AF7E:: @ 0800AF7E
-	.incbin "baserom.gba", 0x00AF7E, 0x000000E
-
-gUnk_0800AF8C:: @ 0800AF8C
-	.incbin "baserom.gba", 0x00AF8C, 0x000001B
-
-gUnk_0800AFA7:: @ 0800AFA7
-	.incbin "baserom.gba", 0x00AFA7, 0x0000009
-
-gUnk_0800AFB0:: @ 0800AFB0
-	.incbin "baserom.gba", 0x00AFB0, 0x0000038
-
-gUnk_0800AFE8:: @ 0800AFE8
-	.incbin "baserom.gba", 0x00AFE8, 0x0000024
-
-gUnk_0800B00C:: @ 0800B00C
-	.incbin "baserom.gba", 0x00B00C, 0x00000A0
-
-gUnk_0800B0AC:: @ 0800B0AC
-	.incbin "baserom.gba", 0x00B0AC, 0x0000004
-
-gUnk_0800B0B0:: @ 0800B0B0
-	.incbin "baserom.gba", 0x00B0B0, 0x0000020
-
-gUnk_0800B0D0:: @ 0800B0D0
-	.incbin "baserom.gba", 0x00B0D0, 0x00000A7
-
-gUnk_0800B177:: @ 0800B177
-	.incbin "baserom.gba", 0x00B177, 0x0000005
-
-gUnk_0800B17C:: @ 0800B17C
-	.incbin "baserom.gba", 0x00B17C, 0x0000044
-
-gUnk_0800B1C0:: @ 0800B1C0
-	.incbin "baserom.gba", 0x00B1C0, 0x0000040
-
-gUnk_0800B200:: @ 0800B200
-	.incbin "baserom.gba", 0x00B200, 0x0000054
-
-gUnk_0800B254:: @ 0800B254
-	.incbin "baserom.gba", 0x00B254, 0x0000030
-
-gUnk_0800B284:: @ 0800B284
-	.incbin "baserom.gba", 0x00B284, 0x0000030
-
-gUnk_0800B2B4:: @ 0800B2B4
-	.incbin "baserom.gba", 0x00B2B4, 0x0000054
-
-gUnk_0800B308:: @ 0800B308
-	.incbin "baserom.gba", 0x00B308, 0x000001A
-
-gUnk_0800B322:: @ 0800B322
-	.incbin "baserom.gba", 0x00B322, 0x0000007
-
-gUnk_0800B329:: @ 0800B329
-	.incbin "baserom.gba", 0x00B329, 0x000001F
-
-gUnk_0800B348:: @ 0800B348
-	.incbin "baserom.gba", 0x00B348, 0x0000014
-
-gUnk_0800B35C:: @ 0800B35C
-	.incbin "baserom.gba", 0x00B35C, 0x0000018
-
-gUnk_0800B374:: @ 0800B374
-	.incbin "baserom.gba", 0x00B374, 0x0000030
-
-gUnk_0800B3A4:: @ 0800B3A4
-	.incbin "baserom.gba", 0x00B3A4, 0x000006B
-
-gUnk_0800B40F:: @ 0800B40F
-	.incbin "baserom.gba", 0x00B40F, 0x000000D
-
-gUnk_0800B41C:: @ 0800B41C
-	.incbin "baserom.gba", 0x00B41C, 0x0000090
-
-gUnk_0800B4AC:: @ 0800B4AC
-	.incbin "baserom.gba", 0x00B4AC, 0x000005C
-
-gUnk_0800B508:: @ 0800B508
-	.incbin "baserom.gba", 0x00B508, 0x0000007
-
-gUnk_0800B50F:: @ 0800B50F
-	.incbin "baserom.gba", 0x00B50F, 0x000003D
-
-gUnk_0800B54C:: @ 0800B54C
-	.incbin "baserom.gba", 0x00B54C, 0x0000028
-
-gUnk_0800B574:: @ 0800B574
-	.incbin "baserom.gba", 0x00B574, 0x0000050
-
-gUnk_0800B5C4:: @ 0800B5C4
-	.incbin "baserom.gba", 0x00B5C4, 0x0000028
-
-gUnk_0800B5EC:: @ 0800B5EC
-	.incbin "baserom.gba", 0x00B5EC, 0x0000028
-
-gUnk_0800B614:: @ 0800B614
-	.incbin "baserom.gba", 0x00B614, 0x00000B4
-
-gUnk_0800B6C8:: @ 0800B6C8
-	.incbin "baserom.gba", 0x00B6C8, 0x0000040
-
-gUnk_0800B708:: @ 0800B708
-	.incbin "baserom.gba", 0x00B708, 0x0000017
-
-gUnk_0800B71F:: @ 0800B71F
-	.incbin "baserom.gba", 0x00B71F, 0x0000011
-
-gUnk_0800B730:: @ 0800B730
-	.incbin "baserom.gba", 0x00B730, 0x0000094
-
-gUnk_0800B7C4:: @ 0800B7C4
-	.incbin "baserom.gba", 0x00B7C4, 0x000008B
-
-gUnk_0800B84F:: @ 0800B84F
-	.incbin "baserom.gba", 0x00B84F, 0x0000012
-
-gUnk_0800B861:: @ 0800B861
-	.incbin "baserom.gba", 0x00B861, 0x0000027
-
-gUnk_0800B888:: @ 0800B888
-	.incbin "baserom.gba", 0x00B888, 0x0000018
-
-gUnk_0800B8A0:: @ 0800B8A0
-	.incbin "baserom.gba", 0x00B8A0, 0x0000018
-
-gUnk_0800B8B8:: @ 0800B8B8
-	.incbin "baserom.gba", 0x00B8B8, 0x000002C
-
-gUnk_0800B8E4:: @ 0800B8E4
-	.incbin "baserom.gba", 0x00B8E4, 0x0000022
-
-gUnk_0800B906:: @ 0800B906
-	.incbin "baserom.gba", 0x00B906, 0x0000016
-
-gUnk_0800B91C:: @ 0800B91C
-	.incbin "baserom.gba", 0x00B91C, 0x0000048
-
-gUnk_0800B964:: @ 0800B964
-	.incbin "baserom.gba", 0x00B964, 0x0000050
-
-gUnk_0800B9B4:: @ 0800B9B4
-	.incbin "baserom.gba", 0x00B9B4, 0x0000088
-
-gUnk_0800BA3C:: @ 0800BA3C
-	.incbin "baserom.gba", 0x00BA3C, 0x000003C
-
-gUnk_0800BA78:: @ 0800BA78
-	.incbin "baserom.gba", 0x00BA78, 0x0000054
-
-gUnk_0800BACC:: @ 0800BACC
-	.incbin "baserom.gba", 0x00BACC, 0x0000034
-
-gUnk_0800BB00:: @ 0800BB00
-	.incbin "baserom.gba", 0x00BB00, 0x0000008
-
-gUnk_0800BB08:: @ 0800BB08
-	.incbin "baserom.gba", 0x00BB08, 0x0000012
-
-gUnk_0800BB1A:: @ 0800BB1A
-	.incbin "baserom.gba", 0x00BB1A, 0x0000016
-
-gUnk_0800BB30:: @ 0800BB30
-	.incbin "baserom.gba", 0x00BB30, 0x0000034
-
-gUnk_0800BB64:: @ 0800BB64
-	.incbin "baserom.gba", 0x00BB64, 0x0000010
-
-gUnk_0800BB74:: @ 0800BB74
-	.incbin "baserom.gba", 0x00BB74, 0x0000030
-
-gUnk_0800BBA4:: @ 0800BBA4
-	.incbin "baserom.gba", 0x00BBA4, 0x0000037
-
-gUnk_0800BBDB:: @ 0800BBDB
-	.incbin "baserom.gba", 0x00BBDB, 0x0000001
-
-gUnk_0800BBDC:: @ 0800BBDC
-	.incbin "baserom.gba", 0x00BBDC, 0x000002C
-
-gUnk_0800BC08:: @ 0800BC08
-	.incbin "baserom.gba", 0x00BC08, 0x000001A
-
-gUnk_0800BC22:: @ 0800BC22
-	.incbin "baserom.gba", 0x00BC22, 0x000002E
-
-gUnk_0800BC50:: @ 0800BC50
-	.incbin "baserom.gba", 0x00BC50, 0x000005E
-
-gUnk_0800BCAE:: @ 0800BCAE
-	.incbin "baserom.gba", 0x00BCAE, 0x0000009
-
-gUnk_0800BCB7:: @ 0800BCB7
-	.incbin "baserom.gba", 0x00BCB7, 0x0000007
-
-gUnk_0800BCBE:: @ 0800BCBE
-	.incbin "baserom.gba", 0x00BCBE, 0x000002A
-
-gUnk_0800BCE8:: @ 0800BCE8
-	.incbin "baserom.gba", 0x00BCE8, 0x0000020
-
-gUnk_0800BD08:: @ 0800BD08
-	.incbin "baserom.gba", 0x00BD08, 0x0000068
-
-gUnk_0800BD70:: @ 0800BD70
-	.incbin "baserom.gba", 0x00BD70, 0x0000008
-
-gUnk_0800BD78:: @ 0800BD78
-	.incbin "baserom.gba", 0x00BD78, 0x0000034
-
-gUnk_0800BDAC:: @ 0800BDAC
-	.incbin "baserom.gba", 0x00BDAC, 0x0000018
-
-gUnk_0800BDC4:: @ 0800BDC4
-	.incbin "baserom.gba", 0x00BDC4, 0x0000058
-
-gUnk_0800BE1C:: @ 0800BE1C
-	.incbin "baserom.gba", 0x00BE1C, 0x0000038
-
-gUnk_0800BE54:: @ 0800BE54
-	.incbin "baserom.gba", 0x00BE54, 0x0000078
-
-gUnk_0800BECC:: @ 0800BECC
-	.incbin "baserom.gba", 0x00BECC, 0x0000048
-
-gUnk_0800BF14:: @ 0800BF14
-	.incbin "baserom.gba", 0x00BF14, 0x0000024
-
-gUnk_0800BF38:: @ 0800BF38
-	.incbin "baserom.gba", 0x00BF38, 0x0000012
-
-gUnk_0800BF4A:: @ 0800BF4A
-	.incbin "baserom.gba", 0x00BF4A, 0x0000026
-
-gUnk_0800BF70:: @ 0800BF70
-	.incbin "baserom.gba", 0x00BF70, 0x000004F
-
-gUnk_0800BFBF:: @ 0800BFBF
-	.incbin "baserom.gba", 0x00BFBF, 0x0000022
-
-gUnk_0800BFE1:: @ 0800BFE1
-	.incbin "baserom.gba", 0x00BFE1, 0x0000002
-
-gUnk_0800BFE3:: @ 0800BFE3
-	.incbin "baserom.gba", 0x00BFE3, 0x0000021
-
-gUnk_0800C004:: @ 0800C004
-	.incbin "baserom.gba", 0x00C004, 0x0000003
-
-gUnk_0800C007:: @ 0800C007
-	.incbin "baserom.gba", 0x00C007, 0x000001D
-
-gUnk_0800C024:: @ 0800C024
-	.incbin "baserom.gba", 0x00C024, 0x0000057
-
-gUnk_0800C07B:: @ 0800C07B
-	.incbin "baserom.gba", 0x00C07B, 0x0000035
-
-gUnk_0800C0B0:: @ 0800C0B0
-	.incbin "baserom.gba", 0x00C0B0, 0x0000017
-
-gUnk_0800C0C7:: @ 0800C0C7
-	.incbin "baserom.gba", 0x00C0C7, 0x000000C
-
-gUnk_0800C0D3:: @ 0800C0D3
-	.incbin "baserom.gba", 0x00C0D3, 0x0000015
-
-gUnk_0800C0E8:: @ 0800C0E8
-	.incbin "baserom.gba", 0x00C0E8, 0x000002B
-
-gUnk_0800C113:: @ 0800C113
-	.incbin "baserom.gba", 0x00C113, 0x0000034
-
-gUnk_0800C147:: @ 0800C147
-	.incbin "baserom.gba", 0x00C147, 0x0000019
-
-gUnk_0800C160:: @ 0800C160
-	.incbin "baserom.gba", 0x00C160, 0x0000078
-
-gUnk_0800C1D8:: @ 0800C1D8
-	.incbin "baserom.gba", 0x00C1D8, 0x000002C
-
-gUnk_0800C204:: @ 0800C204
-	.incbin "baserom.gba", 0x00C204, 0x0000003
-
-gUnk_0800C207:: @ 0800C207
-	.incbin "baserom.gba", 0x00C207, 0x0000001
-
-gUnk_0800C208:: @ 0800C208
-	.incbin "baserom.gba", 0x00C208, 0x0000008
-
-gUnk_0800C210:: @ 0800C210
-	.incbin "baserom.gba", 0x00C210, 0x0000053
-
-gUnk_0800C263:: @ 0800C263
-	.incbin "baserom.gba", 0x00C263, 0x0000041
-
-gUnk_0800C2A4:: @ 0800C2A4
-	.incbin "baserom.gba", 0x00C2A4, 0x0000003
-
-gUnk_0800C2A7:: @ 0800C2A7
-	.incbin "baserom.gba", 0x00C2A7, 0x0000027
-
-gUnk_0800C2CE:: @ 0800C2CE
-	.incbin "baserom.gba", 0x00C2CE, 0x0000082
-
-gUnk_0800C350:: @ 0800C350
-	.incbin "baserom.gba", 0x00C350, 0x0000046
-
-gUnk_0800C396:: @ 0800C396
-	.incbin "baserom.gba", 0x00C396, 0x0000036
-
-gUnk_0800C3CC:: @ 0800C3CC
-	.incbin "baserom.gba", 0x00C3CC, 0x000003C
-
-gUnk_0800C408:: @ 0800C408
-	.incbin "baserom.gba", 0x00C408, 0x0000008
-
-gUnk_0800C410:: @ 0800C410
-	.incbin "baserom.gba", 0x00C410, 0x000004C
-
-gUnk_0800C45C:: @ 0800C45C
-	.incbin "baserom.gba", 0x00C45C, 0x0000038
-
-gUnk_0800C494:: @ 0800C494
-	.incbin "baserom.gba", 0x00C494, 0x000003C
-
-gUnk_0800C4D0:: @ 0800C4D0
-	.incbin "baserom.gba", 0x00C4D0, 0x000000B
-
-gUnk_0800C4DB:: @ 0800C4DB
-	.incbin "baserom.gba", 0x00C4DB, 0x0000031
-
-gUnk_0800C50C:: @ 0800C50C
-	.incbin "baserom.gba", 0x00C50C, 0x0000015
-
-gUnk_0800C521:: @ 0800C521
-	.incbin "baserom.gba", 0x00C521, 0x000002F
-
-gUnk_0800C550:: @ 0800C550
-	.incbin "baserom.gba", 0x00C550, 0x0000006
-
-gUnk_0800C556:: @ 0800C556
-	.incbin "baserom.gba", 0x00C556, 0x000002E
-
-gUnk_0800C584:: @ 0800C584
-	.incbin "baserom.gba", 0x00C584, 0x0000016
-
-gUnk_0800C59A:: @ 0800C59A
-	.incbin "baserom.gba", 0x00C59A, 0x000002E
-
-gUnk_0800C5C8:: @ 0800C5C8
-	.incbin "baserom.gba", 0x00C5C8, 0x0000034
-
-gUnk_0800C5FC:: @ 0800C5FC
-	.incbin "baserom.gba", 0x00C5FC, 0x0000004
-
-gUnk_0800C600:: @ 0800C600
-	.incbin "baserom.gba", 0x00C600, 0x0000007
-
-gUnk_0800C607:: @ 0800C607
-	.incbin "baserom.gba", 0x00C607, 0x000002D
-
-gUnk_0800C634:: @ 0800C634
-	.incbin "baserom.gba", 0x00C634, 0x0000092
-
-gUnk_0800C6C6:: @ 0800C6C6
-	.incbin "baserom.gba", 0x00C6C6, 0x00000AE
-
-gUnk_0800C774:: @ 0800C774
-	.incbin "baserom.gba", 0x00C774, 0x0000005
-
-gUnk_0800C779:: @ 0800C779
-	.incbin "baserom.gba", 0x00C779, 0x000008F
-
-gUnk_0800C808:: @ 0800C808
-	.incbin "baserom.gba", 0x00C808, 0x0000059
-
-gUnk_0800C861:: @ 0800C861
-	.incbin "baserom.gba", 0x00C861, 0x000004F
-
-gUnk_0800C8B0:: @ 0800C8B0
-	.incbin "baserom.gba", 0x00C8B0, 0x000002A
-
-gUnk_0800C8DA:: @ 0800C8DA
-	.incbin "baserom.gba", 0x00C8DA, 0x0000016
-
-gUnk_0800C8F0:: @ 0800C8F0
-	.incbin "baserom.gba", 0x00C8F0, 0x000002C
-
-gUnk_0800C91C:: @ 0800C91C
-	.incbin "baserom.gba", 0x00C91C, 0x0000015
-
-gUnk_0800C931:: @ 0800C931
-	.incbin "baserom.gba", 0x00C931, 0x0000032
-
-gUnk_0800C963:: @ 0800C963
-	.incbin "baserom.gba", 0x00C963, 0x00000A5
-
-gUnk_0800CA08:: @ 0800CA08
-	.incbin "baserom.gba", 0x00CA08, 0x0000084
-
-gUnk_0800CA8C:: @ 0800CA8C
-	.incbin "baserom.gba", 0x00CA8C, 0x000001E
-
-gUnk_0800CAAA:: @ 0800CAAA
-	.incbin "baserom.gba", 0x00CAAA, 0x0000012
-
-gUnk_0800CABC:: @ 0800CABC
-	.incbin "baserom.gba", 0x00CABC, 0x000004B
-
-gUnk_0800CB07:: @ 0800CB07
-	.incbin "baserom.gba", 0x00CB07, 0x000004D
-
-gUnk_0800CB54:: @ 0800CB54
-	.incbin "baserom.gba", 0x00CB54, 0x000004F
-
-gUnk_0800CBA3:: @ 0800CBA3
-	.incbin "baserom.gba", 0x00CBA3, 0x0000031
-
-gUnk_0800CBD4:: @ 0800CBD4
-	.incbin "baserom.gba", 0x00CBD4, 0x0000034
-
-gUnk_0800CC08:: @ 0800CC08
-	.incbin "baserom.gba", 0x00CC08, 0x0000005
-
-gUnk_0800CC0D:: @ 0800CC0D
-	.incbin "baserom.gba", 0x00CC0D, 0x0000035
-
-gUnk_0800CC42:: @ 0800CC42
-	.incbin "baserom.gba", 0x00CC42, 0x000002A
-
-gUnk_0800CC6C:: @ 0800CC6C
-	.incbin "baserom.gba", 0x00CC6C, 0x0000061
-
-gUnk_0800CCCD:: @ 0800CCCD
-	.incbin "baserom.gba", 0x00CCCD, 0x0000010
-
-gUnk_0800CCDD:: @ 0800CCDD
-	.incbin "baserom.gba", 0x00CCDD, 0x0000027
-
-gUnk_0800CD04:: @ 0800CD04
-	.incbin "baserom.gba", 0x00CD04, 0x0000004
-
-gUnk_0800CD08:: @ 0800CD08
-	.incbin "baserom.gba", 0x00CD08, 0x000005F
-
-gUnk_0800CD67:: @ 0800CD67
-	.incbin "baserom.gba", 0x00CD67, 0x0000015
-
-gUnk_0800CD7C:: @ 0800CD7C
-	.incbin "baserom.gba", 0x00CD7C, 0x000008B
-
-gUnk_0800CE07:: @ 0800CE07
-	.incbin "baserom.gba", 0x00CE07, 0x00000FD
-
-gUnk_0800CF04:: @ 0800CF04
-	.incbin "baserom.gba", 0x00CF04, 0x0000012
-
-gUnk_0800CF16:: @ 0800CF16
-	.incbin "baserom.gba", 0x00CF16, 0x0000035
-
-gUnk_0800CF4B:: @ 0800CF4B
-	.incbin "baserom.gba", 0x00CF4B, 0x0000005
-
-gUnk_0800CF50:: @ 0800CF50
-	.incbin "baserom.gba", 0x00CF50, 0x000002B
-
-gUnk_0800CF7B:: @ 0800CF7B
-	.incbin "baserom.gba", 0x00CF7B, 0x000000D
-
-gUnk_0800CF88:: @ 0800CF88
-	.incbin "baserom.gba", 0x00CF88, 0x000000D
-
-gUnk_0800CF95:: @ 0800CF95
-	.incbin "baserom.gba", 0x00CF95, 0x0000014
-
-gUnk_0800CFA9:: @ 0800CFA9
-	.incbin "baserom.gba", 0x00CFA9, 0x0000003
-
-gUnk_0800CFAC:: @ 0800CFAC
-	.incbin "baserom.gba", 0x00CFAC, 0x0000065
-
-gUnk_0800D011:: @ 0800D011
-	.incbin "baserom.gba", 0x00D011, 0x000004E
-
-gUnk_0800D05F:: @ 0800D05F
-	.incbin "baserom.gba", 0x00D05F, 0x000006F
-
-gUnk_0800D0CE:: @ 0800D0CE
-	.incbin "baserom.gba", 0x00D0CE, 0x0000059
-
-gUnk_0800D127:: @ 0800D127
-	.incbin "baserom.gba", 0x00D127, 0x0000069
-
-gUnk_0800D190:: @ 0800D190
-	.incbin "baserom.gba", 0x00D190, 0x0000024
-
-gUnk_0800D1B4:: @ 0800D1B4
-	.incbin "baserom.gba", 0x00D1B4, 0x0000010
-
-gUnk_0800D1C4:: @ 0800D1C4
-	.incbin "baserom.gba", 0x00D1C4, 0x0000010
-
-gUnk_0800D1D4:: @ 0800D1D4
-	.incbin "baserom.gba", 0x00D1D4, 0x000000C
-
-gUnk_0800D1E0:: @ 0800D1E0
-	.incbin "baserom.gba", 0x00D1E0, 0x0000027
-
-gUnk_0800D207:: @ 0800D207
-	.incbin "baserom.gba", 0x00D207, 0x0000011
-
-gUnk_0800D218:: @ 0800D218
-	.incbin "baserom.gba", 0x00D218, 0x000003C
-
-gUnk_0800D254:: @ 0800D254
-	.incbin "baserom.gba", 0x00D254, 0x0000024
-
-gUnk_0800D278:: @ 0800D278
-	.incbin "baserom.gba", 0x00D278, 0x0000056
-
-gUnk_0800D2CE:: @ 0800D2CE
-	.incbin "baserom.gba", 0x00D2CE, 0x0000038
-
-gUnk_0800D306:: @ 0800D306
-	.incbin "baserom.gba", 0x00D306, 0x0000002
-
-gUnk_0800D308:: @ 0800D308
-	.incbin "baserom.gba", 0x00D308, 0x0000007
-
-gUnk_0800D30F:: @ 0800D30F
-	.incbin "baserom.gba", 0x00D30F, 0x0000041
-
-gUnk_0800D350:: @ 0800D350
-	.incbin "baserom.gba", 0x00D350, 0x000009C
-
-gUnk_0800D3EC:: @ 0800D3EC
-	.incbin "baserom.gba", 0x00D3EC, 0x0000028
-
-gUnk_0800D414:: @ 0800D414
-	.incbin "baserom.gba", 0x00D414, 0x0000038
-
-gUnk_0800D44C:: @ 0800D44C
-	.incbin "baserom.gba", 0x00D44C, 0x0000073
-
-gUnk_0800D4BF:: @ 0800D4BF
-	.incbin "baserom.gba", 0x00D4BF, 0x000001D
-
-gUnk_0800D4DC:: @ 0800D4DC
-	.incbin "baserom.gba", 0x00D4DC, 0x00000C0
-
-gUnk_0800D59C:: @ 0800D59C
-	.incbin "baserom.gba", 0x00D59C, 0x0000049
-
-gUnk_0800D5E5:: @ 0800D5E5
-	.incbin "baserom.gba", 0x00D5E5, 0x0000027
-
-gUnk_0800D60C:: @ 0800D60C
-	.incbin "baserom.gba", 0x00D60C, 0x000001F
-
-gUnk_0800D62B:: @ 0800D62B
-	.incbin "baserom.gba", 0x00D62B, 0x0000089
-
-gUnk_0800D6B4:: @ 0800D6B4
-	.incbin "baserom.gba", 0x00D6B4, 0x0000006
-
-gUnk_0800D6BA:: @ 0800D6BA
-	.incbin "baserom.gba", 0x00D6BA, 0x0000016
-
-gUnk_0800D6D0:: @ 0800D6D0
-	.incbin "baserom.gba", 0x00D6D0, 0x0000020
-
-gUnk_0800D6F0:: @ 0800D6F0
-	.incbin "baserom.gba", 0x00D6F0, 0x0000012
-
-gUnk_0800D702:: @ 0800D702
-	.incbin "baserom.gba", 0x00D702, 0x0000001
-
-gUnk_0800D703:: @ 0800D703
-	.incbin "baserom.gba", 0x00D703, 0x000000D
-
-gUnk_0800D710:: @ 0800D710
-	.incbin "baserom.gba", 0x00D710, 0x0000015
-
-gUnk_0800D725:: @ 0800D725
-	.incbin "baserom.gba", 0x00D725, 0x0000003
-
-gUnk_0800D728:: @ 0800D728
-	.incbin "baserom.gba", 0x00D728, 0x0000044
-
-gUnk_0800D76C:: @ 0800D76C
-	.incbin "baserom.gba", 0x00D76C, 0x0000063
-
-gUnk_0800D7CF:: @ 0800D7CF
-	.incbin "baserom.gba", 0x00D7CF, 0x000000D
-
-gUnk_0800D7DC:: @ 0800D7DC
-	.incbin "baserom.gba", 0x00D7DC, 0x0000098
-
-gUnk_0800D874:: @ 0800D874
-	.incbin "baserom.gba", 0x00D874, 0x0000070
-
-gUnk_0800D8E4:: @ 0800D8E4
-	.incbin "baserom.gba", 0x00D8E4, 0x0000022
-
-gUnk_0800D906:: @ 0800D906
-	.incbin "baserom.gba", 0x00D906, 0x000004E
-
-gUnk_0800D954:: @ 0800D954
-	.incbin "baserom.gba", 0x00D954, 0x0000029
-
-gUnk_0800D97D:: @ 0800D97D
-	.incbin "baserom.gba", 0x00D97D, 0x0000004
-
-gUnk_0800D981:: @ 0800D981
-	.incbin "baserom.gba", 0x00D981, 0x0000090
-
-gUnk_0800DA11:: @ 0800DA11
-	.incbin "baserom.gba", 0x00DA11, 0x0000017
-
-gUnk_0800DA28:: @ 0800DA28
-	.incbin "baserom.gba", 0x00DA28, 0x0000024
-
-gUnk_0800DA4C:: @ 0800DA4C
-	.incbin "baserom.gba", 0x00DA4C, 0x0000001
-
-gUnk_0800DA4D:: @ 0800DA4D
-	.incbin "baserom.gba", 0x00DA4D, 0x0000013
-
-gUnk_0800DA60:: @ 0800DA60
-	.incbin "baserom.gba", 0x00DA60, 0x00000AE
-
-gUnk_0800DB0E:: @ 0800DB0E
-	.incbin "baserom.gba", 0x00DB0E, 0x000000A
-
-gUnk_0800DB18:: @ 0800DB18
-	.incbin "baserom.gba", 0x00DB18, 0x0000010
-
-gUnk_0800DB28:: @ 0800DB28
-	.incbin "baserom.gba", 0x00DB28, 0x0000022
-
-gUnk_0800DB4A:: @ 0800DB4A
-	.incbin "baserom.gba", 0x00DB4A, 0x000002E
-
-gUnk_0800DB78:: @ 0800DB78
-	.incbin "baserom.gba", 0x00DB78, 0x0000010
-
-gUnk_0800DB88:: @ 0800DB88
-	.incbin "baserom.gba", 0x00DB88, 0x0000088
-
-gUnk_0800DC10:: @ 0800DC10
-	.incbin "baserom.gba", 0x00DC10, 0x0000009
-
-gUnk_0800DC19:: @ 0800DC19
-	.incbin "baserom.gba", 0x00DC19, 0x0000078
-
-gUnk_0800DC91:: @ 0800DC91
-	.incbin "baserom.gba", 0x00DC91, 0x000001B
-
-gUnk_0800DCAC:: @ 0800DCAC
-	.incbin "baserom.gba", 0x00DCAC, 0x0000030
-
-gUnk_0800DCDC:: @ 0800DCDC
-	.incbin "baserom.gba", 0x00DCDC, 0x0000028
-
-gUnk_0800DD04:: @ 0800DD04
-	.incbin "baserom.gba", 0x00DD04, 0x000000C
-
-gUnk_0800DD10:: @ 0800DD10
-	.incbin "baserom.gba", 0x00DD10, 0x0000009
-
-gUnk_0800DD19:: @ 0800DD19
-	.incbin "baserom.gba", 0x00DD19, 0x0000009
-
-gUnk_0800DD22:: @ 0800DD22
-	.incbin "baserom.gba", 0x00DD22, 0x000006B
-
-gUnk_0800DD8D:: @ 0800DD8D
-	.incbin "baserom.gba", 0x00DD8D, 0x000001D
-
-gUnk_0800DDAA:: @ 0800DDAA
-	.incbin "baserom.gba", 0x00DDAA, 0x000003E
-
-gUnk_0800DDE8:: @ 0800DDE8
-	.incbin "baserom.gba", 0x00DDE8, 0x0000014
-
-gUnk_0800DDFC:: @ 0800DDFC
-	.incbin "baserom.gba", 0x00DDFC, 0x0000004
-
-gUnk_0800DE00:: @ 0800DE00
-	.incbin "baserom.gba", 0x00DE00, 0x0000078
-
-gUnk_0800DE78:: @ 0800DE78
-	.incbin "baserom.gba", 0x00DE78, 0x0000038
-
-gUnk_0800DEB0:: @ 0800DEB0
-	.incbin "baserom.gba", 0x00DEB0, 0x0000024
-
-gUnk_0800DED4:: @ 0800DED4
-	.incbin "baserom.gba", 0x00DED4, 0x0000022
-
-gUnk_0800DEF6:: @ 0800DEF6
-	.incbin "baserom.gba", 0x00DEF6, 0x0000011
-
-gUnk_0800DF07:: @ 0800DF07
-	.incbin "baserom.gba", 0x00DF07, 0x000001D
-
-gUnk_0800DF24:: @ 0800DF24
-	.incbin "baserom.gba", 0x00DF24, 0x0000090
-
-gUnk_0800DFB4:: @ 0800DFB4
-	.incbin "baserom.gba", 0x00DFB4, 0x000001C
-
-gUnk_0800DFD0:: @ 0800DFD0
-	.incbin "baserom.gba", 0x00DFD0, 0x0000007
-
-gUnk_0800DFD7:: @ 0800DFD7
-	.incbin "baserom.gba", 0x00DFD7, 0x0000007
-
-gUnk_0800DFDE:: @ 0800DFDE
-	.incbin "baserom.gba", 0x00DFDE, 0x0000006
-
-gUnk_0800DFE4:: @ 0800DFE4
-	.incbin "baserom.gba", 0x00DFE4, 0x000006C
-
-gUnk_0800E050:: @ 0800E050
-	.incbin "baserom.gba", 0x00E050, 0x000006C
-
-gUnk_0800E0BC:: @ 0800E0BC
-	.incbin "baserom.gba", 0x00E0BC, 0x000003A
-
-gUnk_0800E0F6:: @ 0800E0F6
-	.incbin "baserom.gba", 0x00E0F6, 0x000004A
-
-gUnk_0800E140:: @ 0800E140
-	.incbin "baserom.gba", 0x00E140, 0x0000013
-
-gUnk_0800E153:: @ 0800E153
-	.incbin "baserom.gba", 0x00E153, 0x0000001
-
-gUnk_0800E154:: @ 0800E154
-	.incbin "baserom.gba", 0x00E154, 0x0000071
-
-gUnk_0800E1C5:: @ 0800E1C5
-	.incbin "baserom.gba", 0x00E1C5, 0x000003B
-
-gUnk_0800E200:: @ 0800E200
-	.incbin "baserom.gba", 0x00E200, 0x0000100
-
-gUnk_0800E300:: @ 0800E300
-	.incbin "baserom.gba", 0x00E300, 0x0000005
-
-gUnk_0800E305:: @ 0800E305
-	.incbin "baserom.gba", 0x00E305, 0x0000002
-
-gUnk_0800E307:: @ 0800E307
-	.incbin "baserom.gba", 0x00E307, 0x0000005
-
-gUnk_0800E30C:: @ 0800E30C
-	.incbin "baserom.gba", 0x00E30C, 0x000001D
-
-gUnk_0800E329:: @ 0800E329
-	.incbin "baserom.gba", 0x00E329, 0x0000027
-
-gUnk_0800E350:: @ 0800E350
-	.incbin "baserom.gba", 0x00E350, 0x000009E
-
-gUnk_0800E3EE:: @ 0800E3EE
-	.incbin "baserom.gba", 0x00E3EE, 0x000000B
-
-gUnk_0800E3F9:: @ 0800E3F9
-	.incbin "baserom.gba", 0x00E3F9, 0x0000001
-
-gUnk_0800E3FA:: @ 0800E3FA
-	.incbin "baserom.gba", 0x00E3FA, 0x0000002
-
-gUnk_0800E3FC:: @ 0800E3FC
-	.incbin "baserom.gba", 0x00E3FC, 0x0000004
-
-gUnk_0800E400:: @ 0800E400
-	.incbin "baserom.gba", 0x00E400, 0x0000008
-
-gUnk_0800E408:: @ 0800E408
-	.incbin "baserom.gba", 0x00E408, 0x0000003
-
-gUnk_0800E40B:: @ 0800E40B
-	.incbin "baserom.gba", 0x00E40B, 0x0000006
-
-gUnk_0800E411:: @ 0800E411
-	.incbin "baserom.gba", 0x00E411, 0x000001F
-
-gUnk_0800E430:: @ 0800E430
-	.incbin "baserom.gba", 0x00E430, 0x0000004
-
-gUnk_0800E434:: @ 0800E434
-	.incbin "baserom.gba", 0x00E434, 0x0000038
-
-gUnk_0800E46C:: @ 0800E46C
-	.incbin "baserom.gba", 0x00E46C, 0x000001D
-
-gUnk_0800E489:: @ 0800E489
-	.incbin "baserom.gba", 0x00E489, 0x0000010
-
-gUnk_0800E499:: @ 0800E499
-	.incbin "baserom.gba", 0x00E499, 0x000000B
-
-gUnk_0800E4A4:: @ 0800E4A4
-	.incbin "baserom.gba", 0x00E4A4, 0x000003F
-
-gUnk_0800E4E3:: @ 0800E4E3
-	.incbin "baserom.gba", 0x00E4E3, 0x0000021
-
-gUnk_0800E504:: @ 0800E504
-	.incbin "baserom.gba", 0x00E504, 0x0000008
-
-gUnk_0800E50C:: @ 0800E50C
-	.incbin "baserom.gba", 0x00E50C, 0x0000038
-
-gUnk_0800E544:: @ 0800E544
-	.incbin "baserom.gba", 0x00E544, 0x0000048
-
-gUnk_0800E58C:: @ 0800E58C
-	.incbin "baserom.gba", 0x00E58C, 0x0000038
-
-gUnk_0800E5C4:: @ 0800E5C4
-	.incbin "baserom.gba", 0x00E5C4, 0x000003C
-
-gUnk_0800E600:: @ 0800E600
-	.incbin "baserom.gba", 0x00E600, 0x000000E
-
-gUnk_0800E60E:: @ 0800E60E
-	.incbin "baserom.gba", 0x00E60E, 0x000001E
-
-gUnk_0800E62C:: @ 0800E62C
-	.incbin "baserom.gba", 0x00E62C, 0x000002C
-
-gUnk_0800E658:: @ 0800E658
-	.incbin "baserom.gba", 0x00E658, 0x000002C
-
-gUnk_0800E684:: @ 0800E684
-	.incbin "baserom.gba", 0x00E684, 0x000002C
-
-gUnk_0800E6B0:: @ 0800E6B0
-	.incbin "baserom.gba", 0x00E6B0, 0x0000038
-
-gUnk_0800E6E8:: @ 0800E6E8
-	.incbin "baserom.gba", 0x00E6E8, 0x000001F
-
-gUnk_0800E707:: @ 0800E707
-	.incbin "baserom.gba", 0x00E707, 0x0000003
-
-gUnk_0800E70A:: @ 0800E70A
-	.incbin "baserom.gba", 0x00E70A, 0x000002A
-
-gUnk_0800E734:: @ 0800E734
-	.incbin "baserom.gba", 0x00E734, 0x000002C
-
-gUnk_0800E760:: @ 0800E760
-	.incbin "baserom.gba", 0x00E760, 0x0000079
-
-gUnk_0800E7D9:: @ 0800E7D9
-	.incbin "baserom.gba", 0x00E7D9, 0x000001B
-
-gUnk_0800E7F4:: @ 0800E7F4
-	.incbin "baserom.gba", 0x00E7F4, 0x0000006
-
-gUnk_0800E7FA:: @ 0800E7FA
-	.incbin "baserom.gba", 0x00E7FA, 0x0000029
-
-gUnk_0800E823:: @ 0800E823
-	.incbin "baserom.gba", 0x00E823, 0x0000001
-
-gUnk_0800E824:: @ 0800E824
-	.incbin "baserom.gba", 0x00E824, 0x00000B7
-
-gUnk_0800E8DB:: @ 0800E8DB
-	.incbin "baserom.gba", 0x00E8DB, 0x0000045
-
-gUnk_0800E920:: @ 0800E920
-	.incbin "baserom.gba", 0x00E920, 0x0000044
-
-gUnk_0800E964:: @ 0800E964
-	.incbin "baserom.gba", 0x00E964, 0x0000072
-
-gUnk_0800E9D6:: @ 0800E9D6
-	.incbin "baserom.gba", 0x00E9D6, 0x000001E
-
-gUnk_0800E9F4:: @ 0800E9F4
-	.incbin "baserom.gba", 0x00E9F4, 0x0000028
-
-gUnk_0800EA1C:: @ 0800EA1C
-	.incbin "baserom.gba", 0x00EA1C, 0x0000038
-
-gUnk_0800EA54:: @ 0800EA54
-	.incbin "baserom.gba", 0x00EA54, 0x0000050
-
-gUnk_0800EAA4:: @ 0800EAA4
-	.incbin "baserom.gba", 0x00EAA4, 0x0000047
-
-gUnk_0800EAEB:: @ 0800EAEB
-	.incbin "baserom.gba", 0x00EAEB, 0x000000D
-
-gUnk_0800EAF8:: @ 0800EAF8
-	.incbin "baserom.gba", 0x00EAF8, 0x0000034
-
-gUnk_0800EB2C:: @ 0800EB2C
-	.incbin "baserom.gba", 0x00EB2C, 0x0000038
-
-gUnk_0800EB64:: @ 0800EB64
-	.incbin "baserom.gba", 0x00EB64, 0x000005C
-
-gUnk_0800EBC0:: @ 0800EBC0
-	.incbin "baserom.gba", 0x00EBC0, 0x000001C
-
-gUnk_0800EBDC:: @ 0800EBDC
-	.incbin "baserom.gba", 0x00EBDC, 0x0000004
-
-gUnk_0800EBE0:: @ 0800EBE0
-	.incbin "baserom.gba", 0x00EBE0, 0x0000010
-
-gUnk_0800EBF0:: @ 0800EBF0
-	.incbin "baserom.gba", 0x00EBF0, 0x0000018
-
-gUnk_0800EC08:: @ 0800EC08
-	.incbin "baserom.gba", 0x00EC08, 0x000000C
-
-gUnk_0800EC14:: @ 0800EC14
-	.incbin "baserom.gba", 0x00EC14, 0x0000040
-
-gUnk_0800EC54:: @ 0800EC54
-	.incbin "baserom.gba", 0x00EC54, 0x000000D
-
-gUnk_0800EC61:: @ 0800EC61
-	.incbin "baserom.gba", 0x00EC61, 0x000002B
-
-gUnk_0800EC8C:: @ 0800EC8C
-	.incbin "baserom.gba", 0x00EC8C, 0x0000065
-
-gUnk_0800ECF1:: @ 0800ECF1
-	.incbin "baserom.gba", 0x00ECF1, 0x0000013
-
-gUnk_0800ED04:: @ 0800ED04
-	.incbin "baserom.gba", 0x00ED04, 0x0000008
-
-gUnk_0800ED0C:: @ 0800ED0C
-	.incbin "baserom.gba", 0x00ED0C, 0x0000001
-
-gUnk_0800ED0D:: @ 0800ED0D
-	.incbin "baserom.gba", 0x00ED0D, 0x000004F
-
-gUnk_0800ED5C:: @ 0800ED5C
-	.incbin "baserom.gba", 0x00ED5C, 0x0000034
-
-gUnk_0800ED90:: @ 0800ED90
-	.incbin "baserom.gba", 0x00ED90, 0x0000049
-
-gUnk_0800EDD9:: @ 0800EDD9
-	.incbin "baserom.gba", 0x00EDD9, 0x0000007
-
-gUnk_0800EDE0:: @ 0800EDE0
-	.incbin "baserom.gba", 0x00EDE0, 0x0000029
-
-gUnk_0800EE09:: @ 0800EE09
-	.incbin "baserom.gba", 0x00EE09, 0x0000047
-
-gUnk_0800EE50:: @ 0800EE50
-	.incbin "baserom.gba", 0x00EE50, 0x000003C
-
-gUnk_0800EE8C:: @ 0800EE8C
-	.incbin "baserom.gba", 0x00EE8C, 0x0000054
-
-gUnk_0800EEE0:: @ 0800EEE0
-	.incbin "baserom.gba", 0x00EEE0, 0x000001D
-
-gUnk_0800EEFD:: @ 0800EEFD
-	.incbin "baserom.gba", 0x00EEFD, 0x000000A
-
-gUnk_0800EF07:: @ 0800EF07
-	.incbin "baserom.gba", 0x00EF07, 0x000000B
-
-gUnk_0800EF12:: @ 0800EF12
-	.incbin "baserom.gba", 0x00EF12, 0x000002E
-
-gUnk_0800EF40:: @ 0800EF40
-	.incbin "baserom.gba", 0x00EF40, 0x0000053
-
-gUnk_0800EF93:: @ 0800EF93
-	.incbin "baserom.gba", 0x00EF93, 0x000002D
-
-gUnk_0800EFC0:: @ 0800EFC0
-	.incbin "baserom.gba", 0x00EFC0, 0x0000020
-
-gUnk_0800EFE0:: @ 0800EFE0
-	.incbin "baserom.gba", 0x00EFE0, 0x0000004
-
-gUnk_0800EFE4:: @ 0800EFE4
-	.incbin "baserom.gba", 0x00EFE4, 0x00000AC
-
-gUnk_0800F090:: @ 0800F090
-	.incbin "baserom.gba", 0x00F090, 0x0000004
-
-gUnk_0800F094:: @ 0800F094
-	.incbin "baserom.gba", 0x00F094, 0x0000042
-
-gUnk_0800F0D6:: @ 0800F0D6
-	.incbin "baserom.gba", 0x00F0D6, 0x000000C
-
-gUnk_0800F0E2:: @ 0800F0E2
-	.incbin "baserom.gba", 0x00F0E2, 0x0000010
-
-gUnk_0800F0F2:: @ 0800F0F2
-	.incbin "baserom.gba", 0x00F0F2, 0x0000001
-
-gUnk_0800F0F3:: @ 0800F0F3
-	.incbin "baserom.gba", 0x00F0F3, 0x0000001
-
-gUnk_0800F0F4:: @ 0800F0F4
-	.incbin "baserom.gba", 0x00F0F4, 0x0000058
-
-gUnk_0800F14C:: @ 0800F14C
-	.incbin "baserom.gba", 0x00F14C, 0x0000038
-
-gUnk_0800F184:: @ 0800F184
-	.incbin "baserom.gba", 0x00F184, 0x000005A
-
-gUnk_0800F1DE:: @ 0800F1DE
-	.incbin "baserom.gba", 0x00F1DE, 0x0000003
-
-gUnk_0800F1E1:: @ 0800F1E1
-	.incbin "baserom.gba", 0x00F1E1, 0x0000004
-
-gUnk_0800F1E5:: @ 0800F1E5
-	.incbin "baserom.gba", 0x00F1E5, 0x0000002
-
-gUnk_0800F1E7:: @ 0800F1E7
-	.incbin "baserom.gba", 0x00F1E7, 0x0000006
-
-gUnk_0800F1ED:: @ 0800F1ED
-	.incbin "baserom.gba", 0x00F1ED, 0x000000E
-
-gUnk_0800F1FB:: @ 0800F1FB
-	.incbin "baserom.gba", 0x00F1FB, 0x0000002
-
-gUnk_0800F1FD:: @ 0800F1FD
-	.incbin "baserom.gba", 0x00F1FD, 0x0000006
-
-gUnk_0800F203:: @ 0800F203
-	.incbin "baserom.gba", 0x00F203, 0x0000004
-
-gUnk_0800F207:: @ 0800F207
-	.incbin "baserom.gba", 0x00F207, 0x0000009
-
-gUnk_0800F210:: @ 0800F210
-	.incbin "baserom.gba", 0x00F210, 0x00000DB
-
-gUnk_0800F2EB:: @ 0800F2EB
-	.incbin "baserom.gba", 0x00F2EB, 0x0000005
-
-gUnk_0800F2F0:: @ 0800F2F0
-	.incbin "baserom.gba", 0x00F2F0, 0x0000002
-
-gUnk_0800F2F2:: @ 0800F2F2
-	.incbin "baserom.gba", 0x00F2F2, 0x0000011
-
-gUnk_0800F303:: @ 0800F303
-	.incbin "baserom.gba", 0x00F303, 0x0000099
-
-gUnk_0800F39C:: @ 0800F39C
-	.incbin "baserom.gba", 0x00F39C, 0x000003F
-
-gUnk_0800F3DB:: @ 0800F3DB
-	.incbin "baserom.gba", 0x00F3DB, 0x000000A
-
-gUnk_0800F3E5:: @ 0800F3E5
-	.incbin "baserom.gba", 0x00F3E5, 0x0000001
-
-gUnk_0800F3E6:: @ 0800F3E6
-	.incbin "baserom.gba", 0x00F3E6, 0x0000002
-
-gUnk_0800F3E8:: @ 0800F3E8
-	.incbin "baserom.gba", 0x00F3E8, 0x0000003
-
-gUnk_0800F3EB:: @ 0800F3EB
-	.incbin "baserom.gba", 0x00F3EB, 0x0000002
-
-gUnk_0800F3ED:: @ 0800F3ED
-	.incbin "baserom.gba", 0x00F3ED, 0x0000008
-
-gUnk_0800F3F5:: @ 0800F3F5
-	.incbin "baserom.gba", 0x00F3F5, 0x0000004
-
-gUnk_0800F3F9:: @ 0800F3F9
-	.incbin "baserom.gba", 0x00F3F9, 0x0000007
-
-gUnk_0800F400:: @ 0800F400
-	.incbin "baserom.gba", 0x00F400, 0x0000008
-
-gUnk_0800F408:: @ 0800F408
-	.incbin "baserom.gba", 0x00F408, 0x0000001
-
-gUnk_0800F409:: @ 0800F409
-	.incbin "baserom.gba", 0x00F409, 0x0000007
-
-gUnk_0800F410:: @ 0800F410
-	.incbin "baserom.gba", 0x00F410, 0x0000016
-
-gUnk_0800F426:: @ 0800F426
-	.incbin "baserom.gba", 0x00F426, 0x000000A
-
-gUnk_0800F430:: @ 0800F430
-	.incbin "baserom.gba", 0x00F430, 0x0000094
-
-gUnk_0800F4C4:: @ 0800F4C4
-	.incbin "baserom.gba", 0x00F4C4, 0x0000026
-
-gUnk_0800F4EA:: @ 0800F4EA
-	.incbin "baserom.gba", 0x00F4EA, 0x0000001
-
-gUnk_0800F4EB:: @ 0800F4EB
-	.incbin "baserom.gba", 0x00F4EB, 0x0000004
-
-gUnk_0800F4EF:: @ 0800F4EF
-	.incbin "baserom.gba", 0x00F4EF, 0x0000001
-
-gUnk_0800F4F0:: @ 0800F4F0
-	.incbin "baserom.gba", 0x00F4F0, 0x0000001
-
-gUnk_0800F4F1:: @ 0800F4F1
-	.incbin "baserom.gba", 0x00F4F1, 0x0000002
-
-gUnk_0800F4F3:: @ 0800F4F3
-	.incbin "baserom.gba", 0x00F4F3, 0x0000004
-
-gUnk_0800F4F7:: @ 0800F4F7
-	.incbin "baserom.gba", 0x00F4F7, 0x0000002
-
-gUnk_0800F4F9:: @ 0800F4F9
-	.incbin "baserom.gba", 0x00F4F9, 0x0000008
-
-gUnk_0800F501:: @ 0800F501
-	.incbin "baserom.gba", 0x00F501, 0x000000D
-
-gUnk_0800F50E:: @ 0800F50E
-	.incbin "baserom.gba", 0x00F50E, 0x0000046
-
-gUnk_0800F554:: @ 0800F554
-	.incbin "baserom.gba", 0x00F554, 0x0000030
-
-gUnk_0800F584:: @ 0800F584
-	.incbin "baserom.gba", 0x00F584, 0x000000B
-
-gUnk_0800F58F:: @ 0800F58F
-	.incbin "baserom.gba", 0x00F58F, 0x0000021
-
-gUnk_0800F5B0:: @ 0800F5B0
-	.incbin "baserom.gba", 0x00F5B0, 0x0000039
-
-gUnk_0800F5E9:: @ 0800F5E9
-	.incbin "baserom.gba", 0x00F5E9, 0x0000003
-
-gUnk_0800F5EC:: @ 0800F5EC
-	.incbin "baserom.gba", 0x00F5EC, 0x0000001
-
-gUnk_0800F5ED:: @ 0800F5ED
-	.incbin "baserom.gba", 0x00F5ED, 0x0000001
-
-gUnk_0800F5EE:: @ 0800F5EE
-	.incbin "baserom.gba", 0x00F5EE, 0x0000001
-
-gUnk_0800F5EF:: @ 0800F5EF
-	.incbin "baserom.gba", 0x00F5EF, 0x0000001
-
-gUnk_0800F5F0:: @ 0800F5F0
-	.incbin "baserom.gba", 0x00F5F0, 0x0000002
-
-gUnk_0800F5F2:: @ 0800F5F2
-	.incbin "baserom.gba", 0x00F5F2, 0x0000002
-
-gUnk_0800F5F4:: @ 0800F5F4
-	.incbin "baserom.gba", 0x00F5F4, 0x0000008
-
-gUnk_0800F5FC:: @ 0800F5FC
-	.incbin "baserom.gba", 0x00F5FC, 0x0000003
-
-gUnk_0800F5FF:: @ 0800F5FF
-	.incbin "baserom.gba", 0x00F5FF, 0x0000007
-
-gUnk_0800F606:: @ 0800F606
-	.incbin "baserom.gba", 0x00F606, 0x0000001
-
-gUnk_0800F607:: @ 0800F607
-	.incbin "baserom.gba", 0x00F607, 0x0000001
-
-gUnk_0800F608:: @ 0800F608
-	.incbin "baserom.gba", 0x00F608, 0x0000002
-
-gUnk_0800F60A:: @ 0800F60A
-	.incbin "baserom.gba", 0x00F60A, 0x000001E
-
-gUnk_0800F628:: @ 0800F628
-	.incbin "baserom.gba", 0x00F628, 0x0000028
-
-gUnk_0800F650:: @ 0800F650
-	.incbin "baserom.gba", 0x00F650, 0x0000038
-
-gUnk_0800F688:: @ 0800F688
-	.incbin "baserom.gba", 0x00F688, 0x0000018
-
-gUnk_0800F6A0:: @ 0800F6A0
-	.incbin "baserom.gba", 0x00F6A0, 0x0000028
-
-gUnk_0800F6C8:: @ 0800F6C8
-	.incbin "baserom.gba", 0x00F6C8, 0x0000018
-
-gUnk_0800F6E0:: @ 0800F6E0
-	.incbin "baserom.gba", 0x00F6E0, 0x0000009
-
-gUnk_0800F6E9:: @ 0800F6E9
-	.incbin "baserom.gba", 0x00F6E9, 0x0000003
-
-gUnk_0800F6EC:: @ 0800F6EC
-	.incbin "baserom.gba", 0x00F6EC, 0x0000001
-
-gUnk_0800F6ED:: @ 0800F6ED
-	.incbin "baserom.gba", 0x00F6ED, 0x0000001
-
-gUnk_0800F6EE:: @ 0800F6EE
-	.incbin "baserom.gba", 0x00F6EE, 0x0000001
-
-gUnk_0800F6EF:: @ 0800F6EF
-	.incbin "baserom.gba", 0x00F6EF, 0x0000001
-
-gUnk_0800F6F0:: @ 0800F6F0
-	.incbin "baserom.gba", 0x00F6F0, 0x0000001
-
-gUnk_0800F6F1:: @ 0800F6F1
-	.incbin "baserom.gba", 0x00F6F1, 0x0000001
-
-gUnk_0800F6F2:: @ 0800F6F2
-	.incbin "baserom.gba", 0x00F6F2, 0x0000001
-
-gUnk_0800F6F3:: @ 0800F6F3
-	.incbin "baserom.gba", 0x00F6F3, 0x0000001
-
-gUnk_0800F6F4:: @ 0800F6F4
-	.incbin "baserom.gba", 0x00F6F4, 0x0000005
-
-gUnk_0800F6F9:: @ 0800F6F9
-	.incbin "baserom.gba", 0x00F6F9, 0x0000005
-
-gUnk_0800F6FE:: @ 0800F6FE
-	.incbin "baserom.gba", 0x00F6FE, 0x0000004
-
-gUnk_0800F702:: @ 0800F702
-	.incbin "baserom.gba", 0x00F702, 0x0000004
-
-gUnk_0800F706:: @ 0800F706
-	.incbin "baserom.gba", 0x00F706, 0x0000018
-
-gUnk_0800F71E:: @ 0800F71E
-	.incbin "baserom.gba", 0x00F71E, 0x0000006
-
-gUnk_0800F724:: @ 0800F724
-	.incbin "baserom.gba", 0x00F724, 0x0000010
-
-gUnk_0800F734:: @ 0800F734
-	.incbin "baserom.gba", 0x00F734, 0x0000008
-
-gUnk_0800F73C:: @ 0800F73C
-	.incbin "baserom.gba", 0x00F73C, 0x00000AA
-
-gUnk_0800F7E6:: @ 0800F7E6
-	.incbin "baserom.gba", 0x00F7E6, 0x0000005
-
-gUnk_0800F7EB:: @ 0800F7EB
-	.incbin "baserom.gba", 0x00F7EB, 0x0000003
-
-gUnk_0800F7EE:: @ 0800F7EE
-	.incbin "baserom.gba", 0x00F7EE, 0x0000001
-
-gUnk_0800F7EF:: @ 0800F7EF
-	.incbin "baserom.gba", 0x00F7EF, 0x0000001
-
-gUnk_0800F7F0:: @ 0800F7F0
-	.incbin "baserom.gba", 0x00F7F0, 0x0000004
-
-gUnk_0800F7F4:: @ 0800F7F4
-	.incbin "baserom.gba", 0x00F7F4, 0x0000001
-
-gUnk_0800F7F5:: @ 0800F7F5
-	.incbin "baserom.gba", 0x00F7F5, 0x0000002
-
-gUnk_0800F7F7:: @ 0800F7F7
-	.incbin "baserom.gba", 0x00F7F7, 0x0000005
-
-gUnk_0800F7FC:: @ 0800F7FC
-	.incbin "baserom.gba", 0x00F7FC, 0x0000001
-
-gUnk_0800F7FD:: @ 0800F7FD
-	.incbin "baserom.gba", 0x00F7FD, 0x0000002
-
-gUnk_0800F7FF:: @ 0800F7FF
-	.incbin "baserom.gba", 0x00F7FF, 0x0000001
-
-gUnk_0800F800:: @ 0800F800
-	.incbin "baserom.gba", 0x00F800, 0x0000005
-
-gUnk_0800F805:: @ 0800F805
-	.incbin "baserom.gba", 0x00F805, 0x0000003
-
-gUnk_0800F808:: @ 0800F808
-	.incbin "baserom.gba", 0x00F808, 0x00000E7
-
-gUnk_0800F8EF:: @ 0800F8EF
-	.incbin "baserom.gba", 0x00F8EF, 0x0000001
-
-gUnk_0800F8F0:: @ 0800F8F0
-	.incbin "baserom.gba", 0x00F8F0, 0x0000001
-
-gUnk_0800F8F1:: @ 0800F8F1
-	.incbin "baserom.gba", 0x00F8F1, 0x0000001
-
-gUnk_0800F8F2:: @ 0800F8F2
-	.incbin "baserom.gba", 0x00F8F2, 0x0000001
-
-gUnk_0800F8F3:: @ 0800F8F3
-	.incbin "baserom.gba", 0x00F8F3, 0x0000001
-
-gUnk_0800F8F4:: @ 0800F8F4
-	.incbin "baserom.gba", 0x00F8F4, 0x0000001
-
-gUnk_0800F8F5:: @ 0800F8F5
-	.incbin "baserom.gba", 0x00F8F5, 0x0000003
-
-gUnk_0800F8F8:: @ 0800F8F8
-	.incbin "baserom.gba", 0x00F8F8, 0x0000001
-
-gUnk_0800F8F9:: @ 0800F8F9
-	.incbin "baserom.gba", 0x00F8F9, 0x0000007
-
-gUnk_0800F900:: @ 0800F900
-	.incbin "baserom.gba", 0x00F900, 0x0000002
-
-gUnk_0800F902:: @ 0800F902
-	.incbin "baserom.gba", 0x00F902, 0x0000014
-
-gUnk_0800F916:: @ 0800F916
-	.incbin "baserom.gba", 0x00F916, 0x00000DA
-
-gUnk_0800F9F0:: @ 0800F9F0
-	.incbin "baserom.gba", 0x00F9F0, 0x0000002
-
-gUnk_0800F9F2:: @ 0800F9F2
-	.incbin "baserom.gba", 0x00F9F2, 0x0000001
-
-gUnk_0800F9F3:: @ 0800F9F3
-	.incbin "baserom.gba", 0x00F9F3, 0x0000001
-
-gUnk_0800F9F4:: @ 0800F9F4
-	.incbin "baserom.gba", 0x00F9F4, 0x0000002
-
-gUnk_0800F9F6:: @ 0800F9F6
-	.incbin "baserom.gba", 0x00F9F6, 0x0000001
-
-gUnk_0800F9F7:: @ 0800F9F7
-	.incbin "baserom.gba", 0x00F9F7, 0x0000001
-
-gUnk_0800F9F8:: @ 0800F9F8
-	.incbin "baserom.gba", 0x00F9F8, 0x000000A
-
-gUnk_0800FA02:: @ 0800FA02
-	.incbin "baserom.gba", 0x00FA02, 0x0000005
-
-gUnk_0800FA07:: @ 0800FA07
-	.incbin "baserom.gba", 0x00FA07, 0x0000001
-
-gUnk_0800FA08:: @ 0800FA08
-	.incbin "baserom.gba", 0x00FA08, 0x0000001
-
-gUnk_0800FA09:: @ 0800FA09
-	.incbin "baserom.gba", 0x00FA09, 0x0000004
-
-gUnk_0800FA0D:: @ 0800FA0D
-	.incbin "baserom.gba", 0x00FA0D, 0x000006B
-
-gUnk_0800FA78:: @ 0800FA78
-	.incbin "baserom.gba", 0x00FA78, 0x0000048
-
-gUnk_0800FAC0:: @ 0800FAC0
-	.incbin "baserom.gba", 0x00FAC0, 0x0000024
-
-gUnk_0800FAE4:: @ 0800FAE4
-	.incbin "baserom.gba", 0x00FAE4, 0x000000F
-
-gUnk_0800FAF3:: @ 0800FAF3
-	.incbin "baserom.gba", 0x00FAF3, 0x0000002
-
-gUnk_0800FAF5:: @ 0800FAF5
-	.incbin "baserom.gba", 0x00FAF5, 0x0000001
-
-gUnk_0800FAF6:: @ 0800FAF6
-	.incbin "baserom.gba", 0x00FAF6, 0x0000001
-
-gUnk_0800FAF7:: @ 0800FAF7
-	.incbin "baserom.gba", 0x00FAF7, 0x0000001
-
-gUnk_0800FAF8:: @ 0800FAF8
-	.incbin "baserom.gba", 0x00FAF8, 0x0000005
-
-gUnk_0800FAFD:: @ 0800FAFD
-	.incbin "baserom.gba", 0x00FAFD, 0x0000001
-
-gUnk_0800FAFE:: @ 0800FAFE
-	.incbin "baserom.gba", 0x00FAFE, 0x0000001
-
-gUnk_0800FAFF:: @ 0800FAFF
-	.incbin "baserom.gba", 0x00FAFF, 0x0000001
-
-gUnk_0800FB00:: @ 0800FB00
-	.incbin "baserom.gba", 0x00FB00, 0x0000001
-
-gUnk_0800FB01:: @ 0800FB01
-	.incbin "baserom.gba", 0x00FB01, 0x0000001
-
-gUnk_0800FB02:: @ 0800FB02
-	.incbin "baserom.gba", 0x00FB02, 0x0000002
-
-gUnk_0800FB04:: @ 0800FB04
-	.incbin "baserom.gba", 0x00FB04, 0x0000004
-
-gUnk_0800FB08:: @ 0800FB08
-	.incbin "baserom.gba", 0x00FB08, 0x0000002
-
-gUnk_0800FB0A:: @ 0800FB0A
-	.incbin "baserom.gba", 0x00FB0A, 0x0000027
-
-gUnk_0800FB31:: @ 0800FB31
-	.incbin "baserom.gba", 0x00FB31, 0x0000013
-
-gUnk_0800FB44:: @ 0800FB44
-	.incbin "baserom.gba", 0x00FB44, 0x0000077
-
-gUnk_0800FBBB:: @ 0800FBBB
-	.incbin "baserom.gba", 0x00FBBB, 0x0000035
-
-gUnk_0800FBF0:: @ 0800FBF0
-	.incbin "baserom.gba", 0x00FBF0, 0x0000003
-
-gUnk_0800FBF3:: @ 0800FBF3
-	.incbin "baserom.gba", 0x00FBF3, 0x0000002
-
-gUnk_0800FBF5:: @ 0800FBF5
-	.incbin "baserom.gba", 0x00FBF5, 0x0000001
-
-gUnk_0800FBF6:: @ 0800FBF6
-	.incbin "baserom.gba", 0x00FBF6, 0x0000002
-
-gUnk_0800FBF8:: @ 0800FBF8
-	.incbin "baserom.gba", 0x00FBF8, 0x0000001
-
-gUnk_0800FBF9:: @ 0800FBF9
-	.incbin "baserom.gba", 0x00FBF9, 0x0000001
-
-gUnk_0800FBFA:: @ 0800FBFA
-	.incbin "baserom.gba", 0x00FBFA, 0x0000001
-
-gUnk_0800FBFB:: @ 0800FBFB
-	.incbin "baserom.gba", 0x00FBFB, 0x0000001
-
-gUnk_0800FBFC:: @ 0800FBFC
-	.incbin "baserom.gba", 0x00FBFC, 0x0000003
-
-gUnk_0800FBFF:: @ 0800FBFF
-	.incbin "baserom.gba", 0x00FBFF, 0x0000001
-
-gUnk_0800FC00:: @ 0800FC00
-	.incbin "baserom.gba", 0x00FC00, 0x0000001
-
-gUnk_0800FC01:: @ 0800FC01
-	.incbin "baserom.gba", 0x00FC01, 0x0000004
-
-gUnk_0800FC05:: @ 0800FC05
-	.incbin "baserom.gba", 0x00FC05, 0x0000001
-
-gUnk_0800FC06:: @ 0800FC06
-	.incbin "baserom.gba", 0x00FC06, 0x0000002
-
-gUnk_0800FC08:: @ 0800FC08
-	.incbin "baserom.gba", 0x00FC08, 0x0000001
-
-gUnk_0800FC09:: @ 0800FC09
-	.incbin "baserom.gba", 0x00FC09, 0x0000005
-
-gUnk_0800FC0E:: @ 0800FC0E
-	.incbin "baserom.gba", 0x00FC0E, 0x0000016
-
-gUnk_0800FC24:: @ 0800FC24
-	.incbin "baserom.gba", 0x00FC24, 0x00000C6
-
-gUnk_0800FCEA:: @ 0800FCEA
-	.incbin "baserom.gba", 0x00FCEA, 0x0000004
-
-gUnk_0800FCEE:: @ 0800FCEE
-	.incbin "baserom.gba", 0x00FCEE, 0x0000004
-
-gUnk_0800FCF2:: @ 0800FCF2
-	.incbin "baserom.gba", 0x00FCF2, 0x0000001
-
-gUnk_0800FCF3:: @ 0800FCF3
-	.incbin "baserom.gba", 0x00FCF3, 0x0000002
-
-gUnk_0800FCF5:: @ 0800FCF5
-	.incbin "baserom.gba", 0x00FCF5, 0x0000002
-
-gUnk_0800FCF7:: @ 0800FCF7
-	.incbin "baserom.gba", 0x00FCF7, 0x0000001
-
-gUnk_0800FCF8:: @ 0800FCF8
-	.incbin "baserom.gba", 0x00FCF8, 0x0000002
-
-gUnk_0800FCFA:: @ 0800FCFA
-	.incbin "baserom.gba", 0x00FCFA, 0x0000001
-
-gUnk_0800FCFB:: @ 0800FCFB
-	.incbin "baserom.gba", 0x00FCFB, 0x0000001
-
-gUnk_0800FCFC:: @ 0800FCFC
-	.incbin "baserom.gba", 0x00FCFC, 0x0000002
-
-gUnk_0800FCFE:: @ 0800FCFE
-	.incbin "baserom.gba", 0x00FCFE, 0x0000001
-
-gUnk_0800FCFF:: @ 0800FCFF
-	.incbin "baserom.gba", 0x00FCFF, 0x0000001
-
-gUnk_0800FD00:: @ 0800FD00
-	.incbin "baserom.gba", 0x00FD00, 0x0000001
-
-gUnk_0800FD01:: @ 0800FD01
-	.incbin "baserom.gba", 0x00FD01, 0x0000003
-
-gUnk_0800FD04:: @ 0800FD04
-	.incbin "baserom.gba", 0x00FD04, 0x0000001
-
-gUnk_0800FD05:: @ 0800FD05
-	.incbin "baserom.gba", 0x00FD05, 0x0000007
-
-gUnk_0800FD0C:: @ 0800FD0C
-	.incbin "baserom.gba", 0x00FD0C, 0x000000A
-
-gUnk_0800FD16:: @ 0800FD16
-	.incbin "baserom.gba", 0x00FD16, 0x000000B
-
-gUnk_0800FD21:: @ 0800FD21
-	.incbin "baserom.gba", 0x00FD21, 0x000005F
-
-gUnk_0800FD80:: @ 0800FD80
-	.incbin "baserom.gba", 0x00FD80, 0x0000020
-
-gUnk_0800FDA0:: @ 0800FDA0
-	.incbin "baserom.gba", 0x00FDA0, 0x000002C
-
-gUnk_0800FDCC:: @ 0800FDCC
-	.incbin "baserom.gba", 0x00FDCC, 0x0000026
-
-gUnk_0800FDF2:: @ 0800FDF2
-	.incbin "baserom.gba", 0x00FDF2, 0x0000001
-
-gUnk_0800FDF3:: @ 0800FDF3
-	.incbin "baserom.gba", 0x00FDF3, 0x0000007
-
-gUnk_0800FDFA:: @ 0800FDFA
-	.incbin "baserom.gba", 0x00FDFA, 0x0000002
-
-gUnk_0800FDFC:: @ 0800FDFC
-	.incbin "baserom.gba", 0x00FDFC, 0x0000002
-
-gUnk_0800FDFE:: @ 0800FDFE
-	.incbin "baserom.gba", 0x00FDFE, 0x0000001
-
-gUnk_0800FDFF:: @ 0800FDFF
-	.incbin "baserom.gba", 0x00FDFF, 0x0000001
-
-gUnk_0800FE00:: @ 0800FE00
-	.incbin "baserom.gba", 0x00FE00, 0x0000001
-
-gUnk_0800FE01:: @ 0800FE01
-	.incbin "baserom.gba", 0x00FE01, 0x0000001
-
-gUnk_0800FE02:: @ 0800FE02
-	.incbin "baserom.gba", 0x00FE02, 0x0000002
-
-gUnk_0800FE04:: @ 0800FE04
-	.incbin "baserom.gba", 0x00FE04, 0x0000002
-
-gUnk_0800FE06:: @ 0800FE06
-	.incbin "baserom.gba", 0x00FE06, 0x0000001
-
-gUnk_0800FE07:: @ 0800FE07
-	.incbin "baserom.gba", 0x00FE07, 0x0000001
-
-gUnk_0800FE08:: @ 0800FE08
-	.incbin "baserom.gba", 0x00FE08, 0x0000001
-
-gUnk_0800FE09:: @ 0800FE09
-	.incbin "baserom.gba", 0x00FE09, 0x0000037
-
-gUnk_0800FE40:: @ 0800FE40
-	.incbin "baserom.gba", 0x00FE40, 0x0000004
-
-gUnk_0800FE44:: @ 0800FE44
-	.incbin "baserom.gba", 0x00FE44, 0x0000020
-
-gUnk_0800FE64:: @ 0800FE64
-	.incbin "baserom.gba", 0x00FE64, 0x0000024
-
-gUnk_0800FE88:: @ 0800FE88
-	.incbin "baserom.gba", 0x00FE88, 0x0000034
-
-gUnk_0800FEBC:: @ 0800FEBC
-	.incbin "baserom.gba", 0x00FEBC, 0x0000034
-
-gUnk_0800FEF0:: @ 0800FEF0
-	.incbin "baserom.gba", 0x00FEF0, 0x0000002
-
-gUnk_0800FEF2:: @ 0800FEF2
-	.incbin "baserom.gba", 0x00FEF2, 0x0000007
-
-gUnk_0800FEF9:: @ 0800FEF9
-	.incbin "baserom.gba", 0x00FEF9, 0x0000003
-
-gUnk_0800FEFC:: @ 0800FEFC
-	.incbin "baserom.gba", 0x00FEFC, 0x0000002
-
-gUnk_0800FEFE:: @ 0800FEFE
-	.incbin "baserom.gba", 0x00FEFE, 0x0000003
-
-gUnk_0800FF01:: @ 0800FF01
-	.incbin "baserom.gba", 0x00FF01, 0x0000002
-
-gUnk_0800FF03:: @ 0800FF03
-	.incbin "baserom.gba", 0x00FF03, 0x0000001
-
-gUnk_0800FF04:: @ 0800FF04
-	.incbin "baserom.gba", 0x00FF04, 0x0000001
-
-gUnk_0800FF05:: @ 0800FF05
-	.incbin "baserom.gba", 0x00FF05, 0x0000001
-
-gUnk_0800FF06:: @ 0800FF06
-	.incbin "baserom.gba", 0x00FF06, 0x0000002
-
-gUnk_0800FF08:: @ 0800FF08
-	.incbin "baserom.gba", 0x00FF08, 0x0000010
-
-gUnk_0800FF18:: @ 0800FF18
-	.incbin "baserom.gba", 0x00FF18, 0x0000012
-
-gUnk_0800FF2A:: @ 0800FF2A
-	.incbin "baserom.gba", 0x00FF2A, 0x000004A
-
-gUnk_0800FF74:: @ 0800FF74
-	.incbin "baserom.gba", 0x00FF74, 0x000003C
-
-gUnk_0800FFB0:: @ 0800FFB0
-	.incbin "baserom.gba", 0x00FFB0, 0x000000B
-
-gUnk_0800FFBB:: @ 0800FFBB
-	.incbin "baserom.gba", 0x00FFBB, 0x000001B
-
-gUnk_0800FFD6:: @ 0800FFD6
-	.incbin "baserom.gba", 0x00FFD6, 0x0000018
-
-gUnk_0800FFEE:: @ 0800FFEE
-	.incbin "baserom.gba", 0x00FFEE, 0x0000008
-
-gUnk_0800FFF6:: @ 0800FFF6
-	.incbin "baserom.gba", 0x00FFF6, 0x0000006
-
-gUnk_0800FFFC:: @ 0800FFFC
-	.incbin "baserom.gba", 0x00FFFC, 0x0000001
-
-gUnk_0800FFFD:: @ 0800FFFD
-	.incbin "baserom.gba", 0x00FFFD, 0x0000002
-
-gUnk_0800FFFF:: @ 0800FFFF
-	.incbin "baserom.gba", 0x00FFFF, 0x0000001
-
-gUnk_08010000:: @ 08010000
-	.incbin "baserom.gba", 0x010000, 0x0000001
-
-gUnk_08010001:: @ 08010001
-	.incbin "baserom.gba", 0x010001, 0x0000001
-
-gUnk_08010002:: @ 08010002
-	.incbin "baserom.gba", 0x010002, 0x0000001
-
-gUnk_08010003:: @ 08010003
-	.incbin "baserom.gba", 0x010003, 0x0000002
-
-gUnk_08010005:: @ 08010005
-	.incbin "baserom.gba", 0x010005, 0x0000002
-
-gUnk_08010007:: @ 08010007
-	.incbin "baserom.gba", 0x010007, 0x0000001
-
-gUnk_08010008:: @ 08010008
-	.incbin "baserom.gba", 0x010008, 0x0000001
-
-gUnk_08010009:: @ 08010009
-	.incbin "baserom.gba", 0x010009, 0x0000001
-
-gUnk_0801000A:: @ 0801000A
-	.incbin "baserom.gba", 0x01000A, 0x0000002
-
-gUnk_0801000C:: @ 0801000C
-	.incbin "baserom.gba", 0x01000C, 0x0000001
-
-gUnk_0801000D:: @ 0801000D
-	.incbin "baserom.gba", 0x01000D, 0x0000001
-
-gUnk_0801000E:: @ 0801000E
-	.incbin "baserom.gba", 0x01000E, 0x0000001
-
-gUnk_0801000F:: @ 0801000F
-	.incbin "baserom.gba", 0x01000F, 0x0000009
-
-gUnk_08010018:: @ 08010018
-	.incbin "baserom.gba", 0x010018, 0x0000003
-
-gUnk_0801001B:: @ 0801001B
-	.incbin "baserom.gba", 0x01001B, 0x0000002
-
-gUnk_0801001D:: @ 0801001D
-	.incbin "baserom.gba", 0x01001D, 0x0000006
-
-gUnk_08010023:: @ 08010023
-	.incbin "baserom.gba", 0x010023, 0x0000021
-
-gUnk_08010044:: @ 08010044
-	.incbin "baserom.gba", 0x010044, 0x0000054
-
-gUnk_08010098:: @ 08010098
-	.incbin "baserom.gba", 0x010098, 0x0000001
-
-gUnk_08010099:: @ 08010099
-	.incbin "baserom.gba", 0x010099, 0x0000028
-
-gUnk_080100C1:: @ 080100C1
-	.incbin "baserom.gba", 0x0100C1, 0x0000007
-
-gUnk_080100C8:: @ 080100C8
-	.incbin "baserom.gba", 0x0100C8, 0x000002D
-
-gUnk_080100F5:: @ 080100F5
-	.incbin "baserom.gba", 0x0100F5, 0x0000007
-
-gUnk_080100FC:: @ 080100FC
-	.incbin "baserom.gba", 0x0100FC, 0x0000002
-
-gUnk_080100FE:: @ 080100FE
-	.incbin "baserom.gba", 0x0100FE, 0x0000001
-
-gUnk_080100FF:: @ 080100FF
-	.incbin "baserom.gba", 0x0100FF, 0x0000001
-
-gUnk_08010100:: @ 08010100
-	.incbin "baserom.gba", 0x010100, 0x0000002
-
-gUnk_08010102:: @ 08010102
-	.incbin "baserom.gba", 0x010102, 0x0000001
-
-gUnk_08010103:: @ 08010103
-	.incbin "baserom.gba", 0x010103, 0x0000002
-
-gUnk_08010105:: @ 08010105
-	.incbin "baserom.gba", 0x010105, 0x0000001
-
-gUnk_08010106:: @ 08010106
-	.incbin "baserom.gba", 0x010106, 0x0000004
-
-gUnk_0801010A:: @ 0801010A
-	.incbin "baserom.gba", 0x01010A, 0x0000007
-
-gUnk_08010111:: @ 08010111
-	.incbin "baserom.gba", 0x010111, 0x000000F
-
-gUnk_08010120:: @ 08010120
-	.incbin "baserom.gba", 0x010120, 0x0000010
-
-gUnk_08010130:: @ 08010130
-	.incbin "baserom.gba", 0x010130, 0x0000018
-
-gUnk_08010148:: @ 08010148
-	.incbin "baserom.gba", 0x010148, 0x00000B2
-
-gUnk_080101FA:: @ 080101FA
-	.incbin "baserom.gba", 0x0101FA, 0x0000003
-
-gUnk_080101FD:: @ 080101FD
-	.incbin "baserom.gba", 0x0101FD, 0x0000002
-
-gUnk_080101FF:: @ 080101FF
-	.incbin "baserom.gba", 0x0101FF, 0x0000001
-
-gUnk_08010200:: @ 08010200
-	.incbin "baserom.gba", 0x010200, 0x0000003
-
-gUnk_08010203:: @ 08010203
-	.incbin "baserom.gba", 0x010203, 0x0000004
-
-gUnk_08010207:: @ 08010207
-	.incbin "baserom.gba", 0x010207, 0x0000001
-
-gUnk_08010208:: @ 08010208
-	.incbin "baserom.gba", 0x010208, 0x0000004
-
-gUnk_0801020C:: @ 0801020C
-	.incbin "baserom.gba", 0x01020C, 0x0000014
-
-gUnk_08010220:: @ 08010220
-	.incbin "baserom.gba", 0x010220, 0x0000016
-
-gUnk_08010236:: @ 08010236
-	.incbin "baserom.gba", 0x010236, 0x000002E
-
-gUnk_08010264:: @ 08010264
-	.incbin "baserom.gba", 0x010264, 0x0000030
-
-gUnk_08010294:: @ 08010294
-	.incbin "baserom.gba", 0x010294, 0x000004C
-
-gUnk_080102E0:: @ 080102E0
-	.incbin "baserom.gba", 0x0102E0, 0x000001B
-
-gUnk_080102FB:: @ 080102FB
-	.incbin "baserom.gba", 0x0102FB, 0x0000002
-
-gUnk_080102FD:: @ 080102FD
-	.incbin "baserom.gba", 0x0102FD, 0x0000001
-
-gUnk_080102FE:: @ 080102FE
-	.incbin "baserom.gba", 0x0102FE, 0x0000005
-
-gUnk_08010303:: @ 08010303
-	.incbin "baserom.gba", 0x010303, 0x0000001
-
-gUnk_08010304:: @ 08010304
-	.incbin "baserom.gba", 0x010304, 0x0000001
-
-gUnk_08010305:: @ 08010305
-	.incbin "baserom.gba", 0x010305, 0x0000005
-
-gUnk_0801030A:: @ 0801030A
-	.incbin "baserom.gba", 0x01030A, 0x0000002
-
-gUnk_0801030C:: @ 0801030C
-	.incbin "baserom.gba", 0x01030C, 0x0000014
-
-gUnk_08010320:: @ 08010320
-	.incbin "baserom.gba", 0x010320, 0x0000090
-
-gUnk_080103B0:: @ 080103B0
-	.incbin "baserom.gba", 0x0103B0, 0x0000020
-
-gUnk_080103D0:: @ 080103D0
-	.incbin "baserom.gba", 0x0103D0, 0x0000028
-
-gUnk_080103F8:: @ 080103F8
-	.incbin "baserom.gba", 0x0103F8, 0x0000005
-
-gUnk_080103FD:: @ 080103FD
-	.incbin "baserom.gba", 0x0103FD, 0x0000003
-
-gUnk_08010400:: @ 08010400
-	.incbin "baserom.gba", 0x010400, 0x0000006
-
-gUnk_08010406:: @ 08010406
-	.incbin "baserom.gba", 0x010406, 0x0000001
-
-gUnk_08010407:: @ 08010407
-	.incbin "baserom.gba", 0x010407, 0x0000003
-
-gUnk_0801040A:: @ 0801040A
-	.incbin "baserom.gba", 0x01040A, 0x000001E
-
-gUnk_08010428:: @ 08010428
-	.incbin "baserom.gba", 0x010428, 0x000002C
-
-gUnk_08010454:: @ 08010454
-	.incbin "baserom.gba", 0x010454, 0x000002C
-
-gUnk_08010480:: @ 08010480
-	.incbin "baserom.gba", 0x010480, 0x0000020
-
-gUnk_080104A0:: @ 080104A0
-	.incbin "baserom.gba", 0x0104A0, 0x000004C
-
-gUnk_080104EC:: @ 080104EC
-	.incbin "baserom.gba", 0x0104EC, 0x0000013
-
-gUnk_080104FF:: @ 080104FF
-	.incbin "baserom.gba", 0x0104FF, 0x0000002
-
-gUnk_08010501:: @ 08010501
-	.incbin "baserom.gba", 0x010501, 0x0000001
-
-gUnk_08010502:: @ 08010502
-	.incbin "baserom.gba", 0x010502, 0x0000001
-
-gUnk_08010503:: @ 08010503
-	.incbin "baserom.gba", 0x010503, 0x0000007
-
-gUnk_0801050A:: @ 0801050A
-	.incbin "baserom.gba", 0x01050A, 0x0000001
-
-gUnk_0801050B:: @ 0801050B
-	.incbin "baserom.gba", 0x01050B, 0x000001B
-
-gUnk_08010526:: @ 08010526
-	.incbin "baserom.gba", 0x010526, 0x0000079
-
-gUnk_0801059F:: @ 0801059F
-	.incbin "baserom.gba", 0x01059F, 0x000002A
-
-gUnk_080105C9:: @ 080105C9
-	.incbin "baserom.gba", 0x0105C9, 0x0000032
-
-gUnk_080105FB:: @ 080105FB
-	.incbin "baserom.gba", 0x0105FB, 0x0000004
-
-gUnk_080105FF:: @ 080105FF
-	.incbin "baserom.gba", 0x0105FF, 0x0000001
-
-gUnk_08010600:: @ 08010600
-	.incbin "baserom.gba", 0x010600, 0x000000A
-
-gUnk_0801060A:: @ 0801060A
-	.incbin "baserom.gba", 0x01060A, 0x0000003
-
-gUnk_0801060D:: @ 0801060D
-	.incbin "baserom.gba", 0x01060D, 0x000000A
-
-gUnk_08010617:: @ 08010617
-	.incbin "baserom.gba", 0x010617, 0x0000005
-
-gUnk_0801061C:: @ 0801061C
-	.incbin "baserom.gba", 0x01061C, 0x0000028
-
-gUnk_08010644:: @ 08010644
-	.incbin "baserom.gba", 0x010644, 0x000000C
-
-gUnk_08010650:: @ 08010650
-	.incbin "baserom.gba", 0x010650, 0x0000024
-
-gUnk_08010674:: @ 08010674
-	.incbin "baserom.gba", 0x010674, 0x0000038
-
-gUnk_080106AC:: @ 080106AC
-	.incbin "baserom.gba", 0x0106AC, 0x0000054
-
-gUnk_08010700:: @ 08010700
-	.incbin "baserom.gba", 0x010700, 0x0000001
-
-gUnk_08010701:: @ 08010701
-	.incbin "baserom.gba", 0x010701, 0x0000004
-
-gUnk_08010705:: @ 08010705
-	.incbin "baserom.gba", 0x010705, 0x0000009
-
-gUnk_0801070E:: @ 0801070E
-	.incbin "baserom.gba", 0x01070E, 0x0000026
-
-gUnk_08010734:: @ 08010734
-	.incbin "baserom.gba", 0x010734, 0x0000060
-
-gUnk_08010794:: @ 08010794
-	.incbin "baserom.gba", 0x010794, 0x000003C
-
-gUnk_080107D0:: @ 080107D0
-	.incbin "baserom.gba", 0x0107D0, 0x000003A
-
-gUnk_0801080A:: @ 0801080A
-	.incbin "baserom.gba", 0x01080A, 0x0000001
-
-gUnk_0801080B:: @ 0801080B
-	.incbin "baserom.gba", 0x01080B, 0x000000A
-
-gUnk_08010815:: @ 08010815
-	.incbin "baserom.gba", 0x010815, 0x0000006
-
-gUnk_0801081B:: @ 0801081B
-	.incbin "baserom.gba", 0x01081B, 0x00000B5
-
-gUnk_080108D0:: @ 080108D0
-	.incbin "baserom.gba", 0x0108D0, 0x000002F
-
-gUnk_080108FF:: @ 080108FF
-	.incbin "baserom.gba", 0x0108FF, 0x000000D
-
-gUnk_0801090C:: @ 0801090C
-	.incbin "baserom.gba", 0x01090C, 0x0000003
-
-gUnk_0801090F:: @ 0801090F
-	.incbin "baserom.gba", 0x01090F, 0x0000008
-
-gUnk_08010917:: @ 08010917
-	.incbin "baserom.gba", 0x010917, 0x000004D
-
-gUnk_08010964:: @ 08010964
-	.incbin "baserom.gba", 0x010964, 0x000003C
-
-gUnk_080109A0:: @ 080109A0
-	.incbin "baserom.gba", 0x0109A0, 0x0000050
-
-gUnk_080109F0:: @ 080109F0
-	.incbin "baserom.gba", 0x0109F0, 0x0000006
-
-gUnk_080109F6:: @ 080109F6
-	.incbin "baserom.gba", 0x0109F6, 0x000001E
-
-gUnk_08010A14:: @ 08010A14
-	.incbin "baserom.gba", 0x010A14, 0x000000B
-
-gUnk_08010A1F:: @ 08010A1F
-	.incbin "baserom.gba", 0x010A1F, 0x0000019
-
-gUnk_08010A38:: @ 08010A38
-	.incbin "baserom.gba", 0x010A38, 0x0000024
-
-gUnk_08010A5C:: @ 08010A5C
-	.incbin "baserom.gba", 0x010A5C, 0x000003C
-
-gUnk_08010A98:: @ 08010A98
-	.incbin "baserom.gba", 0x010A98, 0x000004C
-
-gUnk_08010AE4:: @ 08010AE4
-	.incbin "baserom.gba", 0x010AE4, 0x0000020
-
-gUnk_08010B04:: @ 08010B04
-	.incbin "baserom.gba", 0x010B04, 0x0000064
-
-gUnk_08010B68:: @ 08010B68
-	.incbin "baserom.gba", 0x010B68, 0x000004C
-
-gUnk_08010BB4:: @ 08010BB4
-	.incbin "baserom.gba", 0x010BB4, 0x0000038
-
-gUnk_08010BEC:: @ 08010BEC
-	.incbin "baserom.gba", 0x010BEC, 0x000000D
-
-gUnk_08010BF9:: @ 08010BF9
-	.incbin "baserom.gba", 0x010BF9, 0x0000005
-
-gUnk_08010BFE:: @ 08010BFE
-	.incbin "baserom.gba", 0x010BFE, 0x000001C
-
-gUnk_08010C1A:: @ 08010C1A
-	.incbin "baserom.gba", 0x010C1A, 0x00000E9
-
-gUnk_08010D03:: @ 08010D03
-	.incbin "baserom.gba", 0x010D03, 0x00000FD
-
-gUnk_08010E00:: @ 08010E00
-	.incbin "baserom.gba", 0x010E00, 0x000000D
-
-gUnk_08010E0D:: @ 08010E0D
-	.incbin "baserom.gba", 0x010E0D, 0x00000F3
-
-gUnk_08010F00:: @ 08010F00
-	.incbin "baserom.gba", 0x010F00, 0x00000FF
-
-gUnk_08010FFF:: @ 08010FFF
-	.incbin "baserom.gba", 0x010FFF, 0x0000001
-
-gUnk_08011000:: @ 08011000
-	.incbin "baserom.gba", 0x011000, 0x0000001
-
-gUnk_08011001:: @ 08011001
-	.incbin "baserom.gba", 0x011001, 0x000001E
-
-gUnk_0801101F:: @ 0801101F
-	.incbin "baserom.gba", 0x01101F, 0x0000055
-
-gUnk_08011074:: @ 08011074
-	.incbin "baserom.gba", 0x011074, 0x000000F
-
-gUnk_08011083:: @ 08011083
-	.incbin "baserom.gba", 0x011083, 0x0000059
-
-gUnk_080110DC:: @ 080110DC
-	.incbin "baserom.gba", 0x0110DC, 0x000000C
-
-gUnk_080110E8:: @ 080110E8
-	.incbin "baserom.gba", 0x0110E8, 0x0000040
-
-gUnk_08011128:: @ 08011128
-	.incbin "baserom.gba", 0x011128, 0x00000A4
-
-gUnk_080111CC:: @ 080111CC
-	.incbin "baserom.gba", 0x0111CC, 0x000003C
-
-gUnk_08011208:: @ 08011208
-	.incbin "baserom.gba", 0x011208, 0x0000015
-
-gUnk_0801121D:: @ 0801121D
-	.incbin "baserom.gba", 0x01121D, 0x00000A7
-
-gUnk_080112C4:: @ 080112C4
-	.incbin "baserom.gba", 0x0112C4, 0x000004B
-
-gUnk_0801130F:: @ 0801130F
-	.incbin "baserom.gba", 0x01130F, 0x0000019
-
-gUnk_08011328:: @ 08011328
-	.incbin "baserom.gba", 0x011328, 0x00000DB
-
-gUnk_08011403:: @ 08011403
-	.incbin "baserom.gba", 0x011403, 0x00001CD
-
-gUnk_080115D0:: @ 080115D0
-	.incbin "baserom.gba", 0x0115D0, 0x0000038
-
-gUnk_08011608:: @ 08011608
-	.incbin "baserom.gba", 0x011608, 0x0000038
-
-gUnk_08011640:: @ 08011640
-	.incbin "baserom.gba", 0x011640, 0x0000068
-
-gUnk_080116A8:: @ 080116A8
-	.incbin "baserom.gba", 0x0116A8, 0x0000161
-
-gUnk_08011809:: @ 08011809
-	.incbin "baserom.gba", 0x011809, 0x0000033
-
-gUnk_0801183C:: @ 0801183C
-	.incbin "baserom.gba", 0x01183C, 0x0000098
-
-gUnk_080118D4:: @ 080118D4
-	.incbin "baserom.gba", 0x0118D4, 0x000005C
-
-gUnk_08011930:: @ 08011930
-	.incbin "baserom.gba", 0x011930, 0x0000010
-
-gUnk_08011940:: @ 08011940
-	.incbin "baserom.gba", 0x011940, 0x000000C
-
-gUnk_0801194C:: @ 0801194C
-	.incbin "baserom.gba", 0x01194C, 0x000000C
-
-gUnk_08011958:: @ 08011958
-	.incbin "baserom.gba", 0x011958, 0x000000C
-
-gUnk_08011964:: @ 08011964
-	.incbin "baserom.gba", 0x011964, 0x000004C
-
-gUnk_080119B0:: @ 080119B0
-	.incbin "baserom.gba", 0x0119B0, 0x0000028
-
-gUnk_080119D8:: @ 080119D8
-	.incbin "baserom.gba", 0x0119D8, 0x000000C
-
-gUnk_080119E4:: @ 080119E4
-	.incbin "baserom.gba", 0x0119E4, 0x000000C
-
-gUnk_080119F0:: @ 080119F0
-	.incbin "baserom.gba", 0x0119F0, 0x0000014
-
-gUnk_08011A04:: @ 08011A04
-	.incbin "baserom.gba", 0x011A04, 0x0000028
-
-gUnk_08011A2C:: @ 08011A2C
-	.incbin "baserom.gba", 0x011A2C, 0x0000038
-
-gUnk_08011A64:: @ 08011A64
-	.incbin "baserom.gba", 0x011A64, 0x0000080
-
-gUnk_08011AE4:: @ 08011AE4
-	.incbin "baserom.gba", 0x011AE4, 0x0000020
-
-gUnk_08011B04:: @ 08011B04
-	.incbin "baserom.gba", 0x011B04, 0x000001C
-
-gUnk_08011B20:: @ 08011B20
-	.incbin "baserom.gba", 0x011B20, 0x0000020
-
-gUnk_08011B40:: @ 08011B40
-	.incbin "baserom.gba", 0x011B40, 0x00000A4
-
-gUnk_08011BE4:: @ 08011BE4
-	.incbin "baserom.gba", 0x011BE4, 0x0000020
-
-gUnk_08011C04:: @ 08011C04
-	.incbin "baserom.gba", 0x011C04, 0x000004C
-
-gUnk_08011C50:: @ 08011C50
-	.incbin "baserom.gba", 0x011C50, 0x000002C
-
-gUnk_08011C7C:: @ 08011C7C
-	.incbin "baserom.gba", 0x011C7C, 0x00000AC
-
-gUnk_08011D28:: @ 08011D28
-	.incbin "baserom.gba", 0x011D28, 0x00000AC
-
-gUnk_08011DD4:: @ 08011DD4
-	.incbin "baserom.gba", 0x011DD4, 0x0000030
-
-gUnk_08011E04:: @ 08011E04
-	.incbin "baserom.gba", 0x011E04, 0x000007C
-
-gUnk_08011E80:: @ 08011E80
-	.incbin "baserom.gba", 0x011E80, 0x000008C
-
-gUnk_08011F0C:: @ 08011F0C
-	.incbin "baserom.gba", 0x011F0C, 0x000008C
-
-gUnk_08011F98:: @ 08011F98
-	.incbin "baserom.gba", 0x011F98, 0x000008C
-
-gUnk_08012024:: @ 08012024
-	.incbin "baserom.gba", 0x012024, 0x000006D
-
-gUnk_08012091:: @ 08012091
-	.incbin "baserom.gba", 0x012091, 0x000001F
-
-gUnk_080120B0:: @ 080120B0
-	.incbin "baserom.gba", 0x0120B0, 0x000003D
-
-gUnk_080120ED:: @ 080120ED
-	.incbin "baserom.gba", 0x0120ED, 0x000000E
-
-gUnk_080120FB:: @ 080120FB
-	.incbin "baserom.gba", 0x0120FB, 0x0000041
-
-gUnk_0801213C:: @ 0801213C
-	.incbin "baserom.gba", 0x01213C, 0x000008C
-
-gUnk_080121C8:: @ 080121C8
-	.incbin "baserom.gba", 0x0121C8, 0x0000038
-
-gUnk_08012200:: @ 08012200
-	.incbin "baserom.gba", 0x012200, 0x0000038
-
-gUnk_08012238:: @ 08012238
-	.incbin "baserom.gba", 0x012238, 0x0000038
-
-gUnk_08012270:: @ 08012270
-	.incbin "baserom.gba", 0x012270, 0x00000BC
-
-gUnk_0801232C:: @ 0801232C
-	.incbin "baserom.gba", 0x01232C, 0x0000034
-
-gUnk_08012360:: @ 08012360
-	.incbin "baserom.gba", 0x012360, 0x00000B0
-
-gUnk_08012410:: @ 08012410
-	.incbin "baserom.gba", 0x012410, 0x0000020
-
-gUnk_08012430:: @ 08012430
-	.incbin "baserom.gba", 0x012430, 0x0000050
-
-gUnk_08012480:: @ 08012480
-	.incbin "baserom.gba", 0x012480, 0x000027C
-
-
-
-@	.incbin "baserom.gba", 0x0126FC, 0x00003B4
-
 
 
diff --git a/asm/code_08012AB0.s b/asm/code_08012AB0.s
deleted file mode 100644
index cbe339f3..00000000
--- a/asm/code_08012AB0.s
+++ /dev/null
@@ -1,384 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-gUnk_08012AB0:: @ 08012AB0
-	.incbin "baserom.gba", 0x012AB0, 0x00000F8
-
-gUnk_08012BA8:: @ 08012BA8
-	.incbin "baserom.gba", 0x012BA8, 0x0000050
-
-gUnk_08012BF8:: @ 08012BF8
-	.incbin "baserom.gba", 0x012BF8, 0x0000014
-
-gUnk_08012C0C:: @ 08012C0C
-	.incbin "baserom.gba", 0x012C0C, 0x000003C
-
-gUnk_08012C48:: @ 08012C48
-	.incbin "baserom.gba", 0x012C48, 0x0000050
-
-gUnk_08012C98:: @ 08012C98
-	.incbin "baserom.gba", 0x012C98, 0x0000040
-
-gUnk_08012CD8:: @ 08012CD8
-	.incbin "baserom.gba", 0x012CD8, 0x0000040
-
-gUnk_08012D18:: @ 08012D18
-	.incbin "baserom.gba", 0x012D18, 0x0000058
-
-gUnk_08012D70:: @ 08012D70
-	.incbin "baserom.gba", 0x012D70, 0x0000031
-
-gUnk_08012DA1:: @ 08012DA1
-	.incbin "baserom.gba", 0x012DA1, 0x000000F
-
-gUnk_08012DB0:: @ 08012DB0
-	.incbin "baserom.gba", 0x012DB0, 0x0000028
-
-gUnk_08012DD8:: @ 08012DD8
-	.incbin "baserom.gba", 0x012DD8, 0x0000048
-
-gUnk_08012E20:: @ 08012E20
-	.incbin "baserom.gba", 0x012E20, 0x0000024
-
-gUnk_08012E44:: @ 08012E44
-	.incbin "baserom.gba", 0x012E44, 0x0000044
-
-gUnk_08012E88:: @ 08012E88
-	.incbin "baserom.gba", 0x012E88, 0x0000038
-
-gUnk_08012EC0:: @ 08012EC0
-	.incbin "baserom.gba", 0x012EC0, 0x000004C
-
-gUnk_08012F0C:: @ 08012F0C
-	.incbin "baserom.gba", 0x012F0C, 0x00000F5
-
-gUnk_08013001:: @ 08013001
-	.incbin "baserom.gba", 0x013001, 0x0000002
-
-gUnk_08013003:: @ 08013003
-	.incbin "baserom.gba", 0x013003, 0x0000008
-
-gUnk_0801300B:: @ 0801300B
-	.incbin "baserom.gba", 0x01300B, 0x0000031
-
-gUnk_0801303C:: @ 0801303C
-	.incbin "baserom.gba", 0x01303C, 0x0000034
-
-gUnk_08013070:: @ 08013070
-	.incbin "baserom.gba", 0x013070, 0x0000011
-
-gUnk_08013081:: @ 08013081
-	.incbin "baserom.gba", 0x013081, 0x000000F
-
-gUnk_08013090:: @ 08013090
-	.incbin "baserom.gba", 0x013090, 0x0000084
-
-gUnk_08013114:: @ 08013114
-	.incbin "baserom.gba", 0x013114, 0x0000074
-
-gUnk_08013188:: @ 08013188
-	.incbin "baserom.gba", 0x013188, 0x0000024
-
-gUnk_080131AC:: @ 080131AC
-	.incbin "baserom.gba", 0x0131AC, 0x0000138
-
-gUnk_080132E4:: @ 080132E4
-	.incbin "baserom.gba", 0x0132E4, 0x000004C
-
-gUnk_08013330:: @ 08013330
-	.incbin "baserom.gba", 0x013330, 0x000001C
-
-gUnk_0801334C:: @ 0801334C
-	.incbin "baserom.gba", 0x01334C, 0x000002C
-
-gUnk_08013378:: @ 08013378
-	.incbin "baserom.gba", 0x013378, 0x000004C
-
-gUnk_080133C4:: @ 080133C4
-	.incbin "baserom.gba", 0x0133C4, 0x0000034
-
-gUnk_080133F8:: @ 080133F8
-	.incbin "baserom.gba", 0x0133F8, 0x00000E4
-
-gUnk_080134DC:: @ 080134DC
-	.incbin "baserom.gba", 0x0134DC, 0x00001FC
-
-gUnk_080136D8:: @ 080136D8
-	.incbin "baserom.gba", 0x0136D8, 0x0000048
-
-gUnk_08013720:: @ 08013720
-	.incbin "baserom.gba", 0x013720, 0x00000BA
-
-gUnk_080137DA:: @ 080137DA
-	.incbin "baserom.gba", 0x0137DA, 0x00000DA
-
-gUnk_080138B4:: @ 080138B4
-	.incbin "baserom.gba", 0x0138B4, 0x0000264
-
-gUnk_08013B18:: @ 08013B18
-	.incbin "baserom.gba", 0x013B18, 0x0000058
-
-gUnk_08013B70:: @ 08013B70
-	.incbin "baserom.gba", 0x013B70, 0x0000038
-
-gUnk_08013BA8:: @ 08013BA8
-	.incbin "baserom.gba", 0x013BA8, 0x0000040
-
-gUnk_08013BE8:: @ 08013BE8
-	.incbin "baserom.gba", 0x013BE8, 0x00000BC
-
-gUnk_08013CA4:: @ 08013CA4
-	.incbin "baserom.gba", 0x013CA4, 0x0000160
-
-gUnk_08013E04:: @ 08013E04
-	.incbin "baserom.gba", 0x013E04, 0x0000048
-
-gUnk_08013E4C:: @ 08013E4C
-	.incbin "baserom.gba", 0x013E4C, 0x0000024
-
-gUnk_08013E70:: @ 08013E70
-	.incbin "baserom.gba", 0x013E70, 0x0000024
-
-gUnk_08013E94:: @ 08013E94
-	.incbin "baserom.gba", 0x013E94, 0x000001C
-
-gUnk_08013EB0:: @ 08013EB0
-	.incbin "baserom.gba", 0x013EB0, 0x000001C
-
-gUnk_08013ECC:: @ 08013ECC
-	.incbin "baserom.gba", 0x013ECC, 0x000001C
-
-gUnk_08013EE8:: @ 08013EE8
-	.incbin "baserom.gba", 0x013EE8, 0x000001C
-
-gUnk_08013F04:: @ 08013F04
-	.incbin "baserom.gba", 0x013F04, 0x0000030
-
-gUnk_08013F34:: @ 08013F34
-	.incbin "baserom.gba", 0x013F34, 0x0000030
-
-gUnk_08013F64:: @ 08013F64
-	.incbin "baserom.gba", 0x013F64, 0x0000030
-
-gUnk_08013F94:: @ 08013F94
-	.incbin "baserom.gba", 0x013F94, 0x0000054
-
-gUnk_08013FE8:: @ 08013FE8
-	.incbin "baserom.gba", 0x013FE8, 0x000006C
-
-gUnk_08014054:: @ 08014054
-	.incbin "baserom.gba", 0x014054, 0x0000020
-
-gUnk_08014074:: @ 08014074
-	.incbin "baserom.gba", 0x014074, 0x0000020
-
-gUnk_08014094:: @ 08014094
-	.incbin "baserom.gba", 0x014094, 0x0000048
-
-gUnk_080140DC:: @ 080140DC
-	.incbin "baserom.gba", 0x0140DC, 0x000001C
-
-gUnk_080140F8:: @ 080140F8
-	.incbin "baserom.gba", 0x0140F8, 0x0000020
-
-gUnk_08014118:: @ 08014118
-	.incbin "baserom.gba", 0x014118, 0x000003C
-
-gUnk_08014154:: @ 08014154
-	.incbin "baserom.gba", 0x014154, 0x0000088
-
-gUnk_080141DC:: @ 080141DC
-	.incbin "baserom.gba", 0x0141DC, 0x0000034
-
-gUnk_08014210:: @ 08014210
-	.incbin "baserom.gba", 0x014210, 0x0000064
-
-gUnk_08014274:: @ 08014274
-	.incbin "baserom.gba", 0x014274, 0x000003C
-
-gUnk_080142B0:: @ 080142B0
-	.incbin "baserom.gba", 0x0142B0, 0x00000D4
-
-gUnk_08014384:: @ 08014384
-	.incbin "baserom.gba", 0x014384, 0x000003C
-
-gUnk_080143C0:: @ 080143C0
-	.incbin "baserom.gba", 0x0143C0, 0x0000042
-
-gUnk_08014402:: @ 08014402
-	.incbin "baserom.gba", 0x014402, 0x000004E
-
-gUnk_08014450:: @ 08014450
-	.incbin "baserom.gba", 0x014450, 0x00000BC
-
-gUnk_0801450C:: @ 0801450C
-	.incbin "baserom.gba", 0x01450C, 0x000003C
-
-gUnk_08014548:: @ 08014548
-	.incbin "baserom.gba", 0x014548, 0x0000058
-
-gUnk_080145A0:: @ 080145A0
-	.incbin "baserom.gba", 0x0145A0, 0x0000010
-
-gUnk_080145B0:: @ 080145B0
-	.incbin "baserom.gba", 0x0145B0, 0x0000038
-
-gUnk_080145E8:: @ 080145E8
-	.incbin "baserom.gba", 0x0145E8, 0x0000040
-
-gUnk_08014628:: @ 08014628
-	.incbin "baserom.gba", 0x014628, 0x00001DC
-
-gUnk_08014804:: @ 08014804
-	.incbin "baserom.gba", 0x014804, 0x00000EC
-
-gUnk_080148F0:: @ 080148F0
-	.incbin "baserom.gba", 0x0148F0, 0x0000068
-
-gUnk_08014958:: @ 08014958
-	.incbin "baserom.gba", 0x014958, 0x000003C
-
-gUnk_08014994:: @ 08014994
-	.incbin "baserom.gba", 0x014994, 0x0000038
-
-gUnk_080149CC:: @ 080149CC
-	.incbin "baserom.gba", 0x0149CC, 0x000005C
-
-gUnk_08014A28:: @ 08014A28
-	.incbin "baserom.gba", 0x014A28, 0x000002C
-
-gUnk_08014A54:: @ 08014A54
-	.incbin "baserom.gba", 0x014A54, 0x000002C
-
-gUnk_08014A80:: @ 08014A80
-	.incbin "baserom.gba", 0x014A80, 0x0000044
-
-gUnk_08014AC4:: @ 08014AC4
-	.incbin "baserom.gba", 0x014AC4, 0x0000070
-
-gUnk_08014B34:: @ 08014B34
-	.incbin "baserom.gba", 0x014B34, 0x00000F8
-
-gUnk_08014C2C:: @ 08014C2C
-	.incbin "baserom.gba", 0x014C2C, 0x0000068
-
-gUnk_08014C94:: @ 08014C94
-	.incbin "baserom.gba", 0x014C94, 0x0000048
-
-gUnk_08014CDC:: @ 08014CDC
-	.incbin "baserom.gba", 0x014CDC, 0x00000F0
-
-gUnk_08014DCC:: @ 08014DCC
-	.incbin "baserom.gba", 0x014DCC, 0x0000048
-
-gUnk_08014E14:: @ 08014E14
-	.incbin "baserom.gba", 0x014E14, 0x000003C
-
-gUnk_08014E50:: @ 08014E50
-	.incbin "baserom.gba", 0x014E50, 0x000007C
-
-gUnk_08014ECC:: @ 08014ECC
-	.incbin "baserom.gba", 0x014ECC, 0x000002C
-
-gUnk_08014EF8:: @ 08014EF8
-	.incbin "baserom.gba", 0x014EF8, 0x0000038
-
-gUnk_08014F30:: @ 08014F30
-	.incbin "baserom.gba", 0x014F30, 0x000008C
-
-gUnk_08014FBC:: @ 08014FBC
-	.incbin "baserom.gba", 0x014FBC, 0x0000045
-
-gUnk_08015001:: @ 08015001
-	.incbin "baserom.gba", 0x015001, 0x0000086
-
-gUnk_08015087:: @ 08015087
-	.incbin "baserom.gba", 0x015087, 0x0000068
-
-gUnk_080150EF:: @ 080150EF
-	.incbin "baserom.gba", 0x0150EF, 0x0000145
-
-gUnk_08015234:: @ 08015234
-	.incbin "baserom.gba", 0x015234, 0x0000080
-
-gUnk_080152B4:: @ 080152B4
-	.incbin "baserom.gba", 0x0152B4, 0x00000DC
-
-gUnk_08015390:: @ 08015390
-	.incbin "baserom.gba", 0x015390, 0x000005C
-
-gUnk_080153EC:: @ 080153EC
-	.incbin "baserom.gba", 0x0153EC, 0x0000120
-
-gUnk_0801550C:: @ 0801550C
-	.incbin "baserom.gba", 0x01550C, 0x000010C
-
-gUnk_08015618:: @ 08015618
-	.incbin "baserom.gba", 0x015618, 0x000006C
-
-gUnk_08015684:: @ 08015684
-	.incbin "baserom.gba", 0x015684, 0x000001C
-
-gUnk_080156A0:: @ 080156A0
-	.incbin "baserom.gba", 0x0156A0, 0x00000B4
-
-gUnk_08015754:: @ 08015754
-	.incbin "baserom.gba", 0x015754, 0x0000058
-
-gUnk_080157AC:: @ 080157AC
-	.incbin "baserom.gba", 0x0157AC, 0x000014C
-
-gUnk_080158F8:: @ 080158F8
-	.incbin "baserom.gba", 0x0158F8, 0x0000040
-
-gUnk_08015938:: @ 08015938
-	.incbin "baserom.gba", 0x015938, 0x0000020
-
-gUnk_08015958:: @ 08015958
-	.incbin "baserom.gba", 0x015958, 0x000016C
-
-gUnk_08015AC4:: @ 08015AC4
-	.incbin "baserom.gba", 0x015AC4, 0x0000050
-
-gUnk_08015B14:: @ 08015B14
-	.incbin "baserom.gba", 0x015B14, 0x0000020
-
-gUnk_08015B34:: @ 08015B34
-	.incbin "baserom.gba", 0x015B34, 0x0000050
-
-gUnk_08015B84:: @ 08015B84
-	.incbin "baserom.gba", 0x015B84, 0x0000024
-
-gUnk_08015BA8:: @ 08015BA8
-	.incbin "baserom.gba", 0x015BA8, 0x0000040
-
-gUnk_08015BE8:: @ 08015BE8
-	.incbin "baserom.gba", 0x015BE8, 0x00000EC
-
-gUnk_08015CD4:: @ 08015CD4
-	.incbin "baserom.gba", 0x015CD4, 0x000011C
-
-gUnk_08015DF0:: @ 08015DF0
-	.incbin "baserom.gba", 0x015DF0, 0x0000068
-
-gUnk_08015E58:: @ 08015E58
-	.incbin "baserom.gba", 0x015E58, 0x00000B0
-
-gUnk_08015F08:: @ 08015F08
-	.incbin "baserom.gba", 0x015F08, 0x0000034
-
-gUnk_08015F3C:: @ 08015F3C
-	.incbin "baserom.gba", 0x015F3C, 0x0000068
-
-gUnk_08015FA4:: @ 08015FA4
-	.incbin "baserom.gba", 0x015FA4, 0x000001C
-
-gUnk_08015FC0:: @ 08015FC0
-	.incbin "baserom.gba", 0x015FC0, 0x0000061
-
-gUnk_08016021:: @ 08016021
-	.incbin "baserom.gba", 0x016021, 0x000000F
-
diff --git a/asm/code_0801606C.s b/asm/code_08016984.s
similarity index 69%
rename from asm/code_0801606C.s
rename to asm/code_08016984.s
index d7e1df3b..bfdfa728 100644
--- a/asm/code_0801606C.s
+++ b/asm/code_08016984.s
@@ -4,68 +4,6 @@
 	.syntax unified
 
 	.text
-gUnk_0801606C:: @ 0801606C
-	.incbin "baserom.gba", 0x01606C, 0x000003C
-
-gUnk_080160A8:: @ 080160A8
-	.incbin "baserom.gba", 0x0160A8, 0x0000042
-
-gUnk_080160EA:: @ 080160EA
-	.incbin "baserom.gba", 0x0160EA, 0x0000052
-
-gUnk_0801613C:: @ 0801613C
-	.incbin "baserom.gba", 0x01613C, 0x0000054
-
-gUnk_08016190:: @ 08016190
-	.incbin "baserom.gba", 0x016190, 0x0000058
-
-gUnk_080161E8:: @ 080161E8
-	.incbin "baserom.gba", 0x0161E8, 0x0000174
-
-gUnk_0801635C:: @ 0801635C
-	.incbin "baserom.gba", 0x01635C, 0x0000021
-
-gUnk_0801637D:: @ 0801637D
-	.incbin "baserom.gba", 0x01637D, 0x0000007
-
-gUnk_08016384:: @ 08016384
-	.incbin "baserom.gba", 0x016384, 0x0000084
-
-gUnk_08016408:: @ 08016408
-	.incbin "baserom.gba", 0x016408, 0x00001F0
-
-gUnk_080165F8:: @ 080165F8
-	.incbin "baserom.gba", 0x0165F8, 0x0000014
-
-gUnk_0801660C:: @ 0801660C
-	.incbin "baserom.gba", 0x01660C, 0x000001C
-
-gUnk_08016628:: @ 08016628
-	.incbin "baserom.gba", 0x016628, 0x000001C
-
-gUnk_08016644:: @ 08016644
-	.incbin "baserom.gba", 0x016644, 0x0000028
-
-gUnk_0801666C:: @ 0801666C
-	.incbin "baserom.gba", 0x01666C, 0x000004C
-
-gUnk_080166B8:: @ 080166B8
-	.incbin "baserom.gba", 0x0166B8, 0x0000044
-
-gUnk_080166FC:: @ 080166FC
-	.incbin "baserom.gba", 0x0166FC, 0x000009C
-
-gUnk_08016798:: @ 08016798
-	.incbin "baserom.gba", 0x016798, 0x00000AC
-
-gUnk_08016844:: @ 08016844
-	.incbin "baserom.gba", 0x016844, 0x000009C
-
-gUnk_080168E0:: @ 080168E0
-	.incbin "baserom.gba", 0x0168E0, 0x0000014
-
-gUnk_080168F4:: @ 080168F4
-	.incbin "baserom.gba", 0x0168F4, 0x0000090
 
 gUnk_08016984:: @ 08016984
 	.incbin "baserom.gba", 0x016984, 0x0000002
diff --git a/asm/macros/script.inc b/asm/macros/script.inc
index cfe4328f..ba693547 100644
--- a/asm/macros/script.inc
+++ b/asm/macros/script.inc
@@ -2,10 +2,9 @@
 @ Generated by disassemble_script.py
 .macro SCRIPT_START name
         .globl \name
-        .section .rodata
+        .section .text
 \name:
 .endm
-
 .macro SCRIPT_END
         .short 0xffff
 .endm
@@ -112,11 +111,25 @@
         .short 0x0418
 .endm
 
+.macro sub_0807E30C 
+        .short 0x0419
+.endm
+
+.macro sub_0807E40C s
+        .short 0x081d
+        .short \s
+.endm
+
 .macro sub_0807E5F8 w
         .short 0x0c28
         .word \w
 .endm
 
+.macro sub_0807E650 s
+        .short 0x082d
+        .short \s
+.endm
+
 .macro sub_0807E680 s
         .short 0x0831
         .short \s
@@ -127,6 +140,10 @@
         .word \w
 .endm
 
+.macro sub_0807E6DC 
+        .short 0x0434
+.endm
+
 .macro sub_0807E864 
         .short 0x0443
 .endm
@@ -161,6 +178,10 @@
         .short \s
 .endm
 
+.macro sub_0807E944 
+        .short 0x0451
+.endm
+
 .macro sub_0807E9D4 
         .short 0x0453
 .endm
@@ -169,10 +190,23 @@
         .short 0x0454
 .endm
 
+.macro sub_0807E9F0 
+        .short 0x0456
+.endm
+
+.macro sub_0807EA4C 
+        .short 0x0457
+.endm
+
 .macro sub_0807EA94 
         .short 0x0459
 .endm
 
+.macro sub_0807EAB4 s
+        .short 0x085a
+        .short \s
+.endm
+
 .macro sub_0807EAD0 a,b
         .short 0x0c5c
         .short \a
@@ -184,13 +218,22 @@
         .short \s
 .endm
 
+.macro sub_0807EB44 s
+        .short 0x0861
+        .short \s
+.endm
+
+.macro sub_0807EB74 
+        .short 0x0463
+.endm
+
 .macro sub_0807EB8C 
         .short 0x0464
 .endm
 
-.macro sub_0807EBC0 param
+.macro sub_0807EBC0 s
         .short 0x0867
-        .short \param
+        .short \s
 .endm
 
 .macro sub_0807EC1C s
@@ -198,6 +241,17 @@
         .short \s
 .endm
 
+.macro sub_0807ECF4 s
+        .short 0x0871
+        .short \s
+.endm
+
+.macro sub_0807EDD4 a,b
+        .short 0x0c73
+        .short \a
+        .short \b
+.endm
+
 .macro sub_0807EE30 
         .short 0x0475
 .endm
@@ -215,3 +269,17 @@
 .macro sub_0807EFE4 
         .short 0x047e
 .endm
+
+.macro sub_0807F034 s
+        .short 0x0882
+        .short \s
+.endm
+
+.macro sub_0807F098 
+        .short 0x0487
+.endm
+
+.macro sub_0807F0B4 s
+        .short 0x0889
+        .short \s
+.endm
\ No newline at end of file
diff --git a/data/scripts.s b/data/scripts.s
new file mode 100644
index 00000000..edb0c350
--- /dev/null
+++ b/data/scripts.s
@@ -0,0 +1,3214 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.include "asm/macros/script.inc"
+
+	.syntax unified
+
+	.text
+
+gUnk_08008B5C:: @ 08008B5C
+	.incbin "baserom.gba", 0x008B5C, 0x0000034
+
+gUnk_08008B90:: @ 08008B90
+	.incbin "baserom.gba", 0x008B90, 0x0000030
+
+gUnk_08008BC0:: @ 08008BC0
+	.incbin "baserom.gba", 0x008BC0, 0x000008E
+
+gUnk_08008C4E:: @ 08008C4E
+	.incbin "baserom.gba", 0x008C4E, 0x0000016
+
+gUnk_08008C64:: @ 08008C64
+	.incbin "baserom.gba", 0x008C64, 0x0000009
+
+gUnk_08008C6D:: @ 08008C6D
+	.incbin "baserom.gba", 0x008C6D, 0x0000011
+
+gUnk_08008C7E:: @ 08008C7E
+	.incbin "baserom.gba", 0x008C7E, 0x000003B
+
+gUnk_08008CB9:: @ 08008CB9
+	.incbin "baserom.gba", 0x008CB9, 0x0000097
+
+gUnk_08008D50:: @ 08008D50
+	.incbin "baserom.gba", 0x008D50, 0x000003C
+
+gUnk_08008D8C:: @ 08008D8C
+	.incbin "baserom.gba", 0x008D8C, 0x0000034
+
+gUnk_08008DC0:: @ 08008DC0
+	.incbin "baserom.gba", 0x008DC0, 0x0000048
+
+gUnk_08008E08:: @ 08008E08
+	.incbin "baserom.gba", 0x008E08, 0x0000002
+
+gUnk_08008E0A:: @ 08008E0A
+	.incbin "baserom.gba", 0x008E0A, 0x0000102
+
+gUnk_08008F0C:: @ 08008F0C
+	.incbin "baserom.gba", 0x008F0C, 0x000000A
+
+gUnk_08008F16:: @ 08008F16
+	.incbin "baserom.gba", 0x008F16, 0x0000010
+
+gUnk_08008F26:: @ 08008F26
+	.incbin "baserom.gba", 0x008F26, 0x000006A
+
+gUnk_08008F90:: @ 08008F90
+	.incbin "baserom.gba", 0x008F90, 0x0000030
+
+gUnk_08008FC0:: @ 08008FC0
+	.incbin "baserom.gba", 0x008FC0, 0x0000011
+
+gUnk_08008FD1:: @ 08008FD1
+	.incbin "baserom.gba", 0x008FD1, 0x000002B
+
+gUnk_08008FFC:: @ 08008FFC
+	.incbin "baserom.gba", 0x008FFC, 0x000000C
+
+gUnk_08009008:: @ 08009008
+	.incbin "baserom.gba", 0x009008, 0x0000017
+
+gUnk_0800901F:: @ 0800901F
+	.incbin "baserom.gba", 0x00901F, 0x000001D
+
+gUnk_0800903C:: @ 0800903C
+	.incbin "baserom.gba", 0x00903C, 0x0000044
+
+gUnk_08009080:: @ 08009080
+	.incbin "baserom.gba", 0x009080, 0x000005B
+
+gUnk_080090DB:: @ 080090DB
+	.incbin "baserom.gba", 0x0090DB, 0x00000BD
+
+gUnk_08009198:: @ 08009198
+	.incbin "baserom.gba", 0x009198, 0x000006F
+
+gUnk_08009207:: @ 08009207
+	.incbin "baserom.gba", 0x009207, 0x000006D
+
+gUnk_08009274:: @ 08009274
+	.incbin "baserom.gba", 0x009274, 0x0000034
+
+gUnk_080092A8:: @ 080092A8
+	.incbin "baserom.gba", 0x0092A8, 0x000002C
+
+gUnk_080092D4:: @ 080092D4
+	.incbin "baserom.gba", 0x0092D4, 0x000001C
+
+gUnk_080092F0:: @ 080092F0
+	.incbin "baserom.gba", 0x0092F0, 0x0000018
+
+gUnk_08009308:: @ 08009308
+	.incbin "baserom.gba", 0x009308, 0x0000010
+
+gUnk_08009318:: @ 08009318
+	.incbin "baserom.gba", 0x009318, 0x0000008
+
+gUnk_08009320:: @ 08009320
+	.incbin "baserom.gba", 0x009320, 0x0000020
+
+gUnk_08009340:: @ 08009340
+	.incbin "baserom.gba", 0x009340, 0x0000008
+
+gUnk_08009348:: @ 08009348
+	.incbin "baserom.gba", 0x009348, 0x000004B
+
+gUnk_08009393:: @ 08009393
+	.incbin "baserom.gba", 0x009393, 0x0000044
+
+gUnk_080093D7:: @ 080093D7
+	.incbin "baserom.gba", 0x0093D7, 0x0000030
+
+gUnk_08009407:: @ 08009407
+	.incbin "baserom.gba", 0x009407, 0x000007F
+
+gUnk_08009486:: @ 08009486
+	.incbin "baserom.gba", 0x009486, 0x000001E
+
+gUnk_080094A4:: @ 080094A4
+	.incbin "baserom.gba", 0x0094A4, 0x0000028
+
+gUnk_080094CC:: @ 080094CC
+	.incbin "baserom.gba", 0x0094CC, 0x000000B
+
+gUnk_080094D7:: @ 080094D7
+	.incbin "baserom.gba", 0x0094D7, 0x0000025
+
+gUnk_080094FC:: @ 080094FC
+	.incbin "baserom.gba", 0x0094FC, 0x0000007
+
+gUnk_08009503:: @ 08009503
+	.incbin "baserom.gba", 0x009503, 0x0000005
+
+gUnk_08009508:: @ 08009508
+	.incbin "baserom.gba", 0x009508, 0x0000030
+
+gUnk_08009538:: @ 08009538
+	.incbin "baserom.gba", 0x009538, 0x000003C
+
+gUnk_08009574:: @ 08009574
+	.incbin "baserom.gba", 0x009574, 0x0000058
+
+gUnk_080095CC:: @ 080095CC
+	.incbin "baserom.gba", 0x0095CC, 0x0000060
+
+gUnk_0800962C:: @ 0800962C
+	.incbin "baserom.gba", 0x00962C, 0x000006C
+
+gUnk_08009698:: @ 08009698
+	.incbin "baserom.gba", 0x009698, 0x000006C
+
+gUnk_08009704:: @ 08009704
+	.incbin "baserom.gba", 0x009704, 0x0000002
+
+gUnk_08009706:: @ 08009706
+	.incbin "baserom.gba", 0x009706, 0x000003A
+
+gUnk_08009740:: @ 08009740
+	.incbin "baserom.gba", 0x009740, 0x0000038
+
+gUnk_08009778:: @ 08009778
+	.incbin "baserom.gba", 0x009778, 0x000000E
+
+gUnk_08009786:: @ 08009786
+	.incbin "baserom.gba", 0x009786, 0x000001B
+
+gUnk_080097A1:: @ 080097A1
+	.incbin "baserom.gba", 0x0097A1, 0x000004F
+
+gUnk_080097F0:: @ 080097F0
+	.incbin "baserom.gba", 0x0097F0, 0x0000048
+
+gUnk_08009838:: @ 08009838
+	.incbin "baserom.gba", 0x009838, 0x000009C
+
+gUnk_080098D4:: @ 080098D4
+	.incbin "baserom.gba", 0x0098D4, 0x0000044
+
+gUnk_08009918:: @ 08009918
+	.incbin "baserom.gba", 0x009918, 0x0000028
+
+gUnk_08009940:: @ 08009940
+	.incbin "baserom.gba", 0x009940, 0x0000010
+
+gUnk_08009950:: @ 08009950
+	.incbin "baserom.gba", 0x009950, 0x000008C
+
+gUnk_080099DC:: @ 080099DC
+	.incbin "baserom.gba", 0x0099DC, 0x0000028
+
+gUnk_08009A04:: @ 08009A04
+	.incbin "baserom.gba", 0x009A04, 0x0000003
+
+gUnk_08009A07:: @ 08009A07
+	.incbin "baserom.gba", 0x009A07, 0x0000025
+
+gUnk_08009A2C:: @ 08009A2C
+	.incbin "baserom.gba", 0x009A2C, 0x0000008
+
+gUnk_08009A34:: @ 08009A34
+	.incbin "baserom.gba", 0x009A34, 0x000001C
+
+gUnk_08009A50:: @ 08009A50
+	.incbin "baserom.gba", 0x009A50, 0x0000027
+
+gUnk_08009A77:: @ 08009A77
+	.incbin "baserom.gba", 0x009A77, 0x000000A
+
+gUnk_08009A81:: @ 08009A81
+	.incbin "baserom.gba", 0x009A81, 0x0000003
+
+gUnk_08009A84:: @ 08009A84
+	.incbin "baserom.gba", 0x009A84, 0x0000037
+
+gUnk_08009ABB:: @ 08009ABB
+	.incbin "baserom.gba", 0x009ABB, 0x000003D
+
+gUnk_08009AF8:: @ 08009AF8
+	.incbin "baserom.gba", 0x009AF8, 0x0000038
+
+gUnk_08009B30:: @ 08009B30
+	.incbin "baserom.gba", 0x009B30, 0x0000033
+
+gUnk_08009B63:: @ 08009B63
+	.incbin "baserom.gba", 0x009B63, 0x0000015
+
+gUnk_08009B78:: @ 08009B78
+	.incbin "baserom.gba", 0x009B78, 0x00000F0
+
+gUnk_08009C68:: @ 08009C68
+	.incbin "baserom.gba", 0x009C68, 0x0000017
+
+gUnk_08009C7F:: @ 08009C7F
+	.incbin "baserom.gba", 0x009C7F, 0x000001F
+
+gUnk_08009C9E:: @ 08009C9E
+	.incbin "baserom.gba", 0x009C9E, 0x0000062
+
+gUnk_08009D00:: @ 08009D00
+	.incbin "baserom.gba", 0x009D00, 0x000006C
+
+gUnk_08009D6C:: @ 08009D6C
+	.incbin "baserom.gba", 0x009D6C, 0x000000B
+
+gUnk_08009D77:: @ 08009D77
+	.incbin "baserom.gba", 0x009D77, 0x0000039
+
+gUnk_08009DB0:: @ 08009DB0
+	.incbin "baserom.gba", 0x009DB0, 0x000003C
+
+gUnk_08009DEC:: @ 08009DEC
+	.incbin "baserom.gba", 0x009DEC, 0x000004C
+
+gUnk_08009E38:: @ 08009E38
+	.incbin "baserom.gba", 0x009E38, 0x0000020
+
+gUnk_08009E58:: @ 08009E58
+	.incbin "baserom.gba", 0x009E58, 0x0000030
+
+gUnk_08009E88:: @ 08009E88
+	.incbin "baserom.gba", 0x009E88, 0x0000016
+
+gUnk_08009E9E:: @ 08009E9E
+	.incbin "baserom.gba", 0x009E9E, 0x000000B
+
+gUnk_08009EA9:: @ 08009EA9
+	.incbin "baserom.gba", 0x009EA9, 0x000000E
+
+gUnk_08009EB7:: @ 08009EB7
+	.incbin "baserom.gba", 0x009EB7, 0x0000015
+
+gUnk_08009ECC:: @ 08009ECC
+	.incbin "baserom.gba", 0x009ECC, 0x0000024
+
+gUnk_08009EF0:: @ 08009EF0
+	.incbin "baserom.gba", 0x009EF0, 0x0000017
+
+gUnk_08009F07:: @ 08009F07
+	.incbin "baserom.gba", 0x009F07, 0x000000D
+
+gUnk_08009F14:: @ 08009F14
+	.incbin "baserom.gba", 0x009F14, 0x0000025
+
+gUnk_08009F39:: @ 08009F39
+	.incbin "baserom.gba", 0x009F39, 0x0000039
+
+gUnk_08009F72:: @ 08009F72
+	.incbin "baserom.gba", 0x009F72, 0x00000F2
+
+gUnk_0800A064:: @ 0800A064
+	.incbin "baserom.gba", 0x00A064, 0x000001D
+
+gUnk_0800A081:: @ 0800A081
+	.incbin "baserom.gba", 0x00A081, 0x0000033
+
+gUnk_0800A0B4:: @ 0800A0B4
+	.incbin "baserom.gba", 0x00A0B4, 0x0000048
+
+gUnk_0800A0FC:: @ 0800A0FC
+	.incbin "baserom.gba", 0x00A0FC, 0x000000E
+
+gUnk_0800A10A:: @ 0800A10A
+	.incbin "baserom.gba", 0x00A10A, 0x0000005
+
+gUnk_0800A10F:: @ 0800A10F
+	.incbin "baserom.gba", 0x00A10F, 0x0000015
+
+gUnk_0800A124:: @ 0800A124
+	.incbin "baserom.gba", 0x00A124, 0x0000010
+
+gUnk_0800A134:: @ 0800A134
+	.incbin "baserom.gba", 0x00A134, 0x0000080
+
+gUnk_0800A1B4:: @ 0800A1B4
+	.incbin "baserom.gba", 0x00A1B4, 0x0000024
+
+gUnk_0800A1D8:: @ 0800A1D8
+	.incbin "baserom.gba", 0x00A1D8, 0x000004C
+
+gUnk_0800A224:: @ 0800A224
+	.incbin "baserom.gba", 0x00A224, 0x000003C
+
+gUnk_0800A260:: @ 0800A260
+	.incbin "baserom.gba", 0x00A260, 0x00000E0
+
+gUnk_0800A340:: @ 0800A340
+	.incbin "baserom.gba", 0x00A340, 0x0000063
+
+gUnk_0800A3A3:: @ 0800A3A3
+	.incbin "baserom.gba", 0x00A3A3, 0x0000006
+
+gUnk_0800A3A9:: @ 0800A3A9
+	.incbin "baserom.gba", 0x00A3A9, 0x0000001
+
+gUnk_0800A3AA:: @ 0800A3AA
+	.incbin "baserom.gba", 0x00A3AA, 0x000002E
+
+gUnk_0800A3D8:: @ 0800A3D8
+	.incbin "baserom.gba", 0x00A3D8, 0x0000128
+
+gUnk_0800A500:: @ 0800A500
+	.incbin "baserom.gba", 0x00A500, 0x0000090
+
+gUnk_0800A590:: @ 0800A590
+	.incbin "baserom.gba", 0x00A590, 0x0000016
+
+gUnk_0800A5A6:: @ 0800A5A6
+	.incbin "baserom.gba", 0x00A5A6, 0x00000B6
+
+gUnk_0800A65C:: @ 0800A65C
+	.incbin "baserom.gba", 0x00A65C, 0x0000022
+
+gUnk_0800A67E:: @ 0800A67E
+	.incbin "baserom.gba", 0x00A67E, 0x0000002
+
+gUnk_0800A680:: @ 0800A680
+	.incbin "baserom.gba", 0x00A680, 0x0000024
+
+gUnk_0800A6A4:: @ 0800A6A4
+	.incbin "baserom.gba", 0x00A6A4, 0x0000007
+
+gUnk_0800A6AB:: @ 0800A6AB
+	.incbin "baserom.gba", 0x00A6AB, 0x0000029
+
+gUnk_0800A6D4:: @ 0800A6D4
+	.incbin "baserom.gba", 0x00A6D4, 0x0000030
+
+gUnk_0800A704:: @ 0800A704
+	.incbin "baserom.gba", 0x00A704, 0x0000030
+
+gUnk_0800A734:: @ 0800A734
+	.incbin "baserom.gba", 0x00A734, 0x0000016
+
+gUnk_0800A74A:: @ 0800A74A
+	.incbin "baserom.gba", 0x00A74A, 0x000001A
+
+gUnk_0800A764:: @ 0800A764
+	.incbin "baserom.gba", 0x00A764, 0x0000080
+
+gUnk_0800A7E4:: @ 0800A7E4
+	.incbin "baserom.gba", 0x00A7E4, 0x0000004
+
+gUnk_0800A7E8:: @ 0800A7E8
+	.incbin "baserom.gba", 0x00A7E8, 0x000002E
+
+gUnk_0800A816:: @ 0800A816
+	.incbin "baserom.gba", 0x00A816, 0x000000A
+
+gUnk_0800A820:: @ 0800A820
+	.incbin "baserom.gba", 0x00A820, 0x000003C
+
+gUnk_0800A85C:: @ 0800A85C
+	.incbin "baserom.gba", 0x00A85C, 0x000003C
+
+gUnk_0800A898:: @ 0800A898
+	.incbin "baserom.gba", 0x00A898, 0x000003C
+
+gUnk_0800A8D4:: @ 0800A8D4
+	.incbin "baserom.gba", 0x00A8D4, 0x0000034
+
+gUnk_0800A908:: @ 0800A908
+	.incbin "baserom.gba", 0x00A908, 0x0000008
+
+gUnk_0800A910:: @ 0800A910
+	.incbin "baserom.gba", 0x00A910, 0x0000054
+
+gUnk_0800A964:: @ 0800A964
+	.incbin "baserom.gba", 0x00A964, 0x0000024
+
+gUnk_0800A988:: @ 0800A988
+	.incbin "baserom.gba", 0x00A988, 0x0000024
+
+gUnk_0800A9AC:: @ 0800A9AC
+	.incbin "baserom.gba", 0x00A9AC, 0x0000024
+
+gUnk_0800A9D0:: @ 0800A9D0
+	.incbin "baserom.gba", 0x00A9D0, 0x0000024
+
+gUnk_0800A9F4:: @ 0800A9F4
+	.incbin "baserom.gba", 0x00A9F4, 0x000000F
+
+gUnk_0800AA03:: @ 0800AA03
+	.incbin "baserom.gba", 0x00AA03, 0x0000045
+
+gUnk_0800AA48:: @ 0800AA48
+	.incbin "baserom.gba", 0x00AA48, 0x0000024
+
+gUnk_0800AA6C:: @ 0800AA6C
+	.incbin "baserom.gba", 0x00AA6C, 0x0000024
+
+gUnk_0800AA90:: @ 0800AA90
+	.incbin "baserom.gba", 0x00AA90, 0x0000024
+
+gUnk_0800AAB4:: @ 0800AAB4
+	.incbin "baserom.gba", 0x00AAB4, 0x0000024
+
+gUnk_0800AAD8:: @ 0800AAD8
+	.incbin "baserom.gba", 0x00AAD8, 0x0000030
+
+gUnk_0800AB08:: @ 0800AB08
+	.incbin "baserom.gba", 0x00AB08, 0x000001B
+
+gUnk_0800AB23:: @ 0800AB23
+	.incbin "baserom.gba", 0x00AB23, 0x000002C
+
+gUnk_0800AB4F:: @ 0800AB4F
+	.incbin "baserom.gba", 0x00AB4F, 0x00000A1
+
+gUnk_0800ABF0:: @ 0800ABF0
+	.incbin "baserom.gba", 0x00ABF0, 0x0000034
+
+gUnk_0800AC24:: @ 0800AC24
+	.incbin "baserom.gba", 0x00AC24, 0x0000049
+
+gUnk_0800AC6D:: @ 0800AC6D
+	.incbin "baserom.gba", 0x00AC6D, 0x0000048
+
+gUnk_0800ACB5:: @ 0800ACB5
+	.incbin "baserom.gba", 0x00ACB5, 0x0000007
+
+gUnk_0800ACBC:: @ 0800ACBC
+	.incbin "baserom.gba", 0x00ACBC, 0x0000024
+
+gUnk_0800ACE0:: @ 0800ACE0
+	.incbin "baserom.gba", 0x00ACE0, 0x0000074
+
+gUnk_0800AD54:: @ 0800AD54
+	.incbin "baserom.gba", 0x00AD54, 0x0000020
+
+gUnk_0800AD74:: @ 0800AD74
+	.incbin "baserom.gba", 0x00AD74, 0x0000033
+
+gUnk_0800ADA7:: @ 0800ADA7
+	.incbin "baserom.gba", 0x00ADA7, 0x000000D
+
+gUnk_0800ADB4:: @ 0800ADB4
+	.incbin "baserom.gba", 0x00ADB4, 0x00000F0
+
+gUnk_0800AEA4:: @ 0800AEA4
+	.incbin "baserom.gba", 0x00AEA4, 0x0000038
+
+gUnk_0800AEDC:: @ 0800AEDC
+	.incbin "baserom.gba", 0x00AEDC, 0x000003C
+
+gUnk_0800AF18:: @ 0800AF18
+	.incbin "baserom.gba", 0x00AF18, 0x000002C
+
+gUnk_0800AF44:: @ 0800AF44
+	.incbin "baserom.gba", 0x00AF44, 0x0000024
+
+gUnk_0800AF68:: @ 0800AF68
+	.incbin "baserom.gba", 0x00AF68, 0x0000016
+
+gUnk_0800AF7E:: @ 0800AF7E
+	.incbin "baserom.gba", 0x00AF7E, 0x000000E
+
+gUnk_0800AF8C:: @ 0800AF8C
+	.incbin "baserom.gba", 0x00AF8C, 0x000001B
+
+gUnk_0800AFA7:: @ 0800AFA7
+	.incbin "baserom.gba", 0x00AFA7, 0x0000009
+
+gUnk_0800AFB0:: @ 0800AFB0
+	.incbin "baserom.gba", 0x00AFB0, 0x0000038
+
+gUnk_0800AFE8:: @ 0800AFE8
+	.incbin "baserom.gba", 0x00AFE8, 0x0000024
+
+gUnk_0800B00C:: @ 0800B00C
+	.incbin "baserom.gba", 0x00B00C, 0x00000A0
+
+gUnk_0800B0AC:: @ 0800B0AC
+	.incbin "baserom.gba", 0x00B0AC, 0x0000004
+
+gUnk_0800B0B0:: @ 0800B0B0
+	.incbin "baserom.gba", 0x00B0B0, 0x0000020
+
+gUnk_0800B0D0:: @ 0800B0D0
+	.incbin "baserom.gba", 0x00B0D0, 0x00000A7
+
+gUnk_0800B177:: @ 0800B177
+	.incbin "baserom.gba", 0x00B177, 0x0000005
+
+gUnk_0800B17C:: @ 0800B17C
+	.incbin "baserom.gba", 0x00B17C, 0x0000044
+
+gUnk_0800B1C0:: @ 0800B1C0
+	.incbin "baserom.gba", 0x00B1C0, 0x0000040
+
+gUnk_0800B200:: @ 0800B200
+	.incbin "baserom.gba", 0x00B200, 0x0000054
+
+gUnk_0800B254:: @ 0800B254
+	.incbin "baserom.gba", 0x00B254, 0x0000030
+
+gUnk_0800B284:: @ 0800B284
+	.incbin "baserom.gba", 0x00B284, 0x0000030
+
+gUnk_0800B2B4:: @ 0800B2B4
+	.incbin "baserom.gba", 0x00B2B4, 0x0000054
+
+gUnk_0800B308:: @ 0800B308
+	.incbin "baserom.gba", 0x00B308, 0x000001A
+
+gUnk_0800B322:: @ 0800B322
+	.incbin "baserom.gba", 0x00B322, 0x0000007
+
+gUnk_0800B329:: @ 0800B329
+	.incbin "baserom.gba", 0x00B329, 0x000001F
+
+gUnk_0800B348:: @ 0800B348
+	.incbin "baserom.gba", 0x00B348, 0x0000014
+
+gUnk_0800B35C:: @ 0800B35C
+	.incbin "baserom.gba", 0x00B35C, 0x0000018
+
+gUnk_0800B374:: @ 0800B374
+	.incbin "baserom.gba", 0x00B374, 0x0000030
+
+gUnk_0800B3A4:: @ 0800B3A4
+	.incbin "baserom.gba", 0x00B3A4, 0x000006B
+
+gUnk_0800B40F:: @ 0800B40F
+	.incbin "baserom.gba", 0x00B40F, 0x000000D
+
+gUnk_0800B41C:: @ 0800B41C
+	.incbin "baserom.gba", 0x00B41C, 0x0000090
+
+gUnk_0800B4AC:: @ 0800B4AC
+	.incbin "baserom.gba", 0x00B4AC, 0x000005C
+
+gUnk_0800B508:: @ 0800B508
+	.incbin "baserom.gba", 0x00B508, 0x0000007
+
+gUnk_0800B50F:: @ 0800B50F
+	.incbin "baserom.gba", 0x00B50F, 0x000003D
+
+gUnk_0800B54C:: @ 0800B54C
+	.incbin "baserom.gba", 0x00B54C, 0x0000028
+
+gUnk_0800B574:: @ 0800B574
+	.incbin "baserom.gba", 0x00B574, 0x0000050
+
+gUnk_0800B5C4:: @ 0800B5C4
+	.incbin "baserom.gba", 0x00B5C4, 0x0000028
+
+gUnk_0800B5EC:: @ 0800B5EC
+	.incbin "baserom.gba", 0x00B5EC, 0x0000028
+
+gUnk_0800B614:: @ 0800B614
+	.incbin "baserom.gba", 0x00B614, 0x00000B4
+
+gUnk_0800B6C8:: @ 0800B6C8
+	.incbin "baserom.gba", 0x00B6C8, 0x0000040
+
+gUnk_0800B708:: @ 0800B708
+	.incbin "baserom.gba", 0x00B708, 0x0000017
+
+gUnk_0800B71F:: @ 0800B71F
+	.incbin "baserom.gba", 0x00B71F, 0x0000011
+
+gUnk_0800B730:: @ 0800B730
+	.incbin "baserom.gba", 0x00B730, 0x0000094
+
+gUnk_0800B7C4:: @ 0800B7C4
+	.incbin "baserom.gba", 0x00B7C4, 0x000008B
+
+gUnk_0800B84F:: @ 0800B84F
+	.incbin "baserom.gba", 0x00B84F, 0x0000012
+
+gUnk_0800B861:: @ 0800B861
+	.incbin "baserom.gba", 0x00B861, 0x0000027
+
+gUnk_0800B888:: @ 0800B888
+	.incbin "baserom.gba", 0x00B888, 0x0000018
+
+gUnk_0800B8A0:: @ 0800B8A0
+	.incbin "baserom.gba", 0x00B8A0, 0x0000018
+
+gUnk_0800B8B8:: @ 0800B8B8
+	.incbin "baserom.gba", 0x00B8B8, 0x000002C
+
+gUnk_0800B8E4:: @ 0800B8E4
+	.incbin "baserom.gba", 0x00B8E4, 0x0000022
+
+gUnk_0800B906:: @ 0800B906
+	.incbin "baserom.gba", 0x00B906, 0x0000016
+
+gUnk_0800B91C:: @ 0800B91C
+	.incbin "baserom.gba", 0x00B91C, 0x0000048
+
+gUnk_0800B964:: @ 0800B964
+	.incbin "baserom.gba", 0x00B964, 0x0000050
+
+gUnk_0800B9B4:: @ 0800B9B4
+	.incbin "baserom.gba", 0x00B9B4, 0x0000088
+
+gUnk_0800BA3C:: @ 0800BA3C
+	.incbin "baserom.gba", 0x00BA3C, 0x000003C
+
+gUnk_0800BA78:: @ 0800BA78
+	.incbin "baserom.gba", 0x00BA78, 0x0000054
+
+gUnk_0800BACC:: @ 0800BACC
+	.incbin "baserom.gba", 0x00BACC, 0x0000034
+
+gUnk_0800BB00:: @ 0800BB00
+	.incbin "baserom.gba", 0x00BB00, 0x0000008
+
+gUnk_0800BB08:: @ 0800BB08
+	.incbin "baserom.gba", 0x00BB08, 0x0000012
+
+gUnk_0800BB1A:: @ 0800BB1A
+	.incbin "baserom.gba", 0x00BB1A, 0x0000016
+
+gUnk_0800BB30:: @ 0800BB30
+	.incbin "baserom.gba", 0x00BB30, 0x0000034
+
+gUnk_0800BB64:: @ 0800BB64
+	.incbin "baserom.gba", 0x00BB64, 0x0000010
+
+gUnk_0800BB74:: @ 0800BB74
+	.incbin "baserom.gba", 0x00BB74, 0x0000030
+
+gUnk_0800BBA4:: @ 0800BBA4
+	.incbin "baserom.gba", 0x00BBA4, 0x0000037
+
+gUnk_0800BBDB:: @ 0800BBDB
+	.incbin "baserom.gba", 0x00BBDB, 0x0000001
+
+gUnk_0800BBDC:: @ 0800BBDC
+	.incbin "baserom.gba", 0x00BBDC, 0x000002C
+
+gUnk_0800BC08:: @ 0800BC08
+	.incbin "baserom.gba", 0x00BC08, 0x000001A
+
+gUnk_0800BC22:: @ 0800BC22
+	.incbin "baserom.gba", 0x00BC22, 0x000002E
+
+gUnk_0800BC50:: @ 0800BC50
+	.incbin "baserom.gba", 0x00BC50, 0x000005E
+
+gUnk_0800BCAE:: @ 0800BCAE
+	.incbin "baserom.gba", 0x00BCAE, 0x0000009
+
+gUnk_0800BCB7:: @ 0800BCB7
+	.incbin "baserom.gba", 0x00BCB7, 0x0000007
+
+gUnk_0800BCBE:: @ 0800BCBE
+	.incbin "baserom.gba", 0x00BCBE, 0x000002A
+
+gUnk_0800BCE8:: @ 0800BCE8
+	.incbin "baserom.gba", 0x00BCE8, 0x0000020
+
+gUnk_0800BD08:: @ 0800BD08
+	.incbin "baserom.gba", 0x00BD08, 0x0000068
+
+gUnk_0800BD70:: @ 0800BD70
+	.incbin "baserom.gba", 0x00BD70, 0x0000008
+
+gUnk_0800BD78:: @ 0800BD78
+	.incbin "baserom.gba", 0x00BD78, 0x0000034
+
+gUnk_0800BDAC:: @ 0800BDAC
+	.incbin "baserom.gba", 0x00BDAC, 0x0000018
+
+gUnk_0800BDC4:: @ 0800BDC4
+	.incbin "baserom.gba", 0x00BDC4, 0x0000058
+
+gUnk_0800BE1C:: @ 0800BE1C
+	.incbin "baserom.gba", 0x00BE1C, 0x0000038
+
+gUnk_0800BE54:: @ 0800BE54
+	.incbin "baserom.gba", 0x00BE54, 0x0000078
+
+gUnk_0800BECC:: @ 0800BECC
+	.incbin "baserom.gba", 0x00BECC, 0x0000048
+
+gUnk_0800BF14:: @ 0800BF14
+	.incbin "baserom.gba", 0x00BF14, 0x0000024
+
+gUnk_0800BF38:: @ 0800BF38
+	.incbin "baserom.gba", 0x00BF38, 0x0000012
+
+gUnk_0800BF4A:: @ 0800BF4A
+	.incbin "baserom.gba", 0x00BF4A, 0x0000026
+
+gUnk_0800BF70:: @ 0800BF70
+	.incbin "baserom.gba", 0x00BF70, 0x000004F
+
+gUnk_0800BFBF:: @ 0800BFBF
+	.incbin "baserom.gba", 0x00BFBF, 0x0000022
+
+gUnk_0800BFE1:: @ 0800BFE1
+	.incbin "baserom.gba", 0x00BFE1, 0x0000002
+
+gUnk_0800BFE3:: @ 0800BFE3
+	.incbin "baserom.gba", 0x00BFE3, 0x0000021
+
+gUnk_0800C004:: @ 0800C004
+	.incbin "baserom.gba", 0x00C004, 0x0000003
+
+gUnk_0800C007:: @ 0800C007
+	.incbin "baserom.gba", 0x00C007, 0x000001D
+
+gUnk_0800C024:: @ 0800C024
+	.incbin "baserom.gba", 0x00C024, 0x0000057
+
+gUnk_0800C07B:: @ 0800C07B
+	.incbin "baserom.gba", 0x00C07B, 0x0000035
+
+gUnk_0800C0B0:: @ 0800C0B0
+	.incbin "baserom.gba", 0x00C0B0, 0x0000017
+
+gUnk_0800C0C7:: @ 0800C0C7
+	.incbin "baserom.gba", 0x00C0C7, 0x000000C
+
+gUnk_0800C0D3:: @ 0800C0D3
+	.incbin "baserom.gba", 0x00C0D3, 0x0000015
+
+gUnk_0800C0E8:: @ 0800C0E8
+	.incbin "baserom.gba", 0x00C0E8, 0x000002B
+
+gUnk_0800C113:: @ 0800C113
+	.incbin "baserom.gba", 0x00C113, 0x0000034
+
+gUnk_0800C147:: @ 0800C147
+	.incbin "baserom.gba", 0x00C147, 0x0000019
+
+gUnk_0800C160:: @ 0800C160
+	.incbin "baserom.gba", 0x00C160, 0x0000078
+
+gUnk_0800C1D8:: @ 0800C1D8
+	.incbin "baserom.gba", 0x00C1D8, 0x000002C
+
+gUnk_0800C204:: @ 0800C204
+	.incbin "baserom.gba", 0x00C204, 0x0000003
+
+gUnk_0800C207:: @ 0800C207
+	.incbin "baserom.gba", 0x00C207, 0x0000001
+
+gUnk_0800C208:: @ 0800C208
+	.incbin "baserom.gba", 0x00C208, 0x0000008
+
+gUnk_0800C210:: @ 0800C210
+	.incbin "baserom.gba", 0x00C210, 0x0000053
+
+gUnk_0800C263:: @ 0800C263
+	.incbin "baserom.gba", 0x00C263, 0x0000041
+
+gUnk_0800C2A4:: @ 0800C2A4
+	.incbin "baserom.gba", 0x00C2A4, 0x0000003
+
+gUnk_0800C2A7:: @ 0800C2A7
+	.incbin "baserom.gba", 0x00C2A7, 0x0000027
+
+gUnk_0800C2CE:: @ 0800C2CE
+	.incbin "baserom.gba", 0x00C2CE, 0x0000082
+
+gUnk_0800C350:: @ 0800C350
+	.incbin "baserom.gba", 0x00C350, 0x0000046
+
+gUnk_0800C396:: @ 0800C396
+	.incbin "baserom.gba", 0x00C396, 0x0000036
+
+gUnk_0800C3CC:: @ 0800C3CC
+	.incbin "baserom.gba", 0x00C3CC, 0x000003C
+
+gUnk_0800C408:: @ 0800C408
+	.incbin "baserom.gba", 0x00C408, 0x0000008
+
+gUnk_0800C410:: @ 0800C410
+	.incbin "baserom.gba", 0x00C410, 0x000004C
+
+gUnk_0800C45C:: @ 0800C45C
+	.incbin "baserom.gba", 0x00C45C, 0x0000038
+
+gUnk_0800C494:: @ 0800C494
+	.incbin "baserom.gba", 0x00C494, 0x000003C
+
+gUnk_0800C4D0:: @ 0800C4D0
+	.incbin "baserom.gba", 0x00C4D0, 0x000000B
+
+gUnk_0800C4DB:: @ 0800C4DB
+	.incbin "baserom.gba", 0x00C4DB, 0x0000031
+
+gUnk_0800C50C:: @ 0800C50C
+	.incbin "baserom.gba", 0x00C50C, 0x0000015
+
+gUnk_0800C521:: @ 0800C521
+	.incbin "baserom.gba", 0x00C521, 0x000002F
+
+gUnk_0800C550:: @ 0800C550
+	.incbin "baserom.gba", 0x00C550, 0x0000006
+
+gUnk_0800C556:: @ 0800C556
+	.incbin "baserom.gba", 0x00C556, 0x000002E
+
+gUnk_0800C584:: @ 0800C584
+	.incbin "baserom.gba", 0x00C584, 0x0000016
+
+gUnk_0800C59A:: @ 0800C59A
+	.incbin "baserom.gba", 0x00C59A, 0x000002E
+
+gUnk_0800C5C8:: @ 0800C5C8
+	.incbin "baserom.gba", 0x00C5C8, 0x0000034
+
+gUnk_0800C5FC:: @ 0800C5FC
+	.incbin "baserom.gba", 0x00C5FC, 0x0000004
+
+gUnk_0800C600:: @ 0800C600
+	.incbin "baserom.gba", 0x00C600, 0x0000007
+
+gUnk_0800C607:: @ 0800C607
+	.incbin "baserom.gba", 0x00C607, 0x000002D
+
+gUnk_0800C634:: @ 0800C634
+	.incbin "baserom.gba", 0x00C634, 0x0000092
+
+gUnk_0800C6C6:: @ 0800C6C6
+	.incbin "baserom.gba", 0x00C6C6, 0x00000AE
+
+gUnk_0800C774:: @ 0800C774
+	.incbin "baserom.gba", 0x00C774, 0x0000005
+
+gUnk_0800C779:: @ 0800C779
+	.incbin "baserom.gba", 0x00C779, 0x000008F
+
+gUnk_0800C808:: @ 0800C808
+	.incbin "baserom.gba", 0x00C808, 0x0000059
+
+gUnk_0800C861:: @ 0800C861
+	.incbin "baserom.gba", 0x00C861, 0x000004F
+
+gUnk_0800C8B0:: @ 0800C8B0
+	.incbin "baserom.gba", 0x00C8B0, 0x000002A
+
+gUnk_0800C8DA:: @ 0800C8DA
+	.incbin "baserom.gba", 0x00C8DA, 0x0000016
+
+gUnk_0800C8F0:: @ 0800C8F0
+	.incbin "baserom.gba", 0x00C8F0, 0x000002C
+
+gUnk_0800C91C:: @ 0800C91C
+	.incbin "baserom.gba", 0x00C91C, 0x0000015
+
+gUnk_0800C931:: @ 0800C931
+	.incbin "baserom.gba", 0x00C931, 0x0000032
+
+gUnk_0800C963:: @ 0800C963
+	.incbin "baserom.gba", 0x00C963, 0x00000A5
+
+gUnk_0800CA08:: @ 0800CA08
+	.incbin "baserom.gba", 0x00CA08, 0x0000084
+
+gUnk_0800CA8C:: @ 0800CA8C
+	.incbin "baserom.gba", 0x00CA8C, 0x000001E
+
+gUnk_0800CAAA:: @ 0800CAAA
+	.incbin "baserom.gba", 0x00CAAA, 0x0000012
+
+gUnk_0800CABC:: @ 0800CABC
+	.incbin "baserom.gba", 0x00CABC, 0x000004B
+
+gUnk_0800CB07:: @ 0800CB07
+	.incbin "baserom.gba", 0x00CB07, 0x000004D
+
+gUnk_0800CB54:: @ 0800CB54
+	.incbin "baserom.gba", 0x00CB54, 0x000004F
+
+gUnk_0800CBA3:: @ 0800CBA3
+	.incbin "baserom.gba", 0x00CBA3, 0x0000031
+
+gUnk_0800CBD4:: @ 0800CBD4
+	.incbin "baserom.gba", 0x00CBD4, 0x0000034
+
+gUnk_0800CC08:: @ 0800CC08
+	.incbin "baserom.gba", 0x00CC08, 0x0000005
+
+gUnk_0800CC0D:: @ 0800CC0D
+	.incbin "baserom.gba", 0x00CC0D, 0x0000035
+
+gUnk_0800CC42:: @ 0800CC42
+	.incbin "baserom.gba", 0x00CC42, 0x000002A
+
+gUnk_0800CC6C:: @ 0800CC6C
+	.incbin "baserom.gba", 0x00CC6C, 0x0000061
+
+gUnk_0800CCCD:: @ 0800CCCD
+	.incbin "baserom.gba", 0x00CCCD, 0x0000010
+
+gUnk_0800CCDD:: @ 0800CCDD
+	.incbin "baserom.gba", 0x00CCDD, 0x0000027
+
+gUnk_0800CD04:: @ 0800CD04
+	.incbin "baserom.gba", 0x00CD04, 0x0000004
+
+gUnk_0800CD08:: @ 0800CD08
+	.incbin "baserom.gba", 0x00CD08, 0x000005F
+
+gUnk_0800CD67:: @ 0800CD67
+	.incbin "baserom.gba", 0x00CD67, 0x0000015
+
+gUnk_0800CD7C:: @ 0800CD7C
+	.incbin "baserom.gba", 0x00CD7C, 0x000008B
+
+gUnk_0800CE07:: @ 0800CE07
+	.incbin "baserom.gba", 0x00CE07, 0x00000FD
+
+gUnk_0800CF04:: @ 0800CF04
+	.incbin "baserom.gba", 0x00CF04, 0x0000012
+
+gUnk_0800CF16:: @ 0800CF16
+	.incbin "baserom.gba", 0x00CF16, 0x0000035
+
+gUnk_0800CF4B:: @ 0800CF4B
+	.incbin "baserom.gba", 0x00CF4B, 0x0000005
+
+gUnk_0800CF50:: @ 0800CF50
+	.incbin "baserom.gba", 0x00CF50, 0x000002B
+
+gUnk_0800CF7B:: @ 0800CF7B
+	.incbin "baserom.gba", 0x00CF7B, 0x000000D
+
+gUnk_0800CF88:: @ 0800CF88
+	.incbin "baserom.gba", 0x00CF88, 0x000000D
+
+gUnk_0800CF95:: @ 0800CF95
+	.incbin "baserom.gba", 0x00CF95, 0x0000014
+
+gUnk_0800CFA9:: @ 0800CFA9
+	.incbin "baserom.gba", 0x00CFA9, 0x0000003
+
+gUnk_0800CFAC:: @ 0800CFAC
+	.incbin "baserom.gba", 0x00CFAC, 0x0000065
+
+gUnk_0800D011:: @ 0800D011
+	.incbin "baserom.gba", 0x00D011, 0x000004E
+
+gUnk_0800D05F:: @ 0800D05F
+	.incbin "baserom.gba", 0x00D05F, 0x000006F
+
+gUnk_0800D0CE:: @ 0800D0CE
+	.incbin "baserom.gba", 0x00D0CE, 0x0000059
+
+gUnk_0800D127:: @ 0800D127
+	.incbin "baserom.gba", 0x00D127, 0x0000069
+
+gUnk_0800D190:: @ 0800D190
+	.incbin "baserom.gba", 0x00D190, 0x0000024
+
+gUnk_0800D1B4:: @ 0800D1B4
+	.incbin "baserom.gba", 0x00D1B4, 0x0000010
+
+gUnk_0800D1C4:: @ 0800D1C4
+	.incbin "baserom.gba", 0x00D1C4, 0x0000010
+
+gUnk_0800D1D4:: @ 0800D1D4
+	.incbin "baserom.gba", 0x00D1D4, 0x000000C
+
+gUnk_0800D1E0:: @ 0800D1E0
+	.incbin "baserom.gba", 0x00D1E0, 0x0000027
+
+gUnk_0800D207:: @ 0800D207
+	.incbin "baserom.gba", 0x00D207, 0x0000011
+
+gUnk_0800D218:: @ 0800D218
+	.incbin "baserom.gba", 0x00D218, 0x000003C
+
+gUnk_0800D254:: @ 0800D254
+	.incbin "baserom.gba", 0x00D254, 0x0000024
+
+gUnk_0800D278:: @ 0800D278
+	.incbin "baserom.gba", 0x00D278, 0x0000056
+
+gUnk_0800D2CE:: @ 0800D2CE
+	.incbin "baserom.gba", 0x00D2CE, 0x0000038
+
+gUnk_0800D306:: @ 0800D306
+	.incbin "baserom.gba", 0x00D306, 0x0000002
+
+gUnk_0800D308:: @ 0800D308
+	.incbin "baserom.gba", 0x00D308, 0x0000007
+
+gUnk_0800D30F:: @ 0800D30F
+	.incbin "baserom.gba", 0x00D30F, 0x0000041
+
+gUnk_0800D350:: @ 0800D350
+	.incbin "baserom.gba", 0x00D350, 0x000009C
+
+gUnk_0800D3EC:: @ 0800D3EC
+	.incbin "baserom.gba", 0x00D3EC, 0x0000028
+
+gUnk_0800D414:: @ 0800D414
+	.incbin "baserom.gba", 0x00D414, 0x0000038
+
+gUnk_0800D44C:: @ 0800D44C
+	.incbin "baserom.gba", 0x00D44C, 0x0000073
+
+gUnk_0800D4BF:: @ 0800D4BF
+	.incbin "baserom.gba", 0x00D4BF, 0x000001D
+
+gUnk_0800D4DC:: @ 0800D4DC
+	.incbin "baserom.gba", 0x00D4DC, 0x00000C0
+
+gUnk_0800D59C:: @ 0800D59C
+	.incbin "baserom.gba", 0x00D59C, 0x0000049
+
+gUnk_0800D5E5:: @ 0800D5E5
+	.incbin "baserom.gba", 0x00D5E5, 0x0000027
+
+gUnk_0800D60C:: @ 0800D60C
+	.incbin "baserom.gba", 0x00D60C, 0x000001F
+
+gUnk_0800D62B:: @ 0800D62B
+	.incbin "baserom.gba", 0x00D62B, 0x0000089
+
+gUnk_0800D6B4:: @ 0800D6B4
+	.incbin "baserom.gba", 0x00D6B4, 0x0000006
+
+gUnk_0800D6BA:: @ 0800D6BA
+	.incbin "baserom.gba", 0x00D6BA, 0x0000016
+
+gUnk_0800D6D0:: @ 0800D6D0
+	.incbin "baserom.gba", 0x00D6D0, 0x0000020
+
+gUnk_0800D6F0:: @ 0800D6F0
+	.incbin "baserom.gba", 0x00D6F0, 0x0000012
+
+gUnk_0800D702:: @ 0800D702
+	.incbin "baserom.gba", 0x00D702, 0x0000001
+
+gUnk_0800D703:: @ 0800D703
+	.incbin "baserom.gba", 0x00D703, 0x000000D
+
+gUnk_0800D710:: @ 0800D710
+	.incbin "baserom.gba", 0x00D710, 0x0000015
+
+gUnk_0800D725:: @ 0800D725
+	.incbin "baserom.gba", 0x00D725, 0x0000003
+
+gUnk_0800D728:: @ 0800D728
+	.incbin "baserom.gba", 0x00D728, 0x0000044
+
+gUnk_0800D76C:: @ 0800D76C
+	.incbin "baserom.gba", 0x00D76C, 0x0000063
+
+gUnk_0800D7CF:: @ 0800D7CF
+	.incbin "baserom.gba", 0x00D7CF, 0x000000D
+
+gUnk_0800D7DC:: @ 0800D7DC
+	.incbin "baserom.gba", 0x00D7DC, 0x0000098
+
+gUnk_0800D874:: @ 0800D874
+	.incbin "baserom.gba", 0x00D874, 0x0000070
+
+gUnk_0800D8E4:: @ 0800D8E4
+	.incbin "baserom.gba", 0x00D8E4, 0x0000022
+
+gUnk_0800D906:: @ 0800D906
+	.incbin "baserom.gba", 0x00D906, 0x000004E
+
+gUnk_0800D954:: @ 0800D954
+	.incbin "baserom.gba", 0x00D954, 0x0000029
+
+gUnk_0800D97D:: @ 0800D97D
+	.incbin "baserom.gba", 0x00D97D, 0x0000004
+
+gUnk_0800D981:: @ 0800D981
+	.incbin "baserom.gba", 0x00D981, 0x0000090
+
+gUnk_0800DA11:: @ 0800DA11
+	.incbin "baserom.gba", 0x00DA11, 0x0000017
+
+gUnk_0800DA28:: @ 0800DA28
+	.incbin "baserom.gba", 0x00DA28, 0x0000024
+
+gUnk_0800DA4C:: @ 0800DA4C
+	.incbin "baserom.gba", 0x00DA4C, 0x0000001
+
+gUnk_0800DA4D:: @ 0800DA4D
+	.incbin "baserom.gba", 0x00DA4D, 0x0000013
+
+gUnk_0800DA60:: @ 0800DA60
+	.incbin "baserom.gba", 0x00DA60, 0x00000AE
+
+gUnk_0800DB0E:: @ 0800DB0E
+	.incbin "baserom.gba", 0x00DB0E, 0x000000A
+
+gUnk_0800DB18:: @ 0800DB18
+	.incbin "baserom.gba", 0x00DB18, 0x0000010
+
+gUnk_0800DB28:: @ 0800DB28
+	.incbin "baserom.gba", 0x00DB28, 0x0000022
+
+gUnk_0800DB4A:: @ 0800DB4A
+	.incbin "baserom.gba", 0x00DB4A, 0x000002E
+
+gUnk_0800DB78:: @ 0800DB78
+	.incbin "baserom.gba", 0x00DB78, 0x0000010
+
+gUnk_0800DB88:: @ 0800DB88
+	.incbin "baserom.gba", 0x00DB88, 0x0000088
+
+gUnk_0800DC10:: @ 0800DC10
+	.incbin "baserom.gba", 0x00DC10, 0x0000009
+
+gUnk_0800DC19:: @ 0800DC19
+	.incbin "baserom.gba", 0x00DC19, 0x0000078
+
+gUnk_0800DC91:: @ 0800DC91
+	.incbin "baserom.gba", 0x00DC91, 0x000001B
+
+gUnk_0800DCAC:: @ 0800DCAC
+	.incbin "baserom.gba", 0x00DCAC, 0x0000030
+
+gUnk_0800DCDC:: @ 0800DCDC
+	.incbin "baserom.gba", 0x00DCDC, 0x0000028
+
+gUnk_0800DD04:: @ 0800DD04
+	.incbin "baserom.gba", 0x00DD04, 0x000000C
+
+gUnk_0800DD10:: @ 0800DD10
+	.incbin "baserom.gba", 0x00DD10, 0x0000009
+
+gUnk_0800DD19:: @ 0800DD19
+	.incbin "baserom.gba", 0x00DD19, 0x0000009
+
+gUnk_0800DD22:: @ 0800DD22
+	.incbin "baserom.gba", 0x00DD22, 0x000006B
+
+gUnk_0800DD8D:: @ 0800DD8D
+	.incbin "baserom.gba", 0x00DD8D, 0x000001D
+
+gUnk_0800DDAA:: @ 0800DDAA
+	.incbin "baserom.gba", 0x00DDAA, 0x000003E
+
+gUnk_0800DDE8:: @ 0800DDE8
+	.incbin "baserom.gba", 0x00DDE8, 0x0000014
+
+gUnk_0800DDFC:: @ 0800DDFC
+	.incbin "baserom.gba", 0x00DDFC, 0x0000004
+
+gUnk_0800DE00:: @ 0800DE00
+	.incbin "baserom.gba", 0x00DE00, 0x0000078
+
+gUnk_0800DE78:: @ 0800DE78
+	.incbin "baserom.gba", 0x00DE78, 0x0000038
+
+gUnk_0800DEB0:: @ 0800DEB0
+	.incbin "baserom.gba", 0x00DEB0, 0x0000024
+
+gUnk_0800DED4:: @ 0800DED4
+	.incbin "baserom.gba", 0x00DED4, 0x0000022
+
+gUnk_0800DEF6:: @ 0800DEF6
+	.incbin "baserom.gba", 0x00DEF6, 0x0000011
+
+gUnk_0800DF07:: @ 0800DF07
+	.incbin "baserom.gba", 0x00DF07, 0x000001D
+
+gUnk_0800DF24:: @ 0800DF24
+	.incbin "baserom.gba", 0x00DF24, 0x0000090
+
+gUnk_0800DFB4:: @ 0800DFB4
+	.incbin "baserom.gba", 0x00DFB4, 0x000001C
+
+gUnk_0800DFD0:: @ 0800DFD0
+	.incbin "baserom.gba", 0x00DFD0, 0x0000007
+
+gUnk_0800DFD7:: @ 0800DFD7
+	.incbin "baserom.gba", 0x00DFD7, 0x0000007
+
+gUnk_0800DFDE:: @ 0800DFDE
+	.incbin "baserom.gba", 0x00DFDE, 0x0000006
+
+gUnk_0800DFE4:: @ 0800DFE4
+	.incbin "baserom.gba", 0x00DFE4, 0x000006C
+
+gUnk_0800E050:: @ 0800E050
+	.incbin "baserom.gba", 0x00E050, 0x000006C
+
+gUnk_0800E0BC:: @ 0800E0BC
+	.incbin "baserom.gba", 0x00E0BC, 0x000003A
+
+gUnk_0800E0F6:: @ 0800E0F6
+	.incbin "baserom.gba", 0x00E0F6, 0x000004A
+
+gUnk_0800E140:: @ 0800E140
+	.incbin "baserom.gba", 0x00E140, 0x0000013
+
+gUnk_0800E153:: @ 0800E153
+	.incbin "baserom.gba", 0x00E153, 0x0000001
+
+gUnk_0800E154:: @ 0800E154
+	.incbin "baserom.gba", 0x00E154, 0x0000071
+
+gUnk_0800E1C5:: @ 0800E1C5
+	.incbin "baserom.gba", 0x00E1C5, 0x000003B
+
+gUnk_0800E200:: @ 0800E200
+	.incbin "baserom.gba", 0x00E200, 0x0000100
+
+gUnk_0800E300:: @ 0800E300
+	.incbin "baserom.gba", 0x00E300, 0x0000005
+
+gUnk_0800E305:: @ 0800E305
+	.incbin "baserom.gba", 0x00E305, 0x0000002
+
+gUnk_0800E307:: @ 0800E307
+	.incbin "baserom.gba", 0x00E307, 0x0000005
+
+gUnk_0800E30C:: @ 0800E30C
+	.incbin "baserom.gba", 0x00E30C, 0x000001D
+
+gUnk_0800E329:: @ 0800E329
+	.incbin "baserom.gba", 0x00E329, 0x0000027
+
+gUnk_0800E350:: @ 0800E350
+	.incbin "baserom.gba", 0x00E350, 0x000009E
+
+gUnk_0800E3EE:: @ 0800E3EE
+	.incbin "baserom.gba", 0x00E3EE, 0x000000B
+
+gUnk_0800E3F9:: @ 0800E3F9
+	.incbin "baserom.gba", 0x00E3F9, 0x0000001
+
+gUnk_0800E3FA:: @ 0800E3FA
+	.incbin "baserom.gba", 0x00E3FA, 0x0000002
+
+gUnk_0800E3FC:: @ 0800E3FC
+	.incbin "baserom.gba", 0x00E3FC, 0x0000004
+
+gUnk_0800E400:: @ 0800E400
+	.incbin "baserom.gba", 0x00E400, 0x0000008
+
+gUnk_0800E408:: @ 0800E408
+	.incbin "baserom.gba", 0x00E408, 0x0000003
+
+gUnk_0800E40B:: @ 0800E40B
+	.incbin "baserom.gba", 0x00E40B, 0x0000006
+
+gUnk_0800E411:: @ 0800E411
+	.incbin "baserom.gba", 0x00E411, 0x000001F
+
+gUnk_0800E430:: @ 0800E430
+	.incbin "baserom.gba", 0x00E430, 0x0000004
+
+gUnk_0800E434:: @ 0800E434
+	.incbin "baserom.gba", 0x00E434, 0x0000038
+
+gUnk_0800E46C:: @ 0800E46C
+	.incbin "baserom.gba", 0x00E46C, 0x000001D
+
+gUnk_0800E489:: @ 0800E489
+	.incbin "baserom.gba", 0x00E489, 0x0000010
+
+gUnk_0800E499:: @ 0800E499
+	.incbin "baserom.gba", 0x00E499, 0x000000B
+
+gUnk_0800E4A4:: @ 0800E4A4
+	.incbin "baserom.gba", 0x00E4A4, 0x000003F
+
+gUnk_0800E4E3:: @ 0800E4E3
+	.incbin "baserom.gba", 0x00E4E3, 0x0000021
+
+gUnk_0800E504:: @ 0800E504
+	.incbin "baserom.gba", 0x00E504, 0x0000008
+
+gUnk_0800E50C:: @ 0800E50C
+	.incbin "baserom.gba", 0x00E50C, 0x0000038
+
+gUnk_0800E544:: @ 0800E544
+	.incbin "baserom.gba", 0x00E544, 0x0000048
+
+gUnk_0800E58C:: @ 0800E58C
+	.incbin "baserom.gba", 0x00E58C, 0x0000038
+
+gUnk_0800E5C4:: @ 0800E5C4
+	.incbin "baserom.gba", 0x00E5C4, 0x000003C
+
+gUnk_0800E600:: @ 0800E600
+	.incbin "baserom.gba", 0x00E600, 0x000000E
+
+gUnk_0800E60E:: @ 0800E60E
+	.incbin "baserom.gba", 0x00E60E, 0x000001E
+
+gUnk_0800E62C:: @ 0800E62C
+	.incbin "baserom.gba", 0x00E62C, 0x000002C
+
+gUnk_0800E658:: @ 0800E658
+	.incbin "baserom.gba", 0x00E658, 0x000002C
+
+gUnk_0800E684:: @ 0800E684
+	.incbin "baserom.gba", 0x00E684, 0x000002C
+
+gUnk_0800E6B0:: @ 0800E6B0
+	.incbin "baserom.gba", 0x00E6B0, 0x0000038
+
+gUnk_0800E6E8:: @ 0800E6E8
+	.incbin "baserom.gba", 0x00E6E8, 0x000001F
+
+gUnk_0800E707:: @ 0800E707
+	.incbin "baserom.gba", 0x00E707, 0x0000003
+
+gUnk_0800E70A:: @ 0800E70A
+	.incbin "baserom.gba", 0x00E70A, 0x000002A
+
+gUnk_0800E734:: @ 0800E734
+	.incbin "baserom.gba", 0x00E734, 0x000002C
+
+gUnk_0800E760:: @ 0800E760
+	.incbin "baserom.gba", 0x00E760, 0x0000079
+
+gUnk_0800E7D9:: @ 0800E7D9
+	.incbin "baserom.gba", 0x00E7D9, 0x000001B
+
+gUnk_0800E7F4:: @ 0800E7F4
+	.incbin "baserom.gba", 0x00E7F4, 0x0000006
+
+gUnk_0800E7FA:: @ 0800E7FA
+	.incbin "baserom.gba", 0x00E7FA, 0x0000029
+
+gUnk_0800E823:: @ 0800E823
+	.incbin "baserom.gba", 0x00E823, 0x0000001
+
+gUnk_0800E824:: @ 0800E824
+	.incbin "baserom.gba", 0x00E824, 0x00000B7
+
+gUnk_0800E8DB:: @ 0800E8DB
+	.incbin "baserom.gba", 0x00E8DB, 0x0000045
+
+gUnk_0800E920:: @ 0800E920
+	.incbin "baserom.gba", 0x00E920, 0x0000044
+
+gUnk_0800E964:: @ 0800E964
+	.incbin "baserom.gba", 0x00E964, 0x0000072
+
+gUnk_0800E9D6:: @ 0800E9D6
+	.incbin "baserom.gba", 0x00E9D6, 0x000001E
+
+gUnk_0800E9F4:: @ 0800E9F4
+	.incbin "baserom.gba", 0x00E9F4, 0x0000028
+
+gUnk_0800EA1C:: @ 0800EA1C
+	.incbin "baserom.gba", 0x00EA1C, 0x0000038
+
+gUnk_0800EA54:: @ 0800EA54
+	.incbin "baserom.gba", 0x00EA54, 0x0000050
+
+gUnk_0800EAA4:: @ 0800EAA4
+	.incbin "baserom.gba", 0x00EAA4, 0x0000047
+
+gUnk_0800EAEB:: @ 0800EAEB
+	.incbin "baserom.gba", 0x00EAEB, 0x000000D
+
+gUnk_0800EAF8:: @ 0800EAF8
+	.incbin "baserom.gba", 0x00EAF8, 0x0000034
+
+gUnk_0800EB2C:: @ 0800EB2C
+	.incbin "baserom.gba", 0x00EB2C, 0x0000038
+
+gUnk_0800EB64:: @ 0800EB64
+	.incbin "baserom.gba", 0x00EB64, 0x000005C
+
+gUnk_0800EBC0:: @ 0800EBC0
+	.incbin "baserom.gba", 0x00EBC0, 0x000001C
+
+gUnk_0800EBDC:: @ 0800EBDC
+	.incbin "baserom.gba", 0x00EBDC, 0x0000004
+
+gUnk_0800EBE0:: @ 0800EBE0
+	.incbin "baserom.gba", 0x00EBE0, 0x0000010
+
+gUnk_0800EBF0:: @ 0800EBF0
+	.incbin "baserom.gba", 0x00EBF0, 0x0000018
+
+gUnk_0800EC08:: @ 0800EC08
+	.incbin "baserom.gba", 0x00EC08, 0x000000C
+
+gUnk_0800EC14:: @ 0800EC14
+	.incbin "baserom.gba", 0x00EC14, 0x0000040
+
+gUnk_0800EC54:: @ 0800EC54
+	.incbin "baserom.gba", 0x00EC54, 0x000000D
+
+gUnk_0800EC61:: @ 0800EC61
+	.incbin "baserom.gba", 0x00EC61, 0x000002B
+
+gUnk_0800EC8C:: @ 0800EC8C
+	.incbin "baserom.gba", 0x00EC8C, 0x0000065
+
+gUnk_0800ECF1:: @ 0800ECF1
+	.incbin "baserom.gba", 0x00ECF1, 0x0000013
+
+gUnk_0800ED04:: @ 0800ED04
+	.incbin "baserom.gba", 0x00ED04, 0x0000008
+
+gUnk_0800ED0C:: @ 0800ED0C
+	.incbin "baserom.gba", 0x00ED0C, 0x0000001
+
+gUnk_0800ED0D:: @ 0800ED0D
+	.incbin "baserom.gba", 0x00ED0D, 0x000004F
+
+gUnk_0800ED5C:: @ 0800ED5C
+	.incbin "baserom.gba", 0x00ED5C, 0x0000034
+
+gUnk_0800ED90:: @ 0800ED90
+	.incbin "baserom.gba", 0x00ED90, 0x0000049
+
+gUnk_0800EDD9:: @ 0800EDD9
+	.incbin "baserom.gba", 0x00EDD9, 0x0000007
+
+gUnk_0800EDE0:: @ 0800EDE0
+	.incbin "baserom.gba", 0x00EDE0, 0x0000029
+
+gUnk_0800EE09:: @ 0800EE09
+	.incbin "baserom.gba", 0x00EE09, 0x0000047
+
+gUnk_0800EE50:: @ 0800EE50
+	.incbin "baserom.gba", 0x00EE50, 0x000003C
+
+gUnk_0800EE8C:: @ 0800EE8C
+	.incbin "baserom.gba", 0x00EE8C, 0x0000054
+
+gUnk_0800EEE0:: @ 0800EEE0
+	.incbin "baserom.gba", 0x00EEE0, 0x000001D
+
+gUnk_0800EEFD:: @ 0800EEFD
+	.incbin "baserom.gba", 0x00EEFD, 0x000000A
+
+gUnk_0800EF07:: @ 0800EF07
+	.incbin "baserom.gba", 0x00EF07, 0x000000B
+
+gUnk_0800EF12:: @ 0800EF12
+	.incbin "baserom.gba", 0x00EF12, 0x000002E
+
+gUnk_0800EF40:: @ 0800EF40
+	.incbin "baserom.gba", 0x00EF40, 0x0000053
+
+gUnk_0800EF93:: @ 0800EF93
+	.incbin "baserom.gba", 0x00EF93, 0x000002D
+
+gUnk_0800EFC0:: @ 0800EFC0
+	.incbin "baserom.gba", 0x00EFC0, 0x0000020
+
+gUnk_0800EFE0:: @ 0800EFE0
+	.incbin "baserom.gba", 0x00EFE0, 0x0000004
+
+gUnk_0800EFE4:: @ 0800EFE4
+	.incbin "baserom.gba", 0x00EFE4, 0x00000AC
+
+gUnk_0800F090:: @ 0800F090
+	.incbin "baserom.gba", 0x00F090, 0x0000004
+
+gUnk_0800F094:: @ 0800F094
+	.incbin "baserom.gba", 0x00F094, 0x0000042
+
+gUnk_0800F0D6:: @ 0800F0D6
+	.incbin "baserom.gba", 0x00F0D6, 0x000000C
+
+gUnk_0800F0E2:: @ 0800F0E2
+	.incbin "baserom.gba", 0x00F0E2, 0x0000010
+
+gUnk_0800F0F2:: @ 0800F0F2
+	.incbin "baserom.gba", 0x00F0F2, 0x0000001
+
+gUnk_0800F0F3:: @ 0800F0F3
+	.incbin "baserom.gba", 0x00F0F3, 0x0000001
+
+gUnk_0800F0F4:: @ 0800F0F4
+	.incbin "baserom.gba", 0x00F0F4, 0x0000058
+
+gUnk_0800F14C:: @ 0800F14C
+	.incbin "baserom.gba", 0x00F14C, 0x0000038
+
+gUnk_0800F184:: @ 0800F184
+	.incbin "baserom.gba", 0x00F184, 0x000005A
+
+gUnk_0800F1DE:: @ 0800F1DE
+	.incbin "baserom.gba", 0x00F1DE, 0x0000003
+
+gUnk_0800F1E1:: @ 0800F1E1
+	.incbin "baserom.gba", 0x00F1E1, 0x0000004
+
+gUnk_0800F1E5:: @ 0800F1E5
+	.incbin "baserom.gba", 0x00F1E5, 0x0000002
+
+gUnk_0800F1E7:: @ 0800F1E7
+	.incbin "baserom.gba", 0x00F1E7, 0x0000006
+
+gUnk_0800F1ED:: @ 0800F1ED
+	.incbin "baserom.gba", 0x00F1ED, 0x000000E
+
+gUnk_0800F1FB:: @ 0800F1FB
+	.incbin "baserom.gba", 0x00F1FB, 0x0000002
+
+gUnk_0800F1FD:: @ 0800F1FD
+	.incbin "baserom.gba", 0x00F1FD, 0x0000006
+
+gUnk_0800F203:: @ 0800F203
+	.incbin "baserom.gba", 0x00F203, 0x0000004
+
+gUnk_0800F207:: @ 0800F207
+	.incbin "baserom.gba", 0x00F207, 0x0000009
+
+gUnk_0800F210:: @ 0800F210
+	.incbin "baserom.gba", 0x00F210, 0x00000DB
+
+gUnk_0800F2EB:: @ 0800F2EB
+	.incbin "baserom.gba", 0x00F2EB, 0x0000005
+
+gUnk_0800F2F0:: @ 0800F2F0
+	.incbin "baserom.gba", 0x00F2F0, 0x0000002
+
+gUnk_0800F2F2:: @ 0800F2F2
+	.incbin "baserom.gba", 0x00F2F2, 0x0000011
+
+gUnk_0800F303:: @ 0800F303
+	.incbin "baserom.gba", 0x00F303, 0x0000099
+
+gUnk_0800F39C:: @ 0800F39C
+	.incbin "baserom.gba", 0x00F39C, 0x000003F
+
+gUnk_0800F3DB:: @ 0800F3DB
+	.incbin "baserom.gba", 0x00F3DB, 0x000000A
+
+gUnk_0800F3E5:: @ 0800F3E5
+	.incbin "baserom.gba", 0x00F3E5, 0x0000001
+
+gUnk_0800F3E6:: @ 0800F3E6
+	.incbin "baserom.gba", 0x00F3E6, 0x0000002
+
+gUnk_0800F3E8:: @ 0800F3E8
+	.incbin "baserom.gba", 0x00F3E8, 0x0000003
+
+gUnk_0800F3EB:: @ 0800F3EB
+	.incbin "baserom.gba", 0x00F3EB, 0x0000002
+
+gUnk_0800F3ED:: @ 0800F3ED
+	.incbin "baserom.gba", 0x00F3ED, 0x0000008
+
+gUnk_0800F3F5:: @ 0800F3F5
+	.incbin "baserom.gba", 0x00F3F5, 0x0000004
+
+gUnk_0800F3F9:: @ 0800F3F9
+	.incbin "baserom.gba", 0x00F3F9, 0x0000007
+
+gUnk_0800F400:: @ 0800F400
+	.incbin "baserom.gba", 0x00F400, 0x0000008
+
+gUnk_0800F408:: @ 0800F408
+	.incbin "baserom.gba", 0x00F408, 0x0000001
+
+gUnk_0800F409:: @ 0800F409
+	.incbin "baserom.gba", 0x00F409, 0x0000007
+
+gUnk_0800F410:: @ 0800F410
+	.incbin "baserom.gba", 0x00F410, 0x0000016
+
+gUnk_0800F426:: @ 0800F426
+	.incbin "baserom.gba", 0x00F426, 0x000000A
+
+gUnk_0800F430:: @ 0800F430
+	.incbin "baserom.gba", 0x00F430, 0x0000094
+
+gUnk_0800F4C4:: @ 0800F4C4
+	.incbin "baserom.gba", 0x00F4C4, 0x0000026
+
+gUnk_0800F4EA:: @ 0800F4EA
+	.incbin "baserom.gba", 0x00F4EA, 0x0000001
+
+gUnk_0800F4EB:: @ 0800F4EB
+	.incbin "baserom.gba", 0x00F4EB, 0x0000004
+
+gUnk_0800F4EF:: @ 0800F4EF
+	.incbin "baserom.gba", 0x00F4EF, 0x0000001
+
+gUnk_0800F4F0:: @ 0800F4F0
+	.incbin "baserom.gba", 0x00F4F0, 0x0000001
+
+gUnk_0800F4F1:: @ 0800F4F1
+	.incbin "baserom.gba", 0x00F4F1, 0x0000002
+
+gUnk_0800F4F3:: @ 0800F4F3
+	.incbin "baserom.gba", 0x00F4F3, 0x0000004
+
+gUnk_0800F4F7:: @ 0800F4F7
+	.incbin "baserom.gba", 0x00F4F7, 0x0000002
+
+gUnk_0800F4F9:: @ 0800F4F9
+	.incbin "baserom.gba", 0x00F4F9, 0x0000008
+
+gUnk_0800F501:: @ 0800F501
+	.incbin "baserom.gba", 0x00F501, 0x000000D
+
+gUnk_0800F50E:: @ 0800F50E
+	.incbin "baserom.gba", 0x00F50E, 0x0000046
+
+gUnk_0800F554:: @ 0800F554
+	.incbin "baserom.gba", 0x00F554, 0x0000030
+
+gUnk_0800F584:: @ 0800F584
+	.incbin "baserom.gba", 0x00F584, 0x000000B
+
+gUnk_0800F58F:: @ 0800F58F
+	.incbin "baserom.gba", 0x00F58F, 0x0000021
+
+gUnk_0800F5B0:: @ 0800F5B0
+	.incbin "baserom.gba", 0x00F5B0, 0x0000039
+
+gUnk_0800F5E9:: @ 0800F5E9
+	.incbin "baserom.gba", 0x00F5E9, 0x0000003
+
+gUnk_0800F5EC:: @ 0800F5EC
+	.incbin "baserom.gba", 0x00F5EC, 0x0000001
+
+gUnk_0800F5ED:: @ 0800F5ED
+	.incbin "baserom.gba", 0x00F5ED, 0x0000001
+
+gUnk_0800F5EE:: @ 0800F5EE
+	.incbin "baserom.gba", 0x00F5EE, 0x0000001
+
+gUnk_0800F5EF:: @ 0800F5EF
+	.incbin "baserom.gba", 0x00F5EF, 0x0000001
+
+gUnk_0800F5F0:: @ 0800F5F0
+	.incbin "baserom.gba", 0x00F5F0, 0x0000002
+
+gUnk_0800F5F2:: @ 0800F5F2
+	.incbin "baserom.gba", 0x00F5F2, 0x0000002
+
+gUnk_0800F5F4:: @ 0800F5F4
+	.incbin "baserom.gba", 0x00F5F4, 0x0000008
+
+gUnk_0800F5FC:: @ 0800F5FC
+	.incbin "baserom.gba", 0x00F5FC, 0x0000003
+
+gUnk_0800F5FF:: @ 0800F5FF
+	.incbin "baserom.gba", 0x00F5FF, 0x0000007
+
+gUnk_0800F606:: @ 0800F606
+	.incbin "baserom.gba", 0x00F606, 0x0000001
+
+gUnk_0800F607:: @ 0800F607
+	.incbin "baserom.gba", 0x00F607, 0x0000001
+
+gUnk_0800F608:: @ 0800F608
+	.incbin "baserom.gba", 0x00F608, 0x0000002
+
+gUnk_0800F60A:: @ 0800F60A
+	.incbin "baserom.gba", 0x00F60A, 0x000001E
+
+gUnk_0800F628:: @ 0800F628
+	.incbin "baserom.gba", 0x00F628, 0x0000028
+
+gUnk_0800F650:: @ 0800F650
+	.incbin "baserom.gba", 0x00F650, 0x0000038
+
+gUnk_0800F688:: @ 0800F688
+	.incbin "baserom.gba", 0x00F688, 0x0000018
+
+gUnk_0800F6A0:: @ 0800F6A0
+	.incbin "baserom.gba", 0x00F6A0, 0x0000028
+
+gUnk_0800F6C8:: @ 0800F6C8
+	.incbin "baserom.gba", 0x00F6C8, 0x0000018
+
+gUnk_0800F6E0:: @ 0800F6E0
+	.incbin "baserom.gba", 0x00F6E0, 0x0000009
+
+gUnk_0800F6E9:: @ 0800F6E9
+	.incbin "baserom.gba", 0x00F6E9, 0x0000003
+
+gUnk_0800F6EC:: @ 0800F6EC
+	.incbin "baserom.gba", 0x00F6EC, 0x0000001
+
+gUnk_0800F6ED:: @ 0800F6ED
+	.incbin "baserom.gba", 0x00F6ED, 0x0000001
+
+gUnk_0800F6EE:: @ 0800F6EE
+	.incbin "baserom.gba", 0x00F6EE, 0x0000001
+
+gUnk_0800F6EF:: @ 0800F6EF
+	.incbin "baserom.gba", 0x00F6EF, 0x0000001
+
+gUnk_0800F6F0:: @ 0800F6F0
+	.incbin "baserom.gba", 0x00F6F0, 0x0000001
+
+gUnk_0800F6F1:: @ 0800F6F1
+	.incbin "baserom.gba", 0x00F6F1, 0x0000001
+
+gUnk_0800F6F2:: @ 0800F6F2
+	.incbin "baserom.gba", 0x00F6F2, 0x0000001
+
+gUnk_0800F6F3:: @ 0800F6F3
+	.incbin "baserom.gba", 0x00F6F3, 0x0000001
+
+gUnk_0800F6F4:: @ 0800F6F4
+	.incbin "baserom.gba", 0x00F6F4, 0x0000005
+
+gUnk_0800F6F9:: @ 0800F6F9
+	.incbin "baserom.gba", 0x00F6F9, 0x0000005
+
+gUnk_0800F6FE:: @ 0800F6FE
+	.incbin "baserom.gba", 0x00F6FE, 0x0000004
+
+gUnk_0800F702:: @ 0800F702
+	.incbin "baserom.gba", 0x00F702, 0x0000004
+
+gUnk_0800F706:: @ 0800F706
+	.incbin "baserom.gba", 0x00F706, 0x0000018
+
+gUnk_0800F71E:: @ 0800F71E
+	.incbin "baserom.gba", 0x00F71E, 0x0000006
+
+gUnk_0800F724:: @ 0800F724
+	.incbin "baserom.gba", 0x00F724, 0x0000010
+
+gUnk_0800F734:: @ 0800F734
+	.incbin "baserom.gba", 0x00F734, 0x0000008
+
+gUnk_0800F73C:: @ 0800F73C
+	.incbin "baserom.gba", 0x00F73C, 0x00000AA
+
+gUnk_0800F7E6:: @ 0800F7E6
+	.incbin "baserom.gba", 0x00F7E6, 0x0000005
+
+gUnk_0800F7EB:: @ 0800F7EB
+	.incbin "baserom.gba", 0x00F7EB, 0x0000003
+
+gUnk_0800F7EE:: @ 0800F7EE
+	.incbin "baserom.gba", 0x00F7EE, 0x0000001
+
+gUnk_0800F7EF:: @ 0800F7EF
+	.incbin "baserom.gba", 0x00F7EF, 0x0000001
+
+gUnk_0800F7F0:: @ 0800F7F0
+	.incbin "baserom.gba", 0x00F7F0, 0x0000004
+
+gUnk_0800F7F4:: @ 0800F7F4
+	.incbin "baserom.gba", 0x00F7F4, 0x0000001
+
+gUnk_0800F7F5:: @ 0800F7F5
+	.incbin "baserom.gba", 0x00F7F5, 0x0000002
+
+gUnk_0800F7F7:: @ 0800F7F7
+	.incbin "baserom.gba", 0x00F7F7, 0x0000005
+
+gUnk_0800F7FC:: @ 0800F7FC
+	.incbin "baserom.gba", 0x00F7FC, 0x0000001
+
+gUnk_0800F7FD:: @ 0800F7FD
+	.incbin "baserom.gba", 0x00F7FD, 0x0000002
+
+gUnk_0800F7FF:: @ 0800F7FF
+	.incbin "baserom.gba", 0x00F7FF, 0x0000001
+
+gUnk_0800F800:: @ 0800F800
+	.incbin "baserom.gba", 0x00F800, 0x0000005
+
+gUnk_0800F805:: @ 0800F805
+	.incbin "baserom.gba", 0x00F805, 0x0000003
+
+gUnk_0800F808:: @ 0800F808
+	.incbin "baserom.gba", 0x00F808, 0x00000E7
+
+gUnk_0800F8EF:: @ 0800F8EF
+	.incbin "baserom.gba", 0x00F8EF, 0x0000001
+
+gUnk_0800F8F0:: @ 0800F8F0
+	.incbin "baserom.gba", 0x00F8F0, 0x0000001
+
+gUnk_0800F8F1:: @ 0800F8F1
+	.incbin "baserom.gba", 0x00F8F1, 0x0000001
+
+gUnk_0800F8F2:: @ 0800F8F2
+	.incbin "baserom.gba", 0x00F8F2, 0x0000001
+
+gUnk_0800F8F3:: @ 0800F8F3
+	.incbin "baserom.gba", 0x00F8F3, 0x0000001
+
+gUnk_0800F8F4:: @ 0800F8F4
+	.incbin "baserom.gba", 0x00F8F4, 0x0000001
+
+gUnk_0800F8F5:: @ 0800F8F5
+	.incbin "baserom.gba", 0x00F8F5, 0x0000003
+
+gUnk_0800F8F8:: @ 0800F8F8
+	.incbin "baserom.gba", 0x00F8F8, 0x0000001
+
+gUnk_0800F8F9:: @ 0800F8F9
+	.incbin "baserom.gba", 0x00F8F9, 0x0000007
+
+gUnk_0800F900:: @ 0800F900
+	.incbin "baserom.gba", 0x00F900, 0x0000002
+
+gUnk_0800F902:: @ 0800F902
+	.incbin "baserom.gba", 0x00F902, 0x0000014
+
+gUnk_0800F916:: @ 0800F916
+	.incbin "baserom.gba", 0x00F916, 0x00000DA
+
+gUnk_0800F9F0:: @ 0800F9F0
+	.incbin "baserom.gba", 0x00F9F0, 0x0000002
+
+gUnk_0800F9F2:: @ 0800F9F2
+	.incbin "baserom.gba", 0x00F9F2, 0x0000001
+
+gUnk_0800F9F3:: @ 0800F9F3
+	.incbin "baserom.gba", 0x00F9F3, 0x0000001
+
+gUnk_0800F9F4:: @ 0800F9F4
+	.incbin "baserom.gba", 0x00F9F4, 0x0000002
+
+gUnk_0800F9F6:: @ 0800F9F6
+	.incbin "baserom.gba", 0x00F9F6, 0x0000001
+
+gUnk_0800F9F7:: @ 0800F9F7
+	.incbin "baserom.gba", 0x00F9F7, 0x0000001
+
+gUnk_0800F9F8:: @ 0800F9F8
+	.incbin "baserom.gba", 0x00F9F8, 0x000000A
+
+gUnk_0800FA02:: @ 0800FA02
+	.incbin "baserom.gba", 0x00FA02, 0x0000005
+
+gUnk_0800FA07:: @ 0800FA07
+	.incbin "baserom.gba", 0x00FA07, 0x0000001
+
+gUnk_0800FA08:: @ 0800FA08
+	.incbin "baserom.gba", 0x00FA08, 0x0000001
+
+gUnk_0800FA09:: @ 0800FA09
+	.incbin "baserom.gba", 0x00FA09, 0x0000004
+
+gUnk_0800FA0D:: @ 0800FA0D
+	.incbin "baserom.gba", 0x00FA0D, 0x000006B
+
+gUnk_0800FA78:: @ 0800FA78
+	.incbin "baserom.gba", 0x00FA78, 0x0000048
+
+gUnk_0800FAC0:: @ 0800FAC0
+	.incbin "baserom.gba", 0x00FAC0, 0x0000024
+
+gUnk_0800FAE4:: @ 0800FAE4
+	.incbin "baserom.gba", 0x00FAE4, 0x000000F
+
+gUnk_0800FAF3:: @ 0800FAF3
+	.incbin "baserom.gba", 0x00FAF3, 0x0000002
+
+gUnk_0800FAF5:: @ 0800FAF5
+	.incbin "baserom.gba", 0x00FAF5, 0x0000001
+
+gUnk_0800FAF6:: @ 0800FAF6
+	.incbin "baserom.gba", 0x00FAF6, 0x0000001
+
+gUnk_0800FAF7:: @ 0800FAF7
+	.incbin "baserom.gba", 0x00FAF7, 0x0000001
+
+gUnk_0800FAF8:: @ 0800FAF8
+	.incbin "baserom.gba", 0x00FAF8, 0x0000005
+
+gUnk_0800FAFD:: @ 0800FAFD
+	.incbin "baserom.gba", 0x00FAFD, 0x0000001
+
+gUnk_0800FAFE:: @ 0800FAFE
+	.incbin "baserom.gba", 0x00FAFE, 0x0000001
+
+gUnk_0800FAFF:: @ 0800FAFF
+	.incbin "baserom.gba", 0x00FAFF, 0x0000001
+
+gUnk_0800FB00:: @ 0800FB00
+	.incbin "baserom.gba", 0x00FB00, 0x0000001
+
+gUnk_0800FB01:: @ 0800FB01
+	.incbin "baserom.gba", 0x00FB01, 0x0000001
+
+gUnk_0800FB02:: @ 0800FB02
+	.incbin "baserom.gba", 0x00FB02, 0x0000002
+
+gUnk_0800FB04:: @ 0800FB04
+	.incbin "baserom.gba", 0x00FB04, 0x0000004
+
+gUnk_0800FB08:: @ 0800FB08
+	.incbin "baserom.gba", 0x00FB08, 0x0000002
+
+gUnk_0800FB0A:: @ 0800FB0A
+	.incbin "baserom.gba", 0x00FB0A, 0x0000027
+
+gUnk_0800FB31:: @ 0800FB31
+	.incbin "baserom.gba", 0x00FB31, 0x0000013
+
+gUnk_0800FB44:: @ 0800FB44
+	.incbin "baserom.gba", 0x00FB44, 0x0000077
+
+gUnk_0800FBBB:: @ 0800FBBB
+	.incbin "baserom.gba", 0x00FBBB, 0x0000035
+
+gUnk_0800FBF0:: @ 0800FBF0
+	.incbin "baserom.gba", 0x00FBF0, 0x0000003
+
+gUnk_0800FBF3:: @ 0800FBF3
+	.incbin "baserom.gba", 0x00FBF3, 0x0000002
+
+gUnk_0800FBF5:: @ 0800FBF5
+	.incbin "baserom.gba", 0x00FBF5, 0x0000001
+
+gUnk_0800FBF6:: @ 0800FBF6
+	.incbin "baserom.gba", 0x00FBF6, 0x0000002
+
+gUnk_0800FBF8:: @ 0800FBF8
+	.incbin "baserom.gba", 0x00FBF8, 0x0000001
+
+gUnk_0800FBF9:: @ 0800FBF9
+	.incbin "baserom.gba", 0x00FBF9, 0x0000001
+
+gUnk_0800FBFA:: @ 0800FBFA
+	.incbin "baserom.gba", 0x00FBFA, 0x0000001
+
+gUnk_0800FBFB:: @ 0800FBFB
+	.incbin "baserom.gba", 0x00FBFB, 0x0000001
+
+gUnk_0800FBFC:: @ 0800FBFC
+	.incbin "baserom.gba", 0x00FBFC, 0x0000003
+
+gUnk_0800FBFF:: @ 0800FBFF
+	.incbin "baserom.gba", 0x00FBFF, 0x0000001
+
+gUnk_0800FC00:: @ 0800FC00
+	.incbin "baserom.gba", 0x00FC00, 0x0000001
+
+gUnk_0800FC01:: @ 0800FC01
+	.incbin "baserom.gba", 0x00FC01, 0x0000004
+
+gUnk_0800FC05:: @ 0800FC05
+	.incbin "baserom.gba", 0x00FC05, 0x0000001
+
+gUnk_0800FC06:: @ 0800FC06
+	.incbin "baserom.gba", 0x00FC06, 0x0000002
+
+gUnk_0800FC08:: @ 0800FC08
+	.incbin "baserom.gba", 0x00FC08, 0x0000001
+
+gUnk_0800FC09:: @ 0800FC09
+	.incbin "baserom.gba", 0x00FC09, 0x0000005
+
+gUnk_0800FC0E:: @ 0800FC0E
+	.incbin "baserom.gba", 0x00FC0E, 0x0000016
+
+gUnk_0800FC24:: @ 0800FC24
+	.incbin "baserom.gba", 0x00FC24, 0x00000C6
+
+gUnk_0800FCEA:: @ 0800FCEA
+	.incbin "baserom.gba", 0x00FCEA, 0x0000004
+
+gUnk_0800FCEE:: @ 0800FCEE
+	.incbin "baserom.gba", 0x00FCEE, 0x0000004
+
+gUnk_0800FCF2:: @ 0800FCF2
+	.incbin "baserom.gba", 0x00FCF2, 0x0000001
+
+gUnk_0800FCF3:: @ 0800FCF3
+	.incbin "baserom.gba", 0x00FCF3, 0x0000002
+
+gUnk_0800FCF5:: @ 0800FCF5
+	.incbin "baserom.gba", 0x00FCF5, 0x0000002
+
+gUnk_0800FCF7:: @ 0800FCF7
+	.incbin "baserom.gba", 0x00FCF7, 0x0000001
+
+gUnk_0800FCF8:: @ 0800FCF8
+	.incbin "baserom.gba", 0x00FCF8, 0x0000002
+
+gUnk_0800FCFA:: @ 0800FCFA
+	.incbin "baserom.gba", 0x00FCFA, 0x0000001
+
+gUnk_0800FCFB:: @ 0800FCFB
+	.incbin "baserom.gba", 0x00FCFB, 0x0000001
+
+gUnk_0800FCFC:: @ 0800FCFC
+	.incbin "baserom.gba", 0x00FCFC, 0x0000002
+
+gUnk_0800FCFE:: @ 0800FCFE
+	.incbin "baserom.gba", 0x00FCFE, 0x0000001
+
+gUnk_0800FCFF:: @ 0800FCFF
+	.incbin "baserom.gba", 0x00FCFF, 0x0000001
+
+gUnk_0800FD00:: @ 0800FD00
+	.incbin "baserom.gba", 0x00FD00, 0x0000001
+
+gUnk_0800FD01:: @ 0800FD01
+	.incbin "baserom.gba", 0x00FD01, 0x0000003
+
+gUnk_0800FD04:: @ 0800FD04
+	.incbin "baserom.gba", 0x00FD04, 0x0000001
+
+gUnk_0800FD05:: @ 0800FD05
+	.incbin "baserom.gba", 0x00FD05, 0x0000007
+
+gUnk_0800FD0C:: @ 0800FD0C
+	.incbin "baserom.gba", 0x00FD0C, 0x000000A
+
+gUnk_0800FD16:: @ 0800FD16
+	.incbin "baserom.gba", 0x00FD16, 0x000000B
+
+gUnk_0800FD21:: @ 0800FD21
+	.incbin "baserom.gba", 0x00FD21, 0x000005F
+
+gUnk_0800FD80:: @ 0800FD80
+	.incbin "baserom.gba", 0x00FD80, 0x0000020
+
+gUnk_0800FDA0:: @ 0800FDA0
+	.incbin "baserom.gba", 0x00FDA0, 0x000002C
+
+gUnk_0800FDCC:: @ 0800FDCC
+	.incbin "baserom.gba", 0x00FDCC, 0x0000026
+
+gUnk_0800FDF2:: @ 0800FDF2
+	.incbin "baserom.gba", 0x00FDF2, 0x0000001
+
+gUnk_0800FDF3:: @ 0800FDF3
+	.incbin "baserom.gba", 0x00FDF3, 0x0000007
+
+gUnk_0800FDFA:: @ 0800FDFA
+	.incbin "baserom.gba", 0x00FDFA, 0x0000002
+
+gUnk_0800FDFC:: @ 0800FDFC
+	.incbin "baserom.gba", 0x00FDFC, 0x0000002
+
+gUnk_0800FDFE:: @ 0800FDFE
+	.incbin "baserom.gba", 0x00FDFE, 0x0000001
+
+gUnk_0800FDFF:: @ 0800FDFF
+	.incbin "baserom.gba", 0x00FDFF, 0x0000001
+
+gUnk_0800FE00:: @ 0800FE00
+	.incbin "baserom.gba", 0x00FE00, 0x0000001
+
+gUnk_0800FE01:: @ 0800FE01
+	.incbin "baserom.gba", 0x00FE01, 0x0000001
+
+gUnk_0800FE02:: @ 0800FE02
+	.incbin "baserom.gba", 0x00FE02, 0x0000002
+
+gUnk_0800FE04:: @ 0800FE04
+	.incbin "baserom.gba", 0x00FE04, 0x0000002
+
+gUnk_0800FE06:: @ 0800FE06
+	.incbin "baserom.gba", 0x00FE06, 0x0000001
+
+gUnk_0800FE07:: @ 0800FE07
+	.incbin "baserom.gba", 0x00FE07, 0x0000001
+
+gUnk_0800FE08:: @ 0800FE08
+	.incbin "baserom.gba", 0x00FE08, 0x0000001
+
+gUnk_0800FE09:: @ 0800FE09
+	.incbin "baserom.gba", 0x00FE09, 0x0000037
+
+gUnk_0800FE40:: @ 0800FE40
+	.incbin "baserom.gba", 0x00FE40, 0x0000004
+
+gUnk_0800FE44:: @ 0800FE44
+	.incbin "baserom.gba", 0x00FE44, 0x0000020
+
+gUnk_0800FE64:: @ 0800FE64
+	.incbin "baserom.gba", 0x00FE64, 0x0000024
+
+gUnk_0800FE88:: @ 0800FE88
+	.incbin "baserom.gba", 0x00FE88, 0x0000034
+
+gUnk_0800FEBC:: @ 0800FEBC
+	.incbin "baserom.gba", 0x00FEBC, 0x0000034
+
+gUnk_0800FEF0:: @ 0800FEF0
+	.incbin "baserom.gba", 0x00FEF0, 0x0000002
+
+gUnk_0800FEF2:: @ 0800FEF2
+	.incbin "baserom.gba", 0x00FEF2, 0x0000007
+
+gUnk_0800FEF9:: @ 0800FEF9
+	.incbin "baserom.gba", 0x00FEF9, 0x0000003
+
+gUnk_0800FEFC:: @ 0800FEFC
+	.incbin "baserom.gba", 0x00FEFC, 0x0000002
+
+gUnk_0800FEFE:: @ 0800FEFE
+	.incbin "baserom.gba", 0x00FEFE, 0x0000003
+
+gUnk_0800FF01:: @ 0800FF01
+	.incbin "baserom.gba", 0x00FF01, 0x0000002
+
+gUnk_0800FF03:: @ 0800FF03
+	.incbin "baserom.gba", 0x00FF03, 0x0000001
+
+gUnk_0800FF04:: @ 0800FF04
+	.incbin "baserom.gba", 0x00FF04, 0x0000001
+
+gUnk_0800FF05:: @ 0800FF05
+	.incbin "baserom.gba", 0x00FF05, 0x0000001
+
+gUnk_0800FF06:: @ 0800FF06
+	.incbin "baserom.gba", 0x00FF06, 0x0000002
+
+gUnk_0800FF08:: @ 0800FF08
+	.incbin "baserom.gba", 0x00FF08, 0x0000010
+
+gUnk_0800FF18:: @ 0800FF18
+	.incbin "baserom.gba", 0x00FF18, 0x0000012
+
+gUnk_0800FF2A:: @ 0800FF2A
+	.incbin "baserom.gba", 0x00FF2A, 0x000004A
+
+gUnk_0800FF74:: @ 0800FF74
+	.incbin "baserom.gba", 0x00FF74, 0x000003C
+
+gUnk_0800FFB0:: @ 0800FFB0
+	.incbin "baserom.gba", 0x00FFB0, 0x000000B
+
+gUnk_0800FFBB:: @ 0800FFBB
+	.incbin "baserom.gba", 0x00FFBB, 0x000001B
+
+gUnk_0800FFD6:: @ 0800FFD6
+	.incbin "baserom.gba", 0x00FFD6, 0x0000018
+
+gUnk_0800FFEE:: @ 0800FFEE
+	.incbin "baserom.gba", 0x00FFEE, 0x0000008
+
+gUnk_0800FFF6:: @ 0800FFF6
+	.incbin "baserom.gba", 0x00FFF6, 0x0000006
+
+gUnk_0800FFFC:: @ 0800FFFC
+	.incbin "baserom.gba", 0x00FFFC, 0x0000001
+
+gUnk_0800FFFD:: @ 0800FFFD
+	.incbin "baserom.gba", 0x00FFFD, 0x0000002
+
+gUnk_0800FFFF:: @ 0800FFFF
+	.incbin "baserom.gba", 0x00FFFF, 0x0000001
+
+gUnk_08010000:: @ 08010000
+	.incbin "baserom.gba", 0x010000, 0x0000001
+
+gUnk_08010001:: @ 08010001
+	.incbin "baserom.gba", 0x010001, 0x0000001
+
+gUnk_08010002:: @ 08010002
+	.incbin "baserom.gba", 0x010002, 0x0000001
+
+gUnk_08010003:: @ 08010003
+	.incbin "baserom.gba", 0x010003, 0x0000002
+
+gUnk_08010005:: @ 08010005
+	.incbin "baserom.gba", 0x010005, 0x0000002
+
+gUnk_08010007:: @ 08010007
+	.incbin "baserom.gba", 0x010007, 0x0000001
+
+gUnk_08010008:: @ 08010008
+	.incbin "baserom.gba", 0x010008, 0x0000001
+
+gUnk_08010009:: @ 08010009
+	.incbin "baserom.gba", 0x010009, 0x0000001
+
+gUnk_0801000A:: @ 0801000A
+	.incbin "baserom.gba", 0x01000A, 0x0000002
+
+gUnk_0801000C:: @ 0801000C
+	.incbin "baserom.gba", 0x01000C, 0x0000001
+
+gUnk_0801000D:: @ 0801000D
+	.incbin "baserom.gba", 0x01000D, 0x0000001
+
+gUnk_0801000E:: @ 0801000E
+	.incbin "baserom.gba", 0x01000E, 0x0000001
+
+gUnk_0801000F:: @ 0801000F
+	.incbin "baserom.gba", 0x01000F, 0x0000009
+
+gUnk_08010018:: @ 08010018
+	.incbin "baserom.gba", 0x010018, 0x0000003
+
+gUnk_0801001B:: @ 0801001B
+	.incbin "baserom.gba", 0x01001B, 0x0000002
+
+gUnk_0801001D:: @ 0801001D
+	.incbin "baserom.gba", 0x01001D, 0x0000006
+
+gUnk_08010023:: @ 08010023
+	.incbin "baserom.gba", 0x010023, 0x0000021
+
+gUnk_08010044:: @ 08010044
+	.incbin "baserom.gba", 0x010044, 0x0000054
+
+gUnk_08010098:: @ 08010098
+	.incbin "baserom.gba", 0x010098, 0x0000001
+
+gUnk_08010099:: @ 08010099
+	.incbin "baserom.gba", 0x010099, 0x0000028
+
+gUnk_080100C1:: @ 080100C1
+	.incbin "baserom.gba", 0x0100C1, 0x0000007
+
+gUnk_080100C8:: @ 080100C8
+	.incbin "baserom.gba", 0x0100C8, 0x000002D
+
+gUnk_080100F5:: @ 080100F5
+	.incbin "baserom.gba", 0x0100F5, 0x0000007
+
+gUnk_080100FC:: @ 080100FC
+	.incbin "baserom.gba", 0x0100FC, 0x0000002
+
+gUnk_080100FE:: @ 080100FE
+	.incbin "baserom.gba", 0x0100FE, 0x0000001
+
+gUnk_080100FF:: @ 080100FF
+	.incbin "baserom.gba", 0x0100FF, 0x0000001
+
+gUnk_08010100:: @ 08010100
+	.incbin "baserom.gba", 0x010100, 0x0000002
+
+gUnk_08010102:: @ 08010102
+	.incbin "baserom.gba", 0x010102, 0x0000001
+
+gUnk_08010103:: @ 08010103
+	.incbin "baserom.gba", 0x010103, 0x0000002
+
+gUnk_08010105:: @ 08010105
+	.incbin "baserom.gba", 0x010105, 0x0000001
+
+gUnk_08010106:: @ 08010106
+	.incbin "baserom.gba", 0x010106, 0x0000004
+
+gUnk_0801010A:: @ 0801010A
+	.incbin "baserom.gba", 0x01010A, 0x0000007
+
+gUnk_08010111:: @ 08010111
+	.incbin "baserom.gba", 0x010111, 0x000000F
+
+gUnk_08010120:: @ 08010120
+	.incbin "baserom.gba", 0x010120, 0x0000010
+
+gUnk_08010130:: @ 08010130
+	.incbin "baserom.gba", 0x010130, 0x0000018
+
+gUnk_08010148:: @ 08010148
+	.incbin "baserom.gba", 0x010148, 0x00000B2
+
+gUnk_080101FA:: @ 080101FA
+	.incbin "baserom.gba", 0x0101FA, 0x0000003
+
+gUnk_080101FD:: @ 080101FD
+	.incbin "baserom.gba", 0x0101FD, 0x0000002
+
+gUnk_080101FF:: @ 080101FF
+	.incbin "baserom.gba", 0x0101FF, 0x0000001
+
+gUnk_08010200:: @ 08010200
+	.incbin "baserom.gba", 0x010200, 0x0000003
+
+gUnk_08010203:: @ 08010203
+	.incbin "baserom.gba", 0x010203, 0x0000004
+
+gUnk_08010207:: @ 08010207
+	.incbin "baserom.gba", 0x010207, 0x0000001
+
+gUnk_08010208:: @ 08010208
+	.incbin "baserom.gba", 0x010208, 0x0000004
+
+gUnk_0801020C:: @ 0801020C
+	.incbin "baserom.gba", 0x01020C, 0x0000014
+
+gUnk_08010220:: @ 08010220
+	.incbin "baserom.gba", 0x010220, 0x0000016
+
+gUnk_08010236:: @ 08010236
+	.incbin "baserom.gba", 0x010236, 0x000002E
+
+gUnk_08010264:: @ 08010264
+	.incbin "baserom.gba", 0x010264, 0x0000030
+
+gUnk_08010294:: @ 08010294
+	.incbin "baserom.gba", 0x010294, 0x000004C
+
+gUnk_080102E0:: @ 080102E0
+	.incbin "baserom.gba", 0x0102E0, 0x000001B
+
+gUnk_080102FB:: @ 080102FB
+	.incbin "baserom.gba", 0x0102FB, 0x0000002
+
+gUnk_080102FD:: @ 080102FD
+	.incbin "baserom.gba", 0x0102FD, 0x0000001
+
+gUnk_080102FE:: @ 080102FE
+	.incbin "baserom.gba", 0x0102FE, 0x0000005
+
+gUnk_08010303:: @ 08010303
+	.incbin "baserom.gba", 0x010303, 0x0000001
+
+gUnk_08010304:: @ 08010304
+	.incbin "baserom.gba", 0x010304, 0x0000001
+
+gUnk_08010305:: @ 08010305
+	.incbin "baserom.gba", 0x010305, 0x0000005
+
+gUnk_0801030A:: @ 0801030A
+	.incbin "baserom.gba", 0x01030A, 0x0000002
+
+gUnk_0801030C:: @ 0801030C
+	.incbin "baserom.gba", 0x01030C, 0x0000014
+
+gUnk_08010320:: @ 08010320
+	.incbin "baserom.gba", 0x010320, 0x0000090
+
+gUnk_080103B0:: @ 080103B0
+	.incbin "baserom.gba", 0x0103B0, 0x0000020
+
+gUnk_080103D0:: @ 080103D0
+	.incbin "baserom.gba", 0x0103D0, 0x0000028
+
+gUnk_080103F8:: @ 080103F8
+	.incbin "baserom.gba", 0x0103F8, 0x0000005
+
+gUnk_080103FD:: @ 080103FD
+	.incbin "baserom.gba", 0x0103FD, 0x0000003
+
+gUnk_08010400:: @ 08010400
+	.incbin "baserom.gba", 0x010400, 0x0000006
+
+gUnk_08010406:: @ 08010406
+	.incbin "baserom.gba", 0x010406, 0x0000001
+
+gUnk_08010407:: @ 08010407
+	.incbin "baserom.gba", 0x010407, 0x0000003
+
+gUnk_0801040A:: @ 0801040A
+	.incbin "baserom.gba", 0x01040A, 0x000001E
+
+gUnk_08010428:: @ 08010428
+	.incbin "baserom.gba", 0x010428, 0x000002C
+
+gUnk_08010454:: @ 08010454
+	.incbin "baserom.gba", 0x010454, 0x000002C
+
+gUnk_08010480:: @ 08010480
+	.incbin "baserom.gba", 0x010480, 0x0000020
+
+gUnk_080104A0:: @ 080104A0
+	.incbin "baserom.gba", 0x0104A0, 0x000004C
+
+gUnk_080104EC:: @ 080104EC
+	.incbin "baserom.gba", 0x0104EC, 0x0000013
+
+gUnk_080104FF:: @ 080104FF
+	.incbin "baserom.gba", 0x0104FF, 0x0000002
+
+gUnk_08010501:: @ 08010501
+	.incbin "baserom.gba", 0x010501, 0x0000001
+
+gUnk_08010502:: @ 08010502
+	.incbin "baserom.gba", 0x010502, 0x0000001
+
+gUnk_08010503:: @ 08010503
+	.incbin "baserom.gba", 0x010503, 0x0000007
+
+gUnk_0801050A:: @ 0801050A
+	.incbin "baserom.gba", 0x01050A, 0x0000001
+
+gUnk_0801050B:: @ 0801050B
+	.incbin "baserom.gba", 0x01050B, 0x000001B
+
+gUnk_08010526:: @ 08010526
+	.incbin "baserom.gba", 0x010526, 0x0000079
+
+gUnk_0801059F:: @ 0801059F
+	.incbin "baserom.gba", 0x01059F, 0x000002A
+
+gUnk_080105C9:: @ 080105C9
+	.incbin "baserom.gba", 0x0105C9, 0x0000032
+
+gUnk_080105FB:: @ 080105FB
+	.incbin "baserom.gba", 0x0105FB, 0x0000004
+
+gUnk_080105FF:: @ 080105FF
+	.incbin "baserom.gba", 0x0105FF, 0x0000001
+
+gUnk_08010600:: @ 08010600
+	.incbin "baserom.gba", 0x010600, 0x000000A
+
+gUnk_0801060A:: @ 0801060A
+	.incbin "baserom.gba", 0x01060A, 0x0000003
+
+gUnk_0801060D:: @ 0801060D
+	.incbin "baserom.gba", 0x01060D, 0x000000A
+
+gUnk_08010617:: @ 08010617
+	.incbin "baserom.gba", 0x010617, 0x0000005
+
+gUnk_0801061C:: @ 0801061C
+	.incbin "baserom.gba", 0x01061C, 0x0000028
+
+gUnk_08010644:: @ 08010644
+	.incbin "baserom.gba", 0x010644, 0x000000C
+
+gUnk_08010650:: @ 08010650
+	.incbin "baserom.gba", 0x010650, 0x0000024
+
+gUnk_08010674:: @ 08010674
+	.incbin "baserom.gba", 0x010674, 0x0000038
+
+gUnk_080106AC:: @ 080106AC
+	.incbin "baserom.gba", 0x0106AC, 0x0000054
+
+gUnk_08010700:: @ 08010700
+	.incbin "baserom.gba", 0x010700, 0x0000001
+
+gUnk_08010701:: @ 08010701
+	.incbin "baserom.gba", 0x010701, 0x0000004
+
+gUnk_08010705:: @ 08010705
+	.incbin "baserom.gba", 0x010705, 0x0000009
+
+gUnk_0801070E:: @ 0801070E
+	.incbin "baserom.gba", 0x01070E, 0x0000026
+
+gUnk_08010734:: @ 08010734
+	.incbin "baserom.gba", 0x010734, 0x0000060
+
+gUnk_08010794:: @ 08010794
+	.incbin "baserom.gba", 0x010794, 0x000003C
+
+gUnk_080107D0:: @ 080107D0
+	.incbin "baserom.gba", 0x0107D0, 0x000003A
+
+gUnk_0801080A:: @ 0801080A
+	.incbin "baserom.gba", 0x01080A, 0x0000001
+
+gUnk_0801080B:: @ 0801080B
+	.incbin "baserom.gba", 0x01080B, 0x000000A
+
+gUnk_08010815:: @ 08010815
+	.incbin "baserom.gba", 0x010815, 0x0000006
+
+gUnk_0801081B:: @ 0801081B
+	.incbin "baserom.gba", 0x01081B, 0x00000B5
+
+gUnk_080108D0:: @ 080108D0
+	.incbin "baserom.gba", 0x0108D0, 0x000002F
+
+gUnk_080108FF:: @ 080108FF
+	.incbin "baserom.gba", 0x0108FF, 0x000000D
+
+gUnk_0801090C:: @ 0801090C
+	.incbin "baserom.gba", 0x01090C, 0x0000003
+
+gUnk_0801090F:: @ 0801090F
+	.incbin "baserom.gba", 0x01090F, 0x0000008
+
+gUnk_08010917:: @ 08010917
+	.incbin "baserom.gba", 0x010917, 0x000004D
+
+gUnk_08010964:: @ 08010964
+	.incbin "baserom.gba", 0x010964, 0x000003C
+
+gUnk_080109A0:: @ 080109A0
+	.incbin "baserom.gba", 0x0109A0, 0x0000050
+
+gUnk_080109F0:: @ 080109F0
+	.incbin "baserom.gba", 0x0109F0, 0x0000006
+
+gUnk_080109F6:: @ 080109F6
+	.incbin "baserom.gba", 0x0109F6, 0x000001E
+
+gUnk_08010A14:: @ 08010A14
+	.incbin "baserom.gba", 0x010A14, 0x000000B
+
+gUnk_08010A1F:: @ 08010A1F
+	.incbin "baserom.gba", 0x010A1F, 0x0000019
+
+gUnk_08010A38:: @ 08010A38
+	.incbin "baserom.gba", 0x010A38, 0x0000024
+
+gUnk_08010A5C:: @ 08010A5C
+	.incbin "baserom.gba", 0x010A5C, 0x000003C
+
+gUnk_08010A98:: @ 08010A98
+	.incbin "baserom.gba", 0x010A98, 0x000004C
+
+gUnk_08010AE4:: @ 08010AE4
+	.incbin "baserom.gba", 0x010AE4, 0x0000020
+
+gUnk_08010B04:: @ 08010B04
+	.incbin "baserom.gba", 0x010B04, 0x0000064
+
+gUnk_08010B68:: @ 08010B68
+	.incbin "baserom.gba", 0x010B68, 0x000004C
+
+gUnk_08010BB4:: @ 08010BB4
+	.incbin "baserom.gba", 0x010BB4, 0x0000038
+
+gUnk_08010BEC:: @ 08010BEC
+	.incbin "baserom.gba", 0x010BEC, 0x000000D
+
+gUnk_08010BF9:: @ 08010BF9
+	.incbin "baserom.gba", 0x010BF9, 0x0000005
+
+gUnk_08010BFE:: @ 08010BFE
+	.incbin "baserom.gba", 0x010BFE, 0x000001C
+
+gUnk_08010C1A:: @ 08010C1A
+	.incbin "baserom.gba", 0x010C1A, 0x00000E9
+
+gUnk_08010D03:: @ 08010D03
+	.incbin "baserom.gba", 0x010D03, 0x00000FD
+
+gUnk_08010E00:: @ 08010E00
+	.incbin "baserom.gba", 0x010E00, 0x000000D
+
+gUnk_08010E0D:: @ 08010E0D
+	.incbin "baserom.gba", 0x010E0D, 0x00000F3
+
+gUnk_08010F00:: @ 08010F00
+	.incbin "baserom.gba", 0x010F00, 0x00000FF
+
+gUnk_08010FFF:: @ 08010FFF
+	.incbin "baserom.gba", 0x010FFF, 0x0000001
+
+gUnk_08011000:: @ 08011000
+	.incbin "baserom.gba", 0x011000, 0x0000001
+
+gUnk_08011001:: @ 08011001
+	.incbin "baserom.gba", 0x011001, 0x000001E
+
+gUnk_0801101F:: @ 0801101F
+	.incbin "baserom.gba", 0x01101F, 0x0000055
+
+gUnk_08011074:: @ 08011074
+	.incbin "baserom.gba", 0x011074, 0x000000F
+
+gUnk_08011083:: @ 08011083
+	.incbin "baserom.gba", 0x011083, 0x0000059
+
+gUnk_080110DC:: @ 080110DC
+	.incbin "baserom.gba", 0x0110DC, 0x000000C
+
+gUnk_080110E8:: @ 080110E8
+	.incbin "baserom.gba", 0x0110E8, 0x0000040
+
+gUnk_08011128:: @ 08011128
+	.incbin "baserom.gba", 0x011128, 0x00000A4
+
+gUnk_080111CC:: @ 080111CC
+	.incbin "baserom.gba", 0x0111CC, 0x000003C
+
+gUnk_08011208:: @ 08011208
+	.incbin "baserom.gba", 0x011208, 0x0000015
+
+gUnk_0801121D:: @ 0801121D
+	.incbin "baserom.gba", 0x01121D, 0x00000A7
+
+gUnk_080112C4:: @ 080112C4
+	.incbin "baserom.gba", 0x0112C4, 0x000004B
+
+gUnk_0801130F:: @ 0801130F
+	.incbin "baserom.gba", 0x01130F, 0x0000019
+
+gUnk_08011328:: @ 08011328
+	.incbin "baserom.gba", 0x011328, 0x00000DB
+
+gUnk_08011403:: @ 08011403
+	.incbin "baserom.gba", 0x011403, 0x00001CD
+
+gUnk_080115D0:: @ 080115D0
+	.incbin "baserom.gba", 0x0115D0, 0x0000038
+
+gUnk_08011608:: @ 08011608
+	.incbin "baserom.gba", 0x011608, 0x0000038
+
+gUnk_08011640:: @ 08011640
+	.incbin "baserom.gba", 0x011640, 0x0000068
+
+gUnk_080116A8:: @ 080116A8
+	.incbin "baserom.gba", 0x0116A8, 0x0000161
+
+gUnk_08011809:: @ 08011809
+	.incbin "baserom.gba", 0x011809, 0x0000033
+
+gUnk_0801183C:: @ 0801183C
+	.incbin "baserom.gba", 0x01183C, 0x0000098
+
+gUnk_080118D4:: @ 080118D4
+	.incbin "baserom.gba", 0x0118D4, 0x000005C
+
+gUnk_08011930:: @ 08011930
+	.incbin "baserom.gba", 0x011930, 0x0000010
+
+gUnk_08011940:: @ 08011940
+	.incbin "baserom.gba", 0x011940, 0x000000C
+
+gUnk_0801194C:: @ 0801194C
+	.incbin "baserom.gba", 0x01194C, 0x000000C
+
+gUnk_08011958:: @ 08011958
+	.incbin "baserom.gba", 0x011958, 0x000000C
+
+gUnk_08011964:: @ 08011964
+	.incbin "baserom.gba", 0x011964, 0x000004C
+
+gUnk_080119B0:: @ 080119B0
+	.incbin "baserom.gba", 0x0119B0, 0x0000028
+
+gUnk_080119D8:: @ 080119D8
+	.incbin "baserom.gba", 0x0119D8, 0x000000C
+
+gUnk_080119E4:: @ 080119E4
+	.incbin "baserom.gba", 0x0119E4, 0x000000C
+
+gUnk_080119F0:: @ 080119F0
+	.incbin "baserom.gba", 0x0119F0, 0x0000014
+
+gUnk_08011A04:: @ 08011A04
+	.incbin "baserom.gba", 0x011A04, 0x0000028
+
+gUnk_08011A2C:: @ 08011A2C
+	.incbin "baserom.gba", 0x011A2C, 0x0000038
+
+gUnk_08011A64:: @ 08011A64
+	.incbin "baserom.gba", 0x011A64, 0x0000080
+
+gUnk_08011AE4:: @ 08011AE4
+	.incbin "baserom.gba", 0x011AE4, 0x0000020
+
+gUnk_08011B04:: @ 08011B04
+	.incbin "baserom.gba", 0x011B04, 0x000001C
+
+gUnk_08011B20:: @ 08011B20
+	.incbin "baserom.gba", 0x011B20, 0x0000020
+
+gUnk_08011B40:: @ 08011B40
+	.incbin "baserom.gba", 0x011B40, 0x00000A4
+
+gUnk_08011BE4:: @ 08011BE4
+	.incbin "baserom.gba", 0x011BE4, 0x0000020
+
+gUnk_08011C04:: @ 08011C04
+	.incbin "baserom.gba", 0x011C04, 0x000004C
+
+gUnk_08011C50:: @ 08011C50
+	.incbin "baserom.gba", 0x011C50, 0x000002C
+
+gUnk_08011C7C:: @ 08011C7C
+	.incbin "baserom.gba", 0x011C7C, 0x00000AC
+
+gUnk_08011D28:: @ 08011D28
+	.incbin "baserom.gba", 0x011D28, 0x00000AC
+
+gUnk_08011DD4:: @ 08011DD4
+	.incbin "baserom.gba", 0x011DD4, 0x0000030
+
+gUnk_08011E04:: @ 08011E04
+	.incbin "baserom.gba", 0x011E04, 0x000007C
+
+gUnk_08011E80:: @ 08011E80
+	.incbin "baserom.gba", 0x011E80, 0x000008C
+
+gUnk_08011F0C:: @ 08011F0C
+	.incbin "baserom.gba", 0x011F0C, 0x000008C
+
+gUnk_08011F98:: @ 08011F98
+	.incbin "baserom.gba", 0x011F98, 0x000008C
+
+gUnk_08012024:: @ 08012024
+	.incbin "baserom.gba", 0x012024, 0x000006D
+
+gUnk_08012091:: @ 08012091
+	.incbin "baserom.gba", 0x012091, 0x000001F
+
+gUnk_080120B0:: @ 080120B0
+	.incbin "baserom.gba", 0x0120B0, 0x000003D
+
+gUnk_080120ED:: @ 080120ED
+	.incbin "baserom.gba", 0x0120ED, 0x000000E
+
+gUnk_080120FB:: @ 080120FB
+	.incbin "baserom.gba", 0x0120FB, 0x0000041
+
+gUnk_0801213C:: @ 0801213C
+	.incbin "baserom.gba", 0x01213C, 0x000008C
+
+gUnk_080121C8:: @ 080121C8
+	.incbin "baserom.gba", 0x0121C8, 0x0000038
+
+gUnk_08012200:: @ 08012200
+	.incbin "baserom.gba", 0x012200, 0x0000038
+
+gUnk_08012238:: @ 08012238
+	.incbin "baserom.gba", 0x012238, 0x0000038
+
+gUnk_08012270:: @ 08012270
+	.incbin "baserom.gba", 0x012270, 0x00000BC
+
+gUnk_0801232C:: @ 0801232C
+	.incbin "baserom.gba", 0x01232C, 0x0000034
+
+gUnk_08012360:: @ 08012360
+	.incbin "baserom.gba", 0x012360, 0x00000B0
+
+gUnk_08012410:: @ 08012410
+	.incbin "baserom.gba", 0x012410, 0x0000020
+
+gUnk_08012430:: @ 08012430
+	.incbin "baserom.gba", 0x012430, 0x0000050
+
+gUnk_08012480:: @ 08012480
+	.incbin "baserom.gba", 0x012480, 0x000027C
+
+
+.include "data/scripts/ezlo_angry.inc"
+
+gUnk_08012AB0:: @ 08012AB0
+	.incbin "baserom.gba", 0x012AB0, 0x00000F8
+
+gUnk_08012BA8:: @ 08012BA8
+	.incbin "baserom.gba", 0x012BA8, 0x0000050
+
+gUnk_08012BF8:: @ 08012BF8
+	.incbin "baserom.gba", 0x012BF8, 0x0000014
+
+gUnk_08012C0C:: @ 08012C0C
+	.incbin "baserom.gba", 0x012C0C, 0x000003C
+
+gUnk_08012C48:: @ 08012C48
+	.incbin "baserom.gba", 0x012C48, 0x0000050
+
+gUnk_08012C98:: @ 08012C98
+	.incbin "baserom.gba", 0x012C98, 0x0000040
+
+gUnk_08012CD8:: @ 08012CD8
+	.incbin "baserom.gba", 0x012CD8, 0x0000040
+
+gUnk_08012D18:: @ 08012D18
+	.incbin "baserom.gba", 0x012D18, 0x0000058
+
+gUnk_08012D70:: @ 08012D70
+	.incbin "baserom.gba", 0x012D70, 0x0000031
+
+gUnk_08012DA1:: @ 08012DA1
+	.incbin "baserom.gba", 0x012DA1, 0x000000F
+
+gUnk_08012DB0:: @ 08012DB0
+	.incbin "baserom.gba", 0x012DB0, 0x0000028
+
+gUnk_08012DD8:: @ 08012DD8
+	.incbin "baserom.gba", 0x012DD8, 0x0000048
+
+gUnk_08012E20:: @ 08012E20
+	.incbin "baserom.gba", 0x012E20, 0x0000024
+
+gUnk_08012E44:: @ 08012E44
+	.incbin "baserom.gba", 0x012E44, 0x0000044
+
+gUnk_08012E88:: @ 08012E88
+	.incbin "baserom.gba", 0x012E88, 0x0000038
+
+gUnk_08012EC0:: @ 08012EC0
+	.incbin "baserom.gba", 0x012EC0, 0x000004C
+
+gUnk_08012F0C:: @ 08012F0C
+	.incbin "baserom.gba", 0x012F0C, 0x00000F5
+
+gUnk_08013001:: @ 08013001
+	.incbin "baserom.gba", 0x013001, 0x0000002
+
+gUnk_08013003:: @ 08013003
+	.incbin "baserom.gba", 0x013003, 0x0000008
+
+gUnk_0801300B:: @ 0801300B
+	.incbin "baserom.gba", 0x01300B, 0x0000031
+
+gUnk_0801303C:: @ 0801303C
+	.incbin "baserom.gba", 0x01303C, 0x0000034
+
+gUnk_08013070:: @ 08013070
+	.incbin "baserom.gba", 0x013070, 0x0000011
+
+gUnk_08013081:: @ 08013081
+	.incbin "baserom.gba", 0x013081, 0x000000F
+
+gUnk_08013090:: @ 08013090
+	.incbin "baserom.gba", 0x013090, 0x0000084
+
+gUnk_08013114:: @ 08013114
+	.incbin "baserom.gba", 0x013114, 0x0000074
+
+gUnk_08013188:: @ 08013188
+	.incbin "baserom.gba", 0x013188, 0x0000024
+
+gUnk_080131AC:: @ 080131AC
+	.incbin "baserom.gba", 0x0131AC, 0x0000138
+
+gUnk_080132E4:: @ 080132E4
+	.incbin "baserom.gba", 0x0132E4, 0x000004C
+
+gUnk_08013330:: @ 08013330
+	.incbin "baserom.gba", 0x013330, 0x000001C
+
+gUnk_0801334C:: @ 0801334C
+	.incbin "baserom.gba", 0x01334C, 0x000002C
+
+gUnk_08013378:: @ 08013378
+	.incbin "baserom.gba", 0x013378, 0x000004C
+
+gUnk_080133C4:: @ 080133C4
+	.incbin "baserom.gba", 0x0133C4, 0x0000034
+
+gUnk_080133F8:: @ 080133F8
+	.incbin "baserom.gba", 0x0133F8, 0x00000E4
+
+gUnk_080134DC:: @ 080134DC
+	.incbin "baserom.gba", 0x0134DC, 0x00001FC
+
+gUnk_080136D8:: @ 080136D8
+	.incbin "baserom.gba", 0x0136D8, 0x0000048
+
+gUnk_08013720:: @ 08013720
+	.incbin "baserom.gba", 0x013720, 0x00000BA
+
+gUnk_080137DA:: @ 080137DA
+	.incbin "baserom.gba", 0x0137DA, 0x00000DA
+
+gUnk_080138B4:: @ 080138B4
+	.incbin "baserom.gba", 0x0138B4, 0x0000264
+
+gUnk_08013B18:: @ 08013B18
+	.incbin "baserom.gba", 0x013B18, 0x0000058
+
+gUnk_08013B70:: @ 08013B70
+	.incbin "baserom.gba", 0x013B70, 0x0000038
+
+gUnk_08013BA8:: @ 08013BA8
+	.incbin "baserom.gba", 0x013BA8, 0x0000040
+
+gUnk_08013BE8:: @ 08013BE8
+	.incbin "baserom.gba", 0x013BE8, 0x00000BC
+
+gUnk_08013CA4:: @ 08013CA4
+	.incbin "baserom.gba", 0x013CA4, 0x0000160
+
+gUnk_08013E04:: @ 08013E04
+	.incbin "baserom.gba", 0x013E04, 0x0000048
+
+gUnk_08013E4C:: @ 08013E4C
+	.incbin "baserom.gba", 0x013E4C, 0x0000024
+
+gUnk_08013E70:: @ 08013E70
+	.incbin "baserom.gba", 0x013E70, 0x0000024
+
+gUnk_08013E94:: @ 08013E94
+	.incbin "baserom.gba", 0x013E94, 0x000001C
+
+gUnk_08013EB0:: @ 08013EB0
+	.incbin "baserom.gba", 0x013EB0, 0x000001C
+
+gUnk_08013ECC:: @ 08013ECC
+	.incbin "baserom.gba", 0x013ECC, 0x000001C
+
+gUnk_08013EE8:: @ 08013EE8
+	.incbin "baserom.gba", 0x013EE8, 0x000001C
+
+gUnk_08013F04:: @ 08013F04
+	.incbin "baserom.gba", 0x013F04, 0x0000030
+
+gUnk_08013F34:: @ 08013F34
+	.incbin "baserom.gba", 0x013F34, 0x0000030
+
+gUnk_08013F64:: @ 08013F64
+	.incbin "baserom.gba", 0x013F64, 0x0000030
+
+gUnk_08013F94:: @ 08013F94
+	.incbin "baserom.gba", 0x013F94, 0x0000054
+
+gUnk_08013FE8:: @ 08013FE8
+	.incbin "baserom.gba", 0x013FE8, 0x000006C
+
+gUnk_08014054:: @ 08014054
+	.incbin "baserom.gba", 0x014054, 0x0000020
+
+gUnk_08014074:: @ 08014074
+	.incbin "baserom.gba", 0x014074, 0x0000020
+
+gUnk_08014094:: @ 08014094
+	.incbin "baserom.gba", 0x014094, 0x0000048
+
+gUnk_080140DC:: @ 080140DC
+	.incbin "baserom.gba", 0x0140DC, 0x000001C
+
+gUnk_080140F8:: @ 080140F8
+	.incbin "baserom.gba", 0x0140F8, 0x0000020
+
+gUnk_08014118:: @ 08014118
+	.incbin "baserom.gba", 0x014118, 0x000003C
+
+gUnk_08014154:: @ 08014154
+	.incbin "baserom.gba", 0x014154, 0x0000088
+
+gUnk_080141DC:: @ 080141DC
+	.incbin "baserom.gba", 0x0141DC, 0x0000034
+
+gUnk_08014210:: @ 08014210
+	.incbin "baserom.gba", 0x014210, 0x0000064
+
+gUnk_08014274:: @ 08014274
+	.incbin "baserom.gba", 0x014274, 0x000003C
+
+gUnk_080142B0:: @ 080142B0
+	.incbin "baserom.gba", 0x0142B0, 0x00000D4
+
+gUnk_08014384:: @ 08014384
+	.incbin "baserom.gba", 0x014384, 0x000003C
+
+gUnk_080143C0:: @ 080143C0
+	.incbin "baserom.gba", 0x0143C0, 0x0000042
+
+gUnk_08014402:: @ 08014402
+	.incbin "baserom.gba", 0x014402, 0x000004E
+
+gUnk_08014450:: @ 08014450
+	.incbin "baserom.gba", 0x014450, 0x00000BC
+
+gUnk_0801450C:: @ 0801450C
+	.incbin "baserom.gba", 0x01450C, 0x000003C
+
+gUnk_08014548:: @ 08014548
+	.incbin "baserom.gba", 0x014548, 0x0000058
+
+gUnk_080145A0:: @ 080145A0
+	.incbin "baserom.gba", 0x0145A0, 0x0000010
+
+gUnk_080145B0:: @ 080145B0
+	.incbin "baserom.gba", 0x0145B0, 0x0000038
+
+gUnk_080145E8:: @ 080145E8
+	.incbin "baserom.gba", 0x0145E8, 0x0000040
+
+gUnk_08014628:: @ 08014628
+	.incbin "baserom.gba", 0x014628, 0x00001DC
+
+gUnk_08014804:: @ 08014804
+	.incbin "baserom.gba", 0x014804, 0x00000EC
+
+gUnk_080148F0:: @ 080148F0
+	.incbin "baserom.gba", 0x0148F0, 0x0000068
+
+gUnk_08014958:: @ 08014958
+	.incbin "baserom.gba", 0x014958, 0x000003C
+
+gUnk_08014994:: @ 08014994
+	.incbin "baserom.gba", 0x014994, 0x0000038
+
+gUnk_080149CC:: @ 080149CC
+	.incbin "baserom.gba", 0x0149CC, 0x000005C
+
+gUnk_08014A28:: @ 08014A28
+	.incbin "baserom.gba", 0x014A28, 0x000002C
+
+gUnk_08014A54:: @ 08014A54
+	.incbin "baserom.gba", 0x014A54, 0x000002C
+
+gUnk_08014A80:: @ 08014A80
+	.incbin "baserom.gba", 0x014A80, 0x0000044
+
+gUnk_08014AC4:: @ 08014AC4
+	.incbin "baserom.gba", 0x014AC4, 0x0000070
+
+gUnk_08014B34:: @ 08014B34
+	.incbin "baserom.gba", 0x014B34, 0x00000F8
+
+gUnk_08014C2C:: @ 08014C2C
+	.incbin "baserom.gba", 0x014C2C, 0x0000068
+
+gUnk_08014C94:: @ 08014C94
+	.incbin "baserom.gba", 0x014C94, 0x0000048
+
+gUnk_08014CDC:: @ 08014CDC
+	.incbin "baserom.gba", 0x014CDC, 0x00000F0
+
+gUnk_08014DCC:: @ 08014DCC
+	.incbin "baserom.gba", 0x014DCC, 0x0000048
+
+gUnk_08014E14:: @ 08014E14
+	.incbin "baserom.gba", 0x014E14, 0x000003C
+
+gUnk_08014E50:: @ 08014E50
+	.incbin "baserom.gba", 0x014E50, 0x000007C
+
+gUnk_08014ECC:: @ 08014ECC
+	.incbin "baserom.gba", 0x014ECC, 0x000002C
+
+gUnk_08014EF8:: @ 08014EF8
+	.incbin "baserom.gba", 0x014EF8, 0x0000038
+
+gUnk_08014F30:: @ 08014F30
+	.incbin "baserom.gba", 0x014F30, 0x000008C
+
+gUnk_08014FBC:: @ 08014FBC
+	.incbin "baserom.gba", 0x014FBC, 0x0000045
+
+gUnk_08015001:: @ 08015001
+	.incbin "baserom.gba", 0x015001, 0x0000086
+
+gUnk_08015087:: @ 08015087
+	.incbin "baserom.gba", 0x015087, 0x0000068
+
+gUnk_080150EF:: @ 080150EF
+	.incbin "baserom.gba", 0x0150EF, 0x0000145
+
+gUnk_08015234:: @ 08015234
+	.incbin "baserom.gba", 0x015234, 0x0000080
+
+gUnk_080152B4:: @ 080152B4
+	.incbin "baserom.gba", 0x0152B4, 0x00000DC
+
+gUnk_08015390:: @ 08015390
+	.incbin "baserom.gba", 0x015390, 0x000005C
+
+gUnk_080153EC:: @ 080153EC
+	.incbin "baserom.gba", 0x0153EC, 0x0000120
+
+gUnk_0801550C:: @ 0801550C
+	.incbin "baserom.gba", 0x01550C, 0x000010C
+
+gUnk_08015618:: @ 08015618
+	.incbin "baserom.gba", 0x015618, 0x000006C
+
+gUnk_08015684:: @ 08015684
+	.incbin "baserom.gba", 0x015684, 0x000001C
+
+gUnk_080156A0:: @ 080156A0
+	.incbin "baserom.gba", 0x0156A0, 0x00000B4
+
+gUnk_08015754:: @ 08015754
+	.incbin "baserom.gba", 0x015754, 0x0000058
+
+gUnk_080157AC:: @ 080157AC
+	.incbin "baserom.gba", 0x0157AC, 0x000014C
+
+gUnk_080158F8:: @ 080158F8
+	.incbin "baserom.gba", 0x0158F8, 0x0000040
+
+gUnk_08015938:: @ 08015938
+	.incbin "baserom.gba", 0x015938, 0x0000020
+
+gUnk_08015958:: @ 08015958
+	.incbin "baserom.gba", 0x015958, 0x000016C
+
+gUnk_08015AC4:: @ 08015AC4
+	.incbin "baserom.gba", 0x015AC4, 0x0000050
+
+gUnk_08015B14:: @ 08015B14
+	.incbin "baserom.gba", 0x015B14, 0x0000020
+
+gUnk_08015B34:: @ 08015B34
+	.incbin "baserom.gba", 0x015B34, 0x0000050
+
+gUnk_08015B84:: @ 08015B84
+	.incbin "baserom.gba", 0x015B84, 0x0000024
+
+gUnk_08015BA8:: @ 08015BA8
+	.incbin "baserom.gba", 0x015BA8, 0x0000040
+
+gUnk_08015BE8:: @ 08015BE8
+	.incbin "baserom.gba", 0x015BE8, 0x00000EC
+
+gUnk_08015CD4:: @ 08015CD4
+	.incbin "baserom.gba", 0x015CD4, 0x000011C
+
+gUnk_08015DF0:: @ 08015DF0
+	.incbin "baserom.gba", 0x015DF0, 0x0000068
+
+gUnk_08015E58:: @ 08015E58
+	.incbin "baserom.gba", 0x015E58, 0x00000B0
+
+gUnk_08015F08:: @ 08015F08
+	.incbin "baserom.gba", 0x015F08, 0x0000034
+
+gUnk_08015F3C:: @ 08015F3C
+	.incbin "baserom.gba", 0x015F3C, 0x0000068
+
+gUnk_08015FA4:: @ 08015FA4
+	.incbin "baserom.gba", 0x015FA4, 0x000001C
+
+gUnk_08015FC0:: @ 08015FC0
+	.incbin "baserom.gba", 0x015FC0, 0x0000061
+
+gUnk_08016021:: @ 08016021
+	.incbin "baserom.gba", 0x016021, 0x000000F
+
+.include "data/scripts/npc4e_fusion.inc"
+
+gUnk_0801606C:: @ 0801606C
+	.incbin "baserom.gba", 0x01606C, 0x000003C
+
+gUnk_080160A8:: @ 080160A8
+	.incbin "baserom.gba", 0x0160A8, 0x0000042
+
+gUnk_080160EA:: @ 080160EA
+	.incbin "baserom.gba", 0x0160EA, 0x0000052
+
+gUnk_0801613C:: @ 0801613C
+	.incbin "baserom.gba", 0x01613C, 0x0000054
+
+gUnk_08016190:: @ 08016190
+	.incbin "baserom.gba", 0x016190, 0x0000058
+
+gUnk_080161E8:: @ 080161E8
+	.incbin "baserom.gba", 0x0161E8, 0x0000174
+
+gUnk_0801635C:: @ 0801635C
+	.incbin "baserom.gba", 0x01635C, 0x0000021
+
+gUnk_0801637D:: @ 0801637D
+	.incbin "baserom.gba", 0x01637D, 0x0000007
+
+gUnk_08016384:: @ 08016384
+	.incbin "baserom.gba", 0x016384, 0x0000084
+
+gUnk_08016408:: @ 08016408
+	.incbin "baserom.gba", 0x016408, 0x00001F0
+
+gUnk_080165F8:: @ 080165F8
+	.incbin "baserom.gba", 0x0165F8, 0x0000014
+
+gUnk_0801660C:: @ 0801660C
+	.incbin "baserom.gba", 0x01660C, 0x000001C
+
+gUnk_08016628:: @ 08016628
+	.incbin "baserom.gba", 0x016628, 0x000001C
+
+gUnk_08016644:: @ 08016644
+	.incbin "baserom.gba", 0x016644, 0x0000028
+
+gUnk_0801666C:: @ 0801666C
+	.incbin "baserom.gba", 0x01666C, 0x000004C
+
+gUnk_080166B8:: @ 080166B8
+	.incbin "baserom.gba", 0x0166B8, 0x0000044
+
+gUnk_080166FC:: @ 080166FC
+	.incbin "baserom.gba", 0x0166FC, 0x000009C
+
+gUnk_08016798:: @ 08016798
+	.incbin "baserom.gba", 0x016798, 0x00000AC
+
+gUnk_08016844:: @ 08016844
+	.incbin "baserom.gba", 0x016844, 0x000009C
+
+gUnk_080168E0:: @ 080168E0
+	.incbin "baserom.gba", 0x0168E0, 0x0000014
+
+gUnk_080168F4:: @ 080168F4
+	.incbin "baserom.gba", 0x0168F4, 0x0000090
diff --git a/data/scripts/ezlo_angry.s b/data/scripts/ezlo_angry.inc
similarity index 99%
rename from data/scripts/ezlo_angry.s
rename to data/scripts/ezlo_angry.inc
index b8a3f705..d7a8a893 100644
--- a/data/scripts/ezlo_angry.s
+++ b/data/scripts/ezlo_angry.inc
@@ -1,5 +1,3 @@
-.include "asm/macros/script.inc"
-
 SCRIPT_START gUnk_080126FC
 sub_0807E004
 sub_0807EBC0 0x0040
diff --git a/data/scripts/npc4e_fusion.inc b/data/scripts/npc4e_fusion.inc
new file mode 100644
index 00000000..68262d0e
--- /dev/null
+++ b/data/scripts/npc4e_fusion.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08016030
+sub_0807E004 
+sub_0807E40C 0x0009
+sub_0807E050 0x002a
+sub_0807E014 
+sub_0807E6AC 0x00000001
+sub_0807EF80 0x0010
+sub_0807E680 0x003c
+sub_0807EBC0 0x0020
+sub_0807ECF4 0x0080
+sub_0807E680 0x001e
+sub_0807EF80 0x0010
+sub_0807E5F8 0x0000008
+.short 0xffff
+.short 0x0c6a
+.short 0xfff0
+.short 0x0000
+.short 0xffff
+.short 0x0000
\ No newline at end of file
diff --git a/linker.ld b/linker.ld
index 0b0082c8..c8fbcd84 100644
--- a/linker.ld
+++ b/linker.ld
@@ -295,11 +295,9 @@ SECTIONS {
         asm/code_080043E8.o(.text);
         data/data_08007DF4.o(.rodata);
         asm/code_0800857C.o(.text);
-        data/scripts/ezlo_angry.o(.rodata);
-        src/scripts/ezlo_angry.o(.rodata);
-        asm/code_08012AB0.o(.text);
-        src/scripts/npc4e_fusion.o(.rodata);
-        asm/code_0801606C.o(.text);
+        /* scripts */
+        data/scripts.o(.text);
+        asm/code_08016984.o(.text);
         asm/sub_08016AE4.o(.text);
 
 
diff --git a/src/scripts/ezlo_angry.c b/src/scripts/ezlo_angry.c
deleted file mode 100644
index ffaab375..00000000
--- a/src/scripts/ezlo_angry.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "scriptMacros.h"
-#include "functions.h"
-#include "script.h"
-extern void sub_0807F3C8(Entity*, ScriptExecutionContext*);
-extern void sub_0807F5B0(Entity*, ScriptExecutionContext*);
-extern void sub_0806D96C(Entity*, ScriptExecutionContext*);
-extern void sub_0806D944(Entity*, ScriptExecutionContext*);
-extern void sub_0806D908(Entity*, ScriptExecutionContext*);
-extern void sub_0807F9A4(Entity*, ScriptExecutionContext*);
-extern void sub_0807DF28(Entity*, ScriptExecutionContext*);
-extern void sub_0807DF50(Entity*, ScriptExecutionContext*);
-extern void sub_0806D8A0(Entity*, ScriptExecutionContext*);
-extern void sub_0806D9A4(Entity*, ScriptExecutionContext*);
-// clang-format off
-//START_SCRIPT(gUnk_080126FC)
-asm(".section .rodata");
-
-// clang-format on
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index bb0dbce3..5066ce01 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -72,11 +72,11 @@ commands = [
     {'fun': 'sub_0807E280'},
     {'fun': 'sub_0807E2A8', 'params': 's'},
     {'fun': 'sub_0807E2E4', 'params': ''},
-    {'fun': 'sub_0807E30C'},
+    {'fun': 'sub_0807E30C', 'params': ''},
     {'fun': 'sub_0807E390'},
     {'fun': 'sub_0807E3BC'},
     {'fun': 'sub_0807E3E8'},
-    {'fun': 'sub_0807E40C'},
+    {'fun': 'sub_0807E40C', 'params': 's'},
     {'fun': 'sub_0807E42C'},
     {'fun': 'sub_0807E48C'},
     {'fun': 'sub_0807E4CC'},
@@ -92,14 +92,14 @@ commands = [
     {'fun': 'sub_0807E628'},
     {'fun': 'sub_0807E634'},
     {'fun': 'sub_0807E644'},
-    {'fun': 'sub_0807E650'},
+    {'fun': 'sub_0807E650', 'params': 's'},
     {'fun': 'sub_0807E65C'},
     {'fun': 'sub_0807E668'},
     {'fun': 'sub_0807E674'},
     {'fun': 'sub_0807E680', 'params': 's'},
     {'fun': 'sub_0807E690'},
     {'fun': 'sub_0807E6AC', 'params': 'w'},
-    {'fun': 'sub_0807E6DC'},
+    {'fun': 'sub_0807E6DC', 'params': ''},
     {'fun': 'sub_0807E700'},
     {'fun': 'sub_0807E72C'},
     {'fun': 'sub_0807E75C'},
@@ -128,25 +128,25 @@ commands = [
     {'fun': 'sub_0807E914'},
     {'fun': 'sub_0807E924'},
     {'fun': 'sub_0807E930', 'params': 's'},
-    {'fun': 'sub_0807E944'},
+    {'fun': 'sub_0807E944', 'params': ''},
     {'fun': 'sub_0807E974'},
     {'fun': 'sub_0807E9D4', 'params': ''},
     {'fun': 'sub_0807E9DC', 'params': ''},
     {'fun': 'sub_0807E9E4'},
-    {'fun': 'sub_0807E9F0'},
-    {'fun': 'sub_0807EA4C'},
+    {'fun': 'sub_0807E9F0', 'params': ''},
+    {'fun': 'sub_0807EA4C', 'params': ''},
     {'fun': 'sub_0807EA88'},
     {'fun': 'sub_0807EA94', 'params': ''},
-    {'fun': 'sub_0807EAB4'},
+    {'fun': 'sub_0807EAB4', 'params': 's'},
     {'fun': 'sub_0807EAC0'},
     {'fun': 'sub_0807EAD0', 'params': 'ss'},
     {'fun': 'sub_0807EAF0'},
     {'fun': 'sub_0807EB18'},
     {'fun': 'sub_0807EB28', 'params': 's'},
     {'fun': 'sub_0807EB38'},
-    {'fun': 'sub_0807EB44'},
+    {'fun': 'sub_0807EB44', 'params': 's'},
     {'fun': 'sub_0807EB4C'},
-    {'fun': 'sub_0807EB74'},
+    {'fun': 'sub_0807EB74', 'params': ''},
     {'fun': 'sub_0807EB8C', 'params': ''},
     {'fun': 'sub_0807EBA8'},
     {'fun': 'sub_0807EBB0'},
@@ -160,9 +160,9 @@ commands = [
     {'fun': 'sub_0807EC64'},
     {'fun': 'sub_0807EC94'},
     {'fun': 'sub_0807ECC4'},
-    {'fun': 'sub_0807ECF4'},
+    {'fun': 'sub_0807ECF4', 'params': 's'},
     {'fun': 'sub_0807ED24'},
-    {'fun': 'sub_0807EDD4'},
+    {'fun': 'sub_0807EDD4', 'params': 'ss'},
     {'fun': 'sub_0807EE04'},
     {'fun': 'sub_0807EE30', 'params': ''},
     {'fun': 'sub_0807EEB4'},
@@ -177,14 +177,14 @@ commands = [
     {'fun': 'sub_0807EFF4'},
     {'fun': 'sub_0807F004'},
     {'fun': 'sub_0807F010'},
-    {'fun': 'sub_0807F034'},
+    {'fun': 'sub_0807F034', 'params': 's'},
     {'fun': 'sub_0807F050'},
     {'fun': 'sub_0807F060'},
     {'fun': 'sub_0807F078'},
     {'fun': 'sub_0807F088'},
-    {'fun': 'sub_0807F098'},
+    {'fun': 'sub_0807F098', 'params': ''},
     {'fun': 'sub_0807F0A4'},
-    {'fun': 'sub_0807F0B4'},
+    {'fun': 'sub_0807F0B4', 'params': 's'},
     {'fun': 'sub_0807F0C8'}
 ]
 
@@ -212,13 +212,13 @@ parameters = {
         'length': 2,
         'param': 'a,b',
         'expr': '	.short \\a\n	.short \\b',
-        'read': lambda ctx: ','.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
     },
     'ww': {
         'length': 4,
         'param': 'a,b',
         'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: ','.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
+        'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
     },
 }
 
@@ -248,7 +248,7 @@ def ExecuteScriptCommandSet(ctx: Context):
         raise Exception('Parameter configuration ' + command['params'] + ' not defined')
     params = parameters[command['params']]
     if unk_06-1 != params['length']:
-        raise Exception('Call with ' + (unk_06-1) +' length, while length of ' + params['length']+' defined')
+        raise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
 
 
     print(command['fun'] + ' ' + params['read'](ctx))
@@ -270,7 +270,7 @@ def disassemble_script(input_data):
 
     # Print rest (did not manage to get there)
 
-    print(',\n'.join(barray_to_u16_hex(ctx.data[ctx.ptr:])))
+    print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
     
 
 def generate_macros():
@@ -279,7 +279,7 @@ def generate_macros():
 
     print('.macro SCRIPT_START name')
     print('	.globl \\name')
-    print('	.section .rodata')
+    print('	.section .text')
     print('\\name:')
     print('.endm')
 

From d9034ef09af4d9cfba702911e55c7bfbf3bee2be Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 22:09:44 +0100
Subject: [PATCH 08/46] Create parser that resolves the .incbin macros

---
 tools/script_disassembler/incbin_parser.py    |  47 ++++
 .../script_disassembler.py                    | 224 +++++++++---------
 2 files changed, 160 insertions(+), 111 deletions(-)
 create mode 100644 tools/script_disassembler/incbin_parser.py

diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py
new file mode 100644
index 00000000..f20543a9
--- /dev/null
+++ b/tools/script_disassembler/incbin_parser.py
@@ -0,0 +1,47 @@
+# This python script reads the script.s file which contains all the .incbin macros
+# Then it fetches the corresponding data of the baserom, o
+TMC_FOLDER='../..'
+
+import subprocess
+from script_disassembler import disassemble_script
+
+def main():
+    # read baserom data
+    with open(f'{TMC_FOLDER}/baserom.gba', 'rb') as baserom:
+        baserom_data = bytearray(baserom.read())
+
+    # read scripts.s with incbins
+    with open(f'{TMC_FOLDER}/data/scripts.s', 'r') as scripts:
+
+        while True:
+            line = scripts.readline()
+
+            if not line:
+                # end of file
+                break
+
+            if ':: @' in line: # this might be a label
+                incbin_line = scripts.readline()
+
+                if '.incbin' in incbin_line: # found a label with incbin
+                    label = line.split('::')[0]
+                    (_, start, end) = incbin_line.split(',')
+                    start = int(start, 16)
+                    end = int(end, 16)
+                    
+                    # read data from rom
+                    data = baserom_data[start:start+end]
+
+                    print(f'DISASM {label}')
+                    disassemble_script(data)
+
+                    # print new include label
+                    print(f'.include "data/scripts/{label}.inc"')
+                else:
+                    print(line, end='')
+                    print(incbin_line, end='')
+            else:
+                print(line, end='')
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 5066ce01..df2b54dc 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -26,26 +26,6 @@ def barray_to_u32_hex(barray):
     integers = struct.unpack('I'*count, barray)
     return [u32_to_hex(x) for x in integers]
 
-"""
-def GetNextScriptCommandWordAfterCommandMetadata(ctx):
-    return struct.unpack('I', ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
-
-
-def sub_0807E10C(ctx):
-    meta = GetNextScriptCommandWordAfterCommandMetadata(ctx)
-    print('function', hex(meta))
-
-
-def sub_0807E5F8(ctx):
-    curPtr = start + ctx.ptr
-    print('current', hex(curPtr))
-    # gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
-    meta = GetNextScriptCommandWordAfterCommandMetadata(ctx)
-    print('meta', meta)
-    newPtr = curPtr | meta
-    print('Start next script at: ', hex(newPtr))
-"""
-
 commands = [
     {'fun': 'nullsub_507', 'params': ''},
     {'fun': 'sub_0807E004', 'params': '', 'name': 'start executing scripts'},
@@ -65,127 +45,127 @@ commands = [
     {'fun': 'sub_0807E188', 'params': 's'},
     {'fun': 'sub_0807E1D8', 'params': 's'},
     {'fun': 'sub_0807E4AC', 'params': 's'},
-    {'fun': 'sub_0807E200'},
-    {'fun': 'sub_0807E220'},
-    {'fun': 'sub_0807E240'},
+    {'fun': 'sub_0807E200', 'params': 'w'},
+    {'fun': 'sub_0807E220', 'params': 'ss'},
+    {'fun': 'sub_0807E240', 'params': 's'},
     {'fun': 'sub_0807E260', 'params': 's'},
-    {'fun': 'sub_0807E280'},
+    {'fun': 'sub_0807E280', 'params': 'sss'},
     {'fun': 'sub_0807E2A8', 'params': 's'},
     {'fun': 'sub_0807E2E4', 'params': ''},
     {'fun': 'sub_0807E30C', 'params': ''},
-    {'fun': 'sub_0807E390'},
-    {'fun': 'sub_0807E3BC'},
-    {'fun': 'sub_0807E3E8'},
+    {'fun': 'sub_0807E390', 'params': 's'},
+    {'fun': 'sub_0807E3BC', 'params': 's'},
+    {'fun': 'sub_0807E3E8', 'params': ''},
     {'fun': 'sub_0807E40C', 'params': 's'},
-    {'fun': 'sub_0807E42C'},
-    {'fun': 'sub_0807E48C'},
-    {'fun': 'sub_0807E4CC'},
-    {'fun': 'sub_0807E4EC'},
-    {'fun': 'sub_0807E514'},
-    {'fun': 'sub_0807E538'},
-    {'fun': 'sub_0807E564'},
-    {'fun': 'sub_0807E584'},
-    {'fun': 'sub_0807E5A0'},
-    {'fun': 'sub_0807E5CC'},
+    {'fun': 'sub_0807E42C', 'params': 'ss'},
+    {'fun': 'sub_0807E48C', 'params': 's'},
+    {'fun': 'sub_0807E4CC', 'params': 'w'},
+    {'fun': 'sub_0807E4EC', 'params': 'w'},
+    {'fun': 'sub_0807E514', 'params': 's'},
+    {'fun': 'sub_0807E538', 'params':'w'},
+    {'fun': 'sub_0807E564', 'params': ''},
+    {'fun': 'sub_0807E584', 'params': ''},
+    {'fun': 'sub_0807E5A0', 'params': 's'},
+    {'fun': 'sub_0807E5CC', 'params': 's'},
     {'fun': 'sub_0807E5F8', 'params': 'w'},# 'exec': sub_0807E5F8},
-    {'fun': 'sub_0807E610'},
-    {'fun': 'sub_0807E628'},
-    {'fun': 'sub_0807E634'},
-    {'fun': 'sub_0807E644'},
+    {'fun': 'sub_0807E610', 'params': 'w'},
+    {'fun': 'sub_0807E628', 'params': 's'},
+    {'fun': 'sub_0807E634', 'params': 'ss'},
+    {'fun': 'sub_0807E644', 'params': 's'},
     {'fun': 'sub_0807E650', 'params': 's'},
-    {'fun': 'sub_0807E65C'},
-    {'fun': 'sub_0807E668'},
-    {'fun': 'sub_0807E674'},
+    {'fun': 'sub_0807E65C', 'params': 's'},
+    {'fun': 'sub_0807E668', 'params': 's'},
+    {'fun': 'sub_0807E674', 'params': 's'},
     {'fun': 'sub_0807E680', 'params': 's'},
-    {'fun': 'sub_0807E690'},
+    {'fun': 'sub_0807E690', 'params': 'w'},
     {'fun': 'sub_0807E6AC', 'params': 'w'},
     {'fun': 'sub_0807E6DC', 'params': ''},
-    {'fun': 'sub_0807E700'},
-    {'fun': 'sub_0807E72C'},
-    {'fun': 'sub_0807E75C'},
-    {'fun': 'sub_0807E778'},
-    {'fun': 'sub_0807E788'},
-    {'fun': 'sub_0807E79C'},
-    {'fun': 'nullsub_508'},
-    {'fun': 'sub_0807E7B0'},
-    {'fun': 'sub_0807E7C4'},
-    {'fun': 'sub_0807E7D8'},
-    {'fun': 'sub_0807E7EC'},
-    {'fun': 'sub_0807E800'},
-    {'fun': 'sub_0807E80C'},
-    {'fun': 'sub_0807E858'},
+    {'fun': 'sub_0807E700', 'params': ''},
+    {'fun': 'sub_0807E72C', 'params': ''},
+    {'fun': 'sub_0807E75C', 'params': ''},
+    {'fun': 'sub_0807E778', 'params': ''},
+    {'fun': 'sub_0807E788', 'params': 'w'},
+    {'fun': 'sub_0807E79C', 'params': ''},
+    {'fun': 'nullsub_508', 'params': 's'},
+    {'fun': 'sub_0807E7B0', 'params': ''},
+    {'fun': 'sub_0807E7C4', 'params': ''},
+    {'fun': 'sub_0807E7D8', 'params': ''},
+    {'fun': 'sub_0807E7EC', 'params': ''},
+    {'fun': 'sub_0807E800', 'params': 'w'},
+    {'fun': 'sub_0807E80C', 'params': 'w'},
+    {'fun': 'sub_0807E858', 'params': 's'},
     {'fun': 'sub_0807E864', 'params': ''},
     {'fun': 'sub_0807E878', 'params': ''},
-    {'fun': 'sub_0807E888'},
-    {'fun': 'sub_0807E898'},
+    {'fun': 'sub_0807E888', 'params': ''},
+    {'fun': 'sub_0807E898', 'params': 'w'},
     {'fun': 'sub_0807E8C4', 'params': 'w'},
-    {'fun': 'sub_0807E8D4'},
+    {'fun': 'sub_0807E8D4', 'params': 's'},
     {'fun': 'sub_0807E8E4_0', 'params': ''}, # duplicate
     {'fun': 'sub_0807E8E4_1', 'params': ''}, # duplicate
     {'fun': 'sub_0807E8E4_2', 'params': ''}, # duplicate
     {'fun': 'sub_0807E8E4_3', 'params': ''}, # duplicate
-    {'fun': 'sub_0807E908'},
-    {'fun': 'sub_0807E914'},
-    {'fun': 'sub_0807E924'},
+    {'fun': 'sub_0807E908', 'params': 's'},
+    {'fun': 'sub_0807E914', 'params': 'w'},
+    {'fun': 'sub_0807E924', 'params': ''},
     {'fun': 'sub_0807E930', 'params': 's'},
     {'fun': 'sub_0807E944', 'params': ''},
-    {'fun': 'sub_0807E974'},
+    {'fun': 'sub_0807E974', 'params': 's'},
     {'fun': 'sub_0807E9D4', 'params': ''},
     {'fun': 'sub_0807E9DC', 'params': ''},
-    {'fun': 'sub_0807E9E4'},
+    {'fun': 'sub_0807E9E4', 'params': 's'},
     {'fun': 'sub_0807E9F0', 'params': ''},
     {'fun': 'sub_0807EA4C', 'params': ''},
-    {'fun': 'sub_0807EA88'},
+    {'fun': 'sub_0807EA88', 'params': 's'},
     {'fun': 'sub_0807EA94', 'params': ''},
     {'fun': 'sub_0807EAB4', 'params': 's'},
-    {'fun': 'sub_0807EAC0'},
+    {'fun': 'sub_0807EAC0', 'params': 's'},
     {'fun': 'sub_0807EAD0', 'params': 'ss'},
-    {'fun': 'sub_0807EAF0'},
-    {'fun': 'sub_0807EB18'},
+    {'fun': 'sub_0807EAF0', 'params': 'w'},
+    {'fun': 'sub_0807EB18', 'params': ''},
     {'fun': 'sub_0807EB28', 'params': 's'},
-    {'fun': 'sub_0807EB38'},
+    {'fun': 'sub_0807EB38', 'params': ''},
     {'fun': 'sub_0807EB44', 'params': 's'},
-    {'fun': 'sub_0807EB4C'},
+    {'fun': 'sub_0807EB4C', 'params': 'ss'},
     {'fun': 'sub_0807EB74', 'params': ''},
     {'fun': 'sub_0807EB8C', 'params': ''},
-    {'fun': 'sub_0807EBA8'},
-    {'fun': 'sub_0807EBB0'},
+    {'fun': 'sub_0807EBA8', 'params': 's'},
+    {'fun': 'sub_0807EBB0', 'params': 's'},
     {'fun': 'sub_0807EBC0', 'params': 's'},
-    {'fun': 'sub_0807EBC8'},
-    {'fun': 'sub_0807EBD8'},
-    {'fun': 'sub_0807EBF4'},
-    {'fun': 'sub_0807EC08'},
-    {'fun': 'nullsub_509'},
+    {'fun': 'sub_0807EBC8', 'params': 'w'},
+    {'fun': 'sub_0807EBD8', 'params': 'w'},
+    {'fun': 'sub_0807EBF4', 'params': 'ss'},
+    {'fun': 'sub_0807EC08', 'params': ''},
+    {'fun': 'nullsub_509', 'params': ''},
     {'fun': 'sub_0807EC1C', 'params': 's'},
-    {'fun': 'sub_0807EC64'},
-    {'fun': 'sub_0807EC94'},
-    {'fun': 'sub_0807ECC4'},
+    {'fun': 'sub_0807EC64', 'params': 's'},
+    {'fun': 'sub_0807EC94', 'params': 's'},
+    {'fun': 'sub_0807ECC4', 'params': 's'},
     {'fun': 'sub_0807ECF4', 'params': 's'},
-    {'fun': 'sub_0807ED24'},
+    {'fun': 'sub_0807ED24', 'params': 'sss'},
     {'fun': 'sub_0807EDD4', 'params': 'ss'},
-    {'fun': 'sub_0807EE04'},
+    {'fun': 'sub_0807EE04', 'params': 'ss'},
     {'fun': 'sub_0807EE30', 'params': ''},
-    {'fun': 'sub_0807EEB4'},
-    {'fun': 'sub_0807EEF4'},
-    {'fun': 'sub_0807EF3C'},
+    {'fun': 'sub_0807EEB4', 'params': ''},
+    {'fun': 'sub_0807EEF4', 'params': ''},
+    {'fun': 'sub_0807EF3C', 'params': 'ss'},
     {'fun': 'sub_0807EF80', 'params': 's'},
-    {'fun': 'sub_0807EF90'},
-    {'fun': 'sub_0807EFA0'},
+    {'fun': 'sub_0807EF90', 'params': 's'},
+    {'fun': 'sub_0807EFA0', 'params': 's'},
     {'fun': 'sub_0807EFAC', 'params': 's'},
-    {'fun': 'sub_0807EFD4'},
+    {'fun': 'sub_0807EFD4', 'params': 'w'},
     {'fun': 'sub_0807EFE4', 'params': ''},
-    {'fun': 'sub_0807EFF4'},
-    {'fun': 'sub_0807F004'},
-    {'fun': 'sub_0807F010'},
+    {'fun': 'sub_0807EFF4', 'params': 's'},
+    {'fun': 'sub_0807F004', 'params': 's'},
+    {'fun': 'sub_0807F010', 'params': 's'},
     {'fun': 'sub_0807F034', 'params': 's'},
-    {'fun': 'sub_0807F050'},
-    {'fun': 'sub_0807F060'},
-    {'fun': 'sub_0807F078'},
-    {'fun': 'sub_0807F088'},
+    {'fun': 'sub_0807F050', 'params': 's'},
+    {'fun': 'sub_0807F060', 'params': 's'},
+    {'fun': 'sub_0807F078', 'params': 'ss'},
+    {'fun': 'sub_0807F088', 'params': 's'},
     {'fun': 'sub_0807F098', 'params': ''},
-    {'fun': 'sub_0807F0A4'},
+    {'fun': 'sub_0807F0A4', 'params': ''},
     {'fun': 'sub_0807F0B4', 'params': 's'},
-    {'fun': 'sub_0807F0C8'}
+    {'fun': 'sub_0807F0C8', 'params': 'ss'}
 ]
 
 # definitions for parameters
@@ -220,6 +200,12 @@ parameters = {
         'expr': '	.word \\a\n	.word \\b',
         'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
     },
+    'sss': {
+        'length': 3,
+        'param': 'a,b,c',
+        'expr': '	.short \\a\n	.short \\b\n	.short \\c',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8]))
+    },
 }
 
 
@@ -229,14 +215,20 @@ def ExecuteScriptCommandSet(ctx: Context):
         return 0
 
     unk_06 = cmd >> 0xA
+    if unk_06 == 0:
+        # TODO error
+        return 0
     operationId = cmd & 0x3FF
-    #print(cmd)
-    #print('advance by', unk_06)
-    #print('command id', operationId)
+    if operationId >= len(commands):
+        print('ERR: NO CMD')
+        # TODO error
+        return 0
     command = commands[operationId]
-    #print(command)
     param_length = unk_06 - 1 
     if unk_06 > 1:
+        if ctx.ptr+2*unk_06 >= len(ctx.data):
+            # TODO raise Exception(f'Not enough data to fetch {unk_06-1} params')
+            return 0
         meta = struct.unpack(
             'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06])
         #print('meta', meta)
@@ -248,7 +240,11 @@ def ExecuteScriptCommandSet(ctx: Context):
         raise Exception('Parameter configuration ' + command['params'] + ' not defined')
     params = parameters[command['params']]
     if unk_06-1 != params['length']:
-        raise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
+        # TODOraise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
+        # TEMPORARY WORKAROUND:
+        print(ctx.ptr, unk_06, cmd)
+        ctx.ptr += unk_06*2
+        return 1
 
 
     print(command['fun'] + ' ' + params['read'](ctx))
@@ -258,19 +254,24 @@ def ExecuteScriptCommandSet(ctx: Context):
     return 1
 
 
-def disassemble_script(input_data):
-    input_bytes = bytearray.fromhex(input_data)
+def disassemble_script(input_bytes):
 
     ctx = Context(0, input_bytes)
 
     while True:
+        if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id)
+            break
         if not ExecuteScriptCommandSet(ctx):
             break
 
 
     # Print rest (did not manage to get there)
-
-    print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
+    if ctx.ptr < len(ctx.data):
+        if (len(ctx.data) - ctx.ptr) % 2 != 0:
+            print(ctx.data[ctx.ptr:])
+            # TODO error
+            return
+        print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
     
 
 def generate_macros():
@@ -316,6 +317,7 @@ def main():
     if input_data.strip() == 'macros':
         generate_macros()
         return
-    disassemble_script(input_data)
+    disassemble_script(bytearray.fromhex(input_data))
     
-main()
\ No newline at end of file
+if __name__ == '__main__':
+    main()
\ No newline at end of file

From 461ab7759588c36a0dffd1ba91b3853bb402fc42 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 23:21:37 +0100
Subject: [PATCH 09/46] Add parameters for all the commands

---
 data/scripts/gUnk_0800A8D4.inc                | 14 ++++++
 tools/script_disassembler/incbin_parser.py    |  9 +++-
 .../script_disassembler.py                    | 48 +++++++++++++------
 3 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 data/scripts/gUnk_0800A8D4.inc

diff --git a/data/scripts/gUnk_0800A8D4.inc b/data/scripts/gUnk_0800A8D4.inc
new file mode 100644
index 00000000..df47f574
--- /dev/null
+++ b/data/scripts/gUnk_0800A8D4.inc
@@ -0,0 +1,14 @@
+sub_0807E004 
+sub_0807EF80 0x0007
+sub_0807EB44 0x0004
+sub_0807E930 0x0008
+sub_0807E014 
+sub_0807E690 0x00000001
+sub_0807EF80 0x0000
+sub_0807E6AC 0x00000020
+sub_0807EF80 0x0004
+sub_0807E680 0x003c
+sub_0807EB44 0x0002
+sub_0807E680 0x000f
+.short 0x0861
+.short 0x0006
diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py
index f20543a9..e0850f13 100644
--- a/tools/script_disassembler/incbin_parser.py
+++ b/tools/script_disassembler/incbin_parser.py
@@ -3,6 +3,7 @@
 TMC_FOLDER='../..'
 
 import subprocess
+import sys
 from script_disassembler import disassemble_script
 
 def main():
@@ -32,8 +33,12 @@ def main():
                     # read data from rom
                     data = baserom_data[start:start+end]
 
-                    print(f'DISASM {label}')
-                    disassemble_script(data)
+                    stdout = sys.stdout
+                    with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
+                        sys.stdout = out
+                        print(f'SCRIPT_START {label}')
+                        disassemble_script(data)
+                    sys.stdout = stdout
 
                     # print new include label
                     print(f'.include "data/scripts/{label}.inc"')
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index df2b54dc..b73afd61 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -26,6 +26,11 @@ def barray_to_u32_hex(barray):
     integers = struct.unpack('I'*count, barray)
     return [u32_to_hex(x) for x in integers]
 
+# tries to directly reference the function this is pointing to
+def get_pointer(barray):
+    integers = struct.unpack('I', barray)
+    return 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
+
 commands = [
     {'fun': 'nullsub_507', 'params': ''},
     {'fun': 'sub_0807E004', 'params': '', 'name': 'start executing scripts'},
@@ -38,14 +43,14 @@ commands = [
     {'fun': 'sub_0807E0B8', 'params': 'w', 'name': 'abs jump if'},
     {'fun': 'sub_0807E0CC', 'params': 'w', 'name': 'abs jump if not'},
     {'fun': 'sub_0807E0E0', 'params': 'w'},
-    {'fun': 'sub_0807E10C', 'params':'w', 'name': 'Execute function via pointer'},# 'exec': sub_0807E10C},
-    {'fun': 'sub_0807E124', 'params': 'ww'},
+    {'fun': 'sub_0807E10C', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': sub_0807E10C},
+    {'fun': 'sub_0807E124', 'params': 'pw'},
     {'fun': 'sub_0807E148', 'params': 'w'},
     {'fun': 'sub_0807E158', 'params': 'w'},
     {'fun': 'sub_0807E188', 'params': 's'},
     {'fun': 'sub_0807E1D8', 'params': 's'},
     {'fun': 'sub_0807E4AC', 'params': 's'},
-    {'fun': 'sub_0807E200', 'params': 'w'},
+    {'fun': 'sub_0807E200', 'params': 's'},
     {'fun': 'sub_0807E220', 'params': 'ss'},
     {'fun': 'sub_0807E240', 'params': 's'},
     {'fun': 'sub_0807E260', 'params': 's'},
@@ -83,7 +88,7 @@ commands = [
     {'fun': 'sub_0807E700', 'params': ''},
     {'fun': 'sub_0807E72C', 'params': ''},
     {'fun': 'sub_0807E75C', 'params': ''},
-    {'fun': 'sub_0807E778', 'params': ''},
+    {'fun': 'sub_0807E778', 'params': 's'},
     {'fun': 'sub_0807E788', 'params': 'w'},
     {'fun': 'sub_0807E79C', 'params': ''},
     {'fun': 'nullsub_508', 'params': 's'},
@@ -146,7 +151,7 @@ commands = [
     {'fun': 'sub_0807EE04', 'params': 'ss'},
     {'fun': 'sub_0807EE30', 'params': ''},
     {'fun': 'sub_0807EEB4', 'params': ''},
-    {'fun': 'sub_0807EEF4', 'params': ''},
+    {'fun': 'sub_0807EEF4', 'params': 'ss'},
     {'fun': 'sub_0807EF3C', 'params': 'ss'},
     {'fun': 'sub_0807EF80', 'params': 's'},
     {'fun': 'sub_0807EF90', 'params': 's'},
@@ -205,13 +210,29 @@ parameters = {
         'param': 'a,b,c',
         'expr': '	.short \\a\n	.short \\b\n	.short \\c',
         'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8]))
+    },    
+    'p': {
+        'length': 2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+    },
+    'pw': {
+        'length': 4,
+        'param': 'a,b',
+        'expr': '	.word \\a\n	.word \\b',
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+10])[0]
     },
 }
 
 
 def ExecuteScriptCommandSet(ctx: Context):
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
-    if cmd == 0 or cmd ==0xffff:
+    if cmd == 0:
+        return 0
+    if cmd == 0xffff:
+        ctx.ptr += 2
+        print('SCRIPT_END')
         return 0
 
     unk_06 = cmd >> 0xA
@@ -220,7 +241,6 @@ def ExecuteScriptCommandSet(ctx: Context):
         return 0
     operationId = cmd & 0x3FF
     if operationId >= len(commands):
-        print('ERR: NO CMD')
         # TODO error
         return 0
     command = commands[operationId]
@@ -240,12 +260,13 @@ def ExecuteScriptCommandSet(ctx: Context):
         raise Exception('Parameter configuration ' + command['params'] + ' not defined')
     params = parameters[command['params']]
     if unk_06-1 != params['length']:
-        # TODOraise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
+        # raise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
+        return 0
+        #with open('log.txt', 'a') as log:
+#            log.write(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined\n')
         # TEMPORARY WORKAROUND:
-        print(ctx.ptr, unk_06, cmd)
-        ctx.ptr += unk_06*2
-        return 1
-
+        #ctx.ptr += unk_06*2
+        #return 1
 
     print(command['fun'] + ' ' + params['read'](ctx))
 
@@ -291,8 +312,7 @@ def generate_macros():
     print('')
     for num, command in enumerate(commands):
         if not 'params' in command:
-            #raise Exception('Parameters not defined for ' + command['fun'] + '   Should be of length ' + str(param_length))
-            continue # TODO
+            raise Exception('Parameters not defined for ' + command['fun'] + '!')
         if not command['params'] in parameters:
             raise Exception('Parameter configuration ' + command['params'] + ' not defined')
 

From 1a8fad358a3d224bb035b8698162540a1372575b Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Thu, 4 Mar 2021 23:37:57 +0100
Subject: [PATCH 10/46] Reset changes to script.c

---
 include/script.h           |  14 +-
 include/structures.h       |   8 +-
 src/npc/ezloCap.c          |   4 +-
 src/npc/goron.c            |   3 +-
 src/npc/postman.c          |  10 +-
 src/npc/zelda.c            |   3 +-
 src/script.c               | 628 +++++++++++++------------------------
 src/scripts/npc4e_fusion.c |  40 ---
 8 files changed, 239 insertions(+), 471 deletions(-)
 delete mode 100644 src/scripts/npc4e_fusion.c

diff --git a/include/script.h b/include/script.h
index 416485b5..9abc5291 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,24 +3,14 @@
 
 #include "global.h"
 
-typedef struct 
-{
-    u16 command;
-    u16 metadata;
-} ScriptCommand;
-
-
 typedef struct {
-    union {
-        u16* raw;
-        ScriptCommand* commands; // list of commands to execute
-    } unk_00;
+    u16* unk_00;
     u32 unk_04;
     u32 unk_08;
     u8 unk_0C[0x4]; // unused
     u16 unk_10;
     u16 unk_12;
-    u32 compareResult; // result of a compare script command
+    u32 unk_14;
     u8 unk_18;
     u8 unk_19;
     u8 unk_1A;
diff --git a/include/structures.h b/include/structures.h
index f6108ad6..59811d6f 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -119,15 +119,11 @@ typedef struct {
 
 extern struct_02024490 gUnk_02024490;
 
-
-// Some kind of ScriptInterpreter state?
 typedef struct {
     u32 unk_00;
-    u16 operationId;
+    u16 unk_04;
     u8 unk_06;
-    // bit 0 is reset before each script execution
-    // execution is continued if bit 0 or bit 1 are true, so bit 1 can be set to execute until someone unsets bit 1
-    u8 continueScriptExecutionFlags;
+    u8 unk_07;
     u8 unk_08;
 } struct_02033280;
 
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index 8b959949..13ecd8f9 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -52,7 +52,7 @@ typedef struct {
     u8 unk_20[2];
     u16 field_22;
 } paramStruct;
-// This is a ScriptExecutionContext TODO
+
 void sub_0806D8A0(Entity* this, paramStruct* param_2) {
     s32 xOffset;
     s32 yOffset;
@@ -172,7 +172,7 @@ void sub_0806DAAC(Entity* this, u32* param_2) {
     u32 uVar1;
     uVar1 = CheckKinstoneFused(sub_0806DA3C(this));
     param_2[5] = uVar1;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
 // maybe actually execute the kinstone fusion?
diff --git a/src/npc/goron.c b/src/npc/goron.c
index 2bd99575..0203969c 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -97,10 +97,9 @@ u32 sub_08069480(Entity* this) {
     return (sub_0801E99C(this) << 24) >> 24;
 }
 
-// TODO param_1 possibly ScriptExecutionContext?
 void sub_0806948C(Entity* this, u32* param_1) {
     param_1[5] = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
 void sub_080694B0(Entity* this) {
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 7306b69b..532f129f 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -201,13 +201,13 @@ void sub_080606D8(Entity* this) {
     ShowNPCDialogue(this, &gUnk_0810AA30[index]);
 }
 
-void sub_08060700(Entity* this, ScriptExecutionContext* context) {
-    s8* var0 = gUnk_0810A918[(s8)this->field_0x68.HALF.LO];
-    Coords16* coords = &gUnk_0810A66C[var0[(s8)this->field_0x68.HALF.HI]];
+void sub_08060700(Entity* entity, ScriptExecutionContext* context) {
+    s8* var0 = gUnk_0810A918[(s8)entity->field_0x68.HALF.LO];
+    Coords16* coords = &gUnk_0810A66C[var0[(s8)entity->field_0x68.HALF.HI]];
     u32 x = coords->x + gRoomControls.roomOriginX;
     u32 y = coords->y + gRoomControls.roomOriginY;
-    sub_0807DEDC(this, context, x, y);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    sub_0807DEDC(entity, context, x, y);
+    gUnk_02033280.unk_07 |= 1;
 }
 
 void sub_0806075C(Entity* this) {
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 0b1e44f9..90a40fc0 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -128,7 +128,6 @@ void sub_08066E68(Entity* ent) {
     ent->field_0x80.HWORD = ent->animIndex;
 }
 
-// TODO param_2 possibly ScriptExecutionContext?
 void sub_08066E80(Entity* ent, u8* param_2) {
     switch (param_2[0x18]) {
         case 0:
@@ -165,7 +164,7 @@ void sub_08066E80(Entity* ent, u8* param_2) {
         case 4:
             UpdateAnimationSingleFrame(ent);
             if (ent->frames.b.f3) {
-                gUnk_02033280.continueScriptExecutionFlags |= 1;
+                gUnk_02033280.unk_07 |= 1;
                 return;
             }
     }
diff --git a/src/script.c b/src/script.c
index bef65e05..494e0ae5 100644
--- a/src/script.c
+++ b/src/script.c
@@ -154,147 +154,30 @@ void sub_0807F0C8(Entity*, ScriptExecutionContext*);
 extern void CreateSpeechBubbleExclamationMark(Entity*, u32, u32);
 extern void CreateSpeechBubbleQuestionMark(Entity*, u32, u32);
 extern void sub_0801C4A0(u32);
-// size: 139
-void (*const scriptOperations[])() = {
-    nullsub_507,  // 0
-    sub_0807E004, // 1
-    sub_0807E014, // 2
-    sub_0807E024, // 3
-    sub_0807E050, // 4
-    sub_0807E064, // 5
-    sub_0807E078, // 6
-    sub_0807E0A0, // 7
-    sub_0807E0B8, // 8
-    sub_0807E0CC, // 9
-    sub_0807E0E0, // 10
-    sub_0807E10C, // 11
-    sub_0807E124, // 12
-    sub_0807E148, // 13
-    sub_0807E158, // 14
-    sub_0807E188, // 15
-    sub_0807E1D8, // 16
-    sub_0807E4AC, // defined out of order 17
-    sub_0807E200, // 18
-    sub_0807E220, // 19
-    sub_0807E240, // 20
-    sub_0807E260, // 21
-    sub_0807E280, // 22
-    sub_0807E2A8, // 23
-    sub_0807E2E4, // 24
-    sub_0807E30C, // 25
-    sub_0807E390, // 26
-    sub_0807E3BC, // 27
-    sub_0807E3E8, // 28
-    sub_0807E40C, // 29
-    sub_0807E42C, // 30
-    sub_0807E48C, // 31
-    sub_0807E4CC, // 32
-    sub_0807E4EC, // 33
-    sub_0807E514, // 34
-    sub_0807E538, // 35
-    sub_0807E564, // 36
-    sub_0807E584, // 37
-    sub_0807E5A0, // 38
-    sub_0807E5CC, // 39
-    sub_0807E5F8, // 40
-    sub_0807E610, // 41
-    sub_0807E628, // 42
-    sub_0807E634, // 43
-    sub_0807E644, // 44
-    sub_0807E650, // 45
-    sub_0807E65C, // 46
-    sub_0807E668, // 47
-    sub_0807E674, // 48
-    sub_0807E680, // 49
-    sub_0807E690, // 50
-    sub_0807E6AC, // 51
-    sub_0807E6DC, // 52
-    sub_0807E700, // 53
-    sub_0807E72C, // 54
-    sub_0807E75C, // 55
-    sub_0807E778, // 56
-    sub_0807E788, // 57
-    sub_0807E79C, // 58
-    nullsub_508,  // 59
-    sub_0807E7B0, // 60
-    sub_0807E7C4, // 61
-    sub_0807E7D8, // 62
-    sub_0807E7EC, // 63
-    sub_0807E800, // 64
-    sub_0807E80C, // 65
-    sub_0807E858, // 66
-    sub_0807E864, // 67
-    sub_0807E878, // 68
-    sub_0807E888, // 69
-    sub_0807E898, // 70
-    sub_0807E8C4, // 71
-    sub_0807E8D4, // 72
-    sub_0807E8E4, // 73
-    sub_0807E8E4, // 74// duplicate
-    sub_0807E8E4, // 75// duplicate
-    sub_0807E8E4, // 76// duplicate
-    sub_0807E908, // 77
-    sub_0807E914, // 78
-    sub_0807E924, // 79
-    sub_0807E930, // 80
-    sub_0807E944, // 81
-    sub_0807E974, // 82
-    sub_0807E9D4, // 83
-    sub_0807E9DC, // 84
-    sub_0807E9E4, // 85
-    sub_0807E9F0, // 86
-    sub_0807EA4C, // 87
-    sub_0807EA88, // 88
-    sub_0807EA94, // 89
-    sub_0807EAB4, // 90
-    sub_0807EAC0, // 91
-    sub_0807EAD0, // 92
-    sub_0807EAF0, // 93
-    sub_0807EB18, // 94
-    sub_0807EB28, // 95
-    sub_0807EB38, // 96
-    sub_0807EB44, // 97
-    sub_0807EB4C, // 98
-    sub_0807EB74, // 99
-    sub_0807EB8C, // 100
-    sub_0807EBA8, // 101
-    sub_0807EBB0, // 102
-    sub_0807EBC0, // 103
-    sub_0807EBC8, // 104
-    sub_0807EBD8, // 105
-    sub_0807EBF4, // 106
-    sub_0807EC08, // 107
-    nullsub_509,  // 108
-    sub_0807EC1C, // 109
-    sub_0807EC64, // 110
-    sub_0807EC94, // 111
-    sub_0807ECC4, // 112
-    sub_0807ECF4, // 113
-    sub_0807ED24, // 114
-    sub_0807EDD4, // 115
-    sub_0807EE04, // 116
-    sub_0807EE30, // 117
-    sub_0807EEB4, // 118
-    sub_0807EEF4, // 119
-    sub_0807EF3C, // 120
-    sub_0807EF80, // 121
-    sub_0807EF90, // 122
-    sub_0807EFA0, // 123
-    sub_0807EFAC, // 124
-    sub_0807EFD4, // 125
-    sub_0807EFE4, // 126
-    sub_0807EFF4, // 127
-    sub_0807F004, // 128
-    sub_0807F010, // 129
-    sub_0807F034, // 130
-    sub_0807F050, // 131
-    sub_0807F060, // 132
-    sub_0807F078, // 133
-    sub_0807F088, // 134
-    sub_0807F098, // 135
-    sub_0807F0A4, // 136
-    sub_0807F0B4, // 137
-    sub_0807F0C8  // 138
+
+void (*const gUnk_0811E524[])() = {
+    nullsub_507,  sub_0807E004, sub_0807E014, sub_0807E024, sub_0807E050, sub_0807E064, sub_0807E078, sub_0807E0A0,
+    sub_0807E0B8, sub_0807E0CC, sub_0807E0E0, sub_0807E10C, sub_0807E124, sub_0807E148, sub_0807E158, sub_0807E188,
+    sub_0807E1D8,
+    sub_0807E4AC, // defined out of order
+    sub_0807E200, sub_0807E220, sub_0807E240, sub_0807E260, sub_0807E280, sub_0807E2A8, sub_0807E2E4, sub_0807E30C,
+    sub_0807E390, sub_0807E3BC, sub_0807E3E8, sub_0807E40C, sub_0807E42C, sub_0807E48C, sub_0807E4CC, sub_0807E4EC,
+    sub_0807E514, sub_0807E538, sub_0807E564, sub_0807E584, sub_0807E5A0, sub_0807E5CC, sub_0807E5F8, sub_0807E610,
+    sub_0807E628, sub_0807E634, sub_0807E644, sub_0807E650, sub_0807E65C, sub_0807E668, sub_0807E674, sub_0807E680,
+    sub_0807E690, sub_0807E6AC, sub_0807E6DC, sub_0807E700, sub_0807E72C, sub_0807E75C, sub_0807E778, sub_0807E788,
+    sub_0807E79C, nullsub_508,  sub_0807E7B0, sub_0807E7C4, sub_0807E7D8, sub_0807E7EC, sub_0807E800, sub_0807E80C,
+    sub_0807E858, sub_0807E864, sub_0807E878, sub_0807E888, sub_0807E898, sub_0807E8C4, sub_0807E8D4, sub_0807E8E4,
+    sub_0807E8E4, // duplicate
+    sub_0807E8E4, // duplicate
+    sub_0807E8E4, // duplicate
+    sub_0807E908, sub_0807E914, sub_0807E924, sub_0807E930, sub_0807E944, sub_0807E974, sub_0807E9D4, sub_0807E9DC,
+    sub_0807E9E4, sub_0807E9F0, sub_0807EA4C, sub_0807EA88, sub_0807EA94, sub_0807EAB4, sub_0807EAC0, sub_0807EAD0,
+    sub_0807EAF0, sub_0807EB18, sub_0807EB28, sub_0807EB38, sub_0807EB44, sub_0807EB4C, sub_0807EB74, sub_0807EB8C,
+    sub_0807EBA8, sub_0807EBB0, sub_0807EBC0, sub_0807EBC8, sub_0807EBD8, sub_0807EBF4, sub_0807EC08, nullsub_509,
+    sub_0807EC1C, sub_0807EC64, sub_0807EC94, sub_0807ECC4, sub_0807ECF4, sub_0807ED24, sub_0807EDD4, sub_0807EE04,
+    sub_0807EE30, sub_0807EEB4, sub_0807EEF4, sub_0807EF3C, sub_0807EF80, sub_0807EF90, sub_0807EFA0, sub_0807EFAC,
+    sub_0807EFD4, sub_0807EFE4, sub_0807EFF4, sub_0807F004, sub_0807F010, sub_0807F034, sub_0807F050, sub_0807F060,
+    sub_0807F078, sub_0807F088, sub_0807F098, sub_0807F0A4, sub_0807F0B4, sub_0807F0C8
 };
 
 extern const u16 gUnk_08016984;
@@ -315,7 +198,7 @@ ScriptExecutionContext* CreateScriptExecutionContext(void) {
 
     context = gScriptExecutionContextArray;
     do {
-        if (context->unk_00.raw == 0) {
+        if (context->unk_00 == 0) {
             return context;
         }
         context++;
@@ -327,21 +210,20 @@ void DestroyScriptExecutionContext(ScriptExecutionContext* context) {
     MemClear32(context, sizeof(ScriptExecutionContext));
 }
 
-ScriptExecutionContext* StartCutscene(Entity* entity, u16* scriptCode) {
+ScriptExecutionContext* StartCutscene(Entity* entity, u16* unk_2) {
     ScriptExecutionContext* context;
 
     context = CreateScriptExecutionContext();
     if (context) {
-        sub_0807DAF0(entity, context, scriptCode);
+        sub_0807DAF0(entity, context, unk_2);
     }
     return context;
 }
 
-// start script on entity
-void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u16* scriptCode) {
+void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u16* unk1) {
     entity->flags = entity->flags | 2;
     *(ScriptExecutionContext**)&entity->cutsceneBeh = context;
-    sub_0807DB88(context, scriptCode);
+    sub_0807DB88(context, unk1);
 }
 
 void UnloadCutsceneData(Entity* entity) {
@@ -356,7 +238,7 @@ void StartPlayerScript(u16* unk1) {
     Entity* player;
 
     MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
-    gPlayerScriptExecutionContext.unk_00.raw = unk1;
+    gPlayerScriptExecutionContext.unk_00 = unk1;
     player = &gPlayerEntity;
     *(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext;
     gPlayerState.playerAction = 0x1c;
@@ -372,15 +254,14 @@ ScriptExecutionContext* sub_0807DB68(Entity* entity, u16* unk1) {
     if (context) {
         entity->flags |= 2;
         *(ScriptExecutionContext**)&entity->field_0x3c = context;
-        context->unk_00.raw = unk1;
+        context->unk_00 = unk1;
     }
     return context;
 }
 
-// reset ScriptExecutionContext and set new commands?
-void sub_0807DB88(ScriptExecutionContext* context, u16* scriptCode) {
+void sub_0807DB88(ScriptExecutionContext* context, u16* unk1) {
     MemClear32(context, sizeof(ScriptExecutionContext));
-    context->unk_00.raw = scriptCode;
+    context->unk_00 = unk1;
 }
 
 void sub_0807DB98(Entity* entity, ScriptExecutionContext* context) {
@@ -469,9 +350,8 @@ void sub_0807DD64(Entity* entity) {
     entity->field_0x82.HWORD = 0;
 }
 
-// Special script start for windTribespeople?
-void sub_0807DD80(Entity* entity, u16* scriptCode) {
-    sub_0807DB88(*(ScriptExecutionContext**)&entity->cutsceneBeh, scriptCode);
+void sub_0807DD80(Entity* entity, u16* unk1) {
+    sub_0807DB88(*(ScriptExecutionContext**)&entity->cutsceneBeh, unk1);
     sub_0807DD64(entity);
 }
 
@@ -481,17 +361,16 @@ void sub_0807DD94(Entity* entity, void (*function)(Entity*, ScriptExecutionConte
     sub_0807DE80(entity);
 }
 
-// executeScript commandset, then call the function (or sub_0807DB98 if NULL), then delete if no next entity
 void sub_0807DDAC(Entity* entity, void (*function)(Entity*, ScriptExecutionContext*)) {
-    ScriptExecutionContext** context;
+    ScriptExecutionContext** piVar1;
 
-    context = (ScriptExecutionContext**)&entity->cutsceneBeh;
-    if (*context) {
-        ExecuteScriptCommandSet(entity, *context);
+    piVar1 = (ScriptExecutionContext**)&entity->cutsceneBeh;
+    if (*piVar1) {
+        ExecuteScriptCommandSet(entity, *piVar1);
         if (function) {
-            function(entity, *context);
+            function(entity, *piVar1);
         } else {
-            sub_0807DB98(entity, *context);
+            sub_0807DB98(entity, *piVar1);
         }
         if (!entity->next) {
             DeleteThisEntity();
@@ -573,7 +452,7 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 arg2, u32
 
     context->unk_19 = 8;
     context->unk_08 |= 2;
-    context->compareResult = 0;
+    context->unk_14 = 0;
     context->unk_1C.HALF.HI = arg2;
     context->unk_20.HALF.HI = arg3;
     t0 = context->unk_1C.HALF.HI - entity->x.HALF.HI;
@@ -603,142 +482,123 @@ void sub_0807DF50(void) {
 }
 
 void ExecuteScriptCommandSet(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_00.raw)
+    if (!unk2->unk_00)
         return;
     if (unk2->unk_10) {
         unk2->unk_10--;
     } else {
         struct_02033280* tmp2 = &gUnk_02033280;
-        // unk_07 bit 1 is being reset in each iteration
-        // but bit 2 is also tested, so it can be set to continue execution until you reset it
-
-        tmp2->continueScriptExecutionFlags = 0;
+        tmp2->unk_07 = 0;
         do {
-            u32 cmd = GetNextScriptCommandHalfword(unk2->unk_00.raw);
+            u32 cmd = GetNextScriptCommandHalfword(unk2->unk_00);
             u16* tmp;
             if (cmd == 0xFFFF)
                 return;
-            // after cutting of 10 bits, this is the amount to advance the unk_00 pointer of ScriptExecutionContext unk2
             tmp2->unk_06 = cmd >> 0xA;
-            // lower 10 bits are the operationId (index to scriptOperations pointer array)
-            tmp2->operationId = cmd & 0x3FF;
-            tmp = unk2->unk_00.raw;
-            tmp2->continueScriptExecutionFlags &= ~1;
-            scriptOperations[tmp2->operationId](unk1, unk2);
-            unk2->unk_00.raw += tmp2->unk_06;
-            if (tmp != unk2->unk_00.raw) { // unk_00 was changed by tmp->unk_06 or the executed function -> set a flag
-                                           // to execute the next instruction or something?
+            tmp2->unk_04 = cmd & 0x3FF;
+            tmp = unk2->unk_00;
+            tmp2->unk_07 &= ~1;
+            gUnk_0811E524[tmp2->unk_04](unk1, unk2);
+            unk2->unk_00 += tmp2->unk_06;
+            if (tmp != unk2->unk_00) {
                 unk2->unk_18 = 0;
             }
-        } while (tmp2->continueScriptExecutionFlags & 3);
+        } while (tmp2->unk_07 & 3);
     }
 }
 
 void nullsub_507(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
-// Start executing scripts
 void sub_0807E004(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.continueScriptExecutionFlags |= 2;
+    gUnk_02033280.unk_07 |= 2;
 }
 
-// Stop executing scripts
 void sub_0807E014(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.continueScriptExecutionFlags &= ~2;
+    gUnk_02033280.unk_07 &= ~2;
 }
 
-// Jump by offset
 void sub_0807E024(Entity* unk1, ScriptExecutionContext* unk2) {
     s16 tmp;
-    // get metadata -> tmp
-    unk2->unk_00.raw++;
-    tmp = GetNextScriptCommandHalfword(unk2->unk_00.raw);
-    unk2->unk_00.raw += (tmp / 2);
+    unk2->unk_00++;
+    tmp = GetNextScriptCommandHalfword(unk2->unk_00);
+    unk2->unk_00 += (tmp / 2);
     gUnk_02033280.unk_06 = 0;
 }
 
-// if
 void sub_0807E050(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->compareResult) {
+    if (unk2->unk_14) {
         sub_0807E024(unk1, unk2);
     }
 }
 
-// if not
 void sub_0807E064(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->compareResult) {
+    if (!unk2->unk_14) {
         sub_0807E024(unk1, unk2);
     }
 }
 
 void sub_0807E078(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gUnk_02033280.unk_06 > unk2->unk_04) {
-        unk2->unk_00.raw += unk2->unk_04;
+        unk2->unk_00 += unk2->unk_04;
         sub_0807E024(unk1, unk2);
     }
 }
 
-// repoint the execution somewhere else
 void sub_0807E0A0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_00.raw = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    unk2->unk_00 = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
     gUnk_02033280.unk_06 = 0;
 }
 
-// if
 void sub_0807E0B8(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->compareResult) {
+    if (unk2->unk_14) {
         sub_0807E0A0(unk1, unk2);
     }
 }
 
-// if not
 void sub_0807E0CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->compareResult) {
+    if (!unk2->unk_14) {
         sub_0807E0A0(unk1, unk2);
     }
 }
 
 void sub_0807E0E0(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gUnk_02033280.unk_06 > (unk2->unk_04 << 1) + 1) {
-        unk2->unk_00.raw += unk2->unk_04 << 1;
+        unk2->unk_00 += unk2->unk_04 << 1;
         sub_0807E0A0(unk1, unk2);
     }
 }
 
-// Execute function via pointer
 void sub_0807E10C(Entity* unk1, ScriptExecutionContext* unk2) {
-    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw))(unk1,
-                                                                                                                 unk2);
+    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00))(unk1,
+                                                                                                             unk2);
 }
 
-// Execute function via pointer but set context->unk_04 to some meta/cmd before?
 void sub_0807E124(Entity* unk1, ScriptExecutionContext* unk2) {
     void (*tmp)(Entity*, ScriptExecutionContext*) =
-        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
-    unk2->unk_04 = GetNextScriptCommandWord(unk2->unk_00.raw + 3);
+        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+    unk2->unk_04 = GetNextScriptCommandWord(unk2->unk_00 + 3);
     tmp(unk1, unk2);
 }
 
 void sub_0807E148(Entity* unk1, ScriptExecutionContext* unk2) {
-    LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw));
+    LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
 }
 
-// compare ???
 void sub_0807E158(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
     u32 tmp2 = 0;
     u32 tmp3 = gUnk_02033280.unk_00;
     if ((tmp3 & tmp) == tmp)
         tmp2 = 1;
-    unk2->compareResult = tmp2;
+    unk2->unk_14 = tmp2;
     gUnk_02033280.unk_00 = tmp3 & ~tmp;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// different compare functions (dungeon map, dungeon compass, dungeon big key, dungeon small keys, inventory value)
 void sub_0807E188(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp;
-    u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw);
+    u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00);
     switch (tmp2) {
         case 0x53:
             tmp = sub_08052734();
@@ -755,75 +615,66 @@ void sub_0807E188(Entity* unk1, ScriptExecutionContext* unk2) {
         default:
             tmp = GetInventoryValue(tmp2);
     }
-    unk2->compareResult = tmp;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = tmp;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare GetInventoryValue(meta) == 2
 void sub_0807E1D8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = GetInventoryValue(unk2->unk_00.raw[1]) == 2;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = GetInventoryValue(unk2->unk_00[1]) == 2;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare CheckLocalFlag
 void sub_0807E200(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = CheckLocalFlag(unk2->unk_00.raw[1]);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = CheckLocalFlag(unk2->unk_00[1]);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare CheckLocalFlagByOffset(metadata1, metadata2)
 void sub_0807E220(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = CheckLocalFlagByOffset(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = CheckLocalFlagByOffset(unk2->unk_00[1], unk2->unk_00[2]);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare CheckGlobalFlag
 void sub_0807E240(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw));
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00));
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare CheckRoomFlag
 void sub_0807E260(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = CheckRoomFlag(unk2->unk_00.raw[1]);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = CheckRoomFlag(unk2->unk_00[1]);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare checkPlayerInRegion  (square?)
 void sub_0807E280(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 x, y, width, height;
-    width = unk2->unk_00.raw[3];
+    width = unk2->unk_00[3];
     height = width >> 8;
     width &= 0xFF;
-    x = unk2->unk_00.raw[1];
-    y = unk2->unk_00.raw[2];
-    unk2->compareResult = CheckPlayerInRegion(x, y, width, height);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    x = unk2->unk_00[1];
+    y = unk2->unk_00[2];
+    unk2->unk_14 = CheckPlayerInRegion(x, y, width, height);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare CheckPlayerInRegion (room?)
 void sub_0807E2A8(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 x, y, width, height;
-    width = unk2->unk_00.raw[1] & 0xFF;
-    height = unk2->unk_00.raw[1] >> 8;
+    width = unk2->unk_00[1] & 0xFF;
+    height = unk2->unk_00[1] >> 8;
     x = unk1->x.HALF.HI - gRoomControls.roomOriginX;
     y = unk1->y.HALF.HI - gRoomControls.roomOriginY;
-    unk2->compareResult = CheckPlayerInRegion(x, y, width, height);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = CheckPlayerInRegion(x, y, width, height);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare and reset Entity->interactType
 void sub_0807E2E4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (unk1->interactType) {
         unk1->interactType = 0;
-        unk2->compareResult = 1;
+        unk2->unk_14 = 1;
     } else {
-        unk2->compareResult = 0;
+        unk2->unk_14 = 0;
     }
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare and reset interactType while setting animationState ??
 void sub_0807E30C(Entity* unk1, ScriptExecutionContext* unk2) {
     if ((unk2->unk_1A & 0xF) == 0 && (gPlayerState.flags.all & 0x80) == 0 &&
         sub_080041A0(unk1, &gPlayerEntity, 0x28, 0x28)) {
@@ -832,176 +683,160 @@ void sub_0807E30C(Entity* unk1, ScriptExecutionContext* unk2) {
     unk2->unk_1A++;
     if (unk1->interactType) {
         unk1->interactType = 0;
-        unk2->compareResult = 1;
+        unk2->unk_14 = 1;
         unk1->animationState = sub_0806F5B0(GetFacingDirection(unk1, &gPlayerEntity));
     } else {
-        unk2->compareResult = 0;
+        unk2->unk_14 = 0;
     }
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare enough rupees
 void sub_0807E390(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = (unk2->unk_00.raw[1] <= gSave.stats.rupees);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = (unk2->unk_00[1] <= gSave.stats.rupees);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare enough ???
 void sub_0807E3BC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = (unk2->unk_00.raw[1] <= gSave.stats.field_0x1a);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = (unk2->unk_00[1] <= gSave.stats.field_0x1a);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare ???
 void sub_0807E3E8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = !gUnk_02000040.unk_01;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = !gUnk_02000040.unk_01;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare CheckKinstoneFused
 void sub_0807E40C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = CheckKinstoneFused(unk2->unk_00.raw[1]);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = CheckKinstoneFused(unk2->unk_00[1]);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare enough rupees and remove rupees ??
 void sub_0807E42C(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp, tmp2;
     s32 tmp3;
-    tmp = unk2->unk_00.raw[1];
-    tmp2 = unk2->unk_00.raw[2];
+    tmp = unk2->unk_00[1];
+    tmp2 = unk2->unk_00[2];
     if (!tmp) {
         tmp = gRoomVars.itemForSaleIndex;
         tmp2 = gRoomVars.field_0x7;
     }
     tmp3 = sub_08053FE0(tmp);
-    unk2->compareResult = (tmp3 <= gSave.stats.rupees);
-    if (unk2->compareResult) {
+    unk2->unk_14 = (tmp3 <= gSave.stats.rupees);
+    if (unk2->unk_14) {
         ModRupees(-tmp3);
         sub_080A7C18(tmp, tmp2, 0);
         gRoomVars.itemForSaleIndex = 0;
         gRoomVars.field_0x7 = 0;
     }
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare ??
 void sub_0807E48C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = sub_080544DC(unk2->unk_00.raw[1]);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = sub_080544DC(unk2->unk_00[1]);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare itemForSaleIndex??
 void sub_0807E4AC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = !!gRoomVars.itemForSaleIndex;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = !!gRoomVars.itemForSaleIndex;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare ??
 void sub_0807E4CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = !!(unk2->unk_04 & unk2->unk_00.raw[1]);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = !!(unk2->unk_04 & unk2->unk_00[1]);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare meta & unk_04 ??
 void sub_0807E4EC(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = unk2->unk_00.raw[1];
-    unk2->compareResult = tmp == (tmp & unk2->unk_04);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    u32 tmp = unk2->unk_00[1];
+    unk2->unk_14 = tmp == (tmp & unk2->unk_04);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare meta == unk_04 ??
 void sub_0807E514(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = unk2->unk_00.raw[1];
-    unk2->compareResult = tmp == unk2->unk_04;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    u32 tmp = unk2->unk_00[1];
+    unk2->unk_14 = tmp == unk2->unk_04;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare player state flags ???
 void sub_0807E538(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = !!(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw) & gPlayerState.flags.all);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = !!(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00) & gPlayerState.flags.all);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare player state flags ???
 void sub_0807E564(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = (gPlayerState.flags.all >> 7) & 1;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = (gPlayerState.flags.all >> 7) & 1;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare entity height != 0
 void sub_0807E584(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = unk1->height.WORD != 0;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = unk1->height.WORD != 0;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare meta == player.action
 void sub_0807E5A0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = unk2->unk_00.raw[1] == gPlayerEntity.action;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = unk2->unk_00[1] == gPlayerEntity.action;
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// compare meta == player.animationState
 void sub_0807E5CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->compareResult = unk2->unk_00.raw[1] == gPlayerEntity.animationState;
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    unk2->unk_14 = unk2->unk_00[1] == gPlayerEntity.animationState;
+    gUnk_02033280.unk_07 |= 1;
 }
 
 void sub_0807E5F8(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
 }
 
 void sub_0807E610(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    gUnk_02033280.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
 }
 
 void sub_0807E628(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetLocalFlag(unk2->unk_00.raw[1]);
+    SetLocalFlag(unk2->unk_00[1]);
 }
 
 void sub_0807E634(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetLocalFlagByOffset(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
+    SetLocalFlagByOffset(unk2->unk_00[1], unk2->unk_00[2]);
 }
 
 void sub_0807E644(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearLocalFlag(unk2->unk_00.raw[1]);
+    ClearLocalFlag(unk2->unk_00[1]);
 }
 
 void sub_0807E650(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetGlobalFlag(unk2->unk_00.raw[1]);
+    SetGlobalFlag(unk2->unk_00[1]);
 }
 
 void sub_0807E65C(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearGlobalFlag(unk2->unk_00.raw[1]);
+    ClearGlobalFlag(unk2->unk_00[1]);
 }
 
 void sub_0807E668(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetRoomFlag(unk2->unk_00.raw[1]);
+    SetRoomFlag(unk2->unk_00[1]);
 }
 
 void sub_0807E674(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearRoomFlag(unk2->unk_00.raw[1]);
+    ClearRoomFlag(unk2->unk_00[1]);
 }
 
-// set unk2->unk_10 to meta
 void sub_0807E680(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_10 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00.raw);
+    unk2->unk_10 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00);
 }
 
 void sub_0807E690(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
     if ((gUnk_02033280.unk_00 & tmp) != tmp) {
         gUnk_02033280.unk_06 = 0;
     }
 }
 
 void sub_0807E6AC(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
     if ((gUnk_02033280.unk_00 & tmp) != tmp) {
         gUnk_02033280.unk_06 = 0;
     } else {
         gUnk_02033280.unk_00 &= ~tmp;
-        gUnk_02033280.continueScriptExecutionFlags |= 1;
+        gUnk_02033280.unk_07 |= 1;
     }
 }
 
@@ -1015,7 +850,7 @@ void sub_0807E6DC(Entity* unk1, ScriptExecutionContext* unk2) {
 
 void sub_0807E700(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gPlayerEntity.action != 0x17) {
-        gUnk_02033280.continueScriptExecutionFlags |= 1;
+        gUnk_02033280.unk_07 |= 1;
     } else {
         gUnk_02033280.unk_06 = 0;
     }
@@ -1025,7 +860,7 @@ void sub_0807E72C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gRoomControls.unk6 & 4) {
         gUnk_02033280.unk_06 = 0;
     } else {
-        gUnk_02033280.continueScriptExecutionFlags |= 1;
+        gUnk_02033280.unk_07 |= 1;
     }
 }
 
@@ -1036,11 +871,11 @@ void sub_0807E75C(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E778(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_08 = unk2->unk_00.raw[1];
+    gUnk_02033280.unk_08 = unk2->unk_00[1];
 }
 
 void sub_0807E788(Entity* unk1, ScriptExecutionContext* unk2) {
-    gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
 }
 
 void sub_0807E79C(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1088,7 +923,7 @@ void sub_0807E818(u32 unk1) {
 }
 
 void sub_0807E858(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08050038(unk2->unk_00.raw[1]);
+    sub_08050038(unk2->unk_00[1]);
 }
 
 void sub_0807E864(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1105,7 +940,7 @@ void sub_0807E888(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E898(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
     gPlayerState.playerAction = tmp;
     gPlayerState.field_0x38 = tmp >> 8;
     gPlayerState.field_0x39 = tmp >> 0x10;
@@ -1113,26 +948,26 @@ void sub_0807E898(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E8C4(Entity* unk1, ScriptExecutionContext* unk2) {
-    StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw));
+    StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
 }
 
 void sub_0807E8D4(Entity* unk1, ScriptExecutionContext* unk2) {
-    gPlayerState.field_0x8 = unk2->unk_00.raw[1];
+    gPlayerState.field_0x8 = unk2->unk_00[1];
 }
 
 void sub_0807E8E4(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp = (gUnk_08016984 & 0x3FF);
     u32 tmp2;
-    gPlayerEntity.animationState = tmp2 = (unk2->unk_00.raw[0] - tmp) << 1;
+    gPlayerEntity.animationState = tmp2 = (unk2->unk_00[0] - tmp) << 1;
 }
 
 void sub_0807E908(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->action = unk2->unk_00.raw[1];
+    unk1->action = unk2->unk_00[1];
     unk1->previousActionFlag = 0;
 }
 
 void sub_0807E914(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    unk2->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
 }
 
 void sub_0807E924(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1141,14 +976,14 @@ void sub_0807E924(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E930(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->field_0x80.HWORD = unk2->unk_00.raw[1];
-    InitAnimationForceUpdate(unk1, unk2->unk_00.raw[1]);
+    unk1->field_0x80.HWORD = unk2->unk_00[1];
+    InitAnimationForceUpdate(unk1, unk2->unk_00[1]);
 }
 
 void sub_0807E944(Entity* unk1, ScriptExecutionContext* unk2) {
     if (unk1->interactType) {
         unk1->interactType = 0;
-        gUnk_02033280.continueScriptExecutionFlags |= 1;
+        gUnk_02033280.unk_07 |= 1;
     } else {
         gUnk_02033280.unk_06 = 0;
     }
@@ -1165,7 +1000,7 @@ void sub_0807E974(Entity* unk1, ScriptExecutionContext* unk2) {
                 break;
             unk1->interactType = 0;
             unk2->unk_18++;
-            TextboxNoOverlapFollow(unk2->unk_00.raw[1]);
+            TextboxNoOverlapFollow(unk2->unk_00[1]);
             break;
         case 1:
             if (gTextBox.doTextBox & 0x7F)
@@ -1186,10 +1021,9 @@ void sub_0807E9DC(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807E9E4(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078784(unk1, unk2->unk_00.raw[1]);
+    sub_08078784(unk1, unk2->unk_00[1]);
 }
 
-// compare and do stuff?
 void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp;
     sub_0801E00C();
@@ -1198,10 +1032,10 @@ void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
         case 2:
             gPlayerState.field_0x8b = 3;
             gUnk_02034490[0] = tmp;
-            unk2->compareResult = tmp;
+            unk2->unk_14 = tmp;
             break;
         case 1:
-            unk2->compareResult = 0;
+            unk2->unk_14 = 0;
             break;
         default:
             goto lbl;
@@ -1219,14 +1053,14 @@ void sub_0807EA4C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (unk1->interactType == 2) {
         sub_0801DFB4(unk1, 0, 0, 0);
         unk1->interactType = 0;
-        gUnk_02033280.continueScriptExecutionFlags |= 1;
+        gUnk_02033280.unk_07 |= 1;
     } else {
         gUnk_02033280.unk_06 = 0;
     }
 }
 
 void sub_0807EA88(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078790(unk1, unk2->unk_00.raw[1]);
+    sub_08078790(unk1, unk2->unk_00[1]);
 }
 
 void sub_0807EA94(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1236,22 +1070,22 @@ void sub_0807EA94(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EAB4(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlapFollow(unk2->unk_00.raw[1]);
+    TextboxNoOverlapFollow(unk2->unk_00[1]);
 }
 
 void sub_0807EAC0(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlap(unk2->unk_00.raw[1], unk1);
+    TextboxNoOverlap(unk2->unk_00[1], unk1);
 }
 
 void sub_0807EAD0(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlapFollow(unk2->unk_00.raw[1]);
+    TextboxNoOverlapFollow(unk2->unk_00[1]);
     gTextBox.textWindowPosX = 1;
-    gTextBox.textWindowPosY = unk2->unk_00.raw[2];
+    gTextBox.textWindowPosY = unk2->unk_00[2];
 }
 
 void sub_0807EAF0(Entity* unk1, ScriptExecutionContext* unk2) {
     if (gUnk_02033280.unk_06 > unk2->unk_04) {
-        u16* tmp = unk2->unk_00.raw + unk2->unk_04;
+        u16* tmp = unk2->unk_00 + unk2->unk_04;
         TextboxNoOverlapFollow(tmp[1]);
     } else {
         TextboxNoOverlapFollow(0);
@@ -1263,7 +1097,7 @@ void sub_0807EB18(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EB28(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078AA8(unk2->unk_00.raw[1], 0);
+    sub_08078AA8(unk2->unk_00[1], 0);
 }
 
 void sub_0807EB38(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1271,12 +1105,12 @@ void sub_0807EB38(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EB44(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = unk2->unk_00.raw[1];
+    unk1->animationState = unk2->unk_00[1];
 }
 
 void sub_0807EB4C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00.raw[1] + gRoomControls.roomOriginX,
-                                                     unk2->unk_00.raw[2] + gRoomControls.roomOriginY));
+    unk1->animationState = sub_0806F5B0(
+        sub_080045B4(unk1, unk2->unk_00[1] + gRoomControls.roomOriginX, unk2->unk_00[2] + gRoomControls.roomOriginY));
 }
 
 void sub_0807EB74(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1288,31 +1122,30 @@ void sub_0807EB8C(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EBA8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->direction = unk2->unk_00.raw[1];
+    unk1->direction = unk2->unk_00[1];
 }
 
 void sub_0807EBB0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->direction = unk2->unk_00.raw[1];
+    unk1->direction = unk2->unk_00[1];
     unk1->animationState = unk1->direction / 4;
 }
 
-// set nonPlanarMovement
 void sub_0807EBC0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->nonPlanarMovement = unk2->unk_00.raw[1];
+    unk1->nonPlanarMovement = unk2->unk_00[1];
 }
 
 void sub_0807EBC8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw);
+    unk1->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
 }
 
 void sub_0807EBD8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->x.HALF.HI = gRoomControls.roomOriginX + unk2->unk_00.raw[1];
-    unk1->y.HALF.HI = gRoomControls.roomOriginY + unk2->unk_00.raw[2];
+    unk1->x.HALF.HI = gRoomControls.roomOriginX + unk2->unk_00[1];
+    unk1->y.HALF.HI = gRoomControls.roomOriginY + unk2->unk_00[2];
 }
 
 void sub_0807EBF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->x.HALF.HI += unk2->unk_00.raw[1];
-    unk1->y.HALF.HI += unk2->unk_00.raw[2];
+    unk1->x.HALF.HI += unk2->unk_00[1];
+    unk1->y.HALF.HI += unk2->unk_00[2];
 }
 
 void sub_0807EC08(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1325,7 +1158,7 @@ void nullsub_509(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EC1C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00.raw[1];
+        unk2->unk_12 = unk2->unk_00[1];
         unk2->unk_08 |= 2;
     }
     sub_0807EC44(unk1, unk2);
@@ -1341,7 +1174,7 @@ void sub_0807EC44(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EC64(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00.raw[1];
+        unk2->unk_12 = unk2->unk_00[1];
         unk1->animationState = 0;
         unk1->direction = 0;
         unk2->unk_08 |= 2;
@@ -1352,7 +1185,7 @@ void sub_0807EC64(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EC94(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00.raw[1];
+        unk2->unk_12 = unk2->unk_00[1];
         unk1->animationState = 2;
         unk1->direction = 8;
         unk2->unk_08 |= 2;
@@ -1363,7 +1196,7 @@ void sub_0807EC94(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807ECC4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00.raw[1];
+        unk2->unk_12 = unk2->unk_00[1];
         unk1->animationState = 4;
         unk1->direction = 0x10;
         unk2->unk_08 |= 2;
@@ -1374,7 +1207,7 @@ void sub_0807ECC4(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807ECF4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00.raw[1];
+        unk2->unk_12 = unk2->unk_00[1];
         unk1->animationState = 6;
         unk1->direction = 0x18;
         unk2->unk_08 |= 2;
@@ -1386,20 +1219,20 @@ void sub_0807ED24(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         s32 tmp, tmp2, tmp3;
         unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00.raw[3];
-        tmp = unk2->unk_00.raw[1];
+        unk2->unk_12 = unk2->unk_00[3];
+        tmp = unk2->unk_00[1];
         tmp2 = unk1->x.HALF.HI - gRoomControls.roomOriginX;
         unk2->unk_1C.WORD = ((tmp - tmp2) << 0x10) / unk2->unk_12;
-        tmp = unk2->unk_00.raw[2];
+        tmp = unk2->unk_00[2];
         tmp3 = unk1->y.HALF.HI - gRoomControls.roomOriginY;
         unk2->unk_20.WORD = ((tmp - tmp3) << 0x10) / unk2->unk_12;
-        unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00.raw[1] + gRoomControls.roomOriginX,
-                                                         unk2->unk_00.raw[2] + gRoomControls.roomOriginY));
+        unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00[1] + gRoomControls.roomOriginX,
+                                                         unk2->unk_00[2] + gRoomControls.roomOriginY));
         unk2->unk_08 |= 2;
     } else {
         if (!--unk2->unk_12) {
-            unk1->x.HALF.HI = unk2->unk_00.raw[1] + gRoomControls.roomOriginX;
-            unk1->y.HALF.HI = unk2->unk_00.raw[2] + gRoomControls.roomOriginY;
+            unk1->x.HALF.HI = unk2->unk_00[1] + gRoomControls.roomOriginX;
+            unk1->y.HALF.HI = unk2->unk_00[2] + gRoomControls.roomOriginY;
             return;
         }
         unk1->x.WORD += unk2->unk_1C.WORD;
@@ -1408,25 +1241,22 @@ void sub_0807ED24(Entity* unk1, ScriptExecutionContext* unk2) {
     gUnk_02033280.unk_06 = 0;
 }
 
-// something else and an if not
 void sub_0807EDD4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
         sub_0807EE04(unk1, unk2);
     }
     sub_0807EE30(unk1, unk2);
-    if (!unk2->compareResult) {
+    if (!unk2->unk_14) {
         gUnk_02033280.unk_06 = 0;
     }
 }
 
 void sub_0807EE04(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_0807DEDC(unk1, unk2, unk2->unk_00.raw[1] + gRoomControls.roomOriginX,
-                 unk2->unk_00.raw[2] + gRoomControls.roomOriginY);
-    gUnk_02033280.continueScriptExecutionFlags |= 1;
+    sub_0807DEDC(unk1, unk2, unk2->unk_00[1] + gRoomControls.roomOriginX, unk2->unk_00[2] + gRoomControls.roomOriginY);
+    gUnk_02033280.unk_07 |= 1;
 }
 
-// something else and a compare
 void sub_0807EE30(Entity* unk1, ScriptExecutionContext* unk2) {
     s32 tmp, tmp2;
     if (!--unk2->unk_19) {
@@ -1441,33 +1271,30 @@ void sub_0807EE30(Entity* unk1, ScriptExecutionContext* unk2) {
     if (tmp <= 0 && tmp2 <= 0) {
         unk1->x.HALF.HI = unk2->unk_1C.HALF.HI;
         unk1->y.HALF.HI = unk2->unk_20.HALF.HI;
-        unk2->compareResult = 1;
+        unk2->unk_14 = 1;
     } else {
-        unk2->compareResult = 0;
+        unk2->unk_14 = 0;
     }
 }
 
-// another if not and ???
 void sub_0807EEB4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) { // TODO unk_18 another compare flag?
+    if (!unk2->unk_18) {
         unk2->unk_18 = 1;
         sub_0807DEDC(unk1, unk2, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI);
     }
     sub_0807EE30(unk1, unk2);
-    if (!unk2->compareResult) {
-        gUnk_02033280.unk_06 = 0; // TODO research unk_06
+    if (!unk2->unk_14) {
+        gUnk_02033280.unk_06 = 0;
     }
 }
 
-// another if not ???
 void sub_0807EEF4(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        sub_0807DEDC(unk1, unk2, unk1->x.HALF.HI + ((s16)unk2->unk_00.raw[1]),
-                     unk1->y.HALF.HI + ((s16)unk2->unk_00.raw[2]));
+        sub_0807DEDC(unk1, unk2, unk1->x.HALF.HI + ((s16)unk2->unk_00[1]), unk1->y.HALF.HI + ((s16)unk2->unk_00[2]));
     }
     sub_0807EE30(unk1, unk2);
-    if (!unk2->compareResult) {
+    if (!unk2->unk_14) {
         gUnk_02033280.unk_06 = 0;
     }
 }
@@ -1475,8 +1302,8 @@ void sub_0807EEF4(Entity* unk1, ScriptExecutionContext* unk2) {
 void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) {
     if (!unk2->unk_18) {
         unk2->unk_18 = 1;
-        unk1->field_0x20 = ((s16)unk2->unk_00.raw[1]) << 8;
-        unk2->unk_1C.HALF.LO = unk2->unk_00.raw[2] << 8;
+        unk1->field_0x20 = ((s16)unk2->unk_00[1]) << 8;
+        unk2->unk_1C.HALF.LO = unk2->unk_00[2] << 8;
         sub_08003FC4(unk1, (u16)unk2->unk_1C.HALF.LO);
     } else {
         if (!sub_08003FC4(unk1, (u16)unk2->unk_1C.HALF.LO))
@@ -1485,30 +1312,28 @@ void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) {
     gUnk_02033280.unk_06 = 0;
 }
 
-// set one bit in unk_08
 void sub_0807EF80(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_08 |= 1 << unk2->unk_00.raw[1];
+    unk2->unk_08 |= 1 << unk2->unk_00[1];
 }
 
-// set one bit in unk_08
 void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_08 |= 1 << unk2->unk_00.raw[1];
+    unk2->unk_08 |= 1 << unk2->unk_00[1];
 }
 
 void sub_0807EFA0(Entity* unk1, ScriptExecutionContext* unk2) {
-    SoundReq(unk2->unk_00.raw[1]);
+    SoundReq(unk2->unk_00[1]);
 }
 
 void sub_0807EFAC(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_00.raw[1] >= 100) {
+    if (unk2->unk_00[1] >= 100) {
         SoundReq(gArea.musicIndex);
     } else {
-        SoundReq(unk2->unk_00.raw[1]);
+        SoundReq(unk2->unk_00[1]);
     }
 }
 
 void sub_0807EFD4(Entity* unk1, ScriptExecutionContext* unk2) {
-    SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw));
+    SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
 }
 
 void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1516,11 +1341,11 @@ void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807EFF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    ModRupees((s16)unk2->unk_00.raw[1]);
+    ModRupees((s16)unk2->unk_00[1]);
 }
 
 void sub_0807F004(Entity* unk1, ScriptExecutionContext* unk2) {
-    ModHealth(unk2->unk_00.commands[0].metadata);
+    ModHealth(unk2->unk_00[1]);
 }
 
 void sub_0807F010(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1530,28 +1355,27 @@ void sub_0807F010(Entity* unk1, ScriptExecutionContext* unk2) {
 
 void sub_0807F034(Entity* unk1, ScriptExecutionContext* unk2) {
     u32 tmp = 0;
-    if (unk2->unk_00.raw[1] == 0x3F) {
+    if (unk2->unk_00[1] == 0x3F) {
         tmp = unk2->unk_04;
     }
-    sub_080A7C18(unk2->unk_00.raw[1], tmp, 0);
+    sub_080A7C18(unk2->unk_00[1], tmp, 0);
 }
 
 void sub_0807F050(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080A7C18(0x5C, unk2->unk_00.raw[1], 0);
+    sub_080A7C18(0x5C, unk2->unk_00[1], 0);
 }
 
-// get inventory value and compare ??
 void sub_0807F060(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = GetInventoryValue(unk2->unk_00.raw[1]);
-    unk2->compareResult = unk2->unk_04 != 0;
+    unk2->unk_04 = GetInventoryValue(unk2->unk_00[1]);
+    unk2->unk_14 = unk2->unk_04 != 0;
 }
 
 void sub_0807F078(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_0807CAA0(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
+    sub_0807CAA0(unk2->unk_00[1], unk2->unk_00[2]);
 }
 
 void sub_0807F088(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080A7C18(unk2->unk_00.raw[1], 0, 3);
+    sub_080A7C18(unk2->unk_00[1], 0, 3);
 }
 
 void sub_0807F098(Entity* unk1, ScriptExecutionContext* unk2) {
@@ -1563,9 +1387,9 @@ void sub_0807F0A4(Entity* unk1, ScriptExecutionContext* unk2) {
 }
 
 void sub_0807F0B4(Entity* unk1, ScriptExecutionContext* unk2) {
-    gRoomControls.unk5 = unk2->unk_00.raw[1] & 7;
+    gRoomControls.unk5 = unk2->unk_00[1] & 7;
 }
 
 void sub_0807F0C8(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08080964(unk2->unk_00.raw[1], unk2->unk_00.raw[2]);
+    sub_08080964(unk2->unk_00[1], unk2->unk_00[2]);
 }
diff --git a/src/scripts/npc4e_fusion.c b/src/scripts/npc4e_fusion.c
deleted file mode 100644
index ad07d84e..00000000
--- a/src/scripts/npc4e_fusion.c
+++ /dev/null
@@ -1,40 +0,0 @@
-// macro helpers
-#define WORD_TO_SHORTS(word) (unsigned short)word & 0x00ff,(unsigned short)word >> 16,
-
-// script commands
-#define START_EXECUTING_SCRIPTS() 0x0401,
-#define STOP_EXECUTING_SCRIPTS() 0x0402,
-#define CHECK_KINSTONE_FUSED(id) 0x081d, id,
-#define JUMP_IF_TRUE(offset) 0x0804, offset,
-#define sub_0807E6AC(word) 0x0c33, WORD_TO_SHORTS(word)
-#define sub_0807EF80(param) 0x0879, param,
-#define sub_0807E680(param) 0x0831, param,
-#define sub_0807EBC0(param) 0x0867, param,
-#define sub_0807ECF4(param) 0x0871, param,
-#define sub_0807E680(param) 0x0831, param,
-#define sub_0807EF80(param) 0x0879, param,
-#define sub_0807E5F8(word) 0x0c28, WORD_TO_SHORTS(word)
-
-
-const unsigned short gUnk_08016030[] = {
-    // clang-format off
-    START_EXECUTING_SCRIPTS()
-    CHECK_KINSTONE_FUSED(9)
-    JUMP_IF_TRUE(0x2a)
-    STOP_EXECUTING_SCRIPTS()
-    sub_0807E6AC(0x00000001)
-    sub_0807EF80(0x0010)
-    sub_0807E680(0x003c)
-    sub_0807EBC0(0x0020)
-    sub_0807ECF4(0x0080)
-    sub_0807E680(0x001e)
-    sub_0807EF80(0x0010)
-    sub_0807E5F8(0x0000008)
-    // clang-format on
-    0xffff,
-    0x0c6a,
-    0xfff0,
-    0x0000,
-    0xffff,
-    0x0000
-};

From a35c22e940efc7af89562e725575a4e79394ab2e Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Thu, 4 Mar 2021 19:49:46 +0100
Subject: [PATCH 11/46] started naming script stuff

---
 asm/castleMaid.s        |    4 +-
 asm/castorWildsStatue.s |    4 +-
 asm/code_0805436C.s     |    4 +-
 asm/code_080732D0.s     |    8 +-
 asm/code_0807F0D8.s     |  100 +--
 asm/code_080A5574.s     |   12 +-
 asm/figurineDevice.s    |    8 +-
 asm/fourElements.s      |    4 +-
 asm/gorman.s            |    8 +-
 asm/goronMerchant.s     |    4 +-
 asm/guardWithSpear.s    |    4 +-
 asm/kid.s               |    8 +-
 asm/minishEzlo.s        |    8 +-
 asm/object6.s           |    4 +-
 asm/object6A.s          |   16 +-
 asm/object97.s          |   12 +-
 asm/objectB9.s          |    4 +-
 asm/percy.s             |    4 +-
 asm/phonograph.s        |    4 +-
 asm/picolyteBottles.s   |    8 +-
 asm/postman.s           |    4 +-
 asm/rem.s               |   28 +-
 asm/stockwell.s         |    8 +-
 asm/windTribespeople.s  |    4 +-
 include/greatFairy.h    |    2 +-
 include/script.h        |    6 +-
 include/structures.h    |    8 +-
 linker.ld               |    2 +-
 src/npc/ezloCap.c       |    2 +-
 src/npc/goron.c         |    2 +-
 src/npc/postman.c       |    2 +-
 src/npc/townsperson.c   |    2 +-
 src/npc/zelda.c         |    4 +-
 src/object/greatFairy.c |    2 +-
 src/script.c            | 1279 ++++++++++++++++++++-------------------
 35 files changed, 804 insertions(+), 779 deletions(-)

diff --git a/asm/castleMaid.s b/asm/castleMaid.s
index 51f71954..f8f6d720 100644
--- a/asm/castleMaid.s
+++ b/asm/castleMaid.s
@@ -343,10 +343,10 @@ _08064776:
 	lsls r0, r0, #0x10
 	cmp r0, #0
 	beq _08064788
-	ldr r1, _0806478C @ =gUnk_02033280
+	ldr r1, _0806478C @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _08064788:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0806478C: .4byte gUnk_02033280
+_0806478C: .4byte gActiveScriptInfo
diff --git a/asm/castorWildsStatue.s b/asm/castorWildsStatue.s
index b08602c1..957ac56c 100644
--- a/asm/castorWildsStatue.s
+++ b/asm/castorWildsStatue.s
@@ -503,13 +503,13 @@ _08067734:
 	cmp r0, #0
 	beq _08067748
 _08067742:
-	ldr r1, _0806774C @ =gUnk_02033280
+	ldr r1, _0806774C @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _08067748:
 	pop {pc}
 	.align 2, 0
-_0806774C: .4byte gUnk_02033280
+_0806774C: .4byte gActiveScriptInfo
 
 	thumb_func_start CastorWildsStatue_Fusion
 CastorWildsStatue_Fusion: @ 0x08067750
diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s
index 8b559fc7..4ab2c097 100644
--- a/asm/code_0805436C.s
+++ b/asm/code_0805436C.s
@@ -875,7 +875,7 @@ _08054F60: .4byte 0x00004074
 sub_08054F64: @ 0x08054F64
 	push {lr}
 	ldrb r0, [r0, #0xb]
-	ldr r3, _08054F7C @ =gUnk_02033280
+	ldr r3, _08054F7C @ =gActiveScriptInfo
 	ldr r2, [r3]
 	adds r1, r2, #0
 	ands r1, r0
@@ -885,7 +885,7 @@ sub_08054F64: @ 0x08054F64
 	strb r0, [r3, #6]
 	b _08054F8C
 	.align 2, 0
-_08054F7C: .4byte gUnk_02033280
+_08054F7C: .4byte gActiveScriptInfo
 _08054F80:
 	bics r2, r1
 	str r2, [r3]
diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s
index 9ce6bf12..0717d0c5 100644
--- a/asm/code_080732D0.s
+++ b/asm/code_080732D0.s
@@ -3874,7 +3874,7 @@ sub_08074F8C: @ 0x08074F8C
 	bne _08074FAC
 	movs r0, #0
 	strb r0, [r3]
-	ldr r2, _08074FDC @ =gUnk_02033280
+	ldr r2, _08074FDC @ =gActiveScriptInfo
 	ldr r0, [r2]
 	movs r1, #4
 	orrs r0, r1
@@ -3904,7 +3904,7 @@ _08074FAC:
 	lsls r0, r0, #3
 	b _08074FE8
 	.align 2, 0
-_08074FDC: .4byte gUnk_02033280
+_08074FDC: .4byte gActiveScriptInfo
 _08074FE0: .4byte gPlayerState
 _08074FE4:
 	movs r0, #0x80
@@ -4310,13 +4310,13 @@ _080752D0:
 	cmp r0, #0
 	beq _080752E2
 _080752DC:
-	ldr r1, _080752E4 @ =gUnk_02033280
+	ldr r1, _080752E4 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _080752E2:
 	pop {r4, r5, pc}
 	.align 2, 0
-_080752E4: .4byte gUnk_02033280
+_080752E4: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_080752E8
 sub_080752E8: @ 0x080752E8
diff --git a/asm/code_0807F0D8.s b/asm/code_0807F0D8.s
index 11f24fbc..265f7010 100644
--- a/asm/code_0807F0D8.s
+++ b/asm/code_0807F0D8.s
@@ -125,7 +125,7 @@ sub_0807F1A0: @ 0x0807F1A0
 	movs r4, #0x32
 	ldrsh r3, [r3, r4]
 	bl sub_0807DEDC
-	ldr r2, _0807F1C0 @ =gUnk_02033280
+	ldr r2, _0807F1C0 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -133,7 +133,7 @@ sub_0807F1A0: @ 0x0807F1A0
 	pop {r4, pc}
 	.align 2, 0
 _0807F1BC: .4byte gPlayerEntity
-_0807F1C0: .4byte gUnk_02033280
+_0807F1C0: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F1C4
 sub_0807F1C4: @ 0x0807F1C4
@@ -271,7 +271,7 @@ sub_0807F2A8: @ 0x0807F2A8
 	ldr r0, [r0]
 	cmp r0, #0
 	bne _0807F2C8
-	ldr r2, _0807F2C4 @ =gUnk_02033280
+	ldr r2, _0807F2C4 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -279,15 +279,15 @@ sub_0807F2A8: @ 0x0807F2A8
 	b _0807F2CE
 	.align 2, 0
 _0807F2C0: .4byte gPlayerState
-_0807F2C4: .4byte gUnk_02033280
+_0807F2C4: .4byte gActiveScriptInfo
 _0807F2C8:
-	ldr r1, _0807F2D0 @ =gUnk_02033280
+	ldr r1, _0807F2D0 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807F2CE:
 	pop {pc}
 	.align 2, 0
-_0807F2D0: .4byte gUnk_02033280
+_0807F2D0: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F2D4
 sub_0807F2D4: @ 0x0807F2D4
@@ -300,21 +300,21 @@ sub_0807F2D4: @ 0x0807F2D4
 	lsrs r1, r0, #0x18
 	cmp r1, #0
 	beq _0807F2F8
-	ldr r2, _0807F2F4 @ =gUnk_02033280
+	ldr r2, _0807F2F4 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
 	strb r0, [r2, #7]
 	b _0807F2FC
 	.align 2, 0
-_0807F2F4: .4byte gUnk_02033280
+_0807F2F4: .4byte gActiveScriptInfo
 _0807F2F8:
-	ldr r0, _0807F300 @ =gUnk_02033280
+	ldr r0, _0807F300 @ =gActiveScriptInfo
 	strb r1, [r0, #6]
 _0807F2FC:
 	pop {pc}
 	.align 2, 0
-_0807F300: .4byte gUnk_02033280
+_0807F300: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F304
 sub_0807F304: @ 0x0807F304
@@ -328,7 +328,7 @@ sub_0807F304: @ 0x0807F304
 	lsrs r1, r0, #0x18
 	cmp r1, #0
 	beq _0807F32C
-	ldr r2, _0807F328 @ =gUnk_02033280
+	ldr r2, _0807F328 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -336,14 +336,14 @@ sub_0807F304: @ 0x0807F304
 	b _0807F330
 	.align 2, 0
 _0807F324: .4byte gPlayerEntity
-_0807F328: .4byte gUnk_02033280
+_0807F328: .4byte gActiveScriptInfo
 _0807F32C:
-	ldr r0, _0807F334 @ =gUnk_02033280
+	ldr r0, _0807F334 @ =gActiveScriptInfo
 	strb r1, [r0, #6]
 _0807F330:
 	pop {pc}
 	.align 2, 0
-_0807F334: .4byte gUnk_02033280
+_0807F334: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F338
 sub_0807F338: @ 0x0807F338
@@ -509,14 +509,14 @@ _0807F44C:
 	strb r0, [r3]
 	str r2, [r1, #4]
 _0807F452:
-	ldr r2, _0807F460 @ =gUnk_02033280
+	ldr r2, _0807F460 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
 	strb r0, [r2, #7]
 	pop {pc}
 	.align 2, 0
-_0807F460: .4byte gUnk_02033280
+_0807F460: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F464
 sub_0807F464: @ 0x0807F464
@@ -589,13 +589,13 @@ _0807F4BC:
 	strh r0, [r4, #0x2e]
 	b _0807F4F0
 _0807F4EA:
-	ldr r1, _0807F4F4 @ =gUnk_02033280
+	ldr r1, _0807F4F4 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807F4F0:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0807F4F4: .4byte gUnk_02033280
+_0807F4F4: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F4F8
 sub_0807F4F8: @ 0x0807F4F8
@@ -665,13 +665,13 @@ _0807F548:
 	strh r0, [r4, #0x32]
 	b _0807F57C
 _0807F576:
-	ldr r1, _0807F580 @ =gUnk_02033280
+	ldr r1, _0807F580 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807F57C:
 	pop {r4, r5, pc}
 	.align 2, 0
-_0807F580: .4byte gUnk_02033280
+_0807F580: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F584
 sub_0807F584: @ 0x0807F584
@@ -691,14 +691,14 @@ sub_0807F594: @ 0x0807F594
 	ldrb r0, [r0]
 	cmp r0, #0
 	beq _0807F5A6
-	ldr r1, _0807F5AC @ =gUnk_02033280
+	ldr r1, _0807F5AC @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807F5A6:
 	pop {pc}
 	.align 2, 0
 _0807F5A8: .4byte gPlayerState
-_0807F5AC: .4byte gUnk_02033280
+_0807F5AC: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F5B0
 sub_0807F5B0: @ 0x0807F5B0
@@ -757,7 +757,7 @@ _0807F602:
 	ldrsh r0, [r4, r2]
 	cmp r3, r0
 	bne _0807F628
-	ldr r2, _0807F624 @ =gUnk_02033280
+	ldr r2, _0807F624 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -765,15 +765,15 @@ _0807F602:
 	b _0807F62E
 	.align 2, 0
 _0807F620: .4byte gRoomControls
-_0807F624: .4byte gUnk_02033280
+_0807F624: .4byte gActiveScriptInfo
 _0807F628:
-	ldr r1, _0807F630 @ =gUnk_02033280
+	ldr r1, _0807F630 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807F62E:
 	pop {r4, pc}
 	.align 2, 0
-_0807F630: .4byte gUnk_02033280
+_0807F630: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F634
 sub_0807F634: @ 0x0807F634
@@ -831,7 +831,7 @@ sub_0807F680: @ 0x0807F680
 	movs r3, #1
 _0807F69A:
 	str r3, [r2, #0x14]
-	ldr r2, _0807F6B0 @ =gUnk_02033280
+	ldr r2, _0807F6B0 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -840,7 +840,7 @@ _0807F69A:
 	.align 2, 0
 _0807F6A8: .4byte gPlayerEntity
 _0807F6AC: .4byte gRoomControls
-_0807F6B0: .4byte gUnk_02033280
+_0807F6B0: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F6B4
 sub_0807F6B4: @ 0x0807F6B4
@@ -859,7 +859,7 @@ sub_0807F6B4: @ 0x0807F6B4
 	movs r3, #1
 _0807F6CE:
 	str r3, [r2, #0x14]
-	ldr r2, _0807F6E4 @ =gUnk_02033280
+	ldr r2, _0807F6E4 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -868,7 +868,7 @@ _0807F6CE:
 	.align 2, 0
 _0807F6DC: .4byte gPlayerEntity
 _0807F6E0: .4byte gRoomControls
-_0807F6E4: .4byte gUnk_02033280
+_0807F6E4: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F6E8
 sub_0807F6E8: @ 0x0807F6E8
@@ -1018,7 +1018,7 @@ _0807F7D2:
 	movs r2, #1
 _0807F7E4:
 	str r2, [r4, #0x14]
-	ldr r2, _0807F7FC @ =gUnk_02033280
+	ldr r2, _0807F7FC @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -1027,7 +1027,7 @@ _0807F7E4:
 	.align 2, 0
 _0807F7F4: .4byte gRoomVars
 _0807F7F8: .4byte gSave
-_0807F7FC: .4byte gUnk_02033280
+_0807F7FC: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F800
 sub_0807F800: @ 0x0807F800
@@ -1049,7 +1049,7 @@ _0807F80C:
 	ldr r1, _0807F834 @ =gRoomVars
 	movs r0, #0
 	strb r0, [r1, #6]
-	ldr r2, _0807F838 @ =gUnk_02033280
+	ldr r2, _0807F838 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -1057,7 +1057,7 @@ _0807F80C:
 	pop {r4, pc}
 	.align 2, 0
 _0807F834: .4byte gRoomVars
-_0807F838: .4byte gUnk_02033280
+_0807F838: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F83C
 sub_0807F83C: @ 0x0807F83C
@@ -1144,14 +1144,14 @@ sub_0807F8D0: @ 0x0807F8D0
 	push {lr}
 	ldr r1, [r1, #4]
 	bl sub_08003FC4
-	ldr r2, _0807F8E4 @ =gUnk_02033280
+	ldr r2, _0807F8E4 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
 	strb r0, [r2, #7]
 	pop {pc}
 	.align 2, 0
-_0807F8E4: .4byte gUnk_02033280
+_0807F8E4: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807F8E8
 sub_0807F8E8: @ 0x0807F8E8
@@ -1314,14 +1314,14 @@ _0807F9C4: @ jump table
 	.4byte _0807FA24 @ case 22
 	.4byte _0807FA24 @ case 23
 _0807FA24:
-	ldr r1, _0807FA2C @ =gUnk_02033280
+	ldr r1, _0807FA2C @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 	b _0807FA3A
 	.align 2, 0
-_0807FA2C: .4byte gUnk_02033280
+_0807FA2C: .4byte gActiveScriptInfo
 _0807FA30:
-	ldr r2, _0807FA3C @ =gUnk_02033280
+	ldr r2, _0807FA3C @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -1329,7 +1329,7 @@ _0807FA30:
 _0807FA3A:
 	pop {pc}
 	.align 2, 0
-_0807FA3C: .4byte gUnk_02033280
+_0807FA3C: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807FA40
 sub_0807FA40: @ 0x0807FA40
@@ -1374,14 +1374,14 @@ _0807FA60: @ jump table
 	.4byte _0807FAC0 @ case 22
 	.4byte _0807FAC0 @ case 23
 _0807FAC0:
-	ldr r1, _0807FAC8 @ =gUnk_02033280
+	ldr r1, _0807FAC8 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 	b _0807FAD6
 	.align 2, 0
-_0807FAC8: .4byte gUnk_02033280
+_0807FAC8: .4byte gActiveScriptInfo
 _0807FACC:
-	ldr r2, _0807FAD8 @ =gUnk_02033280
+	ldr r2, _0807FAD8 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -1389,7 +1389,7 @@ _0807FACC:
 _0807FAD6:
 	pop {pc}
 	.align 2, 0
-_0807FAD8: .4byte gUnk_02033280
+_0807FAD8: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807FADC
 sub_0807FADC: @ 0x0807FADC
@@ -1427,13 +1427,13 @@ _0807FB16:
 	bl sub_0808C688
 	b _0807FB22
 _0807FB1C:
-	ldr r1, _0807FB24 @ =gUnk_02033280
+	ldr r1, _0807FB24 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807FB22:
 	pop {r4, pc}
 	.align 2, 0
-_0807FB24: .4byte gUnk_02033280
+_0807FB24: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807FB28
 sub_0807FB28: @ 0x0807FB28
@@ -1460,13 +1460,13 @@ _0807FB3A:
 	.align 2, 0
 _0807FB54: .4byte 0x00007FFF
 _0807FB58:
-	ldr r1, _0807FB60 @ =gUnk_02033280
+	ldr r1, _0807FB60 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807FB5E:
 	pop {r4, pc}
 	.align 2, 0
-_0807FB60: .4byte gUnk_02033280
+_0807FB60: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807FB64
 sub_0807FB64: @ 0x0807FB64
@@ -1552,13 +1552,13 @@ sub_0807FBD4: @ 0x0807FBD4
 	bl sub_080040A8
 	cmp r0, #0
 	beq _0807FBF4
-	ldr r1, _0807FBF8 @ =gUnk_02033280
+	ldr r1, _0807FBF8 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0807FBF4:
 	pop {r4, pc}
 	.align 2, 0
-_0807FBF8: .4byte gUnk_02033280
+_0807FBF8: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0807FBFC
 sub_0807FBFC: @ 0x0807FBFC
diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s
index cbe07816..1bd8ec85 100644
--- a/asm/code_080A5574.s
+++ b/asm/code_080A5574.s
@@ -3709,7 +3709,7 @@ sub_080A7250: @ 0x080A7250
 	movs r2, #0x80
 	lsls r2, r2, #1
 	bl MemCopy
-	ldr r0, _080A7310 @ =gUnk_02033280
+	ldr r0, _080A7310 @ =gActiveScriptInfo
 	movs r2, #0xd5
 	lsls r2, r2, #2
 	adds r1, r4, r2
@@ -3750,7 +3750,7 @@ _080A7300: .4byte gUnk_02032F14
 _080A7304: .4byte gUnk_02001A00
 _080A7308: .4byte gRoomControls
 _080A730C: .4byte gUnk_03000420
-_080A7310: .4byte gUnk_02033280
+_080A7310: .4byte gActiveScriptInfo
 _080A7314: .4byte gScreenTransition
 _080A7318: .4byte gPlayerState
 _080A731C: .4byte gUnk_02017654
@@ -3775,7 +3775,7 @@ sub_080A7328: @ 0x080A7328
 	movs r1, #0x80
 	lsls r1, r1, #1
 	bl MemClear32
-	ldr r4, _080A7398 @ =gUnk_02033280
+	ldr r4, _080A7398 @ =gActiveScriptInfo
 	adds r0, r4, #0
 	movs r1, #0xc
 	bl MemClear32
@@ -3803,7 +3803,7 @@ _080A7388: .4byte gFadeControl
 _080A738C: .4byte gMenu
 _080A7390: .4byte gRoomControls
 _080A7394: .4byte gUnk_03000420
-_080A7398: .4byte gUnk_02033280
+_080A7398: .4byte gActiveScriptInfo
 _080A739C: .4byte gUnk_02024490
 _080A73A0: .4byte gUnk_02032EC0
 _080A73A4: .4byte gScreenTransition
@@ -3836,7 +3836,7 @@ _080A73B4:
 	movs r1, #0xea
 	lsls r1, r1, #2
 	adds r0, r5, r1
-	ldr r1, _080A7480 @ =gUnk_02033280
+	ldr r1, _080A7480 @ =gActiveScriptInfo
 	movs r2, #0xc
 	bl MemCopy
 	movs r1, #0xaa
@@ -3899,7 +3899,7 @@ _080A7470: .4byte gUnk_02032EC0
 _080A7474: .4byte gPlayerState
 _080A7478: .4byte gUnk_02025EB0
 _080A747C: .4byte gUnk_0200B650
-_080A7480: .4byte gUnk_02033280
+_080A7480: .4byte gActiveScriptInfo
 _080A7484: .4byte gUnk_03000420
 _080A7488: .4byte gUnk_02001A00
 _080A748C: .4byte gUnk_02024490
diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s
index bf0213bb..9d02534e 100644
--- a/asm/figurineDevice.s
+++ b/asm/figurineDevice.s
@@ -1386,7 +1386,7 @@ _0808863E:
 	movs r0, #0
 	str r0, [r4, #0x14]
 _08088642:
-	ldr r2, _08088654 @ =gUnk_02033280
+	ldr r2, _08088654 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -1394,7 +1394,7 @@ _08088642:
 	pop {r4, pc}
 	.align 2, 0
 _08088650: .4byte gPlayerEntity
-_08088654: .4byte gUnk_02033280
+_08088654: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08088658
 sub_08088658: @ 0x08088658
@@ -1414,7 +1414,7 @@ sub_08088658: @ 0x08088658
 	movs r0, #0
 	str r0, [r4, #0x14]
 _08088678:
-	ldr r2, _08088688 @ =gUnk_02033280
+	ldr r2, _08088688 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -1422,4 +1422,4 @@ _08088678:
 	pop {r4, pc}
 	.align 2, 0
 _08088684: .4byte gPlayerEntity
-_08088688: .4byte gUnk_02033280
+_08088688: .4byte gActiveScriptInfo
diff --git a/asm/fourElements.s b/asm/fourElements.s
index 63271cb5..e69d1373 100644
--- a/asm/fourElements.s
+++ b/asm/fourElements.s
@@ -114,7 +114,7 @@ _080A028C: .4byte gUnk_0800A0B4
 sub_080A0290: @ 0x080A0290
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r5, _080A02BC @ =gUnk_02033280
+	ldr r5, _080A02BC @ =gActiveScriptInfo
 	ldr r0, [r5]
 	movs r1, #4
 	ands r0, r1
@@ -133,7 +133,7 @@ sub_080A0290: @ 0x080A0290
 	strh r0, [r4, #0x36]
 	b _080A02CA
 	.align 2, 0
-_080A02BC: .4byte gUnk_02033280
+_080A02BC: .4byte gActiveScriptInfo
 _080A02C0:
 	movs r1, #2
 	strb r1, [r4, #0xc]
diff --git a/asm/gorman.s b/asm/gorman.s
index 753e767c..9760e2f9 100644
--- a/asm/gorman.s
+++ b/asm/gorman.s
@@ -272,7 +272,7 @@ sub_0806991C: @ 0x0806991C
 	ldrb r0, [r0]
 	orrs r1, r0
 	strb r1, [r5, #0x14]
-	ldr r2, _080699A8 @ =gUnk_02033280
+	ldr r2, _080699A8 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -282,7 +282,7 @@ sub_0806991C: @ 0x0806991C
 _0806999C: .4byte gUnk_08111C5C
 _080699A0: .4byte gRoomControls
 _080699A4: .4byte gUnk_08111C74
-_080699A8: .4byte gUnk_02033280
+_080699A8: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_080699AC
 sub_080699AC: @ 0x080699AC
@@ -342,7 +342,7 @@ sub_080699AC: @ 0x080699AC
 	ldrb r0, [r0]
 	orrs r1, r0
 	strb r1, [r5, #0x14]
-	ldr r2, _08069A38 @ =gUnk_02033280
+	ldr r2, _08069A38 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -352,7 +352,7 @@ sub_080699AC: @ 0x080699AC
 _08069A2C: .4byte gUnk_08111C84
 _08069A30: .4byte gRoomControls
 _08069A34: .4byte gUnk_08111C8C
-_08069A38: .4byte gUnk_02033280
+_08069A38: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08069A3C
 sub_08069A3C: @ 0x08069A3C
diff --git a/asm/goronMerchant.s b/asm/goronMerchant.s
index 80e01bd6..6f9d3259 100644
--- a/asm/goronMerchant.s
+++ b/asm/goronMerchant.s
@@ -50,7 +50,7 @@ _08069766:
 	movs r0, #0
 _0806976E:
 	str r0, [r7, #0x14]
-	ldr r2, _08069780 @ =gUnk_02033280
+	ldr r2, _08069780 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -58,4 +58,4 @@ _0806976E:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _0806977C: .4byte 0x00002C1E
-_08069780: .4byte gUnk_02033280
+_08069780: .4byte gActiveScriptInfo
diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s
index 18957b2c..14da7633 100644
--- a/asm/guardWithSpear.s
+++ b/asm/guardWithSpear.s
@@ -139,13 +139,13 @@ _08064168:
 	lsls r0, r0, #0x10
 	cmp r0, #0
 	beq _0806417A
-	ldr r1, _0806417C @ =gUnk_02033280
+	ldr r1, _0806417C @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0806417A:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0806417C: .4byte gUnk_02033280
+_0806417C: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08064180
 sub_08064180: @ 0x08064180
diff --git a/asm/kid.s b/asm/kid.s
index 88f596e0..ccc90dd2 100644
--- a/asm/kid.s
+++ b/asm/kid.s
@@ -897,13 +897,13 @@ _0806274A:
 	.align 2, 0
 _08062778: .4byte gRoomControls
 _0806277C:
-	ldr r1, _08062784 @ =gUnk_02033280
+	ldr r1, _08062784 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _08062782:
 	pop {r4, r5, pc}
 	.align 2, 0
-_08062784: .4byte gUnk_02033280
+_08062784: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08062788
 sub_08062788: @ 0x08062788
@@ -1228,13 +1228,13 @@ _08062A30:
 	lsls r0, r0, #0x10
 	cmp r0, #0
 	beq _08062A42
-	ldr r1, _08062A44 @ =gUnk_02033280
+	ldr r1, _08062A44 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _08062A42:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08062A44: .4byte gUnk_02033280
+_08062A44: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08062A48
 sub_08062A48: @ 0x08062A48
diff --git a/asm/minishEzlo.s b/asm/minishEzlo.s
index 39185631..438e9ae2 100644
--- a/asm/minishEzlo.s
+++ b/asm/minishEzlo.s
@@ -300,7 +300,7 @@ _08063186:
 	adds r1, #0x80
 	movs r0, #0x11
 	strh r0, [r1]
-	ldr r2, _080631B8 @ =gUnk_02033280
+	ldr r2, _080631B8 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -308,7 +308,7 @@ _08063186:
 	b _080631DC
 	.align 2, 0
 _080631B4: .4byte 0x0000033F
-_080631B8: .4byte gUnk_02033280
+_080631B8: .4byte gActiveScriptInfo
 _080631BC:
 	lsls r0, r3, #1
 	adds r0, r2, r0
@@ -324,11 +324,11 @@ _080631CA:
 	adds r0, r4, #0
 	movs r3, #0
 	bl sub_0805EC9C
-	ldr r1, _080631E4 @ =gUnk_02033280
+	ldr r1, _080631E4 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _080631DC:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 _080631E0: .4byte 0xFFFE0000
-_080631E4: .4byte gUnk_02033280
+_080631E4: .4byte gActiveScriptInfo
diff --git a/asm/object6.s b/asm/object6.s
index 2f89320b..038c3924 100644
--- a/asm/object6.s
+++ b/asm/object6.s
@@ -730,7 +730,7 @@ _08082E44:
 	rsbs r0, r0, #0
 	cmp r1, r0
 	ble _08082E5E
-	ldr r0, _08082E68 @ =gUnk_02033280
+	ldr r0, _08082E68 @ =gActiveScriptInfo
 	ldr r1, [r0]
 	movs r2, #2
 	orrs r1, r2
@@ -741,7 +741,7 @@ _08082E5E:
 	bl UpdateAnimationSingleFrame
 	pop {r4, pc}
 	.align 2, 0
-_08082E68: .4byte gUnk_02033280
+_08082E68: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08082E6C
 sub_08082E6C: @ 0x08082E6C
diff --git a/asm/object6A.s b/asm/object6A.s
index f6cde33d..ec4f6933 100644
--- a/asm/object6A.s
+++ b/asm/object6A.s
@@ -127,12 +127,12 @@ sub_08094B0C: @ 0x08094B0C
 	.align 2, 0
 _08094B2C: .4byte 0x0000FFE0
 _08094B30:
-	ldr r0, _08094B38 @ =gUnk_02033280
+	ldr r0, _08094B38 @ =gActiveScriptInfo
 	strb r3, [r0, #6]
 _08094B34:
 	pop {pc}
 	.align 2, 0
-_08094B38: .4byte gUnk_02033280
+_08094B38: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08094B3C
 sub_08094B3C: @ 0x08094B3C
@@ -155,13 +155,13 @@ sub_08094B3C: @ 0x08094B3C
 	.align 2, 0
 _08094B5C: .4byte 0x0000FFF3
 _08094B60:
-	ldr r1, _08094B68 @ =gUnk_02033280
+	ldr r1, _08094B68 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _08094B66:
 	pop {pc}
 	.align 2, 0
-_08094B68: .4byte gUnk_02033280
+_08094B68: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08094B6C
 sub_08094B6C: @ 0x08094B6C
@@ -2005,7 +2005,7 @@ _080959AC: .4byte gUnk_08122AF8
 _080959B0: .4byte 0x0000FFFD
 _080959B4: .4byte gUnk_08012C48
 _080959B8:
-	ldr r0, _080959C8 @ =gUnk_02033280
+	ldr r0, _080959C8 @ =gActiveScriptInfo
 	ldr r1, [r0]
 	movs r2, #0x80
 	lsls r2, r2, #1
@@ -2014,7 +2014,7 @@ _080959B8:
 _080959C4:
 	pop {r4, r5, pc}
 	.align 2, 0
-_080959C8: .4byte gUnk_02033280
+_080959C8: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_080959CC
 sub_080959CC: @ 0x080959CC
@@ -2550,7 +2550,7 @@ _08095DB8:
 sub_08095DBC: @ 0x08095DBC
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r5, _08095DF0 @ =gUnk_02033280
+	ldr r5, _08095DF0 @ =gActiveScriptInfo
 	ldr r0, [r5]
 	movs r1, #0x10
 	ands r0, r1
@@ -2574,7 +2574,7 @@ _08095DE6:
 	bl sub_0807DDAC
 	b _08095E74
 	.align 2, 0
-_08095DF0: .4byte gUnk_02033280
+_08095DF0: .4byte gActiveScriptInfo
 _08095DF4:
 	ldrb r0, [r4, #0xc]
 	cmp r0, #0
diff --git a/asm/object97.s b/asm/object97.s
index c597b8ea..f237a9d2 100644
--- a/asm/object97.s
+++ b/asm/object97.s
@@ -950,11 +950,11 @@ sub_0809E0D4: @ 0x0809E0D4
 	ldrb r0, [r1, #0xc]
 	cmp r0, #1
 	bhi _0809E0FE
-	ldr r0, _0809E0F8 @ =gUnk_02033280
+	ldr r0, _0809E0F8 @ =gActiveScriptInfo
 	strb r2, [r0, #6]
 	b _0809E1BC
 	.align 2, 0
-_0809E0F8: .4byte gUnk_02033280
+_0809E0F8: .4byte gActiveScriptInfo
 _0809E0FC:
 	ldr r1, _0809E124 @ =gPlayerEntity
 _0809E0FE:
@@ -971,13 +971,13 @@ _0809E0FE:
 	bl sub_0807DEDC
 	ldr r0, _0809E128 @ =0x00000123
 	bl SoundReq
-	ldr r0, _0809E12C @ =gUnk_02033280
+	ldr r0, _0809E12C @ =gActiveScriptInfo
 	strb r4, [r0, #6]
 	b _0809E1BC
 	.align 2, 0
 _0809E124: .4byte gPlayerEntity
 _0809E128: .4byte 0x00000123
-_0809E12C: .4byte gUnk_02033280
+_0809E12C: .4byte gActiveScriptInfo
 _0809E130:
 	ldr r1, [r5, #0x54]
 	cmp r1, #0
@@ -1047,7 +1047,7 @@ _0809E170:
 	bl SoundReq
 	b _0809E1BC
 _0809E1B6:
-	ldr r1, _0809E1C4 @ =gUnk_02033280
+	ldr r1, _0809E1C4 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0809E1BC:
@@ -1055,7 +1055,7 @@ _0809E1BC:
 	mov r8, r3
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0809E1C4: .4byte gUnk_02033280
+_0809E1C4: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0809E1C8
 sub_0809E1C8: @ 0x0809E1C8
diff --git a/asm/objectB9.s b/asm/objectB9.s
index bf5cd9ec..fcebb4f0 100644
--- a/asm/objectB9.s
+++ b/asm/objectB9.s
@@ -193,7 +193,7 @@ _080A132E:
 	.align 2, 0
 _080A136C: .4byte gPlayerState
 _080A1370:
-	ldr r1, _080A1384 @ =gUnk_02033280
+	ldr r1, _080A1384 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _080A1376:
@@ -204,7 +204,7 @@ _080A1376:
 	mov sl, r5
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_080A1384: .4byte gUnk_02033280
+_080A1384: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_080A1388
 sub_080A1388: @ 0x080A1388
diff --git a/asm/percy.s b/asm/percy.s
index 08ec140c..d00ceec6 100644
--- a/asm/percy.s
+++ b/asm/percy.s
@@ -100,13 +100,13 @@ _0806B5EE:
 	.align 2, 0
 _0806B5FC: .4byte gPlayerEntity
 _0806B600:
-	ldr r1, _0806B608 @ =gUnk_02033280
+	ldr r1, _0806B608 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0806B606:
 	pop {r4, pc}
 	.align 2, 0
-_0806B608: .4byte gUnk_02033280
+_0806B608: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806B60C
 sub_0806B60C: @ 0x0806B60C
diff --git a/asm/phonograph.s b/asm/phonograph.s
index 962139ae..c296947d 100644
--- a/asm/phonograph.s
+++ b/asm/phonograph.s
@@ -214,7 +214,7 @@ _0806EA86:
 	strh r1, [r0]
 	strh r1, [r6]
 _0806EAA4:
-	ldr r1, _0806EAB8 @ =gUnk_02033280
+	ldr r1, _0806EAB8 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0806EAAA:
@@ -224,7 +224,7 @@ _0806EAAA:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _0806EAB4: .4byte 0x80010000
-_0806EAB8: .4byte gUnk_02033280
+_0806EAB8: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806EABC
 sub_0806EABC: @ 0x0806EABC
diff --git a/asm/picolyteBottles.s b/asm/picolyteBottles.s
index 158b7a27..0930627e 100644
--- a/asm/picolyteBottles.s
+++ b/asm/picolyteBottles.s
@@ -392,7 +392,7 @@ _0806E1C0:
 	ldr r1, _0806E1D8 @ =gScreenTransition
 	ldrh r0, [r4]
 	strh r0, [r1, #6]
-	ldr r2, _0806E1DC @ =gUnk_02033280
+	ldr r2, _0806E1DC @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -401,7 +401,7 @@ _0806E1C0:
 	.align 2, 0
 _0806E1D4: .4byte 0x0000421C
 _0806E1D8: .4byte gScreenTransition
-_0806E1DC: .4byte gUnk_02033280
+_0806E1DC: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806E1E0
 sub_0806E1E0: @ 0x0806E1E0
@@ -476,11 +476,11 @@ sub_0806E250: @ 0x0806E250
 	movs r0, #1
 	str r0, [r4, #0x14]
 _0806E266:
-	ldr r2, _0806E274 @ =gUnk_02033280
+	ldr r2, _0806E274 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
 	strb r0, [r2, #7]
 	pop {r4, pc}
 	.align 2, 0
-_0806E274: .4byte gUnk_02033280
+_0806E274: .4byte gActiveScriptInfo
diff --git a/asm/postman.s b/asm/postman.s
index 86ce9e54..98732474 100644
--- a/asm/postman.s
+++ b/asm/postman.s
@@ -19,12 +19,12 @@ sub_0806076C: @ 0x0806076C
 	ldr r0, [r7, #0x34]
 	cmp r0, #0
 	bge _08060790
-	ldr r1, _0806078C @ =gUnk_02033280
+	ldr r1, _0806078C @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 	b _080608D8
 	.align 2, 0
-_0806078C: .4byte gUnk_02033280
+_0806078C: .4byte gActiveScriptInfo
 _08060790:
 	adds r4, r7, #0
 	adds r4, #0x69
diff --git a/asm/rem.s b/asm/rem.s
index 1389ec91..a4906475 100644
--- a/asm/rem.s
+++ b/asm/rem.s
@@ -201,7 +201,7 @@ _0806A568:
 	movs r0, #8
 	movs r1, #2
 	bl sub_08080964
-	ldr r2, _0806A5B4 @ =gUnk_02033280
+	ldr r2, _0806A5B4 @ =gActiveScriptInfo
 	ldr r0, [r2]
 	movs r1, #0x80
 	lsls r1, r1, #1
@@ -227,7 +227,7 @@ _0806A590:
 _0806A5B0:
 	pop {r4, r5, pc}
 	.align 2, 0
-_0806A5B4: .4byte gUnk_02033280
+_0806A5B4: .4byte gActiveScriptInfo
 _0806A5B8: .4byte 0x0000011B
 
 	thumb_func_start nullsub_503
@@ -305,7 +305,7 @@ sub_0806A630: @ 0x0806A630
 	movs r1, #0x12
 	bl InitializeAnimation
 _0806A646:
-	ldr r0, _0806A670 @ =gUnk_02033280
+	ldr r0, _0806A670 @ =gActiveScriptInfo
 	ldr r0, [r0]
 	movs r1, #0x80
 	lsls r1, r1, #1
@@ -327,7 +327,7 @@ _0806A65A:
 _0806A66E:
 	pop {r4, pc}
 	.align 2, 0
-_0806A670: .4byte gUnk_02033280
+_0806A670: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806A674
 sub_0806A674: @ 0x0806A674
@@ -370,7 +370,7 @@ _0806A6A0:
 	bl InitializeAnimation
 	b _0806A82A
 _0806A6BE:
-	ldr r0, _0806A6E0 @ =gUnk_02033280
+	ldr r0, _0806A6E0 @ =gActiveScriptInfo
 	ldr r0, [r0]
 	movs r1, #0x80
 	lsls r1, r1, #1
@@ -387,7 +387,7 @@ _0806A6BE:
 	strb r0, [r1]
 	b _0806A82A
 	.align 2, 0
-_0806A6E0: .4byte gUnk_02033280
+_0806A6E0: .4byte gActiveScriptInfo
 _0806A6E4:
 	ldr r0, [r4, #0x50]
 	adds r0, #0x58
@@ -581,7 +581,7 @@ sub_0806A830: @ 0x0806A830
 	movs r1, #2
 	bl sub_0805E3A0
 _0806A84E:
-	ldr r0, _0806A88C @ =gUnk_02033280
+	ldr r0, _0806A88C @ =gActiveScriptInfo
 	ldr r0, [r0]
 	movs r1, #0x80
 	lsls r1, r1, #2
@@ -611,7 +611,7 @@ _0806A860:
 _0806A88A:
 	pop {r4, pc}
 	.align 2, 0
-_0806A88C: .4byte gUnk_02033280
+_0806A88C: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806A890
 sub_0806A890: @ 0x0806A890
@@ -721,13 +721,13 @@ sub_0806A958: @ 0x0806A958
 	ldrb r0, [r0, #0xc]
 	cmp r0, #5
 	beq _0806A966
-	ldr r1, _0806A968 @ =gUnk_02033280
+	ldr r1, _0806A968 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0806A966:
 	pop {pc}
 	.align 2, 0
-_0806A968: .4byte gUnk_02033280
+_0806A968: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806A96C
 sub_0806A96C: @ 0x0806A96C
@@ -758,14 +758,14 @@ _0806A992:
 	strb r3, [r4]
 	movs r0, #1
 	str r0, [r1, #0x14]
-	ldr r2, _0806A9AC @ =gUnk_02033280
+	ldr r2, _0806A9AC @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	orrs r0, r1
 	strb r0, [r2, #7]
 _0806A9A8:
 	pop {r4, pc}
 	.align 2, 0
-_0806A9AC: .4byte gUnk_02033280
+_0806A9AC: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806A9B0
 sub_0806A9B0: @ 0x0806A9B0
@@ -996,7 +996,7 @@ _0806AB5C:
 	cmp r0, #0
 	bge _0806AB6A
 _0806AB64:
-	ldr r1, _0806AB70 @ =gUnk_02033280
+	ldr r1, _0806AB70 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0806AB6A:
@@ -1004,7 +1004,7 @@ _0806AB6A:
 	mov r8, r3
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0806AB70: .4byte gUnk_02033280
+_0806AB70: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_0806AB74
 sub_0806AB74: @ 0x0806AB74
diff --git a/asm/stockwell.s b/asm/stockwell.s
index 074ada57..343f4cbf 100644
--- a/asm/stockwell.s
+++ b/asm/stockwell.s
@@ -635,14 +635,14 @@ sub_080654FC: @ 0x080654FC
 	ands r0, r1
 	cmp r0, #0
 	beq _08065518
-	ldr r1, _08065514 @ =gUnk_02033280
+	ldr r1, _08065514 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 	b _08065522
 	.align 2, 0
-_08065514: .4byte gUnk_02033280
+_08065514: .4byte gActiveScriptInfo
 _08065518:
-	ldr r2, _08065524 @ =gUnk_02033280
+	ldr r2, _08065524 @ =gActiveScriptInfo
 	ldrb r1, [r2, #7]
 	movs r0, #1
 	orrs r0, r1
@@ -650,7 +650,7 @@ _08065518:
 _08065522:
 	pop {pc}
 	.align 2, 0
-_08065524: .4byte gUnk_02033280
+_08065524: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_08065528
 sub_08065528: @ 0x08065528
diff --git a/asm/windTribespeople.s b/asm/windTribespeople.s
index 97aab657..0c4770e5 100644
--- a/asm/windTribespeople.s
+++ b/asm/windTribespeople.s
@@ -152,14 +152,14 @@ _0806CA7E:
 	ldrh r0, [r4, #0x10]
 	cmp r0, #0
 	beq _0806CA8A
-	ldr r1, _0806CA90 @ =gUnk_02033280
+	ldr r1, _0806CA90 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _0806CA8A:
 	pop {r4, pc}
 	.align 2, 0
 _0806CA8C: .4byte gUnk_08113B38
-_0806CA90: .4byte gUnk_02033280
+_0806CA90: .4byte gActiveScriptInfo
 
 	thumb_func_start WindTribespeople_Fusion
 WindTribespeople_Fusion: @ 0x0806CA94
diff --git a/include/greatFairy.h b/include/greatFairy.h
index 31a37c99..ae78ffda 100644
--- a/include/greatFairy.h
+++ b/include/greatFairy.h
@@ -41,7 +41,7 @@ extern const s16 GreatFairy_RippleOffsets[10];
 extern u32 gUnk_02034350;
 extern RoomVars gRoomVars;
 extern Screen gScreen;
-extern struct_02033280 gUnk_02033280;
+extern struct_02033280 gActiveScriptInfo;
 extern u8 gUnk_0812079C[8];
 extern s16 gSineTable[];
 extern s8 gUnk_081207AC[];
diff --git a/include/script.h b/include/script.h
index 9abc5291..201d0f71 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,12 +3,12 @@
 
 #include "global.h"
 
-typedef struct {
-    u16* unk_00;
+typedef struct ScriptExecutionContext {
+    u16* scriptInstructionPointer;
     u32 unk_04;
     u32 unk_08;
     u8 unk_0C[0x4]; // unused
-    u16 unk_10;
+    u16 wait;
     u16 unk_12;
     u32 unk_14;
     u8 unk_18;
diff --git a/include/structures.h b/include/structures.h
index 59811d6f..42e9d3ab 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -121,13 +121,13 @@ extern struct_02024490 gUnk_02024490;
 
 typedef struct {
     u32 unk_00;
-    u16 unk_04;
-    u8 unk_06;
-    u8 unk_07;
+    u16 commandIndex;
+    u8 commandSize;
+    u8 flags;
     u8 unk_08;
 } struct_02033280;
 
-extern struct_02033280 gUnk_02033280;
+extern struct_02033280 gActiveScriptInfo;
 
 typedef struct {
     u16 unk_00;
diff --git a/linker.ld b/linker.ld
index c8fbcd84..507f1cc7 100644
--- a/linker.ld
+++ b/linker.ld
@@ -112,7 +112,7 @@ SECTIONS {
         . = 0x00032EC0; gUnk_02032EC0 = .;
         . = 0x00032EDC; gUnk_02032EDC = .;
         . = 0x00032F14; gUnk_02032F14 = .;
-        . = 0x00033280; gUnk_02033280 = .;
+        . = 0x00033280; gActiveScriptInfo = .;
         . = 0x00033290; gUnk_02033290 = .;
         . = 0x00033A90; gArea = .;
         . = 0x00033AB8; gUnk_02033AB8 = .;
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index 13ecd8f9..532be89c 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -172,7 +172,7 @@ void sub_0806DAAC(Entity* this, u32* param_2) {
     u32 uVar1;
     uVar1 = CheckKinstoneFused(sub_0806DA3C(this));
     param_2[5] = uVar1;
-    gUnk_02033280.unk_07 |= 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
 // maybe actually execute the kinstone fusion?
diff --git a/src/npc/goron.c b/src/npc/goron.c
index 0203969c..b0b60222 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -99,7 +99,7 @@ u32 sub_08069480(Entity* this) {
 
 void sub_0806948C(Entity* this, u32* param_1) {
     param_1[5] = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
-    gUnk_02033280.unk_07 |= 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
 void sub_080694B0(Entity* this) {
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 532f129f..3aa6dd86 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -207,7 +207,7 @@ void sub_08060700(Entity* entity, ScriptExecutionContext* context) {
     u32 x = coords->x + gRoomControls.roomOriginX;
     u32 y = coords->y + gRoomControls.roomOriginY;
     sub_0807DEDC(entity, context, x, y);
-    gUnk_02033280.unk_07 |= 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
 void sub_0806075C(Entity* this) {
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index dbc50909..26e063a2 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -241,7 +241,7 @@ void sub_08061E90(Entity* this, Entity* arg1) {
         arg1->spriteIndex = 1;
     }
     if (--arg1->spriteIndex != 0) {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 90a40fc0..fad1be75 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -164,12 +164,12 @@ void sub_08066E80(Entity* ent, u8* param_2) {
         case 4:
             UpdateAnimationSingleFrame(ent);
             if (ent->frames.b.f3) {
-                gUnk_02033280.unk_07 |= 1;
+                gActiveScriptInfo.flags |= 1;
                 return;
             }
     }
     ent->field_0x80.HWORD = ent->animIndex;
-    gUnk_02033280.unk_06 = 0;
+    gActiveScriptInfo.commandSize = 0;
 }
 
 void sub_08066F94(void) {
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index e71ddfc6..b4c07923 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -170,7 +170,7 @@ void GreatFairy_WingsUpdate(Entity* this) {
         this->action = 2;
         sub_0805EC60(this);
         gRoomVars.greatFairyState |= 32;
-        gUnk_02033280.unk_00 |= 4;
+        gActiveScriptInfo.unk_00 |= 4;
     } else {
         sub_0805EC9C(this, this->nonPlanarMovement, 256, 0);
     }
diff --git a/src/script.c b/src/script.c
index 494e0ae5..eed9dae0 100644
--- a/src/script.c
+++ b/src/script.c
@@ -12,172 +12,187 @@ void sub_0807DAF0(Entity*, ScriptExecutionContext*, u16*);
 void sub_0807DB88(ScriptExecutionContext*, u16*);
 void sub_0807DE80(Entity*);
 void sub_0807DF38(void);
-void nullsub_507(Entity*, ScriptExecutionContext*);
-void sub_0807E004(Entity*, ScriptExecutionContext*);
-void sub_0807E014(Entity*, ScriptExecutionContext*);
-void sub_0807E024(Entity*, ScriptExecutionContext*);
-void sub_0807E050(Entity*, ScriptExecutionContext*);
-void sub_0807E064(Entity*, ScriptExecutionContext*);
-void sub_0807E078(Entity*, ScriptExecutionContext*);
-void sub_0807E0A0(Entity*, ScriptExecutionContext*);
-void sub_0807E0B8(Entity*, ScriptExecutionContext*);
-void sub_0807E0CC(Entity*, ScriptExecutionContext*);
-void sub_0807E0E0(Entity*, ScriptExecutionContext*);
-void sub_0807E10C(Entity*, ScriptExecutionContext*);
-void sub_0807E124(Entity*, ScriptExecutionContext*);
-void sub_0807E148(Entity*, ScriptExecutionContext*);
-void sub_0807E158(Entity*, ScriptExecutionContext*);
-void sub_0807E188(Entity*, ScriptExecutionContext*);
-void sub_0807E1D8(Entity*, ScriptExecutionContext*);
-void sub_0807E200(Entity*, ScriptExecutionContext*);
-void sub_0807E220(Entity*, ScriptExecutionContext*);
-void sub_0807E240(Entity*, ScriptExecutionContext*);
-void sub_0807E260(Entity*, ScriptExecutionContext*);
-void sub_0807E280(Entity*, ScriptExecutionContext*);
-void sub_0807E2A8(Entity*, ScriptExecutionContext*);
-void sub_0807E2E4(Entity*, ScriptExecutionContext*);
-void sub_0807E30C(Entity*, ScriptExecutionContext*);
-void sub_0807E390(Entity*, ScriptExecutionContext*);
-void sub_0807E3BC(Entity*, ScriptExecutionContext*);
-void sub_0807E3E8(Entity*, ScriptExecutionContext*);
-void sub_0807E40C(Entity*, ScriptExecutionContext*);
-void sub_0807E42C(Entity*, ScriptExecutionContext*);
-void sub_0807E48C(Entity*, ScriptExecutionContext*);
-void sub_0807E4AC(Entity*, ScriptExecutionContext*);
-void sub_0807E4CC(Entity*, ScriptExecutionContext*);
-void sub_0807E4EC(Entity*, ScriptExecutionContext*);
-void sub_0807E514(Entity*, ScriptExecutionContext*);
-void sub_0807E538(Entity*, ScriptExecutionContext*);
-void sub_0807E564(Entity*, ScriptExecutionContext*);
-void sub_0807E584(Entity*, ScriptExecutionContext*);
-void sub_0807E5A0(Entity*, ScriptExecutionContext*);
-void sub_0807E5CC(Entity*, ScriptExecutionContext*);
-void sub_0807E5F8(Entity*, ScriptExecutionContext*);
-void sub_0807E610(Entity*, ScriptExecutionContext*);
-void sub_0807E628(Entity*, ScriptExecutionContext*);
-void sub_0807E634(Entity*, ScriptExecutionContext*);
-void sub_0807E644(Entity*, ScriptExecutionContext*);
-void sub_0807E650(Entity*, ScriptExecutionContext*);
-void sub_0807E65C(Entity*, ScriptExecutionContext*);
-void sub_0807E668(Entity*, ScriptExecutionContext*);
-void sub_0807E674(Entity*, ScriptExecutionContext*);
-void sub_0807E680(Entity*, ScriptExecutionContext*);
-void sub_0807E690(Entity*, ScriptExecutionContext*);
-void sub_0807E6AC(Entity*, ScriptExecutionContext*);
-void sub_0807E6DC(Entity*, ScriptExecutionContext*);
-void sub_0807E700(Entity*, ScriptExecutionContext*);
-void sub_0807E72C(Entity*, ScriptExecutionContext*);
-void sub_0807E75C(Entity*, ScriptExecutionContext*);
-void sub_0807E778(Entity*, ScriptExecutionContext*);
-void sub_0807E788(Entity*, ScriptExecutionContext*);
-void sub_0807E79C(Entity*, ScriptExecutionContext*);
-void nullsub_508(Entity*, ScriptExecutionContext*);
-void sub_0807E7B0(Entity*, ScriptExecutionContext*);
-void sub_0807E7C4(Entity*, ScriptExecutionContext*);
-void sub_0807E7D8(Entity*, ScriptExecutionContext*);
-void sub_0807E7EC(Entity*, ScriptExecutionContext*);
-void sub_0807E800(Entity*, ScriptExecutionContext*);
-void sub_0807E80C(Entity*, ScriptExecutionContext*);
+void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E004(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E014(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E024(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E050(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E064(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E0A0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E0B8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E0CC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E10C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E124(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E148(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E158(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E188(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E1D8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E200(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E220(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E240(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E260(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E280(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E2A8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E2E4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E390(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E40C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E42C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E4AC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E538(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E584(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E5A0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E5CC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E628(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E634(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E644(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E650(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E65C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E668(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E674(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E680(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E690(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E6AC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E6DC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E700(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E72C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E75C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E788(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E7B0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E7C4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E7D8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E7EC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E800(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context);
 void sub_0807E818(u32);
-void sub_0807E858(Entity*, ScriptExecutionContext*);
-void sub_0807E864(Entity*, ScriptExecutionContext*);
-void sub_0807E878(Entity*, ScriptExecutionContext*);
-void sub_0807E888(Entity*, ScriptExecutionContext*);
-void sub_0807E898(Entity*, ScriptExecutionContext*);
-void sub_0807E8C4(Entity*, ScriptExecutionContext*);
-void sub_0807E8D4(Entity*, ScriptExecutionContext*);
-void sub_0807E8E4(Entity*, ScriptExecutionContext*);
-void sub_0807E908(Entity*, ScriptExecutionContext*);
-void sub_0807E914(Entity*, ScriptExecutionContext*);
-void sub_0807E924(Entity*, ScriptExecutionContext*);
-void sub_0807E930(Entity*, ScriptExecutionContext*);
-void sub_0807E944(Entity*, ScriptExecutionContext*);
-void sub_0807E974(Entity*, ScriptExecutionContext*);
-void sub_0807E9D4(Entity*, ScriptExecutionContext*);
-void sub_0807E9DC(Entity*, ScriptExecutionContext*);
-void sub_0807E9E4(Entity*, ScriptExecutionContext*);
-void sub_0807E9F0(Entity*, ScriptExecutionContext*);
-void sub_0807EA4C(Entity*, ScriptExecutionContext*);
-void sub_0807EA88(Entity*, ScriptExecutionContext*);
-void sub_0807EA94(Entity*, ScriptExecutionContext*);
-void sub_0807EAB4(Entity*, ScriptExecutionContext*);
-void sub_0807EAC0(Entity*, ScriptExecutionContext*);
-void sub_0807EAD0(Entity*, ScriptExecutionContext*);
-void sub_0807EAF0(Entity*, ScriptExecutionContext*);
-void sub_0807EB18(Entity*, ScriptExecutionContext*);
-void sub_0807EB28(Entity*, ScriptExecutionContext*);
-void sub_0807EB38(Entity*, ScriptExecutionContext*);
-void sub_0807EB44(Entity*, ScriptExecutionContext*);
-void sub_0807EB4C(Entity*, ScriptExecutionContext*);
-void sub_0807EB74(Entity*, ScriptExecutionContext*);
-void sub_0807EB8C(Entity*, ScriptExecutionContext*);
-void sub_0807EBA8(Entity*, ScriptExecutionContext*);
-void sub_0807EBB0(Entity*, ScriptExecutionContext*);
-void sub_0807EBC0(Entity*, ScriptExecutionContext*);
-void sub_0807EBC8(Entity*, ScriptExecutionContext*);
-void sub_0807EBD8(Entity*, ScriptExecutionContext*);
-void sub_0807EBF4(Entity*, ScriptExecutionContext*);
-void sub_0807EC08(Entity*, ScriptExecutionContext*);
-void nullsub_509(Entity*, ScriptExecutionContext*);
-void sub_0807EC1C(Entity*, ScriptExecutionContext*);
+void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E864(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E878(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E898(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E8C4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E914(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E930(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E944(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E9D4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E9DC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E9E4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EA4C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EA94(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EAB4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EAC0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EAD0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB18(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB4C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EBA8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EBB0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EBC0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EBC8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EBD8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EBF4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EC08(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommandNop3(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EC1C(Entity* entity, ScriptExecutionContext* context);
 void sub_0807EC44(Entity*, ScriptExecutionContext*);
-void sub_0807EC64(Entity*, ScriptExecutionContext*);
-void sub_0807EC94(Entity*, ScriptExecutionContext*);
-void sub_0807ECC4(Entity*, ScriptExecutionContext*);
-void sub_0807ECF4(Entity*, ScriptExecutionContext*);
-void sub_0807ED24(Entity*, ScriptExecutionContext*);
-void sub_0807EDD4(Entity*, ScriptExecutionContext*);
-void sub_0807EE04(Entity*, ScriptExecutionContext*);
-void sub_0807EE30(Entity*, ScriptExecutionContext*);
-void sub_0807EEB4(Entity*, ScriptExecutionContext*);
-void sub_0807EEF4(Entity*, ScriptExecutionContext*);
-void sub_0807EF3C(Entity*, ScriptExecutionContext*);
-void sub_0807EF80(Entity*, ScriptExecutionContext*);
-void sub_0807EF90(Entity*, ScriptExecutionContext*);
-void sub_0807EFA0(Entity*, ScriptExecutionContext*);
-void sub_0807EFAC(Entity*, ScriptExecutionContext*);
-void sub_0807EFD4(Entity*, ScriptExecutionContext*);
-void sub_0807EFE4(Entity*, ScriptExecutionContext*);
-void sub_0807EFF4(Entity*, ScriptExecutionContext*);
-void sub_0807F004(Entity*, ScriptExecutionContext*);
-void sub_0807F010(Entity*, ScriptExecutionContext*);
-void sub_0807F034(Entity*, ScriptExecutionContext*);
-void sub_0807F050(Entity*, ScriptExecutionContext*);
-void sub_0807F060(Entity*, ScriptExecutionContext*);
-void sub_0807F078(Entity*, ScriptExecutionContext*);
-void sub_0807F088(Entity*, ScriptExecutionContext*);
-void sub_0807F098(Entity*, ScriptExecutionContext*);
-void sub_0807F0A4(Entity*, ScriptExecutionContext*);
-void sub_0807F0B4(Entity*, ScriptExecutionContext*);
-void sub_0807F0C8(Entity*, ScriptExecutionContext*);
+void ScriptCommand_0807EC64(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EC94(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807ECC4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807ECF4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context);
+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_0807EFA0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EFAC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EFD4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EFE4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807EFF4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F004(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F010(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F060(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F088(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F098(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F0A4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context);
 
 extern void CreateSpeechBubbleExclamationMark(Entity*, u32, u32);
 extern void CreateSpeechBubbleQuestionMark(Entity*, u32, u32);
 extern void sub_0801C4A0(u32);
 
-void (*const gUnk_0811E524[])() = {
-    nullsub_507,  sub_0807E004, sub_0807E014, sub_0807E024, sub_0807E050, sub_0807E064, sub_0807E078, sub_0807E0A0,
-    sub_0807E0B8, sub_0807E0CC, sub_0807E0E0, sub_0807E10C, sub_0807E124, sub_0807E148, sub_0807E158, sub_0807E188,
-    sub_0807E1D8,
-    sub_0807E4AC, // defined out of order
-    sub_0807E200, sub_0807E220, sub_0807E240, sub_0807E260, sub_0807E280, sub_0807E2A8, sub_0807E2E4, sub_0807E30C,
-    sub_0807E390, sub_0807E3BC, sub_0807E3E8, sub_0807E40C, sub_0807E42C, sub_0807E48C, sub_0807E4CC, sub_0807E4EC,
-    sub_0807E514, sub_0807E538, sub_0807E564, sub_0807E584, sub_0807E5A0, sub_0807E5CC, sub_0807E5F8, sub_0807E610,
-    sub_0807E628, sub_0807E634, sub_0807E644, sub_0807E650, sub_0807E65C, sub_0807E668, sub_0807E674, sub_0807E680,
-    sub_0807E690, sub_0807E6AC, sub_0807E6DC, sub_0807E700, sub_0807E72C, sub_0807E75C, sub_0807E778, sub_0807E788,
-    sub_0807E79C, nullsub_508,  sub_0807E7B0, sub_0807E7C4, sub_0807E7D8, sub_0807E7EC, sub_0807E800, sub_0807E80C,
-    sub_0807E858, sub_0807E864, sub_0807E878, sub_0807E888, sub_0807E898, sub_0807E8C4, sub_0807E8D4, sub_0807E8E4,
-    sub_0807E8E4, // duplicate
-    sub_0807E8E4, // duplicate
-    sub_0807E8E4, // duplicate
-    sub_0807E908, sub_0807E914, sub_0807E924, sub_0807E930, sub_0807E944, sub_0807E974, sub_0807E9D4, sub_0807E9DC,
-    sub_0807E9E4, sub_0807E9F0, sub_0807EA4C, sub_0807EA88, sub_0807EA94, sub_0807EAB4, sub_0807EAC0, sub_0807EAD0,
-    sub_0807EAF0, sub_0807EB18, sub_0807EB28, sub_0807EB38, sub_0807EB44, sub_0807EB4C, sub_0807EB74, sub_0807EB8C,
-    sub_0807EBA8, sub_0807EBB0, sub_0807EBC0, sub_0807EBC8, sub_0807EBD8, sub_0807EBF4, sub_0807EC08, nullsub_509,
-    sub_0807EC1C, sub_0807EC64, sub_0807EC94, sub_0807ECC4, sub_0807ECF4, sub_0807ED24, sub_0807EDD4, sub_0807EE04,
-    sub_0807EE30, sub_0807EEB4, sub_0807EEF4, sub_0807EF3C, sub_0807EF80, sub_0807EF90, sub_0807EFA0, sub_0807EFAC,
-    sub_0807EFD4, sub_0807EFE4, sub_0807EFF4, sub_0807F004, sub_0807F010, sub_0807F034, sub_0807F050, sub_0807F060,
-    sub_0807F078, sub_0807F088, sub_0807F098, sub_0807F0A4, sub_0807F0B4, sub_0807F0C8
+typedef void (*ScriptCommand)(Entity*, ScriptExecutionContext*);
+
+const ScriptCommand gScriptCommands[] = {
+    ScriptCommandNop,       ScriptCommand_0807E004, ScriptCommand_0807E014, ScriptCommand_0807E024,
+    ScriptCommand_0807E050, ScriptCommand_0807E064, ScriptCommand_0807E078, ScriptCommand_0807E0A0,
+    ScriptCommand_0807E0B8, ScriptCommand_0807E0CC, ScriptCommand_0807E0E0, ScriptCommand_0807E10C,
+    ScriptCommand_0807E124, ScriptCommand_0807E148, ScriptCommand_0807E158, ScriptCommand_0807E188,
+    ScriptCommand_0807E1D8, ScriptCommand_0807E4AC, ScriptCommand_0807E200, ScriptCommand_0807E220,
+    ScriptCommand_0807E240, ScriptCommand_0807E260, ScriptCommand_0807E280, ScriptCommand_0807E2A8,
+    ScriptCommand_0807E2E4, ScriptCommand_0807E30C, ScriptCommand_0807E390, ScriptCommand_0807E3BC,
+    ScriptCommand_0807E3E8, ScriptCommand_0807E40C, ScriptCommand_0807E42C, ScriptCommand_0807E48C,
+    ScriptCommand_0807E4CC, ScriptCommand_0807E4EC, ScriptCommand_0807E514, ScriptCommand_0807E538,
+    ScriptCommand_0807E564, ScriptCommand_0807E584, ScriptCommand_0807E5A0, ScriptCommand_0807E5CC,
+    ScriptCommand_0807E5F8, ScriptCommand_0807E610, ScriptCommand_0807E628, ScriptCommand_0807E634,
+    ScriptCommand_0807E644, ScriptCommand_0807E650, ScriptCommand_0807E65C, ScriptCommand_0807E668,
+    ScriptCommand_0807E674, ScriptCommand_0807E680, ScriptCommand_0807E690, ScriptCommand_0807E6AC,
+    ScriptCommand_0807E6DC, ScriptCommand_0807E700, ScriptCommand_0807E72C, ScriptCommand_0807E75C,
+    ScriptCommand_0807E778, ScriptCommand_0807E788, ScriptCommand_0807E79C, ScriptCommandNop2,
+    ScriptCommand_0807E7B0, ScriptCommand_0807E7C4, ScriptCommand_0807E7D8, ScriptCommand_0807E7EC,
+    ScriptCommand_0807E800, ScriptCommand_0807E80C, ScriptCommand_0807E858, ScriptCommand_0807E864,
+    ScriptCommand_0807E878, ScriptCommand_0807E888, ScriptCommand_0807E898, ScriptCommand_0807E8C4,
+    ScriptCommand_0807E8D4, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4,
+    ScriptCommand_0807E8E4, ScriptCommand_0807E908, ScriptCommand_0807E914, ScriptCommand_0807E924,
+    ScriptCommand_0807E930, ScriptCommand_0807E944, ScriptCommand_0807E974, ScriptCommand_0807E9D4,
+    ScriptCommand_0807E9DC, ScriptCommand_0807E9E4, ScriptCommand_0807E9F0, ScriptCommand_0807EA4C,
+    ScriptCommand_0807EA88, ScriptCommand_0807EA94, ScriptCommand_0807EAB4, ScriptCommand_0807EAC0,
+    ScriptCommand_0807EAD0, ScriptCommand_0807EAF0, ScriptCommand_0807EB18, ScriptCommand_0807EB28,
+    ScriptCommand_0807EB38, ScriptCommand_0807EB44, ScriptCommand_0807EB4C, ScriptCommand_0807EB74,
+    ScriptCommand_0807EB8C, ScriptCommand_0807EBA8, ScriptCommand_0807EBB0, ScriptCommand_0807EBC0,
+    ScriptCommand_0807EBC8, ScriptCommand_0807EBD8, ScriptCommand_0807EBF4, ScriptCommand_0807EC08,
+    ScriptCommandNop3,      ScriptCommand_0807EC1C, ScriptCommand_0807EC64, ScriptCommand_0807EC94,
+    ScriptCommand_0807ECC4, ScriptCommand_0807ECF4, ScriptCommand_0807ED24, ScriptCommand_0807EDD4,
+    ScriptCommand_0807EE04, ScriptCommand_0807EE30, ScriptCommand_0807EEB4, ScriptCommand_0807EEF4,
+    ScriptCommand_0807EF3C, ScriptCommand_0807EF80, ScriptCommand_0807EF90, ScriptCommand_0807EFA0,
+    ScriptCommand_0807EFAC, ScriptCommand_0807EFD4, ScriptCommand_0807EFE4, ScriptCommand_0807EFF4,
+    ScriptCommand_0807F004, ScriptCommand_0807F010, ScriptCommand_0807F034, ScriptCommand_0807F050,
+    ScriptCommand_0807F060, ScriptCommand_0807F078, ScriptCommand_0807F088, ScriptCommand_0807F098,
+    ScriptCommand_0807F0A4, ScriptCommand_0807F0B4, ScriptCommand_0807F0C8
 };
 
 extern const u16 gUnk_08016984;
@@ -187,10 +202,10 @@ extern ScriptExecutionContext gPlayerScriptExecutionContext;
 extern ScriptExecutionContext gScriptExecutionContextArray[0x20];
 
 void sub_0807DA70(void) {
-    MemClear32(&gUnk_02033280, sizeof(gUnk_02033280));
+    MemClear32(&gActiveScriptInfo, sizeof(gActiveScriptInfo));
     MemClear32(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray));
     MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
-    gUnk_02033280.unk_08 = 8;
+    gActiveScriptInfo.unk_08 = 8;
 }
 
 ScriptExecutionContext* CreateScriptExecutionContext(void) {
@@ -198,7 +213,7 @@ ScriptExecutionContext* CreateScriptExecutionContext(void) {
 
     context = gScriptExecutionContextArray;
     do {
-        if (context->unk_00 == 0) {
+        if (context->scriptInstructionPointer == 0) {
             return context;
         }
         context++;
@@ -238,7 +253,7 @@ void StartPlayerScript(u16* unk1) {
     Entity* player;
 
     MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
-    gPlayerScriptExecutionContext.unk_00 = unk1;
+    gPlayerScriptExecutionContext.scriptInstructionPointer = unk1;
     player = &gPlayerEntity;
     *(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext;
     gPlayerState.playerAction = 0x1c;
@@ -254,14 +269,14 @@ ScriptExecutionContext* sub_0807DB68(Entity* entity, u16* unk1) {
     if (context) {
         entity->flags |= 2;
         *(ScriptExecutionContext**)&entity->field_0x3c = context;
-        context->unk_00 = unk1;
+        context->scriptInstructionPointer = unk1;
     }
     return context;
 }
 
 void sub_0807DB88(ScriptExecutionContext* context, u16* unk1) {
     MemClear32(context, sizeof(ScriptExecutionContext));
-    context->unk_00 = unk1;
+    context->scriptInstructionPointer = unk1;
 }
 
 void sub_0807DB98(Entity* entity, ScriptExecutionContext* context) {
@@ -482,123 +497,125 @@ void sub_0807DF50(void) {
 }
 
 void ExecuteScriptCommandSet(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_00)
+    if (!unk2->scriptInstructionPointer)
         return;
-    if (unk2->unk_10) {
-        unk2->unk_10--;
+    if (unk2->wait) {
+        unk2->wait--;
     } else {
-        struct_02033280* tmp2 = &gUnk_02033280;
-        tmp2->unk_07 = 0;
+        struct_02033280* tmp2 = &gActiveScriptInfo;
+        tmp2->flags = 0;
         do {
-            u32 cmd = GetNextScriptCommandHalfword(unk2->unk_00);
+            u32 cmd = GetNextScriptCommandHalfword(unk2->scriptInstructionPointer);
             u16* tmp;
             if (cmd == 0xFFFF)
                 return;
-            tmp2->unk_06 = cmd >> 0xA;
-            tmp2->unk_04 = cmd & 0x3FF;
-            tmp = unk2->unk_00;
-            tmp2->unk_07 &= ~1;
-            gUnk_0811E524[tmp2->unk_04](unk1, unk2);
-            unk2->unk_00 += tmp2->unk_06;
-            if (tmp != unk2->unk_00) {
+            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;
             }
-        } while (tmp2->unk_07 & 3);
+        } while (tmp2->flags & 3);
     }
 }
 
-void nullsub_507(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context) {
 }
 
-void sub_0807E004(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_07 |= 2;
+void ScriptCommand_0807E004(Entity* entity, ScriptExecutionContext* context) {
+    gActiveScriptInfo.flags |= 2;
 }
 
-void sub_0807E014(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_07 &= ~2;
+void ScriptCommand_0807E014(Entity* entity, ScriptExecutionContext* context) {
+    gActiveScriptInfo.flags &= ~2;
 }
 
-void sub_0807E024(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E024(Entity* entity, ScriptExecutionContext* context) {
     s16 tmp;
-    unk2->unk_00++;
-    tmp = GetNextScriptCommandHalfword(unk2->unk_00);
-    unk2->unk_00 += (tmp / 2);
-    gUnk_02033280.unk_06 = 0;
+    context->scriptInstructionPointer++;
+    tmp = GetNextScriptCommandHalfword(context->scriptInstructionPointer);
+    context->scriptInstructionPointer += (tmp / 2);
+    gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_0807E050(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_14) {
-        sub_0807E024(unk1, unk2);
+void ScriptCommand_0807E050(Entity* entity, ScriptExecutionContext* context) {
+    if (context->unk_14) {
+        ScriptCommand_0807E024(entity, context);
     }
 }
 
-void sub_0807E064(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_14) {
-        sub_0807E024(unk1, unk2);
+void ScriptCommand_0807E064(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_14) {
+        ScriptCommand_0807E024(entity, context);
     }
 }
 
-void sub_0807E078(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (gUnk_02033280.unk_06 > unk2->unk_04) {
-        unk2->unk_00 += unk2->unk_04;
-        sub_0807E024(unk1, unk2);
+void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context) {
+    if (gActiveScriptInfo.commandSize > context->unk_04) {
+        context->scriptInstructionPointer += context->unk_04;
+        ScriptCommand_0807E024(entity, context);
     }
 }
 
-void sub_0807E0A0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_00 = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
-    gUnk_02033280.unk_06 = 0;
+void ScriptCommand_0807E0A0(Entity* entity, ScriptExecutionContext* context) {
+    context->scriptInstructionPointer =
+        (u16*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+    gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_0807E0B8(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_14) {
-        sub_0807E0A0(unk1, unk2);
+void ScriptCommand_0807E0B8(Entity* entity, ScriptExecutionContext* context) {
+    if (context->unk_14) {
+        ScriptCommand_0807E0A0(entity, context);
     }
 }
 
-void sub_0807E0CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_14) {
-        sub_0807E0A0(unk1, unk2);
+void ScriptCommand_0807E0CC(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_14) {
+        ScriptCommand_0807E0A0(entity, context);
     }
 }
 
-void sub_0807E0E0(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (gUnk_02033280.unk_06 > (unk2->unk_04 << 1) + 1) {
-        unk2->unk_00 += unk2->unk_04 << 1;
-        sub_0807E0A0(unk1, unk2);
+void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context) {
+    if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) {
+        context->scriptInstructionPointer += context->unk_04 << 1;
+        ScriptCommand_0807E0A0(entity, context);
     }
 }
 
-void sub_0807E10C(Entity* unk1, ScriptExecutionContext* unk2) {
-    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00))(unk1,
-                                                                                                             unk2);
+void ScriptCommand_0807E10C(Entity* entity, ScriptExecutionContext* context) {
+    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(
+        context->scriptInstructionPointer))(entity, context);
 }
 
-void sub_0807E124(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E124(Entity* entity, ScriptExecutionContext* context) {
     void (*tmp)(Entity*, ScriptExecutionContext*) =
-        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
-    unk2->unk_04 = GetNextScriptCommandWord(unk2->unk_00 + 3);
-    tmp(unk1, unk2);
+        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(
+            context->scriptInstructionPointer);
+    context->unk_04 = GetNextScriptCommandWord(context->scriptInstructionPointer + 3);
+    tmp(entity, context);
 }
 
-void sub_0807E148(Entity* unk1, ScriptExecutionContext* unk2) {
-    LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
+void ScriptCommand_0807E148(Entity* entity, ScriptExecutionContext* context) {
+    LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
-void sub_0807E158(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E158(Entity* entity, ScriptExecutionContext* context) {
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     u32 tmp2 = 0;
-    u32 tmp3 = gUnk_02033280.unk_00;
+    u32 tmp3 = gActiveScriptInfo.unk_00;
     if ((tmp3 & tmp) == tmp)
         tmp2 = 1;
-    unk2->unk_14 = tmp2;
-    gUnk_02033280.unk_00 = tmp3 & ~tmp;
-    gUnk_02033280.unk_07 |= 1;
+    context->unk_14 = tmp2;
+    gActiveScriptInfo.unk_00 = tmp3 & ~tmp;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E188(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E188(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp;
-    u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00);
+    u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer);
     switch (tmp2) {
         case 0x53:
             tmp = sub_08052734();
@@ -615,297 +632,300 @@ void sub_0807E188(Entity* unk1, ScriptExecutionContext* unk2) {
         default:
             tmp = GetInventoryValue(tmp2);
     }
-    unk2->unk_14 = tmp;
-    gUnk_02033280.unk_07 |= 1;
+    context->unk_14 = tmp;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E1D8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = GetInventoryValue(unk2->unk_00[1]) == 2;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E1D8(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = GetInventoryValue(context->scriptInstructionPointer[1]) == 2;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E200(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckLocalFlag(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E200(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = CheckLocalFlag(context->scriptInstructionPointer[1]);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E220(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckLocalFlagByOffset(unk2->unk_00[1], unk2->unk_00[2]);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E220(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 =
+        CheckLocalFlagByOffset(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E240(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00));
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E240(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 =
+        CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer));
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E260(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckRoomFlag(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E260(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = CheckRoomFlag(context->scriptInstructionPointer[1]);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E280(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E280(Entity* entity, ScriptExecutionContext* context) {
     u32 x, y, width, height;
-    width = unk2->unk_00[3];
+    width = context->scriptInstructionPointer[3];
     height = width >> 8;
     width &= 0xFF;
-    x = unk2->unk_00[1];
-    y = unk2->unk_00[2];
-    unk2->unk_14 = CheckPlayerInRegion(x, y, width, height);
-    gUnk_02033280.unk_07 |= 1;
+    x = context->scriptInstructionPointer[1];
+    y = context->scriptInstructionPointer[2];
+    context->unk_14 = CheckPlayerInRegion(x, y, width, height);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E2A8(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E2A8(Entity* entity, ScriptExecutionContext* context) {
     u32 x, y, width, height;
-    width = unk2->unk_00[1] & 0xFF;
-    height = unk2->unk_00[1] >> 8;
-    x = unk1->x.HALF.HI - gRoomControls.roomOriginX;
-    y = unk1->y.HALF.HI - gRoomControls.roomOriginY;
-    unk2->unk_14 = CheckPlayerInRegion(x, y, width, height);
-    gUnk_02033280.unk_07 |= 1;
+    width = context->scriptInstructionPointer[1] & 0xFF;
+    height = context->scriptInstructionPointer[1] >> 8;
+    x = entity->x.HALF.HI - gRoomControls.roomOriginX;
+    y = entity->y.HALF.HI - gRoomControls.roomOriginY;
+    context->unk_14 = CheckPlayerInRegion(x, y, width, height);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E2E4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk1->interactType) {
-        unk1->interactType = 0;
-        unk2->unk_14 = 1;
+void ScriptCommand_0807E2E4(Entity* entity, ScriptExecutionContext* context) {
+    if (entity->interactType) {
+        entity->interactType = 0;
+        context->unk_14 = 1;
     } else {
-        unk2->unk_14 = 0;
+        context->unk_14 = 0;
     }
-    gUnk_02033280.unk_07 |= 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E30C(Entity* unk1, ScriptExecutionContext* unk2) {
-    if ((unk2->unk_1A & 0xF) == 0 && (gPlayerState.flags.all & 0x80) == 0 &&
-        sub_080041A0(unk1, &gPlayerEntity, 0x28, 0x28)) {
-        unk1->animationState = sub_0806F5B0(GetFacingDirection(unk1, &gPlayerEntity));
+void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context) {
+    if ((context->unk_1A & 0xF) == 0 && (gPlayerState.flags.all & 0x80) == 0 &&
+        sub_080041A0(entity, &gPlayerEntity, 0x28, 0x28)) {
+        entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity));
     }
-    unk2->unk_1A++;
-    if (unk1->interactType) {
-        unk1->interactType = 0;
-        unk2->unk_14 = 1;
-        unk1->animationState = sub_0806F5B0(GetFacingDirection(unk1, &gPlayerEntity));
+    context->unk_1A++;
+    if (entity->interactType) {
+        entity->interactType = 0;
+        context->unk_14 = 1;
+        entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity));
     } else {
-        unk2->unk_14 = 0;
+        context->unk_14 = 0;
     }
-    gUnk_02033280.unk_07 |= 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E390(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = (unk2->unk_00[1] <= gSave.stats.rupees);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E390(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = (context->scriptInstructionPointer[1] <= gSave.stats.rupees);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E3BC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = (unk2->unk_00[1] <= gSave.stats.field_0x1a);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = (context->scriptInstructionPointer[1] <= gSave.stats.field_0x1a);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E3E8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !gUnk_02000040.unk_01;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = !gUnk_02000040.unk_01;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E40C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = CheckKinstoneFused(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E40C(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = CheckKinstoneFused(context->scriptInstructionPointer[1]);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E42C(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E42C(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp, tmp2;
     s32 tmp3;
-    tmp = unk2->unk_00[1];
-    tmp2 = unk2->unk_00[2];
+    tmp = context->scriptInstructionPointer[1];
+    tmp2 = context->scriptInstructionPointer[2];
     if (!tmp) {
         tmp = gRoomVars.itemForSaleIndex;
         tmp2 = gRoomVars.field_0x7;
     }
     tmp3 = sub_08053FE0(tmp);
-    unk2->unk_14 = (tmp3 <= gSave.stats.rupees);
-    if (unk2->unk_14) {
+    context->unk_14 = (tmp3 <= gSave.stats.rupees);
+    if (context->unk_14) {
         ModRupees(-tmp3);
         sub_080A7C18(tmp, tmp2, 0);
         gRoomVars.itemForSaleIndex = 0;
         gRoomVars.field_0x7 = 0;
     }
-    gUnk_02033280.unk_07 |= 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E48C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = sub_080544DC(unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = sub_080544DC(context->scriptInstructionPointer[1]);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E4AC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !!gRoomVars.itemForSaleIndex;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E4AC(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = !!gRoomVars.itemForSaleIndex;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E4CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !!(unk2->unk_04 & unk2->unk_00[1]);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = !!(context->unk_04 & context->scriptInstructionPointer[1]);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E4EC(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = unk2->unk_00[1];
-    unk2->unk_14 = tmp == (tmp & unk2->unk_04);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context) {
+    u32 tmp = context->scriptInstructionPointer[1];
+    context->unk_14 = tmp == (tmp & context->unk_04);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E514(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = unk2->unk_00[1];
-    unk2->unk_14 = tmp == unk2->unk_04;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context) {
+    u32 tmp = context->scriptInstructionPointer[1];
+    context->unk_14 = tmp == context->unk_04;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E538(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = !!(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00) & gPlayerState.flags.all);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E538(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 =
+        !!(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer) & gPlayerState.flags.all);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E564(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = (gPlayerState.flags.all >> 7) & 1;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = (gPlayerState.flags.all >> 7) & 1;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E584(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = unk1->height.WORD != 0;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E584(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = entity->height.WORD != 0;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E5A0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = unk2->unk_00[1] == gPlayerEntity.action;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E5A0(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = context->scriptInstructionPointer[1] == gPlayerEntity.action;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E5CC(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_14 = unk2->unk_00[1] == gPlayerEntity.animationState;
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E5CC(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_14 = context->scriptInstructionPointer[1] == gPlayerEntity.animationState;
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807E5F8(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context) {
+    gActiveScriptInfo.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void sub_0807E610(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context) {
+    gActiveScriptInfo.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void sub_0807E628(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetLocalFlag(unk2->unk_00[1]);
+void ScriptCommand_0807E628(Entity* entity, ScriptExecutionContext* context) {
+    SetLocalFlag(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E634(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetLocalFlagByOffset(unk2->unk_00[1], unk2->unk_00[2]);
+void ScriptCommand_0807E634(Entity* entity, ScriptExecutionContext* context) {
+    SetLocalFlagByOffset(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
 }
 
-void sub_0807E644(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearLocalFlag(unk2->unk_00[1]);
+void ScriptCommand_0807E644(Entity* entity, ScriptExecutionContext* context) {
+    ClearLocalFlag(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E650(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetGlobalFlag(unk2->unk_00[1]);
+void ScriptCommand_0807E650(Entity* entity, ScriptExecutionContext* context) {
+    SetGlobalFlag(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E65C(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearGlobalFlag(unk2->unk_00[1]);
+void ScriptCommand_0807E65C(Entity* entity, ScriptExecutionContext* context) {
+    ClearGlobalFlag(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E668(Entity* unk1, ScriptExecutionContext* unk2) {
-    SetRoomFlag(unk2->unk_00[1]);
+void ScriptCommand_0807E668(Entity* entity, ScriptExecutionContext* context) {
+    SetRoomFlag(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E674(Entity* unk1, ScriptExecutionContext* unk2) {
-    ClearRoomFlag(unk2->unk_00[1]);
+void ScriptCommand_0807E674(Entity* entity, ScriptExecutionContext* context) {
+    ClearRoomFlag(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E680(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_10 = GetNextScriptCommandHalfwordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E680(Entity* entity, ScriptExecutionContext* context) {
+    context->wait = GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void sub_0807E690(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
-    if ((gUnk_02033280.unk_00 & tmp) != tmp) {
-        gUnk_02033280.unk_06 = 0;
+void ScriptCommand_0807E690(Entity* entity, ScriptExecutionContext* context) {
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+    if ((gActiveScriptInfo.unk_00 & tmp) != tmp) {
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807E6AC(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
-    if ((gUnk_02033280.unk_00 & tmp) != tmp) {
-        gUnk_02033280.unk_06 = 0;
+void ScriptCommand_0807E6AC(Entity* entity, ScriptExecutionContext* context) {
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+    if ((gActiveScriptInfo.unk_00 & tmp) != tmp) {
+        gActiveScriptInfo.commandSize = 0;
     } else {
-        gUnk_02033280.unk_00 &= ~tmp;
-        gUnk_02033280.unk_07 |= 1;
+        gActiveScriptInfo.unk_00 &= ~tmp;
+        gActiveScriptInfo.flags |= 1;
     }
 }
 
-void sub_0807E6DC(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E6DC(Entity* entity, ScriptExecutionContext* context) {
     if (gPlayerEntity.action == 8) {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     } else {
-        unk2->unk_10 = 0x2D;
+        context->wait = 0x2D;
     }
 }
 
-void sub_0807E700(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E700(Entity* entity, ScriptExecutionContext* context) {
     if (gPlayerEntity.action != 0x17) {
-        gUnk_02033280.unk_07 |= 1;
+        gActiveScriptInfo.flags |= 1;
     } else {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807E72C(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E72C(Entity* entity, ScriptExecutionContext* context) {
     if (gRoomControls.unk6 & 4) {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     } else {
-        gUnk_02033280.unk_07 |= 1;
+        gActiveScriptInfo.flags |= 1;
     }
 }
 
-void sub_0807E75C(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E75C(Entity* entity, ScriptExecutionContext* context) {
     if (gFadeControl.active) {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807E778(Entity* unk1, ScriptExecutionContext* unk2) {
-    gUnk_02033280.unk_08 = unk2->unk_00[1];
+void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context) {
+    gActiveScriptInfo.unk_08 = context->scriptInstructionPointer[1];
 }
 
-void sub_0807E788(Entity* unk1, ScriptExecutionContext* unk2) {
-    gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E788(Entity* entity, ScriptExecutionContext* context) {
+    gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void sub_0807E79C(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080500F4(gUnk_02033280.unk_08);
+void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context) {
+    sub_080500F4(gActiveScriptInfo.unk_08);
 }
 
-void nullsub_508(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context) {
 }
 
-void sub_0807E7B0(Entity* unk1, ScriptExecutionContext* unk2) {
-    DoFade(4, gUnk_02033280.unk_08);
+void ScriptCommand_0807E7B0(Entity* entity, ScriptExecutionContext* context) {
+    DoFade(4, gActiveScriptInfo.unk_08);
 }
 
-void sub_0807E7C4(Entity* unk1, ScriptExecutionContext* unk2) {
-    DoFade(5, gUnk_02033280.unk_08);
+void ScriptCommand_0807E7C4(Entity* entity, ScriptExecutionContext* context) {
+    DoFade(5, gActiveScriptInfo.unk_08);
 }
 
-void sub_0807E7D8(Entity* unk1, ScriptExecutionContext* unk2) {
-    DoFade(6, gUnk_02033280.unk_08);
+void ScriptCommand_0807E7D8(Entity* entity, ScriptExecutionContext* context) {
+    DoFade(6, gActiveScriptInfo.unk_08);
 }
 
-void sub_0807E7EC(Entity* unk1, ScriptExecutionContext* unk2) {
-    DoFade(7, gUnk_02033280.unk_08);
+void ScriptCommand_0807E7EC(Entity* entity, ScriptExecutionContext* context) {
+    DoFade(7, gActiveScriptInfo.unk_08);
 }
 
-void sub_0807E800(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E800(Entity* entity, ScriptExecutionContext* context) {
     sub_0807E818(0x10);
 }
 
-void sub_0807E80C(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context) {
     sub_0807E818(0x11);
 }
 
@@ -919,112 +939,112 @@ void sub_0807E818(u32 unk1) {
         tmp2 = 0x78;
         tmp3 = 0x50;
     }
-    sub_08050110(tmp2, tmp3, unk1, gUnk_02033280.unk_08);
+    sub_08050110(tmp2, tmp3, unk1, gActiveScriptInfo.unk_08);
 }
 
-void sub_0807E858(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08050038(unk2->unk_00[1]);
+void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) {
+    sub_08050038(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E864(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E864(Entity* entity, ScriptExecutionContext* context) {
     gPlayerState.field_0x8b = 3;
     sub_08078B48();
 }
 
-void sub_0807E878(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E878(Entity* entity, ScriptExecutionContext* context) {
     gPlayerState.field_0x8b = 1;
 }
 
-void sub_0807E888(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context) {
     gPlayerState.field_0x8b = 3;
 }
 
-void sub_0807E898(Entity* unk1, ScriptExecutionContext* unk2) {
-    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E898(Entity* entity, ScriptExecutionContext* context) {
+    u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     gPlayerState.playerAction = tmp;
     gPlayerState.field_0x38 = tmp >> 8;
     gPlayerState.field_0x39 = tmp >> 0x10;
     gPlayerState.field_0x3a = tmp >> 0x18;
 }
 
-void sub_0807E8C4(Entity* unk1, ScriptExecutionContext* unk2) {
-    StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
+void ScriptCommand_0807E8C4(Entity* entity, ScriptExecutionContext* context) {
+    StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
-void sub_0807E8D4(Entity* unk1, ScriptExecutionContext* unk2) {
-    gPlayerState.field_0x8 = unk2->unk_00[1];
+void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context) {
+    gPlayerState.field_0x8 = context->scriptInstructionPointer[1];
 }
 
-void sub_0807E8E4(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = (gUnk_08016984 & 0x3FF);
     u32 tmp2;
-    gPlayerEntity.animationState = tmp2 = (unk2->unk_00[0] - tmp) << 1;
+    gPlayerEntity.animationState = tmp2 = (context->scriptInstructionPointer[0] - tmp) << 1;
 }
 
-void sub_0807E908(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->action = unk2->unk_00[1];
-    unk1->previousActionFlag = 0;
+void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context) {
+    entity->action = context->scriptInstructionPointer[1];
+    entity->previousActionFlag = 0;
 }
 
-void sub_0807E914(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807E914(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void sub_0807E924(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = unk1->frames.all;
-    unk1->frames.all = 0;
+void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_04 = entity->frames.all;
+    entity->frames.all = 0;
 }
 
-void sub_0807E930(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->field_0x80.HWORD = unk2->unk_00[1];
-    InitAnimationForceUpdate(unk1, unk2->unk_00[1]);
+void ScriptCommand_0807E930(Entity* entity, ScriptExecutionContext* context) {
+    entity->field_0x80.HWORD = context->scriptInstructionPointer[1];
+    InitAnimationForceUpdate(entity, context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E944(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk1->interactType) {
-        unk1->interactType = 0;
-        gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807E944(Entity* entity, ScriptExecutionContext* context) {
+    if (entity->interactType) {
+        entity->interactType = 0;
+        gActiveScriptInfo.flags |= 1;
     } else {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807E974(Entity* unk1, ScriptExecutionContext* unk2) {
-    switch (unk2->unk_18) {
+void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context) {
+    switch (context->unk_18) {
         default:
-            if (!--unk2->unk_19)
+            if (!--context->unk_19)
                 return;
             break;
         case 0:
-            if (!unk1->interactType)
+            if (!entity->interactType)
                 break;
-            unk1->interactType = 0;
-            unk2->unk_18++;
-            TextboxNoOverlapFollow(unk2->unk_00[1]);
+            entity->interactType = 0;
+            context->unk_18++;
+            TextboxNoOverlapFollow(context->scriptInstructionPointer[1]);
             break;
         case 1:
             if (gTextBox.doTextBox & 0x7F)
                 break;
-            unk2->unk_18 = 2;
-            unk2->unk_19 = 0xF;
+            context->unk_18 = 2;
+            context->unk_19 = 0xF;
             break;
     }
-    gUnk_02033280.unk_06 = 0;
+    gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_0807E9D4(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078778(unk1);
+void ScriptCommand_0807E9D4(Entity* entity, ScriptExecutionContext* context) {
+    sub_08078778(entity);
 }
 
-void sub_0807E9DC(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080788E0(unk1);
+void ScriptCommand_0807E9DC(Entity* entity, ScriptExecutionContext* context) {
+    sub_080788E0(entity);
 }
 
-void sub_0807E9E4(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078784(unk1, unk2->unk_00[1]);
+void ScriptCommand_0807E9E4(Entity* entity, ScriptExecutionContext* context) {
+    sub_08078784(entity, context->scriptInstructionPointer[1]);
 }
 
-void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp;
     sub_0801E00C();
     tmp = 1;
@@ -1032,10 +1052,10 @@ void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
         case 2:
             gPlayerState.field_0x8b = 3;
             gUnk_02034490[0] = tmp;
-            unk2->unk_14 = tmp;
+            context->unk_14 = tmp;
             break;
         case 1:
-            unk2->unk_14 = 0;
+            context->unk_14 = 0;
             break;
         default:
             goto lbl;
@@ -1045,351 +1065,356 @@ void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
         gPlayerState.field_0x8b = 1;
     } else {
     lbl:
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EA4C(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk1->interactType == 2) {
-        sub_0801DFB4(unk1, 0, 0, 0);
-        unk1->interactType = 0;
-        gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807EA4C(Entity* entity, ScriptExecutionContext* context) {
+    if (entity->interactType == 2) {
+        sub_0801DFB4(entity, 0, 0, 0);
+        entity->interactType = 0;
+        gActiveScriptInfo.flags |= 1;
     } else {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EA88(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078790(unk1, unk2->unk_00[1]);
+void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context) {
+    sub_08078790(entity, context->scriptInstructionPointer[1]);
 }
 
-void sub_0807EA94(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807EA94(Entity* entity, ScriptExecutionContext* context) {
     if (gTextBox.doTextBox & 0x7F) {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EAB4(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlapFollow(unk2->unk_00[1]);
+void ScriptCommand_0807EAB4(Entity* entity, ScriptExecutionContext* context) {
+    TextboxNoOverlapFollow(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807EAC0(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlap(unk2->unk_00[1], unk1);
+void ScriptCommand_0807EAC0(Entity* entity, ScriptExecutionContext* context) {
+    TextboxNoOverlap(context->scriptInstructionPointer[1], entity);
 }
 
-void sub_0807EAD0(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlapFollow(unk2->unk_00[1]);
+void ScriptCommand_0807EAD0(Entity* entity, ScriptExecutionContext* context) {
+    TextboxNoOverlapFollow(context->scriptInstructionPointer[1]);
     gTextBox.textWindowPosX = 1;
-    gTextBox.textWindowPosY = unk2->unk_00[2];
+    gTextBox.textWindowPosY = context->scriptInstructionPointer[2];
 }
 
-void sub_0807EAF0(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (gUnk_02033280.unk_06 > unk2->unk_04) {
-        u16* tmp = unk2->unk_00 + unk2->unk_04;
+void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context) {
+    if (gActiveScriptInfo.commandSize > context->unk_04) {
+        u16* tmp = context->scriptInstructionPointer + context->unk_04;
         TextboxNoOverlapFollow(tmp[1]);
     } else {
         TextboxNoOverlapFollow(0);
     }
 }
 
-void sub_0807EB18(Entity* unk1, ScriptExecutionContext* unk2) {
-    TextboxNoOverlap(unk2->unk_04, unk1);
+void ScriptCommand_0807EB18(Entity* entity, ScriptExecutionContext* context) {
+    TextboxNoOverlap(context->unk_04, entity);
 }
 
-void sub_0807EB28(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08078AA8(unk2->unk_00[1], 0);
+void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) {
+    sub_08078AA8(context->scriptInstructionPointer[1], 0);
 }
 
-void sub_0807EB38(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = gUnk_02000040.unk_01;
+void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_04 = gUnk_02000040.unk_01;
 }
 
-void sub_0807EB44(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = unk2->unk_00[1];
+void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context) {
+    entity->animationState = context->scriptInstructionPointer[1];
 }
 
-void sub_0807EB4C(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = sub_0806F5B0(
-        sub_080045B4(unk1, unk2->unk_00[1] + gRoomControls.roomOriginX, unk2->unk_00[2] + gRoomControls.roomOriginY));
+void ScriptCommand_0807EB4C(Entity* entity, ScriptExecutionContext* context) {
+    entity->animationState =
+        sub_0806F5B0(sub_080045B4(entity, context->scriptInstructionPointer[1] + gRoomControls.roomOriginX,
+                                  context->scriptInstructionPointer[2] + gRoomControls.roomOriginY));
 }
 
-void sub_0807EB74(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->animationState = sub_0806F5B0(GetFacingDirection(unk1, &gPlayerEntity));
+void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context) {
+    entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity));
 }
 
-void sub_0807EB8C(Entity* unk1, ScriptExecutionContext* unk2) {
-    gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, unk1)) & ~1;
+void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context) {
+    gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, entity)) & ~1;
 }
 
-void sub_0807EBA8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->direction = unk2->unk_00[1];
+void ScriptCommand_0807EBA8(Entity* entity, ScriptExecutionContext* context) {
+    entity->direction = context->scriptInstructionPointer[1];
 }
 
-void sub_0807EBB0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->direction = unk2->unk_00[1];
-    unk1->animationState = unk1->direction / 4;
+void ScriptCommand_0807EBB0(Entity* entity, ScriptExecutionContext* context) {
+    entity->direction = context->scriptInstructionPointer[1];
+    entity->animationState = entity->direction / 4;
 }
 
-void sub_0807EBC0(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->nonPlanarMovement = unk2->unk_00[1];
+void ScriptCommand_0807EBC0(Entity* entity, ScriptExecutionContext* context) {
+    entity->nonPlanarMovement = context->scriptInstructionPointer[1];
 }
 
-void sub_0807EBC8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00);
+void ScriptCommand_0807EBC8(Entity* entity, ScriptExecutionContext* context) {
+    entity->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void sub_0807EBD8(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->x.HALF.HI = gRoomControls.roomOriginX + unk2->unk_00[1];
-    unk1->y.HALF.HI = gRoomControls.roomOriginY + unk2->unk_00[2];
+void ScriptCommand_0807EBD8(Entity* entity, ScriptExecutionContext* context) {
+    entity->x.HALF.HI = gRoomControls.roomOriginX + context->scriptInstructionPointer[1];
+    entity->y.HALF.HI = gRoomControls.roomOriginY + context->scriptInstructionPointer[2];
 }
 
-void sub_0807EBF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk1->x.HALF.HI += unk2->unk_00[1];
-    unk1->y.HALF.HI += unk2->unk_00[2];
+void ScriptCommand_0807EBF4(Entity* entity, ScriptExecutionContext* context) {
+    entity->x.HALF.HI += context->scriptInstructionPointer[1];
+    entity->y.HALF.HI += context->scriptInstructionPointer[2];
 }
 
-void sub_0807EC08(Entity* unk1, ScriptExecutionContext* unk2) {
-    CopyPosition(&gPlayerEntity, unk1);
+void ScriptCommand_0807EC08(Entity* entity, ScriptExecutionContext* context) {
+    CopyPosition(&gPlayerEntity, entity);
 }
 
-void nullsub_509(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommandNop3(Entity* entity, ScriptExecutionContext* context) {
 }
 
-void sub_0807EC1C(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
-        unk2->unk_08 |= 2;
+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;
     }
-    sub_0807EC44(unk1, unk2);
+    sub_0807EC44(entity, context);
 }
 
 void sub_0807EC44(Entity* unk1, ScriptExecutionContext* unk2) {
     sub_0806F69C(unk1);
     if (--unk2->unk_12) {
-        gUnk_02033280.unk_06 = 0;
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EC64(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
-        unk1->animationState = 0;
-        unk1->direction = 0;
-        unk2->unk_08 |= 2;
+void ScriptCommand_0807EC64(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        context->unk_12 = context->scriptInstructionPointer[1];
+        entity->animationState = 0;
+        entity->direction = 0;
+        context->unk_08 |= 2;
     }
-    sub_0807EC44(unk1, unk2);
+    sub_0807EC44(entity, context);
 }
 
-void sub_0807EC94(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
-        unk1->animationState = 2;
-        unk1->direction = 8;
-        unk2->unk_08 |= 2;
+void ScriptCommand_0807EC94(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        context->unk_12 = context->scriptInstructionPointer[1];
+        entity->animationState = 2;
+        entity->direction = 8;
+        context->unk_08 |= 2;
     }
-    sub_0807EC44(unk1, unk2);
+    sub_0807EC44(entity, context);
 }
 
-void sub_0807ECC4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
-        unk1->animationState = 4;
-        unk1->direction = 0x10;
-        unk2->unk_08 |= 2;
+void ScriptCommand_0807ECC4(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        context->unk_12 = context->scriptInstructionPointer[1];
+        entity->animationState = 4;
+        entity->direction = 0x10;
+        context->unk_08 |= 2;
     }
-    sub_0807EC44(unk1, unk2);
+    sub_0807EC44(entity, context);
 }
 
-void sub_0807ECF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[1];
-        unk1->animationState = 6;
-        unk1->direction = 0x18;
-        unk2->unk_08 |= 2;
+void ScriptCommand_0807ECF4(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        context->unk_12 = context->scriptInstructionPointer[1];
+        entity->animationState = 6;
+        entity->direction = 0x18;
+        context->unk_08 |= 2;
     }
-    sub_0807EC44(unk1, unk2);
+    sub_0807EC44(entity, context);
 }
 
-void sub_0807ED24(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
+void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
         s32 tmp, tmp2, tmp3;
-        unk2->unk_18 = 1;
-        unk2->unk_12 = unk2->unk_00[3];
-        tmp = unk2->unk_00[1];
-        tmp2 = unk1->x.HALF.HI - gRoomControls.roomOriginX;
-        unk2->unk_1C.WORD = ((tmp - tmp2) << 0x10) / unk2->unk_12;
-        tmp = unk2->unk_00[2];
-        tmp3 = unk1->y.HALF.HI - gRoomControls.roomOriginY;
-        unk2->unk_20.WORD = ((tmp - tmp3) << 0x10) / unk2->unk_12;
-        unk1->animationState = sub_0806F5B0(sub_080045B4(unk1, unk2->unk_00[1] + gRoomControls.roomOriginX,
-                                                         unk2->unk_00[2] + gRoomControls.roomOriginY));
-        unk2->unk_08 |= 2;
+        context->unk_18 = 1;
+        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;
+        tmp = context->scriptInstructionPointer[2];
+        tmp3 = entity->y.HALF.HI - gRoomControls.roomOriginY;
+        context->unk_20.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;
     } else {
-        if (!--unk2->unk_12) {
-            unk1->x.HALF.HI = unk2->unk_00[1] + gRoomControls.roomOriginX;
-            unk1->y.HALF.HI = unk2->unk_00[2] + gRoomControls.roomOriginY;
+        if (!--context->unk_12) {
+            entity->x.HALF.HI = context->scriptInstructionPointer[1] + gRoomControls.roomOriginX;
+            entity->y.HALF.HI = context->scriptInstructionPointer[2] + gRoomControls.roomOriginY;
             return;
         }
-        unk1->x.WORD += unk2->unk_1C.WORD;
-        unk1->y.WORD += unk2->unk_20.WORD;
+        entity->x.WORD += context->unk_1C.WORD;
+        entity->y.WORD += context->unk_20.WORD;
     }
-    gUnk_02033280.unk_06 = 0;
+    gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_0807EDD4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        sub_0807EE04(unk1, unk2);
+void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        ScriptCommand_0807EE04(entity, context);
     }
-    sub_0807EE30(unk1, unk2);
-    if (!unk2->unk_14) {
-        gUnk_02033280.unk_06 = 0;
+    ScriptCommand_0807EE30(entity, context);
+    if (!context->unk_14) {
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EE04(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_0807DEDC(unk1, unk2, unk2->unk_00[1] + gRoomControls.roomOriginX, unk2->unk_00[2] + gRoomControls.roomOriginY);
-    gUnk_02033280.unk_07 |= 1;
+void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context) {
+    sub_0807DEDC(entity, context, context->scriptInstructionPointer[1] + gRoomControls.roomOriginX,
+                 context->scriptInstructionPointer[2] + gRoomControls.roomOriginY);
+    gActiveScriptInfo.flags |= 1;
 }
 
-void sub_0807EE30(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) {
     s32 tmp, tmp2;
-    if (!--unk2->unk_19) {
-        unk2->unk_19 = 8;
-        unk1->direction = sub_080045DA(unk2->unk_1C.HALF.HI - unk1->x.HALF.HI, unk2->unk_20.HALF.HI - unk1->y.HALF.HI);
+    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);
     }
-    tmp = unk1->x.HALF.HI - unk2->unk_1C.HALF.HI;
-    tmp2 = unk1->y.HALF.HI - unk2->unk_20.HALF.HI;
-    sub_0806F62C(unk1, unk1->nonPlanarMovement, unk1->direction);
-    tmp *= unk1->x.HALF.HI - unk2->unk_1C.HALF.HI;
-    tmp2 *= unk1->y.HALF.HI - unk2->unk_20.HALF.HI;
+    tmp = entity->x.HALF.HI - context->unk_1C.HALF.HI;
+    tmp2 = entity->y.HALF.HI - context->unk_20.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;
     if (tmp <= 0 && tmp2 <= 0) {
-        unk1->x.HALF.HI = unk2->unk_1C.HALF.HI;
-        unk1->y.HALF.HI = unk2->unk_20.HALF.HI;
-        unk2->unk_14 = 1;
+        entity->x.HALF.HI = context->unk_1C.HALF.HI;
+        entity->y.HALF.HI = context->unk_20.HALF.HI;
+        context->unk_14 = 1;
     } else {
-        unk2->unk_14 = 0;
+        context->unk_14 = 0;
     }
 }
 
-void sub_0807EEB4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        sub_0807DEDC(unk1, unk2, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI);
+void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        sub_0807DEDC(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI);
     }
-    sub_0807EE30(unk1, unk2);
-    if (!unk2->unk_14) {
-        gUnk_02033280.unk_06 = 0;
+    ScriptCommand_0807EE30(entity, context);
+    if (!context->unk_14) {
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EEF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        sub_0807DEDC(unk1, unk2, unk1->x.HALF.HI + ((s16)unk2->unk_00[1]), unk1->y.HALF.HI + ((s16)unk2->unk_00[2]));
+void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->unk_18) {
+        context->unk_18 = 1;
+        sub_0807DEDC(entity, context, entity->x.HALF.HI + ((s16)context->scriptInstructionPointer[1]),
+                     entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2]));
     }
-    sub_0807EE30(unk1, unk2);
-    if (!unk2->unk_14) {
-        gUnk_02033280.unk_06 = 0;
+    ScriptCommand_0807EE30(entity, context);
+    if (!context->unk_14) {
+        gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (!unk2->unk_18) {
-        unk2->unk_18 = 1;
-        unk1->field_0x20 = ((s16)unk2->unk_00[1]) << 8;
-        unk2->unk_1C.HALF.LO = unk2->unk_00[2] << 8;
-        sub_08003FC4(unk1, (u16)unk2->unk_1C.HALF.LO);
+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);
     } else {
-        if (!sub_08003FC4(unk1, (u16)unk2->unk_1C.HALF.LO))
+        if (!sub_08003FC4(entity, (u16)context->unk_1C.HALF.LO))
             return;
     }
-    gUnk_02033280.unk_06 = 0;
+    gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_0807EF80(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_08 |= 1 << unk2->unk_00[1];
+void ScriptCommand_0807EF80(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_08 |= 1 << context->scriptInstructionPointer[1];
 }
 
-void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_08 |= 1 << unk2->unk_00[1];
+void ScriptCommand_0807EF90(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_08 |= 1 << context->scriptInstructionPointer[1];
 }
 
-void sub_0807EFA0(Entity* unk1, ScriptExecutionContext* unk2) {
-    SoundReq(unk2->unk_00[1]);
+void ScriptCommand_0807EFA0(Entity* entity, ScriptExecutionContext* context) {
+    SoundReq(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807EFAC(Entity* unk1, ScriptExecutionContext* unk2) {
-    if (unk2->unk_00[1] >= 100) {
+void ScriptCommand_0807EFAC(Entity* entity, ScriptExecutionContext* context) {
+    if (context->scriptInstructionPointer[1] >= 100) {
         SoundReq(gArea.musicIndex);
     } else {
-        SoundReq(unk2->unk_00[1]);
+        SoundReq(context->scriptInstructionPointer[1]);
     }
 }
 
-void sub_0807EFD4(Entity* unk1, ScriptExecutionContext* unk2) {
-    SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
+void ScriptCommand_0807EFD4(Entity* entity, ScriptExecutionContext* context) {
+    SoundReq(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
-void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807EFE4(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(0x80100000);
 }
 
-void sub_0807EFF4(Entity* unk1, ScriptExecutionContext* unk2) {
-    ModRupees((s16)unk2->unk_00[1]);
+void ScriptCommand_0807EFF4(Entity* entity, ScriptExecutionContext* context) {
+    ModRupees((s16)context->scriptInstructionPointer[1]);
 }
 
-void sub_0807F004(Entity* unk1, ScriptExecutionContext* unk2) {
-    ModHealth(unk2->unk_00[1]);
+void ScriptCommand_0807F004(Entity* entity, ScriptExecutionContext* context) {
+    ModHealth(context->scriptInstructionPointer[1]);
 }
 
-void sub_0807F010(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807F010(Entity* entity, ScriptExecutionContext* context) {
     gSave.stats.maxHealth = min(gSave.stats.maxHealth + 8, 0xA0);
     gSave.stats.health = gSave.stats.maxHealth;
 }
 
-void sub_0807F034(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = 0;
-    if (unk2->unk_00[1] == 0x3F) {
-        tmp = unk2->unk_04;
+    if (context->scriptInstructionPointer[1] == 0x3F) {
+        tmp = context->unk_04;
     }
-    sub_080A7C18(unk2->unk_00[1], tmp, 0);
+    sub_080A7C18(context->scriptInstructionPointer[1], tmp, 0);
 }
 
-void sub_0807F050(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080A7C18(0x5C, unk2->unk_00[1], 0);
+void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context) {
+    sub_080A7C18(0x5C, context->scriptInstructionPointer[1], 0);
 }
 
-void sub_0807F060(Entity* unk1, ScriptExecutionContext* unk2) {
-    unk2->unk_04 = GetInventoryValue(unk2->unk_00[1]);
-    unk2->unk_14 = unk2->unk_04 != 0;
+void ScriptCommand_0807F060(Entity* entity, ScriptExecutionContext* context) {
+    context->unk_04 = GetInventoryValue(context->scriptInstructionPointer[1]);
+    context->unk_14 = context->unk_04 != 0;
 }
 
-void sub_0807F078(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_0807CAA0(unk2->unk_00[1], unk2->unk_00[2]);
+void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context) {
+    sub_0807CAA0(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
 }
 
-void sub_0807F088(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_080A7C18(unk2->unk_00[1], 0, 3);
+void ScriptCommand_0807F088(Entity* entity, ScriptExecutionContext* context) {
+    sub_080A7C18(context->scriptInstructionPointer[1], 0, 3);
 }
 
-void sub_0807F098(Entity* unk1, ScriptExecutionContext* unk2) {
-    gRoomControls.cameraTarget = unk1;
+void ScriptCommand_0807F098(Entity* entity, ScriptExecutionContext* context) {
+    gRoomControls.cameraTarget = entity;
 }
 
-void sub_0807F0A4(Entity* unk1, ScriptExecutionContext* unk2) {
+void ScriptCommand_0807F0A4(Entity* entity, ScriptExecutionContext* context) {
     gRoomControls.cameraTarget = &gPlayerEntity;
 }
 
-void sub_0807F0B4(Entity* unk1, ScriptExecutionContext* unk2) {
-    gRoomControls.unk5 = unk2->unk_00[1] & 7;
+void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context) {
+    gRoomControls.unk5 = context->scriptInstructionPointer[1] & 7;
 }
 
-void sub_0807F0C8(Entity* unk1, ScriptExecutionContext* unk2) {
-    sub_08080964(unk2->unk_00[1], unk2->unk_00[2]);
+void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context) {
+    sub_08080964(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
 }

From 849ff8dcfd1e9b24b91bf830719a24f31f113115 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Thu, 4 Mar 2021 20:59:20 +0100
Subject: [PATCH 12/46] named a lot of script commands

---
 include/script.h |   2 +-
 src/script.c     | 562 ++++++++++++++++++++++++++++-------------------
 2 files changed, 333 insertions(+), 231 deletions(-)

diff --git a/include/script.h b/include/script.h
index 201d0f71..aebc64dd 100644
--- a/include/script.h
+++ b/include/script.h
@@ -10,7 +10,7 @@ typedef struct ScriptExecutionContext {
     u8 unk_0C[0x4]; // unused
     u16 wait;
     u16 unk_12;
-    u32 unk_14;
+    u32 condition;
     u8 unk_18;
     u8 unk_19;
     u8 unk_1A;
diff --git a/src/script.c b/src/script.c
index eed9dae0..9ee2d8ca 100644
--- a/src/script.c
+++ b/src/script.c
@@ -13,69 +13,69 @@ void sub_0807DB88(ScriptExecutionContext*, u16*);
 void sub_0807DE80(Entity*);
 void sub_0807DF38(void);
 void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E004(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E014(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E024(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E050(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E064(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_StartScript(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_StopScript(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_Jump(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpIf(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E0A0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E0B8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E0CC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpAbsolute(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpAbsoluteIf(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E10C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E124(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E148(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E158(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E188(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E1D8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E200(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E220(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E240(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E260(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E280(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E2A8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E2E4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckInventory1(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckInventory2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckLocalFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckLocalFlagByOffset(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckGlobalFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckRoomFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckPlayerInRegion(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckPlayerInRegion2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E390(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_HasRupees(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E40C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E42C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckKinstoneFused(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E4AC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E538(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckPlayerFlags(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E584(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E5A0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E5CC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_EntityHasHeight(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ComparePlayerAction(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E628(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E634(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E644(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E650(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E65C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E668(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E674(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E680(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E690(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E6AC(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E6DC(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E700(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E72C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E75C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetLocalFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetLocalFlagByOffset(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ClearLocalFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetGlobalFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ClearGlobalFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetRoomFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ClearRoomFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitForSomething(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitForSomething2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitPlayerAction8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E788(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E7B0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E7C4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E7D8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E7EC(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_DoFade4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_DoFade5(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_DoFade6(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_DoFade7(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E800(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context);
 void sub_0807E818(u32);
@@ -83,8 +83,8 @@ void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E864(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E878(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E898(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E8C4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetPlayerAction(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_StartPlayerScript(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context);
@@ -100,24 +100,24 @@ void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EA4C(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EA94(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EAB4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EAC0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EAD0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TextboxNoOverlapFollow(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TextboxNoOverlap(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EB18(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB4C(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EBA8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EBB0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EBC0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EBC8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EBD8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EBF4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EC08(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntityDirection(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntityNonPlanarMovement(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntityPositionRelative(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntityPosition(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_MoveEntityToPlayer(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommandNop3(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EC1C(Entity* entity, ScriptExecutionContext* context);
 void sub_0807EC44(Entity*, ScriptExecutionContext*);
@@ -134,20 +134,20 @@ 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_0807EFA0(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EFAC(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EFD4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EFE4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EFF4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807F004(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807F010(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);
+void ScriptCommand_SoundReq0x80100000(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807F060(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F088(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807F098(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807F0A4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CameraTargetEntity(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CameraTargetPlayer(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context);
 
@@ -157,43 +157,145 @@ extern void sub_0801C4A0(u32);
 
 typedef void (*ScriptCommand)(Entity*, ScriptExecutionContext*);
 
-const ScriptCommand gScriptCommands[] = {
-    ScriptCommandNop,       ScriptCommand_0807E004, ScriptCommand_0807E014, ScriptCommand_0807E024,
-    ScriptCommand_0807E050, ScriptCommand_0807E064, ScriptCommand_0807E078, ScriptCommand_0807E0A0,
-    ScriptCommand_0807E0B8, ScriptCommand_0807E0CC, ScriptCommand_0807E0E0, ScriptCommand_0807E10C,
-    ScriptCommand_0807E124, ScriptCommand_0807E148, ScriptCommand_0807E158, ScriptCommand_0807E188,
-    ScriptCommand_0807E1D8, ScriptCommand_0807E4AC, ScriptCommand_0807E200, ScriptCommand_0807E220,
-    ScriptCommand_0807E240, ScriptCommand_0807E260, ScriptCommand_0807E280, ScriptCommand_0807E2A8,
-    ScriptCommand_0807E2E4, ScriptCommand_0807E30C, ScriptCommand_0807E390, ScriptCommand_0807E3BC,
-    ScriptCommand_0807E3E8, ScriptCommand_0807E40C, ScriptCommand_0807E42C, ScriptCommand_0807E48C,
-    ScriptCommand_0807E4CC, ScriptCommand_0807E4EC, ScriptCommand_0807E514, ScriptCommand_0807E538,
-    ScriptCommand_0807E564, ScriptCommand_0807E584, ScriptCommand_0807E5A0, ScriptCommand_0807E5CC,
-    ScriptCommand_0807E5F8, ScriptCommand_0807E610, ScriptCommand_0807E628, ScriptCommand_0807E634,
-    ScriptCommand_0807E644, ScriptCommand_0807E650, ScriptCommand_0807E65C, ScriptCommand_0807E668,
-    ScriptCommand_0807E674, ScriptCommand_0807E680, ScriptCommand_0807E690, ScriptCommand_0807E6AC,
-    ScriptCommand_0807E6DC, ScriptCommand_0807E700, ScriptCommand_0807E72C, ScriptCommand_0807E75C,
-    ScriptCommand_0807E778, ScriptCommand_0807E788, ScriptCommand_0807E79C, ScriptCommandNop2,
-    ScriptCommand_0807E7B0, ScriptCommand_0807E7C4, ScriptCommand_0807E7D8, ScriptCommand_0807E7EC,
-    ScriptCommand_0807E800, ScriptCommand_0807E80C, ScriptCommand_0807E858, ScriptCommand_0807E864,
-    ScriptCommand_0807E878, ScriptCommand_0807E888, ScriptCommand_0807E898, ScriptCommand_0807E8C4,
-    ScriptCommand_0807E8D4, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4,
-    ScriptCommand_0807E8E4, ScriptCommand_0807E908, ScriptCommand_0807E914, ScriptCommand_0807E924,
-    ScriptCommand_0807E930, ScriptCommand_0807E944, ScriptCommand_0807E974, ScriptCommand_0807E9D4,
-    ScriptCommand_0807E9DC, ScriptCommand_0807E9E4, ScriptCommand_0807E9F0, ScriptCommand_0807EA4C,
-    ScriptCommand_0807EA88, ScriptCommand_0807EA94, ScriptCommand_0807EAB4, ScriptCommand_0807EAC0,
-    ScriptCommand_0807EAD0, ScriptCommand_0807EAF0, ScriptCommand_0807EB18, ScriptCommand_0807EB28,
-    ScriptCommand_0807EB38, ScriptCommand_0807EB44, ScriptCommand_0807EB4C, ScriptCommand_0807EB74,
-    ScriptCommand_0807EB8C, ScriptCommand_0807EBA8, ScriptCommand_0807EBB0, ScriptCommand_0807EBC0,
-    ScriptCommand_0807EBC8, ScriptCommand_0807EBD8, ScriptCommand_0807EBF4, ScriptCommand_0807EC08,
-    ScriptCommandNop3,      ScriptCommand_0807EC1C, ScriptCommand_0807EC64, ScriptCommand_0807EC94,
-    ScriptCommand_0807ECC4, ScriptCommand_0807ECF4, ScriptCommand_0807ED24, ScriptCommand_0807EDD4,
-    ScriptCommand_0807EE04, ScriptCommand_0807EE30, ScriptCommand_0807EEB4, ScriptCommand_0807EEF4,
-    ScriptCommand_0807EF3C, ScriptCommand_0807EF80, ScriptCommand_0807EF90, ScriptCommand_0807EFA0,
-    ScriptCommand_0807EFAC, ScriptCommand_0807EFD4, ScriptCommand_0807EFE4, ScriptCommand_0807EFF4,
-    ScriptCommand_0807F004, ScriptCommand_0807F010, ScriptCommand_0807F034, ScriptCommand_0807F050,
-    ScriptCommand_0807F060, ScriptCommand_0807F078, ScriptCommand_0807F088, ScriptCommand_0807F098,
-    ScriptCommand_0807F0A4, ScriptCommand_0807F0B4, ScriptCommand_0807F0C8
-};
+const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
+                                          ScriptCommand_StartScript,
+                                          ScriptCommand_StopScript,
+                                          ScriptCommand_Jump,
+                                          ScriptCommand_JumpIf,
+                                          ScriptCommand_JumpIfNot,
+                                          ScriptCommand_0807E078,
+                                          ScriptCommand_JumpAbsolute,
+                                          ScriptCommand_JumpAbsoluteIf,
+                                          ScriptCommand_JumpAbsoluteIfNot,
+                                          ScriptCommand_0807E0E0,
+                                          ScriptCommand_Call,
+                                          ScriptCommand_CallWithArg,
+                                          ScriptCommand_LoadRoomEntityList,
+                                          ScriptCommand_TestBit,
+                                          ScriptCommand_CheckInventory1,
+                                          ScriptCommand_CheckInventory2,
+                                          ScriptCommand_HasRoomItemForSale,
+                                          ScriptCommand_CheckLocalFlag,
+                                          ScriptCommand_CheckLocalFlagByOffset,
+                                          ScriptCommand_CheckGlobalFlag,
+                                          ScriptCommand_CheckRoomFlag,
+                                          ScriptCommand_CheckPlayerInRegion,
+                                          ScriptCommand_CheckPlayerInRegion2,
+                                          ScriptCommand_CheckEntityInteractType,
+                                          ScriptCommand_0807E30C,
+                                          ScriptCommand_HasRupees,
+                                          ScriptCommand_0807E3BC,
+                                          ScriptCommand_0807E3E8,
+                                          ScriptCommand_CheckKinstoneFused,
+                                          ScriptCommand_BuyItem,
+                                          ScriptCommand_0807E48C,
+                                          ScriptCommand_0807E4CC,
+                                          ScriptCommand_0807E4EC,
+                                          ScriptCommand_0807E514,
+                                          ScriptCommand_CheckPlayerFlags,
+                                          ScriptCommand_0807E564,
+                                          ScriptCommand_EntityHasHeight,
+                                          ScriptCommand_ComparePlayerAction,
+                                          ScriptCommand_ComparePlayerAnimationState,
+                                          ScriptCommand_0807E5F8,
+                                          ScriptCommand_0807E610,
+                                          ScriptCommand_SetLocalFlag,
+                                          ScriptCommand_SetLocalFlagByOffset,
+                                          ScriptCommand_ClearLocalFlag,
+                                          ScriptCommand_SetGlobalFlag,
+                                          ScriptCommand_ClearGlobalFlag,
+                                          ScriptCommand_SetRoomFlag,
+                                          ScriptCommand_ClearRoomFlag,
+                                          ScriptCommand_Wait,
+                                          ScriptCommand_WaitForSomething,
+                                          ScriptCommand_WaitForSomething2,
+                                          ScriptCommand_WaitPlayerAction8,
+                                          ScriptCommand_WaitForPlayerAction0x17,
+                                          ScriptCommand_WaitFor_1,
+                                          ScriptCommand_WaitFor_2,
+                                          ScriptCommand_0807E778,
+                                          ScriptCommand_0807E788,
+                                          ScriptCommand_0807E79C,
+                                          ScriptCommandNop2,
+                                          ScriptCommand_DoFade4,
+                                          ScriptCommand_DoFade5,
+                                          ScriptCommand_DoFade6,
+                                          ScriptCommand_DoFade7,
+                                          ScriptCommand_0807E800,
+                                          ScriptCommand_0807E80C,
+                                          ScriptCommand_0807E858,
+                                          ScriptCommand_0807E864,
+                                          ScriptCommand_0807E878,
+                                          ScriptCommand_0807E888,
+                                          ScriptCommand_SetPlayerAction,
+                                          ScriptCommand_StartPlayerScript,
+                                          ScriptCommand_0807E8D4,
+                                          ScriptCommand_0807E8E4,
+                                          ScriptCommand_0807E8E4,
+                                          ScriptCommand_0807E8E4,
+                                          ScriptCommand_0807E8E4,
+                                          ScriptCommand_0807E908,
+                                          ScriptCommand_0807E914,
+                                          ScriptCommand_0807E924,
+                                          ScriptCommand_0807E930,
+                                          ScriptCommand_0807E944,
+                                          ScriptCommand_0807E974,
+                                          ScriptCommand_0807E9D4,
+                                          ScriptCommand_0807E9DC,
+                                          ScriptCommand_0807E9E4,
+                                          ScriptCommand_0807E9F0,
+                                          ScriptCommand_0807EA4C,
+                                          ScriptCommand_0807EA88,
+                                          ScriptCommand_0807EA94,
+                                          ScriptCommand_TextboxNoOverlapFollow,
+                                          ScriptCommand_TextboxNoOverlap,
+                                          ScriptCommand_TextboxNoOverlapFollowPos,
+                                          ScriptCommand_0807EAF0,
+                                          ScriptCommand_TextboxNoOverlapVar,
+                                          ScriptCommand_0807EB28,
+                                          ScriptCommand_0807EB38,
+                                          ScriptCommand_0807EB44,
+                                          ScriptCommand_0807EB4C,
+                                          ScriptCommand_0807EB74,
+                                          ScriptCommand_0807EB8C,
+                                          ScriptCommand_SetEntityDirection,
+                                          ScriptCommand_SetEntityDirectionWithAnimationState,
+                                          ScriptCommand_SetEntityNonPlanarMovement,
+                                          ScriptCommand_SetEntity0x20,
+                                          ScriptCommand_SetEntityPositionRelative,
+                                          ScriptCommand_SetEntityPosition,
+                                          ScriptCommand_MoveEntityToPlayer,
+                                          ScriptCommandNop3,
+                                          ScriptCommand_0807EC1C,
+                                          ScriptCommand_0807EC64,
+                                          ScriptCommand_0807EC94,
+                                          ScriptCommand_0807ECC4,
+                                          ScriptCommand_0807ECF4,
+                                          ScriptCommand_0807ED24,
+                                          ScriptCommand_0807EDD4,
+                                          ScriptCommand_0807EE04,
+                                          ScriptCommand_0807EE30,
+                                          ScriptCommand_0807EEB4,
+                                          ScriptCommand_0807EEF4,
+                                          ScriptCommand_0807EF3C,
+                                          ScriptCommand_0807EF80,
+                                          ScriptCommand_0807EF90,
+                                          ScriptCommand_SoundReq,
+                                          ScriptCommand_SoundReq2,
+                                          ScriptCommand_SoundReq3,
+                                          ScriptCommand_SoundReq0x80100000,
+                                          ScriptCommand_ModRupees,
+                                          ScriptCommand_ModHealth,
+                                          ScriptCommand_IncreaseMaxHealth,
+                                          ScriptCommand_0807F034,
+                                          ScriptCommand_0807F050,
+                                          ScriptCommand_GetInventoryValue,
+                                          ScriptCommand_0807F078,
+                                          ScriptCommand_0807F088,
+                                          ScriptCommand_CameraTargetEntity,
+                                          ScriptCommand_CameraTargetPlayer,
+                                          ScriptCommand_0807F0B4,
+                                          ScriptCommand_0807F0C8 };
 
 extern const u16 gUnk_08016984;
 extern u8 gUnk_0811E514[];
@@ -467,7 +569,7 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 arg2, u32
 
     context->unk_19 = 8;
     context->unk_08 |= 2;
-    context->unk_14 = 0;
+    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;
@@ -525,15 +627,17 @@ void ExecuteScriptCommandSet(Entity* unk1, ScriptExecutionContext* unk2) {
 void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context) {
 }
 
-void ScriptCommand_0807E004(Entity* entity, ScriptExecutionContext* context) {
+// not entirely sure this name is acurate
+void ScriptCommand_StartScript(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.flags |= 2;
 }
 
-void ScriptCommand_0807E014(Entity* entity, ScriptExecutionContext* context) {
+// not entirely sure this name is acurate
+void ScriptCommand_StopScript(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.flags &= ~2;
 }
 
-void ScriptCommand_0807E024(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_Jump(Entity* entity, ScriptExecutionContext* context) {
     s16 tmp;
     context->scriptInstructionPointer++;
     tmp = GetNextScriptCommandHalfword(context->scriptInstructionPointer);
@@ -541,79 +645,77 @@ void ScriptCommand_0807E024(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.commandSize = 0;
 }
 
-void ScriptCommand_0807E050(Entity* entity, ScriptExecutionContext* context) {
-    if (context->unk_14) {
-        ScriptCommand_0807E024(entity, context);
+void ScriptCommand_JumpIf(Entity* entity, ScriptExecutionContext* context) {
+    if (context->condition) {
+        ScriptCommand_Jump(entity, context);
     }
 }
 
-void ScriptCommand_0807E064(Entity* entity, ScriptExecutionContext* context) {
-    if (!context->unk_14) {
-        ScriptCommand_0807E024(entity, context);
+void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->condition) {
+        ScriptCommand_Jump(entity, context);
     }
 }
 
 void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context) {
     if (gActiveScriptInfo.commandSize > context->unk_04) {
         context->scriptInstructionPointer += context->unk_04;
-        ScriptCommand_0807E024(entity, context);
+        ScriptCommand_Jump(entity, context);
     }
 }
 
-void ScriptCommand_0807E0A0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_JumpAbsolute(Entity* entity, ScriptExecutionContext* context) {
     context->scriptInstructionPointer =
         (u16*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     gActiveScriptInfo.commandSize = 0;
 }
 
-void ScriptCommand_0807E0B8(Entity* entity, ScriptExecutionContext* context) {
-    if (context->unk_14) {
-        ScriptCommand_0807E0A0(entity, context);
+void ScriptCommand_JumpAbsoluteIf(Entity* entity, ScriptExecutionContext* context) {
+    if (context->condition) {
+        ScriptCommand_JumpAbsolute(entity, context);
     }
 }
 
-void ScriptCommand_0807E0CC(Entity* entity, ScriptExecutionContext* context) {
-    if (!context->unk_14) {
-        ScriptCommand_0807E0A0(entity, context);
+void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* context) {
+    if (!context->condition) {
+        ScriptCommand_JumpAbsolute(entity, context);
     }
 }
 
 void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context) {
     if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) {
         context->scriptInstructionPointer += context->unk_04 << 1;
-        ScriptCommand_0807E0A0(entity, context);
+        ScriptCommand_JumpAbsolute(entity, context);
     }
 }
 
-void ScriptCommand_0807E10C(Entity* entity, ScriptExecutionContext* context) {
-    ((void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(
-        context->scriptInstructionPointer))(entity, context);
+void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context) {
+    ((ScriptCommand)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer))(entity, context);
 }
 
-void ScriptCommand_0807E124(Entity* entity, ScriptExecutionContext* context) {
-    void (*tmp)(Entity*, ScriptExecutionContext*) =
-        (void (*)(Entity*, ScriptExecutionContext*))GetNextScriptCommandWordAfterCommandMetadata(
-            context->scriptInstructionPointer);
+// the called function can read an argument from context->unk_04
+void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context) {
+    ScriptCommand tmp = (ScriptCommand)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     context->unk_04 = GetNextScriptCommandWord(context->scriptInstructionPointer + 3);
     tmp(entity, context);
 }
 
-void ScriptCommand_0807E148(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context) {
     LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
-void ScriptCommand_0807E158(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     u32 tmp2 = 0;
     u32 tmp3 = gActiveScriptInfo.unk_00;
     if ((tmp3 & tmp) == tmp)
         tmp2 = 1;
-    context->unk_14 = tmp2;
+    context->condition = tmp2;
     gActiveScriptInfo.unk_00 = tmp3 & ~tmp;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E188(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckInventory1(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp;
     u32 tmp2 = GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer);
     switch (tmp2) {
@@ -632,64 +734,64 @@ void ScriptCommand_0807E188(Entity* entity, ScriptExecutionContext* context) {
         default:
             tmp = GetInventoryValue(tmp2);
     }
-    context->unk_14 = tmp;
+    context->condition = tmp;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E1D8(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = GetInventoryValue(context->scriptInstructionPointer[1]) == 2;
+void ScriptCommand_CheckInventory2(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = GetInventoryValue(context->scriptInstructionPointer[1]) == 2;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E200(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = CheckLocalFlag(context->scriptInstructionPointer[1]);
+void ScriptCommand_CheckLocalFlag(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = CheckLocalFlag(context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E220(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 =
+void ScriptCommand_CheckLocalFlagByOffset(Entity* entity, ScriptExecutionContext* context) {
+    context->condition =
         CheckLocalFlagByOffset(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E240(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 =
+void ScriptCommand_CheckGlobalFlag(Entity* entity, ScriptExecutionContext* context) {
+    context->condition =
         CheckGlobalFlag(GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer));
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E260(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = CheckRoomFlag(context->scriptInstructionPointer[1]);
+void ScriptCommand_CheckRoomFlag(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = CheckRoomFlag(context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E280(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckPlayerInRegion(Entity* entity, ScriptExecutionContext* context) {
     u32 x, y, width, height;
     width = context->scriptInstructionPointer[3];
     height = width >> 8;
     width &= 0xFF;
     x = context->scriptInstructionPointer[1];
     y = context->scriptInstructionPointer[2];
-    context->unk_14 = CheckPlayerInRegion(x, y, width, height);
+    context->condition = CheckPlayerInRegion(x, y, width, height);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E2A8(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckPlayerInRegion2(Entity* entity, ScriptExecutionContext* context) {
     u32 x, y, width, height;
     width = context->scriptInstructionPointer[1] & 0xFF;
     height = context->scriptInstructionPointer[1] >> 8;
     x = entity->x.HALF.HI - gRoomControls.roomOriginX;
     y = entity->y.HALF.HI - gRoomControls.roomOriginY;
-    context->unk_14 = CheckPlayerInRegion(x, y, width, height);
+    context->condition = CheckPlayerInRegion(x, y, width, height);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E2E4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContext* context) {
     if (entity->interactType) {
         entity->interactType = 0;
-        context->unk_14 = 1;
+        context->condition = 1;
     } else {
-        context->unk_14 = 0;
+        context->condition = 0;
     }
     gActiveScriptInfo.flags |= 1;
 }
@@ -702,35 +804,35 @@ void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context) {
     context->unk_1A++;
     if (entity->interactType) {
         entity->interactType = 0;
-        context->unk_14 = 1;
+        context->condition = 1;
         entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity));
     } else {
-        context->unk_14 = 0;
+        context->condition = 0;
     }
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E390(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = (context->scriptInstructionPointer[1] <= gSave.stats.rupees);
+void ScriptCommand_HasRupees(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = (context->scriptInstructionPointer[1] <= gSave.stats.rupees);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = (context->scriptInstructionPointer[1] <= gSave.stats.field_0x1a);
+    context->condition = (context->scriptInstructionPointer[1] <= gSave.stats.field_0x1a);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = !gUnk_02000040.unk_01;
+    context->condition = !gUnk_02000040.unk_01;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E40C(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = CheckKinstoneFused(context->scriptInstructionPointer[1]);
+void ScriptCommand_CheckKinstoneFused(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = CheckKinstoneFused(context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E42C(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp, tmp2;
     s32 tmp3;
     tmp = context->scriptInstructionPointer[1];
@@ -740,8 +842,8 @@ void ScriptCommand_0807E42C(Entity* entity, ScriptExecutionContext* context) {
         tmp2 = gRoomVars.field_0x7;
     }
     tmp3 = sub_08053FE0(tmp);
-    context->unk_14 = (tmp3 <= gSave.stats.rupees);
-    if (context->unk_14) {
+    context->condition = (tmp3 <= gSave.stats.rupees);
+    if (context->condition) {
         ModRupees(-tmp3);
         sub_080A7C18(tmp, tmp2, 0);
         gRoomVars.itemForSaleIndex = 0;
@@ -751,55 +853,55 @@ void ScriptCommand_0807E42C(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = sub_080544DC(context->scriptInstructionPointer[1]);
+    context->condition = sub_080544DC(context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E4AC(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = !!gRoomVars.itemForSaleIndex;
+void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = !!gRoomVars.itemForSaleIndex;
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = !!(context->unk_04 & context->scriptInstructionPointer[1]);
+    context->condition = !!(context->unk_04 & context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = context->scriptInstructionPointer[1];
-    context->unk_14 = tmp == (tmp & context->unk_04);
+    context->condition = tmp == (tmp & context->unk_04);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = context->scriptInstructionPointer[1];
-    context->unk_14 = tmp == context->unk_04;
+    context->condition = tmp == context->unk_04;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E538(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 =
+void ScriptCommand_CheckPlayerFlags(Entity* entity, ScriptExecutionContext* context) {
+    context->condition =
         !!(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer) & gPlayerState.flags.all);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = (gPlayerState.flags.all >> 7) & 1;
+    context->condition = (gPlayerState.flags.all >> 7) & 1;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E584(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = entity->height.WORD != 0;
+void ScriptCommand_EntityHasHeight(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = entity->height.WORD != 0;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E5A0(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = context->scriptInstructionPointer[1] == gPlayerEntity.action;
+void ScriptCommand_ComparePlayerAction(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = context->scriptInstructionPointer[1] == gPlayerEntity.action;
     gActiveScriptInfo.flags |= 1;
 }
 
-void ScriptCommand_0807E5CC(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_14 = context->scriptInstructionPointer[1] == gPlayerEntity.animationState;
+void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionContext* context) {
+    context->condition = context->scriptInstructionPointer[1] == gPlayerEntity.animationState;
     gActiveScriptInfo.flags |= 1;
 }
 
@@ -811,46 +913,46 @@ void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void ScriptCommand_0807E628(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetLocalFlag(Entity* entity, ScriptExecutionContext* context) {
     SetLocalFlag(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807E634(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetLocalFlagByOffset(Entity* entity, ScriptExecutionContext* context) {
     SetLocalFlagByOffset(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
 }
 
-void ScriptCommand_0807E644(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_ClearLocalFlag(Entity* entity, ScriptExecutionContext* context) {
     ClearLocalFlag(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807E650(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetGlobalFlag(Entity* entity, ScriptExecutionContext* context) {
     SetGlobalFlag(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807E65C(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_ClearGlobalFlag(Entity* entity, ScriptExecutionContext* context) {
     ClearGlobalFlag(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807E668(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetRoomFlag(Entity* entity, ScriptExecutionContext* context) {
     SetRoomFlag(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807E674(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_ClearRoomFlag(Entity* entity, ScriptExecutionContext* context) {
     ClearRoomFlag(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807E680(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context) {
     context->wait = GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void ScriptCommand_0807E690(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitForSomething(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     if ((gActiveScriptInfo.unk_00 & tmp) != tmp) {
         gActiveScriptInfo.commandSize = 0;
     }
 }
 
-void ScriptCommand_0807E6AC(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitForSomething2(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     if ((gActiveScriptInfo.unk_00 & tmp) != tmp) {
         gActiveScriptInfo.commandSize = 0;
@@ -860,7 +962,7 @@ void ScriptCommand_0807E6AC(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807E6DC(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitPlayerAction8(Entity* entity, ScriptExecutionContext* context) {
     if (gPlayerEntity.action == 8) {
         gActiveScriptInfo.commandSize = 0;
     } else {
@@ -868,7 +970,7 @@ void ScriptCommand_0807E6DC(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807E700(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContext* context) {
     if (gPlayerEntity.action != 0x17) {
         gActiveScriptInfo.flags |= 1;
     } else {
@@ -876,7 +978,7 @@ void ScriptCommand_0807E700(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807E72C(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context) {
     if (gRoomControls.unk6 & 4) {
         gActiveScriptInfo.commandSize = 0;
     } else {
@@ -884,7 +986,7 @@ void ScriptCommand_0807E72C(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807E75C(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context) {
     if (gFadeControl.active) {
         gActiveScriptInfo.commandSize = 0;
     }
@@ -905,19 +1007,19 @@ void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context) {
 void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context) {
 }
 
-void ScriptCommand_0807E7B0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_DoFade4(Entity* entity, ScriptExecutionContext* context) {
     DoFade(4, gActiveScriptInfo.unk_08);
 }
 
-void ScriptCommand_0807E7C4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_DoFade5(Entity* entity, ScriptExecutionContext* context) {
     DoFade(5, gActiveScriptInfo.unk_08);
 }
 
-void ScriptCommand_0807E7D8(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_DoFade6(Entity* entity, ScriptExecutionContext* context) {
     DoFade(6, gActiveScriptInfo.unk_08);
 }
 
-void ScriptCommand_0807E7EC(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_DoFade7(Entity* entity, ScriptExecutionContext* context) {
     DoFade(7, gActiveScriptInfo.unk_08);
 }
 
@@ -959,7 +1061,7 @@ void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context) {
     gPlayerState.field_0x8b = 3;
 }
 
-void ScriptCommand_0807E898(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetPlayerAction(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
     gPlayerState.playerAction = tmp;
     gPlayerState.field_0x38 = tmp >> 8;
@@ -967,7 +1069,7 @@ void ScriptCommand_0807E898(Entity* entity, ScriptExecutionContext* context) {
     gPlayerState.field_0x3a = tmp >> 0x18;
 }
 
-void ScriptCommand_0807E8C4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_StartPlayerScript(Entity* entity, ScriptExecutionContext* context) {
     StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
@@ -1052,10 +1154,10 @@ void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context) {
         case 2:
             gPlayerState.field_0x8b = 3;
             gUnk_02034490[0] = tmp;
-            context->unk_14 = tmp;
+            context->condition = tmp;
             break;
         case 1:
-            context->unk_14 = 0;
+            context->condition = 0;
             break;
         default:
             goto lbl;
@@ -1089,15 +1191,15 @@ void ScriptCommand_0807EA94(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807EAB4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_TextboxNoOverlapFollow(Entity* entity, ScriptExecutionContext* context) {
     TextboxNoOverlapFollow(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807EAC0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_TextboxNoOverlap(Entity* entity, ScriptExecutionContext* context) {
     TextboxNoOverlap(context->scriptInstructionPointer[1], entity);
 }
 
-void ScriptCommand_0807EAD0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionContext* context) {
     TextboxNoOverlapFollow(context->scriptInstructionPointer[1]);
     gTextBox.textWindowPosX = 1;
     gTextBox.textWindowPosY = context->scriptInstructionPointer[2];
@@ -1112,7 +1214,7 @@ void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807EB18(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context) {
     TextboxNoOverlap(context->unk_04, entity);
 }
 
@@ -1142,34 +1244,34 @@ void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context) {
     gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, entity)) & ~1;
 }
 
-void ScriptCommand_0807EBA8(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetEntityDirection(Entity* entity, ScriptExecutionContext* context) {
     entity->direction = context->scriptInstructionPointer[1];
 }
 
-void ScriptCommand_0807EBB0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptExecutionContext* context) {
     entity->direction = context->scriptInstructionPointer[1];
     entity->animationState = entity->direction / 4;
 }
 
-void ScriptCommand_0807EBC0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetEntityNonPlanarMovement(Entity* entity, ScriptExecutionContext* context) {
     entity->nonPlanarMovement = context->scriptInstructionPointer[1];
 }
 
-void ScriptCommand_0807EBC8(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context) {
     entity->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
-void ScriptCommand_0807EBD8(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetEntityPositionRelative(Entity* entity, ScriptExecutionContext* context) {
     entity->x.HALF.HI = gRoomControls.roomOriginX + context->scriptInstructionPointer[1];
     entity->y.HALF.HI = gRoomControls.roomOriginY + context->scriptInstructionPointer[2];
 }
 
-void ScriptCommand_0807EBF4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SetEntityPosition(Entity* entity, ScriptExecutionContext* context) {
     entity->x.HALF.HI += context->scriptInstructionPointer[1];
     entity->y.HALF.HI += context->scriptInstructionPointer[2];
 }
 
-void ScriptCommand_0807EC08(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_MoveEntityToPlayer(Entity* entity, ScriptExecutionContext* context) {
     CopyPosition(&gPlayerEntity, entity);
 }
 
@@ -1269,7 +1371,7 @@ void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context) {
         ScriptCommand_0807EE04(entity, context);
     }
     ScriptCommand_0807EE30(entity, context);
-    if (!context->unk_14) {
+    if (!context->condition) {
         gActiveScriptInfo.commandSize = 0;
     }
 }
@@ -1295,9 +1397,9 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) {
     if (tmp <= 0 && tmp2 <= 0) {
         entity->x.HALF.HI = context->unk_1C.HALF.HI;
         entity->y.HALF.HI = context->unk_20.HALF.HI;
-        context->unk_14 = 1;
+        context->condition = 1;
     } else {
-        context->unk_14 = 0;
+        context->condition = 0;
     }
 }
 
@@ -1307,7 +1409,7 @@ void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context) {
         sub_0807DEDC(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI);
     }
     ScriptCommand_0807EE30(entity, context);
-    if (!context->unk_14) {
+    if (!context->condition) {
         gActiveScriptInfo.commandSize = 0;
     }
 }
@@ -1319,7 +1421,7 @@ void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context) {
                      entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2]));
     }
     ScriptCommand_0807EE30(entity, context);
-    if (!context->unk_14) {
+    if (!context->condition) {
         gActiveScriptInfo.commandSize = 0;
     }
 }
@@ -1345,11 +1447,11 @@ void ScriptCommand_0807EF90(Entity* entity, ScriptExecutionContext* context) {
     context->unk_08 |= 1 << context->scriptInstructionPointer[1];
 }
 
-void ScriptCommand_0807EFA0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807EFAC(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context) {
     if (context->scriptInstructionPointer[1] >= 100) {
         SoundReq(gArea.musicIndex);
     } else {
@@ -1357,23 +1459,23 @@ void ScriptCommand_0807EFAC(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807EFD4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SoundReq3(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
-void ScriptCommand_0807EFE4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SoundReq0x80100000(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(0x80100000);
 }
 
-void ScriptCommand_0807EFF4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context) {
     ModRupees((s16)context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807F004(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context) {
     ModHealth(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_0807F010(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* context) {
     gSave.stats.maxHealth = min(gSave.stats.maxHealth + 8, 0xA0);
     gSave.stats.health = gSave.stats.maxHealth;
 }
@@ -1390,9 +1492,9 @@ void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context) {
     sub_080A7C18(0x5C, context->scriptInstructionPointer[1], 0);
 }
 
-void ScriptCommand_0807F060(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context) {
     context->unk_04 = GetInventoryValue(context->scriptInstructionPointer[1]);
-    context->unk_14 = context->unk_04 != 0;
+    context->condition = context->unk_04 != 0;
 }
 
 void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context) {
@@ -1403,11 +1505,11 @@ void ScriptCommand_0807F088(Entity* entity, ScriptExecutionContext* context) {
     sub_080A7C18(context->scriptInstructionPointer[1], 0, 3);
 }
 
-void ScriptCommand_0807F098(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CameraTargetEntity(Entity* entity, ScriptExecutionContext* context) {
     gRoomControls.cameraTarget = entity;
 }
 
-void ScriptCommand_0807F0A4(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CameraTargetPlayer(Entity* entity, ScriptExecutionContext* context) {
     gRoomControls.cameraTarget = &gPlayerEntity;
 }
 

From 37d03d13824fc8a6f1da88e77176e4d5d7e95c5e Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Fri, 5 Mar 2021 00:31:07 +0100
Subject: [PATCH 13/46] Apply renaming

---
 .gitignore                                    |   1 -
 asm/macros/script.inc                         | 719 ++++++++++++++----
 data/scripts/ezlo_angry.inc                   | 458 +++++------
 data/scripts/gUnk_0800A8D4.inc                |  24 +-
 data/scripts/npc4e_fusion.inc                 |  24 +-
 include/scriptMacros.h                        |  51 --
 .../script_disassembler.py                    | 287 +++----
 7 files changed, 957 insertions(+), 607 deletions(-)
 delete mode 100644 include/scriptMacros.h

diff --git a/.gitignore b/.gitignore
index f7c4e9e2..a4960ad2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@ types_*.taghl
 !calcrom.pl
 !sound/programmable_wave_samples/*.pcm
 _Deparsed_XSubs.pm
-*.py
 *.sna
 __pycache__
 .vscode/settings.json
diff --git a/asm/macros/script.inc b/asm/macros/script.inc
index ba693547..314edf4c 100644
--- a/asm/macros/script.inc
+++ b/asm/macros/script.inc
@@ -1,285 +1,682 @@
 @ All the macro functions for scripts
 @ Generated by disassemble_script.py
 .macro SCRIPT_START name
-        .globl \name
-        .section .text
+	.globl \name
+	.section .text
 \name:
 .endm
 .macro SCRIPT_END
-        .short 0xffff
+	.short 0xffff
 .endm
 
-.macro nullsub_507 
-        .short 0x0400
+.macro ScriptCommandNop 
+	.short 0x0400
 .endm
 
-.macro sub_0807E004 
-        .short 0x0401
+.macro StartScript 
+	.short 0x0401
 .endm
 
-.macro sub_0807E014 
-        .short 0x0402
+.macro StopScript 
+	.short 0x0402
 .endm
 
-.macro sub_0807E024 s
-        .short 0x0803
-        .short \s
+.macro Jump s
+	.short 0x0803
+	.short \s
 .endm
 
-.macro sub_0807E050 s
-        .short 0x0804
-        .short \s
+.macro JumpIf s
+	.short 0x0804
+	.short \s
 .endm
 
-.macro sub_0807E064 s
-        .short 0x0805
-        .short \s
+.macro JumpIfNot s
+	.short 0x0805
+	.short \s
 .endm
 
-.macro sub_0807E078 s
-        .short 0x0806
-        .short \s
+.macro _0807E078 s
+	.short 0x0806
+	.short \s
 .endm
 
-.macro sub_0807E0A0 w
-        .short 0x0c07
-        .word \w
+.macro JumpAbsolute w
+	.short 0x0c07
+	.word \w
 .endm
 
-.macro sub_0807E0B8 w
-        .short 0x0c08
-        .word \w
+.macro JumpAbsoluteIf w
+	.short 0x0c08
+	.word \w
 .endm
 
-.macro sub_0807E0CC w
-        .short 0x0c09
-        .word \w
+.macro JumpAbsoluteIfNot w
+	.short 0x0c09
+	.word \w
 .endm
 
-.macro sub_0807E0E0 w
-        .short 0x0c0a
-        .word \w
+.macro _0807E0E0 w
+	.short 0x0c0a
+	.word \w
 .endm
 
-.macro sub_0807E10C w
-        .short 0x0c0b
-        .word \w
+.macro Call w
+	.short 0x0c0b
+	.word \w
 .endm
 
-.macro sub_0807E124 a,b
-        .short 0x140c
-        .word \a
-        .word \b
+.macro CallWithArg a,b
+	.short 0x140c
+	.word \a
+	.word \b
 .endm
 
-.macro sub_0807E148 w
-        .short 0x0c0d
-        .word \w
+.macro LoadRoomEntityList w
+	.short 0x0c0d
+	.word \w
 .endm
 
-.macro sub_0807E158 w
-        .short 0x0c0e
-        .word \w
+.macro TestBit w
+	.short 0x0c0e
+	.word \w
 .endm
 
-.macro sub_0807E188 s
-        .short 0x080f
-        .short \s
+.macro CheckInventory1 s
+	.short 0x080f
+	.short \s
 .endm
 
-.macro sub_0807E1D8 s
-        .short 0x0810
-        .short \s
+.macro CheckInventory2 s
+	.short 0x0810
+	.short \s
 .endm
 
-.macro sub_0807E4AC s
-        .short 0x0811
-        .short \s
+.macro HasRoomItemForSale s
+	.short 0x0811
+	.short \s
 .endm
 
-.macro sub_0807E260 s
-        .short 0x0815
-        .short \s
+.macro CheckLocalFlag s
+	.short 0x0812
+	.short \s
 .endm
 
-.macro sub_0807E2A8 s
-        .short 0x0817
-        .short \s
+.macro CheckLocalFlagByOffset a,b
+	.short 0x0c13
+	.short \a
+	.short \b
 .endm
 
-.macro sub_0807E2E4 
-        .short 0x0418
+.macro CheckGlobalFlag s
+	.short 0x0814
+	.short \s
 .endm
 
-.macro sub_0807E30C 
-        .short 0x0419
+.macro CheckRoomFlag s
+	.short 0x0815
+	.short \s
 .endm
 
-.macro sub_0807E40C s
-        .short 0x081d
-        .short \s
+.macro CheckPlayerInRegion a,b,c
+	.short 0x1016
+	.short \a
+	.short \b
+	.short \c
 .endm
 
-.macro sub_0807E5F8 w
-        .short 0x0c28
-        .word \w
+.macro CheckPlayerInRegion2 s
+	.short 0x0817
+	.short \s
 .endm
 
-.macro sub_0807E650 s
-        .short 0x082d
-        .short \s
+.macro CheckEntityInteractType 
+	.short 0x0418
 .endm
 
-.macro sub_0807E680 s
-        .short 0x0831
-        .short \s
+.macro _0807E30C 
+	.short 0x0419
 .endm
 
-.macro sub_0807E6AC w
-        .short 0x0c33
-        .word \w
+.macro HasRupees s
+	.short 0x081a
+	.short \s
 .endm
 
-.macro sub_0807E6DC 
-        .short 0x0434
+.macro _0807E3BC s
+	.short 0x081b
+	.short \s
 .endm
 
-.macro sub_0807E864 
-        .short 0x0443
+.macro _0807E3E8 
+	.short 0x041c
 .endm
 
-.macro sub_0807E878 
-        .short 0x0444
+.macro CheckKinstoneFused s
+	.short 0x081d
+	.short \s
 .endm
 
-.macro sub_0807E8C4 w
-        .short 0x0c47
-        .word \w
+.macro BuyItem a,b
+	.short 0x0c1e
+	.short \a
+	.short \b
 .endm
 
-.macro sub_0807E8E4_0 
-        .short 0x0449
+.macro _0807E48C s
+	.short 0x081f
+	.short \s
 .endm
 
-.macro sub_0807E8E4_1 
-        .short 0x044a
+.macro _0807E4CC w
+	.short 0x0c20
+	.word \w
 .endm
 
-.macro sub_0807E8E4_2 
-        .short 0x044b
+.macro _0807E4EC w
+	.short 0x0c21
+	.word \w
 .endm
 
-.macro sub_0807E8E4_3 
-        .short 0x044c
+.macro _0807E51 s
+	.short 0x0822
+	.short \s
 .endm
 
-.macro sub_0807E930 s
-        .short 0x0850
-        .short \s
+.macro CheckPlayerFlags w
+	.short 0x0c23
+	.word \w
 .endm
 
-.macro sub_0807E944 
-        .short 0x0451
+.macro _0807E564 
+	.short 0x0424
 .endm
 
-.macro sub_0807E9D4 
-        .short 0x0453
+.macro EntityHasHeight 
+	.short 0x0425
 .endm
 
-.macro sub_0807E9DC 
-        .short 0x0454
+.macro ComparePlayerAction s
+	.short 0x0826
+	.short \s
 .endm
 
-.macro sub_0807E9F0 
-        .short 0x0456
+.macro ComparePlayerAnimationState s
+	.short 0x0827
+	.short \s
 .endm
 
-.macro sub_0807EA4C 
-        .short 0x0457
+.macro _0807E5F8 w
+	.short 0x0c28
+	.word \w
 .endm
 
-.macro sub_0807EA94 
-        .short 0x0459
+.macro _0807E610 w
+	.short 0x0c29
+	.word \w
 .endm
 
-.macro sub_0807EAB4 s
-        .short 0x085a
-        .short \s
+.macro SetLocalFlag s
+	.short 0x082a
+	.short \s
 .endm
 
-.macro sub_0807EAD0 a,b
-        .short 0x0c5c
-        .short \a
-        .short \b
+.macro SetLocalFlagByOffset a,b
+	.short 0x0c2b
+	.short \a
+	.short \b
 .endm
 
-.macro sub_0807EB28 s
-        .short 0x085f
-        .short \s
+.macro ClearLocalFlag s
+	.short 0x082c
+	.short \s
 .endm
 
-.macro sub_0807EB44 s
-        .short 0x0861
-        .short \s
+.macro SetGlobalFlag s
+	.short 0x082d
+	.short \s
 .endm
 
-.macro sub_0807EB74 
-        .short 0x0463
+.macro ClearGlobalFlag s
+	.short 0x082e
+	.short \s
 .endm
 
-.macro sub_0807EB8C 
-        .short 0x0464
+.macro SetRoomFlag s
+	.short 0x082f
+	.short \s
 .endm
 
-.macro sub_0807EBC0 s
-        .short 0x0867
-        .short \s
+.macro ClearRoomFlag s
+	.short 0x0830
+	.short \s
 .endm
 
-.macro sub_0807EC1C s
-        .short 0x086d
-        .short \s
+.macro Wait s
+	.short 0x0831
+	.short \s
 .endm
 
-.macro sub_0807ECF4 s
-        .short 0x0871
-        .short \s
+.macro WaitForSomething w
+	.short 0x0c32
+	.word \w
 .endm
 
-.macro sub_0807EDD4 a,b
-        .short 0x0c73
-        .short \a
-        .short \b
+.macro WaitForSomething2 w
+	.short 0x0c33
+	.word \w
 .endm
 
-.macro sub_0807EE30 
-        .short 0x0475
+.macro WaitPlayerAction8 
+	.short 0x0434
 .endm
 
-.macro sub_0807EF80 s
-        .short 0x0879
-        .short \s
+.macro WaitForPlayerAction0x17 
+	.short 0x0435
 .endm
 
-.macro sub_0807EFAC s
-        .short 0x087c
-        .short \s
+.macro WaitFor_1 
+	.short 0x0436
 .endm
 
-.macro sub_0807EFE4 
-        .short 0x047e
+.macro WaitFor_2 
+	.short 0x0437
 .endm
 
-.macro sub_0807F034 s
-        .short 0x0882
-        .short \s
+.macro _0807E778 s
+	.short 0x0838
+	.short \s
 .endm
 
-.macro sub_0807F098 
-        .short 0x0487
+.macro _0807E788 w
+	.short 0x0c39
+	.word \w
 .endm
 
-.macro sub_0807F0B4 s
-        .short 0x0889
-        .short \s
-.endm
\ No newline at end of file
+.macro _0807E79C 
+	.short 0x043a
+.endm
+
+.macro ScriptCommandNop2 s
+	.short 0x083b
+	.short \s
+.endm
+
+.macro DoFade4 
+	.short 0x043c
+.endm
+
+.macro DoFade5 
+	.short 0x043d
+.endm
+
+.macro DoFade6 
+	.short 0x043e
+.endm
+
+.macro DoFade7 
+	.short 0x043f
+.endm
+
+.macro _0807E800 w
+	.short 0x0c40
+	.word \w
+.endm
+
+.macro _0807E80C w
+	.short 0x0c41
+	.word \w
+.endm
+
+.macro _0807E858 s
+	.short 0x0842
+	.short \s
+.endm
+
+.macro _0807E864 
+	.short 0x0443
+.endm
+
+.macro _0807E878 
+	.short 0x0444
+.endm
+
+.macro _0807E888 
+	.short 0x0445
+.endm
+
+.macro SetPlayerAction w
+	.short 0x0c46
+	.word \w
+.endm
+
+.macro StartPlayerScript w
+	.short 0x0c47
+	.word \w
+.endm
+
+.macro _0807E8D4 s
+	.short 0x0848
+	.short \s
+.endm
+
+.macro _0807E8E4_0 
+	.short 0x0449
+.endm
+
+.macro _0807E8E4_1 
+	.short 0x044a
+.endm
+
+.macro _0807E8E4_2 
+	.short 0x044b
+.endm
+
+.macro _0807E8E4_3 
+	.short 0x044c
+.endm
+
+.macro _0807E908 s
+	.short 0x084d
+	.short \s
+.endm
+
+.macro _0807E914 w
+	.short 0x0c4e
+	.word \w
+.endm
+
+.macro _0807E924 
+	.short 0x044f
+.endm
+
+.macro _0807E930 s
+	.short 0x0850
+	.short \s
+.endm
+
+.macro _0807E944 
+	.short 0x0451
+.endm
+
+.macro _0807E974 s
+	.short 0x0852
+	.short \s
+.endm
+
+.macro _0807E9D4 
+	.short 0x0453
+.endm
+
+.macro _0807E9DC 
+	.short 0x0454
+.endm
+
+.macro _0807E9E4 s
+	.short 0x0855
+	.short \s
+.endm
+
+.macro _0807E9F0 
+	.short 0x0456
+.endm
+
+.macro _0807EA4C 
+	.short 0x0457
+.endm
+
+.macro _0807EA88 s
+	.short 0x0858
+	.short \s
+.endm
+
+.macro _0807EA94 
+	.short 0x0459
+.endm
+
+.macro TextboxNoOverlapFollow s
+	.short 0x085a
+	.short \s
+.endm
+
+.macro TextboxNoOverlap s
+	.short 0x085b
+	.short \s
+.endm
+
+.macro TextboxNoOverlapFollowPos a,b
+	.short 0x0c5c
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EAF0 w
+	.short 0x0c5d
+	.word \w
+.endm
+
+.macro TextboxNoOverlapVar 
+	.short 0x045e
+.endm
+
+.macro _0807EB28 s
+	.short 0x085f
+	.short \s
+.endm
+
+.macro _0807EB38 
+	.short 0x0460
+.endm
+
+.macro _0807EB44 s
+	.short 0x0861
+	.short \s
+.endm
+
+.macro _0807EB4C a,b
+	.short 0x0c62
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EB74 
+	.short 0x0463
+.endm
+
+.macro _0807EB8C 
+	.short 0x0464
+.endm
+
+.macro SetEntityDirection s
+	.short 0x0865
+	.short \s
+.endm
+
+.macro SetEntityDirectionWithAnimationState s
+	.short 0x0866
+	.short \s
+.endm
+
+.macro SetEntityNonPlanarMovement s
+	.short 0x0867
+	.short \s
+.endm
+
+.macro SetEntity0x20 w
+	.short 0x0c68
+	.word \w
+.endm
+
+.macro SetEntityPositionRelative w
+	.short 0x0c69
+	.word \w
+.endm
+
+.macro SetEntityPosition a,b
+	.short 0x0c6a
+	.short \a
+	.short \b
+.endm
+
+.macro MoveEntityToPlayer 
+	.short 0x046b
+.endm
+
+.macro ScriptCommandNop3 
+	.short 0x046c
+.endm
+
+.macro _0807EC1C s
+	.short 0x086d
+	.short \s
+.endm
+
+.macro _0807EC64 s
+	.short 0x086e
+	.short \s
+.endm
+
+.macro _0807EC94 s
+	.short 0x086f
+	.short \s
+.endm
+
+.macro _0807ECC4 s
+	.short 0x0870
+	.short \s
+.endm
+
+.macro _0807ECF4 s
+	.short 0x0871
+	.short \s
+.endm
+
+.macro _0807ED24 a,b,c
+	.short 0x1072
+	.short \a
+	.short \b
+	.short \c
+.endm
+
+.macro _0807EDD4 a,b
+	.short 0x0c73
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EE04 a,b
+	.short 0x0c74
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EE30 
+	.short 0x0475
+.endm
+
+.macro _0807EEB4 
+	.short 0x0476
+.endm
+
+.macro _0807EEF4 a,b
+	.short 0x0c77
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EF3C a,b
+	.short 0x0c78
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EF80 s
+	.short 0x0879
+	.short \s
+.endm
+
+.macro _0807EF90 s
+	.short 0x087a
+	.short \s
+.endm
+
+.macro SoundReq s
+	.short 0x087b
+	.short \s
+.endm
+
+.macro SoundReq2 s
+	.short 0x087c
+	.short \s
+.endm
+
+.macro SoundReq3 w
+	.short 0x0c7d
+	.word \w
+.endm
+
+.macro SoundReq0x80100000 
+	.short 0x047e
+.endm
+
+.macro ModRupees s
+	.short 0x087f
+	.short \s
+.endm
+
+.macro ModHealth s
+	.short 0x0880
+	.short \s
+.endm
+
+.macro IncreaseMaxHealth s
+	.short 0x0881
+	.short \s
+.endm
+
+.macro _0807F034 s
+	.short 0x0882
+	.short \s
+.endm
+
+.macro _0807F050 s
+	.short 0x0883
+	.short \s
+.endm
+
+.macro GetInventoryValue s
+	.short 0x0884
+	.short \s
+.endm
+
+.macro _0807F078 a,b
+	.short 0x0c85
+	.short \a
+	.short \b
+.endm
+
+.macro _0807F088 s
+	.short 0x0886
+	.short \s
+.endm
+
+.macro CameraTargetEntity 
+	.short 0x0487
+.endm
+
+.macro CameraTargetPlayer 
+	.short 0x0488
+.endm
+
+.macro _0807F0B4 s
+	.short 0x0889
+	.short \s
+.endm
+
+.macro _0807F0C8 a,b
+	.short 0x0c8a
+	.short \a
+	.short \b
+.endm
+
+
diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc
index d7a8a893..fac9d78b 100644
--- a/data/scripts/ezlo_angry.inc
+++ b/data/scripts/ezlo_angry.inc
@@ -1,231 +1,231 @@
 SCRIPT_START gUnk_080126FC
-sub_0807E004
-sub_0807EBC0 0x0040
-sub_0807EF80 0x0007
-sub_0807E014
-sub_0807E930 0x0020
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0022
-sub_0807E10C sub_0807F3C8
-sub_0807EAD0 0x1102, 0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0021
-sub_0807E10C sub_0807F3C8
-sub_0807EAD0 0x1103,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x0004
-sub_0807E680 0x003c
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x0011
-sub_0807E930 0x001c
-sub_0807EAD0 0x1105,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0022
-sub_0807E10C sub_0807F3C8
-sub_0807EAD0 0x1106,0x000c
-sub_0807EA94 
-sub_0807E930 0x001c
-sub_0807E10C sub_0806D96C // Ezlo Angry FX 
-sub_0807EAD0 0x1107,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0021
-sub_0807E10C sub_0807F3C8 // Ezlo Angry FX 
-sub_0807EAD0 0x1108,0x000c
-sub_0807EA94 
-sub_0807E930 0x001c
-sub_0807E10C sub_0806D96C// Ezlo Angry FX 
-sub_0807EAD0 0x1109,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807EF80 0x000a
-sub_0807E9D4 
-sub_0807E5F8 0x00000008
-sub_0807E014 
-sub_0807E004 
-sub_0807E260 0x0000
-sub_0807E050 0x0028
-sub_0807E2E4 
-sub_0807E064 0xfff0
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x1114,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E878 
-sub_0807E024 0xffd0
-sub_0807E864 
-sub_0807E9DC 
-sub_0807E124 sub_0807F5B0,0x0000003c
-sub_0807E10C sub_080791D0 
-sub_0807E014 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x000b
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E10C sub_0806D944// Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x110a,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0010
-sub_0807EAD0 0x110b,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x0004
-sub_0807E680 0x003c
-sub_0807E930 0x0010
-sub_0807EAD0 0x110c,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0010
-sub_0807EAD0 0x110d,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0010
-sub_0807EAD0 0x110e,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D908 
-sub_0807EC1C 0x0010
-sub_0807EF80 0x000a
-sub_0807E9D4 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E014 
-sub_0807E004 
-sub_0807E10C sub_0806D944 // Ezlo look at player
-sub_0807E2E4 
-sub_0807E050 0x000e
-sub_0807E2A8 0x3030
-sub_0807E064 0x0020
-sub_0807E024 0xffe6
-sub_0807E864 
-sub_0807E930 0x0010
-sub_0807E014 
-sub_0807EAD0 0x1115,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807E878 
-sub_0807E024 0xffcc
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0807F9A4
-sub_0807E10C sub_0807DF28
-sub_0807EB8C 
-sub_0807E10C sub_0806D944 // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x110f,0x000c
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D908
-sub_0807EC1C 0x0050
-sub_0807EA94 
-sub_0807E10C sub_0807DF50 
-sub_0807E878 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E014 
-sub_0807E004 
-sub_0807E10C sub_0806D944 // Ezlo look at player
-sub_0807E2E4 
-sub_0807E050 0x000e
-sub_0807E2A8 0x3030
-sub_0807E064 0x0020
-sub_0807E024 0xffe6
-sub_0807E864 
-sub_0807E930 0x0010
-sub_0807E014 
-sub_0807EAD0 0x1115,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807E878 
-sub_0807E024 0xffcc
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0807F9A4 
-sub_0807E10C sub_0807DF28 
-sub_0807EB8C 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x1110,0x000c
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D908 
-sub_0807EC1C 0x0050
-sub_0807E930 0x0018
-sub_0807EA94 
-sub_0807E10C sub_0807DF50 
-sub_0807E878 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E014 
-sub_0807E004 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E2E4 
-sub_0807E050 0x000e
-sub_0807E2A8 0x3030
-sub_0807E064 0x0020
-sub_0807E024 0xffe6
-sub_0807E864 
-sub_0807E930 0x0010
-sub_0807E014 
-sub_0807EAD0 0x1115,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807E878 
-sub_0807E024 0xffcc
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0807F9A4 
-sub_0807E10C sub_0807DF28 
-sub_0807EFE4 
-sub_0807EF80 0x000b
-sub_0807EB8C 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x1111,0x000c
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D8A0 
-sub_0807EE30 
-sub_0807E064 0xfffc
-sub_0807E930 0x001f
-sub_0807EA94 
-sub_0807E8C4 0x08012b18
-sub_0807E10C sub_0806D9A4 
-sub_0807EF80 0x0008
-sub_0807E680 0x0078
-sub_0807EFAC 0x000e
-sub_0807E004 
-sub_0807E8E4_2 
-sub_0807EB28 0x1112
-sub_0807E014 
-sub_0807EA94 
-sub_0807E5F8 0x00000008
-sub_0807EF80 0x0006
+StartScript
+SetEntityNonPlanarMovement 0x0040
+_0807EF80 0x0007
+StopScript
+_0807E930 0x0020
+WaitForSomething2 0x00000004
+_0807E930 0x0022
+Call sub_0807F3C8
+TextboxNoOverlapFollowPos 0x1102, 0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0021
+Call sub_0807F3C8
+TextboxNoOverlapFollowPos 0x1103,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0011
+_0807E930 0x001c
+TextboxNoOverlapFollowPos 0x1105,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0022
+Call sub_0807F3C8
+TextboxNoOverlapFollowPos 0x1106,0x000c
+_0807EA94 
+_0807E930 0x001c
+Call sub_0806D96C // Ezlo Angry FX 
+TextboxNoOverlapFollowPos 0x1107,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0021
+Call sub_0807F3C8 // Ezlo Angry FX 
+TextboxNoOverlapFollowPos 0x1108,0x000c
+_0807EA94 
+_0807E930 0x001c
+Call sub_0806D96C// Ezlo Angry FX 
+TextboxNoOverlapFollowPos 0x1109,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000008
+StopScript 
+StartScript 
+CheckRoomFlag 0x0000
+JumpIf 0x0028
+CheckEntityInteractType 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+Call sub_0806D944  // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1114,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E878 
+Jump 0xffd0
+_0807E864 
+_0807E9DC 
+CallWithArg sub_0807F5B0,0x0000003c
+Call sub_080791D0 
+StopScript 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x000b
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+Call sub_0806D944// Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110a,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110b,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110c,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110d,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110e,0x000c
+_0807EA94 
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D908 
+_0807EC1C 0x0010
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call sub_0806D944 // Ezlo look at player
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos 0x1115,0x000c
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807EB8C 
+Call sub_0806D944 // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110f,0x000c
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D908
+_0807EC1C 0x0050
+_0807EA94 
+Call sub_0807DF50 
+_0807E878 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call sub_0806D944 // Ezlo look at player
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos 0x1115,0x000c
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call sub_0807F9A4 
+Call sub_0807DF28 
+_0807EB8C 
+Call sub_0806D944  // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1110,0x000c
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D908 
+_0807EC1C 0x0050
+_0807E930 0x0018
+_0807EA94 
+Call sub_0807DF50 
+_0807E878 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call sub_0806D944  // Ezlo look at player
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos 0x1115,0x000c
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call sub_0807F9A4 
+Call sub_0807DF28 
+SoundReq0x80100000 
+_0807EF80 0x000b
+_0807EB8C 
+Call sub_0806D944  // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1111,0x000c
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D8A0 
+_0807EE30 
+JumpIfNot 0xfffc
+_0807E930 0x001f
+_0807EA94 
+StartPlayerScript 0x08012b18
+Call sub_0806D9A4 
+_0807EF80 0x0008
+Wait 0x0078
+SoundReq2 0x000e
+StartScript 
+_0807E8E4_2 
+_0807EB28 0x1112
+StopScript 
+_0807EA94 
+_0807E5F8 0x00000008
+_0807EF80 0x0006
 SCRIPT_END
\ No newline at end of file
diff --git a/data/scripts/gUnk_0800A8D4.inc b/data/scripts/gUnk_0800A8D4.inc
index df47f574..e9b22a64 100644
--- a/data/scripts/gUnk_0800A8D4.inc
+++ b/data/scripts/gUnk_0800A8D4.inc
@@ -1,14 +1,14 @@
-sub_0807E004 
-sub_0807EF80 0x0007
-sub_0807EB44 0x0004
-sub_0807E930 0x0008
-sub_0807E014 
-sub_0807E690 0x00000001
-sub_0807EF80 0x0000
-sub_0807E6AC 0x00000020
-sub_0807EF80 0x0004
-sub_0807E680 0x003c
-sub_0807EB44 0x0002
-sub_0807E680 0x000f
+ScriptCommand_StartScript 
+ScriptCommand_0807EF80 0x0007
+ScriptCommand_0807EB44 0x0004
+ScriptCommand_0807E930 0x0008
+ScriptCommand_StopScript 
+ScriptCommand_WaitForSomething 0x00000001
+ScriptCommand_0807EF80 0x0000
+ScriptCommand_WaitForSomething2 0x00000020
+ScriptCommand_0807EF80 0x0004
+ScriptCommand_Wait 0x003c
+ScriptCommand_0807EB44 0x0002
+ScriptCommand_Wait 0x000f
 .short 0x0861
 .short 0x0006
diff --git a/data/scripts/npc4e_fusion.inc b/data/scripts/npc4e_fusion.inc
index 68262d0e..6a21fd23 100644
--- a/data/scripts/npc4e_fusion.inc
+++ b/data/scripts/npc4e_fusion.inc
@@ -1,16 +1,16 @@
 SCRIPT_START gUnk_08016030
-sub_0807E004 
-sub_0807E40C 0x0009
-sub_0807E050 0x002a
-sub_0807E014 
-sub_0807E6AC 0x00000001
-sub_0807EF80 0x0010
-sub_0807E680 0x003c
-sub_0807EBC0 0x0020
-sub_0807ECF4 0x0080
-sub_0807E680 0x001e
-sub_0807EF80 0x0010
-sub_0807E5F8 0x0000008
+StartScript 
+CheckKinstoneFused 0x0009
+JumpIf 0x002a
+StopScript 
+WaitForSomething2 0x00000001
+_0807EF80 0x0010
+Wait 0x003c
+SetEntityNonPlanarMovement 0x0020
+_0807ECF4 0x0080
+Wait 0x001e
+_0807EF80 0x0010
+_0807E5F8 0x0000008
 .short 0xffff
 .short 0x0c6a
 .short 0xfff0
diff --git a/include/scriptMacros.h b/include/scriptMacros.h
deleted file mode 100644
index fabc19f9..00000000
--- a/include/scriptMacros.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef SCRIPT_MACROS_H
-#define SCRIPT_MACROS_H
-// Generated by disassemble_script.py
-#define START_SCRIPT(name) asm(".globl "#name); asm(".section .rodata"); asm(#name":");
-#define END_SCRIPT() asm(".short 0xffff");
-
-#define nullsub_507() asm(".short 0x0400");
-#define sub_0807E004() asm(".short 0x0401");
-#define sub_0807E014() asm(".short 0x0402");
-#define sub_0807E024(s) asm(".short 0x0803");asm(".short " #s);
-#define sub_0807E050(s) asm(".short 0x0804");asm(".short " #s);
-#define sub_0807E064(s) asm(".short 0x0805");asm(".short " #s);
-#define sub_0807E078(s) asm(".short 0x0806");asm(".short " #s);
-#define sub_0807E0A0(w) asm(".short 0x0c07");asm(".word " #w);
-#define sub_0807E0B8(w) asm(".short 0x0c08");asm(".word " #w);
-#define sub_0807E0CC(w) asm(".short 0x0c09");asm(".word " #w);
-#define sub_0807E0E0(w) asm(".short 0x0c0a");asm(".word " #w);
-#define sub_0807E10C(w) asm(".short 0x0c0b");asm(".word " #w);
-#define sub_0807E124(a,b) asm(".short 0x140c");asm(".word " #a);asm(".word " #b);
-#define sub_0807E148(w) asm(".short 0x0c0d");asm(".word " #w);
-#define sub_0807E158(w) asm(".short 0x0c0e");asm(".word " #w);
-#define sub_0807E188(s) asm(".short 0x080f");asm(".short " #s);
-#define sub_0807E1D8(s) asm(".short 0x0810");asm(".short " #s);
-#define sub_0807E4AC(s) asm(".short 0x0811");asm(".short " #s);
-#define sub_0807E260(s) asm(".short 0x0815");asm(".short " #s);
-#define sub_0807E2A8(s) asm(".short 0x0817");asm(".short " #s);
-#define sub_0807E2E4() asm(".short 0x0418");
-#define sub_0807E5F8(w) asm(".short 0x0c28");asm(".word " #w);
-#define sub_0807E680(s) asm(".short 0x0831");asm(".short " #s);
-#define sub_0807E6AC(w) asm(".short 0x0c33");asm(".word " #w);
-#define sub_0807E864() asm(".short 0x0443");
-#define sub_0807E878() asm(".short 0x0444");
-#define sub_0807E8C4(w) asm(".short 0x0c47");asm(".word " #w);
-#define sub_0807E8E4_0() asm(".short 0x0449");
-#define sub_0807E8E4_1() asm(".short 0x044a");
-#define sub_0807E8E4_2() asm(".short 0x044b");
-#define sub_0807E8E4_3() asm(".short 0x044c");
-#define sub_0807E930(s) asm(".short 0x0850");asm(".short " #s);
-#define sub_0807E9D4() asm(".short 0x0453");
-#define sub_0807E9DC() asm(".short 0x0454");
-#define sub_0807EA94() asm(".short 0x0459");
-#define sub_0807EAD0(a,b) asm(".short 0x0c5c");asm(".short " #a);asm(".short " #b);
-#define sub_0807EB28(s) asm(".short 0x085f");asm(".short " #s);
-#define sub_0807EB8C() asm(".short 0x0464");
-#define sub_0807EBC0(s) asm(".short 0x0867");asm(".short " #s);
-#define sub_0807EC1C(s) asm(".short 0x086d");asm(".short " #s);
-#define sub_0807EE30() asm(".short 0x0475");
-#define sub_0807EF80(s) asm(".short 0x0879");asm(".short " #s);
-#define sub_0807EFAC(s) asm(".short 0x087c");asm(".short " #s);
-#define sub_0807EFE4() asm(".short 0x047e");
-#endif
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index b73afd61..f0926e68 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -32,145 +32,145 @@ def get_pointer(barray):
     return 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
 
 commands = [
-    {'fun': 'nullsub_507', 'params': ''},
-    {'fun': 'sub_0807E004', 'params': '', 'name': 'start executing scripts'},
-    {'fun': 'sub_0807E014', 'params': '', 'name': 'stop executing scripts'},
-    {'fun': 'sub_0807E024', 'params': 's', 'name': 'jump by offset'},
-    {'fun': 'sub_0807E050', 'params': 's', 'name': 'jump if'},
-    {'fun': 'sub_0807E064', 'params': 's', 'name': 'jump if not'},
-    {'fun': 'sub_0807E078', 'params': 's'},
-    {'fun': 'sub_0807E0A0', 'params': 'w','name': 'abs jump' },
-    {'fun': 'sub_0807E0B8', 'params': 'w', 'name': 'abs jump if'},
-    {'fun': 'sub_0807E0CC', 'params': 'w', 'name': 'abs jump if not'},
-    {'fun': 'sub_0807E0E0', 'params': 'w'},
-    {'fun': 'sub_0807E10C', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': sub_0807E10C},
-    {'fun': 'sub_0807E124', 'params': 'pw'},
-    {'fun': 'sub_0807E148', 'params': 'w'},
-    {'fun': 'sub_0807E158', 'params': 'w'},
-    {'fun': 'sub_0807E188', 'params': 's'},
-    {'fun': 'sub_0807E1D8', 'params': 's'},
-    {'fun': 'sub_0807E4AC', 'params': 's'},
-    {'fun': 'sub_0807E200', 'params': 's'},
-    {'fun': 'sub_0807E220', 'params': 'ss'},
-    {'fun': 'sub_0807E240', 'params': 's'},
-    {'fun': 'sub_0807E260', 'params': 's'},
-    {'fun': 'sub_0807E280', 'params': 'sss'},
-    {'fun': 'sub_0807E2A8', 'params': 's'},
-    {'fun': 'sub_0807E2E4', 'params': ''},
-    {'fun': 'sub_0807E30C', 'params': ''},
-    {'fun': 'sub_0807E390', 'params': 's'},
-    {'fun': 'sub_0807E3BC', 'params': 's'},
-    {'fun': 'sub_0807E3E8', 'params': ''},
-    {'fun': 'sub_0807E40C', 'params': 's'},
-    {'fun': 'sub_0807E42C', 'params': 'ss'},
-    {'fun': 'sub_0807E48C', 'params': 's'},
-    {'fun': 'sub_0807E4CC', 'params': 'w'},
-    {'fun': 'sub_0807E4EC', 'params': 'w'},
-    {'fun': 'sub_0807E514', 'params': 's'},
-    {'fun': 'sub_0807E538', 'params':'w'},
-    {'fun': 'sub_0807E564', 'params': ''},
-    {'fun': 'sub_0807E584', 'params': ''},
-    {'fun': 'sub_0807E5A0', 'params': 's'},
-    {'fun': 'sub_0807E5CC', 'params': 's'},
-    {'fun': 'sub_0807E5F8', 'params': 'w'},# 'exec': sub_0807E5F8},
-    {'fun': 'sub_0807E610', 'params': 'w'},
-    {'fun': 'sub_0807E628', 'params': 's'},
-    {'fun': 'sub_0807E634', 'params': 'ss'},
-    {'fun': 'sub_0807E644', 'params': 's'},
-    {'fun': 'sub_0807E650', 'params': 's'},
-    {'fun': 'sub_0807E65C', 'params': 's'},
-    {'fun': 'sub_0807E668', 'params': 's'},
-    {'fun': 'sub_0807E674', 'params': 's'},
-    {'fun': 'sub_0807E680', 'params': 's'},
-    {'fun': 'sub_0807E690', 'params': 'w'},
-    {'fun': 'sub_0807E6AC', 'params': 'w'},
-    {'fun': 'sub_0807E6DC', 'params': ''},
-    {'fun': 'sub_0807E700', 'params': ''},
-    {'fun': 'sub_0807E72C', 'params': ''},
-    {'fun': 'sub_0807E75C', 'params': ''},
-    {'fun': 'sub_0807E778', 'params': 's'},
-    {'fun': 'sub_0807E788', 'params': 'w'},
-    {'fun': 'sub_0807E79C', 'params': ''},
-    {'fun': 'nullsub_508', 'params': 's'},
-    {'fun': 'sub_0807E7B0', 'params': ''},
-    {'fun': 'sub_0807E7C4', 'params': ''},
-    {'fun': 'sub_0807E7D8', 'params': ''},
-    {'fun': 'sub_0807E7EC', 'params': ''},
-    {'fun': 'sub_0807E800', 'params': 'w'},
-    {'fun': 'sub_0807E80C', 'params': 'w'},
-    {'fun': 'sub_0807E858', 'params': 's'},
-    {'fun': 'sub_0807E864', 'params': ''},
-    {'fun': 'sub_0807E878', 'params': ''},
-    {'fun': 'sub_0807E888', 'params': ''},
-    {'fun': 'sub_0807E898', 'params': 'w'},
-    {'fun': 'sub_0807E8C4', 'params': 'w'},
-    {'fun': 'sub_0807E8D4', 'params': 's'},
-    {'fun': 'sub_0807E8E4_0', 'params': ''}, # duplicate
-    {'fun': 'sub_0807E8E4_1', 'params': ''}, # duplicate
-    {'fun': 'sub_0807E8E4_2', 'params': ''}, # duplicate
-    {'fun': 'sub_0807E8E4_3', 'params': ''}, # duplicate
-    {'fun': 'sub_0807E908', 'params': 's'},
-    {'fun': 'sub_0807E914', 'params': 'w'},
-    {'fun': 'sub_0807E924', 'params': ''},
-    {'fun': 'sub_0807E930', 'params': 's'},
-    {'fun': 'sub_0807E944', 'params': ''},
-    {'fun': 'sub_0807E974', 'params': 's'},
-    {'fun': 'sub_0807E9D4', 'params': ''},
-    {'fun': 'sub_0807E9DC', 'params': ''},
-    {'fun': 'sub_0807E9E4', 'params': 's'},
-    {'fun': 'sub_0807E9F0', 'params': ''},
-    {'fun': 'sub_0807EA4C', 'params': ''},
-    {'fun': 'sub_0807EA88', 'params': 's'},
-    {'fun': 'sub_0807EA94', 'params': ''},
-    {'fun': 'sub_0807EAB4', 'params': 's'},
-    {'fun': 'sub_0807EAC0', 'params': 's'},
-    {'fun': 'sub_0807EAD0', 'params': 'ss'},
-    {'fun': 'sub_0807EAF0', 'params': 'w'},
-    {'fun': 'sub_0807EB18', 'params': ''},
-    {'fun': 'sub_0807EB28', 'params': 's'},
-    {'fun': 'sub_0807EB38', 'params': ''},
-    {'fun': 'sub_0807EB44', 'params': 's'},
-    {'fun': 'sub_0807EB4C', 'params': 'ss'},
-    {'fun': 'sub_0807EB74', 'params': ''},
-    {'fun': 'sub_0807EB8C', 'params': ''},
-    {'fun': 'sub_0807EBA8', 'params': 's'},
-    {'fun': 'sub_0807EBB0', 'params': 's'},
-    {'fun': 'sub_0807EBC0', 'params': 's'},
-    {'fun': 'sub_0807EBC8', 'params': 'w'},
-    {'fun': 'sub_0807EBD8', 'params': 'w'},
-    {'fun': 'sub_0807EBF4', 'params': 'ss'},
-    {'fun': 'sub_0807EC08', 'params': ''},
-    {'fun': 'nullsub_509', 'params': ''},
-    {'fun': 'sub_0807EC1C', 'params': 's'},
-    {'fun': 'sub_0807EC64', 'params': 's'},
-    {'fun': 'sub_0807EC94', 'params': 's'},
-    {'fun': 'sub_0807ECC4', 'params': 's'},
-    {'fun': 'sub_0807ECF4', 'params': 's'},
-    {'fun': 'sub_0807ED24', 'params': 'sss'},
-    {'fun': 'sub_0807EDD4', 'params': 'ss'},
-    {'fun': 'sub_0807EE04', 'params': 'ss'},
-    {'fun': 'sub_0807EE30', 'params': ''},
-    {'fun': 'sub_0807EEB4', 'params': ''},
-    {'fun': 'sub_0807EEF4', 'params': 'ss'},
-    {'fun': 'sub_0807EF3C', 'params': 'ss'},
-    {'fun': 'sub_0807EF80', 'params': 's'},
-    {'fun': 'sub_0807EF90', 'params': 's'},
-    {'fun': 'sub_0807EFA0', 'params': 's'},
-    {'fun': 'sub_0807EFAC', 'params': 's'},
-    {'fun': 'sub_0807EFD4', 'params': 'w'},
-    {'fun': 'sub_0807EFE4', 'params': ''},
-    {'fun': 'sub_0807EFF4', 'params': 's'},
-    {'fun': 'sub_0807F004', 'params': 's'},
-    {'fun': 'sub_0807F010', 'params': 's'},
-    {'fun': 'sub_0807F034', 'params': 's'},
-    {'fun': 'sub_0807F050', 'params': 's'},
-    {'fun': 'sub_0807F060', 'params': 's'},
-    {'fun': 'sub_0807F078', 'params': 'ss'},
-    {'fun': 'sub_0807F088', 'params': 's'},
-    {'fun': 'sub_0807F098', 'params': ''},
-    {'fun': 'sub_0807F0A4', 'params': ''},
-    {'fun': 'sub_0807F0B4', 'params': 's'},
-    {'fun': 'sub_0807F0C8', 'params': 'ss'}
+    {'fun': 'ScriptCommandNop', 'params': ''},
+    {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'},
+    {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'},
+    {'fun': 'ScriptCommand_Jump', 'params': 's', 'name': 'jump by offset'},
+    {'fun': 'ScriptCommand_JumpIf', 'params': 's', 'name': 'jump if'},
+    {'fun': 'ScriptCommand_JumpIfNot', 'params': 's', 'name': 'jump if not'},
+    {'fun': 'ScriptCommand_0807E078', 'params': 's'},
+    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'w','name': 'abs jump' },
+    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'w', 'name': 'abs jump if'},
+    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'w', 'name': 'abs jump if not'},
+    {'fun': 'ScriptCommand_0807E0E0', 'params': 'w'},
+    {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
+    {'fun': 'ScriptCommand_CallWithArg', 'params': 'pw'},
+    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'w'},
+    {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
+    {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
+    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
+    {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckRoomFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckPlayerInRegion', 'params': 'sss'},
+    {'fun': 'ScriptCommand_CheckPlayerInRegion2', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckEntityInteractType', 'params': ''},
+    {'fun': 'ScriptCommand_0807E30C', 'params': ''},
+    {'fun': 'ScriptCommand_HasRupees', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E3BC', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E3E8', 'params': ''},
+    {'fun': 'ScriptCommand_CheckKinstoneFused', 'params': 's'},
+    {'fun': 'ScriptCommand_BuyItem', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807E48C', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E51', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'},
+    {'fun': 'ScriptCommand_0807E564', 'params': ''},
+    {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''},
+    {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'},
+    {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},# 'exec': ScriptCommand_0807E5F8},
+    {'fun': 'ScriptCommand_0807E610', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'},
+    {'fun': 'ScriptCommand_ClearLocalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_SetGlobalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_ClearGlobalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_SetRoomFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_ClearRoomFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_Wait', 'params': 's'},
+    {'fun': 'ScriptCommand_WaitForSomething', 'params': 'w'},
+    {'fun': 'ScriptCommand_WaitForSomething2', 'params': 'w'},
+    {'fun': 'ScriptCommand_WaitPlayerAction8', 'params': ''},
+    {'fun': 'ScriptCommand_WaitForPlayerAction0x17', 'params': ''},
+    {'fun': 'ScriptCommand_WaitFor_1', 'params': ''},
+    {'fun': 'ScriptCommand_WaitFor_2', 'params': ''},
+    {'fun': 'ScriptCommand_0807E778', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E788', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E79C', 'params': ''},
+    {'fun': 'ScriptCommandNop2', 'params': 's'},
+    {'fun': 'ScriptCommand_DoFade4', 'params': ''},
+    {'fun': 'ScriptCommand_DoFade5', 'params': ''},
+    {'fun': 'ScriptCommand_DoFade6', 'params': ''},
+    {'fun': 'ScriptCommand_DoFade7', 'params': ''},
+    {'fun': 'ScriptCommand_0807E800', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E80C', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E858', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E864', 'params': ''},
+    {'fun': 'ScriptCommand_0807E878', 'params': ''},
+    {'fun': 'ScriptCommand_0807E888', 'params': ''},
+    {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'},
+    {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E8D4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E908', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E914', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E924', 'params': ''},
+    {'fun': 'ScriptCommand_0807E930', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E944', 'params': ''},
+    {'fun': 'ScriptCommand_0807E974', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E9D4', 'params': ''},
+    {'fun': 'ScriptCommand_0807E9DC', 'params': ''},
+    {'fun': 'ScriptCommand_0807E9E4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E9F0', 'params': ''},
+    {'fun': 'ScriptCommand_0807EA4C', 'params': ''},
+    {'fun': 'ScriptCommand_0807EA88', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EA94', 'params': ''},
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
+    {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EAF0', 'params': 'w'},
+    {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
+    {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EB38', 'params': ''},
+    {'fun': 'ScriptCommand_0807EB44', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EB4C', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EB74', 'params': ''},
+    {'fun': 'ScriptCommand_0807EB8C', 'params': ''},
+    {'fun': 'ScriptCommand_SetEntityDirection', 'params': 's'},
+    {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'},
+    {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'},
+    {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'},
+    {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''},
+    {'fun': 'ScriptCommandNop3', 'params': ''},
+    {'fun': 'ScriptCommand_0807EC1C', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EC64', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EC94', 'params': 's'},
+    {'fun': 'ScriptCommand_0807ECC4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807ECF4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807ED24', 'params': 'sss'},
+    {'fun': 'ScriptCommand_0807EDD4', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EE04', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EE30', 'params': ''},
+    {'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': 'ScriptCommand_SoundReq', 'params': 's'},
+    {'fun': 'ScriptCommand_SoundReq2', 'params': 's'},
+    {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'},
+    {'fun': 'ScriptCommand_SoundReq0x80100000', 'params': ''},
+    {'fun': 'ScriptCommand_ModRupees', 'params': 's'},
+    {'fun': 'ScriptCommand_ModHealth', 'params': 's'},
+    {'fun': 'ScriptCommand_IncreaseMaxHealth', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F034', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F050', 'params': 's'},
+    {'fun': 'ScriptCommand_GetInventoryValue', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F078', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807F088', 'params': 's'},
+    {'fun': 'ScriptCommand_CameraTargetEntity', 'params': ''},
+    {'fun': 'ScriptCommand_CameraTargetPlayer', 'params': ''},
+    {'fun': 'ScriptCommand_0807F0B4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'}
 ]
 
 # definitions for parameters
@@ -225,6 +225,11 @@ parameters = {
     },
 }
 
+def build_script_command(name: str):
+    name = name.replace("ScriptCommand_", "")
+    if name[0].isdigit():
+        return '_' + name
+    return name
 
 def ExecuteScriptCommandSet(ctx: Context):
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
@@ -268,7 +273,7 @@ def ExecuteScriptCommandSet(ctx: Context):
         #ctx.ptr += unk_06*2
         #return 1
 
-    print(command['fun'] + ' ' + params['read'](ctx))
+    print(build_script_command(command['fun']) + ' ' + params['read'](ctx))
 
     # Execute script
     ctx.ptr += unk_06*2
@@ -319,7 +324,7 @@ def generate_macros():
         params = parameters[command['params']]
         id = ((params['length']+1) << 0xA) + num
 
-        print(f'.macro {command["fun"]} {params["param"]}')
+        print(f'.macro {build_script_command(command["fun"])} {params["param"]}')
         print(f'	.short {u16_to_hex(id)}')
         if params['expr'] != '':
             print(params['expr'])

From 6dce46458cb4011e824e16d19a6ae129f61481ca Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Fri, 5 Mar 2021 01:00:45 +0100
Subject: [PATCH 14/46] Split scripts into separate files

---
 data/scripts.s                                | 3201 ++++++-----------
 data/scripts/gUnk_08008B5C.inc                |   17 +
 data/scripts/gUnk_08008B90.inc                |   17 +
 data/scripts/gUnk_08008BC0.inc                |   35 +
 data/scripts/gUnk_08008C4E.inc                |   12 +
 data/scripts/gUnk_08008C64.inc                |    4 +
 data/scripts/gUnk_08008C6D.inc                |   18 +
 data/scripts/gUnk_08008C7E.inc                |   60 +
 data/scripts/gUnk_08008CB9.inc                |  152 +
 data/scripts/gUnk_08008D50.inc                |   17 +
 data/scripts/gUnk_08008D8C.inc                |   16 +
 data/scripts/gUnk_08008DC0.inc                |   19 +
 data/scripts/gUnk_08008E08.inc                |    2 +
 data/scripts/gUnk_08008E0A.inc                |   51 +
 data/scripts/gUnk_08008F0C.inc                |    6 +
 data/scripts/gUnk_08008F16.inc                |    6 +
 data/scripts/gUnk_08008F26.inc                |   34 +
 data/scripts/gUnk_08008F90.inc                |   25 +
 data/scripts/gUnk_08008FC0.inc                |    4 +
 data/scripts/gUnk_08008FD1.inc                |   44 +
 data/scripts/gUnk_08008FFC.inc                |    5 +
 data/scripts/gUnk_08009008.inc                |    7 +
 data/scripts/gUnk_0800901F.inc                |   30 +
 data/scripts/gUnk_0800903C.inc                |   18 +
 data/scripts/gUnk_08009080.inc                |   27 +
 data/scripts/gUnk_080090DB.inc                |  190 +
 data/scripts/gUnk_08009198.inc                |   27 +
 data/scripts/gUnk_08009207.inc                |  110 +
 data/scripts/gUnk_08009274.inc                |   17 +
 data/scripts/gUnk_080092A8.inc                |   17 +
 data/scripts/gUnk_080092D4.inc                |    9 +
 data/scripts/gUnk_080092F0.inc                |    9 +
 data/scripts/gUnk_08009308.inc                |    7 +
 data/scripts/gUnk_08009318.inc                |    5 +
 data/scripts/gUnk_08009320.inc                |    9 +
 data/scripts/gUnk_08009340.inc                |    5 +
 data/scripts/gUnk_08009348.inc                |   27 +
 data/scripts/gUnk_08009393.inc                |   35 +
 data/scripts/gUnk_080093D7.inc                |   25 +
 data/scripts/gUnk_08009407.inc                |  128 +
 data/scripts/gUnk_08009486.inc                |   10 +
 data/scripts/gUnk_080094A4.inc                |   12 +
 data/scripts/gUnk_080094CC.inc                |    6 +
 data/scripts/gUnk_080094D7.inc                |   38 +
 data/scripts/gUnk_080094FC.inc                |    7 +
 data/scripts/gUnk_08009503.inc                |    6 +
 data/scripts/gUnk_08009508.inc                |   16 +
 data/scripts/gUnk_08009538.inc                |   19 +
 data/scripts/gUnk_08009574.inc                |   23 +
 data/scripts/gUnk_080095CC.inc                |   40 +
 data/scripts/gUnk_0800962C.inc                |   32 +
 data/scripts/gUnk_08009698.inc                |   26 +
 data/scripts/gUnk_08009704.inc                |    2 +
 data/scripts/gUnk_08009706.inc                |   30 +
 data/scripts/gUnk_08009740.inc                |   18 +
 data/scripts/gUnk_08009778.inc                |    6 +
 data/scripts/gUnk_08009786.inc                |   12 +
 data/scripts/gUnk_080097A1.inc                |   80 +
 data/scripts/gUnk_080097F0.inc                |   20 +
 data/scripts/gUnk_08009838.inc                |   61 +
 data/scripts/gUnk_080098D4.inc                |   20 +
 data/scripts/gUnk_08009918.inc                |   12 +
 data/scripts/gUnk_08009940.inc                |    5 +
 data/scripts/gUnk_08009950.inc                |   37 +
 data/scripts/gUnk_080099DC.inc                |   11 +
 data/scripts/gUnk_08009A04.inc                |    4 +
 data/scripts/gUnk_08009A07.inc                |   38 +
 data/scripts/gUnk_08009A2C.inc                |    5 +
 data/scripts/gUnk_08009A34.inc                |    8 +
 data/scripts/gUnk_08009A50.inc                |   12 +
 data/scripts/gUnk_08009A77.inc                |    6 +
 data/scripts/gUnk_08009A81.inc                |    4 +
 data/scripts/gUnk_08009A84.inc                |   14 +
 data/scripts/gUnk_08009ABB.inc                |   62 +
 data/scripts/gUnk_08009AF8.inc                |   16 +
 data/scripts/gUnk_08009B30.inc                |   16 +
 data/scripts/gUnk_08009B63.inc                |   22 +
 data/scripts/gUnk_08009B78.inc                |   61 +
 data/scripts/gUnk_08009C68.inc                |   11 +
 data/scripts/gUnk_08009C7F.inc                |   32 +
 data/scripts/gUnk_08009C9E.inc                |   50 +
 data/scripts/gUnk_08009D00.inc                |   25 +
 data/scripts/gUnk_08009D6C.inc                |    5 +
 data/scripts/gUnk_08009D77.inc                |   58 +
 data/scripts/gUnk_08009DB0.inc                |   17 +
 data/scripts/gUnk_08009DEC.inc                |   20 +
 data/scripts/gUnk_08009E38.inc                |   17 +
 data/scripts/gUnk_08009E58.inc                |   16 +
 data/scripts/gUnk_08009E88.inc                |    8 +
 data/scripts/gUnk_08009E9E.inc                |   12 +
 data/scripts/gUnk_08009EA9.inc                |    8 +
 data/scripts/gUnk_08009EB7.inc                |   22 +
 data/scripts/gUnk_08009ECC.inc                |   11 +
 data/scripts/gUnk_08009EF0.inc                |    8 +
 data/scripts/gUnk_08009F07.inc                |   14 +
 data/scripts/gUnk_08009F14.inc                |   12 +
 data/scripts/gUnk_08009F39.inc                |   58 +
 data/scripts/gUnk_08009F72.inc                |   74 +
 data/scripts/gUnk_0800A064.inc                |   10 +
 data/scripts/gUnk_0800A081.inc                |   52 +
 data/scripts/gUnk_0800A0B4.inc                |   20 +
 data/scripts/gUnk_0800A0FC.inc                |    6 +
 data/scripts/gUnk_0800A10A.inc                |    6 +
 data/scripts/gUnk_0800A10F.inc                |   22 +
 data/scripts/gUnk_0800A124.inc                |    5 +
 data/scripts/gUnk_0800A134.inc                |   65 +
 data/scripts/gUnk_0800A1B4.inc                |   10 +
 data/scripts/gUnk_0800A1D8.inc                |   18 +
 data/scripts/gUnk_0800A224.inc                |   13 +
 data/scripts/gUnk_0800A260.inc                |  113 +
 data/scripts/gUnk_0800A340.inc                |   22 +
 data/scripts/gUnk_0800A3A3.inc                |    4 +
 data/scripts/gUnk_0800A3A9.inc                |    2 +
 data/scripts/gUnk_0800A3AA.inc                |   24 +
 data/scripts/gUnk_0800A3D8.inc                |   60 +
 data/scripts/gUnk_0800A500.inc                |   30 +
 data/scripts/gUnk_0800A590.inc                |    7 +
 data/scripts/gUnk_0800A5A6.inc                |   92 +
 data/scripts/gUnk_0800A65C.inc                |    9 +
 data/scripts/gUnk_0800A67E.inc                |    2 +
 data/scripts/gUnk_0800A680.inc                |   10 +
 data/scripts/gUnk_0800A6A4.inc                |    6 +
 data/scripts/gUnk_0800A6AB.inc                |   42 +
 data/scripts/gUnk_0800A6D4.inc                |   12 +
 data/scripts/gUnk_0800A704.inc                |   12 +
 data/scripts/gUnk_0800A734.inc                |    8 +
 data/scripts/gUnk_0800A74A.inc                |    7 +
 data/scripts/gUnk_0800A764.inc                |   31 +
 data/scripts/gUnk_0800A7E4.inc                |    3 +
 data/scripts/gUnk_0800A7E8.inc                |   24 +
 data/scripts/gUnk_0800A816.inc                |    6 +
 data/scripts/gUnk_0800A820.inc                |   17 +
 data/scripts/gUnk_0800A85C.inc                |   17 +
 data/scripts/gUnk_0800A898.inc                |   17 +
 data/scripts/gUnk_0800A8D4.inc                |   25 +-
 data/scripts/gUnk_0800A908.inc                |    4 +
 data/scripts/gUnk_0800A910.inc                |   19 +
 data/scripts/gUnk_0800A964.inc                |   11 +
 data/scripts/gUnk_0800A988.inc                |   11 +
 data/scripts/gUnk_0800A9AC.inc                |   11 +
 data/scripts/gUnk_0800A9D0.inc                |   11 +
 data/scripts/gUnk_0800A9F4.inc                |    9 +
 data/scripts/gUnk_0800AA03.inc                |   70 +
 data/scripts/gUnk_0800AA48.inc                |   11 +
 data/scripts/gUnk_0800AA6C.inc                |   11 +
 data/scripts/gUnk_0800AA90.inc                |   11 +
 data/scripts/gUnk_0800AAB4.inc                |   11 +
 data/scripts/gUnk_0800AAD8.inc                |   12 +
 data/scripts/gUnk_0800AB08.inc                |   10 +
 data/scripts/gUnk_0800AB23.inc                |   23 +
 data/scripts/gUnk_0800AB4F.inc                |  162 +
 data/scripts/gUnk_0800ABF0.inc                |   27 +
 data/scripts/gUnk_0800AC24.inc                |   74 +
 data/scripts/gUnk_0800AC6D.inc                |   37 +
 data/scripts/gUnk_0800ACB5.inc                |    8 +
 data/scripts/gUnk_0800ACBC.inc                |   10 +
 data/scripts/gUnk_0800ACE0.inc                |   25 +
 data/scripts/gUnk_0800AD54.inc                |   11 +
 data/scripts/gUnk_0800AD74.inc                |   15 +
 data/scripts/gUnk_0800ADA7.inc                |   14 +
 data/scripts/gUnk_0800ADB4.inc                |  121 +
 data/scripts/gUnk_0800AEA4.inc                |   15 +
 data/scripts/gUnk_0800AEDC.inc                |   15 +
 data/scripts/gUnk_0800AF18.inc                |   12 +
 data/scripts/gUnk_0800AF44.inc                |   11 +
 data/scripts/gUnk_0800AF68.inc                |    7 +
 data/scripts/gUnk_0800AF7E.inc                |    8 +
 data/scripts/gUnk_0800AF8C.inc                |    8 +
 data/scripts/gUnk_0800AFA7.inc                |   10 +
 data/scripts/gUnk_0800AFB0.inc                |   17 +
 data/scripts/gUnk_0800AFE8.inc                |   11 +
 data/scripts/gUnk_0800B00C.inc                |   44 +
 data/scripts/gUnk_0800B0AC.inc                |    3 +
 data/scripts/gUnk_0800B0B0.inc                |    9 +
 data/scripts/gUnk_0800B0D0.inc                |  144 +
 data/scripts/gUnk_0800B177.inc                |    6 +
 data/scripts/gUnk_0800B17C.inc                |   19 +
 data/scripts/gUnk_0800B1C0.inc                |   16 +
 data/scripts/gUnk_0800B200.inc                |   22 +
 data/scripts/gUnk_0800B254.inc                |   16 +
 data/scripts/gUnk_0800B284.inc                |   16 +
 data/scripts/gUnk_0800B2B4.inc                |   25 +
 data/scripts/gUnk_0800B308.inc                |    9 +
 data/scripts/gUnk_0800B322.inc                |    5 +
 data/scripts/gUnk_0800B329.inc                |   32 +
 data/scripts/gUnk_0800B348.inc                |    7 +
 data/scripts/gUnk_0800B35C.inc                |    6 +
 data/scripts/gUnk_0800B374.inc                |   14 +
 data/scripts/gUnk_0800B3A4.inc                |   24 +
 data/scripts/gUnk_0800B40F.inc                |   14 +
 data/scripts/gUnk_0800B41C.inc                |   36 +
 data/scripts/gUnk_0800B4AC.inc                |   29 +
 data/scripts/gUnk_0800B508.inc                |    4 +
 data/scripts/gUnk_0800B50F.inc                |   62 +
 data/scripts/gUnk_0800B54C.inc                |   11 +
 data/scripts/gUnk_0800B574.inc                |   20 +
 data/scripts/gUnk_0800B5C4.inc                |   12 +
 data/scripts/gUnk_0800B5EC.inc                |   16 +
 data/scripts/gUnk_0800B614.inc                |   47 +
 data/scripts/gUnk_0800B6C8.inc                |   16 +
 data/scripts/gUnk_0800B708.inc                |    8 +
 data/scripts/gUnk_0800B71F.inc                |   18 +
 data/scripts/gUnk_0800B730.inc                |   38 +
 data/scripts/gUnk_0800B7C4.inc                |   95 +
 data/scripts/gUnk_0800B84F.inc                |   10 +
 data/scripts/gUnk_0800B861.inc                |   40 +
 data/scripts/gUnk_0800B888.inc                |    9 +
 data/scripts/gUnk_0800B8A0.inc                |   10 +
 data/scripts/gUnk_0800B8B8.inc                |   12 +
 data/scripts/gUnk_0800B8E4.inc                |   11 +
 data/scripts/gUnk_0800B906.inc                |    7 +
 data/scripts/gUnk_0800B91C.inc                |   26 +
 data/scripts/gUnk_0800B964.inc                |   21 +
 data/scripts/gUnk_0800B9B4.inc                |   62 +
 data/scripts/gUnk_0800BA3C.inc                |   19 +
 data/scripts/gUnk_0800BA78.inc                |   22 +
 data/scripts/gUnk_0800BACC.inc                |   15 +
 data/scripts/gUnk_0800BB00.inc                |    5 +
 data/scripts/gUnk_0800BB08.inc                |    6 +
 data/scripts/gUnk_0800BB1A.inc                |    7 +
 data/scripts/gUnk_0800BB30.inc                |   15 +
 data/scripts/gUnk_0800BB64.inc                |    6 +
 data/scripts/gUnk_0800BB74.inc                |   25 +
 data/scripts/gUnk_0800BBA4.inc                |   16 +
 data/scripts/gUnk_0800BBDB.inc                |    2 +
 data/scripts/gUnk_0800BBDC.inc                |   14 +
 data/scripts/gUnk_0800BC08.inc                |    9 +
 data/scripts/gUnk_0800BC22.inc                |   24 +
 data/scripts/gUnk_0800BC50.inc                |   24 +
 data/scripts/gUnk_0800BCAE.inc                |   10 +
 data/scripts/gUnk_0800BCB7.inc                |    8 +
 data/scripts/gUnk_0800BCBE.inc                |   10 +
 data/scripts/gUnk_0800BCE8.inc                |   11 +
 data/scripts/gUnk_0800BD08.inc                |   26 +
 data/scripts/gUnk_0800BD70.inc                |    3 +
 data/scripts/gUnk_0800BD78.inc                |   13 +
 data/scripts/gUnk_0800BDAC.inc                |   13 +
 data/scripts/gUnk_0800BDC4.inc                |   45 +
 data/scripts/gUnk_0800BE1C.inc                |   17 +
 data/scripts/gUnk_0800BE54.inc                |   31 +
 data/scripts/gUnk_0800BECC.inc                |   18 +
 data/scripts/gUnk_0800BF14.inc                |    9 +
 data/scripts/gUnk_0800BF38.inc                |    6 +
 data/scripts/gUnk_0800BF4A.inc                |   12 +
 data/scripts/gUnk_0800BF70.inc                |   23 +
 data/scripts/gUnk_0800BFBF.inc                |   18 +
 data/scripts/gUnk_0800BFE1.inc                |    2 +
 data/scripts/gUnk_0800BFE3.inc                |   34 +
 data/scripts/gUnk_0800C004.inc                |    3 +
 data/scripts/gUnk_0800C007.inc                |   30 +
 data/scripts/gUnk_0800C024.inc                |   24 +
 data/scripts/gUnk_0800C07B.inc                |   54 +
 data/scripts/gUnk_0800C0B0.inc                |   10 +
 data/scripts/gUnk_0800C0C7.inc                |    7 +
 data/scripts/gUnk_0800C0D3.inc                |   22 +
 data/scripts/gUnk_0800C0E8.inc                |   14 +
 data/scripts/gUnk_0800C113.inc                |   27 +
 data/scripts/gUnk_0800C147.inc                |   26 +
 data/scripts/gUnk_0800C160.inc                |   27 +
 data/scripts/gUnk_0800C1D8.inc                |   14 +
 data/scripts/gUnk_0800C204.inc                |    4 +
 data/scripts/gUnk_0800C207.inc                |    2 +
 data/scripts/gUnk_0800C208.inc                |    5 +
 data/scripts/gUnk_0800C210.inc                |   24 +
 data/scripts/gUnk_0800C263.inc                |   66 +
 data/scripts/gUnk_0800C2A4.inc                |    3 +
 data/scripts/gUnk_0800C2A7.inc                |   40 +
 data/scripts/gUnk_0800C2CE.inc                |   66 +
 data/scripts/gUnk_0800C350.inc                |   15 +
 data/scripts/gUnk_0800C396.inc                |   28 +
 data/scripts/gUnk_0800C3CC.inc                |   13 +
 data/scripts/gUnk_0800C408.inc                |    5 +
 data/scripts/gUnk_0800C410.inc                |   16 +
 data/scripts/gUnk_0800C45C.inc                |   17 +
 data/scripts/gUnk_0800C494.inc                |   17 +
 data/scripts/gUnk_0800C4D0.inc                |    5 +
 data/scripts/gUnk_0800C4DB.inc                |   50 +
 data/scripts/gUnk_0800C50C.inc                |   11 +
 data/scripts/gUnk_0800C521.inc                |   48 +
 data/scripts/gUnk_0800C550.inc                |    4 +
 data/scripts/gUnk_0800C556.inc                |   23 +
 data/scripts/gUnk_0800C584.inc                |    9 +
 data/scripts/gUnk_0800C59A.inc                |   15 +
 data/scripts/gUnk_0800C5C8.inc                |   18 +
 data/scripts/gUnk_0800C5FC.inc                |    3 +
 data/scripts/gUnk_0800C600.inc                |    8 +
 data/scripts/gUnk_0800C607.inc                |   46 +
 data/scripts/gUnk_0800C634.inc                |   38 +
 data/scripts/gUnk_0800C6C6.inc                |   48 +
 data/scripts/gUnk_0800C774.inc                |    5 +
 data/scripts/gUnk_0800C779.inc                |  144 +
 data/scripts/gUnk_0800C808.inc                |   90 +
 data/scripts/gUnk_0800C861.inc                |   80 +
 data/scripts/gUnk_0800C8B0.inc                |   22 +
 data/scripts/gUnk_0800C8DA.inc                |    6 +
 data/scripts/gUnk_0800C8F0.inc                |   12 +
 data/scripts/gUnk_0800C91C.inc                |    7 +
 data/scripts/gUnk_0800C931.inc                |   26 +
 data/scripts/gUnk_0800C963.inc                |  166 +
 data/scripts/gUnk_0800CA08.inc                |   30 +
 data/scripts/gUnk_0800CA8C.inc                |    9 +
 data/scripts/gUnk_0800CAAA.inc                |   10 +
 data/scripts/gUnk_0800CABC.inc                |   20 +
 data/scripts/gUnk_0800CB07.inc                |   78 +
 data/scripts/gUnk_0800CB54.inc                |   20 +
 data/scripts/gUnk_0800CBA3.inc                |   50 +
 data/scripts/gUnk_0800CBD4.inc                |   14 +
 data/scripts/gUnk_0800CC08.inc                |    6 +
 data/scripts/gUnk_0800CC0D.inc                |   54 +
 data/scripts/gUnk_0800CC42.inc                |   22 +
 data/scripts/gUnk_0800CC6C.inc                |   23 +
 data/scripts/gUnk_0800CCCD.inc                |    9 +
 data/scripts/gUnk_0800CCDD.inc                |   40 +
 data/scripts/gUnk_0800CD04.inc                |    3 +
 data/scripts/gUnk_0800CD08.inc                |   96 +
 data/scripts/gUnk_0800CD67.inc                |   22 +
 data/scripts/gUnk_0800CD7C.inc                |   40 +
 data/scripts/gUnk_0800CE07.inc                |  254 ++
 data/scripts/gUnk_0800CF04.inc                |    8 +
 data/scripts/gUnk_0800CF16.inc                |   16 +
 data/scripts/gUnk_0800CF4B.inc                |    6 +
 data/scripts/gUnk_0800CF50.inc                |   18 +
 data/scripts/gUnk_0800CF7B.inc                |   14 +
 data/scripts/gUnk_0800CF88.inc                |    5 +
 data/scripts/gUnk_0800CF95.inc                |   11 +
 data/scripts/gUnk_0800CFA9.inc                |    4 +
 data/scripts/gUnk_0800CFAC.inc                |   31 +
 data/scripts/gUnk_0800D011.inc                |   40 +
 data/scripts/gUnk_0800D05F.inc                |  112 +
 data/scripts/gUnk_0800D0CE.inc                |   20 +
 data/scripts/gUnk_0800D127.inc                |  106 +
 data/scripts/gUnk_0800D190.inc                |   10 +
 data/scripts/gUnk_0800D1B4.inc                |    6 +
 data/scripts/gUnk_0800D1C4.inc                |    9 +
 data/scripts/gUnk_0800D1D4.inc                |    7 +
 data/scripts/gUnk_0800D1E0.inc                |    9 +
 data/scripts/gUnk_0800D207.inc                |   18 +
 data/scripts/gUnk_0800D218.inc                |   21 +
 data/scripts/gUnk_0800D254.inc                |   11 +
 data/scripts/gUnk_0800D278.inc                |   28 +
 data/scripts/gUnk_0800D2CE.inc                |   15 +
 data/scripts/gUnk_0800D306.inc                |    2 +
 data/scripts/gUnk_0800D308.inc                |    7 +
 data/scripts/gUnk_0800D30F.inc                |   66 +
 data/scripts/gUnk_0800D350.inc                |   40 +
 data/scripts/gUnk_0800D3EC.inc                |   12 +
 data/scripts/gUnk_0800D414.inc                |   14 +
 data/scripts/gUnk_0800D44C.inc                |  116 +
 data/scripts/gUnk_0800D4BF.inc                |   30 +
 data/scripts/gUnk_0800D4DC.inc                |   87 +
 data/scripts/gUnk_0800D59C.inc                |   42 +
 data/scripts/gUnk_0800D5E5.inc                |   40 +
 data/scripts/gUnk_0800D60C.inc                |    9 +
 data/scripts/gUnk_0800D62B.inc                |  138 +
 data/scripts/gUnk_0800D6B4.inc                |    4 +
 data/scripts/gUnk_0800D6BA.inc                |    7 +
 data/scripts/gUnk_0800D6D0.inc                |   11 +
 data/scripts/gUnk_0800D6F0.inc                |    7 +
 data/scripts/gUnk_0800D702.inc                |    2 +
 data/scripts/gUnk_0800D703.inc                |   14 +
 data/scripts/gUnk_0800D710.inc                |    9 +
 data/scripts/gUnk_0800D725.inc                |    4 +
 data/scripts/gUnk_0800D728.inc                |   17 +
 data/scripts/gUnk_0800D76C.inc                |   23 +
 data/scripts/gUnk_0800D7CF.inc                |   14 +
 data/scripts/gUnk_0800D7DC.inc                |   44 +
 data/scripts/gUnk_0800D874.inc                |   29 +
 data/scripts/gUnk_0800D8E4.inc                |   11 +
 data/scripts/gUnk_0800D906.inc                |   31 +
 data/scripts/gUnk_0800D954.inc                |   11 +
 data/scripts/gUnk_0800D97D.inc                |    3 +
 data/scripts/gUnk_0800D981.inc                |   73 +
 data/scripts/gUnk_0800DA11.inc                |   24 +
 data/scripts/gUnk_0800DA28.inc                |   11 +
 data/scripts/gUnk_0800DA4C.inc                |    2 +
 data/scripts/gUnk_0800DA4D.inc                |   20 +
 data/scripts/gUnk_0800DA60.inc                |   43 +
 data/scripts/gUnk_0800DB0E.inc                |    5 +
 data/scripts/gUnk_0800DB18.inc                |    6 +
 data/scripts/gUnk_0800DB28.inc                |   11 +
 data/scripts/gUnk_0800DB4A.inc                |   12 +
 data/scripts/gUnk_0800DB78.inc                |    5 +
 data/scripts/gUnk_0800DB88.inc                |   69 +
 data/scripts/gUnk_0800DC10.inc                |   10 +
 data/scripts/gUnk_0800DC19.inc                |   61 +
 data/scripts/gUnk_0800DC91.inc                |   28 +
 data/scripts/gUnk_0800DCAC.inc                |   12 +
 data/scripts/gUnk_0800DCDC.inc                |   10 +
 data/scripts/gUnk_0800DD04.inc                |    7 +
 data/scripts/gUnk_0800DD10.inc                |   10 +
 data/scripts/gUnk_0800DD19.inc                |   10 +
 data/scripts/gUnk_0800DD22.inc                |   27 +
 data/scripts/gUnk_0800DD8D.inc                |   30 +
 data/scripts/gUnk_0800DDAA.inc                |   22 +
 data/scripts/gUnk_0800DDE8.inc                |    7 +
 data/scripts/gUnk_0800DDFC.inc                |    3 +
 data/scripts/gUnk_0800DE00.inc                |   51 +
 data/scripts/gUnk_0800DE78.inc                |   14 +
 data/scripts/gUnk_0800DEB0.inc                |   10 +
 data/scripts/gUnk_0800DED4.inc                |   12 +
 data/scripts/gUnk_0800DEF6.inc                |    9 +
 data/scripts/gUnk_0800DF07.inc                |   30 +
 data/scripts/gUnk_0800DF24.inc                |   38 +
 data/scripts/gUnk_0800DFB4.inc                |   10 +
 data/scripts/gUnk_0800DFD0.inc                |    5 +
 data/scripts/gUnk_0800DFD7.inc                |    8 +
 data/scripts/gUnk_0800DFDE.inc                |    3 +
 data/scripts/gUnk_0800DFE4.inc                |   29 +
 data/scripts/gUnk_0800E050.inc                |   40 +
 data/scripts/gUnk_0800E0BC.inc                |   16 +
 data/scripts/gUnk_0800E0F6.inc                |   38 +
 data/scripts/gUnk_0800E140.inc                |    8 +
 data/scripts/gUnk_0800E153.inc                |    2 +
 data/scripts/gUnk_0800E154.inc                |   31 +
 data/scripts/gUnk_0800E1C5.inc                |   60 +
 data/scripts/gUnk_0800E200.inc                |   64 +
 data/scripts/gUnk_0800E300.inc                |    5 +
 data/scripts/gUnk_0800E305.inc                |    2 +
 data/scripts/gUnk_0800E307.inc                |    6 +
 data/scripts/gUnk_0800E30C.inc                |   10 +
 data/scripts/gUnk_0800E329.inc                |   40 +
 data/scripts/gUnk_0800E350.inc                |   47 +
 data/scripts/gUnk_0800E3EE.inc                |    6 +
 data/scripts/gUnk_0800E3F9.inc                |    2 +
 data/scripts/gUnk_0800E3FA.inc                |    2 +
 data/scripts/gUnk_0800E3FC.inc                |    3 +
 data/scripts/gUnk_0800E400.inc                |    5 +
 data/scripts/gUnk_0800E408.inc                |    3 +
 data/scripts/gUnk_0800E40B.inc                |    4 +
 data/scripts/gUnk_0800E411.inc                |   32 +
 data/scripts/gUnk_0800E430.inc                |    3 +
 data/scripts/gUnk_0800E434.inc                |   17 +
 data/scripts/gUnk_0800E46C.inc                |   11 +
 data/scripts/gUnk_0800E489.inc                |    9 +
 data/scripts/gUnk_0800E499.inc                |   12 +
 data/scripts/gUnk_0800E4A4.inc                |   19 +
 data/scripts/gUnk_0800E4E3.inc                |   34 +
 data/scripts/gUnk_0800E504.inc                |    5 +
 data/scripts/gUnk_0800E50C.inc                |   15 +
 data/scripts/gUnk_0800E544.inc                |   20 +
 data/scripts/gUnk_0800E58C.inc                |   17 +
 data/scripts/gUnk_0800E5C4.inc                |   28 +
 data/scripts/gUnk_0800E600.inc                |    6 +
 data/scripts/gUnk_0800E60E.inc                |   16 +
 data/scripts/gUnk_0800E62C.inc                |   14 +
 data/scripts/gUnk_0800E658.inc                |   14 +
 data/scripts/gUnk_0800E684.inc                |   14 +
 data/scripts/gUnk_0800E6B0.inc                |   19 +
 data/scripts/gUnk_0800E6E8.inc                |   12 +
 data/scripts/gUnk_0800E707.inc                |    4 +
 data/scripts/gUnk_0800E70A.inc                |   15 +
 data/scripts/gUnk_0800E734.inc                |   15 +
 data/scripts/gUnk_0800E760.inc                |   33 +
 data/scripts/gUnk_0800E7D9.inc                |   28 +
 data/scripts/gUnk_0800E7F4.inc                |    4 +
 data/scripts/gUnk_0800E7FA.inc                |   39 +
 data/scripts/gUnk_0800E823.inc                |    2 +
 data/scripts/gUnk_0800E824.inc                |  133 +
 data/scripts/gUnk_0800E8DB.inc                |   70 +
 data/scripts/gUnk_0800E920.inc                |   20 +
 data/scripts/gUnk_0800E964.inc                |   31 +
 data/scripts/gUnk_0800E9D6.inc                |   11 +
 data/scripts/gUnk_0800E9F4.inc                |   11 +
 data/scripts/gUnk_0800EA1C.inc                |   15 +
 data/scripts/gUnk_0800EA54.inc                |   22 +
 data/scripts/gUnk_0800EAA4.inc                |   21 +
 data/scripts/gUnk_0800EAEB.inc                |   14 +
 data/scripts/gUnk_0800EAF8.inc                |   17 +
 data/scripts/gUnk_0800EB2C.inc                |   17 +
 data/scripts/gUnk_0800EB64.inc                |   26 +
 data/scripts/gUnk_0800EBC0.inc                |    9 +
 data/scripts/gUnk_0800EBDC.inc                |    3 +
 data/scripts/gUnk_0800EBE0.inc                |    9 +
 data/scripts/gUnk_0800EBF0.inc                |    9 +
 data/scripts/gUnk_0800EC08.inc                |    5 +
 data/scripts/gUnk_0800EC14.inc                |   19 +
 data/scripts/gUnk_0800EC54.inc                |    5 +
 data/scripts/gUnk_0800EC61.inc                |   44 +
 data/scripts/gUnk_0800EC8C.inc                |   26 +
 data/scripts/gUnk_0800ECF1.inc                |   20 +
 data/scripts/gUnk_0800ED04.inc                |    5 +
 data/scripts/gUnk_0800ED0C.inc                |    2 +
 data/scripts/gUnk_0800ED0D.inc                |   80 +
 data/scripts/gUnk_0800ED5C.inc                |   17 +
 data/scripts/gUnk_0800ED90.inc                |   22 +
 data/scripts/gUnk_0800EDD9.inc                |    8 +
 data/scripts/gUnk_0800EDE0.inc                |   42 +
 data/scripts/gUnk_0800EE09.inc                |   72 +
 data/scripts/gUnk_0800EE50.inc                |   19 +
 data/scripts/gUnk_0800EE8C.inc                |   21 +
 data/scripts/gUnk_0800EEE0.inc                |   30 +
 data/scripts/gUnk_0800EEFD.inc                |    6 +
 data/scripts/gUnk_0800EF07.inc                |   12 +
 data/scripts/gUnk_0800EF12.inc                |   24 +
 data/scripts/gUnk_0800EF40.inc                |   24 +
 data/scripts/gUnk_0800EF93.inc                |   46 +
 data/scripts/gUnk_0800EFC0.inc                |   11 +
 data/scripts/gUnk_0800EFE0.inc                |    3 +
 data/scripts/gUnk_0800EFE4.inc                |   87 +
 data/scripts/gUnk_0800F090.inc                |    3 +
 data/scripts/gUnk_0800F094.inc                |   34 +
 data/scripts/gUnk_0800F0D6.inc                |    7 +
 data/scripts/gUnk_0800F0E2.inc                |    6 +
 data/scripts/gUnk_0800F0F2.inc                |    2 +
 data/scripts/gUnk_0800F0F3.inc                |    2 +
 data/scripts/gUnk_0800F0F4.inc                |   45 +
 data/scripts/gUnk_0800F14C.inc                |   15 +
 data/scripts/gUnk_0800F184.inc                |   22 +
 data/scripts/gUnk_0800F1DE.inc                |    4 +
 data/scripts/gUnk_0800F1E1.inc                |    3 +
 data/scripts/gUnk_0800F1E5.inc                |    2 +
 data/scripts/gUnk_0800F1E7.inc                |    4 +
 data/scripts/gUnk_0800F1ED.inc                |    8 +
 data/scripts/gUnk_0800F1FB.inc                |    2 +
 data/scripts/gUnk_0800F1FD.inc                |    4 +
 data/scripts/gUnk_0800F203.inc                |    3 +
 data/scripts/gUnk_0800F207.inc                |   10 +
 data/scripts/gUnk_0800F210.inc                |   53 +
 data/scripts/gUnk_0800F2EB.inc                |    6 +
 data/scripts/gUnk_0800F2F0.inc                |    2 +
 data/scripts/gUnk_0800F2F2.inc                |    8 +
 data/scripts/gUnk_0800F303.inc                |  154 +
 data/scripts/gUnk_0800F39C.inc                |   18 +
 data/scripts/gUnk_0800F3DB.inc                |    6 +
 data/scripts/gUnk_0800F3E5.inc                |    2 +
 data/scripts/gUnk_0800F3E6.inc                |    2 +
 data/scripts/gUnk_0800F3E8.inc                |    4 +
 data/scripts/gUnk_0800F3EB.inc                |    2 +
 data/scripts/gUnk_0800F3ED.inc                |    5 +
 data/scripts/gUnk_0800F3F5.inc                |    3 +
 data/scripts/gUnk_0800F3F9.inc                |    8 +
 data/scripts/gUnk_0800F400.inc                |    5 +
 data/scripts/gUnk_0800F408.inc                |    2 +
 data/scripts/gUnk_0800F409.inc                |    8 +
 data/scripts/gUnk_0800F410.inc                |   12 +
 data/scripts/gUnk_0800F426.inc                |    6 +
 data/scripts/gUnk_0800F430.inc                |   41 +
 data/scripts/gUnk_0800F4C4.inc                |   13 +
 data/scripts/gUnk_0800F4EA.inc                |    2 +
 data/scripts/gUnk_0800F4EB.inc                |    3 +
 data/scripts/gUnk_0800F4EF.inc                |    2 +
 data/scripts/gUnk_0800F4F0.inc                |    2 +
 data/scripts/gUnk_0800F4F1.inc                |    2 +
 data/scripts/gUnk_0800F4F3.inc                |    3 +
 data/scripts/gUnk_0800F4F7.inc                |    2 +
 data/scripts/gUnk_0800F4F9.inc                |    5 +
 data/scripts/gUnk_0800F501.inc                |   14 +
 data/scripts/gUnk_0800F50E.inc                |   22 +
 data/scripts/gUnk_0800F554.inc                |   16 +
 data/scripts/gUnk_0800F584.inc                |    7 +
 data/scripts/gUnk_0800F58F.inc                |   34 +
 data/scripts/gUnk_0800F5B0.inc                |   18 +
 data/scripts/gUnk_0800F5E9.inc                |    4 +
 data/scripts/gUnk_0800F5EC.inc                |    2 +
 data/scripts/gUnk_0800F5ED.inc                |    2 +
 data/scripts/gUnk_0800F5EE.inc                |    2 +
 data/scripts/gUnk_0800F5EF.inc                |    2 +
 data/scripts/gUnk_0800F5F0.inc                |    2 +
 data/scripts/gUnk_0800F5F2.inc                |    2 +
 data/scripts/gUnk_0800F5F4.inc                |    5 +
 data/scripts/gUnk_0800F5FC.inc                |    4 +
 data/scripts/gUnk_0800F5FF.inc                |    8 +
 data/scripts/gUnk_0800F606.inc                |    2 +
 data/scripts/gUnk_0800F607.inc                |    2 +
 data/scripts/gUnk_0800F608.inc                |    2 +
 data/scripts/gUnk_0800F60A.inc                |   10 +
 data/scripts/gUnk_0800F628.inc                |   15 +
 data/scripts/gUnk_0800F650.inc                |   19 +
 data/scripts/gUnk_0800F688.inc                |    8 +
 data/scripts/gUnk_0800F6A0.inc                |   12 +
 data/scripts/gUnk_0800F6C8.inc                |    7 +
 data/scripts/gUnk_0800F6E0.inc                |    5 +
 data/scripts/gUnk_0800F6E9.inc                |    4 +
 data/scripts/gUnk_0800F6EC.inc                |    2 +
 data/scripts/gUnk_0800F6ED.inc                |    2 +
 data/scripts/gUnk_0800F6EE.inc                |    2 +
 data/scripts/gUnk_0800F6EF.inc                |    2 +
 data/scripts/gUnk_0800F6F0.inc                |    2 +
 data/scripts/gUnk_0800F6F1.inc                |    2 +
 data/scripts/gUnk_0800F6F2.inc                |    2 +
 data/scripts/gUnk_0800F6F3.inc                |    2 +
 data/scripts/gUnk_0800F6F4.inc                |    3 +
 data/scripts/gUnk_0800F6F9.inc                |    6 +
 data/scripts/gUnk_0800F6FE.inc                |    3 +
 data/scripts/gUnk_0800F702.inc                |    3 +
 data/scripts/gUnk_0800F706.inc                |    9 +
 data/scripts/gUnk_0800F71E.inc                |    3 +
 data/scripts/gUnk_0800F724.inc                |    7 +
 data/scripts/gUnk_0800F734.inc                |    4 +
 data/scripts/gUnk_0800F73C.inc                |   37 +
 data/scripts/gUnk_0800F7E6.inc                |    6 +
 data/scripts/gUnk_0800F7EB.inc                |    4 +
 data/scripts/gUnk_0800F7EE.inc                |    2 +
 data/scripts/gUnk_0800F7EF.inc                |    2 +
 data/scripts/gUnk_0800F7F0.inc                |    3 +
 data/scripts/gUnk_0800F7F4.inc                |    2 +
 data/scripts/gUnk_0800F7F5.inc                |    2 +
 data/scripts/gUnk_0800F7F7.inc                |    6 +
 data/scripts/gUnk_0800F7FC.inc                |    2 +
 data/scripts/gUnk_0800F7FD.inc                |    2 +
 data/scripts/gUnk_0800F7FF.inc                |    2 +
 data/scripts/gUnk_0800F800.inc                |    6 +
 data/scripts/gUnk_0800F805.inc                |    4 +
 data/scripts/gUnk_0800F808.inc                |  232 ++
 data/scripts/gUnk_0800F8EF.inc                |    2 +
 data/scripts/gUnk_0800F8F0.inc                |    2 +
 data/scripts/gUnk_0800F8F1.inc                |    2 +
 data/scripts/gUnk_0800F8F2.inc                |    2 +
 data/scripts/gUnk_0800F8F3.inc                |    2 +
 data/scripts/gUnk_0800F8F4.inc                |    2 +
 data/scripts/gUnk_0800F8F5.inc                |    4 +
 data/scripts/gUnk_0800F8F8.inc                |    2 +
 data/scripts/gUnk_0800F8F9.inc                |    8 +
 data/scripts/gUnk_0800F900.inc                |    2 +
 data/scripts/gUnk_0800F902.inc                |   10 +
 data/scripts/gUnk_0800F916.inc                |   49 +
 data/scripts/gUnk_0800F9F0.inc                |    2 +
 data/scripts/gUnk_0800F9F2.inc                |    2 +
 data/scripts/gUnk_0800F9F3.inc                |    2 +
 data/scripts/gUnk_0800F9F4.inc                |    2 +
 data/scripts/gUnk_0800F9F6.inc                |    2 +
 data/scripts/gUnk_0800F9F7.inc                |    2 +
 data/scripts/gUnk_0800F9F8.inc                |    6 +
 data/scripts/gUnk_0800FA02.inc                |    3 +
 data/scripts/gUnk_0800FA07.inc                |    2 +
 data/scripts/gUnk_0800FA08.inc                |    2 +
 data/scripts/gUnk_0800FA09.inc                |    3 +
 data/scripts/gUnk_0800FA0D.inc                |  108 +
 data/scripts/gUnk_0800FA78.inc                |   28 +
 data/scripts/gUnk_0800FAC0.inc                |   10 +
 data/scripts/gUnk_0800FAE4.inc                |    6 +
 data/scripts/gUnk_0800FAF3.inc                |    2 +
 data/scripts/gUnk_0800FAF5.inc                |    2 +
 data/scripts/gUnk_0800FAF6.inc                |    2 +
 data/scripts/gUnk_0800FAF7.inc                |    2 +
 data/scripts/gUnk_0800FAF8.inc                |    6 +
 data/scripts/gUnk_0800FAFD.inc                |    2 +
 data/scripts/gUnk_0800FAFE.inc                |    2 +
 data/scripts/gUnk_0800FAFF.inc                |    2 +
 data/scripts/gUnk_0800FB00.inc                |    2 +
 data/scripts/gUnk_0800FB01.inc                |    2 +
 data/scripts/gUnk_0800FB02.inc                |    2 +
 data/scripts/gUnk_0800FB04.inc                |    3 +
 data/scripts/gUnk_0800FB08.inc                |    2 +
 data/scripts/gUnk_0800FB0A.inc                |   40 +
 data/scripts/gUnk_0800FB31.inc                |   20 +
 data/scripts/gUnk_0800FB44.inc                |   31 +
 data/scripts/gUnk_0800FBBB.inc                |   54 +
 data/scripts/gUnk_0800FBF0.inc                |    4 +
 data/scripts/gUnk_0800FBF3.inc                |    2 +
 data/scripts/gUnk_0800FBF5.inc                |    2 +
 data/scripts/gUnk_0800FBF6.inc                |    2 +
 data/scripts/gUnk_0800FBF8.inc                |    2 +
 data/scripts/gUnk_0800FBF9.inc                |    2 +
 data/scripts/gUnk_0800FBFA.inc                |    2 +
 data/scripts/gUnk_0800FBFB.inc                |    2 +
 data/scripts/gUnk_0800FBFC.inc                |    4 +
 data/scripts/gUnk_0800FBFF.inc                |    2 +
 data/scripts/gUnk_0800FC00.inc                |    2 +
 data/scripts/gUnk_0800FC01.inc                |    3 +
 data/scripts/gUnk_0800FC05.inc                |    2 +
 data/scripts/gUnk_0800FC06.inc                |    2 +
 data/scripts/gUnk_0800FC08.inc                |    2 +
 data/scripts/gUnk_0800FC09.inc                |    6 +
 data/scripts/gUnk_0800FC0E.inc                |   12 +
 data/scripts/gUnk_0800FC24.inc                |   44 +
 data/scripts/gUnk_0800FCEA.inc                |    3 +
 data/scripts/gUnk_0800FCEE.inc                |    3 +
 data/scripts/gUnk_0800FCF2.inc                |    2 +
 data/scripts/gUnk_0800FCF3.inc                |    2 +
 data/scripts/gUnk_0800FCF5.inc                |    2 +
 data/scripts/gUnk_0800FCF7.inc                |    2 +
 data/scripts/gUnk_0800FCF8.inc                |    2 +
 data/scripts/gUnk_0800FCFA.inc                |    2 +
 data/scripts/gUnk_0800FCFB.inc                |    2 +
 data/scripts/gUnk_0800FCFC.inc                |    2 +
 data/scripts/gUnk_0800FCFE.inc                |    2 +
 data/scripts/gUnk_0800FCFF.inc                |    2 +
 data/scripts/gUnk_0800FD00.inc                |    2 +
 data/scripts/gUnk_0800FD01.inc                |    4 +
 data/scripts/gUnk_0800FD04.inc                |    2 +
 data/scripts/gUnk_0800FD05.inc                |    8 +
 data/scripts/gUnk_0800FD0C.inc                |    4 +
 data/scripts/gUnk_0800FD16.inc                |   12 +
 data/scripts/gUnk_0800FD21.inc                |   96 +
 data/scripts/gUnk_0800FD80.inc                |    9 +
 data/scripts/gUnk_0800FDA0.inc                |   16 +
 data/scripts/gUnk_0800FDCC.inc                |   12 +
 data/scripts/gUnk_0800FDF2.inc                |    2 +
 data/scripts/gUnk_0800FDF3.inc                |    8 +
 data/scripts/gUnk_0800FDFA.inc                |    2 +
 data/scripts/gUnk_0800FDFC.inc                |    2 +
 data/scripts/gUnk_0800FDFE.inc                |    2 +
 data/scripts/gUnk_0800FDFF.inc                |    2 +
 data/scripts/gUnk_0800FE00.inc                |    2 +
 data/scripts/gUnk_0800FE01.inc                |    2 +
 data/scripts/gUnk_0800FE02.inc                |    2 +
 data/scripts/gUnk_0800FE04.inc                |    2 +
 data/scripts/gUnk_0800FE06.inc                |    2 +
 data/scripts/gUnk_0800FE07.inc                |    2 +
 data/scripts/gUnk_0800FE08.inc                |    2 +
 data/scripts/gUnk_0800FE09.inc                |   56 +
 data/scripts/gUnk_0800FE40.inc                |    3 +
 data/scripts/gUnk_0800FE44.inc                |   11 +
 data/scripts/gUnk_0800FE64.inc                |   12 +
 data/scripts/gUnk_0800FE88.inc                |   14 +
 data/scripts/gUnk_0800FEBC.inc                |   16 +
 data/scripts/gUnk_0800FEF0.inc                |    2 +
 data/scripts/gUnk_0800FEF2.inc                |    8 +
 data/scripts/gUnk_0800FEF9.inc                |    4 +
 data/scripts/gUnk_0800FEFC.inc                |    2 +
 data/scripts/gUnk_0800FEFE.inc                |    4 +
 data/scripts/gUnk_0800FF01.inc                |    2 +
 data/scripts/gUnk_0800FF03.inc                |    2 +
 data/scripts/gUnk_0800FF04.inc                |    2 +
 data/scripts/gUnk_0800FF05.inc                |    2 +
 data/scripts/gUnk_0800FF06.inc                |    2 +
 data/scripts/gUnk_0800FF08.inc                |    6 +
 data/scripts/gUnk_0800FF18.inc                |    7 +
 data/scripts/gUnk_0800FF2A.inc                |   38 +
 data/scripts/gUnk_0800FF74.inc                |   17 +
 data/scripts/gUnk_0800FFB0.inc                |    4 +
 data/scripts/gUnk_0800FFBB.inc                |   28 +
 data/scripts/gUnk_0800FFD6.inc                |   13 +
 data/scripts/gUnk_0800FFEE.inc                |    4 +
 data/scripts/gUnk_0800FFF6.inc                |    4 +
 data/scripts/gUnk_0800FFFC.inc                |    2 +
 data/scripts/gUnk_0800FFFD.inc                |    2 +
 data/scripts/gUnk_0800FFFF.inc                |    2 +
 data/scripts/gUnk_08010000.inc                |    2 +
 data/scripts/gUnk_08010001.inc                |    2 +
 data/scripts/gUnk_08010002.inc                |    2 +
 data/scripts/gUnk_08010003.inc                |    2 +
 data/scripts/gUnk_08010005.inc                |    2 +
 data/scripts/gUnk_08010007.inc                |    2 +
 data/scripts/gUnk_08010008.inc                |    2 +
 data/scripts/gUnk_08010009.inc                |    2 +
 data/scripts/gUnk_0801000A.inc                |    2 +
 data/scripts/gUnk_0801000C.inc                |    2 +
 data/scripts/gUnk_0801000D.inc                |    2 +
 data/scripts/gUnk_0801000E.inc                |    2 +
 data/scripts/gUnk_0801000F.inc                |   10 +
 data/scripts/gUnk_08010018.inc                |    4 +
 data/scripts/gUnk_0801001B.inc                |    2 +
 data/scripts/gUnk_0801001D.inc                |    4 +
 data/scripts/gUnk_08010023.inc                |   34 +
 data/scripts/gUnk_08010044.inc                |   27 +
 data/scripts/gUnk_08010098.inc                |    2 +
 data/scripts/gUnk_08010099.inc                |   21 +
 data/scripts/gUnk_080100C1.inc                |    8 +
 data/scripts/gUnk_080100C8.inc                |   14 +
 data/scripts/gUnk_080100F5.inc                |    8 +
 data/scripts/gUnk_080100FC.inc                |    2 +
 data/scripts/gUnk_080100FE.inc                |    2 +
 data/scripts/gUnk_080100FF.inc                |    2 +
 data/scripts/gUnk_08010100.inc                |    2 +
 data/scripts/gUnk_08010102.inc                |    2 +
 data/scripts/gUnk_08010103.inc                |    2 +
 data/scripts/gUnk_08010105.inc                |    2 +
 data/scripts/gUnk_08010106.inc                |    3 +
 data/scripts/gUnk_0801010A.inc                |    4 +
 data/scripts/gUnk_08010111.inc                |   16 +
 data/scripts/gUnk_08010120.inc                |    7 +
 data/scripts/gUnk_08010130.inc                |   11 +
 data/scripts/gUnk_08010148.inc                |   47 +
 data/scripts/gUnk_080101FA.inc                |    4 +
 data/scripts/gUnk_080101FD.inc                |    2 +
 data/scripts/gUnk_080101FF.inc                |    2 +
 data/scripts/gUnk_08010200.inc                |    4 +
 data/scripts/gUnk_08010203.inc                |    3 +
 data/scripts/gUnk_08010207.inc                |    2 +
 data/scripts/gUnk_08010208.inc                |    3 +
 data/scripts/gUnk_0801020C.inc                |   11 +
 data/scripts/gUnk_08010220.inc                |   12 +
 data/scripts/gUnk_08010236.inc                |   24 +
 data/scripts/gUnk_08010264.inc                |   17 +
 data/scripts/gUnk_08010294.inc                |   24 +
 data/scripts/gUnk_080102E0.inc                |   10 +
 data/scripts/gUnk_080102FB.inc                |    2 +
 data/scripts/gUnk_080102FD.inc                |    2 +
 data/scripts/gUnk_080102FE.inc                |    6 +
 data/scripts/gUnk_08010303.inc                |    2 +
 data/scripts/gUnk_08010304.inc                |    2 +
 data/scripts/gUnk_08010305.inc                |    6 +
 data/scripts/gUnk_0801030A.inc                |    2 +
 data/scripts/gUnk_0801030C.inc                |    8 +
 data/scripts/gUnk_08010320.inc                |   72 +
 data/scripts/gUnk_080103B0.inc                |   10 +
 data/scripts/gUnk_080103D0.inc                |   11 +
 data/scripts/gUnk_080103F8.inc                |    4 +
 data/scripts/gUnk_080103FD.inc                |    4 +
 data/scripts/gUnk_08010400.inc                |    3 +
 data/scripts/gUnk_08010406.inc                |    2 +
 data/scripts/gUnk_08010407.inc                |    4 +
 data/scripts/gUnk_0801040A.inc                |   16 +
 data/scripts/gUnk_08010428.inc                |   13 +
 data/scripts/gUnk_08010454.inc                |   15 +
 data/scripts/gUnk_08010480.inc                |   17 +
 data/scripts/gUnk_080104A0.inc                |   20 +
 data/scripts/gUnk_080104EC.inc                |   10 +
 data/scripts/gUnk_080104FF.inc                |    2 +
 data/scripts/gUnk_08010501.inc                |    2 +
 data/scripts/gUnk_08010502.inc                |    2 +
 data/scripts/gUnk_08010503.inc                |    8 +
 data/scripts/gUnk_0801050A.inc                |    2 +
 data/scripts/gUnk_0801050B.inc                |   28 +
 data/scripts/gUnk_08010526.inc                |  122 +
 data/scripts/gUnk_0801059F.inc                |   22 +
 data/scripts/gUnk_080105C9.inc                |   26 +
 data/scripts/gUnk_080105FB.inc                |    3 +
 data/scripts/gUnk_080105FF.inc                |    2 +
 data/scripts/gUnk_08010600.inc                |    5 +
 data/scripts/gUnk_0801060A.inc                |    3 +
 data/scripts/gUnk_0801060D.inc                |    6 +
 data/scripts/gUnk_08010617.inc                |    6 +
 data/scripts/gUnk_0801061C.inc                |   14 +
 data/scripts/gUnk_08010644.inc                |    5 +
 data/scripts/gUnk_08010650.inc                |   17 +
 data/scripts/gUnk_08010674.inc                |   25 +
 data/scripts/gUnk_080106AC.inc                |   36 +
 data/scripts/gUnk_08010700.inc                |    2 +
 data/scripts/gUnk_08010701.inc                |    3 +
 data/scripts/gUnk_08010705.inc                |   10 +
 data/scripts/gUnk_0801070E.inc                |   12 +
 data/scripts/gUnk_08010734.inc                |   31 +
 data/scripts/gUnk_08010794.inc                |   19 +
 data/scripts/gUnk_080107D0.inc                |   18 +
 data/scripts/gUnk_0801080A.inc                |    2 +
 data/scripts/gUnk_0801080B.inc                |    6 +
 data/scripts/gUnk_08010815.inc                |    4 +
 data/scripts/gUnk_0801081B.inc                |  182 +
 data/scripts/gUnk_080108D0.inc                |   12 +
 data/scripts/gUnk_080108FF.inc                |   14 +
 data/scripts/gUnk_0801090C.inc                |    3 +
 data/scripts/gUnk_0801090F.inc                |    5 +
 data/scripts/gUnk_08010917.inc                |   78 +
 data/scripts/gUnk_08010964.inc                |   16 +
 data/scripts/gUnk_080109A0.inc                |   22 +
 data/scripts/gUnk_080109F0.inc                |    4 +
 data/scripts/gUnk_080109F6.inc                |    9 +
 data/scripts/gUnk_08010A14.inc                |    7 +
 data/scripts/gUnk_08010A1F.inc                |   26 +
 data/scripts/gUnk_08010A38.inc                |   11 +
 data/scripts/gUnk_08010A5C.inc                |   18 +
 data/scripts/gUnk_08010A98.inc                |   19 +
 data/scripts/gUnk_08010AE4.inc                |   12 +
 data/scripts/gUnk_08010B04.inc                |   27 +
 data/scripts/gUnk_08010B68.inc                |   26 +
 data/scripts/gUnk_08010BB4.inc                |   18 +
 data/scripts/gUnk_08010BEC.inc                |    8 +
 data/scripts/gUnk_08010BF9.inc                |    6 +
 data/scripts/gUnk_08010BFE.inc                |   15 +
 data/scripts/gUnk_08010C1A.inc                |   53 +
 data/scripts/gUnk_08010D03.inc                |  254 ++
 data/scripts/gUnk_08010E00.inc                |   14 +
 data/scripts/gUnk_08010E0D.inc                |  244 ++
 data/scripts/gUnk_08010F00.inc                |  256 ++
 data/scripts/gUnk_08010FFF.inc                |    2 +
 data/scripts/gUnk_08011000.inc                |    2 +
 data/scripts/gUnk_08011001.inc                |   16 +
 data/scripts/gUnk_0801101F.inc                |   86 +
 data/scripts/gUnk_08011074.inc                |    6 +
 data/scripts/gUnk_08011083.inc                |   90 +
 data/scripts/gUnk_080110DC.inc                |    7 +
 data/scripts/gUnk_080110E8.inc                |   16 +
 data/scripts/gUnk_08011128.inc                |   36 +
 data/scripts/gUnk_080111CC.inc                |   15 +
 data/scripts/gUnk_08011208.inc                |   22 +
 data/scripts/gUnk_0801121D.inc                |  168 +
 data/scripts/gUnk_080112C4.inc                |   24 +
 data/scripts/gUnk_0801130F.inc                |   26 +
 data/scripts/gUnk_08011328.inc                |  119 +
 data/scripts/gUnk_08011403.inc                |  462 +++
 data/scripts/gUnk_080115D0.inc                |   15 +
 data/scripts/gUnk_08011608.inc                |   15 +
 data/scripts/gUnk_08011640.inc                |   25 +
 data/scripts/gUnk_080116A8.inc                |   74 +
 data/scripts/gUnk_08011809.inc                |   52 +
 data/scripts/gUnk_0801183C.inc                |   53 +
 data/scripts/gUnk_080118D4.inc                |   21 +
 data/scripts/gUnk_08011930.inc                |    5 +
 data/scripts/gUnk_08011940.inc                |    4 +
 data/scripts/gUnk_0801194C.inc                |    5 +
 data/scripts/gUnk_08011958.inc                |    5 +
 data/scripts/gUnk_08011964.inc                |   22 +
 data/scripts/gUnk_080119B0.inc                |   11 +
 data/scripts/gUnk_080119D8.inc                |    5 +
 data/scripts/gUnk_080119E4.inc                |    5 +
 data/scripts/gUnk_080119F0.inc                |    9 +
 data/scripts/gUnk_08011A04.inc                |   21 +
 data/scripts/gUnk_08011A2C.inc                |   17 +
 data/scripts/gUnk_08011A64.inc                |   47 +
 data/scripts/gUnk_08011AE4.inc                |    9 +
 data/scripts/gUnk_08011B04.inc                |   15 +
 data/scripts/gUnk_08011B20.inc                |   10 +
 data/scripts/gUnk_08011B40.inc                |   47 +
 data/scripts/gUnk_08011BE4.inc                |   11 +
 data/scripts/gUnk_08011C04.inc                |   22 +
 data/scripts/gUnk_08011C50.inc                |   13 +
 data/scripts/gUnk_08011C7C.inc                |   56 +
 data/scripts/gUnk_08011D28.inc                |   56 +
 data/scripts/gUnk_08011DD4.inc                |   17 +
 data/scripts/gUnk_08011E04.inc                |   63 +
 data/scripts/gUnk_08011E80.inc                |   45 +
 data/scripts/gUnk_08011F0C.inc                |   45 +
 data/scripts/gUnk_08011F98.inc                |   45 +
 data/scripts/gUnk_08012024.inc                |   34 +
 data/scripts/gUnk_08012091.inc                |   32 +
 data/scripts/gUnk_080120B0.inc                |   21 +
 data/scripts/gUnk_080120ED.inc                |    8 +
 data/scripts/gUnk_080120FB.inc                |   66 +
 data/scripts/gUnk_0801213C.inc                |   42 +
 data/scripts/gUnk_080121C8.inc                |   19 +
 data/scripts/gUnk_08012200.inc                |   19 +
 data/scripts/gUnk_08012238.inc                |   19 +
 data/scripts/gUnk_08012270.inc                |   57 +
 data/scripts/gUnk_0801232C.inc                |   20 +
 data/scripts/gUnk_08012360.inc                |   50 +
 data/scripts/gUnk_08012410.inc                |   10 +
 data/scripts/gUnk_08012430.inc                |   24 +
 data/scripts/gUnk_08012480.inc                |  132 +
 data/scripts/gUnk_08012AB0.inc                |  120 +
 data/scripts/gUnk_08012BA8.inc                |   20 +
 data/scripts/gUnk_08012BF8.inc                |    8 +
 data/scripts/gUnk_08012C0C.inc                |   31 +
 data/scripts/gUnk_08012C48.inc                |   34 +
 data/scripts/gUnk_08012C98.inc                |   19 +
 data/scripts/gUnk_08012CD8.inc                |   19 +
 data/scripts/gUnk_08012D18.inc                |   23 +
 data/scripts/gUnk_08012D70.inc                |   12 +
 data/scripts/gUnk_08012DA1.inc                |   16 +
 data/scripts/gUnk_08012DB0.inc                |   11 +
 data/scripts/gUnk_08012DD8.inc                |   31 +
 data/scripts/gUnk_08012E20.inc                |   11 +
 data/scripts/gUnk_08012E44.inc                |   19 +
 data/scripts/gUnk_08012E88.inc                |   18 +
 data/scripts/gUnk_08012EC0.inc                |   19 +
 data/scripts/gUnk_08012F0C.inc                |  155 +
 data/scripts/gUnk_08013001.inc                |    2 +
 data/scripts/gUnk_08013003.inc                |    5 +
 data/scripts/gUnk_0801300B.inc                |   50 +
 data/scripts/gUnk_0801303C.inc                |   27 +
 data/scripts/gUnk_08013070.inc                |    9 +
 data/scripts/gUnk_08013081.inc                |   16 +
 data/scripts/gUnk_08013090.inc                |   36 +
 data/scripts/gUnk_08013114.inc                |   31 +
 data/scripts/gUnk_08013188.inc                |   16 +
 data/scripts/gUnk_080131AC.inc                |   71 +
 data/scripts/gUnk_080132E4.inc                |   29 +
 data/scripts/gUnk_08013330.inc                |    8 +
 data/scripts/gUnk_0801334C.inc                |   13 +
 data/scripts/gUnk_08013378.inc                |   16 +
 data/scripts/gUnk_080133C4.inc                |   14 +
 data/scripts/gUnk_080133F8.inc                |   70 +
 data/scripts/gUnk_080134DC.inc                |  112 +
 data/scripts/gUnk_080136D8.inc                |   34 +
 data/scripts/gUnk_08013720.inc                |   39 +
 data/scripts/gUnk_080137DA.inc                |  110 +
 data/scripts/gUnk_080138B4.inc                |  118 +
 data/scripts/gUnk_08013B18.inc                |   23 +
 data/scripts/gUnk_08013B70.inc                |   12 +
 data/scripts/gUnk_08013BA8.inc                |   12 +
 data/scripts/gUnk_08013BE8.inc                |   51 +
 data/scripts/gUnk_08013CA4.inc                |  152 +
 data/scripts/gUnk_08013E04.inc                |   29 +
 data/scripts/gUnk_08013E4C.inc                |   11 +
 data/scripts/gUnk_08013E70.inc                |   11 +
 data/scripts/gUnk_08013E94.inc                |    9 +
 data/scripts/gUnk_08013EB0.inc                |    9 +
 data/scripts/gUnk_08013ECC.inc                |    9 +
 data/scripts/gUnk_08013EE8.inc                |    9 +
 data/scripts/gUnk_08013F04.inc                |   13 +
 data/scripts/gUnk_08013F34.inc                |   13 +
 data/scripts/gUnk_08013F64.inc                |   13 +
 data/scripts/gUnk_08013F94.inc                |   25 +
 data/scripts/gUnk_08013FE8.inc                |   30 +
 data/scripts/gUnk_08014054.inc                |   10 +
 data/scripts/gUnk_08014074.inc                |   10 +
 data/scripts/gUnk_08014094.inc                |   28 +
 data/scripts/gUnk_080140DC.inc                |   10 +
 data/scripts/gUnk_080140F8.inc                |    8 +
 data/scripts/gUnk_08014118.inc                |   15 +
 data/scripts/gUnk_08014154.inc                |   51 +
 data/scripts/gUnk_080141DC.inc                |   13 +
 data/scripts/gUnk_08014210.inc                |   35 +
 data/scripts/gUnk_08014274.inc                |   18 +
 data/scripts/gUnk_080142B0.inc                |   60 +
 data/scripts/gUnk_08014384.inc                |   21 +
 data/scripts/gUnk_080143C0.inc                |   17 +
 data/scripts/gUnk_08014402.inc                |   40 +
 data/scripts/gUnk_08014450.inc                |   74 +
 data/scripts/gUnk_0801450C.inc                |   17 +
 data/scripts/gUnk_08014548.inc                |   30 +
 data/scripts/gUnk_080145A0.inc                |    9 +
 data/scripts/gUnk_080145B0.inc                |   18 +
 data/scripts/gUnk_080145E8.inc                |   18 +
 data/scripts/gUnk_08014628.inc                |  131 +
 data/scripts/gUnk_08014804.inc                |   60 +
 data/scripts/gUnk_080148F0.inc                |   28 +
 data/scripts/gUnk_08014958.inc                |   19 +
 data/scripts/gUnk_08014994.inc                |   18 +
 data/scripts/gUnk_080149CC.inc                |   27 +
 data/scripts/gUnk_08014A28.inc                |   15 +
 data/scripts/gUnk_08014A54.inc                |   15 +
 data/scripts/gUnk_08014A80.inc                |   21 +
 data/scripts/gUnk_08014AC4.inc                |   41 +
 data/scripts/gUnk_08014B34.inc                |   66 +
 data/scripts/gUnk_08014C2C.inc                |   31 +
 data/scripts/gUnk_08014C94.inc                |   24 +
 data/scripts/gUnk_08014CDC.inc                |   57 +
 data/scripts/gUnk_08014DCC.inc                |   20 +
 data/scripts/gUnk_08014E14.inc                |   17 +
 data/scripts/gUnk_08014E50.inc                |   32 +
 data/scripts/gUnk_08014ECC.inc                |   16 +
 data/scripts/gUnk_08014EF8.inc                |   19 +
 data/scripts/gUnk_08014F30.inc                |   40 +
 data/scripts/gUnk_08014FBC.inc                |   17 +
 data/scripts/gUnk_08015001.inc                |   68 +
 data/scripts/gUnk_08015087.inc                |   53 +
 data/scripts/gUnk_080150EF.inc                |  326 ++
 data/scripts/gUnk_08015234.inc                |   30 +
 data/scripts/gUnk_080152B4.inc                |  101 +
 data/scripts/gUnk_08015390.inc                |   23 +
 data/scripts/gUnk_080153EC.inc                |   61 +
 data/scripts/gUnk_0801550C.inc                |   62 +
 data/scripts/gUnk_08015618.inc                |   22 +
 data/scripts/gUnk_08015684.inc                |    9 +
 data/scripts/gUnk_080156A0.inc                |   91 +
 data/scripts/gUnk_08015754.inc                |   20 +
 data/scripts/gUnk_080157AC.inc                |   70 +
 data/scripts/gUnk_080158F8.inc                |   24 +
 data/scripts/gUnk_08015938.inc                |    8 +
 data/scripts/gUnk_08015958.inc                |  107 +
 data/scripts/gUnk_08015AC4.inc                |   21 +
 data/scripts/gUnk_08015B14.inc                |   10 +
 data/scripts/gUnk_08015B34.inc                |   20 +
 data/scripts/gUnk_08015B84.inc                |   10 +
 data/scripts/gUnk_08015BA8.inc                |   21 +
 data/scripts/gUnk_08015BE8.inc                |   83 +
 data/scripts/gUnk_08015CD4.inc                |   67 +
 data/scripts/gUnk_08015DF0.inc                |   26 +
 data/scripts/gUnk_08015E58.inc                |   40 +
 data/scripts/gUnk_08015F08.inc                |   14 +
 data/scripts/gUnk_08015F3C.inc                |   36 +
 data/scripts/gUnk_08015FA4.inc                |    9 +
 data/scripts/gUnk_08015FC0.inc                |   25 +
 data/scripts/gUnk_08016021.inc                |   16 +
 data/scripts/gUnk_0801606C.inc                |   19 +
 data/scripts/gUnk_080160A8.inc                |   22 +
 data/scripts/gUnk_080160EA.inc                |   42 +
 data/scripts/gUnk_0801613C.inc                |   39 +
 data/scripts/gUnk_08016190.inc                |   41 +
 data/scripts/gUnk_080161E8.inc                |   91 +
 data/scripts/gUnk_0801635C.inc                |    9 +
 data/scripts/gUnk_0801637D.inc                |    8 +
 data/scripts/gUnk_08016384.inc                |   64 +
 data/scripts/gUnk_08016408.inc                |  242 ++
 data/scripts/gUnk_080165F8.inc                |    9 +
 data/scripts/gUnk_0801660C.inc                |   12 +
 data/scripts/gUnk_08016628.inc                |   12 +
 data/scripts/gUnk_08016644.inc                |   12 +
 data/scripts/gUnk_0801666C.inc                |   15 +
 data/scripts/gUnk_080166B8.inc                |   16 +
 data/scripts/gUnk_080166FC.inc                |   38 +
 data/scripts/gUnk_08016798.inc                |   40 +
 data/scripts/gUnk_08016844.inc                |   38 +
 data/scripts/gUnk_080168E0.inc                |   10 +
 data/scripts/gUnk_080168F4.inc                |   55 +
 src/code_080A29BC.c                           |    2 +-
 src/npc/carpenter.c                           |    2 +-
 src/npc/librari.c                             |    2 +-
 .../script_disassembler.py                    |    9 +-
 1072 files changed, 25621 insertions(+), 2152 deletions(-)
 create mode 100644 data/scripts/gUnk_08008B5C.inc
 create mode 100644 data/scripts/gUnk_08008B90.inc
 create mode 100644 data/scripts/gUnk_08008BC0.inc
 create mode 100644 data/scripts/gUnk_08008C4E.inc
 create mode 100644 data/scripts/gUnk_08008C64.inc
 create mode 100644 data/scripts/gUnk_08008C6D.inc
 create mode 100644 data/scripts/gUnk_08008C7E.inc
 create mode 100644 data/scripts/gUnk_08008CB9.inc
 create mode 100644 data/scripts/gUnk_08008D50.inc
 create mode 100644 data/scripts/gUnk_08008D8C.inc
 create mode 100644 data/scripts/gUnk_08008DC0.inc
 create mode 100644 data/scripts/gUnk_08008E08.inc
 create mode 100644 data/scripts/gUnk_08008E0A.inc
 create mode 100644 data/scripts/gUnk_08008F0C.inc
 create mode 100644 data/scripts/gUnk_08008F16.inc
 create mode 100644 data/scripts/gUnk_08008F26.inc
 create mode 100644 data/scripts/gUnk_08008F90.inc
 create mode 100644 data/scripts/gUnk_08008FC0.inc
 create mode 100644 data/scripts/gUnk_08008FD1.inc
 create mode 100644 data/scripts/gUnk_08008FFC.inc
 create mode 100644 data/scripts/gUnk_08009008.inc
 create mode 100644 data/scripts/gUnk_0800901F.inc
 create mode 100644 data/scripts/gUnk_0800903C.inc
 create mode 100644 data/scripts/gUnk_08009080.inc
 create mode 100644 data/scripts/gUnk_080090DB.inc
 create mode 100644 data/scripts/gUnk_08009198.inc
 create mode 100644 data/scripts/gUnk_08009207.inc
 create mode 100644 data/scripts/gUnk_08009274.inc
 create mode 100644 data/scripts/gUnk_080092A8.inc
 create mode 100644 data/scripts/gUnk_080092D4.inc
 create mode 100644 data/scripts/gUnk_080092F0.inc
 create mode 100644 data/scripts/gUnk_08009308.inc
 create mode 100644 data/scripts/gUnk_08009318.inc
 create mode 100644 data/scripts/gUnk_08009320.inc
 create mode 100644 data/scripts/gUnk_08009340.inc
 create mode 100644 data/scripts/gUnk_08009348.inc
 create mode 100644 data/scripts/gUnk_08009393.inc
 create mode 100644 data/scripts/gUnk_080093D7.inc
 create mode 100644 data/scripts/gUnk_08009407.inc
 create mode 100644 data/scripts/gUnk_08009486.inc
 create mode 100644 data/scripts/gUnk_080094A4.inc
 create mode 100644 data/scripts/gUnk_080094CC.inc
 create mode 100644 data/scripts/gUnk_080094D7.inc
 create mode 100644 data/scripts/gUnk_080094FC.inc
 create mode 100644 data/scripts/gUnk_08009503.inc
 create mode 100644 data/scripts/gUnk_08009508.inc
 create mode 100644 data/scripts/gUnk_08009538.inc
 create mode 100644 data/scripts/gUnk_08009574.inc
 create mode 100644 data/scripts/gUnk_080095CC.inc
 create mode 100644 data/scripts/gUnk_0800962C.inc
 create mode 100644 data/scripts/gUnk_08009698.inc
 create mode 100644 data/scripts/gUnk_08009704.inc
 create mode 100644 data/scripts/gUnk_08009706.inc
 create mode 100644 data/scripts/gUnk_08009740.inc
 create mode 100644 data/scripts/gUnk_08009778.inc
 create mode 100644 data/scripts/gUnk_08009786.inc
 create mode 100644 data/scripts/gUnk_080097A1.inc
 create mode 100644 data/scripts/gUnk_080097F0.inc
 create mode 100644 data/scripts/gUnk_08009838.inc
 create mode 100644 data/scripts/gUnk_080098D4.inc
 create mode 100644 data/scripts/gUnk_08009918.inc
 create mode 100644 data/scripts/gUnk_08009940.inc
 create mode 100644 data/scripts/gUnk_08009950.inc
 create mode 100644 data/scripts/gUnk_080099DC.inc
 create mode 100644 data/scripts/gUnk_08009A04.inc
 create mode 100644 data/scripts/gUnk_08009A07.inc
 create mode 100644 data/scripts/gUnk_08009A2C.inc
 create mode 100644 data/scripts/gUnk_08009A34.inc
 create mode 100644 data/scripts/gUnk_08009A50.inc
 create mode 100644 data/scripts/gUnk_08009A77.inc
 create mode 100644 data/scripts/gUnk_08009A81.inc
 create mode 100644 data/scripts/gUnk_08009A84.inc
 create mode 100644 data/scripts/gUnk_08009ABB.inc
 create mode 100644 data/scripts/gUnk_08009AF8.inc
 create mode 100644 data/scripts/gUnk_08009B30.inc
 create mode 100644 data/scripts/gUnk_08009B63.inc
 create mode 100644 data/scripts/gUnk_08009B78.inc
 create mode 100644 data/scripts/gUnk_08009C68.inc
 create mode 100644 data/scripts/gUnk_08009C7F.inc
 create mode 100644 data/scripts/gUnk_08009C9E.inc
 create mode 100644 data/scripts/gUnk_08009D00.inc
 create mode 100644 data/scripts/gUnk_08009D6C.inc
 create mode 100644 data/scripts/gUnk_08009D77.inc
 create mode 100644 data/scripts/gUnk_08009DB0.inc
 create mode 100644 data/scripts/gUnk_08009DEC.inc
 create mode 100644 data/scripts/gUnk_08009E38.inc
 create mode 100644 data/scripts/gUnk_08009E58.inc
 create mode 100644 data/scripts/gUnk_08009E88.inc
 create mode 100644 data/scripts/gUnk_08009E9E.inc
 create mode 100644 data/scripts/gUnk_08009EA9.inc
 create mode 100644 data/scripts/gUnk_08009EB7.inc
 create mode 100644 data/scripts/gUnk_08009ECC.inc
 create mode 100644 data/scripts/gUnk_08009EF0.inc
 create mode 100644 data/scripts/gUnk_08009F07.inc
 create mode 100644 data/scripts/gUnk_08009F14.inc
 create mode 100644 data/scripts/gUnk_08009F39.inc
 create mode 100644 data/scripts/gUnk_08009F72.inc
 create mode 100644 data/scripts/gUnk_0800A064.inc
 create mode 100644 data/scripts/gUnk_0800A081.inc
 create mode 100644 data/scripts/gUnk_0800A0B4.inc
 create mode 100644 data/scripts/gUnk_0800A0FC.inc
 create mode 100644 data/scripts/gUnk_0800A10A.inc
 create mode 100644 data/scripts/gUnk_0800A10F.inc
 create mode 100644 data/scripts/gUnk_0800A124.inc
 create mode 100644 data/scripts/gUnk_0800A134.inc
 create mode 100644 data/scripts/gUnk_0800A1B4.inc
 create mode 100644 data/scripts/gUnk_0800A1D8.inc
 create mode 100644 data/scripts/gUnk_0800A224.inc
 create mode 100644 data/scripts/gUnk_0800A260.inc
 create mode 100644 data/scripts/gUnk_0800A340.inc
 create mode 100644 data/scripts/gUnk_0800A3A3.inc
 create mode 100644 data/scripts/gUnk_0800A3A9.inc
 create mode 100644 data/scripts/gUnk_0800A3AA.inc
 create mode 100644 data/scripts/gUnk_0800A3D8.inc
 create mode 100644 data/scripts/gUnk_0800A500.inc
 create mode 100644 data/scripts/gUnk_0800A590.inc
 create mode 100644 data/scripts/gUnk_0800A5A6.inc
 create mode 100644 data/scripts/gUnk_0800A65C.inc
 create mode 100644 data/scripts/gUnk_0800A67E.inc
 create mode 100644 data/scripts/gUnk_0800A680.inc
 create mode 100644 data/scripts/gUnk_0800A6A4.inc
 create mode 100644 data/scripts/gUnk_0800A6AB.inc
 create mode 100644 data/scripts/gUnk_0800A6D4.inc
 create mode 100644 data/scripts/gUnk_0800A704.inc
 create mode 100644 data/scripts/gUnk_0800A734.inc
 create mode 100644 data/scripts/gUnk_0800A74A.inc
 create mode 100644 data/scripts/gUnk_0800A764.inc
 create mode 100644 data/scripts/gUnk_0800A7E4.inc
 create mode 100644 data/scripts/gUnk_0800A7E8.inc
 create mode 100644 data/scripts/gUnk_0800A816.inc
 create mode 100644 data/scripts/gUnk_0800A820.inc
 create mode 100644 data/scripts/gUnk_0800A85C.inc
 create mode 100644 data/scripts/gUnk_0800A898.inc
 create mode 100644 data/scripts/gUnk_0800A908.inc
 create mode 100644 data/scripts/gUnk_0800A910.inc
 create mode 100644 data/scripts/gUnk_0800A964.inc
 create mode 100644 data/scripts/gUnk_0800A988.inc
 create mode 100644 data/scripts/gUnk_0800A9AC.inc
 create mode 100644 data/scripts/gUnk_0800A9D0.inc
 create mode 100644 data/scripts/gUnk_0800A9F4.inc
 create mode 100644 data/scripts/gUnk_0800AA03.inc
 create mode 100644 data/scripts/gUnk_0800AA48.inc
 create mode 100644 data/scripts/gUnk_0800AA6C.inc
 create mode 100644 data/scripts/gUnk_0800AA90.inc
 create mode 100644 data/scripts/gUnk_0800AAB4.inc
 create mode 100644 data/scripts/gUnk_0800AAD8.inc
 create mode 100644 data/scripts/gUnk_0800AB08.inc
 create mode 100644 data/scripts/gUnk_0800AB23.inc
 create mode 100644 data/scripts/gUnk_0800AB4F.inc
 create mode 100644 data/scripts/gUnk_0800ABF0.inc
 create mode 100644 data/scripts/gUnk_0800AC24.inc
 create mode 100644 data/scripts/gUnk_0800AC6D.inc
 create mode 100644 data/scripts/gUnk_0800ACB5.inc
 create mode 100644 data/scripts/gUnk_0800ACBC.inc
 create mode 100644 data/scripts/gUnk_0800ACE0.inc
 create mode 100644 data/scripts/gUnk_0800AD54.inc
 create mode 100644 data/scripts/gUnk_0800AD74.inc
 create mode 100644 data/scripts/gUnk_0800ADA7.inc
 create mode 100644 data/scripts/gUnk_0800ADB4.inc
 create mode 100644 data/scripts/gUnk_0800AEA4.inc
 create mode 100644 data/scripts/gUnk_0800AEDC.inc
 create mode 100644 data/scripts/gUnk_0800AF18.inc
 create mode 100644 data/scripts/gUnk_0800AF44.inc
 create mode 100644 data/scripts/gUnk_0800AF68.inc
 create mode 100644 data/scripts/gUnk_0800AF7E.inc
 create mode 100644 data/scripts/gUnk_0800AF8C.inc
 create mode 100644 data/scripts/gUnk_0800AFA7.inc
 create mode 100644 data/scripts/gUnk_0800AFB0.inc
 create mode 100644 data/scripts/gUnk_0800AFE8.inc
 create mode 100644 data/scripts/gUnk_0800B00C.inc
 create mode 100644 data/scripts/gUnk_0800B0AC.inc
 create mode 100644 data/scripts/gUnk_0800B0B0.inc
 create mode 100644 data/scripts/gUnk_0800B0D0.inc
 create mode 100644 data/scripts/gUnk_0800B177.inc
 create mode 100644 data/scripts/gUnk_0800B17C.inc
 create mode 100644 data/scripts/gUnk_0800B1C0.inc
 create mode 100644 data/scripts/gUnk_0800B200.inc
 create mode 100644 data/scripts/gUnk_0800B254.inc
 create mode 100644 data/scripts/gUnk_0800B284.inc
 create mode 100644 data/scripts/gUnk_0800B2B4.inc
 create mode 100644 data/scripts/gUnk_0800B308.inc
 create mode 100644 data/scripts/gUnk_0800B322.inc
 create mode 100644 data/scripts/gUnk_0800B329.inc
 create mode 100644 data/scripts/gUnk_0800B348.inc
 create mode 100644 data/scripts/gUnk_0800B35C.inc
 create mode 100644 data/scripts/gUnk_0800B374.inc
 create mode 100644 data/scripts/gUnk_0800B3A4.inc
 create mode 100644 data/scripts/gUnk_0800B40F.inc
 create mode 100644 data/scripts/gUnk_0800B41C.inc
 create mode 100644 data/scripts/gUnk_0800B4AC.inc
 create mode 100644 data/scripts/gUnk_0800B508.inc
 create mode 100644 data/scripts/gUnk_0800B50F.inc
 create mode 100644 data/scripts/gUnk_0800B54C.inc
 create mode 100644 data/scripts/gUnk_0800B574.inc
 create mode 100644 data/scripts/gUnk_0800B5C4.inc
 create mode 100644 data/scripts/gUnk_0800B5EC.inc
 create mode 100644 data/scripts/gUnk_0800B614.inc
 create mode 100644 data/scripts/gUnk_0800B6C8.inc
 create mode 100644 data/scripts/gUnk_0800B708.inc
 create mode 100644 data/scripts/gUnk_0800B71F.inc
 create mode 100644 data/scripts/gUnk_0800B730.inc
 create mode 100644 data/scripts/gUnk_0800B7C4.inc
 create mode 100644 data/scripts/gUnk_0800B84F.inc
 create mode 100644 data/scripts/gUnk_0800B861.inc
 create mode 100644 data/scripts/gUnk_0800B888.inc
 create mode 100644 data/scripts/gUnk_0800B8A0.inc
 create mode 100644 data/scripts/gUnk_0800B8B8.inc
 create mode 100644 data/scripts/gUnk_0800B8E4.inc
 create mode 100644 data/scripts/gUnk_0800B906.inc
 create mode 100644 data/scripts/gUnk_0800B91C.inc
 create mode 100644 data/scripts/gUnk_0800B964.inc
 create mode 100644 data/scripts/gUnk_0800B9B4.inc
 create mode 100644 data/scripts/gUnk_0800BA3C.inc
 create mode 100644 data/scripts/gUnk_0800BA78.inc
 create mode 100644 data/scripts/gUnk_0800BACC.inc
 create mode 100644 data/scripts/gUnk_0800BB00.inc
 create mode 100644 data/scripts/gUnk_0800BB08.inc
 create mode 100644 data/scripts/gUnk_0800BB1A.inc
 create mode 100644 data/scripts/gUnk_0800BB30.inc
 create mode 100644 data/scripts/gUnk_0800BB64.inc
 create mode 100644 data/scripts/gUnk_0800BB74.inc
 create mode 100644 data/scripts/gUnk_0800BBA4.inc
 create mode 100644 data/scripts/gUnk_0800BBDB.inc
 create mode 100644 data/scripts/gUnk_0800BBDC.inc
 create mode 100644 data/scripts/gUnk_0800BC08.inc
 create mode 100644 data/scripts/gUnk_0800BC22.inc
 create mode 100644 data/scripts/gUnk_0800BC50.inc
 create mode 100644 data/scripts/gUnk_0800BCAE.inc
 create mode 100644 data/scripts/gUnk_0800BCB7.inc
 create mode 100644 data/scripts/gUnk_0800BCBE.inc
 create mode 100644 data/scripts/gUnk_0800BCE8.inc
 create mode 100644 data/scripts/gUnk_0800BD08.inc
 create mode 100644 data/scripts/gUnk_0800BD70.inc
 create mode 100644 data/scripts/gUnk_0800BD78.inc
 create mode 100644 data/scripts/gUnk_0800BDAC.inc
 create mode 100644 data/scripts/gUnk_0800BDC4.inc
 create mode 100644 data/scripts/gUnk_0800BE1C.inc
 create mode 100644 data/scripts/gUnk_0800BE54.inc
 create mode 100644 data/scripts/gUnk_0800BECC.inc
 create mode 100644 data/scripts/gUnk_0800BF14.inc
 create mode 100644 data/scripts/gUnk_0800BF38.inc
 create mode 100644 data/scripts/gUnk_0800BF4A.inc
 create mode 100644 data/scripts/gUnk_0800BF70.inc
 create mode 100644 data/scripts/gUnk_0800BFBF.inc
 create mode 100644 data/scripts/gUnk_0800BFE1.inc
 create mode 100644 data/scripts/gUnk_0800BFE3.inc
 create mode 100644 data/scripts/gUnk_0800C004.inc
 create mode 100644 data/scripts/gUnk_0800C007.inc
 create mode 100644 data/scripts/gUnk_0800C024.inc
 create mode 100644 data/scripts/gUnk_0800C07B.inc
 create mode 100644 data/scripts/gUnk_0800C0B0.inc
 create mode 100644 data/scripts/gUnk_0800C0C7.inc
 create mode 100644 data/scripts/gUnk_0800C0D3.inc
 create mode 100644 data/scripts/gUnk_0800C0E8.inc
 create mode 100644 data/scripts/gUnk_0800C113.inc
 create mode 100644 data/scripts/gUnk_0800C147.inc
 create mode 100644 data/scripts/gUnk_0800C160.inc
 create mode 100644 data/scripts/gUnk_0800C1D8.inc
 create mode 100644 data/scripts/gUnk_0800C204.inc
 create mode 100644 data/scripts/gUnk_0800C207.inc
 create mode 100644 data/scripts/gUnk_0800C208.inc
 create mode 100644 data/scripts/gUnk_0800C210.inc
 create mode 100644 data/scripts/gUnk_0800C263.inc
 create mode 100644 data/scripts/gUnk_0800C2A4.inc
 create mode 100644 data/scripts/gUnk_0800C2A7.inc
 create mode 100644 data/scripts/gUnk_0800C2CE.inc
 create mode 100644 data/scripts/gUnk_0800C350.inc
 create mode 100644 data/scripts/gUnk_0800C396.inc
 create mode 100644 data/scripts/gUnk_0800C3CC.inc
 create mode 100644 data/scripts/gUnk_0800C408.inc
 create mode 100644 data/scripts/gUnk_0800C410.inc
 create mode 100644 data/scripts/gUnk_0800C45C.inc
 create mode 100644 data/scripts/gUnk_0800C494.inc
 create mode 100644 data/scripts/gUnk_0800C4D0.inc
 create mode 100644 data/scripts/gUnk_0800C4DB.inc
 create mode 100644 data/scripts/gUnk_0800C50C.inc
 create mode 100644 data/scripts/gUnk_0800C521.inc
 create mode 100644 data/scripts/gUnk_0800C550.inc
 create mode 100644 data/scripts/gUnk_0800C556.inc
 create mode 100644 data/scripts/gUnk_0800C584.inc
 create mode 100644 data/scripts/gUnk_0800C59A.inc
 create mode 100644 data/scripts/gUnk_0800C5C8.inc
 create mode 100644 data/scripts/gUnk_0800C5FC.inc
 create mode 100644 data/scripts/gUnk_0800C600.inc
 create mode 100644 data/scripts/gUnk_0800C607.inc
 create mode 100644 data/scripts/gUnk_0800C634.inc
 create mode 100644 data/scripts/gUnk_0800C6C6.inc
 create mode 100644 data/scripts/gUnk_0800C774.inc
 create mode 100644 data/scripts/gUnk_0800C779.inc
 create mode 100644 data/scripts/gUnk_0800C808.inc
 create mode 100644 data/scripts/gUnk_0800C861.inc
 create mode 100644 data/scripts/gUnk_0800C8B0.inc
 create mode 100644 data/scripts/gUnk_0800C8DA.inc
 create mode 100644 data/scripts/gUnk_0800C8F0.inc
 create mode 100644 data/scripts/gUnk_0800C91C.inc
 create mode 100644 data/scripts/gUnk_0800C931.inc
 create mode 100644 data/scripts/gUnk_0800C963.inc
 create mode 100644 data/scripts/gUnk_0800CA08.inc
 create mode 100644 data/scripts/gUnk_0800CA8C.inc
 create mode 100644 data/scripts/gUnk_0800CAAA.inc
 create mode 100644 data/scripts/gUnk_0800CABC.inc
 create mode 100644 data/scripts/gUnk_0800CB07.inc
 create mode 100644 data/scripts/gUnk_0800CB54.inc
 create mode 100644 data/scripts/gUnk_0800CBA3.inc
 create mode 100644 data/scripts/gUnk_0800CBD4.inc
 create mode 100644 data/scripts/gUnk_0800CC08.inc
 create mode 100644 data/scripts/gUnk_0800CC0D.inc
 create mode 100644 data/scripts/gUnk_0800CC42.inc
 create mode 100644 data/scripts/gUnk_0800CC6C.inc
 create mode 100644 data/scripts/gUnk_0800CCCD.inc
 create mode 100644 data/scripts/gUnk_0800CCDD.inc
 create mode 100644 data/scripts/gUnk_0800CD04.inc
 create mode 100644 data/scripts/gUnk_0800CD08.inc
 create mode 100644 data/scripts/gUnk_0800CD67.inc
 create mode 100644 data/scripts/gUnk_0800CD7C.inc
 create mode 100644 data/scripts/gUnk_0800CE07.inc
 create mode 100644 data/scripts/gUnk_0800CF04.inc
 create mode 100644 data/scripts/gUnk_0800CF16.inc
 create mode 100644 data/scripts/gUnk_0800CF4B.inc
 create mode 100644 data/scripts/gUnk_0800CF50.inc
 create mode 100644 data/scripts/gUnk_0800CF7B.inc
 create mode 100644 data/scripts/gUnk_0800CF88.inc
 create mode 100644 data/scripts/gUnk_0800CF95.inc
 create mode 100644 data/scripts/gUnk_0800CFA9.inc
 create mode 100644 data/scripts/gUnk_0800CFAC.inc
 create mode 100644 data/scripts/gUnk_0800D011.inc
 create mode 100644 data/scripts/gUnk_0800D05F.inc
 create mode 100644 data/scripts/gUnk_0800D0CE.inc
 create mode 100644 data/scripts/gUnk_0800D127.inc
 create mode 100644 data/scripts/gUnk_0800D190.inc
 create mode 100644 data/scripts/gUnk_0800D1B4.inc
 create mode 100644 data/scripts/gUnk_0800D1C4.inc
 create mode 100644 data/scripts/gUnk_0800D1D4.inc
 create mode 100644 data/scripts/gUnk_0800D1E0.inc
 create mode 100644 data/scripts/gUnk_0800D207.inc
 create mode 100644 data/scripts/gUnk_0800D218.inc
 create mode 100644 data/scripts/gUnk_0800D254.inc
 create mode 100644 data/scripts/gUnk_0800D278.inc
 create mode 100644 data/scripts/gUnk_0800D2CE.inc
 create mode 100644 data/scripts/gUnk_0800D306.inc
 create mode 100644 data/scripts/gUnk_0800D308.inc
 create mode 100644 data/scripts/gUnk_0800D30F.inc
 create mode 100644 data/scripts/gUnk_0800D350.inc
 create mode 100644 data/scripts/gUnk_0800D3EC.inc
 create mode 100644 data/scripts/gUnk_0800D414.inc
 create mode 100644 data/scripts/gUnk_0800D44C.inc
 create mode 100644 data/scripts/gUnk_0800D4BF.inc
 create mode 100644 data/scripts/gUnk_0800D4DC.inc
 create mode 100644 data/scripts/gUnk_0800D59C.inc
 create mode 100644 data/scripts/gUnk_0800D5E5.inc
 create mode 100644 data/scripts/gUnk_0800D60C.inc
 create mode 100644 data/scripts/gUnk_0800D62B.inc
 create mode 100644 data/scripts/gUnk_0800D6B4.inc
 create mode 100644 data/scripts/gUnk_0800D6BA.inc
 create mode 100644 data/scripts/gUnk_0800D6D0.inc
 create mode 100644 data/scripts/gUnk_0800D6F0.inc
 create mode 100644 data/scripts/gUnk_0800D702.inc
 create mode 100644 data/scripts/gUnk_0800D703.inc
 create mode 100644 data/scripts/gUnk_0800D710.inc
 create mode 100644 data/scripts/gUnk_0800D725.inc
 create mode 100644 data/scripts/gUnk_0800D728.inc
 create mode 100644 data/scripts/gUnk_0800D76C.inc
 create mode 100644 data/scripts/gUnk_0800D7CF.inc
 create mode 100644 data/scripts/gUnk_0800D7DC.inc
 create mode 100644 data/scripts/gUnk_0800D874.inc
 create mode 100644 data/scripts/gUnk_0800D8E4.inc
 create mode 100644 data/scripts/gUnk_0800D906.inc
 create mode 100644 data/scripts/gUnk_0800D954.inc
 create mode 100644 data/scripts/gUnk_0800D97D.inc
 create mode 100644 data/scripts/gUnk_0800D981.inc
 create mode 100644 data/scripts/gUnk_0800DA11.inc
 create mode 100644 data/scripts/gUnk_0800DA28.inc
 create mode 100644 data/scripts/gUnk_0800DA4C.inc
 create mode 100644 data/scripts/gUnk_0800DA4D.inc
 create mode 100644 data/scripts/gUnk_0800DA60.inc
 create mode 100644 data/scripts/gUnk_0800DB0E.inc
 create mode 100644 data/scripts/gUnk_0800DB18.inc
 create mode 100644 data/scripts/gUnk_0800DB28.inc
 create mode 100644 data/scripts/gUnk_0800DB4A.inc
 create mode 100644 data/scripts/gUnk_0800DB78.inc
 create mode 100644 data/scripts/gUnk_0800DB88.inc
 create mode 100644 data/scripts/gUnk_0800DC10.inc
 create mode 100644 data/scripts/gUnk_0800DC19.inc
 create mode 100644 data/scripts/gUnk_0800DC91.inc
 create mode 100644 data/scripts/gUnk_0800DCAC.inc
 create mode 100644 data/scripts/gUnk_0800DCDC.inc
 create mode 100644 data/scripts/gUnk_0800DD04.inc
 create mode 100644 data/scripts/gUnk_0800DD10.inc
 create mode 100644 data/scripts/gUnk_0800DD19.inc
 create mode 100644 data/scripts/gUnk_0800DD22.inc
 create mode 100644 data/scripts/gUnk_0800DD8D.inc
 create mode 100644 data/scripts/gUnk_0800DDAA.inc
 create mode 100644 data/scripts/gUnk_0800DDE8.inc
 create mode 100644 data/scripts/gUnk_0800DDFC.inc
 create mode 100644 data/scripts/gUnk_0800DE00.inc
 create mode 100644 data/scripts/gUnk_0800DE78.inc
 create mode 100644 data/scripts/gUnk_0800DEB0.inc
 create mode 100644 data/scripts/gUnk_0800DED4.inc
 create mode 100644 data/scripts/gUnk_0800DEF6.inc
 create mode 100644 data/scripts/gUnk_0800DF07.inc
 create mode 100644 data/scripts/gUnk_0800DF24.inc
 create mode 100644 data/scripts/gUnk_0800DFB4.inc
 create mode 100644 data/scripts/gUnk_0800DFD0.inc
 create mode 100644 data/scripts/gUnk_0800DFD7.inc
 create mode 100644 data/scripts/gUnk_0800DFDE.inc
 create mode 100644 data/scripts/gUnk_0800DFE4.inc
 create mode 100644 data/scripts/gUnk_0800E050.inc
 create mode 100644 data/scripts/gUnk_0800E0BC.inc
 create mode 100644 data/scripts/gUnk_0800E0F6.inc
 create mode 100644 data/scripts/gUnk_0800E140.inc
 create mode 100644 data/scripts/gUnk_0800E153.inc
 create mode 100644 data/scripts/gUnk_0800E154.inc
 create mode 100644 data/scripts/gUnk_0800E1C5.inc
 create mode 100644 data/scripts/gUnk_0800E200.inc
 create mode 100644 data/scripts/gUnk_0800E300.inc
 create mode 100644 data/scripts/gUnk_0800E305.inc
 create mode 100644 data/scripts/gUnk_0800E307.inc
 create mode 100644 data/scripts/gUnk_0800E30C.inc
 create mode 100644 data/scripts/gUnk_0800E329.inc
 create mode 100644 data/scripts/gUnk_0800E350.inc
 create mode 100644 data/scripts/gUnk_0800E3EE.inc
 create mode 100644 data/scripts/gUnk_0800E3F9.inc
 create mode 100644 data/scripts/gUnk_0800E3FA.inc
 create mode 100644 data/scripts/gUnk_0800E3FC.inc
 create mode 100644 data/scripts/gUnk_0800E400.inc
 create mode 100644 data/scripts/gUnk_0800E408.inc
 create mode 100644 data/scripts/gUnk_0800E40B.inc
 create mode 100644 data/scripts/gUnk_0800E411.inc
 create mode 100644 data/scripts/gUnk_0800E430.inc
 create mode 100644 data/scripts/gUnk_0800E434.inc
 create mode 100644 data/scripts/gUnk_0800E46C.inc
 create mode 100644 data/scripts/gUnk_0800E489.inc
 create mode 100644 data/scripts/gUnk_0800E499.inc
 create mode 100644 data/scripts/gUnk_0800E4A4.inc
 create mode 100644 data/scripts/gUnk_0800E4E3.inc
 create mode 100644 data/scripts/gUnk_0800E504.inc
 create mode 100644 data/scripts/gUnk_0800E50C.inc
 create mode 100644 data/scripts/gUnk_0800E544.inc
 create mode 100644 data/scripts/gUnk_0800E58C.inc
 create mode 100644 data/scripts/gUnk_0800E5C4.inc
 create mode 100644 data/scripts/gUnk_0800E600.inc
 create mode 100644 data/scripts/gUnk_0800E60E.inc
 create mode 100644 data/scripts/gUnk_0800E62C.inc
 create mode 100644 data/scripts/gUnk_0800E658.inc
 create mode 100644 data/scripts/gUnk_0800E684.inc
 create mode 100644 data/scripts/gUnk_0800E6B0.inc
 create mode 100644 data/scripts/gUnk_0800E6E8.inc
 create mode 100644 data/scripts/gUnk_0800E707.inc
 create mode 100644 data/scripts/gUnk_0800E70A.inc
 create mode 100644 data/scripts/gUnk_0800E734.inc
 create mode 100644 data/scripts/gUnk_0800E760.inc
 create mode 100644 data/scripts/gUnk_0800E7D9.inc
 create mode 100644 data/scripts/gUnk_0800E7F4.inc
 create mode 100644 data/scripts/gUnk_0800E7FA.inc
 create mode 100644 data/scripts/gUnk_0800E823.inc
 create mode 100644 data/scripts/gUnk_0800E824.inc
 create mode 100644 data/scripts/gUnk_0800E8DB.inc
 create mode 100644 data/scripts/gUnk_0800E920.inc
 create mode 100644 data/scripts/gUnk_0800E964.inc
 create mode 100644 data/scripts/gUnk_0800E9D6.inc
 create mode 100644 data/scripts/gUnk_0800E9F4.inc
 create mode 100644 data/scripts/gUnk_0800EA1C.inc
 create mode 100644 data/scripts/gUnk_0800EA54.inc
 create mode 100644 data/scripts/gUnk_0800EAA4.inc
 create mode 100644 data/scripts/gUnk_0800EAEB.inc
 create mode 100644 data/scripts/gUnk_0800EAF8.inc
 create mode 100644 data/scripts/gUnk_0800EB2C.inc
 create mode 100644 data/scripts/gUnk_0800EB64.inc
 create mode 100644 data/scripts/gUnk_0800EBC0.inc
 create mode 100644 data/scripts/gUnk_0800EBDC.inc
 create mode 100644 data/scripts/gUnk_0800EBE0.inc
 create mode 100644 data/scripts/gUnk_0800EBF0.inc
 create mode 100644 data/scripts/gUnk_0800EC08.inc
 create mode 100644 data/scripts/gUnk_0800EC14.inc
 create mode 100644 data/scripts/gUnk_0800EC54.inc
 create mode 100644 data/scripts/gUnk_0800EC61.inc
 create mode 100644 data/scripts/gUnk_0800EC8C.inc
 create mode 100644 data/scripts/gUnk_0800ECF1.inc
 create mode 100644 data/scripts/gUnk_0800ED04.inc
 create mode 100644 data/scripts/gUnk_0800ED0C.inc
 create mode 100644 data/scripts/gUnk_0800ED0D.inc
 create mode 100644 data/scripts/gUnk_0800ED5C.inc
 create mode 100644 data/scripts/gUnk_0800ED90.inc
 create mode 100644 data/scripts/gUnk_0800EDD9.inc
 create mode 100644 data/scripts/gUnk_0800EDE0.inc
 create mode 100644 data/scripts/gUnk_0800EE09.inc
 create mode 100644 data/scripts/gUnk_0800EE50.inc
 create mode 100644 data/scripts/gUnk_0800EE8C.inc
 create mode 100644 data/scripts/gUnk_0800EEE0.inc
 create mode 100644 data/scripts/gUnk_0800EEFD.inc
 create mode 100644 data/scripts/gUnk_0800EF07.inc
 create mode 100644 data/scripts/gUnk_0800EF12.inc
 create mode 100644 data/scripts/gUnk_0800EF40.inc
 create mode 100644 data/scripts/gUnk_0800EF93.inc
 create mode 100644 data/scripts/gUnk_0800EFC0.inc
 create mode 100644 data/scripts/gUnk_0800EFE0.inc
 create mode 100644 data/scripts/gUnk_0800EFE4.inc
 create mode 100644 data/scripts/gUnk_0800F090.inc
 create mode 100644 data/scripts/gUnk_0800F094.inc
 create mode 100644 data/scripts/gUnk_0800F0D6.inc
 create mode 100644 data/scripts/gUnk_0800F0E2.inc
 create mode 100644 data/scripts/gUnk_0800F0F2.inc
 create mode 100644 data/scripts/gUnk_0800F0F3.inc
 create mode 100644 data/scripts/gUnk_0800F0F4.inc
 create mode 100644 data/scripts/gUnk_0800F14C.inc
 create mode 100644 data/scripts/gUnk_0800F184.inc
 create mode 100644 data/scripts/gUnk_0800F1DE.inc
 create mode 100644 data/scripts/gUnk_0800F1E1.inc
 create mode 100644 data/scripts/gUnk_0800F1E5.inc
 create mode 100644 data/scripts/gUnk_0800F1E7.inc
 create mode 100644 data/scripts/gUnk_0800F1ED.inc
 create mode 100644 data/scripts/gUnk_0800F1FB.inc
 create mode 100644 data/scripts/gUnk_0800F1FD.inc
 create mode 100644 data/scripts/gUnk_0800F203.inc
 create mode 100644 data/scripts/gUnk_0800F207.inc
 create mode 100644 data/scripts/gUnk_0800F210.inc
 create mode 100644 data/scripts/gUnk_0800F2EB.inc
 create mode 100644 data/scripts/gUnk_0800F2F0.inc
 create mode 100644 data/scripts/gUnk_0800F2F2.inc
 create mode 100644 data/scripts/gUnk_0800F303.inc
 create mode 100644 data/scripts/gUnk_0800F39C.inc
 create mode 100644 data/scripts/gUnk_0800F3DB.inc
 create mode 100644 data/scripts/gUnk_0800F3E5.inc
 create mode 100644 data/scripts/gUnk_0800F3E6.inc
 create mode 100644 data/scripts/gUnk_0800F3E8.inc
 create mode 100644 data/scripts/gUnk_0800F3EB.inc
 create mode 100644 data/scripts/gUnk_0800F3ED.inc
 create mode 100644 data/scripts/gUnk_0800F3F5.inc
 create mode 100644 data/scripts/gUnk_0800F3F9.inc
 create mode 100644 data/scripts/gUnk_0800F400.inc
 create mode 100644 data/scripts/gUnk_0800F408.inc
 create mode 100644 data/scripts/gUnk_0800F409.inc
 create mode 100644 data/scripts/gUnk_0800F410.inc
 create mode 100644 data/scripts/gUnk_0800F426.inc
 create mode 100644 data/scripts/gUnk_0800F430.inc
 create mode 100644 data/scripts/gUnk_0800F4C4.inc
 create mode 100644 data/scripts/gUnk_0800F4EA.inc
 create mode 100644 data/scripts/gUnk_0800F4EB.inc
 create mode 100644 data/scripts/gUnk_0800F4EF.inc
 create mode 100644 data/scripts/gUnk_0800F4F0.inc
 create mode 100644 data/scripts/gUnk_0800F4F1.inc
 create mode 100644 data/scripts/gUnk_0800F4F3.inc
 create mode 100644 data/scripts/gUnk_0800F4F7.inc
 create mode 100644 data/scripts/gUnk_0800F4F9.inc
 create mode 100644 data/scripts/gUnk_0800F501.inc
 create mode 100644 data/scripts/gUnk_0800F50E.inc
 create mode 100644 data/scripts/gUnk_0800F554.inc
 create mode 100644 data/scripts/gUnk_0800F584.inc
 create mode 100644 data/scripts/gUnk_0800F58F.inc
 create mode 100644 data/scripts/gUnk_0800F5B0.inc
 create mode 100644 data/scripts/gUnk_0800F5E9.inc
 create mode 100644 data/scripts/gUnk_0800F5EC.inc
 create mode 100644 data/scripts/gUnk_0800F5ED.inc
 create mode 100644 data/scripts/gUnk_0800F5EE.inc
 create mode 100644 data/scripts/gUnk_0800F5EF.inc
 create mode 100644 data/scripts/gUnk_0800F5F0.inc
 create mode 100644 data/scripts/gUnk_0800F5F2.inc
 create mode 100644 data/scripts/gUnk_0800F5F4.inc
 create mode 100644 data/scripts/gUnk_0800F5FC.inc
 create mode 100644 data/scripts/gUnk_0800F5FF.inc
 create mode 100644 data/scripts/gUnk_0800F606.inc
 create mode 100644 data/scripts/gUnk_0800F607.inc
 create mode 100644 data/scripts/gUnk_0800F608.inc
 create mode 100644 data/scripts/gUnk_0800F60A.inc
 create mode 100644 data/scripts/gUnk_0800F628.inc
 create mode 100644 data/scripts/gUnk_0800F650.inc
 create mode 100644 data/scripts/gUnk_0800F688.inc
 create mode 100644 data/scripts/gUnk_0800F6A0.inc
 create mode 100644 data/scripts/gUnk_0800F6C8.inc
 create mode 100644 data/scripts/gUnk_0800F6E0.inc
 create mode 100644 data/scripts/gUnk_0800F6E9.inc
 create mode 100644 data/scripts/gUnk_0800F6EC.inc
 create mode 100644 data/scripts/gUnk_0800F6ED.inc
 create mode 100644 data/scripts/gUnk_0800F6EE.inc
 create mode 100644 data/scripts/gUnk_0800F6EF.inc
 create mode 100644 data/scripts/gUnk_0800F6F0.inc
 create mode 100644 data/scripts/gUnk_0800F6F1.inc
 create mode 100644 data/scripts/gUnk_0800F6F2.inc
 create mode 100644 data/scripts/gUnk_0800F6F3.inc
 create mode 100644 data/scripts/gUnk_0800F6F4.inc
 create mode 100644 data/scripts/gUnk_0800F6F9.inc
 create mode 100644 data/scripts/gUnk_0800F6FE.inc
 create mode 100644 data/scripts/gUnk_0800F702.inc
 create mode 100644 data/scripts/gUnk_0800F706.inc
 create mode 100644 data/scripts/gUnk_0800F71E.inc
 create mode 100644 data/scripts/gUnk_0800F724.inc
 create mode 100644 data/scripts/gUnk_0800F734.inc
 create mode 100644 data/scripts/gUnk_0800F73C.inc
 create mode 100644 data/scripts/gUnk_0800F7E6.inc
 create mode 100644 data/scripts/gUnk_0800F7EB.inc
 create mode 100644 data/scripts/gUnk_0800F7EE.inc
 create mode 100644 data/scripts/gUnk_0800F7EF.inc
 create mode 100644 data/scripts/gUnk_0800F7F0.inc
 create mode 100644 data/scripts/gUnk_0800F7F4.inc
 create mode 100644 data/scripts/gUnk_0800F7F5.inc
 create mode 100644 data/scripts/gUnk_0800F7F7.inc
 create mode 100644 data/scripts/gUnk_0800F7FC.inc
 create mode 100644 data/scripts/gUnk_0800F7FD.inc
 create mode 100644 data/scripts/gUnk_0800F7FF.inc
 create mode 100644 data/scripts/gUnk_0800F800.inc
 create mode 100644 data/scripts/gUnk_0800F805.inc
 create mode 100644 data/scripts/gUnk_0800F808.inc
 create mode 100644 data/scripts/gUnk_0800F8EF.inc
 create mode 100644 data/scripts/gUnk_0800F8F0.inc
 create mode 100644 data/scripts/gUnk_0800F8F1.inc
 create mode 100644 data/scripts/gUnk_0800F8F2.inc
 create mode 100644 data/scripts/gUnk_0800F8F3.inc
 create mode 100644 data/scripts/gUnk_0800F8F4.inc
 create mode 100644 data/scripts/gUnk_0800F8F5.inc
 create mode 100644 data/scripts/gUnk_0800F8F8.inc
 create mode 100644 data/scripts/gUnk_0800F8F9.inc
 create mode 100644 data/scripts/gUnk_0800F900.inc
 create mode 100644 data/scripts/gUnk_0800F902.inc
 create mode 100644 data/scripts/gUnk_0800F916.inc
 create mode 100644 data/scripts/gUnk_0800F9F0.inc
 create mode 100644 data/scripts/gUnk_0800F9F2.inc
 create mode 100644 data/scripts/gUnk_0800F9F3.inc
 create mode 100644 data/scripts/gUnk_0800F9F4.inc
 create mode 100644 data/scripts/gUnk_0800F9F6.inc
 create mode 100644 data/scripts/gUnk_0800F9F7.inc
 create mode 100644 data/scripts/gUnk_0800F9F8.inc
 create mode 100644 data/scripts/gUnk_0800FA02.inc
 create mode 100644 data/scripts/gUnk_0800FA07.inc
 create mode 100644 data/scripts/gUnk_0800FA08.inc
 create mode 100644 data/scripts/gUnk_0800FA09.inc
 create mode 100644 data/scripts/gUnk_0800FA0D.inc
 create mode 100644 data/scripts/gUnk_0800FA78.inc
 create mode 100644 data/scripts/gUnk_0800FAC0.inc
 create mode 100644 data/scripts/gUnk_0800FAE4.inc
 create mode 100644 data/scripts/gUnk_0800FAF3.inc
 create mode 100644 data/scripts/gUnk_0800FAF5.inc
 create mode 100644 data/scripts/gUnk_0800FAF6.inc
 create mode 100644 data/scripts/gUnk_0800FAF7.inc
 create mode 100644 data/scripts/gUnk_0800FAF8.inc
 create mode 100644 data/scripts/gUnk_0800FAFD.inc
 create mode 100644 data/scripts/gUnk_0800FAFE.inc
 create mode 100644 data/scripts/gUnk_0800FAFF.inc
 create mode 100644 data/scripts/gUnk_0800FB00.inc
 create mode 100644 data/scripts/gUnk_0800FB01.inc
 create mode 100644 data/scripts/gUnk_0800FB02.inc
 create mode 100644 data/scripts/gUnk_0800FB04.inc
 create mode 100644 data/scripts/gUnk_0800FB08.inc
 create mode 100644 data/scripts/gUnk_0800FB0A.inc
 create mode 100644 data/scripts/gUnk_0800FB31.inc
 create mode 100644 data/scripts/gUnk_0800FB44.inc
 create mode 100644 data/scripts/gUnk_0800FBBB.inc
 create mode 100644 data/scripts/gUnk_0800FBF0.inc
 create mode 100644 data/scripts/gUnk_0800FBF3.inc
 create mode 100644 data/scripts/gUnk_0800FBF5.inc
 create mode 100644 data/scripts/gUnk_0800FBF6.inc
 create mode 100644 data/scripts/gUnk_0800FBF8.inc
 create mode 100644 data/scripts/gUnk_0800FBF9.inc
 create mode 100644 data/scripts/gUnk_0800FBFA.inc
 create mode 100644 data/scripts/gUnk_0800FBFB.inc
 create mode 100644 data/scripts/gUnk_0800FBFC.inc
 create mode 100644 data/scripts/gUnk_0800FBFF.inc
 create mode 100644 data/scripts/gUnk_0800FC00.inc
 create mode 100644 data/scripts/gUnk_0800FC01.inc
 create mode 100644 data/scripts/gUnk_0800FC05.inc
 create mode 100644 data/scripts/gUnk_0800FC06.inc
 create mode 100644 data/scripts/gUnk_0800FC08.inc
 create mode 100644 data/scripts/gUnk_0800FC09.inc
 create mode 100644 data/scripts/gUnk_0800FC0E.inc
 create mode 100644 data/scripts/gUnk_0800FC24.inc
 create mode 100644 data/scripts/gUnk_0800FCEA.inc
 create mode 100644 data/scripts/gUnk_0800FCEE.inc
 create mode 100644 data/scripts/gUnk_0800FCF2.inc
 create mode 100644 data/scripts/gUnk_0800FCF3.inc
 create mode 100644 data/scripts/gUnk_0800FCF5.inc
 create mode 100644 data/scripts/gUnk_0800FCF7.inc
 create mode 100644 data/scripts/gUnk_0800FCF8.inc
 create mode 100644 data/scripts/gUnk_0800FCFA.inc
 create mode 100644 data/scripts/gUnk_0800FCFB.inc
 create mode 100644 data/scripts/gUnk_0800FCFC.inc
 create mode 100644 data/scripts/gUnk_0800FCFE.inc
 create mode 100644 data/scripts/gUnk_0800FCFF.inc
 create mode 100644 data/scripts/gUnk_0800FD00.inc
 create mode 100644 data/scripts/gUnk_0800FD01.inc
 create mode 100644 data/scripts/gUnk_0800FD04.inc
 create mode 100644 data/scripts/gUnk_0800FD05.inc
 create mode 100644 data/scripts/gUnk_0800FD0C.inc
 create mode 100644 data/scripts/gUnk_0800FD16.inc
 create mode 100644 data/scripts/gUnk_0800FD21.inc
 create mode 100644 data/scripts/gUnk_0800FD80.inc
 create mode 100644 data/scripts/gUnk_0800FDA0.inc
 create mode 100644 data/scripts/gUnk_0800FDCC.inc
 create mode 100644 data/scripts/gUnk_0800FDF2.inc
 create mode 100644 data/scripts/gUnk_0800FDF3.inc
 create mode 100644 data/scripts/gUnk_0800FDFA.inc
 create mode 100644 data/scripts/gUnk_0800FDFC.inc
 create mode 100644 data/scripts/gUnk_0800FDFE.inc
 create mode 100644 data/scripts/gUnk_0800FDFF.inc
 create mode 100644 data/scripts/gUnk_0800FE00.inc
 create mode 100644 data/scripts/gUnk_0800FE01.inc
 create mode 100644 data/scripts/gUnk_0800FE02.inc
 create mode 100644 data/scripts/gUnk_0800FE04.inc
 create mode 100644 data/scripts/gUnk_0800FE06.inc
 create mode 100644 data/scripts/gUnk_0800FE07.inc
 create mode 100644 data/scripts/gUnk_0800FE08.inc
 create mode 100644 data/scripts/gUnk_0800FE09.inc
 create mode 100644 data/scripts/gUnk_0800FE40.inc
 create mode 100644 data/scripts/gUnk_0800FE44.inc
 create mode 100644 data/scripts/gUnk_0800FE64.inc
 create mode 100644 data/scripts/gUnk_0800FE88.inc
 create mode 100644 data/scripts/gUnk_0800FEBC.inc
 create mode 100644 data/scripts/gUnk_0800FEF0.inc
 create mode 100644 data/scripts/gUnk_0800FEF2.inc
 create mode 100644 data/scripts/gUnk_0800FEF9.inc
 create mode 100644 data/scripts/gUnk_0800FEFC.inc
 create mode 100644 data/scripts/gUnk_0800FEFE.inc
 create mode 100644 data/scripts/gUnk_0800FF01.inc
 create mode 100644 data/scripts/gUnk_0800FF03.inc
 create mode 100644 data/scripts/gUnk_0800FF04.inc
 create mode 100644 data/scripts/gUnk_0800FF05.inc
 create mode 100644 data/scripts/gUnk_0800FF06.inc
 create mode 100644 data/scripts/gUnk_0800FF08.inc
 create mode 100644 data/scripts/gUnk_0800FF18.inc
 create mode 100644 data/scripts/gUnk_0800FF2A.inc
 create mode 100644 data/scripts/gUnk_0800FF74.inc
 create mode 100644 data/scripts/gUnk_0800FFB0.inc
 create mode 100644 data/scripts/gUnk_0800FFBB.inc
 create mode 100644 data/scripts/gUnk_0800FFD6.inc
 create mode 100644 data/scripts/gUnk_0800FFEE.inc
 create mode 100644 data/scripts/gUnk_0800FFF6.inc
 create mode 100644 data/scripts/gUnk_0800FFFC.inc
 create mode 100644 data/scripts/gUnk_0800FFFD.inc
 create mode 100644 data/scripts/gUnk_0800FFFF.inc
 create mode 100644 data/scripts/gUnk_08010000.inc
 create mode 100644 data/scripts/gUnk_08010001.inc
 create mode 100644 data/scripts/gUnk_08010002.inc
 create mode 100644 data/scripts/gUnk_08010003.inc
 create mode 100644 data/scripts/gUnk_08010005.inc
 create mode 100644 data/scripts/gUnk_08010007.inc
 create mode 100644 data/scripts/gUnk_08010008.inc
 create mode 100644 data/scripts/gUnk_08010009.inc
 create mode 100644 data/scripts/gUnk_0801000A.inc
 create mode 100644 data/scripts/gUnk_0801000C.inc
 create mode 100644 data/scripts/gUnk_0801000D.inc
 create mode 100644 data/scripts/gUnk_0801000E.inc
 create mode 100644 data/scripts/gUnk_0801000F.inc
 create mode 100644 data/scripts/gUnk_08010018.inc
 create mode 100644 data/scripts/gUnk_0801001B.inc
 create mode 100644 data/scripts/gUnk_0801001D.inc
 create mode 100644 data/scripts/gUnk_08010023.inc
 create mode 100644 data/scripts/gUnk_08010044.inc
 create mode 100644 data/scripts/gUnk_08010098.inc
 create mode 100644 data/scripts/gUnk_08010099.inc
 create mode 100644 data/scripts/gUnk_080100C1.inc
 create mode 100644 data/scripts/gUnk_080100C8.inc
 create mode 100644 data/scripts/gUnk_080100F5.inc
 create mode 100644 data/scripts/gUnk_080100FC.inc
 create mode 100644 data/scripts/gUnk_080100FE.inc
 create mode 100644 data/scripts/gUnk_080100FF.inc
 create mode 100644 data/scripts/gUnk_08010100.inc
 create mode 100644 data/scripts/gUnk_08010102.inc
 create mode 100644 data/scripts/gUnk_08010103.inc
 create mode 100644 data/scripts/gUnk_08010105.inc
 create mode 100644 data/scripts/gUnk_08010106.inc
 create mode 100644 data/scripts/gUnk_0801010A.inc
 create mode 100644 data/scripts/gUnk_08010111.inc
 create mode 100644 data/scripts/gUnk_08010120.inc
 create mode 100644 data/scripts/gUnk_08010130.inc
 create mode 100644 data/scripts/gUnk_08010148.inc
 create mode 100644 data/scripts/gUnk_080101FA.inc
 create mode 100644 data/scripts/gUnk_080101FD.inc
 create mode 100644 data/scripts/gUnk_080101FF.inc
 create mode 100644 data/scripts/gUnk_08010200.inc
 create mode 100644 data/scripts/gUnk_08010203.inc
 create mode 100644 data/scripts/gUnk_08010207.inc
 create mode 100644 data/scripts/gUnk_08010208.inc
 create mode 100644 data/scripts/gUnk_0801020C.inc
 create mode 100644 data/scripts/gUnk_08010220.inc
 create mode 100644 data/scripts/gUnk_08010236.inc
 create mode 100644 data/scripts/gUnk_08010264.inc
 create mode 100644 data/scripts/gUnk_08010294.inc
 create mode 100644 data/scripts/gUnk_080102E0.inc
 create mode 100644 data/scripts/gUnk_080102FB.inc
 create mode 100644 data/scripts/gUnk_080102FD.inc
 create mode 100644 data/scripts/gUnk_080102FE.inc
 create mode 100644 data/scripts/gUnk_08010303.inc
 create mode 100644 data/scripts/gUnk_08010304.inc
 create mode 100644 data/scripts/gUnk_08010305.inc
 create mode 100644 data/scripts/gUnk_0801030A.inc
 create mode 100644 data/scripts/gUnk_0801030C.inc
 create mode 100644 data/scripts/gUnk_08010320.inc
 create mode 100644 data/scripts/gUnk_080103B0.inc
 create mode 100644 data/scripts/gUnk_080103D0.inc
 create mode 100644 data/scripts/gUnk_080103F8.inc
 create mode 100644 data/scripts/gUnk_080103FD.inc
 create mode 100644 data/scripts/gUnk_08010400.inc
 create mode 100644 data/scripts/gUnk_08010406.inc
 create mode 100644 data/scripts/gUnk_08010407.inc
 create mode 100644 data/scripts/gUnk_0801040A.inc
 create mode 100644 data/scripts/gUnk_08010428.inc
 create mode 100644 data/scripts/gUnk_08010454.inc
 create mode 100644 data/scripts/gUnk_08010480.inc
 create mode 100644 data/scripts/gUnk_080104A0.inc
 create mode 100644 data/scripts/gUnk_080104EC.inc
 create mode 100644 data/scripts/gUnk_080104FF.inc
 create mode 100644 data/scripts/gUnk_08010501.inc
 create mode 100644 data/scripts/gUnk_08010502.inc
 create mode 100644 data/scripts/gUnk_08010503.inc
 create mode 100644 data/scripts/gUnk_0801050A.inc
 create mode 100644 data/scripts/gUnk_0801050B.inc
 create mode 100644 data/scripts/gUnk_08010526.inc
 create mode 100644 data/scripts/gUnk_0801059F.inc
 create mode 100644 data/scripts/gUnk_080105C9.inc
 create mode 100644 data/scripts/gUnk_080105FB.inc
 create mode 100644 data/scripts/gUnk_080105FF.inc
 create mode 100644 data/scripts/gUnk_08010600.inc
 create mode 100644 data/scripts/gUnk_0801060A.inc
 create mode 100644 data/scripts/gUnk_0801060D.inc
 create mode 100644 data/scripts/gUnk_08010617.inc
 create mode 100644 data/scripts/gUnk_0801061C.inc
 create mode 100644 data/scripts/gUnk_08010644.inc
 create mode 100644 data/scripts/gUnk_08010650.inc
 create mode 100644 data/scripts/gUnk_08010674.inc
 create mode 100644 data/scripts/gUnk_080106AC.inc
 create mode 100644 data/scripts/gUnk_08010700.inc
 create mode 100644 data/scripts/gUnk_08010701.inc
 create mode 100644 data/scripts/gUnk_08010705.inc
 create mode 100644 data/scripts/gUnk_0801070E.inc
 create mode 100644 data/scripts/gUnk_08010734.inc
 create mode 100644 data/scripts/gUnk_08010794.inc
 create mode 100644 data/scripts/gUnk_080107D0.inc
 create mode 100644 data/scripts/gUnk_0801080A.inc
 create mode 100644 data/scripts/gUnk_0801080B.inc
 create mode 100644 data/scripts/gUnk_08010815.inc
 create mode 100644 data/scripts/gUnk_0801081B.inc
 create mode 100644 data/scripts/gUnk_080108D0.inc
 create mode 100644 data/scripts/gUnk_080108FF.inc
 create mode 100644 data/scripts/gUnk_0801090C.inc
 create mode 100644 data/scripts/gUnk_0801090F.inc
 create mode 100644 data/scripts/gUnk_08010917.inc
 create mode 100644 data/scripts/gUnk_08010964.inc
 create mode 100644 data/scripts/gUnk_080109A0.inc
 create mode 100644 data/scripts/gUnk_080109F0.inc
 create mode 100644 data/scripts/gUnk_080109F6.inc
 create mode 100644 data/scripts/gUnk_08010A14.inc
 create mode 100644 data/scripts/gUnk_08010A1F.inc
 create mode 100644 data/scripts/gUnk_08010A38.inc
 create mode 100644 data/scripts/gUnk_08010A5C.inc
 create mode 100644 data/scripts/gUnk_08010A98.inc
 create mode 100644 data/scripts/gUnk_08010AE4.inc
 create mode 100644 data/scripts/gUnk_08010B04.inc
 create mode 100644 data/scripts/gUnk_08010B68.inc
 create mode 100644 data/scripts/gUnk_08010BB4.inc
 create mode 100644 data/scripts/gUnk_08010BEC.inc
 create mode 100644 data/scripts/gUnk_08010BF9.inc
 create mode 100644 data/scripts/gUnk_08010BFE.inc
 create mode 100644 data/scripts/gUnk_08010C1A.inc
 create mode 100644 data/scripts/gUnk_08010D03.inc
 create mode 100644 data/scripts/gUnk_08010E00.inc
 create mode 100644 data/scripts/gUnk_08010E0D.inc
 create mode 100644 data/scripts/gUnk_08010F00.inc
 create mode 100644 data/scripts/gUnk_08010FFF.inc
 create mode 100644 data/scripts/gUnk_08011000.inc
 create mode 100644 data/scripts/gUnk_08011001.inc
 create mode 100644 data/scripts/gUnk_0801101F.inc
 create mode 100644 data/scripts/gUnk_08011074.inc
 create mode 100644 data/scripts/gUnk_08011083.inc
 create mode 100644 data/scripts/gUnk_080110DC.inc
 create mode 100644 data/scripts/gUnk_080110E8.inc
 create mode 100644 data/scripts/gUnk_08011128.inc
 create mode 100644 data/scripts/gUnk_080111CC.inc
 create mode 100644 data/scripts/gUnk_08011208.inc
 create mode 100644 data/scripts/gUnk_0801121D.inc
 create mode 100644 data/scripts/gUnk_080112C4.inc
 create mode 100644 data/scripts/gUnk_0801130F.inc
 create mode 100644 data/scripts/gUnk_08011328.inc
 create mode 100644 data/scripts/gUnk_08011403.inc
 create mode 100644 data/scripts/gUnk_080115D0.inc
 create mode 100644 data/scripts/gUnk_08011608.inc
 create mode 100644 data/scripts/gUnk_08011640.inc
 create mode 100644 data/scripts/gUnk_080116A8.inc
 create mode 100644 data/scripts/gUnk_08011809.inc
 create mode 100644 data/scripts/gUnk_0801183C.inc
 create mode 100644 data/scripts/gUnk_080118D4.inc
 create mode 100644 data/scripts/gUnk_08011930.inc
 create mode 100644 data/scripts/gUnk_08011940.inc
 create mode 100644 data/scripts/gUnk_0801194C.inc
 create mode 100644 data/scripts/gUnk_08011958.inc
 create mode 100644 data/scripts/gUnk_08011964.inc
 create mode 100644 data/scripts/gUnk_080119B0.inc
 create mode 100644 data/scripts/gUnk_080119D8.inc
 create mode 100644 data/scripts/gUnk_080119E4.inc
 create mode 100644 data/scripts/gUnk_080119F0.inc
 create mode 100644 data/scripts/gUnk_08011A04.inc
 create mode 100644 data/scripts/gUnk_08011A2C.inc
 create mode 100644 data/scripts/gUnk_08011A64.inc
 create mode 100644 data/scripts/gUnk_08011AE4.inc
 create mode 100644 data/scripts/gUnk_08011B04.inc
 create mode 100644 data/scripts/gUnk_08011B20.inc
 create mode 100644 data/scripts/gUnk_08011B40.inc
 create mode 100644 data/scripts/gUnk_08011BE4.inc
 create mode 100644 data/scripts/gUnk_08011C04.inc
 create mode 100644 data/scripts/gUnk_08011C50.inc
 create mode 100644 data/scripts/gUnk_08011C7C.inc
 create mode 100644 data/scripts/gUnk_08011D28.inc
 create mode 100644 data/scripts/gUnk_08011DD4.inc
 create mode 100644 data/scripts/gUnk_08011E04.inc
 create mode 100644 data/scripts/gUnk_08011E80.inc
 create mode 100644 data/scripts/gUnk_08011F0C.inc
 create mode 100644 data/scripts/gUnk_08011F98.inc
 create mode 100644 data/scripts/gUnk_08012024.inc
 create mode 100644 data/scripts/gUnk_08012091.inc
 create mode 100644 data/scripts/gUnk_080120B0.inc
 create mode 100644 data/scripts/gUnk_080120ED.inc
 create mode 100644 data/scripts/gUnk_080120FB.inc
 create mode 100644 data/scripts/gUnk_0801213C.inc
 create mode 100644 data/scripts/gUnk_080121C8.inc
 create mode 100644 data/scripts/gUnk_08012200.inc
 create mode 100644 data/scripts/gUnk_08012238.inc
 create mode 100644 data/scripts/gUnk_08012270.inc
 create mode 100644 data/scripts/gUnk_0801232C.inc
 create mode 100644 data/scripts/gUnk_08012360.inc
 create mode 100644 data/scripts/gUnk_08012410.inc
 create mode 100644 data/scripts/gUnk_08012430.inc
 create mode 100644 data/scripts/gUnk_08012480.inc
 create mode 100644 data/scripts/gUnk_08012AB0.inc
 create mode 100644 data/scripts/gUnk_08012BA8.inc
 create mode 100644 data/scripts/gUnk_08012BF8.inc
 create mode 100644 data/scripts/gUnk_08012C0C.inc
 create mode 100644 data/scripts/gUnk_08012C48.inc
 create mode 100644 data/scripts/gUnk_08012C98.inc
 create mode 100644 data/scripts/gUnk_08012CD8.inc
 create mode 100644 data/scripts/gUnk_08012D18.inc
 create mode 100644 data/scripts/gUnk_08012D70.inc
 create mode 100644 data/scripts/gUnk_08012DA1.inc
 create mode 100644 data/scripts/gUnk_08012DB0.inc
 create mode 100644 data/scripts/gUnk_08012DD8.inc
 create mode 100644 data/scripts/gUnk_08012E20.inc
 create mode 100644 data/scripts/gUnk_08012E44.inc
 create mode 100644 data/scripts/gUnk_08012E88.inc
 create mode 100644 data/scripts/gUnk_08012EC0.inc
 create mode 100644 data/scripts/gUnk_08012F0C.inc
 create mode 100644 data/scripts/gUnk_08013001.inc
 create mode 100644 data/scripts/gUnk_08013003.inc
 create mode 100644 data/scripts/gUnk_0801300B.inc
 create mode 100644 data/scripts/gUnk_0801303C.inc
 create mode 100644 data/scripts/gUnk_08013070.inc
 create mode 100644 data/scripts/gUnk_08013081.inc
 create mode 100644 data/scripts/gUnk_08013090.inc
 create mode 100644 data/scripts/gUnk_08013114.inc
 create mode 100644 data/scripts/gUnk_08013188.inc
 create mode 100644 data/scripts/gUnk_080131AC.inc
 create mode 100644 data/scripts/gUnk_080132E4.inc
 create mode 100644 data/scripts/gUnk_08013330.inc
 create mode 100644 data/scripts/gUnk_0801334C.inc
 create mode 100644 data/scripts/gUnk_08013378.inc
 create mode 100644 data/scripts/gUnk_080133C4.inc
 create mode 100644 data/scripts/gUnk_080133F8.inc
 create mode 100644 data/scripts/gUnk_080134DC.inc
 create mode 100644 data/scripts/gUnk_080136D8.inc
 create mode 100644 data/scripts/gUnk_08013720.inc
 create mode 100644 data/scripts/gUnk_080137DA.inc
 create mode 100644 data/scripts/gUnk_080138B4.inc
 create mode 100644 data/scripts/gUnk_08013B18.inc
 create mode 100644 data/scripts/gUnk_08013B70.inc
 create mode 100644 data/scripts/gUnk_08013BA8.inc
 create mode 100644 data/scripts/gUnk_08013BE8.inc
 create mode 100644 data/scripts/gUnk_08013CA4.inc
 create mode 100644 data/scripts/gUnk_08013E04.inc
 create mode 100644 data/scripts/gUnk_08013E4C.inc
 create mode 100644 data/scripts/gUnk_08013E70.inc
 create mode 100644 data/scripts/gUnk_08013E94.inc
 create mode 100644 data/scripts/gUnk_08013EB0.inc
 create mode 100644 data/scripts/gUnk_08013ECC.inc
 create mode 100644 data/scripts/gUnk_08013EE8.inc
 create mode 100644 data/scripts/gUnk_08013F04.inc
 create mode 100644 data/scripts/gUnk_08013F34.inc
 create mode 100644 data/scripts/gUnk_08013F64.inc
 create mode 100644 data/scripts/gUnk_08013F94.inc
 create mode 100644 data/scripts/gUnk_08013FE8.inc
 create mode 100644 data/scripts/gUnk_08014054.inc
 create mode 100644 data/scripts/gUnk_08014074.inc
 create mode 100644 data/scripts/gUnk_08014094.inc
 create mode 100644 data/scripts/gUnk_080140DC.inc
 create mode 100644 data/scripts/gUnk_080140F8.inc
 create mode 100644 data/scripts/gUnk_08014118.inc
 create mode 100644 data/scripts/gUnk_08014154.inc
 create mode 100644 data/scripts/gUnk_080141DC.inc
 create mode 100644 data/scripts/gUnk_08014210.inc
 create mode 100644 data/scripts/gUnk_08014274.inc
 create mode 100644 data/scripts/gUnk_080142B0.inc
 create mode 100644 data/scripts/gUnk_08014384.inc
 create mode 100644 data/scripts/gUnk_080143C0.inc
 create mode 100644 data/scripts/gUnk_08014402.inc
 create mode 100644 data/scripts/gUnk_08014450.inc
 create mode 100644 data/scripts/gUnk_0801450C.inc
 create mode 100644 data/scripts/gUnk_08014548.inc
 create mode 100644 data/scripts/gUnk_080145A0.inc
 create mode 100644 data/scripts/gUnk_080145B0.inc
 create mode 100644 data/scripts/gUnk_080145E8.inc
 create mode 100644 data/scripts/gUnk_08014628.inc
 create mode 100644 data/scripts/gUnk_08014804.inc
 create mode 100644 data/scripts/gUnk_080148F0.inc
 create mode 100644 data/scripts/gUnk_08014958.inc
 create mode 100644 data/scripts/gUnk_08014994.inc
 create mode 100644 data/scripts/gUnk_080149CC.inc
 create mode 100644 data/scripts/gUnk_08014A28.inc
 create mode 100644 data/scripts/gUnk_08014A54.inc
 create mode 100644 data/scripts/gUnk_08014A80.inc
 create mode 100644 data/scripts/gUnk_08014AC4.inc
 create mode 100644 data/scripts/gUnk_08014B34.inc
 create mode 100644 data/scripts/gUnk_08014C2C.inc
 create mode 100644 data/scripts/gUnk_08014C94.inc
 create mode 100644 data/scripts/gUnk_08014CDC.inc
 create mode 100644 data/scripts/gUnk_08014DCC.inc
 create mode 100644 data/scripts/gUnk_08014E14.inc
 create mode 100644 data/scripts/gUnk_08014E50.inc
 create mode 100644 data/scripts/gUnk_08014ECC.inc
 create mode 100644 data/scripts/gUnk_08014EF8.inc
 create mode 100644 data/scripts/gUnk_08014F30.inc
 create mode 100644 data/scripts/gUnk_08014FBC.inc
 create mode 100644 data/scripts/gUnk_08015001.inc
 create mode 100644 data/scripts/gUnk_08015087.inc
 create mode 100644 data/scripts/gUnk_080150EF.inc
 create mode 100644 data/scripts/gUnk_08015234.inc
 create mode 100644 data/scripts/gUnk_080152B4.inc
 create mode 100644 data/scripts/gUnk_08015390.inc
 create mode 100644 data/scripts/gUnk_080153EC.inc
 create mode 100644 data/scripts/gUnk_0801550C.inc
 create mode 100644 data/scripts/gUnk_08015618.inc
 create mode 100644 data/scripts/gUnk_08015684.inc
 create mode 100644 data/scripts/gUnk_080156A0.inc
 create mode 100644 data/scripts/gUnk_08015754.inc
 create mode 100644 data/scripts/gUnk_080157AC.inc
 create mode 100644 data/scripts/gUnk_080158F8.inc
 create mode 100644 data/scripts/gUnk_08015938.inc
 create mode 100644 data/scripts/gUnk_08015958.inc
 create mode 100644 data/scripts/gUnk_08015AC4.inc
 create mode 100644 data/scripts/gUnk_08015B14.inc
 create mode 100644 data/scripts/gUnk_08015B34.inc
 create mode 100644 data/scripts/gUnk_08015B84.inc
 create mode 100644 data/scripts/gUnk_08015BA8.inc
 create mode 100644 data/scripts/gUnk_08015BE8.inc
 create mode 100644 data/scripts/gUnk_08015CD4.inc
 create mode 100644 data/scripts/gUnk_08015DF0.inc
 create mode 100644 data/scripts/gUnk_08015E58.inc
 create mode 100644 data/scripts/gUnk_08015F08.inc
 create mode 100644 data/scripts/gUnk_08015F3C.inc
 create mode 100644 data/scripts/gUnk_08015FA4.inc
 create mode 100644 data/scripts/gUnk_08015FC0.inc
 create mode 100644 data/scripts/gUnk_08016021.inc
 create mode 100644 data/scripts/gUnk_0801606C.inc
 create mode 100644 data/scripts/gUnk_080160A8.inc
 create mode 100644 data/scripts/gUnk_080160EA.inc
 create mode 100644 data/scripts/gUnk_0801613C.inc
 create mode 100644 data/scripts/gUnk_08016190.inc
 create mode 100644 data/scripts/gUnk_080161E8.inc
 create mode 100644 data/scripts/gUnk_0801635C.inc
 create mode 100644 data/scripts/gUnk_0801637D.inc
 create mode 100644 data/scripts/gUnk_08016384.inc
 create mode 100644 data/scripts/gUnk_08016408.inc
 create mode 100644 data/scripts/gUnk_080165F8.inc
 create mode 100644 data/scripts/gUnk_0801660C.inc
 create mode 100644 data/scripts/gUnk_08016628.inc
 create mode 100644 data/scripts/gUnk_08016644.inc
 create mode 100644 data/scripts/gUnk_0801666C.inc
 create mode 100644 data/scripts/gUnk_080166B8.inc
 create mode 100644 data/scripts/gUnk_080166FC.inc
 create mode 100644 data/scripts/gUnk_08016798.inc
 create mode 100644 data/scripts/gUnk_08016844.inc
 create mode 100644 data/scripts/gUnk_080168E0.inc
 create mode 100644 data/scripts/gUnk_080168F4.inc

diff --git a/data/scripts.s b/data/scripts.s
index edb0c350..1f07d4b8 100644
--- a/data/scripts.s
+++ b/data/scripts.s
@@ -7,3208 +7,2141 @@
 
 	.text
 
-gUnk_08008B5C:: @ 08008B5C
-	.incbin "baserom.gba", 0x008B5C, 0x0000034
+.include "data/scripts/gUnk_08008B5C.inc"
 
-gUnk_08008B90:: @ 08008B90
-	.incbin "baserom.gba", 0x008B90, 0x0000030
+.include "data/scripts/gUnk_08008B90.inc"
 
-gUnk_08008BC0:: @ 08008BC0
-	.incbin "baserom.gba", 0x008BC0, 0x000008E
+.include "data/scripts/gUnk_08008BC0.inc"
 
-gUnk_08008C4E:: @ 08008C4E
-	.incbin "baserom.gba", 0x008C4E, 0x0000016
+.include "data/scripts/gUnk_08008C4E.inc"
 
-gUnk_08008C64:: @ 08008C64
-	.incbin "baserom.gba", 0x008C64, 0x0000009
+.include "data/scripts/gUnk_08008C64.inc"
 
-gUnk_08008C6D:: @ 08008C6D
-	.incbin "baserom.gba", 0x008C6D, 0x0000011
+.include "data/scripts/gUnk_08008C6D.inc"
 
-gUnk_08008C7E:: @ 08008C7E
-	.incbin "baserom.gba", 0x008C7E, 0x000003B
+.include "data/scripts/gUnk_08008C7E.inc"
 
-gUnk_08008CB9:: @ 08008CB9
-	.incbin "baserom.gba", 0x008CB9, 0x0000097
+.include "data/scripts/gUnk_08008CB9.inc"
 
-gUnk_08008D50:: @ 08008D50
-	.incbin "baserom.gba", 0x008D50, 0x000003C
+.include "data/scripts/gUnk_08008D50.inc"
 
-gUnk_08008D8C:: @ 08008D8C
-	.incbin "baserom.gba", 0x008D8C, 0x0000034
+.include "data/scripts/gUnk_08008D8C.inc"
 
-gUnk_08008DC0:: @ 08008DC0
-	.incbin "baserom.gba", 0x008DC0, 0x0000048
+.include "data/scripts/gUnk_08008DC0.inc"
 
-gUnk_08008E08:: @ 08008E08
-	.incbin "baserom.gba", 0x008E08, 0x0000002
+.include "data/scripts/gUnk_08008E08.inc"
 
-gUnk_08008E0A:: @ 08008E0A
-	.incbin "baserom.gba", 0x008E0A, 0x0000102
+.include "data/scripts/gUnk_08008E0A.inc"
 
-gUnk_08008F0C:: @ 08008F0C
-	.incbin "baserom.gba", 0x008F0C, 0x000000A
+.include "data/scripts/gUnk_08008F0C.inc"
 
-gUnk_08008F16:: @ 08008F16
-	.incbin "baserom.gba", 0x008F16, 0x0000010
+.include "data/scripts/gUnk_08008F16.inc"
 
-gUnk_08008F26:: @ 08008F26
-	.incbin "baserom.gba", 0x008F26, 0x000006A
+.include "data/scripts/gUnk_08008F26.inc"
 
-gUnk_08008F90:: @ 08008F90
-	.incbin "baserom.gba", 0x008F90, 0x0000030
+.include "data/scripts/gUnk_08008F90.inc"
 
-gUnk_08008FC0:: @ 08008FC0
-	.incbin "baserom.gba", 0x008FC0, 0x0000011
+.include "data/scripts/gUnk_08008FC0.inc"
 
-gUnk_08008FD1:: @ 08008FD1
-	.incbin "baserom.gba", 0x008FD1, 0x000002B
+.include "data/scripts/gUnk_08008FD1.inc"
 
-gUnk_08008FFC:: @ 08008FFC
-	.incbin "baserom.gba", 0x008FFC, 0x000000C
+.include "data/scripts/gUnk_08008FFC.inc"
 
-gUnk_08009008:: @ 08009008
-	.incbin "baserom.gba", 0x009008, 0x0000017
+.include "data/scripts/gUnk_08009008.inc"
 
-gUnk_0800901F:: @ 0800901F
-	.incbin "baserom.gba", 0x00901F, 0x000001D
+.include "data/scripts/gUnk_0800901F.inc"
 
-gUnk_0800903C:: @ 0800903C
-	.incbin "baserom.gba", 0x00903C, 0x0000044
+.include "data/scripts/gUnk_0800903C.inc"
 
-gUnk_08009080:: @ 08009080
-	.incbin "baserom.gba", 0x009080, 0x000005B
+.include "data/scripts/gUnk_08009080.inc"
 
-gUnk_080090DB:: @ 080090DB
-	.incbin "baserom.gba", 0x0090DB, 0x00000BD
+.include "data/scripts/gUnk_080090DB.inc"
 
-gUnk_08009198:: @ 08009198
-	.incbin "baserom.gba", 0x009198, 0x000006F
+.include "data/scripts/gUnk_08009198.inc"
 
-gUnk_08009207:: @ 08009207
-	.incbin "baserom.gba", 0x009207, 0x000006D
+.include "data/scripts/gUnk_08009207.inc"
 
-gUnk_08009274:: @ 08009274
-	.incbin "baserom.gba", 0x009274, 0x0000034
+.include "data/scripts/gUnk_08009274.inc"
 
-gUnk_080092A8:: @ 080092A8
-	.incbin "baserom.gba", 0x0092A8, 0x000002C
+.include "data/scripts/gUnk_080092A8.inc"
 
-gUnk_080092D4:: @ 080092D4
-	.incbin "baserom.gba", 0x0092D4, 0x000001C
+.include "data/scripts/gUnk_080092D4.inc"
 
-gUnk_080092F0:: @ 080092F0
-	.incbin "baserom.gba", 0x0092F0, 0x0000018
+.include "data/scripts/gUnk_080092F0.inc"
 
-gUnk_08009308:: @ 08009308
-	.incbin "baserom.gba", 0x009308, 0x0000010
+.include "data/scripts/gUnk_08009308.inc"
 
-gUnk_08009318:: @ 08009318
-	.incbin "baserom.gba", 0x009318, 0x0000008
+.include "data/scripts/gUnk_08009318.inc"
 
-gUnk_08009320:: @ 08009320
-	.incbin "baserom.gba", 0x009320, 0x0000020
+.include "data/scripts/gUnk_08009320.inc"
 
-gUnk_08009340:: @ 08009340
-	.incbin "baserom.gba", 0x009340, 0x0000008
+.include "data/scripts/gUnk_08009340.inc"
 
-gUnk_08009348:: @ 08009348
-	.incbin "baserom.gba", 0x009348, 0x000004B
+.include "data/scripts/gUnk_08009348.inc"
 
-gUnk_08009393:: @ 08009393
-	.incbin "baserom.gba", 0x009393, 0x0000044
+.include "data/scripts/gUnk_08009393.inc"
 
-gUnk_080093D7:: @ 080093D7
-	.incbin "baserom.gba", 0x0093D7, 0x0000030
+.include "data/scripts/gUnk_080093D7.inc"
 
-gUnk_08009407:: @ 08009407
-	.incbin "baserom.gba", 0x009407, 0x000007F
+.include "data/scripts/gUnk_08009407.inc"
 
-gUnk_08009486:: @ 08009486
-	.incbin "baserom.gba", 0x009486, 0x000001E
+.include "data/scripts/gUnk_08009486.inc"
 
-gUnk_080094A4:: @ 080094A4
-	.incbin "baserom.gba", 0x0094A4, 0x0000028
+.include "data/scripts/gUnk_080094A4.inc"
 
-gUnk_080094CC:: @ 080094CC
-	.incbin "baserom.gba", 0x0094CC, 0x000000B
+.include "data/scripts/gUnk_080094CC.inc"
 
-gUnk_080094D7:: @ 080094D7
-	.incbin "baserom.gba", 0x0094D7, 0x0000025
+.include "data/scripts/gUnk_080094D7.inc"
 
-gUnk_080094FC:: @ 080094FC
-	.incbin "baserom.gba", 0x0094FC, 0x0000007
+.include "data/scripts/gUnk_080094FC.inc"
 
-gUnk_08009503:: @ 08009503
-	.incbin "baserom.gba", 0x009503, 0x0000005
+.include "data/scripts/gUnk_08009503.inc"
 
-gUnk_08009508:: @ 08009508
-	.incbin "baserom.gba", 0x009508, 0x0000030
+.include "data/scripts/gUnk_08009508.inc"
 
-gUnk_08009538:: @ 08009538
-	.incbin "baserom.gba", 0x009538, 0x000003C
+.include "data/scripts/gUnk_08009538.inc"
 
-gUnk_08009574:: @ 08009574
-	.incbin "baserom.gba", 0x009574, 0x0000058
+.include "data/scripts/gUnk_08009574.inc"
 
-gUnk_080095CC:: @ 080095CC
-	.incbin "baserom.gba", 0x0095CC, 0x0000060
+.include "data/scripts/gUnk_080095CC.inc"
 
-gUnk_0800962C:: @ 0800962C
-	.incbin "baserom.gba", 0x00962C, 0x000006C
+.include "data/scripts/gUnk_0800962C.inc"
 
-gUnk_08009698:: @ 08009698
-	.incbin "baserom.gba", 0x009698, 0x000006C
+.include "data/scripts/gUnk_08009698.inc"
 
-gUnk_08009704:: @ 08009704
-	.incbin "baserom.gba", 0x009704, 0x0000002
+.include "data/scripts/gUnk_08009704.inc"
 
-gUnk_08009706:: @ 08009706
-	.incbin "baserom.gba", 0x009706, 0x000003A
+.include "data/scripts/gUnk_08009706.inc"
 
-gUnk_08009740:: @ 08009740
-	.incbin "baserom.gba", 0x009740, 0x0000038
+.include "data/scripts/gUnk_08009740.inc"
 
-gUnk_08009778:: @ 08009778
-	.incbin "baserom.gba", 0x009778, 0x000000E
+.include "data/scripts/gUnk_08009778.inc"
 
-gUnk_08009786:: @ 08009786
-	.incbin "baserom.gba", 0x009786, 0x000001B
+.include "data/scripts/gUnk_08009786.inc"
 
-gUnk_080097A1:: @ 080097A1
-	.incbin "baserom.gba", 0x0097A1, 0x000004F
+.include "data/scripts/gUnk_080097A1.inc"
 
-gUnk_080097F0:: @ 080097F0
-	.incbin "baserom.gba", 0x0097F0, 0x0000048
+.include "data/scripts/gUnk_080097F0.inc"
 
-gUnk_08009838:: @ 08009838
-	.incbin "baserom.gba", 0x009838, 0x000009C
+.include "data/scripts/gUnk_08009838.inc"
 
-gUnk_080098D4:: @ 080098D4
-	.incbin "baserom.gba", 0x0098D4, 0x0000044
+.include "data/scripts/gUnk_080098D4.inc"
 
-gUnk_08009918:: @ 08009918
-	.incbin "baserom.gba", 0x009918, 0x0000028
+.include "data/scripts/gUnk_08009918.inc"
 
-gUnk_08009940:: @ 08009940
-	.incbin "baserom.gba", 0x009940, 0x0000010
+.include "data/scripts/gUnk_08009940.inc"
 
-gUnk_08009950:: @ 08009950
-	.incbin "baserom.gba", 0x009950, 0x000008C
+.include "data/scripts/gUnk_08009950.inc"
 
-gUnk_080099DC:: @ 080099DC
-	.incbin "baserom.gba", 0x0099DC, 0x0000028
+.include "data/scripts/gUnk_080099DC.inc"
 
-gUnk_08009A04:: @ 08009A04
-	.incbin "baserom.gba", 0x009A04, 0x0000003
+.include "data/scripts/gUnk_08009A04.inc"
 
-gUnk_08009A07:: @ 08009A07
-	.incbin "baserom.gba", 0x009A07, 0x0000025
+.include "data/scripts/gUnk_08009A07.inc"
 
-gUnk_08009A2C:: @ 08009A2C
-	.incbin "baserom.gba", 0x009A2C, 0x0000008
+.include "data/scripts/gUnk_08009A2C.inc"
 
-gUnk_08009A34:: @ 08009A34
-	.incbin "baserom.gba", 0x009A34, 0x000001C
+.include "data/scripts/gUnk_08009A34.inc"
 
-gUnk_08009A50:: @ 08009A50
-	.incbin "baserom.gba", 0x009A50, 0x0000027
+.include "data/scripts/gUnk_08009A50.inc"
 
-gUnk_08009A77:: @ 08009A77
-	.incbin "baserom.gba", 0x009A77, 0x000000A
+.include "data/scripts/gUnk_08009A77.inc"
 
-gUnk_08009A81:: @ 08009A81
-	.incbin "baserom.gba", 0x009A81, 0x0000003
+.include "data/scripts/gUnk_08009A81.inc"
 
-gUnk_08009A84:: @ 08009A84
-	.incbin "baserom.gba", 0x009A84, 0x0000037
+.include "data/scripts/gUnk_08009A84.inc"
 
-gUnk_08009ABB:: @ 08009ABB
-	.incbin "baserom.gba", 0x009ABB, 0x000003D
+.include "data/scripts/gUnk_08009ABB.inc"
 
-gUnk_08009AF8:: @ 08009AF8
-	.incbin "baserom.gba", 0x009AF8, 0x0000038
+.include "data/scripts/gUnk_08009AF8.inc"
 
-gUnk_08009B30:: @ 08009B30
-	.incbin "baserom.gba", 0x009B30, 0x0000033
+.include "data/scripts/gUnk_08009B30.inc"
 
-gUnk_08009B63:: @ 08009B63
-	.incbin "baserom.gba", 0x009B63, 0x0000015
+.include "data/scripts/gUnk_08009B63.inc"
 
-gUnk_08009B78:: @ 08009B78
-	.incbin "baserom.gba", 0x009B78, 0x00000F0
+.include "data/scripts/gUnk_08009B78.inc"
 
-gUnk_08009C68:: @ 08009C68
-	.incbin "baserom.gba", 0x009C68, 0x0000017
+.include "data/scripts/gUnk_08009C68.inc"
 
-gUnk_08009C7F:: @ 08009C7F
-	.incbin "baserom.gba", 0x009C7F, 0x000001F
+.include "data/scripts/gUnk_08009C7F.inc"
 
-gUnk_08009C9E:: @ 08009C9E
-	.incbin "baserom.gba", 0x009C9E, 0x0000062
+.include "data/scripts/gUnk_08009C9E.inc"
 
-gUnk_08009D00:: @ 08009D00
-	.incbin "baserom.gba", 0x009D00, 0x000006C
+.include "data/scripts/gUnk_08009D00.inc"
 
-gUnk_08009D6C:: @ 08009D6C
-	.incbin "baserom.gba", 0x009D6C, 0x000000B
+.include "data/scripts/gUnk_08009D6C.inc"
 
-gUnk_08009D77:: @ 08009D77
-	.incbin "baserom.gba", 0x009D77, 0x0000039
+.include "data/scripts/gUnk_08009D77.inc"
 
-gUnk_08009DB0:: @ 08009DB0
-	.incbin "baserom.gba", 0x009DB0, 0x000003C
+.include "data/scripts/gUnk_08009DB0.inc"
 
-gUnk_08009DEC:: @ 08009DEC
-	.incbin "baserom.gba", 0x009DEC, 0x000004C
+.include "data/scripts/gUnk_08009DEC.inc"
 
-gUnk_08009E38:: @ 08009E38
-	.incbin "baserom.gba", 0x009E38, 0x0000020
+.include "data/scripts/gUnk_08009E38.inc"
 
-gUnk_08009E58:: @ 08009E58
-	.incbin "baserom.gba", 0x009E58, 0x0000030
+.include "data/scripts/gUnk_08009E58.inc"
 
-gUnk_08009E88:: @ 08009E88
-	.incbin "baserom.gba", 0x009E88, 0x0000016
+.include "data/scripts/gUnk_08009E88.inc"
 
-gUnk_08009E9E:: @ 08009E9E
-	.incbin "baserom.gba", 0x009E9E, 0x000000B
+.include "data/scripts/gUnk_08009E9E.inc"
 
-gUnk_08009EA9:: @ 08009EA9
-	.incbin "baserom.gba", 0x009EA9, 0x000000E
+.include "data/scripts/gUnk_08009EA9.inc"
 
-gUnk_08009EB7:: @ 08009EB7
-	.incbin "baserom.gba", 0x009EB7, 0x0000015
+.include "data/scripts/gUnk_08009EB7.inc"
 
-gUnk_08009ECC:: @ 08009ECC
-	.incbin "baserom.gba", 0x009ECC, 0x0000024
+.include "data/scripts/gUnk_08009ECC.inc"
 
-gUnk_08009EF0:: @ 08009EF0
-	.incbin "baserom.gba", 0x009EF0, 0x0000017
+.include "data/scripts/gUnk_08009EF0.inc"
 
-gUnk_08009F07:: @ 08009F07
-	.incbin "baserom.gba", 0x009F07, 0x000000D
+.include "data/scripts/gUnk_08009F07.inc"
 
-gUnk_08009F14:: @ 08009F14
-	.incbin "baserom.gba", 0x009F14, 0x0000025
+.include "data/scripts/gUnk_08009F14.inc"
 
-gUnk_08009F39:: @ 08009F39
-	.incbin "baserom.gba", 0x009F39, 0x0000039
+.include "data/scripts/gUnk_08009F39.inc"
 
-gUnk_08009F72:: @ 08009F72
-	.incbin "baserom.gba", 0x009F72, 0x00000F2
+.include "data/scripts/gUnk_08009F72.inc"
 
-gUnk_0800A064:: @ 0800A064
-	.incbin "baserom.gba", 0x00A064, 0x000001D
+.include "data/scripts/gUnk_0800A064.inc"
 
-gUnk_0800A081:: @ 0800A081
-	.incbin "baserom.gba", 0x00A081, 0x0000033
+.include "data/scripts/gUnk_0800A081.inc"
 
-gUnk_0800A0B4:: @ 0800A0B4
-	.incbin "baserom.gba", 0x00A0B4, 0x0000048
+.include "data/scripts/gUnk_0800A0B4.inc"
 
-gUnk_0800A0FC:: @ 0800A0FC
-	.incbin "baserom.gba", 0x00A0FC, 0x000000E
+.include "data/scripts/gUnk_0800A0FC.inc"
 
-gUnk_0800A10A:: @ 0800A10A
-	.incbin "baserom.gba", 0x00A10A, 0x0000005
+.include "data/scripts/gUnk_0800A10A.inc"
 
-gUnk_0800A10F:: @ 0800A10F
-	.incbin "baserom.gba", 0x00A10F, 0x0000015
+.include "data/scripts/gUnk_0800A10F.inc"
 
-gUnk_0800A124:: @ 0800A124
-	.incbin "baserom.gba", 0x00A124, 0x0000010
+.include "data/scripts/gUnk_0800A124.inc"
 
-gUnk_0800A134:: @ 0800A134
-	.incbin "baserom.gba", 0x00A134, 0x0000080
+.include "data/scripts/gUnk_0800A134.inc"
 
-gUnk_0800A1B4:: @ 0800A1B4
-	.incbin "baserom.gba", 0x00A1B4, 0x0000024
+.include "data/scripts/gUnk_0800A1B4.inc"
 
-gUnk_0800A1D8:: @ 0800A1D8
-	.incbin "baserom.gba", 0x00A1D8, 0x000004C
+.include "data/scripts/gUnk_0800A1D8.inc"
 
-gUnk_0800A224:: @ 0800A224
-	.incbin "baserom.gba", 0x00A224, 0x000003C
+.include "data/scripts/gUnk_0800A224.inc"
 
-gUnk_0800A260:: @ 0800A260
-	.incbin "baserom.gba", 0x00A260, 0x00000E0
+.include "data/scripts/gUnk_0800A260.inc"
 
-gUnk_0800A340:: @ 0800A340
-	.incbin "baserom.gba", 0x00A340, 0x0000063
+.include "data/scripts/gUnk_0800A340.inc"
 
-gUnk_0800A3A3:: @ 0800A3A3
-	.incbin "baserom.gba", 0x00A3A3, 0x0000006
+.include "data/scripts/gUnk_0800A3A3.inc"
 
-gUnk_0800A3A9:: @ 0800A3A9
-	.incbin "baserom.gba", 0x00A3A9, 0x0000001
+.include "data/scripts/gUnk_0800A3A9.inc"
 
-gUnk_0800A3AA:: @ 0800A3AA
-	.incbin "baserom.gba", 0x00A3AA, 0x000002E
+.include "data/scripts/gUnk_0800A3AA.inc"
 
-gUnk_0800A3D8:: @ 0800A3D8
-	.incbin "baserom.gba", 0x00A3D8, 0x0000128
+.include "data/scripts/gUnk_0800A3D8.inc"
 
-gUnk_0800A500:: @ 0800A500
-	.incbin "baserom.gba", 0x00A500, 0x0000090
+.include "data/scripts/gUnk_0800A500.inc"
 
-gUnk_0800A590:: @ 0800A590
-	.incbin "baserom.gba", 0x00A590, 0x0000016
+.include "data/scripts/gUnk_0800A590.inc"
 
-gUnk_0800A5A6:: @ 0800A5A6
-	.incbin "baserom.gba", 0x00A5A6, 0x00000B6
+.include "data/scripts/gUnk_0800A5A6.inc"
 
-gUnk_0800A65C:: @ 0800A65C
-	.incbin "baserom.gba", 0x00A65C, 0x0000022
+.include "data/scripts/gUnk_0800A65C.inc"
 
-gUnk_0800A67E:: @ 0800A67E
-	.incbin "baserom.gba", 0x00A67E, 0x0000002
+.include "data/scripts/gUnk_0800A67E.inc"
 
-gUnk_0800A680:: @ 0800A680
-	.incbin "baserom.gba", 0x00A680, 0x0000024
+.include "data/scripts/gUnk_0800A680.inc"
 
-gUnk_0800A6A4:: @ 0800A6A4
-	.incbin "baserom.gba", 0x00A6A4, 0x0000007
+.include "data/scripts/gUnk_0800A6A4.inc"
 
-gUnk_0800A6AB:: @ 0800A6AB
-	.incbin "baserom.gba", 0x00A6AB, 0x0000029
+.include "data/scripts/gUnk_0800A6AB.inc"
 
-gUnk_0800A6D4:: @ 0800A6D4
-	.incbin "baserom.gba", 0x00A6D4, 0x0000030
+.include "data/scripts/gUnk_0800A6D4.inc"
 
-gUnk_0800A704:: @ 0800A704
-	.incbin "baserom.gba", 0x00A704, 0x0000030
+.include "data/scripts/gUnk_0800A704.inc"
 
-gUnk_0800A734:: @ 0800A734
-	.incbin "baserom.gba", 0x00A734, 0x0000016
+.include "data/scripts/gUnk_0800A734.inc"
 
-gUnk_0800A74A:: @ 0800A74A
-	.incbin "baserom.gba", 0x00A74A, 0x000001A
+.include "data/scripts/gUnk_0800A74A.inc"
 
-gUnk_0800A764:: @ 0800A764
-	.incbin "baserom.gba", 0x00A764, 0x0000080
+.include "data/scripts/gUnk_0800A764.inc"
 
-gUnk_0800A7E4:: @ 0800A7E4
-	.incbin "baserom.gba", 0x00A7E4, 0x0000004
+.include "data/scripts/gUnk_0800A7E4.inc"
 
-gUnk_0800A7E8:: @ 0800A7E8
-	.incbin "baserom.gba", 0x00A7E8, 0x000002E
+.include "data/scripts/gUnk_0800A7E8.inc"
 
-gUnk_0800A816:: @ 0800A816
-	.incbin "baserom.gba", 0x00A816, 0x000000A
+.include "data/scripts/gUnk_0800A816.inc"
 
-gUnk_0800A820:: @ 0800A820
-	.incbin "baserom.gba", 0x00A820, 0x000003C
+.include "data/scripts/gUnk_0800A820.inc"
 
-gUnk_0800A85C:: @ 0800A85C
-	.incbin "baserom.gba", 0x00A85C, 0x000003C
+.include "data/scripts/gUnk_0800A85C.inc"
 
-gUnk_0800A898:: @ 0800A898
-	.incbin "baserom.gba", 0x00A898, 0x000003C
+.include "data/scripts/gUnk_0800A898.inc"
 
-gUnk_0800A8D4:: @ 0800A8D4
-	.incbin "baserom.gba", 0x00A8D4, 0x0000034
+.include "data/scripts/gUnk_0800A8D4.inc"
 
-gUnk_0800A908:: @ 0800A908
-	.incbin "baserom.gba", 0x00A908, 0x0000008
+.include "data/scripts/gUnk_0800A908.inc"
 
-gUnk_0800A910:: @ 0800A910
-	.incbin "baserom.gba", 0x00A910, 0x0000054
+.include "data/scripts/gUnk_0800A910.inc"
 
-gUnk_0800A964:: @ 0800A964
-	.incbin "baserom.gba", 0x00A964, 0x0000024
+.include "data/scripts/gUnk_0800A964.inc"
 
-gUnk_0800A988:: @ 0800A988
-	.incbin "baserom.gba", 0x00A988, 0x0000024
+.include "data/scripts/gUnk_0800A988.inc"
 
-gUnk_0800A9AC:: @ 0800A9AC
-	.incbin "baserom.gba", 0x00A9AC, 0x0000024
+.include "data/scripts/gUnk_0800A9AC.inc"
 
-gUnk_0800A9D0:: @ 0800A9D0
-	.incbin "baserom.gba", 0x00A9D0, 0x0000024
+.include "data/scripts/gUnk_0800A9D0.inc"
 
-gUnk_0800A9F4:: @ 0800A9F4
-	.incbin "baserom.gba", 0x00A9F4, 0x000000F
+.include "data/scripts/gUnk_0800A9F4.inc"
 
-gUnk_0800AA03:: @ 0800AA03
-	.incbin "baserom.gba", 0x00AA03, 0x0000045
+.include "data/scripts/gUnk_0800AA03.inc"
 
-gUnk_0800AA48:: @ 0800AA48
-	.incbin "baserom.gba", 0x00AA48, 0x0000024
+.include "data/scripts/gUnk_0800AA48.inc"
 
-gUnk_0800AA6C:: @ 0800AA6C
-	.incbin "baserom.gba", 0x00AA6C, 0x0000024
+.include "data/scripts/gUnk_0800AA6C.inc"
 
-gUnk_0800AA90:: @ 0800AA90
-	.incbin "baserom.gba", 0x00AA90, 0x0000024
+.include "data/scripts/gUnk_0800AA90.inc"
 
-gUnk_0800AAB4:: @ 0800AAB4
-	.incbin "baserom.gba", 0x00AAB4, 0x0000024
+.include "data/scripts/gUnk_0800AAB4.inc"
 
-gUnk_0800AAD8:: @ 0800AAD8
-	.incbin "baserom.gba", 0x00AAD8, 0x0000030
+.include "data/scripts/gUnk_0800AAD8.inc"
 
-gUnk_0800AB08:: @ 0800AB08
-	.incbin "baserom.gba", 0x00AB08, 0x000001B
+.include "data/scripts/gUnk_0800AB08.inc"
 
-gUnk_0800AB23:: @ 0800AB23
-	.incbin "baserom.gba", 0x00AB23, 0x000002C
+.include "data/scripts/gUnk_0800AB23.inc"
 
-gUnk_0800AB4F:: @ 0800AB4F
-	.incbin "baserom.gba", 0x00AB4F, 0x00000A1
+.include "data/scripts/gUnk_0800AB4F.inc"
 
-gUnk_0800ABF0:: @ 0800ABF0
-	.incbin "baserom.gba", 0x00ABF0, 0x0000034
+.include "data/scripts/gUnk_0800ABF0.inc"
 
-gUnk_0800AC24:: @ 0800AC24
-	.incbin "baserom.gba", 0x00AC24, 0x0000049
+.include "data/scripts/gUnk_0800AC24.inc"
 
-gUnk_0800AC6D:: @ 0800AC6D
-	.incbin "baserom.gba", 0x00AC6D, 0x0000048
+.include "data/scripts/gUnk_0800AC6D.inc"
 
-gUnk_0800ACB5:: @ 0800ACB5
-	.incbin "baserom.gba", 0x00ACB5, 0x0000007
+.include "data/scripts/gUnk_0800ACB5.inc"
 
-gUnk_0800ACBC:: @ 0800ACBC
-	.incbin "baserom.gba", 0x00ACBC, 0x0000024
+.include "data/scripts/gUnk_0800ACBC.inc"
 
-gUnk_0800ACE0:: @ 0800ACE0
-	.incbin "baserom.gba", 0x00ACE0, 0x0000074
+.include "data/scripts/gUnk_0800ACE0.inc"
 
-gUnk_0800AD54:: @ 0800AD54
-	.incbin "baserom.gba", 0x00AD54, 0x0000020
+.include "data/scripts/gUnk_0800AD54.inc"
 
-gUnk_0800AD74:: @ 0800AD74
-	.incbin "baserom.gba", 0x00AD74, 0x0000033
+.include "data/scripts/gUnk_0800AD74.inc"
 
-gUnk_0800ADA7:: @ 0800ADA7
-	.incbin "baserom.gba", 0x00ADA7, 0x000000D
+.include "data/scripts/gUnk_0800ADA7.inc"
 
-gUnk_0800ADB4:: @ 0800ADB4
-	.incbin "baserom.gba", 0x00ADB4, 0x00000F0
+.include "data/scripts/gUnk_0800ADB4.inc"
 
-gUnk_0800AEA4:: @ 0800AEA4
-	.incbin "baserom.gba", 0x00AEA4, 0x0000038
+.include "data/scripts/gUnk_0800AEA4.inc"
 
-gUnk_0800AEDC:: @ 0800AEDC
-	.incbin "baserom.gba", 0x00AEDC, 0x000003C
+.include "data/scripts/gUnk_0800AEDC.inc"
 
-gUnk_0800AF18:: @ 0800AF18
-	.incbin "baserom.gba", 0x00AF18, 0x000002C
+.include "data/scripts/gUnk_0800AF18.inc"
 
-gUnk_0800AF44:: @ 0800AF44
-	.incbin "baserom.gba", 0x00AF44, 0x0000024
+.include "data/scripts/gUnk_0800AF44.inc"
 
-gUnk_0800AF68:: @ 0800AF68
-	.incbin "baserom.gba", 0x00AF68, 0x0000016
+.include "data/scripts/gUnk_0800AF68.inc"
 
-gUnk_0800AF7E:: @ 0800AF7E
-	.incbin "baserom.gba", 0x00AF7E, 0x000000E
+.include "data/scripts/gUnk_0800AF7E.inc"
 
-gUnk_0800AF8C:: @ 0800AF8C
-	.incbin "baserom.gba", 0x00AF8C, 0x000001B
+.include "data/scripts/gUnk_0800AF8C.inc"
 
-gUnk_0800AFA7:: @ 0800AFA7
-	.incbin "baserom.gba", 0x00AFA7, 0x0000009
+.include "data/scripts/gUnk_0800AFA7.inc"
 
-gUnk_0800AFB0:: @ 0800AFB0
-	.incbin "baserom.gba", 0x00AFB0, 0x0000038
+.include "data/scripts/gUnk_0800AFB0.inc"
 
-gUnk_0800AFE8:: @ 0800AFE8
-	.incbin "baserom.gba", 0x00AFE8, 0x0000024
+.include "data/scripts/gUnk_0800AFE8.inc"
 
-gUnk_0800B00C:: @ 0800B00C
-	.incbin "baserom.gba", 0x00B00C, 0x00000A0
+.include "data/scripts/gUnk_0800B00C.inc"
 
-gUnk_0800B0AC:: @ 0800B0AC
-	.incbin "baserom.gba", 0x00B0AC, 0x0000004
+.include "data/scripts/gUnk_0800B0AC.inc"
 
-gUnk_0800B0B0:: @ 0800B0B0
-	.incbin "baserom.gba", 0x00B0B0, 0x0000020
+.include "data/scripts/gUnk_0800B0B0.inc"
 
-gUnk_0800B0D0:: @ 0800B0D0
-	.incbin "baserom.gba", 0x00B0D0, 0x00000A7
+.include "data/scripts/gUnk_0800B0D0.inc"
 
-gUnk_0800B177:: @ 0800B177
-	.incbin "baserom.gba", 0x00B177, 0x0000005
+.include "data/scripts/gUnk_0800B177.inc"
 
-gUnk_0800B17C:: @ 0800B17C
-	.incbin "baserom.gba", 0x00B17C, 0x0000044
+.include "data/scripts/gUnk_0800B17C.inc"
 
-gUnk_0800B1C0:: @ 0800B1C0
-	.incbin "baserom.gba", 0x00B1C0, 0x0000040
+.include "data/scripts/gUnk_0800B1C0.inc"
 
-gUnk_0800B200:: @ 0800B200
-	.incbin "baserom.gba", 0x00B200, 0x0000054
+.include "data/scripts/gUnk_0800B200.inc"
 
-gUnk_0800B254:: @ 0800B254
-	.incbin "baserom.gba", 0x00B254, 0x0000030
+.include "data/scripts/gUnk_0800B254.inc"
 
-gUnk_0800B284:: @ 0800B284
-	.incbin "baserom.gba", 0x00B284, 0x0000030
+.include "data/scripts/gUnk_0800B284.inc"
 
-gUnk_0800B2B4:: @ 0800B2B4
-	.incbin "baserom.gba", 0x00B2B4, 0x0000054
+.include "data/scripts/gUnk_0800B2B4.inc"
 
-gUnk_0800B308:: @ 0800B308
-	.incbin "baserom.gba", 0x00B308, 0x000001A
+.include "data/scripts/gUnk_0800B308.inc"
 
-gUnk_0800B322:: @ 0800B322
-	.incbin "baserom.gba", 0x00B322, 0x0000007
+.include "data/scripts/gUnk_0800B322.inc"
 
-gUnk_0800B329:: @ 0800B329
-	.incbin "baserom.gba", 0x00B329, 0x000001F
+.include "data/scripts/gUnk_0800B329.inc"
 
-gUnk_0800B348:: @ 0800B348
-	.incbin "baserom.gba", 0x00B348, 0x0000014
+.include "data/scripts/gUnk_0800B348.inc"
 
-gUnk_0800B35C:: @ 0800B35C
-	.incbin "baserom.gba", 0x00B35C, 0x0000018
+.include "data/scripts/gUnk_0800B35C.inc"
 
-gUnk_0800B374:: @ 0800B374
-	.incbin "baserom.gba", 0x00B374, 0x0000030
+.include "data/scripts/gUnk_0800B374.inc"
 
-gUnk_0800B3A4:: @ 0800B3A4
-	.incbin "baserom.gba", 0x00B3A4, 0x000006B
+.include "data/scripts/gUnk_0800B3A4.inc"
 
-gUnk_0800B40F:: @ 0800B40F
-	.incbin "baserom.gba", 0x00B40F, 0x000000D
+.include "data/scripts/gUnk_0800B40F.inc"
 
-gUnk_0800B41C:: @ 0800B41C
-	.incbin "baserom.gba", 0x00B41C, 0x0000090
+.include "data/scripts/gUnk_0800B41C.inc"
 
-gUnk_0800B4AC:: @ 0800B4AC
-	.incbin "baserom.gba", 0x00B4AC, 0x000005C
+.include "data/scripts/gUnk_0800B4AC.inc"
 
-gUnk_0800B508:: @ 0800B508
-	.incbin "baserom.gba", 0x00B508, 0x0000007
+.include "data/scripts/gUnk_0800B508.inc"
 
-gUnk_0800B50F:: @ 0800B50F
-	.incbin "baserom.gba", 0x00B50F, 0x000003D
+.include "data/scripts/gUnk_0800B50F.inc"
 
-gUnk_0800B54C:: @ 0800B54C
-	.incbin "baserom.gba", 0x00B54C, 0x0000028
+.include "data/scripts/gUnk_0800B54C.inc"
 
-gUnk_0800B574:: @ 0800B574
-	.incbin "baserom.gba", 0x00B574, 0x0000050
+.include "data/scripts/gUnk_0800B574.inc"
 
-gUnk_0800B5C4:: @ 0800B5C4
-	.incbin "baserom.gba", 0x00B5C4, 0x0000028
+.include "data/scripts/gUnk_0800B5C4.inc"
 
-gUnk_0800B5EC:: @ 0800B5EC
-	.incbin "baserom.gba", 0x00B5EC, 0x0000028
+.include "data/scripts/gUnk_0800B5EC.inc"
 
-gUnk_0800B614:: @ 0800B614
-	.incbin "baserom.gba", 0x00B614, 0x00000B4
+.include "data/scripts/gUnk_0800B614.inc"
 
-gUnk_0800B6C8:: @ 0800B6C8
-	.incbin "baserom.gba", 0x00B6C8, 0x0000040
+.include "data/scripts/gUnk_0800B6C8.inc"
 
-gUnk_0800B708:: @ 0800B708
-	.incbin "baserom.gba", 0x00B708, 0x0000017
+.include "data/scripts/gUnk_0800B708.inc"
 
-gUnk_0800B71F:: @ 0800B71F
-	.incbin "baserom.gba", 0x00B71F, 0x0000011
+.include "data/scripts/gUnk_0800B71F.inc"
 
-gUnk_0800B730:: @ 0800B730
-	.incbin "baserom.gba", 0x00B730, 0x0000094
+.include "data/scripts/gUnk_0800B730.inc"
 
-gUnk_0800B7C4:: @ 0800B7C4
-	.incbin "baserom.gba", 0x00B7C4, 0x000008B
+.include "data/scripts/gUnk_0800B7C4.inc"
 
-gUnk_0800B84F:: @ 0800B84F
-	.incbin "baserom.gba", 0x00B84F, 0x0000012
+.include "data/scripts/gUnk_0800B84F.inc"
 
-gUnk_0800B861:: @ 0800B861
-	.incbin "baserom.gba", 0x00B861, 0x0000027
+.include "data/scripts/gUnk_0800B861.inc"
 
-gUnk_0800B888:: @ 0800B888
-	.incbin "baserom.gba", 0x00B888, 0x0000018
+.include "data/scripts/gUnk_0800B888.inc"
 
-gUnk_0800B8A0:: @ 0800B8A0
-	.incbin "baserom.gba", 0x00B8A0, 0x0000018
+.include "data/scripts/gUnk_0800B8A0.inc"
 
-gUnk_0800B8B8:: @ 0800B8B8
-	.incbin "baserom.gba", 0x00B8B8, 0x000002C
+.include "data/scripts/gUnk_0800B8B8.inc"
 
-gUnk_0800B8E4:: @ 0800B8E4
-	.incbin "baserom.gba", 0x00B8E4, 0x0000022
+.include "data/scripts/gUnk_0800B8E4.inc"
 
-gUnk_0800B906:: @ 0800B906
-	.incbin "baserom.gba", 0x00B906, 0x0000016
+.include "data/scripts/gUnk_0800B906.inc"
 
-gUnk_0800B91C:: @ 0800B91C
-	.incbin "baserom.gba", 0x00B91C, 0x0000048
+.include "data/scripts/gUnk_0800B91C.inc"
 
-gUnk_0800B964:: @ 0800B964
-	.incbin "baserom.gba", 0x00B964, 0x0000050
+.include "data/scripts/gUnk_0800B964.inc"
 
-gUnk_0800B9B4:: @ 0800B9B4
-	.incbin "baserom.gba", 0x00B9B4, 0x0000088
+.include "data/scripts/gUnk_0800B9B4.inc"
 
-gUnk_0800BA3C:: @ 0800BA3C
-	.incbin "baserom.gba", 0x00BA3C, 0x000003C
+.include "data/scripts/gUnk_0800BA3C.inc"
 
-gUnk_0800BA78:: @ 0800BA78
-	.incbin "baserom.gba", 0x00BA78, 0x0000054
+.include "data/scripts/gUnk_0800BA78.inc"
 
-gUnk_0800BACC:: @ 0800BACC
-	.incbin "baserom.gba", 0x00BACC, 0x0000034
+.include "data/scripts/gUnk_0800BACC.inc"
 
-gUnk_0800BB00:: @ 0800BB00
-	.incbin "baserom.gba", 0x00BB00, 0x0000008
+.include "data/scripts/gUnk_0800BB00.inc"
 
-gUnk_0800BB08:: @ 0800BB08
-	.incbin "baserom.gba", 0x00BB08, 0x0000012
+.include "data/scripts/gUnk_0800BB08.inc"
 
-gUnk_0800BB1A:: @ 0800BB1A
-	.incbin "baserom.gba", 0x00BB1A, 0x0000016
+.include "data/scripts/gUnk_0800BB1A.inc"
 
-gUnk_0800BB30:: @ 0800BB30
-	.incbin "baserom.gba", 0x00BB30, 0x0000034
+.include "data/scripts/gUnk_0800BB30.inc"
 
-gUnk_0800BB64:: @ 0800BB64
-	.incbin "baserom.gba", 0x00BB64, 0x0000010
+.include "data/scripts/gUnk_0800BB64.inc"
 
-gUnk_0800BB74:: @ 0800BB74
-	.incbin "baserom.gba", 0x00BB74, 0x0000030
+.include "data/scripts/gUnk_0800BB74.inc"
 
-gUnk_0800BBA4:: @ 0800BBA4
-	.incbin "baserom.gba", 0x00BBA4, 0x0000037
+.include "data/scripts/gUnk_0800BBA4.inc"
 
-gUnk_0800BBDB:: @ 0800BBDB
-	.incbin "baserom.gba", 0x00BBDB, 0x0000001
+.include "data/scripts/gUnk_0800BBDB.inc"
 
-gUnk_0800BBDC:: @ 0800BBDC
-	.incbin "baserom.gba", 0x00BBDC, 0x000002C
+.include "data/scripts/gUnk_0800BBDC.inc"
 
-gUnk_0800BC08:: @ 0800BC08
-	.incbin "baserom.gba", 0x00BC08, 0x000001A
+.include "data/scripts/gUnk_0800BC08.inc"
 
-gUnk_0800BC22:: @ 0800BC22
-	.incbin "baserom.gba", 0x00BC22, 0x000002E
+.include "data/scripts/gUnk_0800BC22.inc"
 
-gUnk_0800BC50:: @ 0800BC50
-	.incbin "baserom.gba", 0x00BC50, 0x000005E
+.include "data/scripts/gUnk_0800BC50.inc"
 
-gUnk_0800BCAE:: @ 0800BCAE
-	.incbin "baserom.gba", 0x00BCAE, 0x0000009
+.include "data/scripts/gUnk_0800BCAE.inc"
 
-gUnk_0800BCB7:: @ 0800BCB7
-	.incbin "baserom.gba", 0x00BCB7, 0x0000007
+.include "data/scripts/gUnk_0800BCB7.inc"
 
-gUnk_0800BCBE:: @ 0800BCBE
-	.incbin "baserom.gba", 0x00BCBE, 0x000002A
+.include "data/scripts/gUnk_0800BCBE.inc"
 
-gUnk_0800BCE8:: @ 0800BCE8
-	.incbin "baserom.gba", 0x00BCE8, 0x0000020
+.include "data/scripts/gUnk_0800BCE8.inc"
 
-gUnk_0800BD08:: @ 0800BD08
-	.incbin "baserom.gba", 0x00BD08, 0x0000068
+.include "data/scripts/gUnk_0800BD08.inc"
 
-gUnk_0800BD70:: @ 0800BD70
-	.incbin "baserom.gba", 0x00BD70, 0x0000008
+.include "data/scripts/gUnk_0800BD70.inc"
 
-gUnk_0800BD78:: @ 0800BD78
-	.incbin "baserom.gba", 0x00BD78, 0x0000034
+.include "data/scripts/gUnk_0800BD78.inc"
 
-gUnk_0800BDAC:: @ 0800BDAC
-	.incbin "baserom.gba", 0x00BDAC, 0x0000018
+.include "data/scripts/gUnk_0800BDAC.inc"
 
-gUnk_0800BDC4:: @ 0800BDC4
-	.incbin "baserom.gba", 0x00BDC4, 0x0000058
+.include "data/scripts/gUnk_0800BDC4.inc"
 
-gUnk_0800BE1C:: @ 0800BE1C
-	.incbin "baserom.gba", 0x00BE1C, 0x0000038
+.include "data/scripts/gUnk_0800BE1C.inc"
 
-gUnk_0800BE54:: @ 0800BE54
-	.incbin "baserom.gba", 0x00BE54, 0x0000078
+.include "data/scripts/gUnk_0800BE54.inc"
 
-gUnk_0800BECC:: @ 0800BECC
-	.incbin "baserom.gba", 0x00BECC, 0x0000048
+.include "data/scripts/gUnk_0800BECC.inc"
 
-gUnk_0800BF14:: @ 0800BF14
-	.incbin "baserom.gba", 0x00BF14, 0x0000024
+.include "data/scripts/gUnk_0800BF14.inc"
 
-gUnk_0800BF38:: @ 0800BF38
-	.incbin "baserom.gba", 0x00BF38, 0x0000012
+.include "data/scripts/gUnk_0800BF38.inc"
 
-gUnk_0800BF4A:: @ 0800BF4A
-	.incbin "baserom.gba", 0x00BF4A, 0x0000026
+.include "data/scripts/gUnk_0800BF4A.inc"
 
-gUnk_0800BF70:: @ 0800BF70
-	.incbin "baserom.gba", 0x00BF70, 0x000004F
+.include "data/scripts/gUnk_0800BF70.inc"
 
-gUnk_0800BFBF:: @ 0800BFBF
-	.incbin "baserom.gba", 0x00BFBF, 0x0000022
+.include "data/scripts/gUnk_0800BFBF.inc"
 
-gUnk_0800BFE1:: @ 0800BFE1
-	.incbin "baserom.gba", 0x00BFE1, 0x0000002
+.include "data/scripts/gUnk_0800BFE1.inc"
 
-gUnk_0800BFE3:: @ 0800BFE3
-	.incbin "baserom.gba", 0x00BFE3, 0x0000021
+.include "data/scripts/gUnk_0800BFE3.inc"
 
-gUnk_0800C004:: @ 0800C004
-	.incbin "baserom.gba", 0x00C004, 0x0000003
+.include "data/scripts/gUnk_0800C004.inc"
 
-gUnk_0800C007:: @ 0800C007
-	.incbin "baserom.gba", 0x00C007, 0x000001D
+.include "data/scripts/gUnk_0800C007.inc"
 
-gUnk_0800C024:: @ 0800C024
-	.incbin "baserom.gba", 0x00C024, 0x0000057
+.include "data/scripts/gUnk_0800C024.inc"
 
-gUnk_0800C07B:: @ 0800C07B
-	.incbin "baserom.gba", 0x00C07B, 0x0000035
+.include "data/scripts/gUnk_0800C07B.inc"
 
-gUnk_0800C0B0:: @ 0800C0B0
-	.incbin "baserom.gba", 0x00C0B0, 0x0000017
+.include "data/scripts/gUnk_0800C0B0.inc"
 
-gUnk_0800C0C7:: @ 0800C0C7
-	.incbin "baserom.gba", 0x00C0C7, 0x000000C
+.include "data/scripts/gUnk_0800C0C7.inc"
 
-gUnk_0800C0D3:: @ 0800C0D3
-	.incbin "baserom.gba", 0x00C0D3, 0x0000015
+.include "data/scripts/gUnk_0800C0D3.inc"
 
-gUnk_0800C0E8:: @ 0800C0E8
-	.incbin "baserom.gba", 0x00C0E8, 0x000002B
+.include "data/scripts/gUnk_0800C0E8.inc"
 
-gUnk_0800C113:: @ 0800C113
-	.incbin "baserom.gba", 0x00C113, 0x0000034
+.include "data/scripts/gUnk_0800C113.inc"
 
-gUnk_0800C147:: @ 0800C147
-	.incbin "baserom.gba", 0x00C147, 0x0000019
+.include "data/scripts/gUnk_0800C147.inc"
 
-gUnk_0800C160:: @ 0800C160
-	.incbin "baserom.gba", 0x00C160, 0x0000078
+.include "data/scripts/gUnk_0800C160.inc"
 
-gUnk_0800C1D8:: @ 0800C1D8
-	.incbin "baserom.gba", 0x00C1D8, 0x000002C
+.include "data/scripts/gUnk_0800C1D8.inc"
 
-gUnk_0800C204:: @ 0800C204
-	.incbin "baserom.gba", 0x00C204, 0x0000003
+.include "data/scripts/gUnk_0800C204.inc"
 
-gUnk_0800C207:: @ 0800C207
-	.incbin "baserom.gba", 0x00C207, 0x0000001
+.include "data/scripts/gUnk_0800C207.inc"
 
-gUnk_0800C208:: @ 0800C208
-	.incbin "baserom.gba", 0x00C208, 0x0000008
+.include "data/scripts/gUnk_0800C208.inc"
 
-gUnk_0800C210:: @ 0800C210
-	.incbin "baserom.gba", 0x00C210, 0x0000053
+.include "data/scripts/gUnk_0800C210.inc"
 
-gUnk_0800C263:: @ 0800C263
-	.incbin "baserom.gba", 0x00C263, 0x0000041
+.include "data/scripts/gUnk_0800C263.inc"
 
-gUnk_0800C2A4:: @ 0800C2A4
-	.incbin "baserom.gba", 0x00C2A4, 0x0000003
+.include "data/scripts/gUnk_0800C2A4.inc"
 
-gUnk_0800C2A7:: @ 0800C2A7
-	.incbin "baserom.gba", 0x00C2A7, 0x0000027
+.include "data/scripts/gUnk_0800C2A7.inc"
 
-gUnk_0800C2CE:: @ 0800C2CE
-	.incbin "baserom.gba", 0x00C2CE, 0x0000082
+.include "data/scripts/gUnk_0800C2CE.inc"
 
-gUnk_0800C350:: @ 0800C350
-	.incbin "baserom.gba", 0x00C350, 0x0000046
+.include "data/scripts/gUnk_0800C350.inc"
 
-gUnk_0800C396:: @ 0800C396
-	.incbin "baserom.gba", 0x00C396, 0x0000036
+.include "data/scripts/gUnk_0800C396.inc"
 
-gUnk_0800C3CC:: @ 0800C3CC
-	.incbin "baserom.gba", 0x00C3CC, 0x000003C
+.include "data/scripts/gUnk_0800C3CC.inc"
 
-gUnk_0800C408:: @ 0800C408
-	.incbin "baserom.gba", 0x00C408, 0x0000008
+.include "data/scripts/gUnk_0800C408.inc"
 
-gUnk_0800C410:: @ 0800C410
-	.incbin "baserom.gba", 0x00C410, 0x000004C
+.include "data/scripts/gUnk_0800C410.inc"
 
-gUnk_0800C45C:: @ 0800C45C
-	.incbin "baserom.gba", 0x00C45C, 0x0000038
+.include "data/scripts/gUnk_0800C45C.inc"
 
-gUnk_0800C494:: @ 0800C494
-	.incbin "baserom.gba", 0x00C494, 0x000003C
+.include "data/scripts/gUnk_0800C494.inc"
 
-gUnk_0800C4D0:: @ 0800C4D0
-	.incbin "baserom.gba", 0x00C4D0, 0x000000B
+.include "data/scripts/gUnk_0800C4D0.inc"
 
-gUnk_0800C4DB:: @ 0800C4DB
-	.incbin "baserom.gba", 0x00C4DB, 0x0000031
+.include "data/scripts/gUnk_0800C4DB.inc"
 
-gUnk_0800C50C:: @ 0800C50C
-	.incbin "baserom.gba", 0x00C50C, 0x0000015
+.include "data/scripts/gUnk_0800C50C.inc"
 
-gUnk_0800C521:: @ 0800C521
-	.incbin "baserom.gba", 0x00C521, 0x000002F
+.include "data/scripts/gUnk_0800C521.inc"
 
-gUnk_0800C550:: @ 0800C550
-	.incbin "baserom.gba", 0x00C550, 0x0000006
+.include "data/scripts/gUnk_0800C550.inc"
 
-gUnk_0800C556:: @ 0800C556
-	.incbin "baserom.gba", 0x00C556, 0x000002E
+.include "data/scripts/gUnk_0800C556.inc"
 
-gUnk_0800C584:: @ 0800C584
-	.incbin "baserom.gba", 0x00C584, 0x0000016
+.include "data/scripts/gUnk_0800C584.inc"
 
-gUnk_0800C59A:: @ 0800C59A
-	.incbin "baserom.gba", 0x00C59A, 0x000002E
+.include "data/scripts/gUnk_0800C59A.inc"
 
-gUnk_0800C5C8:: @ 0800C5C8
-	.incbin "baserom.gba", 0x00C5C8, 0x0000034
+.include "data/scripts/gUnk_0800C5C8.inc"
 
-gUnk_0800C5FC:: @ 0800C5FC
-	.incbin "baserom.gba", 0x00C5FC, 0x0000004
+.include "data/scripts/gUnk_0800C5FC.inc"
 
-gUnk_0800C600:: @ 0800C600
-	.incbin "baserom.gba", 0x00C600, 0x0000007
+.include "data/scripts/gUnk_0800C600.inc"
 
-gUnk_0800C607:: @ 0800C607
-	.incbin "baserom.gba", 0x00C607, 0x000002D
+.include "data/scripts/gUnk_0800C607.inc"
 
-gUnk_0800C634:: @ 0800C634
-	.incbin "baserom.gba", 0x00C634, 0x0000092
+.include "data/scripts/gUnk_0800C634.inc"
 
-gUnk_0800C6C6:: @ 0800C6C6
-	.incbin "baserom.gba", 0x00C6C6, 0x00000AE
+.include "data/scripts/gUnk_0800C6C6.inc"
 
-gUnk_0800C774:: @ 0800C774
-	.incbin "baserom.gba", 0x00C774, 0x0000005
+.include "data/scripts/gUnk_0800C774.inc"
 
-gUnk_0800C779:: @ 0800C779
-	.incbin "baserom.gba", 0x00C779, 0x000008F
+.include "data/scripts/gUnk_0800C779.inc"
 
-gUnk_0800C808:: @ 0800C808
-	.incbin "baserom.gba", 0x00C808, 0x0000059
+.include "data/scripts/gUnk_0800C808.inc"
 
-gUnk_0800C861:: @ 0800C861
-	.incbin "baserom.gba", 0x00C861, 0x000004F
+.include "data/scripts/gUnk_0800C861.inc"
 
-gUnk_0800C8B0:: @ 0800C8B0
-	.incbin "baserom.gba", 0x00C8B0, 0x000002A
+.include "data/scripts/gUnk_0800C8B0.inc"
 
-gUnk_0800C8DA:: @ 0800C8DA
-	.incbin "baserom.gba", 0x00C8DA, 0x0000016
+.include "data/scripts/gUnk_0800C8DA.inc"
 
-gUnk_0800C8F0:: @ 0800C8F0
-	.incbin "baserom.gba", 0x00C8F0, 0x000002C
+.include "data/scripts/gUnk_0800C8F0.inc"
 
-gUnk_0800C91C:: @ 0800C91C
-	.incbin "baserom.gba", 0x00C91C, 0x0000015
+.include "data/scripts/gUnk_0800C91C.inc"
 
-gUnk_0800C931:: @ 0800C931
-	.incbin "baserom.gba", 0x00C931, 0x0000032
+.include "data/scripts/gUnk_0800C931.inc"
 
-gUnk_0800C963:: @ 0800C963
-	.incbin "baserom.gba", 0x00C963, 0x00000A5
+.include "data/scripts/gUnk_0800C963.inc"
 
-gUnk_0800CA08:: @ 0800CA08
-	.incbin "baserom.gba", 0x00CA08, 0x0000084
+.include "data/scripts/gUnk_0800CA08.inc"
 
-gUnk_0800CA8C:: @ 0800CA8C
-	.incbin "baserom.gba", 0x00CA8C, 0x000001E
+.include "data/scripts/gUnk_0800CA8C.inc"
 
-gUnk_0800CAAA:: @ 0800CAAA
-	.incbin "baserom.gba", 0x00CAAA, 0x0000012
+.include "data/scripts/gUnk_0800CAAA.inc"
 
-gUnk_0800CABC:: @ 0800CABC
-	.incbin "baserom.gba", 0x00CABC, 0x000004B
+.include "data/scripts/gUnk_0800CABC.inc"
 
-gUnk_0800CB07:: @ 0800CB07
-	.incbin "baserom.gba", 0x00CB07, 0x000004D
+.include "data/scripts/gUnk_0800CB07.inc"
 
-gUnk_0800CB54:: @ 0800CB54
-	.incbin "baserom.gba", 0x00CB54, 0x000004F
+.include "data/scripts/gUnk_0800CB54.inc"
 
-gUnk_0800CBA3:: @ 0800CBA3
-	.incbin "baserom.gba", 0x00CBA3, 0x0000031
+.include "data/scripts/gUnk_0800CBA3.inc"
 
-gUnk_0800CBD4:: @ 0800CBD4
-	.incbin "baserom.gba", 0x00CBD4, 0x0000034
+.include "data/scripts/gUnk_0800CBD4.inc"
 
-gUnk_0800CC08:: @ 0800CC08
-	.incbin "baserom.gba", 0x00CC08, 0x0000005
+.include "data/scripts/gUnk_0800CC08.inc"
 
-gUnk_0800CC0D:: @ 0800CC0D
-	.incbin "baserom.gba", 0x00CC0D, 0x0000035
+.include "data/scripts/gUnk_0800CC0D.inc"
 
-gUnk_0800CC42:: @ 0800CC42
-	.incbin "baserom.gba", 0x00CC42, 0x000002A
+.include "data/scripts/gUnk_0800CC42.inc"
 
-gUnk_0800CC6C:: @ 0800CC6C
-	.incbin "baserom.gba", 0x00CC6C, 0x0000061
+.include "data/scripts/gUnk_0800CC6C.inc"
 
-gUnk_0800CCCD:: @ 0800CCCD
-	.incbin "baserom.gba", 0x00CCCD, 0x0000010
+.include "data/scripts/gUnk_0800CCCD.inc"
 
-gUnk_0800CCDD:: @ 0800CCDD
-	.incbin "baserom.gba", 0x00CCDD, 0x0000027
+.include "data/scripts/gUnk_0800CCDD.inc"
 
-gUnk_0800CD04:: @ 0800CD04
-	.incbin "baserom.gba", 0x00CD04, 0x0000004
+.include "data/scripts/gUnk_0800CD04.inc"
 
-gUnk_0800CD08:: @ 0800CD08
-	.incbin "baserom.gba", 0x00CD08, 0x000005F
+.include "data/scripts/gUnk_0800CD08.inc"
 
-gUnk_0800CD67:: @ 0800CD67
-	.incbin "baserom.gba", 0x00CD67, 0x0000015
+.include "data/scripts/gUnk_0800CD67.inc"
 
-gUnk_0800CD7C:: @ 0800CD7C
-	.incbin "baserom.gba", 0x00CD7C, 0x000008B
+.include "data/scripts/gUnk_0800CD7C.inc"
 
-gUnk_0800CE07:: @ 0800CE07
-	.incbin "baserom.gba", 0x00CE07, 0x00000FD
+.include "data/scripts/gUnk_0800CE07.inc"
 
-gUnk_0800CF04:: @ 0800CF04
-	.incbin "baserom.gba", 0x00CF04, 0x0000012
+.include "data/scripts/gUnk_0800CF04.inc"
 
-gUnk_0800CF16:: @ 0800CF16
-	.incbin "baserom.gba", 0x00CF16, 0x0000035
+.include "data/scripts/gUnk_0800CF16.inc"
 
-gUnk_0800CF4B:: @ 0800CF4B
-	.incbin "baserom.gba", 0x00CF4B, 0x0000005
+.include "data/scripts/gUnk_0800CF4B.inc"
 
-gUnk_0800CF50:: @ 0800CF50
-	.incbin "baserom.gba", 0x00CF50, 0x000002B
+.include "data/scripts/gUnk_0800CF50.inc"
 
-gUnk_0800CF7B:: @ 0800CF7B
-	.incbin "baserom.gba", 0x00CF7B, 0x000000D
+.include "data/scripts/gUnk_0800CF7B.inc"
 
-gUnk_0800CF88:: @ 0800CF88
-	.incbin "baserom.gba", 0x00CF88, 0x000000D
+.include "data/scripts/gUnk_0800CF88.inc"
 
-gUnk_0800CF95:: @ 0800CF95
-	.incbin "baserom.gba", 0x00CF95, 0x0000014
+.include "data/scripts/gUnk_0800CF95.inc"
 
-gUnk_0800CFA9:: @ 0800CFA9
-	.incbin "baserom.gba", 0x00CFA9, 0x0000003
+.include "data/scripts/gUnk_0800CFA9.inc"
 
-gUnk_0800CFAC:: @ 0800CFAC
-	.incbin "baserom.gba", 0x00CFAC, 0x0000065
+.include "data/scripts/gUnk_0800CFAC.inc"
 
-gUnk_0800D011:: @ 0800D011
-	.incbin "baserom.gba", 0x00D011, 0x000004E
+.include "data/scripts/gUnk_0800D011.inc"
 
-gUnk_0800D05F:: @ 0800D05F
-	.incbin "baserom.gba", 0x00D05F, 0x000006F
+.include "data/scripts/gUnk_0800D05F.inc"
 
-gUnk_0800D0CE:: @ 0800D0CE
-	.incbin "baserom.gba", 0x00D0CE, 0x0000059
+.include "data/scripts/gUnk_0800D0CE.inc"
 
-gUnk_0800D127:: @ 0800D127
-	.incbin "baserom.gba", 0x00D127, 0x0000069
+.include "data/scripts/gUnk_0800D127.inc"
 
-gUnk_0800D190:: @ 0800D190
-	.incbin "baserom.gba", 0x00D190, 0x0000024
+.include "data/scripts/gUnk_0800D190.inc"
 
-gUnk_0800D1B4:: @ 0800D1B4
-	.incbin "baserom.gba", 0x00D1B4, 0x0000010
+.include "data/scripts/gUnk_0800D1B4.inc"
 
-gUnk_0800D1C4:: @ 0800D1C4
-	.incbin "baserom.gba", 0x00D1C4, 0x0000010
+.include "data/scripts/gUnk_0800D1C4.inc"
 
-gUnk_0800D1D4:: @ 0800D1D4
-	.incbin "baserom.gba", 0x00D1D4, 0x000000C
+.include "data/scripts/gUnk_0800D1D4.inc"
 
-gUnk_0800D1E0:: @ 0800D1E0
-	.incbin "baserom.gba", 0x00D1E0, 0x0000027
+.include "data/scripts/gUnk_0800D1E0.inc"
 
-gUnk_0800D207:: @ 0800D207
-	.incbin "baserom.gba", 0x00D207, 0x0000011
+.include "data/scripts/gUnk_0800D207.inc"
 
-gUnk_0800D218:: @ 0800D218
-	.incbin "baserom.gba", 0x00D218, 0x000003C
+.include "data/scripts/gUnk_0800D218.inc"
 
-gUnk_0800D254:: @ 0800D254
-	.incbin "baserom.gba", 0x00D254, 0x0000024
+.include "data/scripts/gUnk_0800D254.inc"
 
-gUnk_0800D278:: @ 0800D278
-	.incbin "baserom.gba", 0x00D278, 0x0000056
+.include "data/scripts/gUnk_0800D278.inc"
 
-gUnk_0800D2CE:: @ 0800D2CE
-	.incbin "baserom.gba", 0x00D2CE, 0x0000038
+.include "data/scripts/gUnk_0800D2CE.inc"
 
-gUnk_0800D306:: @ 0800D306
-	.incbin "baserom.gba", 0x00D306, 0x0000002
+.include "data/scripts/gUnk_0800D306.inc"
 
-gUnk_0800D308:: @ 0800D308
-	.incbin "baserom.gba", 0x00D308, 0x0000007
+.include "data/scripts/gUnk_0800D308.inc"
 
-gUnk_0800D30F:: @ 0800D30F
-	.incbin "baserom.gba", 0x00D30F, 0x0000041
+.include "data/scripts/gUnk_0800D30F.inc"
 
-gUnk_0800D350:: @ 0800D350
-	.incbin "baserom.gba", 0x00D350, 0x000009C
+.include "data/scripts/gUnk_0800D350.inc"
 
-gUnk_0800D3EC:: @ 0800D3EC
-	.incbin "baserom.gba", 0x00D3EC, 0x0000028
+.include "data/scripts/gUnk_0800D3EC.inc"
 
-gUnk_0800D414:: @ 0800D414
-	.incbin "baserom.gba", 0x00D414, 0x0000038
+.include "data/scripts/gUnk_0800D414.inc"
 
-gUnk_0800D44C:: @ 0800D44C
-	.incbin "baserom.gba", 0x00D44C, 0x0000073
+.include "data/scripts/gUnk_0800D44C.inc"
 
-gUnk_0800D4BF:: @ 0800D4BF
-	.incbin "baserom.gba", 0x00D4BF, 0x000001D
+.include "data/scripts/gUnk_0800D4BF.inc"
 
-gUnk_0800D4DC:: @ 0800D4DC
-	.incbin "baserom.gba", 0x00D4DC, 0x00000C0
+.include "data/scripts/gUnk_0800D4DC.inc"
 
-gUnk_0800D59C:: @ 0800D59C
-	.incbin "baserom.gba", 0x00D59C, 0x0000049
+.include "data/scripts/gUnk_0800D59C.inc"
 
-gUnk_0800D5E5:: @ 0800D5E5
-	.incbin "baserom.gba", 0x00D5E5, 0x0000027
+.include "data/scripts/gUnk_0800D5E5.inc"
 
-gUnk_0800D60C:: @ 0800D60C
-	.incbin "baserom.gba", 0x00D60C, 0x000001F
+.include "data/scripts/gUnk_0800D60C.inc"
 
-gUnk_0800D62B:: @ 0800D62B
-	.incbin "baserom.gba", 0x00D62B, 0x0000089
+.include "data/scripts/gUnk_0800D62B.inc"
 
-gUnk_0800D6B4:: @ 0800D6B4
-	.incbin "baserom.gba", 0x00D6B4, 0x0000006
+.include "data/scripts/gUnk_0800D6B4.inc"
 
-gUnk_0800D6BA:: @ 0800D6BA
-	.incbin "baserom.gba", 0x00D6BA, 0x0000016
+.include "data/scripts/gUnk_0800D6BA.inc"
 
-gUnk_0800D6D0:: @ 0800D6D0
-	.incbin "baserom.gba", 0x00D6D0, 0x0000020
+.include "data/scripts/gUnk_0800D6D0.inc"
 
-gUnk_0800D6F0:: @ 0800D6F0
-	.incbin "baserom.gba", 0x00D6F0, 0x0000012
+.include "data/scripts/gUnk_0800D6F0.inc"
 
-gUnk_0800D702:: @ 0800D702
-	.incbin "baserom.gba", 0x00D702, 0x0000001
+.include "data/scripts/gUnk_0800D702.inc"
 
-gUnk_0800D703:: @ 0800D703
-	.incbin "baserom.gba", 0x00D703, 0x000000D
+.include "data/scripts/gUnk_0800D703.inc"
 
-gUnk_0800D710:: @ 0800D710
-	.incbin "baserom.gba", 0x00D710, 0x0000015
+.include "data/scripts/gUnk_0800D710.inc"
 
-gUnk_0800D725:: @ 0800D725
-	.incbin "baserom.gba", 0x00D725, 0x0000003
+.include "data/scripts/gUnk_0800D725.inc"
 
-gUnk_0800D728:: @ 0800D728
-	.incbin "baserom.gba", 0x00D728, 0x0000044
+.include "data/scripts/gUnk_0800D728.inc"
 
-gUnk_0800D76C:: @ 0800D76C
-	.incbin "baserom.gba", 0x00D76C, 0x0000063
+.include "data/scripts/gUnk_0800D76C.inc"
 
-gUnk_0800D7CF:: @ 0800D7CF
-	.incbin "baserom.gba", 0x00D7CF, 0x000000D
+.include "data/scripts/gUnk_0800D7CF.inc"
 
-gUnk_0800D7DC:: @ 0800D7DC
-	.incbin "baserom.gba", 0x00D7DC, 0x0000098
+.include "data/scripts/gUnk_0800D7DC.inc"
 
-gUnk_0800D874:: @ 0800D874
-	.incbin "baserom.gba", 0x00D874, 0x0000070
+.include "data/scripts/gUnk_0800D874.inc"
 
-gUnk_0800D8E4:: @ 0800D8E4
-	.incbin "baserom.gba", 0x00D8E4, 0x0000022
+.include "data/scripts/gUnk_0800D8E4.inc"
 
-gUnk_0800D906:: @ 0800D906
-	.incbin "baserom.gba", 0x00D906, 0x000004E
+.include "data/scripts/gUnk_0800D906.inc"
 
-gUnk_0800D954:: @ 0800D954
-	.incbin "baserom.gba", 0x00D954, 0x0000029
+.include "data/scripts/gUnk_0800D954.inc"
 
-gUnk_0800D97D:: @ 0800D97D
-	.incbin "baserom.gba", 0x00D97D, 0x0000004
+.include "data/scripts/gUnk_0800D97D.inc"
 
-gUnk_0800D981:: @ 0800D981
-	.incbin "baserom.gba", 0x00D981, 0x0000090
+.include "data/scripts/gUnk_0800D981.inc"
 
-gUnk_0800DA11:: @ 0800DA11
-	.incbin "baserom.gba", 0x00DA11, 0x0000017
+.include "data/scripts/gUnk_0800DA11.inc"
 
-gUnk_0800DA28:: @ 0800DA28
-	.incbin "baserom.gba", 0x00DA28, 0x0000024
+.include "data/scripts/gUnk_0800DA28.inc"
 
-gUnk_0800DA4C:: @ 0800DA4C
-	.incbin "baserom.gba", 0x00DA4C, 0x0000001
+.include "data/scripts/gUnk_0800DA4C.inc"
 
-gUnk_0800DA4D:: @ 0800DA4D
-	.incbin "baserom.gba", 0x00DA4D, 0x0000013
+.include "data/scripts/gUnk_0800DA4D.inc"
 
-gUnk_0800DA60:: @ 0800DA60
-	.incbin "baserom.gba", 0x00DA60, 0x00000AE
+.include "data/scripts/gUnk_0800DA60.inc"
 
-gUnk_0800DB0E:: @ 0800DB0E
-	.incbin "baserom.gba", 0x00DB0E, 0x000000A
+.include "data/scripts/gUnk_0800DB0E.inc"
 
-gUnk_0800DB18:: @ 0800DB18
-	.incbin "baserom.gba", 0x00DB18, 0x0000010
+.include "data/scripts/gUnk_0800DB18.inc"
 
-gUnk_0800DB28:: @ 0800DB28
-	.incbin "baserom.gba", 0x00DB28, 0x0000022
+.include "data/scripts/gUnk_0800DB28.inc"
 
-gUnk_0800DB4A:: @ 0800DB4A
-	.incbin "baserom.gba", 0x00DB4A, 0x000002E
+.include "data/scripts/gUnk_0800DB4A.inc"
 
-gUnk_0800DB78:: @ 0800DB78
-	.incbin "baserom.gba", 0x00DB78, 0x0000010
+.include "data/scripts/gUnk_0800DB78.inc"
 
-gUnk_0800DB88:: @ 0800DB88
-	.incbin "baserom.gba", 0x00DB88, 0x0000088
+.include "data/scripts/gUnk_0800DB88.inc"
 
-gUnk_0800DC10:: @ 0800DC10
-	.incbin "baserom.gba", 0x00DC10, 0x0000009
+.include "data/scripts/gUnk_0800DC10.inc"
 
-gUnk_0800DC19:: @ 0800DC19
-	.incbin "baserom.gba", 0x00DC19, 0x0000078
+.include "data/scripts/gUnk_0800DC19.inc"
 
-gUnk_0800DC91:: @ 0800DC91
-	.incbin "baserom.gba", 0x00DC91, 0x000001B
+.include "data/scripts/gUnk_0800DC91.inc"
 
-gUnk_0800DCAC:: @ 0800DCAC
-	.incbin "baserom.gba", 0x00DCAC, 0x0000030
+.include "data/scripts/gUnk_0800DCAC.inc"
 
-gUnk_0800DCDC:: @ 0800DCDC
-	.incbin "baserom.gba", 0x00DCDC, 0x0000028
+.include "data/scripts/gUnk_0800DCDC.inc"
 
-gUnk_0800DD04:: @ 0800DD04
-	.incbin "baserom.gba", 0x00DD04, 0x000000C
+.include "data/scripts/gUnk_0800DD04.inc"
 
-gUnk_0800DD10:: @ 0800DD10
-	.incbin "baserom.gba", 0x00DD10, 0x0000009
+.include "data/scripts/gUnk_0800DD10.inc"
 
-gUnk_0800DD19:: @ 0800DD19
-	.incbin "baserom.gba", 0x00DD19, 0x0000009
+.include "data/scripts/gUnk_0800DD19.inc"
 
-gUnk_0800DD22:: @ 0800DD22
-	.incbin "baserom.gba", 0x00DD22, 0x000006B
+.include "data/scripts/gUnk_0800DD22.inc"
 
-gUnk_0800DD8D:: @ 0800DD8D
-	.incbin "baserom.gba", 0x00DD8D, 0x000001D
+.include "data/scripts/gUnk_0800DD8D.inc"
 
-gUnk_0800DDAA:: @ 0800DDAA
-	.incbin "baserom.gba", 0x00DDAA, 0x000003E
+.include "data/scripts/gUnk_0800DDAA.inc"
 
-gUnk_0800DDE8:: @ 0800DDE8
-	.incbin "baserom.gba", 0x00DDE8, 0x0000014
+.include "data/scripts/gUnk_0800DDE8.inc"
 
-gUnk_0800DDFC:: @ 0800DDFC
-	.incbin "baserom.gba", 0x00DDFC, 0x0000004
+.include "data/scripts/gUnk_0800DDFC.inc"
 
-gUnk_0800DE00:: @ 0800DE00
-	.incbin "baserom.gba", 0x00DE00, 0x0000078
+.include "data/scripts/gUnk_0800DE00.inc"
 
-gUnk_0800DE78:: @ 0800DE78
-	.incbin "baserom.gba", 0x00DE78, 0x0000038
+.include "data/scripts/gUnk_0800DE78.inc"
 
-gUnk_0800DEB0:: @ 0800DEB0
-	.incbin "baserom.gba", 0x00DEB0, 0x0000024
+.include "data/scripts/gUnk_0800DEB0.inc"
 
-gUnk_0800DED4:: @ 0800DED4
-	.incbin "baserom.gba", 0x00DED4, 0x0000022
+.include "data/scripts/gUnk_0800DED4.inc"
 
-gUnk_0800DEF6:: @ 0800DEF6
-	.incbin "baserom.gba", 0x00DEF6, 0x0000011
+.include "data/scripts/gUnk_0800DEF6.inc"
 
-gUnk_0800DF07:: @ 0800DF07
-	.incbin "baserom.gba", 0x00DF07, 0x000001D
+.include "data/scripts/gUnk_0800DF07.inc"
 
-gUnk_0800DF24:: @ 0800DF24
-	.incbin "baserom.gba", 0x00DF24, 0x0000090
+.include "data/scripts/gUnk_0800DF24.inc"
 
-gUnk_0800DFB4:: @ 0800DFB4
-	.incbin "baserom.gba", 0x00DFB4, 0x000001C
+.include "data/scripts/gUnk_0800DFB4.inc"
 
-gUnk_0800DFD0:: @ 0800DFD0
-	.incbin "baserom.gba", 0x00DFD0, 0x0000007
+.include "data/scripts/gUnk_0800DFD0.inc"
 
-gUnk_0800DFD7:: @ 0800DFD7
-	.incbin "baserom.gba", 0x00DFD7, 0x0000007
+.include "data/scripts/gUnk_0800DFD7.inc"
 
-gUnk_0800DFDE:: @ 0800DFDE
-	.incbin "baserom.gba", 0x00DFDE, 0x0000006
+.include "data/scripts/gUnk_0800DFDE.inc"
 
-gUnk_0800DFE4:: @ 0800DFE4
-	.incbin "baserom.gba", 0x00DFE4, 0x000006C
+.include "data/scripts/gUnk_0800DFE4.inc"
 
-gUnk_0800E050:: @ 0800E050
-	.incbin "baserom.gba", 0x00E050, 0x000006C
+.include "data/scripts/gUnk_0800E050.inc"
 
-gUnk_0800E0BC:: @ 0800E0BC
-	.incbin "baserom.gba", 0x00E0BC, 0x000003A
+.include "data/scripts/gUnk_0800E0BC.inc"
 
-gUnk_0800E0F6:: @ 0800E0F6
-	.incbin "baserom.gba", 0x00E0F6, 0x000004A
+.include "data/scripts/gUnk_0800E0F6.inc"
 
-gUnk_0800E140:: @ 0800E140
-	.incbin "baserom.gba", 0x00E140, 0x0000013
+.include "data/scripts/gUnk_0800E140.inc"
 
-gUnk_0800E153:: @ 0800E153
-	.incbin "baserom.gba", 0x00E153, 0x0000001
+.include "data/scripts/gUnk_0800E153.inc"
 
-gUnk_0800E154:: @ 0800E154
-	.incbin "baserom.gba", 0x00E154, 0x0000071
+.include "data/scripts/gUnk_0800E154.inc"
 
-gUnk_0800E1C5:: @ 0800E1C5
-	.incbin "baserom.gba", 0x00E1C5, 0x000003B
+.include "data/scripts/gUnk_0800E1C5.inc"
 
-gUnk_0800E200:: @ 0800E200
-	.incbin "baserom.gba", 0x00E200, 0x0000100
+.include "data/scripts/gUnk_0800E200.inc"
 
-gUnk_0800E300:: @ 0800E300
-	.incbin "baserom.gba", 0x00E300, 0x0000005
+.include "data/scripts/gUnk_0800E300.inc"
 
-gUnk_0800E305:: @ 0800E305
-	.incbin "baserom.gba", 0x00E305, 0x0000002
+.include "data/scripts/gUnk_0800E305.inc"
 
-gUnk_0800E307:: @ 0800E307
-	.incbin "baserom.gba", 0x00E307, 0x0000005
+.include "data/scripts/gUnk_0800E307.inc"
 
-gUnk_0800E30C:: @ 0800E30C
-	.incbin "baserom.gba", 0x00E30C, 0x000001D
+.include "data/scripts/gUnk_0800E30C.inc"
 
-gUnk_0800E329:: @ 0800E329
-	.incbin "baserom.gba", 0x00E329, 0x0000027
+.include "data/scripts/gUnk_0800E329.inc"
 
-gUnk_0800E350:: @ 0800E350
-	.incbin "baserom.gba", 0x00E350, 0x000009E
+.include "data/scripts/gUnk_0800E350.inc"
 
-gUnk_0800E3EE:: @ 0800E3EE
-	.incbin "baserom.gba", 0x00E3EE, 0x000000B
+.include "data/scripts/gUnk_0800E3EE.inc"
 
-gUnk_0800E3F9:: @ 0800E3F9
-	.incbin "baserom.gba", 0x00E3F9, 0x0000001
+.include "data/scripts/gUnk_0800E3F9.inc"
 
-gUnk_0800E3FA:: @ 0800E3FA
-	.incbin "baserom.gba", 0x00E3FA, 0x0000002
+.include "data/scripts/gUnk_0800E3FA.inc"
 
-gUnk_0800E3FC:: @ 0800E3FC
-	.incbin "baserom.gba", 0x00E3FC, 0x0000004
+.include "data/scripts/gUnk_0800E3FC.inc"
 
-gUnk_0800E400:: @ 0800E400
-	.incbin "baserom.gba", 0x00E400, 0x0000008
+.include "data/scripts/gUnk_0800E400.inc"
 
-gUnk_0800E408:: @ 0800E408
-	.incbin "baserom.gba", 0x00E408, 0x0000003
+.include "data/scripts/gUnk_0800E408.inc"
 
-gUnk_0800E40B:: @ 0800E40B
-	.incbin "baserom.gba", 0x00E40B, 0x0000006
+.include "data/scripts/gUnk_0800E40B.inc"
 
-gUnk_0800E411:: @ 0800E411
-	.incbin "baserom.gba", 0x00E411, 0x000001F
+.include "data/scripts/gUnk_0800E411.inc"
 
-gUnk_0800E430:: @ 0800E430
-	.incbin "baserom.gba", 0x00E430, 0x0000004
+.include "data/scripts/gUnk_0800E430.inc"
 
-gUnk_0800E434:: @ 0800E434
-	.incbin "baserom.gba", 0x00E434, 0x0000038
+.include "data/scripts/gUnk_0800E434.inc"
 
-gUnk_0800E46C:: @ 0800E46C
-	.incbin "baserom.gba", 0x00E46C, 0x000001D
+.include "data/scripts/gUnk_0800E46C.inc"
 
-gUnk_0800E489:: @ 0800E489
-	.incbin "baserom.gba", 0x00E489, 0x0000010
+.include "data/scripts/gUnk_0800E489.inc"
 
-gUnk_0800E499:: @ 0800E499
-	.incbin "baserom.gba", 0x00E499, 0x000000B
+.include "data/scripts/gUnk_0800E499.inc"
 
-gUnk_0800E4A4:: @ 0800E4A4
-	.incbin "baserom.gba", 0x00E4A4, 0x000003F
+.include "data/scripts/gUnk_0800E4A4.inc"
 
-gUnk_0800E4E3:: @ 0800E4E3
-	.incbin "baserom.gba", 0x00E4E3, 0x0000021
+.include "data/scripts/gUnk_0800E4E3.inc"
 
-gUnk_0800E504:: @ 0800E504
-	.incbin "baserom.gba", 0x00E504, 0x0000008
+.include "data/scripts/gUnk_0800E504.inc"
 
-gUnk_0800E50C:: @ 0800E50C
-	.incbin "baserom.gba", 0x00E50C, 0x0000038
+.include "data/scripts/gUnk_0800E50C.inc"
 
-gUnk_0800E544:: @ 0800E544
-	.incbin "baserom.gba", 0x00E544, 0x0000048
+.include "data/scripts/gUnk_0800E544.inc"
 
-gUnk_0800E58C:: @ 0800E58C
-	.incbin "baserom.gba", 0x00E58C, 0x0000038
+.include "data/scripts/gUnk_0800E58C.inc"
 
-gUnk_0800E5C4:: @ 0800E5C4
-	.incbin "baserom.gba", 0x00E5C4, 0x000003C
+.include "data/scripts/gUnk_0800E5C4.inc"
 
-gUnk_0800E600:: @ 0800E600
-	.incbin "baserom.gba", 0x00E600, 0x000000E
+.include "data/scripts/gUnk_0800E600.inc"
 
-gUnk_0800E60E:: @ 0800E60E
-	.incbin "baserom.gba", 0x00E60E, 0x000001E
+.include "data/scripts/gUnk_0800E60E.inc"
 
-gUnk_0800E62C:: @ 0800E62C
-	.incbin "baserom.gba", 0x00E62C, 0x000002C
+.include "data/scripts/gUnk_0800E62C.inc"
 
-gUnk_0800E658:: @ 0800E658
-	.incbin "baserom.gba", 0x00E658, 0x000002C
+.include "data/scripts/gUnk_0800E658.inc"
 
-gUnk_0800E684:: @ 0800E684
-	.incbin "baserom.gba", 0x00E684, 0x000002C
+.include "data/scripts/gUnk_0800E684.inc"
 
-gUnk_0800E6B0:: @ 0800E6B0
-	.incbin "baserom.gba", 0x00E6B0, 0x0000038
+.include "data/scripts/gUnk_0800E6B0.inc"
 
-gUnk_0800E6E8:: @ 0800E6E8
-	.incbin "baserom.gba", 0x00E6E8, 0x000001F
+.include "data/scripts/gUnk_0800E6E8.inc"
 
-gUnk_0800E707:: @ 0800E707
-	.incbin "baserom.gba", 0x00E707, 0x0000003
+.include "data/scripts/gUnk_0800E707.inc"
 
-gUnk_0800E70A:: @ 0800E70A
-	.incbin "baserom.gba", 0x00E70A, 0x000002A
+.include "data/scripts/gUnk_0800E70A.inc"
 
-gUnk_0800E734:: @ 0800E734
-	.incbin "baserom.gba", 0x00E734, 0x000002C
+.include "data/scripts/gUnk_0800E734.inc"
 
-gUnk_0800E760:: @ 0800E760
-	.incbin "baserom.gba", 0x00E760, 0x0000079
+.include "data/scripts/gUnk_0800E760.inc"
 
-gUnk_0800E7D9:: @ 0800E7D9
-	.incbin "baserom.gba", 0x00E7D9, 0x000001B
+.include "data/scripts/gUnk_0800E7D9.inc"
 
-gUnk_0800E7F4:: @ 0800E7F4
-	.incbin "baserom.gba", 0x00E7F4, 0x0000006
+.include "data/scripts/gUnk_0800E7F4.inc"
 
-gUnk_0800E7FA:: @ 0800E7FA
-	.incbin "baserom.gba", 0x00E7FA, 0x0000029
+.include "data/scripts/gUnk_0800E7FA.inc"
 
-gUnk_0800E823:: @ 0800E823
-	.incbin "baserom.gba", 0x00E823, 0x0000001
+.include "data/scripts/gUnk_0800E823.inc"
 
-gUnk_0800E824:: @ 0800E824
-	.incbin "baserom.gba", 0x00E824, 0x00000B7
+.include "data/scripts/gUnk_0800E824.inc"
 
-gUnk_0800E8DB:: @ 0800E8DB
-	.incbin "baserom.gba", 0x00E8DB, 0x0000045
+.include "data/scripts/gUnk_0800E8DB.inc"
 
-gUnk_0800E920:: @ 0800E920
-	.incbin "baserom.gba", 0x00E920, 0x0000044
+.include "data/scripts/gUnk_0800E920.inc"
 
-gUnk_0800E964:: @ 0800E964
-	.incbin "baserom.gba", 0x00E964, 0x0000072
+.include "data/scripts/gUnk_0800E964.inc"
 
-gUnk_0800E9D6:: @ 0800E9D6
-	.incbin "baserom.gba", 0x00E9D6, 0x000001E
+.include "data/scripts/gUnk_0800E9D6.inc"
 
-gUnk_0800E9F4:: @ 0800E9F4
-	.incbin "baserom.gba", 0x00E9F4, 0x0000028
+.include "data/scripts/gUnk_0800E9F4.inc"
 
-gUnk_0800EA1C:: @ 0800EA1C
-	.incbin "baserom.gba", 0x00EA1C, 0x0000038
+.include "data/scripts/gUnk_0800EA1C.inc"
 
-gUnk_0800EA54:: @ 0800EA54
-	.incbin "baserom.gba", 0x00EA54, 0x0000050
+.include "data/scripts/gUnk_0800EA54.inc"
 
-gUnk_0800EAA4:: @ 0800EAA4
-	.incbin "baserom.gba", 0x00EAA4, 0x0000047
+.include "data/scripts/gUnk_0800EAA4.inc"
 
-gUnk_0800EAEB:: @ 0800EAEB
-	.incbin "baserom.gba", 0x00EAEB, 0x000000D
+.include "data/scripts/gUnk_0800EAEB.inc"
 
-gUnk_0800EAF8:: @ 0800EAF8
-	.incbin "baserom.gba", 0x00EAF8, 0x0000034
+.include "data/scripts/gUnk_0800EAF8.inc"
 
-gUnk_0800EB2C:: @ 0800EB2C
-	.incbin "baserom.gba", 0x00EB2C, 0x0000038
+.include "data/scripts/gUnk_0800EB2C.inc"
 
-gUnk_0800EB64:: @ 0800EB64
-	.incbin "baserom.gba", 0x00EB64, 0x000005C
+.include "data/scripts/gUnk_0800EB64.inc"
 
-gUnk_0800EBC0:: @ 0800EBC0
-	.incbin "baserom.gba", 0x00EBC0, 0x000001C
+.include "data/scripts/gUnk_0800EBC0.inc"
 
-gUnk_0800EBDC:: @ 0800EBDC
-	.incbin "baserom.gba", 0x00EBDC, 0x0000004
+.include "data/scripts/gUnk_0800EBDC.inc"
 
-gUnk_0800EBE0:: @ 0800EBE0
-	.incbin "baserom.gba", 0x00EBE0, 0x0000010
+.include "data/scripts/gUnk_0800EBE0.inc"
 
-gUnk_0800EBF0:: @ 0800EBF0
-	.incbin "baserom.gba", 0x00EBF0, 0x0000018
+.include "data/scripts/gUnk_0800EBF0.inc"
 
-gUnk_0800EC08:: @ 0800EC08
-	.incbin "baserom.gba", 0x00EC08, 0x000000C
+.include "data/scripts/gUnk_0800EC08.inc"
 
-gUnk_0800EC14:: @ 0800EC14
-	.incbin "baserom.gba", 0x00EC14, 0x0000040
+.include "data/scripts/gUnk_0800EC14.inc"
 
-gUnk_0800EC54:: @ 0800EC54
-	.incbin "baserom.gba", 0x00EC54, 0x000000D
+.include "data/scripts/gUnk_0800EC54.inc"
 
-gUnk_0800EC61:: @ 0800EC61
-	.incbin "baserom.gba", 0x00EC61, 0x000002B
+.include "data/scripts/gUnk_0800EC61.inc"
 
-gUnk_0800EC8C:: @ 0800EC8C
-	.incbin "baserom.gba", 0x00EC8C, 0x0000065
+.include "data/scripts/gUnk_0800EC8C.inc"
 
-gUnk_0800ECF1:: @ 0800ECF1
-	.incbin "baserom.gba", 0x00ECF1, 0x0000013
+.include "data/scripts/gUnk_0800ECF1.inc"
 
-gUnk_0800ED04:: @ 0800ED04
-	.incbin "baserom.gba", 0x00ED04, 0x0000008
+.include "data/scripts/gUnk_0800ED04.inc"
 
-gUnk_0800ED0C:: @ 0800ED0C
-	.incbin "baserom.gba", 0x00ED0C, 0x0000001
+.include "data/scripts/gUnk_0800ED0C.inc"
 
-gUnk_0800ED0D:: @ 0800ED0D
-	.incbin "baserom.gba", 0x00ED0D, 0x000004F
+.include "data/scripts/gUnk_0800ED0D.inc"
 
-gUnk_0800ED5C:: @ 0800ED5C
-	.incbin "baserom.gba", 0x00ED5C, 0x0000034
+.include "data/scripts/gUnk_0800ED5C.inc"
 
-gUnk_0800ED90:: @ 0800ED90
-	.incbin "baserom.gba", 0x00ED90, 0x0000049
+.include "data/scripts/gUnk_0800ED90.inc"
 
-gUnk_0800EDD9:: @ 0800EDD9
-	.incbin "baserom.gba", 0x00EDD9, 0x0000007
+.include "data/scripts/gUnk_0800EDD9.inc"
 
-gUnk_0800EDE0:: @ 0800EDE0
-	.incbin "baserom.gba", 0x00EDE0, 0x0000029
+.include "data/scripts/gUnk_0800EDE0.inc"
 
-gUnk_0800EE09:: @ 0800EE09
-	.incbin "baserom.gba", 0x00EE09, 0x0000047
+.include "data/scripts/gUnk_0800EE09.inc"
 
-gUnk_0800EE50:: @ 0800EE50
-	.incbin "baserom.gba", 0x00EE50, 0x000003C
+.include "data/scripts/gUnk_0800EE50.inc"
 
-gUnk_0800EE8C:: @ 0800EE8C
-	.incbin "baserom.gba", 0x00EE8C, 0x0000054
+.include "data/scripts/gUnk_0800EE8C.inc"
 
-gUnk_0800EEE0:: @ 0800EEE0
-	.incbin "baserom.gba", 0x00EEE0, 0x000001D
+.include "data/scripts/gUnk_0800EEE0.inc"
 
-gUnk_0800EEFD:: @ 0800EEFD
-	.incbin "baserom.gba", 0x00EEFD, 0x000000A
+.include "data/scripts/gUnk_0800EEFD.inc"
 
-gUnk_0800EF07:: @ 0800EF07
-	.incbin "baserom.gba", 0x00EF07, 0x000000B
+.include "data/scripts/gUnk_0800EF07.inc"
 
-gUnk_0800EF12:: @ 0800EF12
-	.incbin "baserom.gba", 0x00EF12, 0x000002E
+.include "data/scripts/gUnk_0800EF12.inc"
 
-gUnk_0800EF40:: @ 0800EF40
-	.incbin "baserom.gba", 0x00EF40, 0x0000053
+.include "data/scripts/gUnk_0800EF40.inc"
 
-gUnk_0800EF93:: @ 0800EF93
-	.incbin "baserom.gba", 0x00EF93, 0x000002D
+.include "data/scripts/gUnk_0800EF93.inc"
 
-gUnk_0800EFC0:: @ 0800EFC0
-	.incbin "baserom.gba", 0x00EFC0, 0x0000020
+.include "data/scripts/gUnk_0800EFC0.inc"
 
-gUnk_0800EFE0:: @ 0800EFE0
-	.incbin "baserom.gba", 0x00EFE0, 0x0000004
+.include "data/scripts/gUnk_0800EFE0.inc"
 
-gUnk_0800EFE4:: @ 0800EFE4
-	.incbin "baserom.gba", 0x00EFE4, 0x00000AC
+.include "data/scripts/gUnk_0800EFE4.inc"
 
-gUnk_0800F090:: @ 0800F090
-	.incbin "baserom.gba", 0x00F090, 0x0000004
+.include "data/scripts/gUnk_0800F090.inc"
 
-gUnk_0800F094:: @ 0800F094
-	.incbin "baserom.gba", 0x00F094, 0x0000042
+.include "data/scripts/gUnk_0800F094.inc"
 
-gUnk_0800F0D6:: @ 0800F0D6
-	.incbin "baserom.gba", 0x00F0D6, 0x000000C
+.include "data/scripts/gUnk_0800F0D6.inc"
 
-gUnk_0800F0E2:: @ 0800F0E2
-	.incbin "baserom.gba", 0x00F0E2, 0x0000010
+.include "data/scripts/gUnk_0800F0E2.inc"
 
-gUnk_0800F0F2:: @ 0800F0F2
-	.incbin "baserom.gba", 0x00F0F2, 0x0000001
+.include "data/scripts/gUnk_0800F0F2.inc"
 
-gUnk_0800F0F3:: @ 0800F0F3
-	.incbin "baserom.gba", 0x00F0F3, 0x0000001
+.include "data/scripts/gUnk_0800F0F3.inc"
 
-gUnk_0800F0F4:: @ 0800F0F4
-	.incbin "baserom.gba", 0x00F0F4, 0x0000058
+.include "data/scripts/gUnk_0800F0F4.inc"
 
-gUnk_0800F14C:: @ 0800F14C
-	.incbin "baserom.gba", 0x00F14C, 0x0000038
+.include "data/scripts/gUnk_0800F14C.inc"
 
-gUnk_0800F184:: @ 0800F184
-	.incbin "baserom.gba", 0x00F184, 0x000005A
+.include "data/scripts/gUnk_0800F184.inc"
 
-gUnk_0800F1DE:: @ 0800F1DE
-	.incbin "baserom.gba", 0x00F1DE, 0x0000003
+.include "data/scripts/gUnk_0800F1DE.inc"
 
-gUnk_0800F1E1:: @ 0800F1E1
-	.incbin "baserom.gba", 0x00F1E1, 0x0000004
+.include "data/scripts/gUnk_0800F1E1.inc"
 
-gUnk_0800F1E5:: @ 0800F1E5
-	.incbin "baserom.gba", 0x00F1E5, 0x0000002
+.include "data/scripts/gUnk_0800F1E5.inc"
 
-gUnk_0800F1E7:: @ 0800F1E7
-	.incbin "baserom.gba", 0x00F1E7, 0x0000006
+.include "data/scripts/gUnk_0800F1E7.inc"
 
-gUnk_0800F1ED:: @ 0800F1ED
-	.incbin "baserom.gba", 0x00F1ED, 0x000000E
+.include "data/scripts/gUnk_0800F1ED.inc"
 
-gUnk_0800F1FB:: @ 0800F1FB
-	.incbin "baserom.gba", 0x00F1FB, 0x0000002
+.include "data/scripts/gUnk_0800F1FB.inc"
 
-gUnk_0800F1FD:: @ 0800F1FD
-	.incbin "baserom.gba", 0x00F1FD, 0x0000006
+.include "data/scripts/gUnk_0800F1FD.inc"
 
-gUnk_0800F203:: @ 0800F203
-	.incbin "baserom.gba", 0x00F203, 0x0000004
+.include "data/scripts/gUnk_0800F203.inc"
 
-gUnk_0800F207:: @ 0800F207
-	.incbin "baserom.gba", 0x00F207, 0x0000009
+.include "data/scripts/gUnk_0800F207.inc"
 
-gUnk_0800F210:: @ 0800F210
-	.incbin "baserom.gba", 0x00F210, 0x00000DB
+.include "data/scripts/gUnk_0800F210.inc"
 
-gUnk_0800F2EB:: @ 0800F2EB
-	.incbin "baserom.gba", 0x00F2EB, 0x0000005
+.include "data/scripts/gUnk_0800F2EB.inc"
 
-gUnk_0800F2F0:: @ 0800F2F0
-	.incbin "baserom.gba", 0x00F2F0, 0x0000002
+.include "data/scripts/gUnk_0800F2F0.inc"
 
-gUnk_0800F2F2:: @ 0800F2F2
-	.incbin "baserom.gba", 0x00F2F2, 0x0000011
+.include "data/scripts/gUnk_0800F2F2.inc"
 
-gUnk_0800F303:: @ 0800F303
-	.incbin "baserom.gba", 0x00F303, 0x0000099
+.include "data/scripts/gUnk_0800F303.inc"
 
-gUnk_0800F39C:: @ 0800F39C
-	.incbin "baserom.gba", 0x00F39C, 0x000003F
+.include "data/scripts/gUnk_0800F39C.inc"
 
-gUnk_0800F3DB:: @ 0800F3DB
-	.incbin "baserom.gba", 0x00F3DB, 0x000000A
+.include "data/scripts/gUnk_0800F3DB.inc"
 
-gUnk_0800F3E5:: @ 0800F3E5
-	.incbin "baserom.gba", 0x00F3E5, 0x0000001
+.include "data/scripts/gUnk_0800F3E5.inc"
 
-gUnk_0800F3E6:: @ 0800F3E6
-	.incbin "baserom.gba", 0x00F3E6, 0x0000002
+.include "data/scripts/gUnk_0800F3E6.inc"
 
-gUnk_0800F3E8:: @ 0800F3E8
-	.incbin "baserom.gba", 0x00F3E8, 0x0000003
+.include "data/scripts/gUnk_0800F3E8.inc"
 
-gUnk_0800F3EB:: @ 0800F3EB
-	.incbin "baserom.gba", 0x00F3EB, 0x0000002
+.include "data/scripts/gUnk_0800F3EB.inc"
 
-gUnk_0800F3ED:: @ 0800F3ED
-	.incbin "baserom.gba", 0x00F3ED, 0x0000008
+.include "data/scripts/gUnk_0800F3ED.inc"
 
-gUnk_0800F3F5:: @ 0800F3F5
-	.incbin "baserom.gba", 0x00F3F5, 0x0000004
+.include "data/scripts/gUnk_0800F3F5.inc"
 
-gUnk_0800F3F9:: @ 0800F3F9
-	.incbin "baserom.gba", 0x00F3F9, 0x0000007
+.include "data/scripts/gUnk_0800F3F9.inc"
 
-gUnk_0800F400:: @ 0800F400
-	.incbin "baserom.gba", 0x00F400, 0x0000008
+.include "data/scripts/gUnk_0800F400.inc"
 
-gUnk_0800F408:: @ 0800F408
-	.incbin "baserom.gba", 0x00F408, 0x0000001
+.include "data/scripts/gUnk_0800F408.inc"
 
-gUnk_0800F409:: @ 0800F409
-	.incbin "baserom.gba", 0x00F409, 0x0000007
+.include "data/scripts/gUnk_0800F409.inc"
 
-gUnk_0800F410:: @ 0800F410
-	.incbin "baserom.gba", 0x00F410, 0x0000016
+.include "data/scripts/gUnk_0800F410.inc"
 
-gUnk_0800F426:: @ 0800F426
-	.incbin "baserom.gba", 0x00F426, 0x000000A
+.include "data/scripts/gUnk_0800F426.inc"
 
-gUnk_0800F430:: @ 0800F430
-	.incbin "baserom.gba", 0x00F430, 0x0000094
+.include "data/scripts/gUnk_0800F430.inc"
 
-gUnk_0800F4C4:: @ 0800F4C4
-	.incbin "baserom.gba", 0x00F4C4, 0x0000026
+.include "data/scripts/gUnk_0800F4C4.inc"
 
-gUnk_0800F4EA:: @ 0800F4EA
-	.incbin "baserom.gba", 0x00F4EA, 0x0000001
+.include "data/scripts/gUnk_0800F4EA.inc"
 
-gUnk_0800F4EB:: @ 0800F4EB
-	.incbin "baserom.gba", 0x00F4EB, 0x0000004
+.include "data/scripts/gUnk_0800F4EB.inc"
 
-gUnk_0800F4EF:: @ 0800F4EF
-	.incbin "baserom.gba", 0x00F4EF, 0x0000001
+.include "data/scripts/gUnk_0800F4EF.inc"
 
-gUnk_0800F4F0:: @ 0800F4F0
-	.incbin "baserom.gba", 0x00F4F0, 0x0000001
+.include "data/scripts/gUnk_0800F4F0.inc"
 
-gUnk_0800F4F1:: @ 0800F4F1
-	.incbin "baserom.gba", 0x00F4F1, 0x0000002
+.include "data/scripts/gUnk_0800F4F1.inc"
 
-gUnk_0800F4F3:: @ 0800F4F3
-	.incbin "baserom.gba", 0x00F4F3, 0x0000004
+.include "data/scripts/gUnk_0800F4F3.inc"
 
-gUnk_0800F4F7:: @ 0800F4F7
-	.incbin "baserom.gba", 0x00F4F7, 0x0000002
+.include "data/scripts/gUnk_0800F4F7.inc"
 
-gUnk_0800F4F9:: @ 0800F4F9
-	.incbin "baserom.gba", 0x00F4F9, 0x0000008
+.include "data/scripts/gUnk_0800F4F9.inc"
 
-gUnk_0800F501:: @ 0800F501
-	.incbin "baserom.gba", 0x00F501, 0x000000D
+.include "data/scripts/gUnk_0800F501.inc"
 
-gUnk_0800F50E:: @ 0800F50E
-	.incbin "baserom.gba", 0x00F50E, 0x0000046
+.include "data/scripts/gUnk_0800F50E.inc"
 
-gUnk_0800F554:: @ 0800F554
-	.incbin "baserom.gba", 0x00F554, 0x0000030
+.include "data/scripts/gUnk_0800F554.inc"
 
-gUnk_0800F584:: @ 0800F584
-	.incbin "baserom.gba", 0x00F584, 0x000000B
+.include "data/scripts/gUnk_0800F584.inc"
 
-gUnk_0800F58F:: @ 0800F58F
-	.incbin "baserom.gba", 0x00F58F, 0x0000021
+.include "data/scripts/gUnk_0800F58F.inc"
 
-gUnk_0800F5B0:: @ 0800F5B0
-	.incbin "baserom.gba", 0x00F5B0, 0x0000039
+.include "data/scripts/gUnk_0800F5B0.inc"
 
-gUnk_0800F5E9:: @ 0800F5E9
-	.incbin "baserom.gba", 0x00F5E9, 0x0000003
+.include "data/scripts/gUnk_0800F5E9.inc"
 
-gUnk_0800F5EC:: @ 0800F5EC
-	.incbin "baserom.gba", 0x00F5EC, 0x0000001
+.include "data/scripts/gUnk_0800F5EC.inc"
 
-gUnk_0800F5ED:: @ 0800F5ED
-	.incbin "baserom.gba", 0x00F5ED, 0x0000001
+.include "data/scripts/gUnk_0800F5ED.inc"
 
-gUnk_0800F5EE:: @ 0800F5EE
-	.incbin "baserom.gba", 0x00F5EE, 0x0000001
+.include "data/scripts/gUnk_0800F5EE.inc"
 
-gUnk_0800F5EF:: @ 0800F5EF
-	.incbin "baserom.gba", 0x00F5EF, 0x0000001
+.include "data/scripts/gUnk_0800F5EF.inc"
 
-gUnk_0800F5F0:: @ 0800F5F0
-	.incbin "baserom.gba", 0x00F5F0, 0x0000002
+.include "data/scripts/gUnk_0800F5F0.inc"
 
-gUnk_0800F5F2:: @ 0800F5F2
-	.incbin "baserom.gba", 0x00F5F2, 0x0000002
+.include "data/scripts/gUnk_0800F5F2.inc"
 
-gUnk_0800F5F4:: @ 0800F5F4
-	.incbin "baserom.gba", 0x00F5F4, 0x0000008
+.include "data/scripts/gUnk_0800F5F4.inc"
 
-gUnk_0800F5FC:: @ 0800F5FC
-	.incbin "baserom.gba", 0x00F5FC, 0x0000003
+.include "data/scripts/gUnk_0800F5FC.inc"
 
-gUnk_0800F5FF:: @ 0800F5FF
-	.incbin "baserom.gba", 0x00F5FF, 0x0000007
+.include "data/scripts/gUnk_0800F5FF.inc"
 
-gUnk_0800F606:: @ 0800F606
-	.incbin "baserom.gba", 0x00F606, 0x0000001
+.include "data/scripts/gUnk_0800F606.inc"
 
-gUnk_0800F607:: @ 0800F607
-	.incbin "baserom.gba", 0x00F607, 0x0000001
+.include "data/scripts/gUnk_0800F607.inc"
 
-gUnk_0800F608:: @ 0800F608
-	.incbin "baserom.gba", 0x00F608, 0x0000002
+.include "data/scripts/gUnk_0800F608.inc"
 
-gUnk_0800F60A:: @ 0800F60A
-	.incbin "baserom.gba", 0x00F60A, 0x000001E
+.include "data/scripts/gUnk_0800F60A.inc"
 
-gUnk_0800F628:: @ 0800F628
-	.incbin "baserom.gba", 0x00F628, 0x0000028
+.include "data/scripts/gUnk_0800F628.inc"
 
-gUnk_0800F650:: @ 0800F650
-	.incbin "baserom.gba", 0x00F650, 0x0000038
+.include "data/scripts/gUnk_0800F650.inc"
 
-gUnk_0800F688:: @ 0800F688
-	.incbin "baserom.gba", 0x00F688, 0x0000018
+.include "data/scripts/gUnk_0800F688.inc"
 
-gUnk_0800F6A0:: @ 0800F6A0
-	.incbin "baserom.gba", 0x00F6A0, 0x0000028
+.include "data/scripts/gUnk_0800F6A0.inc"
 
-gUnk_0800F6C8:: @ 0800F6C8
-	.incbin "baserom.gba", 0x00F6C8, 0x0000018
+.include "data/scripts/gUnk_0800F6C8.inc"
 
-gUnk_0800F6E0:: @ 0800F6E0
-	.incbin "baserom.gba", 0x00F6E0, 0x0000009
+.include "data/scripts/gUnk_0800F6E0.inc"
 
-gUnk_0800F6E9:: @ 0800F6E9
-	.incbin "baserom.gba", 0x00F6E9, 0x0000003
+.include "data/scripts/gUnk_0800F6E9.inc"
 
-gUnk_0800F6EC:: @ 0800F6EC
-	.incbin "baserom.gba", 0x00F6EC, 0x0000001
+.include "data/scripts/gUnk_0800F6EC.inc"
 
-gUnk_0800F6ED:: @ 0800F6ED
-	.incbin "baserom.gba", 0x00F6ED, 0x0000001
+.include "data/scripts/gUnk_0800F6ED.inc"
 
-gUnk_0800F6EE:: @ 0800F6EE
-	.incbin "baserom.gba", 0x00F6EE, 0x0000001
+.include "data/scripts/gUnk_0800F6EE.inc"
 
-gUnk_0800F6EF:: @ 0800F6EF
-	.incbin "baserom.gba", 0x00F6EF, 0x0000001
+.include "data/scripts/gUnk_0800F6EF.inc"
 
-gUnk_0800F6F0:: @ 0800F6F0
-	.incbin "baserom.gba", 0x00F6F0, 0x0000001
+.include "data/scripts/gUnk_0800F6F0.inc"
 
-gUnk_0800F6F1:: @ 0800F6F1
-	.incbin "baserom.gba", 0x00F6F1, 0x0000001
+.include "data/scripts/gUnk_0800F6F1.inc"
 
-gUnk_0800F6F2:: @ 0800F6F2
-	.incbin "baserom.gba", 0x00F6F2, 0x0000001
+.include "data/scripts/gUnk_0800F6F2.inc"
 
-gUnk_0800F6F3:: @ 0800F6F3
-	.incbin "baserom.gba", 0x00F6F3, 0x0000001
+.include "data/scripts/gUnk_0800F6F3.inc"
 
-gUnk_0800F6F4:: @ 0800F6F4
-	.incbin "baserom.gba", 0x00F6F4, 0x0000005
+.include "data/scripts/gUnk_0800F6F4.inc"
 
-gUnk_0800F6F9:: @ 0800F6F9
-	.incbin "baserom.gba", 0x00F6F9, 0x0000005
+.include "data/scripts/gUnk_0800F6F9.inc"
 
-gUnk_0800F6FE:: @ 0800F6FE
-	.incbin "baserom.gba", 0x00F6FE, 0x0000004
+.include "data/scripts/gUnk_0800F6FE.inc"
 
-gUnk_0800F702:: @ 0800F702
-	.incbin "baserom.gba", 0x00F702, 0x0000004
+.include "data/scripts/gUnk_0800F702.inc"
 
-gUnk_0800F706:: @ 0800F706
-	.incbin "baserom.gba", 0x00F706, 0x0000018
+.include "data/scripts/gUnk_0800F706.inc"
 
-gUnk_0800F71E:: @ 0800F71E
-	.incbin "baserom.gba", 0x00F71E, 0x0000006
+.include "data/scripts/gUnk_0800F71E.inc"
 
-gUnk_0800F724:: @ 0800F724
-	.incbin "baserom.gba", 0x00F724, 0x0000010
+.include "data/scripts/gUnk_0800F724.inc"
 
-gUnk_0800F734:: @ 0800F734
-	.incbin "baserom.gba", 0x00F734, 0x0000008
+.include "data/scripts/gUnk_0800F734.inc"
 
-gUnk_0800F73C:: @ 0800F73C
-	.incbin "baserom.gba", 0x00F73C, 0x00000AA
+.include "data/scripts/gUnk_0800F73C.inc"
 
-gUnk_0800F7E6:: @ 0800F7E6
-	.incbin "baserom.gba", 0x00F7E6, 0x0000005
+.include "data/scripts/gUnk_0800F7E6.inc"
 
-gUnk_0800F7EB:: @ 0800F7EB
-	.incbin "baserom.gba", 0x00F7EB, 0x0000003
+.include "data/scripts/gUnk_0800F7EB.inc"
 
-gUnk_0800F7EE:: @ 0800F7EE
-	.incbin "baserom.gba", 0x00F7EE, 0x0000001
+.include "data/scripts/gUnk_0800F7EE.inc"
 
-gUnk_0800F7EF:: @ 0800F7EF
-	.incbin "baserom.gba", 0x00F7EF, 0x0000001
+.include "data/scripts/gUnk_0800F7EF.inc"
 
-gUnk_0800F7F0:: @ 0800F7F0
-	.incbin "baserom.gba", 0x00F7F0, 0x0000004
+.include "data/scripts/gUnk_0800F7F0.inc"
 
-gUnk_0800F7F4:: @ 0800F7F4
-	.incbin "baserom.gba", 0x00F7F4, 0x0000001
+.include "data/scripts/gUnk_0800F7F4.inc"
 
-gUnk_0800F7F5:: @ 0800F7F5
-	.incbin "baserom.gba", 0x00F7F5, 0x0000002
+.include "data/scripts/gUnk_0800F7F5.inc"
 
-gUnk_0800F7F7:: @ 0800F7F7
-	.incbin "baserom.gba", 0x00F7F7, 0x0000005
+.include "data/scripts/gUnk_0800F7F7.inc"
 
-gUnk_0800F7FC:: @ 0800F7FC
-	.incbin "baserom.gba", 0x00F7FC, 0x0000001
+.include "data/scripts/gUnk_0800F7FC.inc"
 
-gUnk_0800F7FD:: @ 0800F7FD
-	.incbin "baserom.gba", 0x00F7FD, 0x0000002
+.include "data/scripts/gUnk_0800F7FD.inc"
 
-gUnk_0800F7FF:: @ 0800F7FF
-	.incbin "baserom.gba", 0x00F7FF, 0x0000001
+.include "data/scripts/gUnk_0800F7FF.inc"
 
-gUnk_0800F800:: @ 0800F800
-	.incbin "baserom.gba", 0x00F800, 0x0000005
+.include "data/scripts/gUnk_0800F800.inc"
 
-gUnk_0800F805:: @ 0800F805
-	.incbin "baserom.gba", 0x00F805, 0x0000003
+.include "data/scripts/gUnk_0800F805.inc"
 
-gUnk_0800F808:: @ 0800F808
-	.incbin "baserom.gba", 0x00F808, 0x00000E7
+.include "data/scripts/gUnk_0800F808.inc"
 
-gUnk_0800F8EF:: @ 0800F8EF
-	.incbin "baserom.gba", 0x00F8EF, 0x0000001
+.include "data/scripts/gUnk_0800F8EF.inc"
 
-gUnk_0800F8F0:: @ 0800F8F0
-	.incbin "baserom.gba", 0x00F8F0, 0x0000001
+.include "data/scripts/gUnk_0800F8F0.inc"
 
-gUnk_0800F8F1:: @ 0800F8F1
-	.incbin "baserom.gba", 0x00F8F1, 0x0000001
+.include "data/scripts/gUnk_0800F8F1.inc"
 
-gUnk_0800F8F2:: @ 0800F8F2
-	.incbin "baserom.gba", 0x00F8F2, 0x0000001
+.include "data/scripts/gUnk_0800F8F2.inc"
 
-gUnk_0800F8F3:: @ 0800F8F3
-	.incbin "baserom.gba", 0x00F8F3, 0x0000001
+.include "data/scripts/gUnk_0800F8F3.inc"
 
-gUnk_0800F8F4:: @ 0800F8F4
-	.incbin "baserom.gba", 0x00F8F4, 0x0000001
+.include "data/scripts/gUnk_0800F8F4.inc"
 
-gUnk_0800F8F5:: @ 0800F8F5
-	.incbin "baserom.gba", 0x00F8F5, 0x0000003
+.include "data/scripts/gUnk_0800F8F5.inc"
 
-gUnk_0800F8F8:: @ 0800F8F8
-	.incbin "baserom.gba", 0x00F8F8, 0x0000001
+.include "data/scripts/gUnk_0800F8F8.inc"
 
-gUnk_0800F8F9:: @ 0800F8F9
-	.incbin "baserom.gba", 0x00F8F9, 0x0000007
+.include "data/scripts/gUnk_0800F8F9.inc"
 
-gUnk_0800F900:: @ 0800F900
-	.incbin "baserom.gba", 0x00F900, 0x0000002
+.include "data/scripts/gUnk_0800F900.inc"
 
-gUnk_0800F902:: @ 0800F902
-	.incbin "baserom.gba", 0x00F902, 0x0000014
+.include "data/scripts/gUnk_0800F902.inc"
 
-gUnk_0800F916:: @ 0800F916
-	.incbin "baserom.gba", 0x00F916, 0x00000DA
+.include "data/scripts/gUnk_0800F916.inc"
 
-gUnk_0800F9F0:: @ 0800F9F0
-	.incbin "baserom.gba", 0x00F9F0, 0x0000002
+.include "data/scripts/gUnk_0800F9F0.inc"
 
-gUnk_0800F9F2:: @ 0800F9F2
-	.incbin "baserom.gba", 0x00F9F2, 0x0000001
+.include "data/scripts/gUnk_0800F9F2.inc"
 
-gUnk_0800F9F3:: @ 0800F9F3
-	.incbin "baserom.gba", 0x00F9F3, 0x0000001
+.include "data/scripts/gUnk_0800F9F3.inc"
 
-gUnk_0800F9F4:: @ 0800F9F4
-	.incbin "baserom.gba", 0x00F9F4, 0x0000002
+.include "data/scripts/gUnk_0800F9F4.inc"
 
-gUnk_0800F9F6:: @ 0800F9F6
-	.incbin "baserom.gba", 0x00F9F6, 0x0000001
+.include "data/scripts/gUnk_0800F9F6.inc"
 
-gUnk_0800F9F7:: @ 0800F9F7
-	.incbin "baserom.gba", 0x00F9F7, 0x0000001
+.include "data/scripts/gUnk_0800F9F7.inc"
 
-gUnk_0800F9F8:: @ 0800F9F8
-	.incbin "baserom.gba", 0x00F9F8, 0x000000A
+.include "data/scripts/gUnk_0800F9F8.inc"
 
-gUnk_0800FA02:: @ 0800FA02
-	.incbin "baserom.gba", 0x00FA02, 0x0000005
+.include "data/scripts/gUnk_0800FA02.inc"
 
-gUnk_0800FA07:: @ 0800FA07
-	.incbin "baserom.gba", 0x00FA07, 0x0000001
+.include "data/scripts/gUnk_0800FA07.inc"
 
-gUnk_0800FA08:: @ 0800FA08
-	.incbin "baserom.gba", 0x00FA08, 0x0000001
+.include "data/scripts/gUnk_0800FA08.inc"
 
-gUnk_0800FA09:: @ 0800FA09
-	.incbin "baserom.gba", 0x00FA09, 0x0000004
+.include "data/scripts/gUnk_0800FA09.inc"
 
-gUnk_0800FA0D:: @ 0800FA0D
-	.incbin "baserom.gba", 0x00FA0D, 0x000006B
+.include "data/scripts/gUnk_0800FA0D.inc"
 
-gUnk_0800FA78:: @ 0800FA78
-	.incbin "baserom.gba", 0x00FA78, 0x0000048
+.include "data/scripts/gUnk_0800FA78.inc"
 
-gUnk_0800FAC0:: @ 0800FAC0
-	.incbin "baserom.gba", 0x00FAC0, 0x0000024
+.include "data/scripts/gUnk_0800FAC0.inc"
 
-gUnk_0800FAE4:: @ 0800FAE4
-	.incbin "baserom.gba", 0x00FAE4, 0x000000F
+.include "data/scripts/gUnk_0800FAE4.inc"
 
-gUnk_0800FAF3:: @ 0800FAF3
-	.incbin "baserom.gba", 0x00FAF3, 0x0000002
+.include "data/scripts/gUnk_0800FAF3.inc"
 
-gUnk_0800FAF5:: @ 0800FAF5
-	.incbin "baserom.gba", 0x00FAF5, 0x0000001
+.include "data/scripts/gUnk_0800FAF5.inc"
 
-gUnk_0800FAF6:: @ 0800FAF6
-	.incbin "baserom.gba", 0x00FAF6, 0x0000001
+.include "data/scripts/gUnk_0800FAF6.inc"
 
-gUnk_0800FAF7:: @ 0800FAF7
-	.incbin "baserom.gba", 0x00FAF7, 0x0000001
+.include "data/scripts/gUnk_0800FAF7.inc"
 
-gUnk_0800FAF8:: @ 0800FAF8
-	.incbin "baserom.gba", 0x00FAF8, 0x0000005
+.include "data/scripts/gUnk_0800FAF8.inc"
 
-gUnk_0800FAFD:: @ 0800FAFD
-	.incbin "baserom.gba", 0x00FAFD, 0x0000001
+.include "data/scripts/gUnk_0800FAFD.inc"
 
-gUnk_0800FAFE:: @ 0800FAFE
-	.incbin "baserom.gba", 0x00FAFE, 0x0000001
+.include "data/scripts/gUnk_0800FAFE.inc"
 
-gUnk_0800FAFF:: @ 0800FAFF
-	.incbin "baserom.gba", 0x00FAFF, 0x0000001
+.include "data/scripts/gUnk_0800FAFF.inc"
 
-gUnk_0800FB00:: @ 0800FB00
-	.incbin "baserom.gba", 0x00FB00, 0x0000001
+.include "data/scripts/gUnk_0800FB00.inc"
 
-gUnk_0800FB01:: @ 0800FB01
-	.incbin "baserom.gba", 0x00FB01, 0x0000001
+.include "data/scripts/gUnk_0800FB01.inc"
 
-gUnk_0800FB02:: @ 0800FB02
-	.incbin "baserom.gba", 0x00FB02, 0x0000002
+.include "data/scripts/gUnk_0800FB02.inc"
 
-gUnk_0800FB04:: @ 0800FB04
-	.incbin "baserom.gba", 0x00FB04, 0x0000004
+.include "data/scripts/gUnk_0800FB04.inc"
 
-gUnk_0800FB08:: @ 0800FB08
-	.incbin "baserom.gba", 0x00FB08, 0x0000002
+.include "data/scripts/gUnk_0800FB08.inc"
 
-gUnk_0800FB0A:: @ 0800FB0A
-	.incbin "baserom.gba", 0x00FB0A, 0x0000027
+.include "data/scripts/gUnk_0800FB0A.inc"
 
-gUnk_0800FB31:: @ 0800FB31
-	.incbin "baserom.gba", 0x00FB31, 0x0000013
+.include "data/scripts/gUnk_0800FB31.inc"
 
-gUnk_0800FB44:: @ 0800FB44
-	.incbin "baserom.gba", 0x00FB44, 0x0000077
+.include "data/scripts/gUnk_0800FB44.inc"
 
-gUnk_0800FBBB:: @ 0800FBBB
-	.incbin "baserom.gba", 0x00FBBB, 0x0000035
+.include "data/scripts/gUnk_0800FBBB.inc"
 
-gUnk_0800FBF0:: @ 0800FBF0
-	.incbin "baserom.gba", 0x00FBF0, 0x0000003
+.include "data/scripts/gUnk_0800FBF0.inc"
 
-gUnk_0800FBF3:: @ 0800FBF3
-	.incbin "baserom.gba", 0x00FBF3, 0x0000002
+.include "data/scripts/gUnk_0800FBF3.inc"
 
-gUnk_0800FBF5:: @ 0800FBF5
-	.incbin "baserom.gba", 0x00FBF5, 0x0000001
+.include "data/scripts/gUnk_0800FBF5.inc"
 
-gUnk_0800FBF6:: @ 0800FBF6
-	.incbin "baserom.gba", 0x00FBF6, 0x0000002
+.include "data/scripts/gUnk_0800FBF6.inc"
 
-gUnk_0800FBF8:: @ 0800FBF8
-	.incbin "baserom.gba", 0x00FBF8, 0x0000001
+.include "data/scripts/gUnk_0800FBF8.inc"
 
-gUnk_0800FBF9:: @ 0800FBF9
-	.incbin "baserom.gba", 0x00FBF9, 0x0000001
+.include "data/scripts/gUnk_0800FBF9.inc"
 
-gUnk_0800FBFA:: @ 0800FBFA
-	.incbin "baserom.gba", 0x00FBFA, 0x0000001
+.include "data/scripts/gUnk_0800FBFA.inc"
 
-gUnk_0800FBFB:: @ 0800FBFB
-	.incbin "baserom.gba", 0x00FBFB, 0x0000001
+.include "data/scripts/gUnk_0800FBFB.inc"
 
-gUnk_0800FBFC:: @ 0800FBFC
-	.incbin "baserom.gba", 0x00FBFC, 0x0000003
+.include "data/scripts/gUnk_0800FBFC.inc"
 
-gUnk_0800FBFF:: @ 0800FBFF
-	.incbin "baserom.gba", 0x00FBFF, 0x0000001
+.include "data/scripts/gUnk_0800FBFF.inc"
 
-gUnk_0800FC00:: @ 0800FC00
-	.incbin "baserom.gba", 0x00FC00, 0x0000001
+.include "data/scripts/gUnk_0800FC00.inc"
 
-gUnk_0800FC01:: @ 0800FC01
-	.incbin "baserom.gba", 0x00FC01, 0x0000004
+.include "data/scripts/gUnk_0800FC01.inc"
 
-gUnk_0800FC05:: @ 0800FC05
-	.incbin "baserom.gba", 0x00FC05, 0x0000001
+.include "data/scripts/gUnk_0800FC05.inc"
 
-gUnk_0800FC06:: @ 0800FC06
-	.incbin "baserom.gba", 0x00FC06, 0x0000002
+.include "data/scripts/gUnk_0800FC06.inc"
 
-gUnk_0800FC08:: @ 0800FC08
-	.incbin "baserom.gba", 0x00FC08, 0x0000001
+.include "data/scripts/gUnk_0800FC08.inc"
 
-gUnk_0800FC09:: @ 0800FC09
-	.incbin "baserom.gba", 0x00FC09, 0x0000005
+.include "data/scripts/gUnk_0800FC09.inc"
 
-gUnk_0800FC0E:: @ 0800FC0E
-	.incbin "baserom.gba", 0x00FC0E, 0x0000016
+.include "data/scripts/gUnk_0800FC0E.inc"
 
-gUnk_0800FC24:: @ 0800FC24
-	.incbin "baserom.gba", 0x00FC24, 0x00000C6
+.include "data/scripts/gUnk_0800FC24.inc"
 
-gUnk_0800FCEA:: @ 0800FCEA
-	.incbin "baserom.gba", 0x00FCEA, 0x0000004
+.include "data/scripts/gUnk_0800FCEA.inc"
 
-gUnk_0800FCEE:: @ 0800FCEE
-	.incbin "baserom.gba", 0x00FCEE, 0x0000004
+.include "data/scripts/gUnk_0800FCEE.inc"
 
-gUnk_0800FCF2:: @ 0800FCF2
-	.incbin "baserom.gba", 0x00FCF2, 0x0000001
+.include "data/scripts/gUnk_0800FCF2.inc"
 
-gUnk_0800FCF3:: @ 0800FCF3
-	.incbin "baserom.gba", 0x00FCF3, 0x0000002
+.include "data/scripts/gUnk_0800FCF3.inc"
 
-gUnk_0800FCF5:: @ 0800FCF5
-	.incbin "baserom.gba", 0x00FCF5, 0x0000002
+.include "data/scripts/gUnk_0800FCF5.inc"
 
-gUnk_0800FCF7:: @ 0800FCF7
-	.incbin "baserom.gba", 0x00FCF7, 0x0000001
+.include "data/scripts/gUnk_0800FCF7.inc"
 
-gUnk_0800FCF8:: @ 0800FCF8
-	.incbin "baserom.gba", 0x00FCF8, 0x0000002
+.include "data/scripts/gUnk_0800FCF8.inc"
 
-gUnk_0800FCFA:: @ 0800FCFA
-	.incbin "baserom.gba", 0x00FCFA, 0x0000001
+.include "data/scripts/gUnk_0800FCFA.inc"
 
-gUnk_0800FCFB:: @ 0800FCFB
-	.incbin "baserom.gba", 0x00FCFB, 0x0000001
+.include "data/scripts/gUnk_0800FCFB.inc"
 
-gUnk_0800FCFC:: @ 0800FCFC
-	.incbin "baserom.gba", 0x00FCFC, 0x0000002
+.include "data/scripts/gUnk_0800FCFC.inc"
 
-gUnk_0800FCFE:: @ 0800FCFE
-	.incbin "baserom.gba", 0x00FCFE, 0x0000001
+.include "data/scripts/gUnk_0800FCFE.inc"
 
-gUnk_0800FCFF:: @ 0800FCFF
-	.incbin "baserom.gba", 0x00FCFF, 0x0000001
+.include "data/scripts/gUnk_0800FCFF.inc"
 
-gUnk_0800FD00:: @ 0800FD00
-	.incbin "baserom.gba", 0x00FD00, 0x0000001
+.include "data/scripts/gUnk_0800FD00.inc"
 
-gUnk_0800FD01:: @ 0800FD01
-	.incbin "baserom.gba", 0x00FD01, 0x0000003
+.include "data/scripts/gUnk_0800FD01.inc"
 
-gUnk_0800FD04:: @ 0800FD04
-	.incbin "baserom.gba", 0x00FD04, 0x0000001
+.include "data/scripts/gUnk_0800FD04.inc"
 
-gUnk_0800FD05:: @ 0800FD05
-	.incbin "baserom.gba", 0x00FD05, 0x0000007
+.include "data/scripts/gUnk_0800FD05.inc"
 
-gUnk_0800FD0C:: @ 0800FD0C
-	.incbin "baserom.gba", 0x00FD0C, 0x000000A
+.include "data/scripts/gUnk_0800FD0C.inc"
 
-gUnk_0800FD16:: @ 0800FD16
-	.incbin "baserom.gba", 0x00FD16, 0x000000B
+.include "data/scripts/gUnk_0800FD16.inc"
 
-gUnk_0800FD21:: @ 0800FD21
-	.incbin "baserom.gba", 0x00FD21, 0x000005F
+.include "data/scripts/gUnk_0800FD21.inc"
 
-gUnk_0800FD80:: @ 0800FD80
-	.incbin "baserom.gba", 0x00FD80, 0x0000020
+.include "data/scripts/gUnk_0800FD80.inc"
 
-gUnk_0800FDA0:: @ 0800FDA0
-	.incbin "baserom.gba", 0x00FDA0, 0x000002C
+.include "data/scripts/gUnk_0800FDA0.inc"
 
-gUnk_0800FDCC:: @ 0800FDCC
-	.incbin "baserom.gba", 0x00FDCC, 0x0000026
+.include "data/scripts/gUnk_0800FDCC.inc"
 
-gUnk_0800FDF2:: @ 0800FDF2
-	.incbin "baserom.gba", 0x00FDF2, 0x0000001
+.include "data/scripts/gUnk_0800FDF2.inc"
 
-gUnk_0800FDF3:: @ 0800FDF3
-	.incbin "baserom.gba", 0x00FDF3, 0x0000007
+.include "data/scripts/gUnk_0800FDF3.inc"
 
-gUnk_0800FDFA:: @ 0800FDFA
-	.incbin "baserom.gba", 0x00FDFA, 0x0000002
+.include "data/scripts/gUnk_0800FDFA.inc"
 
-gUnk_0800FDFC:: @ 0800FDFC
-	.incbin "baserom.gba", 0x00FDFC, 0x0000002
+.include "data/scripts/gUnk_0800FDFC.inc"
 
-gUnk_0800FDFE:: @ 0800FDFE
-	.incbin "baserom.gba", 0x00FDFE, 0x0000001
+.include "data/scripts/gUnk_0800FDFE.inc"
 
-gUnk_0800FDFF:: @ 0800FDFF
-	.incbin "baserom.gba", 0x00FDFF, 0x0000001
+.include "data/scripts/gUnk_0800FDFF.inc"
 
-gUnk_0800FE00:: @ 0800FE00
-	.incbin "baserom.gba", 0x00FE00, 0x0000001
+.include "data/scripts/gUnk_0800FE00.inc"
 
-gUnk_0800FE01:: @ 0800FE01
-	.incbin "baserom.gba", 0x00FE01, 0x0000001
+.include "data/scripts/gUnk_0800FE01.inc"
 
-gUnk_0800FE02:: @ 0800FE02
-	.incbin "baserom.gba", 0x00FE02, 0x0000002
+.include "data/scripts/gUnk_0800FE02.inc"
 
-gUnk_0800FE04:: @ 0800FE04
-	.incbin "baserom.gba", 0x00FE04, 0x0000002
+.include "data/scripts/gUnk_0800FE04.inc"
 
-gUnk_0800FE06:: @ 0800FE06
-	.incbin "baserom.gba", 0x00FE06, 0x0000001
+.include "data/scripts/gUnk_0800FE06.inc"
 
-gUnk_0800FE07:: @ 0800FE07
-	.incbin "baserom.gba", 0x00FE07, 0x0000001
+.include "data/scripts/gUnk_0800FE07.inc"
 
-gUnk_0800FE08:: @ 0800FE08
-	.incbin "baserom.gba", 0x00FE08, 0x0000001
+.include "data/scripts/gUnk_0800FE08.inc"
 
-gUnk_0800FE09:: @ 0800FE09
-	.incbin "baserom.gba", 0x00FE09, 0x0000037
+.include "data/scripts/gUnk_0800FE09.inc"
 
-gUnk_0800FE40:: @ 0800FE40
-	.incbin "baserom.gba", 0x00FE40, 0x0000004
+.include "data/scripts/gUnk_0800FE40.inc"
 
-gUnk_0800FE44:: @ 0800FE44
-	.incbin "baserom.gba", 0x00FE44, 0x0000020
+.include "data/scripts/gUnk_0800FE44.inc"
 
-gUnk_0800FE64:: @ 0800FE64
-	.incbin "baserom.gba", 0x00FE64, 0x0000024
+.include "data/scripts/gUnk_0800FE64.inc"
 
-gUnk_0800FE88:: @ 0800FE88
-	.incbin "baserom.gba", 0x00FE88, 0x0000034
+.include "data/scripts/gUnk_0800FE88.inc"
 
-gUnk_0800FEBC:: @ 0800FEBC
-	.incbin "baserom.gba", 0x00FEBC, 0x0000034
+.include "data/scripts/gUnk_0800FEBC.inc"
 
-gUnk_0800FEF0:: @ 0800FEF0
-	.incbin "baserom.gba", 0x00FEF0, 0x0000002
+.include "data/scripts/gUnk_0800FEF0.inc"
 
-gUnk_0800FEF2:: @ 0800FEF2
-	.incbin "baserom.gba", 0x00FEF2, 0x0000007
+.include "data/scripts/gUnk_0800FEF2.inc"
 
-gUnk_0800FEF9:: @ 0800FEF9
-	.incbin "baserom.gba", 0x00FEF9, 0x0000003
+.include "data/scripts/gUnk_0800FEF9.inc"
 
-gUnk_0800FEFC:: @ 0800FEFC
-	.incbin "baserom.gba", 0x00FEFC, 0x0000002
+.include "data/scripts/gUnk_0800FEFC.inc"
 
-gUnk_0800FEFE:: @ 0800FEFE
-	.incbin "baserom.gba", 0x00FEFE, 0x0000003
+.include "data/scripts/gUnk_0800FEFE.inc"
 
-gUnk_0800FF01:: @ 0800FF01
-	.incbin "baserom.gba", 0x00FF01, 0x0000002
+.include "data/scripts/gUnk_0800FF01.inc"
 
-gUnk_0800FF03:: @ 0800FF03
-	.incbin "baserom.gba", 0x00FF03, 0x0000001
+.include "data/scripts/gUnk_0800FF03.inc"
 
-gUnk_0800FF04:: @ 0800FF04
-	.incbin "baserom.gba", 0x00FF04, 0x0000001
+.include "data/scripts/gUnk_0800FF04.inc"
 
-gUnk_0800FF05:: @ 0800FF05
-	.incbin "baserom.gba", 0x00FF05, 0x0000001
+.include "data/scripts/gUnk_0800FF05.inc"
 
-gUnk_0800FF06:: @ 0800FF06
-	.incbin "baserom.gba", 0x00FF06, 0x0000002
+.include "data/scripts/gUnk_0800FF06.inc"
 
-gUnk_0800FF08:: @ 0800FF08
-	.incbin "baserom.gba", 0x00FF08, 0x0000010
+.include "data/scripts/gUnk_0800FF08.inc"
 
-gUnk_0800FF18:: @ 0800FF18
-	.incbin "baserom.gba", 0x00FF18, 0x0000012
+.include "data/scripts/gUnk_0800FF18.inc"
 
-gUnk_0800FF2A:: @ 0800FF2A
-	.incbin "baserom.gba", 0x00FF2A, 0x000004A
+.include "data/scripts/gUnk_0800FF2A.inc"
 
-gUnk_0800FF74:: @ 0800FF74
-	.incbin "baserom.gba", 0x00FF74, 0x000003C
+.include "data/scripts/gUnk_0800FF74.inc"
 
-gUnk_0800FFB0:: @ 0800FFB0
-	.incbin "baserom.gba", 0x00FFB0, 0x000000B
+.include "data/scripts/gUnk_0800FFB0.inc"
 
-gUnk_0800FFBB:: @ 0800FFBB
-	.incbin "baserom.gba", 0x00FFBB, 0x000001B
+.include "data/scripts/gUnk_0800FFBB.inc"
 
-gUnk_0800FFD6:: @ 0800FFD6
-	.incbin "baserom.gba", 0x00FFD6, 0x0000018
+.include "data/scripts/gUnk_0800FFD6.inc"
 
-gUnk_0800FFEE:: @ 0800FFEE
-	.incbin "baserom.gba", 0x00FFEE, 0x0000008
+.include "data/scripts/gUnk_0800FFEE.inc"
 
-gUnk_0800FFF6:: @ 0800FFF6
-	.incbin "baserom.gba", 0x00FFF6, 0x0000006
+.include "data/scripts/gUnk_0800FFF6.inc"
 
-gUnk_0800FFFC:: @ 0800FFFC
-	.incbin "baserom.gba", 0x00FFFC, 0x0000001
+.include "data/scripts/gUnk_0800FFFC.inc"
 
-gUnk_0800FFFD:: @ 0800FFFD
-	.incbin "baserom.gba", 0x00FFFD, 0x0000002
+.include "data/scripts/gUnk_0800FFFD.inc"
 
-gUnk_0800FFFF:: @ 0800FFFF
-	.incbin "baserom.gba", 0x00FFFF, 0x0000001
+.include "data/scripts/gUnk_0800FFFF.inc"
 
-gUnk_08010000:: @ 08010000
-	.incbin "baserom.gba", 0x010000, 0x0000001
+.include "data/scripts/gUnk_08010000.inc"
 
-gUnk_08010001:: @ 08010001
-	.incbin "baserom.gba", 0x010001, 0x0000001
+.include "data/scripts/gUnk_08010001.inc"
 
-gUnk_08010002:: @ 08010002
-	.incbin "baserom.gba", 0x010002, 0x0000001
+.include "data/scripts/gUnk_08010002.inc"
 
-gUnk_08010003:: @ 08010003
-	.incbin "baserom.gba", 0x010003, 0x0000002
+.include "data/scripts/gUnk_08010003.inc"
 
-gUnk_08010005:: @ 08010005
-	.incbin "baserom.gba", 0x010005, 0x0000002
+.include "data/scripts/gUnk_08010005.inc"
 
-gUnk_08010007:: @ 08010007
-	.incbin "baserom.gba", 0x010007, 0x0000001
+.include "data/scripts/gUnk_08010007.inc"
 
-gUnk_08010008:: @ 08010008
-	.incbin "baserom.gba", 0x010008, 0x0000001
+.include "data/scripts/gUnk_08010008.inc"
 
-gUnk_08010009:: @ 08010009
-	.incbin "baserom.gba", 0x010009, 0x0000001
+.include "data/scripts/gUnk_08010009.inc"
 
-gUnk_0801000A:: @ 0801000A
-	.incbin "baserom.gba", 0x01000A, 0x0000002
+.include "data/scripts/gUnk_0801000A.inc"
 
-gUnk_0801000C:: @ 0801000C
-	.incbin "baserom.gba", 0x01000C, 0x0000001
+.include "data/scripts/gUnk_0801000C.inc"
 
-gUnk_0801000D:: @ 0801000D
-	.incbin "baserom.gba", 0x01000D, 0x0000001
+.include "data/scripts/gUnk_0801000D.inc"
 
-gUnk_0801000E:: @ 0801000E
-	.incbin "baserom.gba", 0x01000E, 0x0000001
+.include "data/scripts/gUnk_0801000E.inc"
 
-gUnk_0801000F:: @ 0801000F
-	.incbin "baserom.gba", 0x01000F, 0x0000009
+.include "data/scripts/gUnk_0801000F.inc"
 
-gUnk_08010018:: @ 08010018
-	.incbin "baserom.gba", 0x010018, 0x0000003
+.include "data/scripts/gUnk_08010018.inc"
 
-gUnk_0801001B:: @ 0801001B
-	.incbin "baserom.gba", 0x01001B, 0x0000002
+.include "data/scripts/gUnk_0801001B.inc"
 
-gUnk_0801001D:: @ 0801001D
-	.incbin "baserom.gba", 0x01001D, 0x0000006
+.include "data/scripts/gUnk_0801001D.inc"
 
-gUnk_08010023:: @ 08010023
-	.incbin "baserom.gba", 0x010023, 0x0000021
+.include "data/scripts/gUnk_08010023.inc"
 
-gUnk_08010044:: @ 08010044
-	.incbin "baserom.gba", 0x010044, 0x0000054
+.include "data/scripts/gUnk_08010044.inc"
 
-gUnk_08010098:: @ 08010098
-	.incbin "baserom.gba", 0x010098, 0x0000001
+.include "data/scripts/gUnk_08010098.inc"
 
-gUnk_08010099:: @ 08010099
-	.incbin "baserom.gba", 0x010099, 0x0000028
+.include "data/scripts/gUnk_08010099.inc"
 
-gUnk_080100C1:: @ 080100C1
-	.incbin "baserom.gba", 0x0100C1, 0x0000007
+.include "data/scripts/gUnk_080100C1.inc"
 
-gUnk_080100C8:: @ 080100C8
-	.incbin "baserom.gba", 0x0100C8, 0x000002D
+.include "data/scripts/gUnk_080100C8.inc"
 
-gUnk_080100F5:: @ 080100F5
-	.incbin "baserom.gba", 0x0100F5, 0x0000007
+.include "data/scripts/gUnk_080100F5.inc"
 
-gUnk_080100FC:: @ 080100FC
-	.incbin "baserom.gba", 0x0100FC, 0x0000002
+.include "data/scripts/gUnk_080100FC.inc"
 
-gUnk_080100FE:: @ 080100FE
-	.incbin "baserom.gba", 0x0100FE, 0x0000001
+.include "data/scripts/gUnk_080100FE.inc"
 
-gUnk_080100FF:: @ 080100FF
-	.incbin "baserom.gba", 0x0100FF, 0x0000001
+.include "data/scripts/gUnk_080100FF.inc"
 
-gUnk_08010100:: @ 08010100
-	.incbin "baserom.gba", 0x010100, 0x0000002
+.include "data/scripts/gUnk_08010100.inc"
 
-gUnk_08010102:: @ 08010102
-	.incbin "baserom.gba", 0x010102, 0x0000001
+.include "data/scripts/gUnk_08010102.inc"
 
-gUnk_08010103:: @ 08010103
-	.incbin "baserom.gba", 0x010103, 0x0000002
+.include "data/scripts/gUnk_08010103.inc"
 
-gUnk_08010105:: @ 08010105
-	.incbin "baserom.gba", 0x010105, 0x0000001
+.include "data/scripts/gUnk_08010105.inc"
 
-gUnk_08010106:: @ 08010106
-	.incbin "baserom.gba", 0x010106, 0x0000004
+.include "data/scripts/gUnk_08010106.inc"
 
-gUnk_0801010A:: @ 0801010A
-	.incbin "baserom.gba", 0x01010A, 0x0000007
+.include "data/scripts/gUnk_0801010A.inc"
 
-gUnk_08010111:: @ 08010111
-	.incbin "baserom.gba", 0x010111, 0x000000F
+.include "data/scripts/gUnk_08010111.inc"
 
-gUnk_08010120:: @ 08010120
-	.incbin "baserom.gba", 0x010120, 0x0000010
+.include "data/scripts/gUnk_08010120.inc"
 
-gUnk_08010130:: @ 08010130
-	.incbin "baserom.gba", 0x010130, 0x0000018
+.include "data/scripts/gUnk_08010130.inc"
 
-gUnk_08010148:: @ 08010148
-	.incbin "baserom.gba", 0x010148, 0x00000B2
+.include "data/scripts/gUnk_08010148.inc"
 
-gUnk_080101FA:: @ 080101FA
-	.incbin "baserom.gba", 0x0101FA, 0x0000003
+.include "data/scripts/gUnk_080101FA.inc"
 
-gUnk_080101FD:: @ 080101FD
-	.incbin "baserom.gba", 0x0101FD, 0x0000002
+.include "data/scripts/gUnk_080101FD.inc"
 
-gUnk_080101FF:: @ 080101FF
-	.incbin "baserom.gba", 0x0101FF, 0x0000001
+.include "data/scripts/gUnk_080101FF.inc"
 
-gUnk_08010200:: @ 08010200
-	.incbin "baserom.gba", 0x010200, 0x0000003
+.include "data/scripts/gUnk_08010200.inc"
 
-gUnk_08010203:: @ 08010203
-	.incbin "baserom.gba", 0x010203, 0x0000004
+.include "data/scripts/gUnk_08010203.inc"
 
-gUnk_08010207:: @ 08010207
-	.incbin "baserom.gba", 0x010207, 0x0000001
+.include "data/scripts/gUnk_08010207.inc"
 
-gUnk_08010208:: @ 08010208
-	.incbin "baserom.gba", 0x010208, 0x0000004
+.include "data/scripts/gUnk_08010208.inc"
 
-gUnk_0801020C:: @ 0801020C
-	.incbin "baserom.gba", 0x01020C, 0x0000014
+.include "data/scripts/gUnk_0801020C.inc"
 
-gUnk_08010220:: @ 08010220
-	.incbin "baserom.gba", 0x010220, 0x0000016
+.include "data/scripts/gUnk_08010220.inc"
 
-gUnk_08010236:: @ 08010236
-	.incbin "baserom.gba", 0x010236, 0x000002E
+.include "data/scripts/gUnk_08010236.inc"
 
-gUnk_08010264:: @ 08010264
-	.incbin "baserom.gba", 0x010264, 0x0000030
+.include "data/scripts/gUnk_08010264.inc"
 
-gUnk_08010294:: @ 08010294
-	.incbin "baserom.gba", 0x010294, 0x000004C
+.include "data/scripts/gUnk_08010294.inc"
 
-gUnk_080102E0:: @ 080102E0
-	.incbin "baserom.gba", 0x0102E0, 0x000001B
+.include "data/scripts/gUnk_080102E0.inc"
 
-gUnk_080102FB:: @ 080102FB
-	.incbin "baserom.gba", 0x0102FB, 0x0000002
+.include "data/scripts/gUnk_080102FB.inc"
 
-gUnk_080102FD:: @ 080102FD
-	.incbin "baserom.gba", 0x0102FD, 0x0000001
+.include "data/scripts/gUnk_080102FD.inc"
 
-gUnk_080102FE:: @ 080102FE
-	.incbin "baserom.gba", 0x0102FE, 0x0000005
+.include "data/scripts/gUnk_080102FE.inc"
 
-gUnk_08010303:: @ 08010303
-	.incbin "baserom.gba", 0x010303, 0x0000001
+.include "data/scripts/gUnk_08010303.inc"
 
-gUnk_08010304:: @ 08010304
-	.incbin "baserom.gba", 0x010304, 0x0000001
+.include "data/scripts/gUnk_08010304.inc"
 
-gUnk_08010305:: @ 08010305
-	.incbin "baserom.gba", 0x010305, 0x0000005
+.include "data/scripts/gUnk_08010305.inc"
 
-gUnk_0801030A:: @ 0801030A
-	.incbin "baserom.gba", 0x01030A, 0x0000002
+.include "data/scripts/gUnk_0801030A.inc"
 
-gUnk_0801030C:: @ 0801030C
-	.incbin "baserom.gba", 0x01030C, 0x0000014
+.include "data/scripts/gUnk_0801030C.inc"
 
-gUnk_08010320:: @ 08010320
-	.incbin "baserom.gba", 0x010320, 0x0000090
+.include "data/scripts/gUnk_08010320.inc"
 
-gUnk_080103B0:: @ 080103B0
-	.incbin "baserom.gba", 0x0103B0, 0x0000020
+.include "data/scripts/gUnk_080103B0.inc"
 
-gUnk_080103D0:: @ 080103D0
-	.incbin "baserom.gba", 0x0103D0, 0x0000028
+.include "data/scripts/gUnk_080103D0.inc"
 
-gUnk_080103F8:: @ 080103F8
-	.incbin "baserom.gba", 0x0103F8, 0x0000005
+.include "data/scripts/gUnk_080103F8.inc"
 
-gUnk_080103FD:: @ 080103FD
-	.incbin "baserom.gba", 0x0103FD, 0x0000003
+.include "data/scripts/gUnk_080103FD.inc"
 
-gUnk_08010400:: @ 08010400
-	.incbin "baserom.gba", 0x010400, 0x0000006
+.include "data/scripts/gUnk_08010400.inc"
 
-gUnk_08010406:: @ 08010406
-	.incbin "baserom.gba", 0x010406, 0x0000001
+.include "data/scripts/gUnk_08010406.inc"
 
-gUnk_08010407:: @ 08010407
-	.incbin "baserom.gba", 0x010407, 0x0000003
+.include "data/scripts/gUnk_08010407.inc"
 
-gUnk_0801040A:: @ 0801040A
-	.incbin "baserom.gba", 0x01040A, 0x000001E
+.include "data/scripts/gUnk_0801040A.inc"
 
-gUnk_08010428:: @ 08010428
-	.incbin "baserom.gba", 0x010428, 0x000002C
+.include "data/scripts/gUnk_08010428.inc"
 
-gUnk_08010454:: @ 08010454
-	.incbin "baserom.gba", 0x010454, 0x000002C
+.include "data/scripts/gUnk_08010454.inc"
 
-gUnk_08010480:: @ 08010480
-	.incbin "baserom.gba", 0x010480, 0x0000020
+.include "data/scripts/gUnk_08010480.inc"
 
-gUnk_080104A0:: @ 080104A0
-	.incbin "baserom.gba", 0x0104A0, 0x000004C
+.include "data/scripts/gUnk_080104A0.inc"
 
-gUnk_080104EC:: @ 080104EC
-	.incbin "baserom.gba", 0x0104EC, 0x0000013
+.include "data/scripts/gUnk_080104EC.inc"
 
-gUnk_080104FF:: @ 080104FF
-	.incbin "baserom.gba", 0x0104FF, 0x0000002
+.include "data/scripts/gUnk_080104FF.inc"
 
-gUnk_08010501:: @ 08010501
-	.incbin "baserom.gba", 0x010501, 0x0000001
+.include "data/scripts/gUnk_08010501.inc"
 
-gUnk_08010502:: @ 08010502
-	.incbin "baserom.gba", 0x010502, 0x0000001
+.include "data/scripts/gUnk_08010502.inc"
 
-gUnk_08010503:: @ 08010503
-	.incbin "baserom.gba", 0x010503, 0x0000007
+.include "data/scripts/gUnk_08010503.inc"
 
-gUnk_0801050A:: @ 0801050A
-	.incbin "baserom.gba", 0x01050A, 0x0000001
+.include "data/scripts/gUnk_0801050A.inc"
 
-gUnk_0801050B:: @ 0801050B
-	.incbin "baserom.gba", 0x01050B, 0x000001B
+.include "data/scripts/gUnk_0801050B.inc"
 
-gUnk_08010526:: @ 08010526
-	.incbin "baserom.gba", 0x010526, 0x0000079
+.include "data/scripts/gUnk_08010526.inc"
 
-gUnk_0801059F:: @ 0801059F
-	.incbin "baserom.gba", 0x01059F, 0x000002A
+.include "data/scripts/gUnk_0801059F.inc"
 
-gUnk_080105C9:: @ 080105C9
-	.incbin "baserom.gba", 0x0105C9, 0x0000032
+.include "data/scripts/gUnk_080105C9.inc"
 
-gUnk_080105FB:: @ 080105FB
-	.incbin "baserom.gba", 0x0105FB, 0x0000004
+.include "data/scripts/gUnk_080105FB.inc"
 
-gUnk_080105FF:: @ 080105FF
-	.incbin "baserom.gba", 0x0105FF, 0x0000001
+.include "data/scripts/gUnk_080105FF.inc"
 
-gUnk_08010600:: @ 08010600
-	.incbin "baserom.gba", 0x010600, 0x000000A
+.include "data/scripts/gUnk_08010600.inc"
 
-gUnk_0801060A:: @ 0801060A
-	.incbin "baserom.gba", 0x01060A, 0x0000003
+.include "data/scripts/gUnk_0801060A.inc"
 
-gUnk_0801060D:: @ 0801060D
-	.incbin "baserom.gba", 0x01060D, 0x000000A
+.include "data/scripts/gUnk_0801060D.inc"
 
-gUnk_08010617:: @ 08010617
-	.incbin "baserom.gba", 0x010617, 0x0000005
+.include "data/scripts/gUnk_08010617.inc"
 
-gUnk_0801061C:: @ 0801061C
-	.incbin "baserom.gba", 0x01061C, 0x0000028
+.include "data/scripts/gUnk_0801061C.inc"
 
-gUnk_08010644:: @ 08010644
-	.incbin "baserom.gba", 0x010644, 0x000000C
+.include "data/scripts/gUnk_08010644.inc"
 
-gUnk_08010650:: @ 08010650
-	.incbin "baserom.gba", 0x010650, 0x0000024
+.include "data/scripts/gUnk_08010650.inc"
 
-gUnk_08010674:: @ 08010674
-	.incbin "baserom.gba", 0x010674, 0x0000038
+.include "data/scripts/gUnk_08010674.inc"
 
-gUnk_080106AC:: @ 080106AC
-	.incbin "baserom.gba", 0x0106AC, 0x0000054
+.include "data/scripts/gUnk_080106AC.inc"
 
-gUnk_08010700:: @ 08010700
-	.incbin "baserom.gba", 0x010700, 0x0000001
+.include "data/scripts/gUnk_08010700.inc"
 
-gUnk_08010701:: @ 08010701
-	.incbin "baserom.gba", 0x010701, 0x0000004
+.include "data/scripts/gUnk_08010701.inc"
 
-gUnk_08010705:: @ 08010705
-	.incbin "baserom.gba", 0x010705, 0x0000009
+.include "data/scripts/gUnk_08010705.inc"
 
-gUnk_0801070E:: @ 0801070E
-	.incbin "baserom.gba", 0x01070E, 0x0000026
+.include "data/scripts/gUnk_0801070E.inc"
 
-gUnk_08010734:: @ 08010734
-	.incbin "baserom.gba", 0x010734, 0x0000060
+.include "data/scripts/gUnk_08010734.inc"
 
-gUnk_08010794:: @ 08010794
-	.incbin "baserom.gba", 0x010794, 0x000003C
+.include "data/scripts/gUnk_08010794.inc"
 
-gUnk_080107D0:: @ 080107D0
-	.incbin "baserom.gba", 0x0107D0, 0x000003A
+.include "data/scripts/gUnk_080107D0.inc"
 
-gUnk_0801080A:: @ 0801080A
-	.incbin "baserom.gba", 0x01080A, 0x0000001
+.include "data/scripts/gUnk_0801080A.inc"
 
-gUnk_0801080B:: @ 0801080B
-	.incbin "baserom.gba", 0x01080B, 0x000000A
+.include "data/scripts/gUnk_0801080B.inc"
 
-gUnk_08010815:: @ 08010815
-	.incbin "baserom.gba", 0x010815, 0x0000006
+.include "data/scripts/gUnk_08010815.inc"
 
-gUnk_0801081B:: @ 0801081B
-	.incbin "baserom.gba", 0x01081B, 0x00000B5
+.include "data/scripts/gUnk_0801081B.inc"
 
-gUnk_080108D0:: @ 080108D0
-	.incbin "baserom.gba", 0x0108D0, 0x000002F
+.include "data/scripts/gUnk_080108D0.inc"
 
-gUnk_080108FF:: @ 080108FF
-	.incbin "baserom.gba", 0x0108FF, 0x000000D
+.include "data/scripts/gUnk_080108FF.inc"
 
-gUnk_0801090C:: @ 0801090C
-	.incbin "baserom.gba", 0x01090C, 0x0000003
+.include "data/scripts/gUnk_0801090C.inc"
 
-gUnk_0801090F:: @ 0801090F
-	.incbin "baserom.gba", 0x01090F, 0x0000008
+.include "data/scripts/gUnk_0801090F.inc"
 
-gUnk_08010917:: @ 08010917
-	.incbin "baserom.gba", 0x010917, 0x000004D
+.include "data/scripts/gUnk_08010917.inc"
 
-gUnk_08010964:: @ 08010964
-	.incbin "baserom.gba", 0x010964, 0x000003C
+.include "data/scripts/gUnk_08010964.inc"
 
-gUnk_080109A0:: @ 080109A0
-	.incbin "baserom.gba", 0x0109A0, 0x0000050
+.include "data/scripts/gUnk_080109A0.inc"
 
-gUnk_080109F0:: @ 080109F0
-	.incbin "baserom.gba", 0x0109F0, 0x0000006
+.include "data/scripts/gUnk_080109F0.inc"
 
-gUnk_080109F6:: @ 080109F6
-	.incbin "baserom.gba", 0x0109F6, 0x000001E
+.include "data/scripts/gUnk_080109F6.inc"
 
-gUnk_08010A14:: @ 08010A14
-	.incbin "baserom.gba", 0x010A14, 0x000000B
+.include "data/scripts/gUnk_08010A14.inc"
 
-gUnk_08010A1F:: @ 08010A1F
-	.incbin "baserom.gba", 0x010A1F, 0x0000019
+.include "data/scripts/gUnk_08010A1F.inc"
 
-gUnk_08010A38:: @ 08010A38
-	.incbin "baserom.gba", 0x010A38, 0x0000024
+.include "data/scripts/gUnk_08010A38.inc"
 
-gUnk_08010A5C:: @ 08010A5C
-	.incbin "baserom.gba", 0x010A5C, 0x000003C
+.include "data/scripts/gUnk_08010A5C.inc"
 
-gUnk_08010A98:: @ 08010A98
-	.incbin "baserom.gba", 0x010A98, 0x000004C
+.include "data/scripts/gUnk_08010A98.inc"
 
-gUnk_08010AE4:: @ 08010AE4
-	.incbin "baserom.gba", 0x010AE4, 0x0000020
+.include "data/scripts/gUnk_08010AE4.inc"
 
-gUnk_08010B04:: @ 08010B04
-	.incbin "baserom.gba", 0x010B04, 0x0000064
+.include "data/scripts/gUnk_08010B04.inc"
 
-gUnk_08010B68:: @ 08010B68
-	.incbin "baserom.gba", 0x010B68, 0x000004C
+.include "data/scripts/gUnk_08010B68.inc"
 
-gUnk_08010BB4:: @ 08010BB4
-	.incbin "baserom.gba", 0x010BB4, 0x0000038
+.include "data/scripts/gUnk_08010BB4.inc"
 
-gUnk_08010BEC:: @ 08010BEC
-	.incbin "baserom.gba", 0x010BEC, 0x000000D
+.include "data/scripts/gUnk_08010BEC.inc"
 
-gUnk_08010BF9:: @ 08010BF9
-	.incbin "baserom.gba", 0x010BF9, 0x0000005
+.include "data/scripts/gUnk_08010BF9.inc"
 
-gUnk_08010BFE:: @ 08010BFE
-	.incbin "baserom.gba", 0x010BFE, 0x000001C
+.include "data/scripts/gUnk_08010BFE.inc"
 
-gUnk_08010C1A:: @ 08010C1A
-	.incbin "baserom.gba", 0x010C1A, 0x00000E9
+.include "data/scripts/gUnk_08010C1A.inc"
 
-gUnk_08010D03:: @ 08010D03
-	.incbin "baserom.gba", 0x010D03, 0x00000FD
+.include "data/scripts/gUnk_08010D03.inc"
 
-gUnk_08010E00:: @ 08010E00
-	.incbin "baserom.gba", 0x010E00, 0x000000D
+.include "data/scripts/gUnk_08010E00.inc"
 
-gUnk_08010E0D:: @ 08010E0D
-	.incbin "baserom.gba", 0x010E0D, 0x00000F3
+.include "data/scripts/gUnk_08010E0D.inc"
 
-gUnk_08010F00:: @ 08010F00
-	.incbin "baserom.gba", 0x010F00, 0x00000FF
+.include "data/scripts/gUnk_08010F00.inc"
 
-gUnk_08010FFF:: @ 08010FFF
-	.incbin "baserom.gba", 0x010FFF, 0x0000001
+.include "data/scripts/gUnk_08010FFF.inc"
 
-gUnk_08011000:: @ 08011000
-	.incbin "baserom.gba", 0x011000, 0x0000001
+.include "data/scripts/gUnk_08011000.inc"
 
-gUnk_08011001:: @ 08011001
-	.incbin "baserom.gba", 0x011001, 0x000001E
+.include "data/scripts/gUnk_08011001.inc"
 
-gUnk_0801101F:: @ 0801101F
-	.incbin "baserom.gba", 0x01101F, 0x0000055
+.include "data/scripts/gUnk_0801101F.inc"
 
-gUnk_08011074:: @ 08011074
-	.incbin "baserom.gba", 0x011074, 0x000000F
+.include "data/scripts/gUnk_08011074.inc"
 
-gUnk_08011083:: @ 08011083
-	.incbin "baserom.gba", 0x011083, 0x0000059
+.include "data/scripts/gUnk_08011083.inc"
 
-gUnk_080110DC:: @ 080110DC
-	.incbin "baserom.gba", 0x0110DC, 0x000000C
+.include "data/scripts/gUnk_080110DC.inc"
 
-gUnk_080110E8:: @ 080110E8
-	.incbin "baserom.gba", 0x0110E8, 0x0000040
+.include "data/scripts/gUnk_080110E8.inc"
 
-gUnk_08011128:: @ 08011128
-	.incbin "baserom.gba", 0x011128, 0x00000A4
+.include "data/scripts/gUnk_08011128.inc"
 
-gUnk_080111CC:: @ 080111CC
-	.incbin "baserom.gba", 0x0111CC, 0x000003C
+.include "data/scripts/gUnk_080111CC.inc"
 
-gUnk_08011208:: @ 08011208
-	.incbin "baserom.gba", 0x011208, 0x0000015
+.include "data/scripts/gUnk_08011208.inc"
 
-gUnk_0801121D:: @ 0801121D
-	.incbin "baserom.gba", 0x01121D, 0x00000A7
+.include "data/scripts/gUnk_0801121D.inc"
 
-gUnk_080112C4:: @ 080112C4
-	.incbin "baserom.gba", 0x0112C4, 0x000004B
+.include "data/scripts/gUnk_080112C4.inc"
 
-gUnk_0801130F:: @ 0801130F
-	.incbin "baserom.gba", 0x01130F, 0x0000019
+.include "data/scripts/gUnk_0801130F.inc"
 
-gUnk_08011328:: @ 08011328
-	.incbin "baserom.gba", 0x011328, 0x00000DB
+.include "data/scripts/gUnk_08011328.inc"
 
-gUnk_08011403:: @ 08011403
-	.incbin "baserom.gba", 0x011403, 0x00001CD
+.include "data/scripts/gUnk_08011403.inc"
 
-gUnk_080115D0:: @ 080115D0
-	.incbin "baserom.gba", 0x0115D0, 0x0000038
+.include "data/scripts/gUnk_080115D0.inc"
 
-gUnk_08011608:: @ 08011608
-	.incbin "baserom.gba", 0x011608, 0x0000038
+.include "data/scripts/gUnk_08011608.inc"
 
-gUnk_08011640:: @ 08011640
-	.incbin "baserom.gba", 0x011640, 0x0000068
+.include "data/scripts/gUnk_08011640.inc"
 
-gUnk_080116A8:: @ 080116A8
-	.incbin "baserom.gba", 0x0116A8, 0x0000161
+.include "data/scripts/gUnk_080116A8.inc"
 
-gUnk_08011809:: @ 08011809
-	.incbin "baserom.gba", 0x011809, 0x0000033
+.include "data/scripts/gUnk_08011809.inc"
 
-gUnk_0801183C:: @ 0801183C
-	.incbin "baserom.gba", 0x01183C, 0x0000098
+.include "data/scripts/gUnk_0801183C.inc"
 
-gUnk_080118D4:: @ 080118D4
-	.incbin "baserom.gba", 0x0118D4, 0x000005C
+.include "data/scripts/gUnk_080118D4.inc"
 
-gUnk_08011930:: @ 08011930
-	.incbin "baserom.gba", 0x011930, 0x0000010
+.include "data/scripts/gUnk_08011930.inc"
 
-gUnk_08011940:: @ 08011940
-	.incbin "baserom.gba", 0x011940, 0x000000C
+.include "data/scripts/gUnk_08011940.inc"
 
-gUnk_0801194C:: @ 0801194C
-	.incbin "baserom.gba", 0x01194C, 0x000000C
+.include "data/scripts/gUnk_0801194C.inc"
 
-gUnk_08011958:: @ 08011958
-	.incbin "baserom.gba", 0x011958, 0x000000C
+.include "data/scripts/gUnk_08011958.inc"
 
-gUnk_08011964:: @ 08011964
-	.incbin "baserom.gba", 0x011964, 0x000004C
+.include "data/scripts/gUnk_08011964.inc"
 
-gUnk_080119B0:: @ 080119B0
-	.incbin "baserom.gba", 0x0119B0, 0x0000028
+.include "data/scripts/gUnk_080119B0.inc"
 
-gUnk_080119D8:: @ 080119D8
-	.incbin "baserom.gba", 0x0119D8, 0x000000C
+.include "data/scripts/gUnk_080119D8.inc"
 
-gUnk_080119E4:: @ 080119E4
-	.incbin "baserom.gba", 0x0119E4, 0x000000C
+.include "data/scripts/gUnk_080119E4.inc"
 
-gUnk_080119F0:: @ 080119F0
-	.incbin "baserom.gba", 0x0119F0, 0x0000014
+.include "data/scripts/gUnk_080119F0.inc"
 
-gUnk_08011A04:: @ 08011A04
-	.incbin "baserom.gba", 0x011A04, 0x0000028
+.include "data/scripts/gUnk_08011A04.inc"
 
-gUnk_08011A2C:: @ 08011A2C
-	.incbin "baserom.gba", 0x011A2C, 0x0000038
+.include "data/scripts/gUnk_08011A2C.inc"
 
-gUnk_08011A64:: @ 08011A64
-	.incbin "baserom.gba", 0x011A64, 0x0000080
+.include "data/scripts/gUnk_08011A64.inc"
 
-gUnk_08011AE4:: @ 08011AE4
-	.incbin "baserom.gba", 0x011AE4, 0x0000020
+.include "data/scripts/gUnk_08011AE4.inc"
 
-gUnk_08011B04:: @ 08011B04
-	.incbin "baserom.gba", 0x011B04, 0x000001C
+.include "data/scripts/gUnk_08011B04.inc"
 
-gUnk_08011B20:: @ 08011B20
-	.incbin "baserom.gba", 0x011B20, 0x0000020
+.include "data/scripts/gUnk_08011B20.inc"
 
-gUnk_08011B40:: @ 08011B40
-	.incbin "baserom.gba", 0x011B40, 0x00000A4
+.include "data/scripts/gUnk_08011B40.inc"
 
-gUnk_08011BE4:: @ 08011BE4
-	.incbin "baserom.gba", 0x011BE4, 0x0000020
+.include "data/scripts/gUnk_08011BE4.inc"
 
-gUnk_08011C04:: @ 08011C04
-	.incbin "baserom.gba", 0x011C04, 0x000004C
+.include "data/scripts/gUnk_08011C04.inc"
 
-gUnk_08011C50:: @ 08011C50
-	.incbin "baserom.gba", 0x011C50, 0x000002C
+.include "data/scripts/gUnk_08011C50.inc"
 
-gUnk_08011C7C:: @ 08011C7C
-	.incbin "baserom.gba", 0x011C7C, 0x00000AC
+.include "data/scripts/gUnk_08011C7C.inc"
 
-gUnk_08011D28:: @ 08011D28
-	.incbin "baserom.gba", 0x011D28, 0x00000AC
+.include "data/scripts/gUnk_08011D28.inc"
 
-gUnk_08011DD4:: @ 08011DD4
-	.incbin "baserom.gba", 0x011DD4, 0x0000030
+.include "data/scripts/gUnk_08011DD4.inc"
 
-gUnk_08011E04:: @ 08011E04
-	.incbin "baserom.gba", 0x011E04, 0x000007C
+.include "data/scripts/gUnk_08011E04.inc"
 
-gUnk_08011E80:: @ 08011E80
-	.incbin "baserom.gba", 0x011E80, 0x000008C
+.include "data/scripts/gUnk_08011E80.inc"
 
-gUnk_08011F0C:: @ 08011F0C
-	.incbin "baserom.gba", 0x011F0C, 0x000008C
+.include "data/scripts/gUnk_08011F0C.inc"
 
-gUnk_08011F98:: @ 08011F98
-	.incbin "baserom.gba", 0x011F98, 0x000008C
+.include "data/scripts/gUnk_08011F98.inc"
 
-gUnk_08012024:: @ 08012024
-	.incbin "baserom.gba", 0x012024, 0x000006D
+.include "data/scripts/gUnk_08012024.inc"
 
-gUnk_08012091:: @ 08012091
-	.incbin "baserom.gba", 0x012091, 0x000001F
+.include "data/scripts/gUnk_08012091.inc"
 
-gUnk_080120B0:: @ 080120B0
-	.incbin "baserom.gba", 0x0120B0, 0x000003D
+.include "data/scripts/gUnk_080120B0.inc"
 
-gUnk_080120ED:: @ 080120ED
-	.incbin "baserom.gba", 0x0120ED, 0x000000E
+.include "data/scripts/gUnk_080120ED.inc"
 
-gUnk_080120FB:: @ 080120FB
-	.incbin "baserom.gba", 0x0120FB, 0x0000041
+.include "data/scripts/gUnk_080120FB.inc"
 
-gUnk_0801213C:: @ 0801213C
-	.incbin "baserom.gba", 0x01213C, 0x000008C
+.include "data/scripts/gUnk_0801213C.inc"
 
-gUnk_080121C8:: @ 080121C8
-	.incbin "baserom.gba", 0x0121C8, 0x0000038
+.include "data/scripts/gUnk_080121C8.inc"
 
-gUnk_08012200:: @ 08012200
-	.incbin "baserom.gba", 0x012200, 0x0000038
+.include "data/scripts/gUnk_08012200.inc"
 
-gUnk_08012238:: @ 08012238
-	.incbin "baserom.gba", 0x012238, 0x0000038
+.include "data/scripts/gUnk_08012238.inc"
 
-gUnk_08012270:: @ 08012270
-	.incbin "baserom.gba", 0x012270, 0x00000BC
+.include "data/scripts/gUnk_08012270.inc"
 
-gUnk_0801232C:: @ 0801232C
-	.incbin "baserom.gba", 0x01232C, 0x0000034
+.include "data/scripts/gUnk_0801232C.inc"
 
-gUnk_08012360:: @ 08012360
-	.incbin "baserom.gba", 0x012360, 0x00000B0
+.include "data/scripts/gUnk_08012360.inc"
 
-gUnk_08012410:: @ 08012410
-	.incbin "baserom.gba", 0x012410, 0x0000020
+.include "data/scripts/gUnk_08012410.inc"
 
-gUnk_08012430:: @ 08012430
-	.incbin "baserom.gba", 0x012430, 0x0000050
+.include "data/scripts/gUnk_08012430.inc"
 
-gUnk_08012480:: @ 08012480
-	.incbin "baserom.gba", 0x012480, 0x000027C
+.include "data/scripts/gUnk_08012480.inc"
 
 
 .include "data/scripts/ezlo_angry.inc"
 
-gUnk_08012AB0:: @ 08012AB0
-	.incbin "baserom.gba", 0x012AB0, 0x00000F8
+.include "data/scripts/gUnk_08012AB0.inc"
 
-gUnk_08012BA8:: @ 08012BA8
-	.incbin "baserom.gba", 0x012BA8, 0x0000050
+.include "data/scripts/gUnk_08012BA8.inc"
 
-gUnk_08012BF8:: @ 08012BF8
-	.incbin "baserom.gba", 0x012BF8, 0x0000014
+.include "data/scripts/gUnk_08012BF8.inc"
 
-gUnk_08012C0C:: @ 08012C0C
-	.incbin "baserom.gba", 0x012C0C, 0x000003C
+.include "data/scripts/gUnk_08012C0C.inc"
 
-gUnk_08012C48:: @ 08012C48
-	.incbin "baserom.gba", 0x012C48, 0x0000050
+.include "data/scripts/gUnk_08012C48.inc"
 
-gUnk_08012C98:: @ 08012C98
-	.incbin "baserom.gba", 0x012C98, 0x0000040
+.include "data/scripts/gUnk_08012C98.inc"
 
-gUnk_08012CD8:: @ 08012CD8
-	.incbin "baserom.gba", 0x012CD8, 0x0000040
+.include "data/scripts/gUnk_08012CD8.inc"
 
-gUnk_08012D18:: @ 08012D18
-	.incbin "baserom.gba", 0x012D18, 0x0000058
+.include "data/scripts/gUnk_08012D18.inc"
 
-gUnk_08012D70:: @ 08012D70
-	.incbin "baserom.gba", 0x012D70, 0x0000031
+.include "data/scripts/gUnk_08012D70.inc"
 
-gUnk_08012DA1:: @ 08012DA1
-	.incbin "baserom.gba", 0x012DA1, 0x000000F
+.include "data/scripts/gUnk_08012DA1.inc"
 
-gUnk_08012DB0:: @ 08012DB0
-	.incbin "baserom.gba", 0x012DB0, 0x0000028
+.include "data/scripts/gUnk_08012DB0.inc"
 
-gUnk_08012DD8:: @ 08012DD8
-	.incbin "baserom.gba", 0x012DD8, 0x0000048
+.include "data/scripts/gUnk_08012DD8.inc"
 
-gUnk_08012E20:: @ 08012E20
-	.incbin "baserom.gba", 0x012E20, 0x0000024
+.include "data/scripts/gUnk_08012E20.inc"
 
-gUnk_08012E44:: @ 08012E44
-	.incbin "baserom.gba", 0x012E44, 0x0000044
+.include "data/scripts/gUnk_08012E44.inc"
 
-gUnk_08012E88:: @ 08012E88
-	.incbin "baserom.gba", 0x012E88, 0x0000038
+.include "data/scripts/gUnk_08012E88.inc"
 
-gUnk_08012EC0:: @ 08012EC0
-	.incbin "baserom.gba", 0x012EC0, 0x000004C
+.include "data/scripts/gUnk_08012EC0.inc"
 
-gUnk_08012F0C:: @ 08012F0C
-	.incbin "baserom.gba", 0x012F0C, 0x00000F5
+.include "data/scripts/gUnk_08012F0C.inc"
 
-gUnk_08013001:: @ 08013001
-	.incbin "baserom.gba", 0x013001, 0x0000002
+.include "data/scripts/gUnk_08013001.inc"
 
-gUnk_08013003:: @ 08013003
-	.incbin "baserom.gba", 0x013003, 0x0000008
+.include "data/scripts/gUnk_08013003.inc"
 
-gUnk_0801300B:: @ 0801300B
-	.incbin "baserom.gba", 0x01300B, 0x0000031
+.include "data/scripts/gUnk_0801300B.inc"
 
-gUnk_0801303C:: @ 0801303C
-	.incbin "baserom.gba", 0x01303C, 0x0000034
+.include "data/scripts/gUnk_0801303C.inc"
 
-gUnk_08013070:: @ 08013070
-	.incbin "baserom.gba", 0x013070, 0x0000011
+.include "data/scripts/gUnk_08013070.inc"
 
-gUnk_08013081:: @ 08013081
-	.incbin "baserom.gba", 0x013081, 0x000000F
+.include "data/scripts/gUnk_08013081.inc"
 
-gUnk_08013090:: @ 08013090
-	.incbin "baserom.gba", 0x013090, 0x0000084
+.include "data/scripts/gUnk_08013090.inc"
 
-gUnk_08013114:: @ 08013114
-	.incbin "baserom.gba", 0x013114, 0x0000074
+.include "data/scripts/gUnk_08013114.inc"
 
-gUnk_08013188:: @ 08013188
-	.incbin "baserom.gba", 0x013188, 0x0000024
+.include "data/scripts/gUnk_08013188.inc"
 
-gUnk_080131AC:: @ 080131AC
-	.incbin "baserom.gba", 0x0131AC, 0x0000138
+.include "data/scripts/gUnk_080131AC.inc"
 
-gUnk_080132E4:: @ 080132E4
-	.incbin "baserom.gba", 0x0132E4, 0x000004C
+.include "data/scripts/gUnk_080132E4.inc"
 
-gUnk_08013330:: @ 08013330
-	.incbin "baserom.gba", 0x013330, 0x000001C
+.include "data/scripts/gUnk_08013330.inc"
 
-gUnk_0801334C:: @ 0801334C
-	.incbin "baserom.gba", 0x01334C, 0x000002C
+.include "data/scripts/gUnk_0801334C.inc"
 
-gUnk_08013378:: @ 08013378
-	.incbin "baserom.gba", 0x013378, 0x000004C
+.include "data/scripts/gUnk_08013378.inc"
 
-gUnk_080133C4:: @ 080133C4
-	.incbin "baserom.gba", 0x0133C4, 0x0000034
+.include "data/scripts/gUnk_080133C4.inc"
 
-gUnk_080133F8:: @ 080133F8
-	.incbin "baserom.gba", 0x0133F8, 0x00000E4
+.include "data/scripts/gUnk_080133F8.inc"
 
-gUnk_080134DC:: @ 080134DC
-	.incbin "baserom.gba", 0x0134DC, 0x00001FC
+.include "data/scripts/gUnk_080134DC.inc"
 
-gUnk_080136D8:: @ 080136D8
-	.incbin "baserom.gba", 0x0136D8, 0x0000048
+.include "data/scripts/gUnk_080136D8.inc"
 
-gUnk_08013720:: @ 08013720
-	.incbin "baserom.gba", 0x013720, 0x00000BA
+.include "data/scripts/gUnk_08013720.inc"
 
-gUnk_080137DA:: @ 080137DA
-	.incbin "baserom.gba", 0x0137DA, 0x00000DA
+.include "data/scripts/gUnk_080137DA.inc"
 
-gUnk_080138B4:: @ 080138B4
-	.incbin "baserom.gba", 0x0138B4, 0x0000264
+.include "data/scripts/gUnk_080138B4.inc"
 
-gUnk_08013B18:: @ 08013B18
-	.incbin "baserom.gba", 0x013B18, 0x0000058
+.include "data/scripts/gUnk_08013B18.inc"
 
-gUnk_08013B70:: @ 08013B70
-	.incbin "baserom.gba", 0x013B70, 0x0000038
+.include "data/scripts/gUnk_08013B70.inc"
 
-gUnk_08013BA8:: @ 08013BA8
-	.incbin "baserom.gba", 0x013BA8, 0x0000040
+.include "data/scripts/gUnk_08013BA8.inc"
 
-gUnk_08013BE8:: @ 08013BE8
-	.incbin "baserom.gba", 0x013BE8, 0x00000BC
+.include "data/scripts/gUnk_08013BE8.inc"
 
-gUnk_08013CA4:: @ 08013CA4
-	.incbin "baserom.gba", 0x013CA4, 0x0000160
+.include "data/scripts/gUnk_08013CA4.inc"
 
-gUnk_08013E04:: @ 08013E04
-	.incbin "baserom.gba", 0x013E04, 0x0000048
+.include "data/scripts/gUnk_08013E04.inc"
 
-gUnk_08013E4C:: @ 08013E4C
-	.incbin "baserom.gba", 0x013E4C, 0x0000024
+.include "data/scripts/gUnk_08013E4C.inc"
 
-gUnk_08013E70:: @ 08013E70
-	.incbin "baserom.gba", 0x013E70, 0x0000024
+.include "data/scripts/gUnk_08013E70.inc"
 
-gUnk_08013E94:: @ 08013E94
-	.incbin "baserom.gba", 0x013E94, 0x000001C
+.include "data/scripts/gUnk_08013E94.inc"
 
-gUnk_08013EB0:: @ 08013EB0
-	.incbin "baserom.gba", 0x013EB0, 0x000001C
+.include "data/scripts/gUnk_08013EB0.inc"
 
-gUnk_08013ECC:: @ 08013ECC
-	.incbin "baserom.gba", 0x013ECC, 0x000001C
+.include "data/scripts/gUnk_08013ECC.inc"
 
-gUnk_08013EE8:: @ 08013EE8
-	.incbin "baserom.gba", 0x013EE8, 0x000001C
+.include "data/scripts/gUnk_08013EE8.inc"
 
-gUnk_08013F04:: @ 08013F04
-	.incbin "baserom.gba", 0x013F04, 0x0000030
+.include "data/scripts/gUnk_08013F04.inc"
 
-gUnk_08013F34:: @ 08013F34
-	.incbin "baserom.gba", 0x013F34, 0x0000030
+.include "data/scripts/gUnk_08013F34.inc"
 
-gUnk_08013F64:: @ 08013F64
-	.incbin "baserom.gba", 0x013F64, 0x0000030
+.include "data/scripts/gUnk_08013F64.inc"
 
-gUnk_08013F94:: @ 08013F94
-	.incbin "baserom.gba", 0x013F94, 0x0000054
+.include "data/scripts/gUnk_08013F94.inc"
 
-gUnk_08013FE8:: @ 08013FE8
-	.incbin "baserom.gba", 0x013FE8, 0x000006C
+.include "data/scripts/gUnk_08013FE8.inc"
 
-gUnk_08014054:: @ 08014054
-	.incbin "baserom.gba", 0x014054, 0x0000020
+.include "data/scripts/gUnk_08014054.inc"
 
-gUnk_08014074:: @ 08014074
-	.incbin "baserom.gba", 0x014074, 0x0000020
+.include "data/scripts/gUnk_08014074.inc"
 
-gUnk_08014094:: @ 08014094
-	.incbin "baserom.gba", 0x014094, 0x0000048
+.include "data/scripts/gUnk_08014094.inc"
 
-gUnk_080140DC:: @ 080140DC
-	.incbin "baserom.gba", 0x0140DC, 0x000001C
+.include "data/scripts/gUnk_080140DC.inc"
 
-gUnk_080140F8:: @ 080140F8
-	.incbin "baserom.gba", 0x0140F8, 0x0000020
+.include "data/scripts/gUnk_080140F8.inc"
 
-gUnk_08014118:: @ 08014118
-	.incbin "baserom.gba", 0x014118, 0x000003C
+.include "data/scripts/gUnk_08014118.inc"
 
-gUnk_08014154:: @ 08014154
-	.incbin "baserom.gba", 0x014154, 0x0000088
+.include "data/scripts/gUnk_08014154.inc"
 
-gUnk_080141DC:: @ 080141DC
-	.incbin "baserom.gba", 0x0141DC, 0x0000034
+.include "data/scripts/gUnk_080141DC.inc"
 
-gUnk_08014210:: @ 08014210
-	.incbin "baserom.gba", 0x014210, 0x0000064
+.include "data/scripts/gUnk_08014210.inc"
 
-gUnk_08014274:: @ 08014274
-	.incbin "baserom.gba", 0x014274, 0x000003C
+.include "data/scripts/gUnk_08014274.inc"
 
-gUnk_080142B0:: @ 080142B0
-	.incbin "baserom.gba", 0x0142B0, 0x00000D4
+.include "data/scripts/gUnk_080142B0.inc"
 
-gUnk_08014384:: @ 08014384
-	.incbin "baserom.gba", 0x014384, 0x000003C
+.include "data/scripts/gUnk_08014384.inc"
 
-gUnk_080143C0:: @ 080143C0
-	.incbin "baserom.gba", 0x0143C0, 0x0000042
+.include "data/scripts/gUnk_080143C0.inc"
 
-gUnk_08014402:: @ 08014402
-	.incbin "baserom.gba", 0x014402, 0x000004E
+.include "data/scripts/gUnk_08014402.inc"
 
-gUnk_08014450:: @ 08014450
-	.incbin "baserom.gba", 0x014450, 0x00000BC
+.include "data/scripts/gUnk_08014450.inc"
 
-gUnk_0801450C:: @ 0801450C
-	.incbin "baserom.gba", 0x01450C, 0x000003C
+.include "data/scripts/gUnk_0801450C.inc"
 
-gUnk_08014548:: @ 08014548
-	.incbin "baserom.gba", 0x014548, 0x0000058
+.include "data/scripts/gUnk_08014548.inc"
 
-gUnk_080145A0:: @ 080145A0
-	.incbin "baserom.gba", 0x0145A0, 0x0000010
+.include "data/scripts/gUnk_080145A0.inc"
 
-gUnk_080145B0:: @ 080145B0
-	.incbin "baserom.gba", 0x0145B0, 0x0000038
+.include "data/scripts/gUnk_080145B0.inc"
 
-gUnk_080145E8:: @ 080145E8
-	.incbin "baserom.gba", 0x0145E8, 0x0000040
+.include "data/scripts/gUnk_080145E8.inc"
 
-gUnk_08014628:: @ 08014628
-	.incbin "baserom.gba", 0x014628, 0x00001DC
+.include "data/scripts/gUnk_08014628.inc"
 
-gUnk_08014804:: @ 08014804
-	.incbin "baserom.gba", 0x014804, 0x00000EC
+.include "data/scripts/gUnk_08014804.inc"
 
-gUnk_080148F0:: @ 080148F0
-	.incbin "baserom.gba", 0x0148F0, 0x0000068
+.include "data/scripts/gUnk_080148F0.inc"
 
-gUnk_08014958:: @ 08014958
-	.incbin "baserom.gba", 0x014958, 0x000003C
+.include "data/scripts/gUnk_08014958.inc"
 
-gUnk_08014994:: @ 08014994
-	.incbin "baserom.gba", 0x014994, 0x0000038
+.include "data/scripts/gUnk_08014994.inc"
 
-gUnk_080149CC:: @ 080149CC
-	.incbin "baserom.gba", 0x0149CC, 0x000005C
+.include "data/scripts/gUnk_080149CC.inc"
 
-gUnk_08014A28:: @ 08014A28
-	.incbin "baserom.gba", 0x014A28, 0x000002C
+.include "data/scripts/gUnk_08014A28.inc"
 
-gUnk_08014A54:: @ 08014A54
-	.incbin "baserom.gba", 0x014A54, 0x000002C
+.include "data/scripts/gUnk_08014A54.inc"
 
-gUnk_08014A80:: @ 08014A80
-	.incbin "baserom.gba", 0x014A80, 0x0000044
+.include "data/scripts/gUnk_08014A80.inc"
 
-gUnk_08014AC4:: @ 08014AC4
-	.incbin "baserom.gba", 0x014AC4, 0x0000070
+.include "data/scripts/gUnk_08014AC4.inc"
 
-gUnk_08014B34:: @ 08014B34
-	.incbin "baserom.gba", 0x014B34, 0x00000F8
+.include "data/scripts/gUnk_08014B34.inc"
 
-gUnk_08014C2C:: @ 08014C2C
-	.incbin "baserom.gba", 0x014C2C, 0x0000068
+.include "data/scripts/gUnk_08014C2C.inc"
 
-gUnk_08014C94:: @ 08014C94
-	.incbin "baserom.gba", 0x014C94, 0x0000048
+.include "data/scripts/gUnk_08014C94.inc"
 
-gUnk_08014CDC:: @ 08014CDC
-	.incbin "baserom.gba", 0x014CDC, 0x00000F0
+.include "data/scripts/gUnk_08014CDC.inc"
 
-gUnk_08014DCC:: @ 08014DCC
-	.incbin "baserom.gba", 0x014DCC, 0x0000048
+.include "data/scripts/gUnk_08014DCC.inc"
 
-gUnk_08014E14:: @ 08014E14
-	.incbin "baserom.gba", 0x014E14, 0x000003C
+.include "data/scripts/gUnk_08014E14.inc"
 
-gUnk_08014E50:: @ 08014E50
-	.incbin "baserom.gba", 0x014E50, 0x000007C
+.include "data/scripts/gUnk_08014E50.inc"
 
-gUnk_08014ECC:: @ 08014ECC
-	.incbin "baserom.gba", 0x014ECC, 0x000002C
+.include "data/scripts/gUnk_08014ECC.inc"
 
-gUnk_08014EF8:: @ 08014EF8
-	.incbin "baserom.gba", 0x014EF8, 0x0000038
+.include "data/scripts/gUnk_08014EF8.inc"
 
-gUnk_08014F30:: @ 08014F30
-	.incbin "baserom.gba", 0x014F30, 0x000008C
+.include "data/scripts/gUnk_08014F30.inc"
 
-gUnk_08014FBC:: @ 08014FBC
-	.incbin "baserom.gba", 0x014FBC, 0x0000045
+.include "data/scripts/gUnk_08014FBC.inc"
 
-gUnk_08015001:: @ 08015001
-	.incbin "baserom.gba", 0x015001, 0x0000086
+.include "data/scripts/gUnk_08015001.inc"
 
-gUnk_08015087:: @ 08015087
-	.incbin "baserom.gba", 0x015087, 0x0000068
+.include "data/scripts/gUnk_08015087.inc"
 
-gUnk_080150EF:: @ 080150EF
-	.incbin "baserom.gba", 0x0150EF, 0x0000145
+.include "data/scripts/gUnk_080150EF.inc"
 
-gUnk_08015234:: @ 08015234
-	.incbin "baserom.gba", 0x015234, 0x0000080
+.include "data/scripts/gUnk_08015234.inc"
 
-gUnk_080152B4:: @ 080152B4
-	.incbin "baserom.gba", 0x0152B4, 0x00000DC
+.include "data/scripts/gUnk_080152B4.inc"
 
-gUnk_08015390:: @ 08015390
-	.incbin "baserom.gba", 0x015390, 0x000005C
+.include "data/scripts/gUnk_08015390.inc"
 
-gUnk_080153EC:: @ 080153EC
-	.incbin "baserom.gba", 0x0153EC, 0x0000120
+.include "data/scripts/gUnk_080153EC.inc"
 
-gUnk_0801550C:: @ 0801550C
-	.incbin "baserom.gba", 0x01550C, 0x000010C
+.include "data/scripts/gUnk_0801550C.inc"
 
-gUnk_08015618:: @ 08015618
-	.incbin "baserom.gba", 0x015618, 0x000006C
+.include "data/scripts/gUnk_08015618.inc"
 
-gUnk_08015684:: @ 08015684
-	.incbin "baserom.gba", 0x015684, 0x000001C
+.include "data/scripts/gUnk_08015684.inc"
 
-gUnk_080156A0:: @ 080156A0
-	.incbin "baserom.gba", 0x0156A0, 0x00000B4
+.include "data/scripts/gUnk_080156A0.inc"
 
-gUnk_08015754:: @ 08015754
-	.incbin "baserom.gba", 0x015754, 0x0000058
+.include "data/scripts/gUnk_08015754.inc"
 
-gUnk_080157AC:: @ 080157AC
-	.incbin "baserom.gba", 0x0157AC, 0x000014C
+.include "data/scripts/gUnk_080157AC.inc"
 
-gUnk_080158F8:: @ 080158F8
-	.incbin "baserom.gba", 0x0158F8, 0x0000040
+.include "data/scripts/gUnk_080158F8.inc"
 
-gUnk_08015938:: @ 08015938
-	.incbin "baserom.gba", 0x015938, 0x0000020
+.include "data/scripts/gUnk_08015938.inc"
 
-gUnk_08015958:: @ 08015958
-	.incbin "baserom.gba", 0x015958, 0x000016C
+.include "data/scripts/gUnk_08015958.inc"
 
-gUnk_08015AC4:: @ 08015AC4
-	.incbin "baserom.gba", 0x015AC4, 0x0000050
+.include "data/scripts/gUnk_08015AC4.inc"
 
-gUnk_08015B14:: @ 08015B14
-	.incbin "baserom.gba", 0x015B14, 0x0000020
+.include "data/scripts/gUnk_08015B14.inc"
 
-gUnk_08015B34:: @ 08015B34
-	.incbin "baserom.gba", 0x015B34, 0x0000050
+.include "data/scripts/gUnk_08015B34.inc"
 
-gUnk_08015B84:: @ 08015B84
-	.incbin "baserom.gba", 0x015B84, 0x0000024
+.include "data/scripts/gUnk_08015B84.inc"
 
-gUnk_08015BA8:: @ 08015BA8
-	.incbin "baserom.gba", 0x015BA8, 0x0000040
+.include "data/scripts/gUnk_08015BA8.inc"
 
-gUnk_08015BE8:: @ 08015BE8
-	.incbin "baserom.gba", 0x015BE8, 0x00000EC
+.include "data/scripts/gUnk_08015BE8.inc"
 
-gUnk_08015CD4:: @ 08015CD4
-	.incbin "baserom.gba", 0x015CD4, 0x000011C
+.include "data/scripts/gUnk_08015CD4.inc"
 
-gUnk_08015DF0:: @ 08015DF0
-	.incbin "baserom.gba", 0x015DF0, 0x0000068
+.include "data/scripts/gUnk_08015DF0.inc"
 
-gUnk_08015E58:: @ 08015E58
-	.incbin "baserom.gba", 0x015E58, 0x00000B0
+.include "data/scripts/gUnk_08015E58.inc"
 
-gUnk_08015F08:: @ 08015F08
-	.incbin "baserom.gba", 0x015F08, 0x0000034
+.include "data/scripts/gUnk_08015F08.inc"
 
-gUnk_08015F3C:: @ 08015F3C
-	.incbin "baserom.gba", 0x015F3C, 0x0000068
+.include "data/scripts/gUnk_08015F3C.inc"
 
-gUnk_08015FA4:: @ 08015FA4
-	.incbin "baserom.gba", 0x015FA4, 0x000001C
+.include "data/scripts/gUnk_08015FA4.inc"
 
-gUnk_08015FC0:: @ 08015FC0
-	.incbin "baserom.gba", 0x015FC0, 0x0000061
+.include "data/scripts/gUnk_08015FC0.inc"
 
-gUnk_08016021:: @ 08016021
-	.incbin "baserom.gba", 0x016021, 0x000000F
+.include "data/scripts/gUnk_08016021.inc"
 
 .include "data/scripts/npc4e_fusion.inc"
 
-gUnk_0801606C:: @ 0801606C
-	.incbin "baserom.gba", 0x01606C, 0x000003C
+.include "data/scripts/gUnk_0801606C.inc"
 
-gUnk_080160A8:: @ 080160A8
-	.incbin "baserom.gba", 0x0160A8, 0x0000042
+.include "data/scripts/gUnk_080160A8.inc"
 
-gUnk_080160EA:: @ 080160EA
-	.incbin "baserom.gba", 0x0160EA, 0x0000052
+.include "data/scripts/gUnk_080160EA.inc"
 
-gUnk_0801613C:: @ 0801613C
-	.incbin "baserom.gba", 0x01613C, 0x0000054
+.include "data/scripts/gUnk_0801613C.inc"
 
-gUnk_08016190:: @ 08016190
-	.incbin "baserom.gba", 0x016190, 0x0000058
+.include "data/scripts/gUnk_08016190.inc"
 
-gUnk_080161E8:: @ 080161E8
-	.incbin "baserom.gba", 0x0161E8, 0x0000174
+.include "data/scripts/gUnk_080161E8.inc"
 
-gUnk_0801635C:: @ 0801635C
-	.incbin "baserom.gba", 0x01635C, 0x0000021
+.include "data/scripts/gUnk_0801635C.inc"
 
-gUnk_0801637D:: @ 0801637D
-	.incbin "baserom.gba", 0x01637D, 0x0000007
+.include "data/scripts/gUnk_0801637D.inc"
 
-gUnk_08016384:: @ 08016384
-	.incbin "baserom.gba", 0x016384, 0x0000084
+.include "data/scripts/gUnk_08016384.inc"
 
-gUnk_08016408:: @ 08016408
-	.incbin "baserom.gba", 0x016408, 0x00001F0
+.include "data/scripts/gUnk_08016408.inc"
 
-gUnk_080165F8:: @ 080165F8
-	.incbin "baserom.gba", 0x0165F8, 0x0000014
+.include "data/scripts/gUnk_080165F8.inc"
 
-gUnk_0801660C:: @ 0801660C
-	.incbin "baserom.gba", 0x01660C, 0x000001C
+.include "data/scripts/gUnk_0801660C.inc"
 
-gUnk_08016628:: @ 08016628
-	.incbin "baserom.gba", 0x016628, 0x000001C
+.include "data/scripts/gUnk_08016628.inc"
 
-gUnk_08016644:: @ 08016644
-	.incbin "baserom.gba", 0x016644, 0x0000028
+.include "data/scripts/gUnk_08016644.inc"
 
-gUnk_0801666C:: @ 0801666C
-	.incbin "baserom.gba", 0x01666C, 0x000004C
+.include "data/scripts/gUnk_0801666C.inc"
 
-gUnk_080166B8:: @ 080166B8
-	.incbin "baserom.gba", 0x0166B8, 0x0000044
+.include "data/scripts/gUnk_080166B8.inc"
 
-gUnk_080166FC:: @ 080166FC
-	.incbin "baserom.gba", 0x0166FC, 0x000009C
+.include "data/scripts/gUnk_080166FC.inc"
 
-gUnk_08016798:: @ 08016798
-	.incbin "baserom.gba", 0x016798, 0x00000AC
+.include "data/scripts/gUnk_08016798.inc"
 
-gUnk_08016844:: @ 08016844
-	.incbin "baserom.gba", 0x016844, 0x000009C
+.include "data/scripts/gUnk_08016844.inc"
 
-gUnk_080168E0:: @ 080168E0
-	.incbin "baserom.gba", 0x0168E0, 0x0000014
+.include "data/scripts/gUnk_080168E0.inc"
 
-gUnk_080168F4:: @ 080168F4
-	.incbin "baserom.gba", 0x0168F4, 0x0000090
+.include "data/scripts/gUnk_080168F4.inc"
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc
new file mode 100644
index 00000000..d60f2088
--- /dev/null
+++ b/data/scripts/gUnk_08008B5C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08008B5C
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E944 
+_0807E864 
+_0807E930 0x0004
+Call sub_0807F2D4
+Call sub_0806BBB0
+_0807EA94 
+_0807E930 0x0008
+_0807E878 
+Jump 0xffe2
+.short 0x0000
diff --git a/data/scripts/gUnk_08008B90.inc b/data/scripts/gUnk_08008B90.inc
new file mode 100644
index 00000000..6466fc32
--- /dev/null
+++ b/data/scripts/gUnk_08008B90.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08008B90
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+_0807E930 0x0004
+Call sub_0807F2D4
+TextboxNoOverlapFollow 0x4912
+_0807EA94 
+_0807E930 0x0008
+_0807E878 
+.short 0x0803
+.short 0xffe4
diff --git a/data/scripts/gUnk_08008BC0.inc b/data/scripts/gUnk_08008BC0.inc
new file mode 100644
index 00000000..51a2ba13
--- /dev/null
+++ b/data/scripts/gUnk_08008BC0.inc
@@ -0,0 +1,35 @@
+SCRIPT_START gUnk_08008BC0
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+SetGlobalFlag 0x0061
+_0807E930 0x0004
+Call sub_0807F2D4
+_0807EA94 
+Call sub_0806BA34
+JumpIfNot 0x0066
+_0807EA94 
+CallWithArg sub_0806BB1C, 0x00000000
+Call sub_0807F2D4
+CallWithArg sub_0806BB1C, 0x00000001
+Call sub_0806BB7C
+JumpIfNot 0x0048
+TextboxNoOverlap 0x490c
+_0807EA94 
+LoadRoomEntityList 0x080d6784
+WaitForSomething 0x00000001
+WaitForSomething 0x00000004
+Wait 0x000f
+SoundReq 0x0072
+_0807E930 0x0004
+Call sub_0807F2D4
+TextboxNoOverlap 0x4913
+_0807EA94 
+_0807E930 0x0008
+.short 0x0c0b
+.short 0xf2d5
diff --git a/data/scripts/gUnk_08008C4E.inc b/data/scripts/gUnk_08008C4E.inc
new file mode 100644
index 00000000..d3e0563b
--- /dev/null
+++ b/data/scripts/gUnk_08008C4E.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08008C4E
+.short 0x0807
+.short 0x0803
+.short 0x000a
+.short 0x0850
+.short 0x0008
+.short 0x0831
+.short 0x000f
+.short 0x0459
+.short 0x0444
+.short 0x0803
+.short 0xff70
diff --git a/data/scripts/gUnk_08008C64.inc b/data/scripts/gUnk_08008C64.inc
new file mode 100644
index 00000000..fd75474f
--- /dev/null
+++ b/data/scripts/gUnk_08008C64.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08008C64
+StartScript 
+SetEntityPositionRelative 0x00180068
+.byte 0x79
diff --git a/data/scripts/gUnk_08008C6D.inc b/data/scripts/gUnk_08008C6D.inc
new file mode 100644
index 00000000..28bd166a
--- /dev/null
+++ b/data/scripts/gUnk_08008C6D.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08008C6D
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x3
+.byte 0x7b
+.byte 0x8
diff --git a/data/scripts/gUnk_08008C7E.inc b/data/scripts/gUnk_08008C7E.inc
new file mode 100644
index 00000000..022e1d38
--- /dev/null
+++ b/data/scripts/gUnk_08008C7E.inc
@@ -0,0 +1,60 @@
+SCRIPT_START gUnk_08008C7E
+.byte 0x21
+.byte 0x1
+.byte 0x2
+.byte 0x4
+.byte 0x32
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0xd
+.byte 0x49
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x9
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x73
+.byte 0xc
+.byte 0x68
+.byte 0x0
+.byte 0x78
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x9
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x73
+.byte 0xc
+.byte 0x98
diff --git a/data/scripts/gUnk_08008CB9.inc b/data/scripts/gUnk_08008CB9.inc
new file mode 100644
index 00000000..20ff7526
--- /dev/null
+++ b/data/scripts/gUnk_08008CB9.inc
@@ -0,0 +1,152 @@
+SCRIPT_START gUnk_08008CB9
+.byte 0x0
+.byte 0x78
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x7f
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xac
+.byte 0x0
+.byte 0x78
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x7f
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xc0
+.byte 0x0
+.byte 0x78
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x7f
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x9
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x73
+.byte 0xc
+.byte 0x68
+.byte 0x0
+.byte 0x78
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x9
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x73
+.byte 0xc
+.byte 0x68
+.byte 0x0
+.byte 0x18
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0x4d
+.byte 0x6
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0x21
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08008D50.inc b/data/scripts/gUnk_08008D50.inc
new file mode 100644
index 00000000..a26efd03
--- /dev/null
+++ b/data/scripts/gUnk_08008D50.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08008D50
+StartScript 
+SetEntityPositionRelative 0x00680068
+_0807F0B4 0x0004
+CameraTargetEntity 
+StopScript 
+Wait 0x001e
+_0807E5F8 0x00000002
+WaitForSomething 0x00000001
+Wait 0x000f
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Wait 0x001e
+_0807E5F8 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc
new file mode 100644
index 00000000..dc7c641f
--- /dev/null
+++ b/data/scripts/gUnk_08008D8C.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08008D8C
+StartScript 
+Call sub_08061FD8
+Call sub_08061E70
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FD8
+Call sub_08062048
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
diff --git a/data/scripts/gUnk_08008DC0.inc b/data/scripts/gUnk_08008DC0.inc
new file mode 100644
index 00000000..e00bb2ff
--- /dev/null
+++ b/data/scripts/gUnk_08008DC0.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08008DC0
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+Call sub_080643D8
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+CallWithArg sub_0807F3D8, 0x00000000
+.short 0x0803
+.short 0xffd2
diff --git a/data/scripts/gUnk_08008E08.inc b/data/scripts/gUnk_08008E08.inc
new file mode 100644
index 00000000..62659dc7
--- /dev/null
+++ b/data/scripts/gUnk_08008E08.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08008E08
+StartScript 
diff --git a/data/scripts/gUnk_08008E0A.inc b/data/scripts/gUnk_08008E0A.inc
new file mode 100644
index 00000000..7e94dd41
--- /dev/null
+++ b/data/scripts/gUnk_08008E0A.inc
@@ -0,0 +1,51 @@
+SCRIPT_START gUnk_08008E0A
+SetEntityPositionRelative 0x00780088
+StopScript 
+CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807F0B4 0x0001
+CameraTargetEntity 
+WaitForPlayerAction0x17 
+Wait 0x003c
+StartPlayerScript 0x08008f74
+WaitForSomething2 0x00000020
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Wait 0x003c
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Wait 0x000f
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollowPos 0x1053, 0x000e
+_0807EA94 
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807F034 0x0035
+WaitPlayerAction8 
+StartPlayerScript 0x08008fc0
+WaitForSomething2 0x00000020
+_0807E8E4_0 
+_0807E5F8 0x00000080
+.short 0x0c33
diff --git a/data/scripts/gUnk_08008F0C.inc b/data/scripts/gUnk_08008F0C.inc
new file mode 100644
index 00000000..a4861020
--- /dev/null
+++ b/data/scripts/gUnk_08008F0C.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08008F0C
+.short 0x0100
+.short 0x0000
+.short 0x0c28
+.short 0x0010
+.short 0x0000
diff --git a/data/scripts/gUnk_08008F16.inc b/data/scripts/gUnk_08008F16.inc
new file mode 100644
index 00000000..ad605c23
--- /dev/null
+++ b/data/scripts/gUnk_08008F16.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08008F16
+Wait 0x0078
+_0807E5F8 0x00000080
+.short 0x0c33
+.short 0x0100
+.short 0x0000
diff --git a/data/scripts/gUnk_08008F26.inc b/data/scripts/gUnk_08008F26.inc
new file mode 100644
index 00000000..3919213d
--- /dev/null
+++ b/data/scripts/gUnk_08008F26.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_08008F26
+_0807E8E4_1 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807F034 0x0047
+WaitPlayerAction8 
+_0807E914 0x00000003
+Call sub_0807F420
+_0807E8E4_0 
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetGlobalFlag 0x0015
+Call sub_0806DCC0
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x00b8
+.short 0x0090
+.short 0x0861
+.short 0x0006
+.short 0x0879
+.short 0x0000
+.short 0x0c28
diff --git a/data/scripts/gUnk_08008F90.inc b/data/scripts/gUnk_08008F90.inc
new file mode 100644
index 00000000..90b432cd
--- /dev/null
+++ b/data/scripts/gUnk_08008F90.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08008F90
+.short 0x0020
+.short 0x0000
+.short 0x0c33
+.short 0x0040
+.short 0x0000
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x0088
+.short 0x0078
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0831
+.short 0x000f
+.short 0x0c28
+.short 0x0020
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc
new file mode 100644
index 00000000..9f53cce2
--- /dev/null
+++ b/data/scripts/gUnk_08008FC0.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08008FC0
+_0807F078 0x0001, 0x0001
+CallWithArg sub_0807F918, 0x00000001
+.byte 0x7b
diff --git a/data/scripts/gUnk_08008FD1.inc b/data/scripts/gUnk_08008FD1.inc
new file mode 100644
index 00000000..91ec5f96
--- /dev/null
+++ b/data/scripts/gUnk_08008FD1.inc
@@ -0,0 +1,44 @@
+SCRIPT_START gUnk_08008FD1
+.byte 0x8
+.byte 0x9
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0x39
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x5f
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x5
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x5c
+.byte 0xc
+.byte 0x1
+.byte 0x5
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08008FFC.inc b/data/scripts/gUnk_08008FFC.inc
new file mode 100644
index 00000000..975b83e9
--- /dev/null
+++ b/data/scripts/gUnk_08008FFC.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08008FFC
+StartScript 
+_0807EB44 0x0000
+_0807E930 0x0000
+StopScript 
diff --git a/data/scripts/gUnk_08009008.inc b/data/scripts/gUnk_08009008.inc
new file mode 100644
index 00000000..073f0128
--- /dev/null
+++ b/data/scripts/gUnk_08009008.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_08009008
+WaitForSomething 0x00000010
+SoundReq 0x011c
+_0807E930 0x0001
+Wait 0x0010
+SoundReq 0x011c
+.byte 0x61
diff --git a/data/scripts/gUnk_0800901F.inc b/data/scripts/gUnk_0800901F.inc
new file mode 100644
index 00000000..c91d9fc0
--- /dev/null
+++ b/data/scripts/gUnk_0800901F.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800901F
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x2
+.byte 0x70
+.byte 0x8
+.byte 0x20
+.byte 0x1c
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc
new file mode 100644
index 00000000..4ed2438f
--- /dev/null
+++ b/data/scripts/gUnk_0800903C.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800903C
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000004
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+_0807EB44 0x0002
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EB44 0x0004
+_0807E5F8 0x00000008
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+Jump 0x0202
+.short 0x0000
diff --git a/data/scripts/gUnk_08009080.inc b/data/scripts/gUnk_08009080.inc
new file mode 100644
index 00000000..95ca1475
--- /dev/null
+++ b/data/scripts/gUnk_08009080.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_08009080
+StartScript 
+Call sub_0807F348
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+WaitForSomething2 0x00000080
+_0807EB44 0x0004
+_0807ECC4 0x0008
+_0807E930 0x0004
+TextboxNoOverlapFollowPos 0x1050, 0x000e
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0004
+TextboxNoOverlapFollowPos 0x1052, 0x000e
+_0807EA94 
+_0807EF80 0x0000
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
diff --git a/data/scripts/gUnk_080090DB.inc b/data/scripts/gUnk_080090DB.inc
new file mode 100644
index 00000000..c985e235
--- /dev/null
+++ b/data/scripts/gUnk_080090DB.inc
@@ -0,0 +1,190 @@
+SCRIPT_START gUnk_080090DB
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x5
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x54
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x56
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x57
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x58
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x5c
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x3d
+.byte 0x67
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe6
+.byte 0xff
diff --git a/data/scripts/gUnk_08009198.inc b/data/scripts/gUnk_08009198.inc
new file mode 100644
index 00000000..d65a60e8
--- /dev/null
+++ b/data/scripts/gUnk_08009198.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_08009198
+StartScript 
+Call sub_0807F348
+_0807EB44 0x0006
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000001
+_0807EB74 
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos 0x105b, 0x0000
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EF80 0x0005
+Wait 0x003c
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos 0x1051, 0x0000
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+.byte 0x79
diff --git a/data/scripts/gUnk_08009207.inc b/data/scripts/gUnk_08009207.inc
new file mode 100644
index 00000000..bee9bb90
--- /dev/null
+++ b/data/scripts/gUnk_08009207.inc
@@ -0,0 +1,110 @@
+SCRIPT_START gUnk_08009207
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x55
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x98
+.byte 0x0
+.byte 0x78
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x59
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x53
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x42
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08009274.inc b/data/scripts/gUnk_08009274.inc
new file mode 100644
index 00000000..5a45094a
--- /dev/null
+++ b/data/scripts/gUnk_08009274.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08009274
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call sub_080668F0
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08066904
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
diff --git a/data/scripts/gUnk_080092A8.inc b/data/scripts/gUnk_080092A8.inc
new file mode 100644
index 00000000..a0ec8edd
--- /dev/null
+++ b/data/scripts/gUnk_080092A8.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_080092A8
+StartScript 
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x105e
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_080092D4.inc b/data/scripts/gUnk_080092D4.inc
new file mode 100644
index 00000000..d12ec231
--- /dev/null
+++ b/data/scripts/gUnk_080092D4.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_080092D4
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call sub_0806672C
+_0807EF80 0x000a
+StopScript 
+Jump 0xfe90
+.short 0x0000
diff --git a/data/scripts/gUnk_080092F0.inc b/data/scripts/gUnk_080092F0.inc
new file mode 100644
index 00000000..78f1e8c2
--- /dev/null
+++ b/data/scripts/gUnk_080092F0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_080092F0
+StartScript 
+_0807EF80 0x000a
+Call sub_08066E38
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
diff --git a/data/scripts/gUnk_08009308.inc b/data/scripts/gUnk_08009308.inc
new file mode 100644
index 00000000..bd43b0be
--- /dev/null
+++ b/data/scripts/gUnk_08009308.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_08009308
+_0807EB74 
+TextboxNoOverlap 0x1071
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
diff --git a/data/scripts/gUnk_08009318.inc b/data/scripts/gUnk_08009318.inc
new file mode 100644
index 00000000..77ed439b
--- /dev/null
+++ b/data/scripts/gUnk_08009318.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08009318
+StartScript 
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009320.inc b/data/scripts/gUnk_08009320.inc
new file mode 100644
index 00000000..381ac07b
--- /dev/null
+++ b/data/scripts/gUnk_08009320.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08009320
+StartScript 
+Call sub_0806D650
+SetEntityNonPlanarMovement 0x0010
+StopScript 
+_0807EEF4 0xfff8, 0x0000
+_0807EEF4 0x0008, 0x0000
+Jump 0xfff2
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009340.inc b/data/scripts/gUnk_08009340.inc
new file mode 100644
index 00000000..649b253d
--- /dev/null
+++ b/data/scripts/gUnk_08009340.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08009340
+StartScript 
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009348.inc b/data/scripts/gUnk_08009348.inc
new file mode 100644
index 00000000..aab9e58c
--- /dev/null
+++ b/data/scripts/gUnk_08009348.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_08009348
+StartScript 
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+Call sub_0806D638
+_0807F0B4 0x0001
+CameraTargetEntity 
+CheckGlobalFlag 0x0055
+JumpIf 0x002c
+TextboxNoOverlap 0x1d01
+_0807EA94 
+_0807EA94 
+Call sub_0806D640
+_0807F0B4 0x0001
+CameraTargetPlayer 
+Wait 0x002d
+_0807F0B4 0x0004
+_0807E878 
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
diff --git a/data/scripts/gUnk_08009393.inc b/data/scripts/gUnk_08009393.inc
new file mode 100644
index 00000000..9aa38ba6
--- /dev/null
+++ b/data/scripts/gUnk_08009393.inc
@@ -0,0 +1,35 @@
+SCRIPT_START gUnk_08009393
+.short 0x0308
+.short 0xb808
+.short 0xffff
+.short 0x12ff
+.short 0xae08
+.short 0x0400
+.short 0x9e08
+.short 0x0f00
+.short 0x0d08
+.short 0x0400
+.short 0x1408
+.short 0x0f00
+.short 0x0e08
+.short 0x0400
+.short 0x0c08
+.short 0x5b00
+.short 0x0208
+.short 0x591d
+.short 0x0304
+.short 0xbc08
+.short 0x0fff
+.short 0x0e08
+.short 0x0500
+.short 0x1808
+.short 0x0b00
+.short 0x890c
+.short 0x06d7
+.short 0x5b08
+.short 0x0308
+.short 0x591d
+.short 0x0b04
+.short 0x0d0c
+.short 0x06d7
+.short 0x0308
diff --git a/data/scripts/gUnk_080093D7.inc b/data/scripts/gUnk_080093D7.inc
new file mode 100644
index 00000000..af980951
--- /dev/null
+++ b/data/scripts/gUnk_080093D7.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_080093D7
+.short 0x9e08
+.short 0x4eff
+.short 0x050c
+.short 0x001d
+.short 0x1200
+.short 0xad08
+.short 0x0400
+.short 0x0808
+.short 0x4e00
+.short 0x040c
+.short 0x001d
+.short 0x5e00
+.short 0x5904
+.short 0x1c04
+.short 0x0504
+.short 0x8008
+.short 0x31ff
+.short 0x1e08
+.short 0x5b00
+.short 0x0808
+.short 0x591d
+.short 0x0d04
+.short 0x380c
+.short 0x0f9c
diff --git a/data/scripts/gUnk_08009407.inc b/data/scripts/gUnk_08009407.inc
new file mode 100644
index 00000000..4db8cbf7
--- /dev/null
+++ b/data/scripts/gUnk_08009407.inc
@@ -0,0 +1,128 @@
+SCRIPT_START gUnk_08009407
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd1
+.byte 0xd6
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0xb4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd
+.byte 0xd7
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0xae
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0xad
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd5
+.byte 0xd5
+.byte 0x6
+.byte 0x8
+.byte 0x64
+.byte 0x4
+.byte 0x5b
+.byte 0x8
+.byte 0x9
+.byte 0x1d
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x3a
+.byte 0xff
+.byte 0xb
+.byte 0xc
+.byte 0x1
+.byte 0xd6
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x8
+.byte 0xc
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0xa
+.byte 0x1d
+.byte 0x59
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x26
+.byte 0xff
+.byte 0x5b
+.byte 0x8
+.byte 0xb
+.byte 0x1d
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x4d
+.byte 0xd7
+.byte 0x6
+.byte 0x8
+.byte 0x8a
+.byte 0xc
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x8a
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xd
+.byte 0xc
+.byte 0x58
+.byte 0x9c
+.byte 0xf
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd
+.byte 0xd7
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x2c
+.byte 0x8
+.byte 0xae
+.byte 0x0
diff --git a/data/scripts/gUnk_08009486.inc b/data/scripts/gUnk_08009486.inc
new file mode 100644
index 00000000..4904ed77
--- /dev/null
+++ b/data/scripts/gUnk_08009486.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08009486
+Call sub_0806D620
+Wait 0x003c
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlap 0x1d0c
+_0807EA94 
+Wait 0x000a
+Jump 0xfed6
+.short 0x0000
diff --git a/data/scripts/gUnk_080094A4.inc b/data/scripts/gUnk_080094A4.inc
new file mode 100644
index 00000000..db7ed246
--- /dev/null
+++ b/data/scripts/gUnk_080094A4.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_080094A4
+StartScript 
+Call sub_0806D7C4
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+Wait 0x003c
+SetEntity0x20 0x00018000
+_0807EE30 
+JumpIfNot 0xfffc
+Wait 0x003c
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080094CC.inc b/data/scripts/gUnk_080094CC.inc
new file mode 100644
index 00000000..d276472a
--- /dev/null
+++ b/data/scripts/gUnk_080094CC.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_080094CC
+StartScript 
+Call sub_0806D804
+.byte 0x67
+.byte 0x8
+.byte 0x80
diff --git a/data/scripts/gUnk_080094D7.inc b/data/scripts/gUnk_080094D7.inc
new file mode 100644
index 00000000..f5d95cdd
--- /dev/null
+++ b/data/scripts/gUnk_080094D7.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_080094D7
+.byte 0x1
+.byte 0x2
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x68
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x1
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0xd8
+.byte 0x6
+.byte 0x8
+.byte 0x75
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_080094FC.inc b/data/scripts/gUnk_080094FC.inc
new file mode 100644
index 00000000..4f661dba
--- /dev/null
+++ b/data/scripts/gUnk_080094FC.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_080094FC
+StartScript 
+.byte 0xb
+.byte 0xc
+.byte 0x1
+.byte 0x71
+.byte 0x6
diff --git a/data/scripts/gUnk_08009503.inc b/data/scripts/gUnk_08009503.inc
new file mode 100644
index 00000000..d3b5e361
--- /dev/null
+++ b/data/scripts/gUnk_08009503.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08009503
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
diff --git a/data/scripts/gUnk_08009508.inc b/data/scripts/gUnk_08009508.inc
new file mode 100644
index 00000000..307a6777
--- /dev/null
+++ b/data/scripts/gUnk_08009508.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08009508
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EF80 0x0001
+_0807EB74 
+Call sub_080670B4
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
diff --git a/data/scripts/gUnk_08009538.inc b/data/scripts/gUnk_08009538.inc
new file mode 100644
index 00000000..7472c60a
--- /dev/null
+++ b/data/scripts/gUnk_08009538.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08009538
+StartScript 
+Call sub_08067100
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EF80 0x0001
+_0807EB74 
+Call sub_080670E4
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
diff --git a/data/scripts/gUnk_08009574.inc b/data/scripts/gUnk_08009574.inc
new file mode 100644
index 00000000..3b89e47a
--- /dev/null
+++ b/data/scripts/gUnk_08009574.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_08009574
+StartScript 
+Call sub_08067314
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E914 0x00000000
+Call sub_080672B0
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807E914 0x00000004
+Call sub_080672B0
+Call sub_080672C8
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EB44 0x0004
+_0807E914 0x00000000
+Call sub_080672B0
+Jump 0xffca
+.short 0x0000
diff --git a/data/scripts/gUnk_080095CC.inc b/data/scripts/gUnk_080095CC.inc
new file mode 100644
index 00000000..2e964cf0
--- /dev/null
+++ b/data/scripts/gUnk_080095CC.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_080095CC
+StartScript 
+Call sub_0806BE3C
+_0807EF80 0x000a
+_0807EF80 0x0007
+StopScript 
+Call sub_0806BF44
+JumpIf 0x000c
+_0807EF80 0x000b
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0418
+.short 0x0805
+.short 0xffe8
+.short 0x0443
+.short 0x0463
+.short 0x0879
+.short 0x0001
+.short 0x0c0b
+.short 0xbe85
+.short 0x0806
+.short 0x0459
+.short 0x0805
+.short 0x0018
+.short 0x087b
+.short 0x0109
+.short 0x0886
+.short 0x003c
+.short 0x085a
+.short 0x053c
+.short 0x0434
+.short 0x0459
+.short 0x0c85
+.short 0x003c
+.short 0x0001
+.short 0x0444
+.short 0x0879
+.short 0x0000
+.short 0x0803
+.short 0xffb4
diff --git a/data/scripts/gUnk_0800962C.inc b/data/scripts/gUnk_0800962C.inc
new file mode 100644
index 00000000..2c2ef3fd
--- /dev/null
+++ b/data/scripts/gUnk_0800962C.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_0800962C
+StartScript 
+_0807EF80 0x000b
+_0807EF80 0x0008
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x0020
+JumpIfNot 0xfff6
+StopScript 
+Call sub_0806BF44
+JumpIf 0xfff8
+StopScript 
+Call sub_0806BE3C
+_0807EF80 0x000a
+_0807EF80 0x0007
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0001
+Call sub_0806BEC8
+_0807EA94 
+JumpIfNot 0x0016
+SoundReq 0x0111
+SoundReq 0x0072
+_0807F078 0x003c, 0x0002
+Call sub_0806BEFC
+_0807E878 
+_0807EF80 0x0000
+.short 0x0803
+.short 0xffca
diff --git a/data/scripts/gUnk_08009698.inc b/data/scripts/gUnk_08009698.inc
new file mode 100644
index 00000000..8af24e88
--- /dev/null
+++ b/data/scripts/gUnk_08009698.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_08009698
+StartScript 
+_0807EF80 0x0007
+Jump 0x005c
+CheckGlobalFlag 0x0020
+JumpIf 0x0054
+StopScript 
+CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x08009704
+WaitForSomething2 0x00000001
+SoundReq 0x0111
+_0807EF80 0x0008
+LoadRoomEntityList 0x080d9048
+Wait 0x000f
+SoundReq 0x0111
+_0807EF80 0x0007
+CheckGlobalFlag 0x0020
+JumpIfNot 0xfffa
+Call sub_0807DF50
+_0807E878 
+Call sub_0808692C
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009704.inc b/data/scripts/gUnk_08009704.inc
new file mode 100644
index 00000000..6e733e50
--- /dev/null
+++ b/data/scripts/gUnk_08009704.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08009704
+.short 0x0867
diff --git a/data/scripts/gUnk_08009706.inc b/data/scripts/gUnk_08009706.inc
new file mode 100644
index 00000000..4978f927
--- /dev/null
+++ b/data/scripts/gUnk_08009706.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_08009706
+.short 0x0080
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x01a0
+.short 0x01b0
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0831
+.short 0x000a
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0879
+.short 0x000d
+.short 0x0867
+.short 0x0100
+.short 0x0870
+.short 0x0010
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08009740.inc b/data/scripts/gUnk_08009740.inc
new file mode 100644
index 00000000..71021433
--- /dev/null
+++ b/data/scripts/gUnk_08009740.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08009740
+StartScript 
+Call sub_08065D00
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807EF80 0x0007
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+Call sub_08065F64
+_0807EA94 
+_0807E878 
+Jump 0xffe6
+.short 0x0000
diff --git a/data/scripts/gUnk_08009778.inc b/data/scripts/gUnk_08009778.inc
new file mode 100644
index 00000000..ab8d80c6
--- /dev/null
+++ b/data/scripts/gUnk_08009778.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08009778
+_0807E864 
+Call sub_0807F9A4
+.short 0x0c0b
+.short 0xdf29
+.short 0x0807
diff --git a/data/scripts/gUnk_08009786.inc b/data/scripts/gUnk_08009786.inc
new file mode 100644
index 00000000..86ce5f88
--- /dev/null
+++ b/data/scripts/gUnk_08009786.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08009786
+SoundReq 0x01f3
+Call sub_0807F40C
+_0807E8E4_1 
+Wait 0x000a
+_0807E8E4_3 
+Wait 0x0032
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_080097A1.inc b/data/scripts/gUnk_080097A1.inc
new file mode 100644
index 00000000..541696f5
--- /dev/null
+++ b/data/scripts/gUnk_080097A1.inc
@@ -0,0 +1,80 @@
+SCRIPT_START gUnk_080097A1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x47
+.byte 0xc
+.byte 0x7c
+.byte 0x98
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x85
+.byte 0xc
+.byte 0x3c
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x2d
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x4c
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x5f
+.byte 0x8
+.byte 0x9
+.byte 0x28
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_080097F0.inc b/data/scripts/gUnk_080097F0.inc
new file mode 100644
index 00000000..a6bab11d
--- /dev/null
+++ b/data/scripts/gUnk_080097F0.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_080097F0
+StartScript 
+_0807E930 0x0003
+_0807EF80 0x0007
+SetEntityNonPlanarMovement 0x0300
+Call sub_0807F348
+StopScript 
+WaitForSomething2 0x00000002
+SoundReq 0x0123
+Call sub_0807F1A0
+StopScript 
+StartScript 
+_0807EE30 
+JumpIfNot 0xfff8
+StopScript 
+_0807E5F8 0x00000004
+Call sub_0807FBD4
+SoundReq 0x01f3
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009838.inc b/data/scripts/gUnk_08009838.inc
new file mode 100644
index 00000000..8bb51dfe
--- /dev/null
+++ b/data/scripts/gUnk_08009838.inc
@@ -0,0 +1,61 @@
+SCRIPT_START gUnk_08009838
+StartScript 
+_0807E930 0x0003
+_0807EF80 0x0007
+SetEntityNonPlanarMovement 0x0300
+Call sub_0807F348
+StopScript 
+WaitForSomething2 0x00000008
+Call sub_0809E0A0
+Call sub_0809E0D4
+SoundReq 0x01f3
+Call sub_0807FBD4
+SoundReq 0x01f3
+_0807E5F8 0x00000010
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x087b
+.short 0x007a
+.short 0x0861
+.short 0x0004
+.short 0x087b
+.short 0x0086
+.short 0x0c0b
+.short 0xf36d
+.short 0x0807
+.short 0x0867
+.short 0x0400
+.short 0x0871
+.short 0x0004
+.short 0x0c0b
+.short 0xf1e9
+.short 0x0807
+.short 0x0831
+.short 0x001e
+.short 0x0c28
+.short 0x0040
+.short 0x0000
+.short 0x0c33
+.short 0x0020
+.short 0x0000
+.short 0x087b
+.short 0x007c
+.short 0x0861
+.short 0x0004
+.short 0x0c0b
+.short 0xf211
+.short 0x0807
+.short 0x0c78
+.short 0x0200
+.short 0x0020
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0040
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_080098D4.inc b/data/scripts/gUnk_080098D4.inc
new file mode 100644
index 00000000..ef2ea423
--- /dev/null
+++ b/data/scripts/gUnk_080098D4.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_080098D4
+StartScript 
+StopScript 
+CheckGlobalFlag 0x0020
+JumpIfNot 0xfffa
+CheckInventory1 0x003c
+JumpIfNot 0xfffa
+CheckLocalFlag 0x005d
+JumpIf 0x0022
+SetLocalFlag 0x005d
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807EB28 0x280a
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009918.inc b/data/scripts/gUnk_08009918.inc
new file mode 100644
index 00000000..9c759fe3
--- /dev/null
+++ b/data/scripts/gUnk_08009918.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08009918
+StartScript 
+Call sub_0807DF28
+_0807E864 
+_0807E5F8 0x00000000
+StopScript 
+WaitFor_2 
+Wait 0x0078
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000001
+.short 0x082d
+.short 0x001c
diff --git a/data/scripts/gUnk_08009940.inc b/data/scripts/gUnk_08009940.inc
new file mode 100644
index 00000000..b94a43d3
--- /dev/null
+++ b/data/scripts/gUnk_08009940.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08009940
+Call sub_0807DF50
+_0807E878 
+Call sub_0807921C
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009950.inc b/data/scripts/gUnk_08009950.inc
new file mode 100644
index 00000000..c4f64c1e
--- /dev/null
+++ b/data/scripts/gUnk_08009950.inc
@@ -0,0 +1,37 @@
+SCRIPT_START gUnk_08009950
+StartScript 
+Call sub_0807F348
+SetEntityNonPlanarMovement 0x0040
+_0807EB44 0x0004
+_0807E930 0x000c
+_0807E908 0x0003
+StopScript 
+Wait 0x001e
+CameraTargetEntity 
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+WaitForSomething2 0x00000008
+_0807EF80 0x0004
+Wait 0x001e
+_0807E930 0x000b
+Wait 0x001e
+TextboxNoOverlapFollow 0x1002
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E908 0x0001
+_0807EB44 0x0004
+_0807EDD4 0x00b8, 0x005c
+_0807EB44 0x0006
+_0807EF80 0x0001
+TextboxNoOverlapFollow 0x1004
+_0807EA94 
+_0807EF80 0x0000
+Wait 0x001e
+_0807E778 0x0002
+DoFade5 
+WaitFor_2 
+Call sub_08053634
+SCRIPT_END
diff --git a/data/scripts/gUnk_080099DC.inc b/data/scripts/gUnk_080099DC.inc
new file mode 100644
index 00000000..f2aa379b
--- /dev/null
+++ b/data/scripts/gUnk_080099DC.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_080099DC
+StartScript 
+Call sub_0807F348
+SetEntityNonPlanarMovement 0x00c0
+_0807EB44 0x0002
+_0807EF80 0x0008
+StopScript 
+WaitForSomething2 0x00000004
+_0807EF80 0x0007
+_0807EDD4 0x0068, 0x0060
+.short 0x0831
diff --git a/data/scripts/gUnk_08009A04.inc b/data/scripts/gUnk_08009A04.inc
new file mode 100644
index 00000000..017cff95
--- /dev/null
+++ b/data/scripts/gUnk_08009A04.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08009A04
+.byte 0xf
+.byte 0x0
+.byte 0x5a
diff --git a/data/scripts/gUnk_08009A07.inc b/data/scripts/gUnk_08009A07.inc
new file mode 100644
index 00000000..0ea8dd36
--- /dev/null
+++ b/data/scripts/gUnk_08009A07.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_08009A07
+.byte 0x8
+.byte 0x1
+.byte 0x10
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x3
+.byte 0x10
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
diff --git a/data/scripts/gUnk_08009A2C.inc b/data/scripts/gUnk_08009A2C.inc
new file mode 100644
index 00000000..361b494b
--- /dev/null
+++ b/data/scripts/gUnk_08009A2C.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08009A2C
+.short 0x0008
+.short 0x0000
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08009A34.inc b/data/scripts/gUnk_08009A34.inc
new file mode 100644
index 00000000..cddc151e
--- /dev/null
+++ b/data/scripts/gUnk_08009A34.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08009A34
+Wait 0x003c
+Call sub_08066258
+Wait 0x001e
+Call sub_08066258
+Wait 0x005a
+.short 0x0803
+.short 0xffea
diff --git a/data/scripts/gUnk_08009A50.inc b/data/scripts/gUnk_08009A50.inc
new file mode 100644
index 00000000..c41d6a9d
--- /dev/null
+++ b/data/scripts/gUnk_08009A50.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08009A50
+SetEntityPositionRelative 0x01780240
+CameraTargetEntity 
+SetEntityNonPlanarMovement 0x0080
+Wait 0x0078
+SoundReq2 0x0036
+_0807E778 0x0002
+DoFade4 
+WaitFor_2 
+Wait 0x0078
+_0807E5F8 0x00000004
+.byte 0xb
diff --git a/data/scripts/gUnk_08009A77.inc b/data/scripts/gUnk_08009A77.inc
new file mode 100644
index 00000000..edb32b26
--- /dev/null
+++ b/data/scripts/gUnk_08009A77.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08009A77
+.short 0x490c
+.short 0x0536
+.short 0x7308
+.short 0x400c
+.short 0x2802
diff --git a/data/scripts/gUnk_08009A81.inc b/data/scripts/gUnk_08009A81.inc
new file mode 100644
index 00000000..eef0be65
--- /dev/null
+++ b/data/scripts/gUnk_08009A81.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08009A81
+.byte 0x2
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_08009A84.inc b/data/scripts/gUnk_08009A84.inc
new file mode 100644
index 00000000..cd06d4ab
--- /dev/null
+++ b/data/scripts/gUnk_08009A84.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_08009A84
+StartScript 
+SetEntityPositionRelative 0x011001e8
+SetEntityNonPlanarMovement 0x00c0
+_0807EF80 0x0008
+StopScript 
+WaitForSomething2 0x00000004
+_0807EF80 0x0007
+_0807EDD4 0x01e8, 0x0200
+_0807EDD4 0x01f8, 0x0218
+_0807EDD4 0x0220, 0x0228
+_0807EDD4 0x0240, 0x0228
+CameraTargetEntity 
+.byte 0x73
diff --git a/data/scripts/gUnk_08009ABB.inc b/data/scripts/gUnk_08009ABB.inc
new file mode 100644
index 00000000..413a352b
--- /dev/null
+++ b/data/scripts/gUnk_08009ABB.inc
@@ -0,0 +1,62 @@
+SCRIPT_START gUnk_08009ABB
+.byte 0xc
+.byte 0x90
+.byte 0x2
+.byte 0x28
+.byte 0x2
+.byte 0x73
+.byte 0xc
+.byte 0x90
+.byte 0x2
+.byte 0xf8
+.byte 0x1
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x90
+.byte 0x2
+.byte 0xc8
+.byte 0x1
+.byte 0x67
+.byte 0x8
+.byte 0xc0
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x90
+.byte 0x2
+.byte 0x98
+.byte 0x1
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x90
+.byte 0x2
+.byte 0x90
+.byte 0x1
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x90
+.byte 0x2
+.byte 0x88
+.byte 0x1
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08009AF8.inc b/data/scripts/gUnk_08009AF8.inc
new file mode 100644
index 00000000..ebcae1d4
--- /dev/null
+++ b/data/scripts/gUnk_08009AF8.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08009AF8
+StartScript 
+StopScript 
+WaitForSomething2 0x00000010
+SoundReq 0x00f0
+_0807EF80 0x0008
+Wait 0x001e
+SoundReq 0x00f1
+_0807EF80 0x0007
+Wait 0x005a
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+Call sub_0805367C
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009B30.inc b/data/scripts/gUnk_08009B30.inc
new file mode 100644
index 00000000..a4964eca
--- /dev/null
+++ b/data/scripts/gUnk_08009B30.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08009B30
+StartScript 
+Call sub_0807DF28
+_0807E864 
+SetLocalFlag 0x0046
+StopScript 
+WaitFor_2 
+Wait 0x001e
+TextboxNoOverlapFollow 0x1005
+_0807EA94 
+Wait 0x003c
+Call sub_0807529C
+Wait 0x003c
+_0807EF80 0x0014
+Wait 0x001e
+.byte 0xb
diff --git a/data/scripts/gUnk_08009B63.inc b/data/scripts/gUnk_08009B63.inc
new file mode 100644
index 00000000..75b26ee3
--- /dev/null
+++ b/data/scripts/gUnk_08009B63.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_08009B63
+.byte 0xc
+.byte 0x51
+.byte 0x32
+.byte 0x5
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xd1
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc
new file mode 100644
index 00000000..5248ef2a
--- /dev/null
+++ b/data/scripts/gUnk_08009B78.inc
@@ -0,0 +1,61 @@
+SCRIPT_START gUnk_08009B78
+StartScript 
+_0807EB44 0x0006
+SetEntityNonPlanarMovement 0x0080
+_0807E9D4 
+Call sub_0807F348
+StopScript 
+CheckGlobalFlag 0x0013
+JumpIf 0x00ba
+_0807E888 
+Wait 0x000a
+_0807E864 
+StartPlayerScript 0x08009cfc
+Call sub_0807DF28
+WaitForSomething2 0x00000008
+_0807EDD4 0x0080, 0x005c
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x000f
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos 0x1009, 0x0000
+_0807E8E4_1 
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807EB8C 
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos 0x100b, 0x0000
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000008
+_0807EDD4 0x007c, 0x005c
+Wait 0x000f
+_0807EF80 0x000d
+_0807EDD4 0x0084, 0x005c
+_0807EB44 0x0006
+_0807EF80 0x000c
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000008
+Call sub_08053250
+_0807F034 0x0034
+WaitPlayerAction8 
+_0807E8E4_1 
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos 0x100c, 0x0000
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x100e
+_0807E878 
+Jump 0xffee
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc
new file mode 100644
index 00000000..3b9ae6ae
--- /dev/null
+++ b/data/scripts/gUnk_08009C68.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08009C68
+StartScript 
+_0807EB44 0x0002
+SetEntityNonPlanarMovement 0x0100
+Call sub_0807F348
+StopScript 
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08009C7F.inc b/data/scripts/gUnk_08009C7F.inc
new file mode 100644
index 00000000..714700f4
--- /dev/null
+++ b/data/scripts/gUnk_08009C7F.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_08009C7F
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x5c
+.byte 0xc
diff --git a/data/scripts/gUnk_08009C9E.inc b/data/scripts/gUnk_08009C9E.inc
new file mode 100644
index 00000000..39d4756f
--- /dev/null
+++ b/data/scripts/gUnk_08009C9E.inc
@@ -0,0 +1,50 @@
+SCRIPT_START gUnk_08009C9E
+.short 0x100a
+.short 0x0000
+.short 0x0459
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0008
+.short 0x0000
+.short 0x0c33
+.short 0x0004
+.short 0x0000
+.short 0x0464
+.short 0x0879
+.short 0x0001
+.short 0x0464
+.short 0x0861
+.short 0x0002
+.short 0x0c5c
+.short 0x100d
+.short 0x0000
+.short 0x0459
+.short 0x0879
+.short 0x0000
+.short 0x0c73
+.short 0x0028
+.short 0x0060
+.short 0x0c73
+.short 0x0000
+.short 0x0060
+.short 0x0c0b
+.short 0x36a9
+.short 0x0805
+.short 0x0831
+.short 0x001e
+.short 0x0401
+.short 0x082d
+.short 0x0013
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0c0b
+.short 0x91d1
+.short 0x0807
+.short 0x0444
+.short 0x0402
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x044a
diff --git a/data/scripts/gUnk_08009D00.inc b/data/scripts/gUnk_08009D00.inc
new file mode 100644
index 00000000..67476331
--- /dev/null
+++ b/data/scripts/gUnk_08009D00.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08009D00
+SetEntityNonPlanarMovement 0x00c0
+StopScript 
+_0807E5F8 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807EDD4 0x0040, 0x0060
+_0807EDD4 0x0060, 0x0068
+_0807E5F8 0x00000004
+_0807EF80 0x0000
+_0807E8E4_0 
+Wait 0x000f
+SoundReq 0x0094
+_0807EF80 0x0000
+Wait 0x001e
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000002
+_0807EDD4 0x0070, 0x005c
+_0807E8E4_1 
+_0807EF80 0x0000
+Wait 0x000f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000008
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009D6C.inc b/data/scripts/gUnk_08009D6C.inc
new file mode 100644
index 00000000..2fc4629a
--- /dev/null
+++ b/data/scripts/gUnk_08009D6C.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08009D6C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0006
+.byte 0x2
diff --git a/data/scripts/gUnk_08009D77.inc b/data/scripts/gUnk_08009D77.inc
new file mode 100644
index 00000000..2102b98e
--- /dev/null
+++ b/data/scripts/gUnk_08009D77.inc
@@ -0,0 +1,58 @@
+SCRIPT_START gUnk_08009D77
+.byte 0x4
+.byte 0x73
+.byte 0xc
+.byte 0x78
+.byte 0x0
+.byte 0x60
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x78
+.byte 0x0
+.byte 0x7c
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x8d
+.byte 0x36
+.byte 0x5
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x78
+.byte 0x0
+.byte 0x98
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x38
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x3d
+.byte 0x4
+.byte 0x37
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x35
+.byte 0x36
+.byte 0x5
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_08009DB0.inc b/data/scripts/gUnk_08009DB0.inc
new file mode 100644
index 00000000..4789a493
--- /dev/null
+++ b/data/scripts/gUnk_08009DB0.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08009DB0
+StartScript 
+Call sub_0807F348
+Call sub_08066288
+Call sub_08066274
+_0807EF80 0x000a
+_0807E930 0x000c
+_0807E908 0x0003
+StopScript 
+_0807E944 
+_0807E908 0x0002
+Call sub_0806622C
+_0807EA94 
+_0807E908 0x0003
+_0807E930 0x000c
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_08009DEC.inc b/data/scripts/gUnk_08009DEC.inc
new file mode 100644
index 00000000..c453741e
--- /dev/null
+++ b/data/scripts/gUnk_08009DEC.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_08009DEC
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Wait 0x0008
+_0807EB28 0x3207
+_0807E3E8 
+JumpIfNot 0x003e
+Call sub_0807DF28
+_0807E778 0x0002
+DoFade5 
+WaitFor_2 
+Call sub_0804E864
+Wait 0x001e
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+.short 0x085f
diff --git a/data/scripts/gUnk_08009E38.inc b/data/scripts/gUnk_08009E38.inc
new file mode 100644
index 00000000..df8b734b
--- /dev/null
+++ b/data/scripts/gUnk_08009E38.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08009E38
+.short 0x3209
+.short 0x0831
+.short 0x000f
+.short 0x0459
+.short 0x0444
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0444
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08009E58.inc b/data/scripts/gUnk_08009E58.inc
new file mode 100644
index 00000000..4b923498
--- /dev/null
+++ b/data/scripts/gUnk_08009E58.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08009E58
+StartScript 
+Call sub_0807DF28
+StopScript 
+WaitForSomething2 0x00000002
+_0807E778 0x0002
+DoFade4 
+WaitFor_2 
+_0807EF80 0x0014
+Wait 0x001e
+_0807E5F8 0x00000001
+SCRIPT_END
+.short 0x0401
+.short 0x0402
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08009E88.inc b/data/scripts/gUnk_08009E88.inc
new file mode 100644
index 00000000..82fc63fc
--- /dev/null
+++ b/data/scripts/gUnk_08009E88.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08009E88
+StartScript 
+Call sub_0807DF28
+_0807E864 
+SetLocalFlag 0x009f
+StopScript 
+Wait 0x003c
+.short 0x0838
diff --git a/data/scripts/gUnk_08009E9E.inc b/data/scripts/gUnk_08009E9E.inc
new file mode 100644
index 00000000..310e58fc
--- /dev/null
+++ b/data/scripts/gUnk_08009E9E.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08009E9E
+.byte 0x4
+.byte 0x0
+.byte 0x3c
+.byte 0x4
+.byte 0x37
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0xf0
+.byte 0x7
diff --git a/data/scripts/gUnk_08009EA9.inc b/data/scripts/gUnk_08009EA9.inc
new file mode 100644
index 00000000..e1883ab6
--- /dev/null
+++ b/data/scripts/gUnk_08009EA9.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08009EA9
+.short 0x0508
+.short 0xf808
+.short 0x79ff
+.short 0x1408
+.short 0x3100
+.short 0x0a08
+.short 0x0b00
diff --git a/data/scripts/gUnk_08009EB7.inc b/data/scripts/gUnk_08009EB7.inc
new file mode 100644
index 00000000..80b0a609
--- /dev/null
+++ b/data/scripts/gUnk_08009EB7.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_08009EB7
+.byte 0xc
+.byte 0x51
+.byte 0x32
+.byte 0x5
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xd1
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_08009ECC.inc b/data/scripts/gUnk_08009ECC.inc
new file mode 100644
index 00000000..171776d1
--- /dev/null
+++ b/data/scripts/gUnk_08009ECC.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08009ECC
+StartScript 
+_0807E914 0x00000002
+_0807EF80 0x0001
+StopScript 
+WaitForSomething2 0x00000004
+StartScript 
+_0807E914 0x00000003
+_0807EF80 0x0001
+StopScript 
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009EF0.inc b/data/scripts/gUnk_08009EF0.inc
new file mode 100644
index 00000000..9468e41d
--- /dev/null
+++ b/data/scripts/gUnk_08009EF0.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08009EF0
+StartScript 
+_0807E914 0x00000000
+_0807EF80 0x0001
+StopScript 
+WaitForSomething2 0x00000004
+StartScript 
+.byte 0x4e
diff --git a/data/scripts/gUnk_08009F07.inc b/data/scripts/gUnk_08009F07.inc
new file mode 100644
index 00000000..d1f94779
--- /dev/null
+++ b/data/scripts/gUnk_08009F07.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_08009F07
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc
new file mode 100644
index 00000000..a456299d
--- /dev/null
+++ b/data/scripts/gUnk_08009F14.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08009F14
+StartScript 
+_0807EB44 0x0004
+Call sub_08060090
+_0807EF80 0x000a
+CheckKinstoneFused 0x001c
+JumpIf 0x00a8
+CheckInventory1 0x0007
+JumpIf 0x0052
+StopScript 
+StopScript 
+.byte 0x1
diff --git a/data/scripts/gUnk_08009F39.inc b/data/scripts/gUnk_08009F39.inc
new file mode 100644
index 00000000..843abe36
--- /dev/null
+++ b/data/scripts/gUnk_08009F39.inc
@@ -0,0 +1,58 @@
+SCRIPT_START gUnk_08009F39
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0x1
+.byte 0x6
+.byte 0x8
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xf2
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0xb
+.byte 0x0
+.byte 0x47
+.byte 0xc
+.byte 0x88
+.byte 0xa0
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x4d
+.byte 0x1
+.byte 0x6
+.byte 0x8
+.byte 0x5c
+.byte 0xc
+.byte 0x1
+.byte 0x1f
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
diff --git a/data/scripts/gUnk_08009F72.inc b/data/scripts/gUnk_08009F72.inc
new file mode 100644
index 00000000..4691447a
--- /dev/null
+++ b/data/scripts/gUnk_08009F72.inc
@@ -0,0 +1,74 @@
+SCRIPT_START gUnk_08009F72
+_0807F034 0x0065
+WaitPlayerAction8 
+_0807EF80 0x000a
+Call sub_0807DF50
+_0807E878 
+StopScript 
+StopScript 
+StartScript 
+Call sub_08060158
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+Call sub_080602BC
+_0807EA94 
+CallWithArg sub_0807F970, 0x00001f03
+JumpIf 0x0008
+_0807E878 
+Jump 0xffd2
+Wait 0x0008
+SoundReq 0x0103
+CallWithArg sub_0806030C, 0x00000063
+Wait 0x0008
+_0807E878 
+Jump 0xffb6
+StopScript 
+CheckLocalFlag 0x00b0
+JumpIf 0x004a
+StopScript 
+StartScript 
+Call sub_08060158
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+TextboxNoOverlap 0x1f0e
+_0807EA94 
+_0807E3E8 
+JumpIf 0x0008
+_0807E878 
+Jump 0xffdc
+Wait 0x0008
+_0807F034 0x0008
+Call sub_08060318
+WaitPlayerAction8 
+Wait 0x0008
+_0807EB8C 
+TextboxNoOverlapFollow 0x1f13
+_0807EA94 
+SetLocalFlag 0x00b0
+_0807E878 
+StopScript 
+StartScript 
+Call sub_08060158
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+CheckInventory1 0x0008
+JumpIf 0x0014
+TextboxNoOverlap 0x1f14
+_0807EA94 
+_0807E3E8 
+JumpIf 0xffb8
+_0807E878 
+Jump 0xffd4
+TextboxNoOverlap 0x1f11
+_0807EA94 
+_0807E3E8 
+JumpIf 0x0008
+_0807E878 
+.short 0x0803
+.short 0xffc2
diff --git a/data/scripts/gUnk_0800A064.inc b/data/scripts/gUnk_0800A064.inc
new file mode 100644
index 00000000..cf52c09e
--- /dev/null
+++ b/data/scripts/gUnk_0800A064.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800A064
+Wait 0x0008
+_0807F034 0x0007
+Call sub_08060318
+WaitPlayerAction8 
+Wait 0x0008
+_0807EB8C 
+TextboxNoOverlapFollow 0x1f10
+_0807EA94 
+.byte 0x44
diff --git a/data/scripts/gUnk_0800A081.inc b/data/scripts/gUnk_0800A081.inc
new file mode 100644
index 00000000..118f427a
--- /dev/null
+++ b/data/scripts/gUnk_0800A081.inc
@@ -0,0 +1,52 @@
+SCRIPT_START gUnk_0800A081
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xa0
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x2
+.byte 0x4
+.byte 0x70
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x78
+.byte 0x0
+.byte 0x60
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800A0B4.inc b/data/scripts/gUnk_0800A0B4.inc
new file mode 100644
index 00000000..92f45a45
--- /dev/null
+++ b/data/scripts/gUnk_0800A0B4.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800A0B4
+StartScript 
+SetEntityNonPlanarMovement 0x0140
+_0807E864 
+Call sub_0807DF28
+StopScript 
+Wait 0x0078
+SoundReq2 0x0018
+Call sub_080A0464
+_0807EE30 
+JumpIfNot 0xfffc
+_0807E8E4_0 
+Wait 0x0008
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+Wait 0x003c
+SetEntityNonPlanarMovement 0x0080
+_0807EC64 0x0030
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc
new file mode 100644
index 00000000..7eb0530e
--- /dev/null
+++ b/data/scripts/gUnk_0800A0FC.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800A0FC
+StopScript 
+CheckGlobalFlag 0x0051
+JumpIfNot 0xfffa
+StartScript 
+_0807E864 
diff --git a/data/scripts/gUnk_0800A10A.inc b/data/scripts/gUnk_0800A10A.inc
new file mode 100644
index 00000000..17b2b548
--- /dev/null
+++ b/data/scripts/gUnk_0800A10A.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800A10A
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
diff --git a/data/scripts/gUnk_0800A10F.inc b/data/scripts/gUnk_0800A10F.inc
new file mode 100644
index 00000000..0b89d7e4
--- /dev/null
+++ b/data/scripts/gUnk_0800A10F.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800A10F
+.byte 0x8
+.byte 0x7e
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xfd
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x69
+.byte 0xc
+.byte 0xb0
+.byte 0x0
+.byte 0x58
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0xf8
+.byte 0x7
+.byte 0x8
diff --git a/data/scripts/gUnk_0800A124.inc b/data/scripts/gUnk_0800A124.inc
new file mode 100644
index 00000000..f7d50aa4
--- /dev/null
+++ b/data/scripts/gUnk_0800A124.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800A124
+_0807E8E4_3 
+CallWithArg sub_0807F75C, 0x00d00060
+.short 0x140c
+.short 0x4ae9
diff --git a/data/scripts/gUnk_0800A134.inc b/data/scripts/gUnk_0800A134.inc
new file mode 100644
index 00000000..79b32191
--- /dev/null
+++ b/data/scripts/gUnk_0800A134.inc
@@ -0,0 +1,65 @@
+SCRIPT_START gUnk_0800A134
+.short 0x0809
+.short 0xa160
+.short 0x0800
+.short 0x087b
+.short 0x00f7
+.short 0x0838
+.short 0x0002
+.short 0x043e
+.short 0x0402
+.short 0x0437
+.short 0x0c33
+.short 0x0004
+.short 0x0000
+.short 0x140c
+.short 0xda1d
+.short 0x0806
+.short 0x0006
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0080
+.short 0x0879
+.short 0x0007
+.short 0x0879
+.short 0x000b
+.short 0x0850
+.short 0x0002
+.short 0x0c69
+.short 0x00b0
+.short 0x0080
+.short 0x140c
+.short 0xf98d
+.short 0x0807
+.short 0x0000
+.short 0xff80
+.short 0x140c
+.short 0x60c5
+.short 0x0809
+.short 0xa1b4
+.short 0x0800
+.short 0x0402
+.short 0x087b
+.short 0x0142
+.short 0x0c78
+.short 0xff80
+.short 0x0000
+.short 0x087b
+.short 0x0143
+.short 0x0850
+.short 0x0004
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc
new file mode 100644
index 00000000..6c66905f
--- /dev/null
+++ b/data/scripts/gUnk_0800A1B4.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800A1B4
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000b
+CallWithArg sub_0807F994, 0x0000fff8
+StopScript 
+WaitForSomething 0x00000002
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc
new file mode 100644
index 00000000..ec26a0f2
--- /dev/null
+++ b/data/scripts/gUnk_0800A1D8.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800A1D8
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x00800088
+Call sub_0807F844
+_0807E8E4_3 
+CallWithArg sub_0807F75C, 0x00a80088
+StopScript 
+Wait 0x003c
+StartPlayerScript 0x0800a310
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000080
+TextboxNoOverlapFollowPos 0x1659, 0x0000
+_0807EA94 
+.short 0x0831
+.short 0x003c
diff --git a/data/scripts/gUnk_0800A224.inc b/data/scripts/gUnk_0800A224.inc
new file mode 100644
index 00000000..9ae17ba9
--- /dev/null
+++ b/data/scripts/gUnk_0800A224.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800A224
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000200
+_0807E5F8 0x00000004
+_0807E8E4_0 
+WaitForSomething2 0x00000080
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000200
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000040
+_0807E5F8 0x00000004
+.short 0x0c0b
+.short 0xf3f9
diff --git a/data/scripts/gUnk_0800A260.inc b/data/scripts/gUnk_0800A260.inc
new file mode 100644
index 00000000..3dd7f1b9
--- /dev/null
+++ b/data/scripts/gUnk_0800A260.inc
@@ -0,0 +1,113 @@
+SCRIPT_START gUnk_0800A260
+.short 0x0807
+.short 0x0c33
+.short 0x0080
+.short 0x0000
+.short 0x0c5c
+.short 0x165a
+.short 0x000e
+.short 0x0459
+.short 0x0831
+.short 0x003c
+.short 0x0c5c
+.short 0x165b
+.short 0x000e
+.short 0x0459
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c33
+.short 0x0040
+.short 0x0000
+.short 0x0c28
+.short 0x0008
+.short 0x0000
+.short 0x0c33
+.short 0x0100
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x044c
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0080
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x0008
+.short 0x0000
+.short 0x0c33
+.short 0x0100
+.short 0x0000
+.short 0x0c28
+.short 0x0006
+.short 0x0000
+.short 0x0c33
+.short 0x00c0
+.short 0x0000
+.short 0x0c5c
+.short 0x165c
+.short 0x000e
+.short 0x0459
+.short 0x047e
+.short 0x0c5c
+.short 0x165d
+.short 0x000e
+.short 0x0459
+.short 0x0c28
+.short 0x0006
+.short 0x0000
+.short 0x0c33
+.short 0x00c0
+.short 0x0000
+.short 0x0c28
+.short 0x0006
+.short 0x0000
+.short 0x0c33
+.short 0x0080
+.short 0x0000
+.short 0x0c28
+.short 0x0008
+.short 0x0000
+.short 0x0c33
+.short 0x0100
+.short 0x0000
+.short 0x087c
+.short 0x0008
+.short 0x087b
+.short 0x00f7
+.short 0x140c
+.short 0xda1d
+.short 0x0806
+.short 0x0007
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0402
+.short 0x0861
+.short 0x0002
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0006
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0002
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0006
+.short 0x0831
+.short 0x000a
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A340.inc b/data/scripts/gUnk_0800A340.inc
new file mode 100644
index 00000000..c427d35e
--- /dev/null
+++ b/data/scripts/gUnk_0800A340.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800A340
+StartScript 
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x000b
+_0807EB44 0x0004
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+WaitForSomething2 0x00000002
+_0807E930 0x000e
+_0807EF80 0x0007
+Call sub_0807F2D4
+_0807EF80 0x0004
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+_0807E930 0x000c
+Call sub_0807F2D4
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+_0807E930 0x000f
+Call sub_0807F2D4
+.byte 0x28
diff --git a/data/scripts/gUnk_0800A3A3.inc b/data/scripts/gUnk_0800A3A3.inc
new file mode 100644
index 00000000..952e122c
--- /dev/null
+++ b/data/scripts/gUnk_0800A3A3.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800A3A3
+.short 0x400c
+.short 0x0000
+.short 0x3300
diff --git a/data/scripts/gUnk_0800A3A9.inc b/data/scripts/gUnk_0800A3A9.inc
new file mode 100644
index 00000000..861473df
--- /dev/null
+++ b/data/scripts/gUnk_0800A3A9.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800A3A9
+.byte 0xc
diff --git a/data/scripts/gUnk_0800A3AA.inc b/data/scripts/gUnk_0800A3AA.inc
new file mode 100644
index 00000000..b6654ff9
--- /dev/null
+++ b/data/scripts/gUnk_0800A3AA.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800A3AA
+.short 0x0002
+.short 0x0000
+.short 0x0850
+.short 0x000c
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0c28
+.short 0x0040
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x140c
+.short 0x60c5
+.short 0x0809
+.short 0xa680
+.short 0x0800
+.short 0x0c28
+.short 0x0040
+.short 0x0000
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc
new file mode 100644
index 00000000..ac087eda
--- /dev/null
+++ b/data/scripts/gUnk_0800A3D8.inc
@@ -0,0 +1,60 @@
+SCRIPT_START gUnk_0800A3D8
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807EB44 0x0002
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000004
+StartScript 
+_0807EF80 0x0004
+Call sub_0807F3F8
+StopScript 
+Wait 0x003c
+_0807EC94 0x0010
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+_0807EB44 0x0004
+_0807EF80 0x0000
+SoundReq 0x0142
+CallWithArg sub_080960C4, 0x0800a638
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+SoundReq 0x0143
+_0807E5F8 0x00001000
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+Call sub_08066E68
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+SoundReq 0x0142
+CallWithArg sub_080960C4, 0x0800a680
+Wait 0x0078
+SoundReq 0x0153
+CallWithArg sub_0807FADC, 0x00000003
+Wait 0x000f
+SoundReq 0x0153
+CallWithArg sub_0807FADC, 0x00000003
+Wait 0x000f
+SoundReq 0x0153
+CallWithArg sub_0807FADC, 0x00000003
+Wait 0x003c
+SoundReq 0x0153
+CallWithArg sub_0807FADC, 0x00000001
+SoundReq 0x0143
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc
new file mode 100644
index 00000000..0379d003
--- /dev/null
+++ b/data/scripts/gUnk_0800A500.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800A500
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807E930 0x0005
+Call sub_0807F348
+StopScript 
+WaitForSomething2 0x00000008
+SoundReq 0x0142
+_0807E610 0x00000800
+CallWithArg sub_080960C4, 0x0800a65c
+_0807E930 0x0002
+Call sub_08094B0C
+_0807EDD4 0x0068, 0x0088
+Call sub_08094B80
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000008
+Call sub_08094B3C
+_0807E930 0x0004
+_0807E5F8 0x00000800
+SoundReq 0x0143
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000008
+_0807EF80 0x0008
+Call sub_080961B0
+SoundReq 0x00fa
+Wait 0x003c
+_0807E5F8 0x00000100
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc
new file mode 100644
index 00000000..df64eb73
--- /dev/null
+++ b/data/scripts/gUnk_0800A590.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800A590
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+SetEntity0x20 0x00000000
+_0807EF80 0x0008
+_0807EB44 0x0000
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800A5A6.inc b/data/scripts/gUnk_0800A5A6.inc
new file mode 100644
index 00000000..6317298f
--- /dev/null
+++ b/data/scripts/gUnk_0800A5A6.inc
@@ -0,0 +1,92 @@
+SCRIPT_START gUnk_0800A5A6
+.short 0xf715
+.short 0x0807
+.short 0x046b
+.short 0x140c
+.short 0xf98d
+.short 0x0807
+.short 0x0000
+.short 0xfff0
+.short 0x0402
+.short 0x0850
+.short 0x0023
+.short 0x0c33
+.short 0x0010
+.short 0x0000
+.short 0x140c
+.short 0xf6e9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+.short 0x0879
+.short 0x0007
+.short 0x087b
+.short 0x0142
+.short 0x0c29
+.short 0x0800
+.short 0x0000
+.short 0x140c
+.short 0x60c5
+.short 0x0809
+.short 0xa65c
+.short 0x0800
+.short 0x0831
+.short 0x003c
+.short 0x0c73
+.short 0x0088
+.short 0x0068
+.short 0x0831
+.short 0x0078
+.short 0x0c28
+.short 0x0800
+.short 0x0000
+.short 0x087b
+.short 0x0143
+.short 0x0c78
+.short 0x0000
+.short 0x0020
+.short 0x0850
+.short 0x001f
+.short 0x0c28
+.short 0x0200
+.short 0x0000
+.short 0x0c33
+.short 0x0010
+.short 0x0000
+.short 0x0831
+.short 0x0078
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x0200
+.short 0x0000
+.short 0x0831
+.short 0x0001
+.short 0x0879
+.short 0x0008
+.short 0x0c33
+.short 0x0010
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0401
+.short 0x0879
+.short 0x0007
+.short 0x0879
+.short 0x000b
+.short 0x140c
+.short 0xf995
+.short 0x0807
+.short 0xfff8
+.short 0x0000
+.short 0x0402
+.short 0x0c32
+.short 0x1000
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc
new file mode 100644
index 00000000..e724c755
--- /dev/null
+++ b/data/scripts/gUnk_0800A65C.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800A65C
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000b
+CallWithArg sub_0807F994, 0x0000fff8
+StopScript 
+WaitForSomething 0x00000800
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A67E.inc b/data/scripts/gUnk_0800A67E.inc
new file mode 100644
index 00000000..cc4eb753
--- /dev/null
+++ b/data/scripts/gUnk_0800A67E.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800A67E
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc
new file mode 100644
index 00000000..b065e201
--- /dev/null
+++ b/data/scripts/gUnk_0800A680.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800A680
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000b
+CallWithArg sub_0807F994, 0x0000fff8
+StopScript 
+WaitForSomething 0x00000020
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc
new file mode 100644
index 00000000..6ef55566
--- /dev/null
+++ b/data/scripts/gUnk_0800A6A4.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800A6A4
+StartScript 
+_0807E864 
+.byte 0xb
+.byte 0xc
+.byte 0x29
diff --git a/data/scripts/gUnk_0800A6AB.inc b/data/scripts/gUnk_0800A6AB.inc
new file mode 100644
index 00000000..581b7885
--- /dev/null
+++ b/data/scripts/gUnk_0800A6AB.inc
@@ -0,0 +1,42 @@
+SCRIPT_START gUnk_0800A6AB
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x69
+.byte 0xc
+.byte 0x88
+.byte 0x0
+.byte 0x68
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0xf8
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xf6
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x1d
+.byte 0xda
+.byte 0x6
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc
new file mode 100644
index 00000000..5e8f1277
--- /dev/null
+++ b/data/scripts/gUnk_0800A6D4.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800A6D4
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x00700088
+Call sub_0807F844
+SoundReq 0x00f7
+StopScript 
+Wait 0x003c
+CallWithArg sub_0806DA1C, 0x00000009
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc
new file mode 100644
index 00000000..7fe91929
--- /dev/null
+++ b/data/scripts/gUnk_0800A704.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800A704
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x01c80198
+Call sub_0807F844
+StopScript 
+Wait 0x003c
+SoundReq 0x00f6
+CallWithArg sub_0806DA1C, 0x0000000a
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc
new file mode 100644
index 00000000..86e0b3c7
--- /dev/null
+++ b/data/scripts/gUnk_0800A734.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800A734
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x01c800d8
+.short 0x0c0b
+.short 0xf845
+.short 0x0807
diff --git a/data/scripts/gUnk_0800A74A.inc b/data/scripts/gUnk_0800A74A.inc
new file mode 100644
index 00000000..bd50de98
--- /dev/null
+++ b/data/scripts/gUnk_0800A74A.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800A74A
+SoundReq 0x00f7
+StopScript 
+Wait 0x003c
+CallWithArg sub_0806DA1C, 0x0000000b
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc
new file mode 100644
index 00000000..8a63af09
--- /dev/null
+++ b/data/scripts/gUnk_0800A764.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800A764
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x01b800f8
+Call sub_0807F844
+StopScript 
+Wait 0x003c
+SoundReq 0x00f6
+_0807E778 0x0004
+DoFade7 
+WaitFor_2 
+_0807E5F8 0x00000001
+SoundReq 0x00f7
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+Wait 0x001e
+_0807E5F8 0x00000002
+Wait 0x0014
+_0807E5F8 0x00000004
+Wait 0x000a
+_0807E5F8 0x00000008
+Wait 0x0005
+_0807E5F8 0x00000010
+Wait 0x0002
+_0807E5F8 0x00000020
+Wait 0x0078
+CallWithArg sub_0806DA1C, 0x0000000c
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc
new file mode 100644
index 00000000..2ca09744
--- /dev/null
+++ b/data/scripts/gUnk_0800A7E4.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800A7E4
+StartScript 
+.short 0x0879
diff --git a/data/scripts/gUnk_0800A7E8.inc b/data/scripts/gUnk_0800A7E8.inc
new file mode 100644
index 00000000..b767904a
--- /dev/null
+++ b/data/scripts/gUnk_0800A7E8.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800A7E8
+.short 0x0007
+.short 0x0861
+.short 0x0004
+.short 0x0850
+.short 0x0010
+.short 0x0402
+.short 0x0c32
+.short 0x0001
+.short 0x0000
+.short 0x0850
+.short 0x0002
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x003c
+.short 0x0850
+.short 0x0001
+.short 0x0831
+.short 0x001e
+.short 0x0850
diff --git a/data/scripts/gUnk_0800A816.inc b/data/scripts/gUnk_0800A816.inc
new file mode 100644
index 00000000..5e9cd87a
--- /dev/null
+++ b/data/scripts/gUnk_0800A816.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800A816
+.short 0x0003
+.short 0x0831
+.short 0x001e
+.short 0x0803
+.short 0xffee
diff --git a/data/scripts/gUnk_0800A820.inc b/data/scripts/gUnk_0800A820.inc
new file mode 100644
index 00000000..0b7dfe6e
--- /dev/null
+++ b/data/scripts/gUnk_0800A820.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800A820
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0010
+StopScript 
+WaitForSomething 0x00000001
+_0807E930 0x0002
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0001
+Wait 0x0014
+_0807E930 0x0003
+Wait 0x0014
+.short 0x0803
+.short 0xffee
diff --git a/data/scripts/gUnk_0800A85C.inc b/data/scripts/gUnk_0800A85C.inc
new file mode 100644
index 00000000..ea415c26
--- /dev/null
+++ b/data/scripts/gUnk_0800A85C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800A85C
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0010
+StopScript 
+WaitForSomething 0x00000001
+_0807E930 0x0002
+WaitForSomething2 0x00000008
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0001
+Wait 0x000a
+_0807E930 0x0003
+Wait 0x000a
+.short 0x0803
+.short 0xffee
diff --git a/data/scripts/gUnk_0800A898.inc b/data/scripts/gUnk_0800A898.inc
new file mode 100644
index 00000000..d187960a
--- /dev/null
+++ b/data/scripts/gUnk_0800A898.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800A898
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0008
+StopScript 
+WaitForSomething 0x00000001
+_0807EF80 0x0000
+WaitForSomething2 0x00000010
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0002
+Wait 0x0019
+_0807EB44 0x0006
+Wait 0x0019
+.short 0x0803
+.short 0xffee
diff --git a/data/scripts/gUnk_0800A8D4.inc b/data/scripts/gUnk_0800A8D4.inc
index e9b22a64..bfe1d195 100644
--- a/data/scripts/gUnk_0800A8D4.inc
+++ b/data/scripts/gUnk_0800A8D4.inc
@@ -1,14 +1,15 @@
-ScriptCommand_StartScript 
-ScriptCommand_0807EF80 0x0007
-ScriptCommand_0807EB44 0x0004
-ScriptCommand_0807E930 0x0008
-ScriptCommand_StopScript 
-ScriptCommand_WaitForSomething 0x00000001
-ScriptCommand_0807EF80 0x0000
-ScriptCommand_WaitForSomething2 0x00000020
-ScriptCommand_0807EF80 0x0004
-ScriptCommand_Wait 0x003c
-ScriptCommand_0807EB44 0x0002
-ScriptCommand_Wait 0x000f
+SCRIPT_START gUnk_0800A8D4
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0008
+StopScript 
+WaitForSomething 0x00000001
+_0807EF80 0x0000
+WaitForSomething2 0x00000020
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0002
+Wait 0x000f
 .short 0x0861
 .short 0x0006
diff --git a/data/scripts/gUnk_0800A908.inc b/data/scripts/gUnk_0800A908.inc
new file mode 100644
index 00000000..c0885233
--- /dev/null
+++ b/data/scripts/gUnk_0800A908.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800A908
+Wait 0x000f
+.short 0x0803
+.short 0xffee
diff --git a/data/scripts/gUnk_0800A910.inc b/data/scripts/gUnk_0800A910.inc
new file mode 100644
index 00000000..e52eb0b9
--- /dev/null
+++ b/data/scripts/gUnk_0800A910.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800A910
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x01780378
+Call sub_0807F844
+StopScript 
+Wait 0x003c
+_0807E5F8 0x00000001
+Wait 0x001e
+_0807E5F8 0x00000002
+Wait 0x0014
+_0807E5F8 0x00000004
+Wait 0x000a
+_0807E5F8 0x00000008
+Wait 0x003c
+CallWithArg sub_0806DA1C, 0x0000000d
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A964.inc b/data/scripts/gUnk_0800A964.inc
new file mode 100644
index 00000000..558fb639
--- /dev/null
+++ b/data/scripts/gUnk_0800A964.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800A964
+StartScript 
+_0807EB44 0x0002
+_0807EF80 0x0007
+_0807E930 0x0001
+StopScript 
+WaitForSomething2 0x00000001
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A988.inc b/data/scripts/gUnk_0800A988.inc
new file mode 100644
index 00000000..9773d029
--- /dev/null
+++ b/data/scripts/gUnk_0800A988.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800A988
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0007
+_0807E930 0x0002
+StopScript 
+WaitForSomething2 0x00000002
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A9AC.inc b/data/scripts/gUnk_0800A9AC.inc
new file mode 100644
index 00000000..75aafcd7
--- /dev/null
+++ b/data/scripts/gUnk_0800A9AC.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800A9AC
+StartScript 
+_0807EB44 0x0000
+_0807EF80 0x0007
+_0807E930 0x0000
+StopScript 
+WaitForSomething2 0x00000004
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A9D0.inc b/data/scripts/gUnk_0800A9D0.inc
new file mode 100644
index 00000000..d70c742c
--- /dev/null
+++ b/data/scripts/gUnk_0800A9D0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800A9D0
+StartScript 
+_0807EB44 0x0006
+_0807EF80 0x0007
+_0807E930 0x0003
+StopScript 
+WaitForSomething2 0x00000008
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc
new file mode 100644
index 00000000..595cf338
--- /dev/null
+++ b/data/scripts/gUnk_0800A9F4.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800A9F4
+StartScript 
+_0807E864 
+Call sub_0807DF28
+.byte 0x69
+.byte 0xc
+.byte 0x28
+.byte 0x1
+.byte 0x58
diff --git a/data/scripts/gUnk_0800AA03.inc b/data/scripts/gUnk_0800AA03.inc
new file mode 100644
index 00000000..e0dc247d
--- /dev/null
+++ b/data/scripts/gUnk_0800AA03.inc
@@ -0,0 +1,70 @@
+SCRIPT_START gUnk_0800AA03
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0xf8
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x1d
+.byte 0xda
+.byte 0x6
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800AA48.inc b/data/scripts/gUnk_0800AA48.inc
new file mode 100644
index 00000000..c4e7fb14
--- /dev/null
+++ b/data/scripts/gUnk_0800AA48.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AA48
+StartScript 
+_0807EB44 0x0002
+_0807EF80 0x0007
+_0807E930 0x0000
+StopScript 
+WaitForSomething2 0x00000001
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AA6C.inc b/data/scripts/gUnk_0800AA6C.inc
new file mode 100644
index 00000000..d9166bb5
--- /dev/null
+++ b/data/scripts/gUnk_0800AA6C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AA6C
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0007
+_0807E930 0x0000
+StopScript 
+WaitForSomething2 0x00000002
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AA90.inc b/data/scripts/gUnk_0800AA90.inc
new file mode 100644
index 00000000..3f08f7c6
--- /dev/null
+++ b/data/scripts/gUnk_0800AA90.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AA90
+StartScript 
+_0807EB44 0x0000
+_0807EF80 0x0007
+_0807E930 0x0000
+StopScript 
+WaitForSomething2 0x00000004
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AAB4.inc b/data/scripts/gUnk_0800AAB4.inc
new file mode 100644
index 00000000..5af49a63
--- /dev/null
+++ b/data/scripts/gUnk_0800AAB4.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AAB4
+StartScript 
+_0807EB44 0x0006
+_0807EF80 0x0007
+_0807E930 0x0000
+StopScript 
+WaitForSomething2 0x00000008
+Call CreateDust
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc
new file mode 100644
index 00000000..38f1dd36
--- /dev/null
+++ b/data/scripts/gUnk_0800AAD8.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800AAD8
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x01480088
+Call sub_0807F844
+StopScript 
+Wait 0x003c
+SoundReq 0x00f6
+CallWithArg sub_0806DA1C, 0x0000000f
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc
new file mode 100644
index 00000000..e84df154
--- /dev/null
+++ b/data/scripts/gUnk_0800AB08.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800AB08
+StartScript 
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x01480088
+Call sub_0807F844
+_0807E8E4_3 
+.byte 0xc
+.byte 0x14
+.byte 0xe9
diff --git a/data/scripts/gUnk_0800AB23.inc b/data/scripts/gUnk_0800AB23.inc
new file mode 100644
index 00000000..4cc931cd
--- /dev/null
+++ b/data/scripts/gUnk_0800AB23.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_0800AB23
+.short 0x07f6
+.short 0x0808
+.short 0x0000
+.short 0x0c00
+.short 0x5d14
+.short 0x07f7
+.short 0x8808
+.short 0xa800
+.short 0x7b00
+.short 0xf708
+.short 0x0200
+.short 0x3104
+.short 0x7808
+.short 0x8900
+.short 0x0108
+.short 0x6900
+.short 0x880c
+.short 0x7800
+.short 0x0b00
+.short 0xc10c
+.short 0x07f5
+.short 0x5c08
diff --git a/data/scripts/gUnk_0800AB4F.inc b/data/scripts/gUnk_0800AB4F.inc
new file mode 100644
index 00000000..de5fe07d
--- /dev/null
+++ b/data/scripts/gUnk_0800AB4F.inc
@@ -0,0 +1,162 @@
+SCRIPT_START gUnk_0800AB4F
+.byte 0xc
+.byte 0x64
+.byte 0x16
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x5c
+.byte 0xc
+.byte 0x5e
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0xed
+.byte 0xdd
+.byte 0x5
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8a
+.byte 0xc
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xcd
+.byte 0xd2
+.byte 0x8
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x49
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x6a
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xe0
+.byte 0xff
+.byte 0xb
+.byte 0xc
+.byte 0xc1
+.byte 0xf5
+.byte 0x7
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x19
+.byte 0xde
+.byte 0x5
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8a
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x5f
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0xbc
+.byte 0xac
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x60
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x61
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
diff --git a/data/scripts/gUnk_0800ABF0.inc b/data/scripts/gUnk_0800ABF0.inc
new file mode 100644
index 00000000..1d5967fe
--- /dev/null
+++ b/data/scripts/gUnk_0800ABF0.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_0800ABF0
+.short 0x0008
+.short 0x0000
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c33
+.short 0x0004
+.short 0x0000
+.short 0x0c6a
+.short 0x0000
+.short 0x0020
+.short 0x0c0b
+.short 0xf5c1
+.short 0x0807
+.short 0x0c33
+.short 0x0010
+.short 0x0000
+.short 0x0c47
+.short 0xace0
+.short 0x0800
+.short 0x0c33
+.short 0x0001
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x0c5c
diff --git a/data/scripts/gUnk_0800AC24.inc b/data/scripts/gUnk_0800AC24.inc
new file mode 100644
index 00000000..7582ca47
--- /dev/null
+++ b/data/scripts/gUnk_0800AC24.inc
@@ -0,0 +1,74 @@
+SCRIPT_START gUnk_0800AC24
+.byte 0x62
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x5c
+.byte 0xc
+.byte 0x63
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x6a
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xe0
+.byte 0xff
+.byte 0xb
+.byte 0xc
+.byte 0xc1
+.byte 0xf5
+.byte 0x7
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x47
+.byte 0xc
+.byte 0x54
+.byte 0xad
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x65
+.byte 0x16
+.byte 0xe
+.byte 0x0
+.byte 0x59
diff --git a/data/scripts/gUnk_0800AC6D.inc b/data/scripts/gUnk_0800AC6D.inc
new file mode 100644
index 00000000..405ae99b
--- /dev/null
+++ b/data/scripts/gUnk_0800AC6D.inc
@@ -0,0 +1,37 @@
+SCRIPT_START gUnk_0800AC6D
+.short 0x2804
+.short 0x020c
+.short 0x0000
+.short 0x3300
+.short 0x040c
+.short 0x0000
+.short 0x3100
+.short 0x7808
+.short 0x0b00
+.short 0x810c
+.short 0x08d2
+.short 0x3108
+.short 0x7808
+.short 0x3800
+.short 0x0408
+.short 0x3d00
+.short 0x3704
+.short 0x0b04
+.short 0x950c
+.short 0x07fb
+.short 0x6b08
+.short 0x0b04
+.short 0x450c
+.short 0x07f8
+.short 0x8908
+.short 0x0408
+.short 0x8800
+.short 0x2804
+.short 0x000c
+.short 0x0000
+.short 0x3c80
+.short 0x3704
+.short 0x0b04
+.short 0x510c
+.short 0x07df
+.short 0x4408
diff --git a/data/scripts/gUnk_0800ACB5.inc b/data/scripts/gUnk_0800ACB5.inc
new file mode 100644
index 00000000..7079f097
--- /dev/null
+++ b/data/scripts/gUnk_0800ACB5.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800ACB5
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc
new file mode 100644
index 00000000..07f8d2d2
--- /dev/null
+++ b/data/scripts/gUnk_0800ACBC.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800ACBC
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0088, 0x0080
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+.short 0x0000
diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc
new file mode 100644
index 00000000..2035165c
--- /dev/null
+++ b/data/scripts/gUnk_0800ACE0.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_0800ACE0
+StartScript 
+Call sub_08094BE0
+CallWithArg sub_0807F238, 0x0000045b
+SoundReq 0x0109
+StopScript 
+Call sub_0807F304
+Wait 0x005a
+_0807E5F8 0x00000008
+StartScript 
+CallWithArg sub_0807F6F8, 0x00000008
+CallWithArg sub_0807F238, 0x000008e4
+StopScript 
+Call sub_0807F304
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x003c
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x0004
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800AD54.inc
new file mode 100644
index 00000000..27b91895
--- /dev/null
+++ b/data/scripts/gUnk_0800AD54.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AD54
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EC64 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
diff --git a/data/scripts/gUnk_0800AD74.inc b/data/scripts/gUnk_0800AD74.inc
new file mode 100644
index 00000000..f2eb830e
--- /dev/null
+++ b/data/scripts/gUnk_0800AD74.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800AD74
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807EB44 0x0004
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0004
+Wait 0x001e
+_0807EB44 0x0002
+.byte 0xc
+.byte 0x14
+.byte 0xd9
diff --git a/data/scripts/gUnk_0800ADA7.inc b/data/scripts/gUnk_0800ADA7.inc
new file mode 100644
index 00000000..0fe40272
--- /dev/null
+++ b/data/scripts/gUnk_0800ADA7.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800ADA7
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x61
+.byte 0x8
diff --git a/data/scripts/gUnk_0800ADB4.inc b/data/scripts/gUnk_0800ADB4.inc
new file mode 100644
index 00000000..b7a6cde0
--- /dev/null
+++ b/data/scripts/gUnk_0800ADB4.inc
@@ -0,0 +1,121 @@
+SCRIPT_START gUnk_0800ADB4
+.short 0x0000
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0861
+.short 0x0002
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0831
+.short 0x0014
+.short 0x0861
+.short 0x0004
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0850
+.short 0x000c
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0c0b
+.short 0x4b95
+.short 0x0809
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0850
+.short 0x000f
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x140c
+.short 0x60c5
+.short 0x0809
+.short 0xaf18
+.short 0x0800
+.short 0x0850
+.short 0x0012
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0831
+.short 0x001e
+.short 0x0c28
+.short 0x0020
+.short 0x0000
+.short 0x047e
+.short 0x0c0b
+.short 0x29bd
+.short 0x080a
+.short 0x0c0b
+.short 0x305d
+.short 0x0806
+.short 0x0c0b
+.short 0x30a5
+.short 0x0806
+.short 0x0c78
+.short 0x0000
+.short 0x0020
+.short 0x0831
+.short 0x001e
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0867
+.short 0x0080
+.short 0x0c77
+.short 0x0000
+.short 0xfff0
+.short 0x0831
+.short 0x003c
+.short 0x0c77
+.short 0x0000
+.short 0xfff0
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0c73
+.short 0x0088
+.short 0x0040
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_0800AEA4.inc b/data/scripts/gUnk_0800AEA4.inc
new file mode 100644
index 00000000..0f292006
--- /dev/null
+++ b/data/scripts/gUnk_0800AEA4.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800AEA4
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807EB44 0x0002
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000040
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000080
+WaitForSomething2 0x80000000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800AEDC.inc b/data/scripts/gUnk_0800AEDC.inc
new file mode 100644
index 00000000..d8650582
--- /dev/null
+++ b/data/scripts/gUnk_0800AEDC.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800AEDC
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807E930 0x0000
+StopScript 
+WaitForSomething2 0x00000008
+Call sub_08094B80
+_0807EF3C 0x0000, 0x0001
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000008
+_0807EF80 0x0008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc
new file mode 100644
index 00000000..a786d6d5
--- /dev/null
+++ b/data/scripts/gUnk_0800AF18.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800AF18
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000b
+CallWithArg sub_0807F994, 0x0000fff8
+SoundReq 0x0142
+StopScript 
+WaitForSomething 0x00000020
+SoundReq 0x0143
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AF44.inc b/data/scripts/gUnk_0800AF44.inc
new file mode 100644
index 00000000..ebfa32bc
--- /dev/null
+++ b/data/scripts/gUnk_0800AF44.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AF44
+_0807E864 
+Call sub_0807DF28
+_0807EB28 0x1c01
+_0807EA94 
+SetLocalFlagByOffset 0x0100, 0x0001
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AF68.inc b/data/scripts/gUnk_0800AF68.inc
new file mode 100644
index 00000000..2b99a066
--- /dev/null
+++ b/data/scripts/gUnk_0800AF68.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800AF68
+_0807E864 
+Call sub_0807DF28
+_0807EB28 0x1c02
+_0807EA94 
+SetLocalFlagByOffset 0x0100, 0x0002
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800AF7E.inc b/data/scripts/gUnk_0800AF7E.inc
new file mode 100644
index 00000000..1a8d0025
--- /dev/null
+++ b/data/scripts/gUnk_0800AF7E.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800AF7E
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AF8C.inc b/data/scripts/gUnk_0800AF8C.inc
new file mode 100644
index 00000000..f0352fce
--- /dev/null
+++ b/data/scripts/gUnk_0800AF8C.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800AF8C
+_0807E864 
+Call sub_0807DF28
+_0807EB28 0x1c03
+_0807EA94 
+SetLocalFlagByOffset 0x0100, 0x0003
+Call sub_0807DF50
+.byte 0x44
diff --git a/data/scripts/gUnk_0800AFA7.inc b/data/scripts/gUnk_0800AFA7.inc
new file mode 100644
index 00000000..0b73b74c
--- /dev/null
+++ b/data/scripts/gUnk_0800AFA7.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800AFA7
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800AFB0.inc b/data/scripts/gUnk_0800AFB0.inc
new file mode 100644
index 00000000..123fb79d
--- /dev/null
+++ b/data/scripts/gUnk_0800AFB0.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800AFB0
+_0807E864 
+StopScript 
+StartScript 
+Call sub_0807FBB4
+ComparePlayerAction 0x0001
+JumpIfNot 0xfff0
+StopScript 
+Call sub_0807DF28
+_0807EB28 0x1c04
+_0807EA94 
+SetLocalFlagByOffset 0x0100, 0x0004
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AFE8.inc b/data/scripts/gUnk_0800AFE8.inc
new file mode 100644
index 00000000..c150d8e0
--- /dev/null
+++ b/data/scripts/gUnk_0800AFE8.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800AFE8
+_0807E864 
+Call sub_0807DF28
+_0807EB28 0x1c05
+_0807EA94 
+SetLocalFlagByOffset 0x0100, 0x0005
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B00C.inc b/data/scripts/gUnk_0800B00C.inc
new file mode 100644
index 00000000..8bc5453a
--- /dev/null
+++ b/data/scripts/gUnk_0800B00C.inc
@@ -0,0 +1,44 @@
+SCRIPT_START gUnk_0800B00C
+StartScript 
+Call sub_0807F934
+Call sub_080A2124
+_0807EF80 0x000a
+_0807EF80 0x0007
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+CheckGlobalFlag 0x0052
+JumpIf 0x004a
+CheckGlobalFlag 0x0053
+JumpIf 0x0024
+TextboxNoOverlap 0x3f32
+_0807EA94 
+_0807EF80 0x0008
+Call Windcrest_Unlock
+Wait 0x003c
+_0807EB28 0x0b5c
+_0807EA94 
+SetGlobalFlag 0x0053
+Jump 0x003a
+TextboxNoOverlap 0x3f32
+_0807EA94 
+_0807EF80 0x0008
+Call Windcrest_Unlock
+Wait 0x003c
+_0807EB28 0x0b5d
+_0807EA94 
+Jump 0x001c
+TextboxNoOverlap 0x3f32
+_0807EA94 
+_0807EF80 0x0008
+Call Windcrest_Unlock
+Wait 0x003c
+_0807EB28 0x0b5e
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B0AC.inc b/data/scripts/gUnk_0800B0AC.inc
new file mode 100644
index 00000000..93f58f77
--- /dev/null
+++ b/data/scripts/gUnk_0800B0AC.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800B0AC
+StopScript 
+_0807E864 
diff --git a/data/scripts/gUnk_0800B0B0.inc b/data/scripts/gUnk_0800B0B0.inc
new file mode 100644
index 00000000..60cdd0bb
--- /dev/null
+++ b/data/scripts/gUnk_0800B0B0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800B0B0
+Call sub_0807FA40
+Call sub_0807DF28
+_0807EB28 0x0b5f
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc
new file mode 100644
index 00000000..b6d85120
--- /dev/null
+++ b/data/scripts/gUnk_0800B0D0.inc
@@ -0,0 +1,144 @@
+SCRIPT_START gUnk_0800B0D0
+StartScript 
+Call sub_0806BCD4
+_0807EF80 0x000a
+CallWithArg sub_0806BC94, 0x00000000
+StopScript 
+Call sub_0807F434
+.byte 0x6
+.byte 0x10
+.byte 0xf8
+.byte 0xff
+.byte 0x4
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xd5
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x63
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0x95
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xe9
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xb9
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x95
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xb6
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xd5
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x63
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0x95
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xf6
+.byte 0x7
+.byte 0x8
+.byte 0x56
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xc1
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xb9
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x95
+.byte 0xbc
+.byte 0x6
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800B177.inc b/data/scripts/gUnk_0800B177.inc
new file mode 100644
index 00000000..15e5d732
--- /dev/null
+++ b/data/scripts/gUnk_0800B177.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800B177
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x6e
+.byte 0xff
diff --git a/data/scripts/gUnk_0800B17C.inc b/data/scripts/gUnk_0800B17C.inc
new file mode 100644
index 00000000..1c3c36a4
--- /dev/null
+++ b/data/scripts/gUnk_0800B17C.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800B17C
+StartScript 
+Call sub_0807DF28
+SetLocalFlag 0x0039
+_0807E864 
+StopScript 
+WaitForPlayerAction0x17 
+StartPlayerScript 0x0800b1c0
+Wait 0x0018
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetRoomFlag 0x0000
+Wait 0x0010
+SoundReq2 0x002d
+_0807EB28 0x2701
+_0807E878 
+Call sub_0807DF50
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc
new file mode 100644
index 00000000..e5ef8a57
--- /dev/null
+++ b/data/scripts/gUnk_0800B1C0.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800B1C0
+StartScript 
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x00e0
+_0807EDD4 0x0088, 0x0090
+ClearLocalFlag 0x0039
+_0807EF80 0x0000
+_0807EF80 0x0004
+Wait 0x002c
+LoadRoomEntityList 0x080da260
+Wait 0x001e
+_0807E5F8 0x00000001
+Call sub_0807921C
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B200.inc b/data/scripts/gUnk_0800B200.inc
new file mode 100644
index 00000000..8d16d2c1
--- /dev/null
+++ b/data/scripts/gUnk_0800B200.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800B200
+StartScript 
+_0807E5F8 0x00000000
+CheckLocalFlag 0x001d
+JumpIf 0x0044
+SetEntityNonPlanarMovement 0x00c0
+StopScript 
+WaitForSomething2 0x00000001
+Call sub_0807DF28
+MoveEntityToPlayer 
+CameraTargetEntity 
+_0807EDD4 0x0068, 0x0380
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+Call sub_0807DF50
+Wait 0x000c
+CameraTargetPlayer 
+Wait 0x0008
+_0807E878 
+CheckLocalFlag 0x001d
+JumpIfNot 0xffc6
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B254.inc b/data/scripts/gUnk_0800B254.inc
new file mode 100644
index 00000000..8354b1c8
--- /dev/null
+++ b/data/scripts/gUnk_0800B254.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800B254
+StartScript 
+CheckKinstoneFused 0x0006
+JumpIf 0x00a6
+_0807EA88 0x0006
+_0807EB44 0x0002
+StopScript 
+_0807EA4C 
+_0807E9F0 
+_0807E864 
+CheckKinstoneFused 0x0006
+JumpIf 0x006e
+Call sub_0807DF50
+_0807E878 
+Jump 0xffe8
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B284.inc b/data/scripts/gUnk_0800B284.inc
new file mode 100644
index 00000000..9b1da0f5
--- /dev/null
+++ b/data/scripts/gUnk_0800B284.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800B284
+StartScript 
+CheckKinstoneFused 0x0007
+JumpIf 0x0076
+_0807EA88 0x0007
+_0807EB44 0x0002
+StopScript 
+_0807EA4C 
+_0807E9F0 
+_0807E864 
+CheckKinstoneFused 0x0007
+JumpIf 0x003e
+Call sub_0807DF50
+_0807E878 
+Jump 0xffe8
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B2B4.inc b/data/scripts/gUnk_0800B2B4.inc
new file mode 100644
index 00000000..c149985a
--- /dev/null
+++ b/data/scripts/gUnk_0800B2B4.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_0800B2B4
+StartScript 
+CheckKinstoneFused 0x0008
+JumpIf 0x0046
+_0807EA88 0x0008
+_0807EB44 0x0002
+StopScript 
+_0807EA4C 
+_0807E9F0 
+_0807E864 
+CheckKinstoneFused 0x0008
+JumpIf 0x000e
+Call sub_0807DF50
+_0807E878 
+Jump 0xffe8
+_0807EF80 0x0013
+_0807EB44 0x0004
+_0807E9DC 
+Call sub_080676E0
+Call sub_08067534
+_0807EF80 0x0012
+_0807E5F8 0x00000001
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B308.inc b/data/scripts/gUnk_0800B308.inc
new file mode 100644
index 00000000..28e72dba
--- /dev/null
+++ b/data/scripts/gUnk_0800B308.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800B308
+StartScript 
+CheckLocalFlag 0x001d
+JumpIf 0x008c
+_0807EF80 0x0001
+SetEntityNonPlanarMovement 0x0040
+SetEntityDirection 0x0010
+.short 0x081d
+.short 0x0006
diff --git a/data/scripts/gUnk_0800B322.inc b/data/scripts/gUnk_0800B322.inc
new file mode 100644
index 00000000..ad122e94
--- /dev/null
+++ b/data/scripts/gUnk_0800B322.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800B322
+JumpIfNot 0x0008
+.byte 0xb
+.byte 0xc
+.byte 0xd9
diff --git a/data/scripts/gUnk_0800B329.inc b/data/scripts/gUnk_0800B329.inc
new file mode 100644
index 00000000..8e545d3b
--- /dev/null
+++ b/data/scripts/gUnk_0800B329.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_0800B329
+.byte 0x76
+.byte 0x6
+.byte 0x8
+.byte 0x1d
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0x76
+.byte 0x6
+.byte 0x8
+.byte 0x1d
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0x76
+.byte 0x6
+.byte 0x8
diff --git a/data/scripts/gUnk_0800B348.inc b/data/scripts/gUnk_0800B348.inc
new file mode 100644
index 00000000..63a72982
--- /dev/null
+++ b/data/scripts/gUnk_0800B348.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800B348
+StopScript 
+Call sub_0806757C
+StopScript 
+WaitForSomething2 0x00000002
+.short 0x087b
+.short 0x00fd
diff --git a/data/scripts/gUnk_0800B35C.inc b/data/scripts/gUnk_0800B35C.inc
new file mode 100644
index 00000000..eef552e6
--- /dev/null
+++ b/data/scripts/gUnk_0800B35C.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800B35C
+Call sub_080676D8
+Call sub_0806757C
+Call sub_080675D4
+Wait 0x0014
+StartScript 
diff --git a/data/scripts/gUnk_0800B374.inc b/data/scripts/gUnk_0800B374.inc
new file mode 100644
index 00000000..aab431ab
--- /dev/null
+++ b/data/scripts/gUnk_0800B374.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800B374
+_0807E5F8 0x00000001
+CheckKinstoneFused 0x0006
+JumpIfNot 0xffd0
+CheckKinstoneFused 0x0007
+JumpIfNot 0xffc8
+CheckKinstoneFused 0x0008
+JumpIfNot 0xffc0
+StopScript 
+SetLocalFlag 0x001d
+SoundReq 0x0072
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc
new file mode 100644
index 00000000..cfb8bc0b
--- /dev/null
+++ b/data/scripts/gUnk_0800B3A4.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800B3A4
+StartScript 
+_0807EF80 0x000a
+Call sub_0807F158
+SetEntityNonPlanarMovement 0x0120
+_0807EB44 0x0004
+_0807E908 0x0002
+_0807E914 0x0000200a
+StopScript 
+_0807EDD4 0x0158, 0x0290
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+_0807EDD4 0x0128, 0x0290
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+.byte 0xb
+.byte 0xc
+.byte 0x81
diff --git a/data/scripts/gUnk_0800B40F.inc b/data/scripts/gUnk_0800B40F.inc
new file mode 100644
index 00000000..b71aa529
--- /dev/null
+++ b/data/scripts/gUnk_0800B40F.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800B40F
+.byte 0x57
+.byte 0x6
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0x81
+.byte 0x57
+.byte 0x6
+.byte 0x8
+.byte 0x3
+.byte 0x8
+.byte 0xaa
+.byte 0xff
diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc
new file mode 100644
index 00000000..394408ff
--- /dev/null
+++ b/data/scripts/gUnk_0800B41C.inc
@@ -0,0 +1,36 @@
+SCRIPT_START gUnk_0800B41C
+StartScript 
+SetEntityNonPlanarMovement 0x00c0
+_0807E908 0x0001
+_0807EF80 0x000b
+_0807E864 
+Call sub_0807FBC4
+StopScript 
+Wait 0x000a
+_0807EF80 0x0004
+_0807E5F8 0x00000008
+StartPlayerScript 0x0800b54c
+_0807EDD4 0x0140, 0x0298
+_0807EB74 
+WaitForSomething2 0x00000004
+_0807EB74 
+Wait 0x003c
+SoundReq 0x00cd
+_0807F088 0x0037
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlapFollow 0x200c
+_0807EA94 
+Wait 0x0014
+_0807EDD4 0x0158, 0x0290
+Wait 0x000a
+_0807EDD4 0x0158, 0x0288
+Wait 0x0014
+_0807E5F8 0x00000010
+_0807EDD4 0x0158, 0x0280
+Wait 0x000a
+_0807EF80 0x0008
+_0807E5F8 0x00000010
+_0807E5F8 0x00000008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B4AC.inc b/data/scripts/gUnk_0800B4AC.inc
new file mode 100644
index 00000000..5ebfe39b
--- /dev/null
+++ b/data/scripts/gUnk_0800B4AC.inc
@@ -0,0 +1,29 @@
+SCRIPT_START gUnk_0800B4AC
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0001
+SetEntityNonPlanarMovement 0x00c0
+_0807E9D4 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x0010
+TestBit 0x00000008
+JumpIf 0x0022
+Jump 0xffea
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlapFollow 0x200b
+StopScript 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffce
+StopScript 
+_0807E610 0x00000008
+_0807EDD4 0x0134, 0x0288
+_0807EB44 0x0004
+.short 0x0c33
+.short 0x0008
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B508.inc b/data/scripts/gUnk_0800B508.inc
new file mode 100644
index 00000000..30af8b50
--- /dev/null
+++ b/data/scripts/gUnk_0800B508.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800B508
+TextboxNoOverlapFollow 0x2016
+_0807EA94 
+.byte 0x73
diff --git a/data/scripts/gUnk_0800B50F.inc b/data/scripts/gUnk_0800B50F.inc
new file mode 100644
index 00000000..956ec942
--- /dev/null
+++ b/data/scripts/gUnk_0800B50F.inc
@@ -0,0 +1,62 @@
+SCRIPT_START gUnk_0800B50F
+.byte 0xc
+.byte 0x58
+.byte 0x1
+.byte 0x88
+.byte 0x2
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x2d
+.byte 0x8
+.byte 0x1d
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x1d
+.byte 0x92
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xcd
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800B54C.inc b/data/scripts/gUnk_0800B54C.inc
new file mode 100644
index 00000000..2df8c531
--- /dev/null
+++ b/data/scripts/gUnk_0800B54C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800B54C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0128, 0x0298
+Wait 0x000a
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B574.inc b/data/scripts/gUnk_0800B574.inc
new file mode 100644
index 00000000..c63c2a13
--- /dev/null
+++ b/data/scripts/gUnk_0800B574.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800B574
+StartScript 
+_0807EF80 0x0007
+CheckGlobalFlag 0x001d
+JumpIf 0x003c
+StopScript 
+WaitForSomething2 0x00000010
+_0807EF80 0x0008
+SoundReq 0x0111
+WaitForSomething2 0x00000010
+_0807EF80 0x0007
+SoundReq 0x0111
+WaitForSomething2 0x00000010
+_0807EF80 0x0008
+SoundReq 0x0111
+WaitForSomething2 0x00000010
+_0807EF80 0x0007
+SoundReq 0x0111
+Call sub_0808692C
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B5C4.inc b/data/scripts/gUnk_0800B5C4.inc
new file mode 100644
index 00000000..e834cb3c
--- /dev/null
+++ b/data/scripts/gUnk_0800B5C4.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800B5C4
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0004
+StopScript 
+Wait 0x001e
+SoundReq 0x00d1
+_0807EDD4 0x008a, 0x005a
+Wait 0x000a
+Call sub_08069EE8
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc
new file mode 100644
index 00000000..fbbd3b35
--- /dev/null
+++ b/data/scripts/gUnk_0800B5EC.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800B5EC
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0001
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2009
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_0800B614.inc b/data/scripts/gUnk_0800B614.inc
new file mode 100644
index 00000000..5a4caed2
--- /dev/null
+++ b/data/scripts/gUnk_0800B614.inc
@@ -0,0 +1,47 @@
+SCRIPT_START gUnk_0800B614
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
+JumpIfNot 0xfff6
+Call sub_08079184
+_0807E864 
+Call sub_0807F9A4
+StartPlayerScript 0x0800b7c4
+WaitForSomething2 0x00000004
+SetRoomFlag 0x0000
+WaitForSomething2 0x00000004
+CheckLocalFlag 0x009e
+JumpIf 0x0154
+TextboxNoOverlap 0x0583
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x002a
+Wait 0x000f
+TextboxNoOverlap 0x0584
+CallWithArg sub_0807F970, 0x0000058b
+JumpIf 0x001e
+CallWithArg sub_08087424, 0x00000000
+Wait 0x00b4
+Jump 0x0024
+TextboxNoOverlap 0x057d
+_0807EA94 
+Jump 0x001a
+_0807EA94 
+SetLocalFlag 0x009e
+_0807F034 0x0066
+WaitPlayerAction8 
+_0807EB8C 
+Wait 0x001e
+TextboxNoOverlap 0x057f
+_0807EA94 
+_0807E778 0x0004
+DoFade7 
+WaitFor_2 
+Call sub_080873FC
+DoFade6 
+WaitFor_2 
+CameraTargetPlayer 
+Wait 0x001e
+Call sub_0807DF50
+_0807E878 
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc
new file mode 100644
index 00000000..4959b7fa
--- /dev/null
+++ b/data/scripts/gUnk_0800B6C8.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800B6C8
+StartScript 
+StopScript 
+HasRupees 0x0001
+JumpIfNot 0xfffa
+CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
+JumpIfNot 0xfff6
+Call sub_08079184
+_0807E864 
+Call sub_0807F9A4
+StartPlayerScript 0x0800b7c4
+WaitForSomething2 0x00000004
+SetRoomFlag 0x0000
+WaitForSomething2 0x00000004
+.short 0x0812
+.short 0x009f
diff --git a/data/scripts/gUnk_0800B708.inc b/data/scripts/gUnk_0800B708.inc
new file mode 100644
index 00000000..f1eed151
--- /dev/null
+++ b/data/scripts/gUnk_0800B708.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800B708
+JumpIf 0x0098
+TextboxNoOverlap 0x057b
+_0807EA94 
+CallWithArg sub_0807F970, 0x0000057d
+.byte 0x4
+.byte 0x8
+.byte 0x88
diff --git a/data/scripts/gUnk_0800B71F.inc b/data/scripts/gUnk_0800B71F.inc
new file mode 100644
index 00000000..1a53d93b
--- /dev/null
+++ b/data/scripts/gUnk_0800B71F.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800B71F
+.byte 0xff
+.byte 0x59
+.byte 0x4
+.byte 0x2a
+.byte 0x8
+.byte 0x9f
+.byte 0x0
+.byte 0x82
+.byte 0x8
+.byte 0x64
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x6c
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800B730.inc b/data/scripts/gUnk_0800B730.inc
new file mode 100644
index 00000000..8455f72a
--- /dev/null
+++ b/data/scripts/gUnk_0800B730.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_0800B730
+StartScript 
+StopScript 
+Call sub_0808747C
+JumpIfNot 0xfff8
+Call sub_08079184
+_0807E864 
+Wait 0x000a
+Call sub_0807F9A4
+StartPlayerScript 0x0800b7c4
+WaitForSomething2 0x00000004
+SetRoomFlag 0x0000
+WaitForSomething2 0x00000004
+CheckLocalFlag 0x00a0
+JumpIf 0x0036
+TextboxNoOverlap 0x0580
+_0807EA94 
+CallWithArg sub_0807F970, 0x00000582
+JumpIf 0x0014
+CallWithArg sub_08087424, 0x00000001
+Wait 0x00b4
+Jump 0xff14
+_0807EA94 
+SetLocalFlag 0x00a0
+_0807F034 0x0065
+Jump 0xfef8
+TextboxNoOverlap 0x0590
+_0807EA94 
+_0807E778 0x0010
+DoFade7 
+WaitFor_2 
+ModHealth 0x00a0
+DoFade6 
+WaitFor_2 
+TextboxNoOverlap 0x057f
+_0807EA94 
+Jump 0xfee6
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc
new file mode 100644
index 00000000..577b81e0
--- /dev/null
+++ b/data/scripts/gUnk_0800B7C4.inc
@@ -0,0 +1,95 @@
+SCRIPT_START gUnk_0800B7C4
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+CallWithArg sub_0807F6B4, 0x00000090
+JumpIfNot 0x0024
+CallWithArg sub_0807F464, 0x00000078
+CallWithArg sub_0807F4F8, 0x00000090
+_0807E8E4_0 
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+SCRIPT_END
+.byte 0xc
+.byte 0x14
+.byte 0xf9
+.byte 0xf4
+.byte 0x7
+.byte 0x8
+.byte 0x90
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x65
+.byte 0xf4
+.byte 0x7
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xdc
+.byte 0xff
+.byte 0x1
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x53
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x51
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x1
+.byte 0xa
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xee
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x53
diff --git a/data/scripts/gUnk_0800B84F.inc b/data/scripts/gUnk_0800B84F.inc
new file mode 100644
index 00000000..88b7b333
--- /dev/null
+++ b/data/scripts/gUnk_0800B84F.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800B84F
+.short 0x6104
+.short 0x0408
+.short 0x7900
+.short 0x0008
+.short 0x7900
+.short 0x0a08
+.short 0x0200
+.short 0x3104
+.short 0x3c08
diff --git a/data/scripts/gUnk_0800B861.inc b/data/scripts/gUnk_0800B861.inc
new file mode 100644
index 00000000..e39093e6
--- /dev/null
+++ b/data/scripts/gUnk_0800B861.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800B861
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0x46
+.byte 0x6
+.byte 0x8
+.byte 0x3
+.byte 0x8
+.byte 0xf4
+.byte 0xff
+.byte 0x1
+.byte 0x4
+.byte 0x53
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x7d
+.byte 0x40
+.byte 0x6
+.byte 0x8
diff --git a/data/scripts/gUnk_0800B888.inc b/data/scripts/gUnk_0800B888.inc
new file mode 100644
index 00000000..cfa4f625
--- /dev/null
+++ b/data/scripts/gUnk_0800B888.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800B888
+Jump 0xfff4
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
diff --git a/data/scripts/gUnk_0800B8A0.inc b/data/scripts/gUnk_0800B8A0.inc
new file mode 100644
index 00000000..20de8560
--- /dev/null
+++ b/data/scripts/gUnk_0800B8A0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800B8A0
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_0800B8B8.inc b/data/scripts/gUnk_0800B8B8.inc
new file mode 100644
index 00000000..83c890d6
--- /dev/null
+++ b/data/scripts/gUnk_0800B8B8.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800B8B8
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+CallWithArg sub_08064644, 0x0806464d
+StopScript 
+Wait 0x003c
+Call sub_080646A4
+Jump 0xfff4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B8E4.inc b/data/scripts/gUnk_0800B8E4.inc
new file mode 100644
index 00000000..f9072d93
--- /dev/null
+++ b/data/scripts/gUnk_0800B8E4.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800B8E4
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call sub_08061FD8
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
diff --git a/data/scripts/gUnk_0800B906.inc b/data/scripts/gUnk_0800B906.inc
new file mode 100644
index 00000000..c33d8c11
--- /dev/null
+++ b/data/scripts/gUnk_0800B906.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800B906
+Call sub_08061FD8
+Call sub_08062048
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B91C.inc b/data/scripts/gUnk_0800B91C.inc
new file mode 100644
index 00000000..9f8a5c8b
--- /dev/null
+++ b/data/scripts/gUnk_0800B91C.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0800B91C
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+CheckLocalFlag 0x005f
+JumpIf 0x001c
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x3f19
+_0807EA94 
+SetLocalFlag 0x005f
+_0807E878 
+Jump 0xffe8
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x3f1a
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffec
diff --git a/data/scripts/gUnk_0800B964.inc b/data/scripts/gUnk_0800B964.inc
new file mode 100644
index 00000000..50ab5cd7
--- /dev/null
+++ b/data/scripts/gUnk_0800B964.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_0800B964
+StartScript 
+_0807EF80 0x000b
+_0807EF80 0x0008
+Call sub_0806DAAC
+JumpIf 0x0036
+Call sub_0806DAD0
+CallWithArg sub_0806DA04, 0x00000005
+StopScript 
+_0807EA4C 
+_0807E9F0 
+JumpIf 0x000e
+Call sub_0807DF50
+_0807E878 
+Jump 0xffee
+Call sub_0806F188
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc
new file mode 100644
index 00000000..7813aa0b
--- /dev/null
+++ b/data/scripts/gUnk_0800B9B4.inc
@@ -0,0 +1,62 @@
+SCRIPT_START gUnk_0800B9B4
+StartScript 
+_0807E9D4 
+Call sub_080694EC
+_0807EF80 0x000a
+Call sub_080694B0
+StopScript 
+Call sub_0807F434
+.short 0x1006
+.short 0xfff8
+.short 0x0004
+.short 0x001e
+.short 0x0443
+.short 0x0463
+.short 0x0879
+.short 0x0000
+.short 0x0c0b
+.short 0x94d9
+.short 0x0806
+.short 0x0459
+.short 0x0c0b
+.short 0x94ed
+.short 0x0806
+.short 0x0444
+.short 0x0803
+.short 0xffd8
+.short 0x0443
+.short 0x0463
+.short 0x0879
+.short 0x0000
+.short 0x0c0b
+.short 0xf651
+.short 0x0807
+.short 0x0456
+.short 0x0443
+.short 0x0c0b
+.short 0x948d
+.short 0x0806
+.short 0x0804
+.short 0x0016
+.short 0x0459
+.short 0x0c0b
+.short 0x94ed
+.short 0x0806
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0803
+.short 0xffa8
+.short 0x0459
+.short 0x0454
+.short 0x0453
+.short 0x0c0b
+.short 0x94ed
+.short 0x0806
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0803
+.short 0xff90
diff --git a/data/scripts/gUnk_0800BA3C.inc b/data/scripts/gUnk_0800BA3C.inc
new file mode 100644
index 00000000..706dbff6
--- /dev/null
+++ b/data/scripts/gUnk_0800BA3C.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800BA3C
+StartScript 
+Call sub_0807F934
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+TextboxNoOverlapFollow 0x3301
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x000e
+SoundReq0x80100000 
+Call sub_0806E964
+SoundReq2 0xffff
+Call sub_0807DF50
+_0807E878 
+.short 0x0803
+.short 0xffd0
diff --git a/data/scripts/gUnk_0800BA78.inc b/data/scripts/gUnk_0800BA78.inc
new file mode 100644
index 00000000..a1b5cda4
--- /dev/null
+++ b/data/scripts/gUnk_0800BA78.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800BA78
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0040
+Call sub_0807F348
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EDD4 0x02f8, 0x0350
+Wait 0x001e
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0006
+Wait 0x001e
+_0807EDD4 0x02f0, 0x0350
+Wait 0x001e
+TextboxNoOverlap 0x0e00
+_0807EA94 
+Wait 0x0078
+Call sub_08054968
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BACC.inc b/data/scripts/gUnk_0800BACC.inc
new file mode 100644
index 00000000..6272a549
--- /dev/null
+++ b/data/scripts/gUnk_0800BACC.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800BACC
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call sub_0807F348
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e01
+_0807EA94 
+Wait 0x0078
+Call sub_08054968
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB00.inc b/data/scripts/gUnk_0800BB00.inc
new file mode 100644
index 00000000..2adf9e53
--- /dev/null
+++ b/data/scripts/gUnk_0800BB00.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800BB00
+StartScript 
+StopScript 
+.short 0x0815
+.short 0x00ff
diff --git a/data/scripts/gUnk_0800BB08.inc b/data/scripts/gUnk_0800BB08.inc
new file mode 100644
index 00000000..6a6a69ba
--- /dev/null
+++ b/data/scripts/gUnk_0800BB08.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800BB08
+JumpIfNot 0xfffa
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e02
+_0807EA94 
diff --git a/data/scripts/gUnk_0800BB1A.inc b/data/scripts/gUnk_0800BB1A.inc
new file mode 100644
index 00000000..df3681ff
--- /dev/null
+++ b/data/scripts/gUnk_0800BB1A.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800BB1A
+Wait 0x003c
+_0807EF80 0x000f
+Wait 0x00b4
+Call sub_08054968
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BB30.inc b/data/scripts/gUnk_0800BB30.inc
new file mode 100644
index 00000000..75b33cd3
--- /dev/null
+++ b/data/scripts/gUnk_0800BB30.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800BB30
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call sub_0807F348
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e05
+_0807EA94 
+Wait 0x0078
+Call sub_08054968
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB64.inc b/data/scripts/gUnk_0800BB64.inc
new file mode 100644
index 00000000..c2c7ed3d
--- /dev/null
+++ b/data/scripts/gUnk_0800BB64.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800BB64
+StartScript 
+_0807EB44 0x0006
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0040
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800BB74.inc b/data/scripts/gUnk_0800BB74.inc
new file mode 100644
index 00000000..5c978df5
--- /dev/null
+++ b/data/scripts/gUnk_0800BB74.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_0800BB74
+.short 0xf349
+.short 0x0807
+.short 0x0402
+.short 0x0815
+.short 0x00ff
+.short 0x0805
+.short 0xfffa
+.short 0x0c73
+.short 0x03a0
+.short 0x00f8
+.short 0x0831
+.short 0x001e
+.short 0x085b
+.short 0x0e06
+.short 0x0459
+.short 0x0831
+.short 0x000f
+.short 0x0c73
+.short 0x0380
+.short 0x00f8
+.short 0x0c0b
+.short 0x4969
+.short 0x0805
+.short 0xffff
diff --git a/data/scripts/gUnk_0800BBA4.inc b/data/scripts/gUnk_0800BBA4.inc
new file mode 100644
index 00000000..d482264a
--- /dev/null
+++ b/data/scripts/gUnk_0800BBA4.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800BBA4
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call sub_0807F348
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e04
+_0807EA94 
+Wait 0x0078
+Call sub_08054968
+.byte 0xff
diff --git a/data/scripts/gUnk_0800BBDB.inc b/data/scripts/gUnk_0800BBDB.inc
new file mode 100644
index 00000000..24df52e9
--- /dev/null
+++ b/data/scripts/gUnk_0800BBDB.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800BBDB
+.byte 0xff
diff --git a/data/scripts/gUnk_0800BBDC.inc b/data/scripts/gUnk_0800BBDC.inc
new file mode 100644
index 00000000..1ddfba44
--- /dev/null
+++ b/data/scripts/gUnk_0800BBDC.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800BBDC
+StartScript 
+_0807E930 0x0000
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e03
+_0807EA94 
+Wait 0x0078
+Call sub_08054968
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BC08.inc b/data/scripts/gUnk_0800BC08.inc
new file mode 100644
index 00000000..eb93a51d
--- /dev/null
+++ b/data/scripts/gUnk_0800BC08.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800BC08
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+.short 0x0879
diff --git a/data/scripts/gUnk_0800BC22.inc b/data/scripts/gUnk_0800BC22.inc
new file mode 100644
index 00000000..04efcba5
--- /dev/null
+++ b/data/scripts/gUnk_0800BC22.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800BC22
+.short 0x0004
+.short 0x0831
+.short 0x003c
+.short 0x085b
+.short 0x0e07
+.short 0x0459
+.short 0x0401
+.short 0x0861
+.short 0x0000
+.short 0x0850
+.short 0x0004
+.short 0x0402
+.short 0x0831
+.short 0x003c
+.short 0x0c0b
+.short 0x5ccd
+.short 0x0806
+.short 0x0831
+.short 0x0078
+.short 0x0c0b
+.short 0x4969
+.short 0x0805
+.short 0xffff
diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc
new file mode 100644
index 00000000..d6604a70
--- /dev/null
+++ b/data/scripts/gUnk_0800BC50.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800BC50
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_08054EB8
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E930 0x0000
+Wait 0x001e
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e08
+_0807EA94 
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+Call sub_08054EFC
+_0807EB44 0x0000
+_0807E930 0x0000
+SetEntityNonPlanarMovement 0x0040
+_0807EF80 0x000d
+CallWithArg sub_0807F4F8, 0x00000378
+.short 0x0831
diff --git a/data/scripts/gUnk_0800BCAE.inc b/data/scripts/gUnk_0800BCAE.inc
new file mode 100644
index 00000000..24fa0f31
--- /dev/null
+++ b/data/scripts/gUnk_0800BCAE.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800BCAE
+.byte 0x3c
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xc
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
diff --git a/data/scripts/gUnk_0800BCB7.inc b/data/scripts/gUnk_0800BCB7.inc
new file mode 100644
index 00000000..2b8b3603
--- /dev/null
+++ b/data/scripts/gUnk_0800BCB7.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800BCB7
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x9
+.byte 0xe
+.byte 0x59
+.byte 0x4
diff --git a/data/scripts/gUnk_0800BCBE.inc b/data/scripts/gUnk_0800BCBE.inc
new file mode 100644
index 00000000..7e9644b6
--- /dev/null
+++ b/data/scripts/gUnk_0800BCBE.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800BCBE
+Call sub_0807F158
+CallWithArg sub_0807F4F8, 0x0000035c
+Wait 0x001e
+SoundReq 0x0188
+_0807EF80 0x0008
+Wait 0x0078
+Call sub_08054968
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BCE8.inc b/data/scripts/gUnk_0800BCE8.inc
new file mode 100644
index 00000000..821120f8
--- /dev/null
+++ b/data/scripts/gUnk_0800BCE8.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800BCE8
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+.short 0x0831
+.short 0x003c
diff --git a/data/scripts/gUnk_0800BD08.inc b/data/scripts/gUnk_0800BD08.inc
new file mode 100644
index 00000000..c7002b4d
--- /dev/null
+++ b/data/scripts/gUnk_0800BD08.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0800BD08
+TextboxNoOverlap 0x0e0a
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e0c
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x0168
+_0807E930 0x0000
+Wait 0x003c
+_0807EB44 0x0002
+WaitForSomething2 0x00000004
+.short 0x0867
+.short 0x0080
diff --git a/data/scripts/gUnk_0800BD70.inc b/data/scripts/gUnk_0800BD70.inc
new file mode 100644
index 00000000..b78fa5cf
--- /dev/null
+++ b/data/scripts/gUnk_0800BD70.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800BD70
+_0807EEF4 0x0000, 0xffe0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc
new file mode 100644
index 00000000..5b8a2b22
--- /dev/null
+++ b/data/scripts/gUnk_0800BD78.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800BD78
+StartScript 
+_0807EB44 0x0000
+_0807E930 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+Call sub_0807F348
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0007
+CallWithArg sub_0807F4F8, 0x00000270
+Wait 0x001e
+.short 0x085b
diff --git a/data/scripts/gUnk_0800BDAC.inc b/data/scripts/gUnk_0800BDAC.inc
new file mode 100644
index 00000000..f534b72d
--- /dev/null
+++ b/data/scripts/gUnk_0800BDAC.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800BDAC
+.short 0x0e0b
+.short 0x0459
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0867
+.short 0x0100
+.short 0x0c73
+.short 0x0088
diff --git a/data/scripts/gUnk_0800BDC4.inc b/data/scripts/gUnk_0800BDC4.inc
new file mode 100644
index 00000000..067ea5bb
--- /dev/null
+++ b/data/scripts/gUnk_0800BDC4.inc
@@ -0,0 +1,45 @@
+SCRIPT_START gUnk_0800BDC4
+.short 0x0228
+.short 0x0831
+.short 0x000f
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0879
+.short 0x000f
+.short 0x0850
+.short 0x0008
+.short 0x0831
+.short 0x00b4
+.short 0x140c
+.short 0xbf39
+.short 0x0804
+.short 0x0000
+.short 0x0000
+.short 0x0831
+.short 0x00b4
+.short 0x140c
+.short 0xbf39
+.short 0x0804
+.short 0x0003
+.short 0x0000
+.short 0x0861
+.short 0x0004
+.short 0x0850
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x0861
+.short 0x0006
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0867
+.short 0x0080
+.short 0x0c77
+.short 0x0000
+.short 0xffe0
+.short 0x0c0b
+.short 0x4969
+.short 0x0805
+.short 0xffff
diff --git a/data/scripts/gUnk_0800BE1C.inc b/data/scripts/gUnk_0800BE1C.inc
new file mode 100644
index 00000000..6b2b425d
--- /dev/null
+++ b/data/scripts/gUnk_0800BE1C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800BE1C
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0002
+Wait 0x003c
+TextboxNoOverlap 0x0e0d
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+Jump 0x0038
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BE54.inc b/data/scripts/gUnk_0800BE54.inc
new file mode 100644
index 00000000..42dc4998
--- /dev/null
+++ b/data/scripts/gUnk_0800BE54.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800BE54
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call sub_08054F64
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e0f
+_0807EA94 
+_0807E5F8 0x00000002
+Call sub_08054F64
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc
new file mode 100644
index 00000000..28a6b12a
--- /dev/null
+++ b/data/scripts/gUnk_0800BECC.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800BECC
+StartScript 
+_0807EB44 0x0000
+_0807E930 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+Call sub_0807F348
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0007
+CallWithArg sub_0807F4F8, 0x000001b8
+Wait 0x001e
+TextboxNoOverlap 0x0e0e
+_0807EA94 
+_0807E5F8 0x0000000c
+WaitForSomething2 0x00000002
+.short 0x0867
+.short 0x0100
diff --git a/data/scripts/gUnk_0800BF14.inc b/data/scripts/gUnk_0800BF14.inc
new file mode 100644
index 00000000..5b723169
--- /dev/null
+++ b/data/scripts/gUnk_0800BF14.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800BF14
+_0807EDD4 0x0088, 0x0178
+Wait 0x000f
+_0807E5F8 0x0000000c
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+Call sub_08054968
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BF38.inc b/data/scripts/gUnk_0800BF38.inc
new file mode 100644
index 00000000..e303ed9b
--- /dev/null
+++ b/data/scripts/gUnk_0800BF38.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800BF38
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
diff --git a/data/scripts/gUnk_0800BF4A.inc b/data/scripts/gUnk_0800BF4A.inc
new file mode 100644
index 00000000..ddf24f2c
--- /dev/null
+++ b/data/scripts/gUnk_0800BF4A.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800BF4A
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0002
+Wait 0x003c
+TextboxNoOverlap 0x0e10
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+Jump 0x0038
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BF70.inc b/data/scripts/gUnk_0800BF70.inc
new file mode 100644
index 00000000..408ef7b0
--- /dev/null
+++ b/data/scripts/gUnk_0800BF70.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_0800BF70
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call sub_08054F64
+.byte 0x50
+.byte 0x8
+.byte 0x0
diff --git a/data/scripts/gUnk_0800BFBF.inc b/data/scripts/gUnk_0800BFBF.inc
new file mode 100644
index 00000000..a8c6bbcc
--- /dev/null
+++ b/data/scripts/gUnk_0800BFBF.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800BFBF
+.short 0x7900
+.short 0x0408
+.short 0x3100
+.short 0x3c08
+.short 0x5b00
+.short 0x1208
+.short 0x590e
+.short 0x2804
+.short 0x020c
+.short 0x0000
+.short 0x0b00
+.short 0x650c
+.short 0x054f
+.short 0x7908
+.short 0x0f08
+.short 0x5000
+.short 0x0808
diff --git a/data/scripts/gUnk_0800BFE1.inc b/data/scripts/gUnk_0800BFE1.inc
new file mode 100644
index 00000000..2d042c6e
--- /dev/null
+++ b/data/scripts/gUnk_0800BFE1.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800BFE1
+.short 0x3100
diff --git a/data/scripts/gUnk_0800BFE3.inc b/data/scripts/gUnk_0800BFE3.inc
new file mode 100644
index 00000000..b017f9dc
--- /dev/null
+++ b/data/scripts/gUnk_0800BFE3.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_0800BFE3
+.byte 0x8
+.byte 0x68
+.byte 0x1
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x65
+.byte 0x4f
+.byte 0x5
+.byte 0x8
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xe0
+.byte 0xff
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc
new file mode 100644
index 00000000..5dec75b5
--- /dev/null
+++ b/data/scripts/gUnk_0800C004.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800C004
+StartScript 
+.byte 0x61
diff --git a/data/scripts/gUnk_0800C007.inc b/data/scripts/gUnk_0800C007.inc
new file mode 100644
index 00000000..93a41138
--- /dev/null
+++ b/data/scripts/gUnk_0800C007.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800C007
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x49
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800C024.inc b/data/scripts/gUnk_0800C024.inc
new file mode 100644
index 00000000..bd53a68a
--- /dev/null
+++ b/data/scripts/gUnk_0800C024.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800C024
+_0807EF80 0x0007
+CallWithArg sub_0807F4F8, 0x000001b8
+Wait 0x001e
+TextboxNoOverlap 0x0e11
+_0807EA94 
+_0807E5F8 0x0000001c
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0088, 0x0188
+_0807EDD4 0x00a8, 0x0188
+_0807EDD4 0x00a8, 0x0178
+Wait 0x000f
+_0807E5F8 0x0000001c
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00b4
+.byte 0xc
+.byte 0x14
+.byte 0x39
+.byte 0xbf
+.byte 0x4
+.byte 0x8
+.byte 0x1
diff --git a/data/scripts/gUnk_0800C07B.inc b/data/scripts/gUnk_0800C07B.inc
new file mode 100644
index 00000000..a4a862a0
--- /dev/null
+++ b/data/scripts/gUnk_0800C07B.inc
@@ -0,0 +1,54 @@
+SCRIPT_START gUnk_0800C07B
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xb4
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x39
+.byte 0xbf
+.byte 0x4
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1c
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xe0
+.byte 0xff
+.byte 0xb
+.byte 0xc
+.byte 0x69
+.byte 0x49
+.byte 0x5
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800C0B0.inc b/data/scripts/gUnk_0800C0B0.inc
new file mode 100644
index 00000000..15a249fa
--- /dev/null
+++ b/data/scripts/gUnk_0800C0B0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800C0B0
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+.byte 0x31
+.byte 0x8
+.byte 0xf0
diff --git a/data/scripts/gUnk_0800C0C7.inc b/data/scripts/gUnk_0800C0C7.inc
new file mode 100644
index 00000000..e61e836e
--- /dev/null
+++ b/data/scripts/gUnk_0800C0C7.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800C0C7
+.short 0x5000
+.short 0x0008
+.short 0x6100
+.short 0x0208
+.short 0x3100
+.short 0x3c08
diff --git a/data/scripts/gUnk_0800C0D3.inc b/data/scripts/gUnk_0800C0D3.inc
new file mode 100644
index 00000000..618999db
--- /dev/null
+++ b/data/scripts/gUnk_0800C0D3.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800C0D3
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x13
+.byte 0xe
+.byte 0x59
+.byte 0x4
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x38
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800C0E8.inc b/data/scripts/gUnk_0800C0E8.inc
new file mode 100644
index 00000000..3a9d782b
--- /dev/null
+++ b/data/scripts/gUnk_0800C0E8.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800C0E8
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+.byte 0x31
diff --git a/data/scripts/gUnk_0800C113.inc b/data/scripts/gUnk_0800C113.inc
new file mode 100644
index 00000000..84c4b088
--- /dev/null
+++ b/data/scripts/gUnk_0800C113.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_0800C113
+.short 0x3c08
+.short 0x2800
+.short 0x010c
+.short 0x0000
+.short 0x6100
+.short 0x0408
+.short 0x1500
+.short 0xff08
+.short 0x0500
+.short 0xfa08
+.short 0x28ff
+.short 0x020c
+.short 0x0000
+.short 0x0b00
+.short 0x650c
+.short 0x054f
+.short 0x5008
+.short 0x0008
+.short 0x7900
+.short 0x0408
+.short 0x3100
+.short 0x3c08
+.short 0x5b00
+.short 0x1508
+.short 0x590e
+.short 0x2804
diff --git a/data/scripts/gUnk_0800C147.inc b/data/scripts/gUnk_0800C147.inc
new file mode 100644
index 00000000..b0009dae
--- /dev/null
+++ b/data/scripts/gUnk_0800C147.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0800C147
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x65
+.byte 0x4f
+.byte 0x5
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf0
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc
new file mode 100644
index 00000000..640e28e1
--- /dev/null
+++ b/data/scripts/gUnk_0800C160.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_0800C160
+StartScript 
+_0807EB44 0x0000
+_0807E930 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+Call sub_0807F348
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0007
+CallWithArg sub_0807F4F8, 0x00000128
+Wait 0x001e
+TextboxNoOverlap 0x0e14
+_0807EA94 
+_0807E5F8 0x0000003c
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0098, 0x00e8
+_0807EDD4 0x00a8, 0x00e8
+_0807EDD4 0x00a8, 0x00d8
+Wait 0x000f
+_0807E5F8 0x0000003c
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+Call sub_08054968
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C1D8.inc b/data/scripts/gUnk_0800C1D8.inc
new file mode 100644
index 00000000..e1cfa5ce
--- /dev/null
+++ b/data/scripts/gUnk_0800C1D8.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800C1D8
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0002
+Wait 0x003c
+TextboxNoOverlap 0x0e16
+_0807EA94 
+.short 0x0850
diff --git a/data/scripts/gUnk_0800C204.inc b/data/scripts/gUnk_0800C204.inc
new file mode 100644
index 00000000..09738cda
--- /dev/null
+++ b/data/scripts/gUnk_0800C204.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800C204
+.byte 0x8
+.byte 0x0
+.byte 0x31
diff --git a/data/scripts/gUnk_0800C207.inc b/data/scripts/gUnk_0800C207.inc
new file mode 100644
index 00000000..a5784088
--- /dev/null
+++ b/data/scripts/gUnk_0800C207.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800C207
+.byte 0x8
diff --git a/data/scripts/gUnk_0800C208.inc b/data/scripts/gUnk_0800C208.inc
new file mode 100644
index 00000000..8ee04842
--- /dev/null
+++ b/data/scripts/gUnk_0800C208.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800C208
+.short 0x003c
+.short 0x0803
+.short 0x0038
+.short 0x0000
diff --git a/data/scripts/gUnk_0800C210.inc b/data/scripts/gUnk_0800C210.inc
new file mode 100644
index 00000000..8910ab47
--- /dev/null
+++ b/data/scripts/gUnk_0800C210.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800C210
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0807F348
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call sub_08054F64
+_0807E930 0x0000
+.byte 0x79
+.byte 0x8
+.byte 0x4
diff --git a/data/scripts/gUnk_0800C263.inc b/data/scripts/gUnk_0800C263.inc
new file mode 100644
index 00000000..b240a0a8
--- /dev/null
+++ b/data/scripts/gUnk_0800C263.inc
@@ -0,0 +1,66 @@
+SCRIPT_START gUnk_0800C263
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x18
+.byte 0xe
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x65
+.byte 0x4f
+.byte 0x5
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x68
+.byte 0x1
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x65
+.byte 0x4f
+.byte 0x5
+.byte 0x8
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xe0
+.byte 0xff
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc
new file mode 100644
index 00000000..0b5e3f88
--- /dev/null
+++ b/data/scripts/gUnk_0800C2A4.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800C2A4
+StartScript 
+.byte 0x61
diff --git a/data/scripts/gUnk_0800C2A7.inc b/data/scripts/gUnk_0800C2A7.inc
new file mode 100644
index 00000000..af14966b
--- /dev/null
+++ b/data/scripts/gUnk_0800C2A7.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800C2A7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x49
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0xf9
+.byte 0xf4
+.byte 0x7
+.byte 0x8
diff --git a/data/scripts/gUnk_0800C2CE.inc b/data/scripts/gUnk_0800C2CE.inc
new file mode 100644
index 00000000..e3998876
--- /dev/null
+++ b/data/scripts/gUnk_0800C2CE.inc
@@ -0,0 +1,66 @@
+SCRIPT_START gUnk_0800C2CE
+.short 0x0128
+.short 0x0000
+.short 0x0831
+.short 0x001e
+.short 0x085b
+.short 0x0e17
+.short 0x0459
+.short 0x0c28
+.short 0x007c
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0867
+.short 0x0100
+.short 0x0c73
+.short 0x0098
+.short 0x00e8
+.short 0x0c73
+.short 0x00c8
+.short 0x00e8
+.short 0x0c73
+.short 0x00c8
+.short 0x00d8
+.short 0x0831
+.short 0x000f
+.short 0x0c28
+.short 0x007c
+.short 0x0000
+.short 0x0879
+.short 0x000f
+.short 0x0850
+.short 0x0008
+.short 0x0831
+.short 0x00b4
+.short 0x140c
+.short 0xbf39
+.short 0x0804
+.short 0x0002
+.short 0x0000
+.short 0x0831
+.short 0x00b4
+.short 0x140c
+.short 0xbf39
+.short 0x0804
+.short 0x0005
+.short 0x0000
+.short 0x0861
+.short 0x0004
+.short 0x0850
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x007c
+.short 0x0000
+.short 0x0867
+.short 0x0080
+.short 0x0c77
+.short 0x0000
+.short 0xffe0
+.short 0x0c0b
+.short 0x4969
+.short 0x0805
+.short 0xffff
diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc
new file mode 100644
index 00000000..1e6ef99c
--- /dev/null
+++ b/data/scripts/gUnk_0800C350.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800C350
+StartScript 
+CallWithArg sub_0806D658, 0x00000003
+SetEntityNonPlanarMovement 0x0200
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807F0C8 0xffff, 0x0000
+_0807EEF4 0xfff8, 0x0000
+_0807EEF4 0x0010, 0x0000
+_0807EEF4 0xfff0, 0x0000
+_0807EEF4 0x0010, 0x0000
+_0807EEF4 0xfff8, 0x0000
+_0807F0C8 0x0000, 0x0000
+.short 0x0831
diff --git a/data/scripts/gUnk_0800C396.inc b/data/scripts/gUnk_0800C396.inc
new file mode 100644
index 00000000..7dec0c3d
--- /dev/null
+++ b/data/scripts/gUnk_0800C396.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800C396
+.short 0x001e
+.short 0x085b
+.short 0x1d00
+.short 0x0459
+.short 0x0c28
+.short 0x0006
+.short 0x0000
+.short 0x0c33
+.short 0x0001
+.short 0x0000
+.short 0x0c8a
+.short 0xffff
+.short 0x0000
+.short 0x0867
+.short 0x0080
+.short 0x0c77
+.short 0x0000
+.short 0xff30
+.short 0x0c8a
+.short 0x0000
+.short 0x0000
+.short 0x0831
+.short 0x00b4
+.short 0x0c0b
+.short 0x4969
+.short 0x0805
+.short 0xffff
diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc
new file mode 100644
index 00000000..d87deb67
--- /dev/null
+++ b/data/scripts/gUnk_0800C3CC.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800C3CC
+StartScript 
+Call sub_0806D660
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+WaitForSomething2 0x00000002
+CallWithArg sub_0807F4F8, 0x00000048
+Call sub_0806D66C
+Wait 0x000f
+CallWithArg sub_0807F4F8, 0x00000068
+Call sub_0806D67C
+.short 0x0c8a
+.short 0x001e
diff --git a/data/scripts/gUnk_0800C408.inc b/data/scripts/gUnk_0800C408.inc
new file mode 100644
index 00000000..137a4b9a
--- /dev/null
+++ b/data/scripts/gUnk_0800C408.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800C408
+.short 0x0000
+.short 0x087b
+.short 0x010b
+.short 0xffff
diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc
new file mode 100644
index 00000000..f3ddc136
--- /dev/null
+++ b/data/scripts/gUnk_0800C410.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800C410
+StartScript 
+Call sub_0806D660
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+WaitForSomething2 0x00000004
+CallWithArg sub_0807F4F8, 0x00000048
+Call sub_0806D66C
+Wait 0x000f
+CallWithArg sub_0807F4F8, 0x00000068
+Call sub_0806D67C
+_0807F0C8 0x001e, 0x0000
+SoundReq 0x010b
+_0807E5F8 0x00000001
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800C45C.inc b/data/scripts/gUnk_0800C45C.inc
new file mode 100644
index 00000000..64c371f7
--- /dev/null
+++ b/data/scripts/gUnk_0800C45C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800C45C
+StartScript 
+SetEntityNonPlanarMovement 0x0180
+_0807E930 0x0004
+Call sub_080A0B28
+StopScript 
+Wait 0x000a
+_0807EF80 0x0007
+SoundReq 0x0136
+_0807EE30 
+JumpIfNot 0xfffc
+Wait 0x003c
+SetRoomFlag 0x00ff
+_0807E930 0x0005
+Wait 0x000f
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800C494.inc b/data/scripts/gUnk_0800C494.inc
new file mode 100644
index 00000000..e7df7c4a
--- /dev/null
+++ b/data/scripts/gUnk_0800C494.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800C494
+StartScript 
+SetEntityNonPlanarMovement 0x0120
+_0807E930 0x0004
+StopScript 
+Wait 0x000a
+_0807EF80 0x0007
+SoundReq 0x0136
+_0807EEF4 0x0000, 0xff90
+Wait 0x001e
+_0807EEF4 0x0000, 0xffb0
+Wait 0x003c
+SetRoomFlag 0x00ff
+_0807E930 0x0005
+Wait 0x000f
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800C4D0.inc b/data/scripts/gUnk_0800C4D0.inc
new file mode 100644
index 00000000..8e8f296b
--- /dev/null
+++ b/data/scripts/gUnk_0800C4D0.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800C4D0
+StartScript 
+SetEntityNonPlanarMovement 0x0180
+_0807E930 0x0004
+.byte 0x2
diff --git a/data/scripts/gUnk_0800C4DB.inc b/data/scripts/gUnk_0800C4DB.inc
new file mode 100644
index 00000000..da705f95
--- /dev/null
+++ b/data/scripts/gUnk_0800C4DB.inc
@@ -0,0 +1,50 @@
+SCRIPT_START gUnk_0800C4DB
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x36
+.byte 0x1
+.byte 0x77
+.byte 0xc
+.byte 0xc0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x70
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x2f
+.byte 0x8
+.byte 0xff
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x5
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800C50C.inc b/data/scripts/gUnk_0800C50C.inc
new file mode 100644
index 00000000..5ca23758
--- /dev/null
+++ b/data/scripts/gUnk_0800C50C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800C50C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807E930 0x0004
+_0807EF80 0x0008
+StopScript 
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800C521.inc b/data/scripts/gUnk_0800C521.inc
new file mode 100644
index 00000000..2f6c09a3
--- /dev/null
+++ b/data/scripts/gUnk_0800C521.inc
@@ -0,0 +1,48 @@
+SCRIPT_START gUnk_0800C521
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x36
+.byte 0x1
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x60
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x60
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x2f
+.byte 0x8
+.byte 0xff
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x5
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800C550.inc b/data/scripts/gUnk_0800C550.inc
new file mode 100644
index 00000000..7a0f8f86
--- /dev/null
+++ b/data/scripts/gUnk_0800C550.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800C550
+StartScript 
+.short 0x0c0b
+.short 0x0091
diff --git a/data/scripts/gUnk_0800C556.inc b/data/scripts/gUnk_0800C556.inc
new file mode 100644
index 00000000..5a8ed43c
--- /dev/null
+++ b/data/scripts/gUnk_0800C556.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_0800C556
+_0807E078 0x0879
+.short 0x000a
+.short 0x0402
+.short 0x0401
+.short 0x0418
+.short 0x0804
+.short 0x000e
+.short 0x0c0b
+.short 0x0159
+.short 0x0806
+.short 0x0402
+.short 0x0803
+.short 0xffee
+.short 0x0402
+.short 0x0443
+.short 0x0c0b
+.short 0x0209
+.short 0x0806
+.short 0x0459
+.short 0x0444
+.short 0x0803
+.short 0xffdc
diff --git a/data/scripts/gUnk_0800C584.inc b/data/scripts/gUnk_0800C584.inc
new file mode 100644
index 00000000..59348d00
--- /dev/null
+++ b/data/scripts/gUnk_0800C584.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800C584
+StartScript 
+Call sub_08060090
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+.short 0x0804
+.short 0x000e
diff --git a/data/scripts/gUnk_0800C59A.inc b/data/scripts/gUnk_0800C59A.inc
new file mode 100644
index 00000000..a49738d8
--- /dev/null
+++ b/data/scripts/gUnk_0800C59A.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800C59A
+Call sub_08060158
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+CheckInventory1 0x0067
+JumpIfNot 0x000c
+Call sub_08060208
+Jump 0x0006
+TextboxNoOverlap 0x4710
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffcc
diff --git a/data/scripts/gUnk_0800C5C8.inc b/data/scripts/gUnk_0800C5C8.inc
new file mode 100644
index 00000000..a6b4ea0b
--- /dev/null
+++ b/data/scripts/gUnk_0800C5C8.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800C5C8
+StartScript 
+Call sub_08060090
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call sub_08060158
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call sub_08060270
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffdc
diff --git a/data/scripts/gUnk_0800C5FC.inc b/data/scripts/gUnk_0800C5FC.inc
new file mode 100644
index 00000000..5b7a5d0c
--- /dev/null
+++ b/data/scripts/gUnk_0800C5FC.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800C5FC
+StartScript 
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800C600.inc b/data/scripts/gUnk_0800C600.inc
new file mode 100644
index 00000000..bb7b571a
--- /dev/null
+++ b/data/scripts/gUnk_0800C600.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800C600
+.byte 0x91
+.byte 0x0
+.byte 0x6
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0xa
diff --git a/data/scripts/gUnk_0800C607.inc b/data/scripts/gUnk_0800C607.inc
new file mode 100644
index 00000000..4fb7cc8b
--- /dev/null
+++ b/data/scripts/gUnk_0800C607.inc
@@ -0,0 +1,46 @@
+SCRIPT_START gUnk_0800C607
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x4
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0x1
+.byte 0x6
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xee
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x1d
+.byte 0x2
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xd8
+.byte 0xff
diff --git a/data/scripts/gUnk_0800C634.inc b/data/scripts/gUnk_0800C634.inc
new file mode 100644
index 00000000..e338ca4d
--- /dev/null
+++ b/data/scripts/gUnk_0800C634.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_0800C634
+StartScript 
+_0807EF80 0x000a
+SetEntityNonPlanarMovement 0x0080
+_0807EB44 0x0004
+CheckLocalFlag 0x0082
+JumpIfNot 0x0008
+SetEntityPosition 0x0010, 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+Call sub_0807DF28
+CheckLocalFlag 0x0082
+JumpIf 0x0022
+CheckPlayerInRegion 0x00e8, 0x0028, 0x1810
+JumpIfNot 0x0006
+_0807EF80 0x000b
+StartPlayerScript 0x0800c8c8
+WaitForSomething2 0x00000001
+_0807EF80 0x000a
+CheckInventory1 0x0040
+JumpIf 0x00a6
+CheckInventory1 0x005b
+JumpIf 0x0024
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f16
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+SetLocalFlag 0x0080
+Call sub_0807DF50
+_0807E878 
+Jump 0xff9e
+CheckLocalFlag 0x0081
+JumpIf 0x0020
+_0807EF80 0x0002
+.short 0x085a
+.short 0x1f1b
diff --git a/data/scripts/gUnk_0800C6C6.inc b/data/scripts/gUnk_0800C6C6.inc
new file mode 100644
index 00000000..ac56f554
--- /dev/null
+++ b/data/scripts/gUnk_0800C6C6.inc
@@ -0,0 +1,48 @@
+SCRIPT_START gUnk_0800C6C6
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call sub_0807DF50
+_0807E878 
+Jump 0xff78
+CheckLocalFlag 0x0082
+JumpIf 0x0030
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f17
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807EC94 0x0020
+_0807EB44 0x0004
+Wait 0x000f
+SoundReq 0x0072
+SetLocalFlag 0x0082
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f18
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call sub_0807DF50
+_0807E878 
+Jump 0xff24
+CheckLocalFlag 0x0083
+JumpIf 0x0020
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f19
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call sub_0807DF50
+_0807E878 
+Jump 0xfefe
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f1a
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call sub_0807DF50
+_0807E878 
+.short 0x0803
+.short 0xfee0
diff --git a/data/scripts/gUnk_0800C774.inc b/data/scripts/gUnk_0800C774.inc
new file mode 100644
index 00000000..d22d801d
--- /dev/null
+++ b/data/scripts/gUnk_0800C774.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800C774
+StartScript 
+.byte 0x79
+.byte 0x8
+.byte 0xa
diff --git a/data/scripts/gUnk_0800C779.inc b/data/scripts/gUnk_0800C779.inc
new file mode 100644
index 00000000..b1a24810
--- /dev/null
+++ b/data/scripts/gUnk_0800C779.inc
@@ -0,0 +1,144 @@
+SCRIPT_START gUnk_0800C779
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x51
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x47
+.byte 0xc
+.byte 0xf0
+.byte 0xc8
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xf
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x88
+.byte 0x0
+.byte 0xf
+.byte 0x8
+.byte 0x5b
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x1c
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x22
+.byte 0x21
+.byte 0x59
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xc2
+.byte 0xff
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x12
+.byte 0x8
+.byte 0x81
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x30
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x5f
+.byte 0x8
+.byte 0x31
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x32
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x4e
+.byte 0xc
+.byte 0x3
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x21
+.byte 0xf4
+.byte 0x7
+.byte 0x8
+.byte 0x5a
+.byte 0x8
+.byte 0x33
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0x81
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
diff --git a/data/scripts/gUnk_0800C808.inc b/data/scripts/gUnk_0800C808.inc
new file mode 100644
index 00000000..4e4b50ab
--- /dev/null
+++ b/data/scripts/gUnk_0800C808.inc
@@ -0,0 +1,90 @@
+SCRIPT_START gUnk_0800C808
+.byte 0x78
+.byte 0xff
+.byte 0x5a
+.byte 0x8
+.byte 0x33
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x5e
+.byte 0xff
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x12
+.byte 0x8
+.byte 0x83
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x80
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x35
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x67
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x38
+.byte 0x0
+.byte 0x44
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0x83
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x72
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x36
+.byte 0x11
+.byte 0x59
diff --git a/data/scripts/gUnk_0800C861.inc b/data/scripts/gUnk_0800C861.inc
new file mode 100644
index 00000000..ee142128
--- /dev/null
+++ b/data/scripts/gUnk_0800C861.inc
@@ -0,0 +1,80 @@
+SCRIPT_START gUnk_0800C861
+.byte 0x4
+.byte 0x5f
+.byte 0x8
+.byte 0x37
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x51
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x63
+.byte 0x4
+.byte 0x4e
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x5a
+.byte 0x8
+.byte 0x36
+.byte 0x11
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xd0
+.byte 0xff
+.byte 0x5a
+.byte 0x8
diff --git a/data/scripts/gUnk_0800C8B0.inc b/data/scripts/gUnk_0800C8B0.inc
new file mode 100644
index 00000000..bfde9edf
--- /dev/null
+++ b/data/scripts/gUnk_0800C8B0.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800C8B0
+.short 0x1136
+.short 0x0459
+.short 0x0831
+.short 0x000a
+.short 0x0879
+.short 0x0000
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0803
+.short 0xfeba
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0c73
+.short 0x00e8
+.short 0x0068
+.short 0x0861
+.short 0x0000
diff --git a/data/scripts/gUnk_0800C8DA.inc b/data/scripts/gUnk_0800C8DA.inc
new file mode 100644
index 00000000..c8c32cdf
--- /dev/null
+++ b/data/scripts/gUnk_0800C8DA.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800C8DA
+Wait 0x000f
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C8F0.inc b/data/scripts/gUnk_0800C8F0.inc
new file mode 100644
index 00000000..fb281a40
--- /dev/null
+++ b/data/scripts/gUnk_0800C8F0.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800C8F0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807ECC4 0x0010
+_0807EDD4 0x0078, 0x0058
+_0807EB44 0x0000
+Wait 0x000f
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C91C.inc b/data/scripts/gUnk_0800C91C.inc
new file mode 100644
index 00000000..34b1e63d
--- /dev/null
+++ b/data/scripts/gUnk_0800C91C.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800C91C
+StartScript 
+_0807EB44 0x0004
+SetEntityNonPlanarMovement 0x0300
+StopScript 
+CheckPlayerInRegion 0x0208, 0x0360, 0x2040
+.byte 0x5
diff --git a/data/scripts/gUnk_0800C931.inc b/data/scripts/gUnk_0800C931.inc
new file mode 100644
index 00000000..3c9d52b4
--- /dev/null
+++ b/data/scripts/gUnk_0800C931.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0800C931
+.short 0xf608
+.short 0x43ff
+.short 0x0b04
+.short 0xa50c
+.short 0x07f9
+.short 0x0b08
+.short 0x290c
+.short 0x07df
+.short 0x4708
+.short 0x8c0c
+.short 0x00ca
+.short 0x3308
+.short 0x020c
+.short 0x0000
+.short 0x3100
+.short 0x3c08
+.short 0x5f00
+.short 0x2508
+.short 0x5911
+.short 0x2804
+.short 0x000c
+.short 0x0008
+.short 0x4c00
+.short 0x3104
+.short 0x3c08
diff --git a/data/scripts/gUnk_0800C963.inc b/data/scripts/gUnk_0800C963.inc
new file mode 100644
index 00000000..50750035
--- /dev/null
+++ b/data/scripts/gUnk_0800C963.inc
@@ -0,0 +1,166 @@
+SCRIPT_START gUnk_0800C963
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x49
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x4a
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x4a
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x4c
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x49
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x49
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x26
+.byte 0x11
+.byte 0xb
+.byte 0xc
+.byte 0xd
+.byte 0xf4
+.byte 0x7
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
diff --git a/data/scripts/gUnk_0800CA08.inc b/data/scripts/gUnk_0800CA08.inc
new file mode 100644
index 00000000..f49ccebe
--- /dev/null
+++ b/data/scripts/gUnk_0800CA08.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800CA08
+WaitForSomething2 0x00040000
+_0807E5F8 0x00008000
+WaitForSomething2 0x00010000
+_0807E8E4_3 
+TextboxNoOverlapFollow 0x1127
+_0807EA94 
+_0807E5F8 0x00002000
+WaitForSomething2 0x00004000
+_0807E8E4_1 
+TextboxNoOverlapFollow 0x1128
+_0807EA94 
+_0807E5F8 0x00000200
+_0807E5F8 0x00000800
+_0807E5F8 0x00002000
+_0807E5F8 0x00008000
+_0807E5F8 0x00020000
+WaitForSomething2 0x00000400
+WaitForSomething2 0x00001000
+WaitForSomething2 0x00004000
+WaitForSomething2 0x00010000
+WaitForSomething2 0x00040000
+_0807E8E4_0 
+_0807EB28 0x1129
+_0807EA94 
+SetLocalFlag 0x008d
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800CA8C.inc b/data/scripts/gUnk_0800CA8C.inc
new file mode 100644
index 00000000..30ecb797
--- /dev/null
+++ b/data/scripts/gUnk_0800CA8C.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800CA8C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0208, 0x0358
+SetEntityNonPlanarMovement 0x0080
+_0807EDD4 0x0208, 0x0340
+.short 0x0879
diff --git a/data/scripts/gUnk_0800CAAA.inc b/data/scripts/gUnk_0800CAAA.inc
new file mode 100644
index 00000000..7e8e4cff
--- /dev/null
+++ b/data/scripts/gUnk_0800CAAA.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800CAAA
+.short 0x0000
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CABC.inc b/data/scripts/gUnk_0800CABC.inc
new file mode 100644
index 00000000..7827c502
--- /dev/null
+++ b/data/scripts/gUnk_0800CABC.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800CABC
+StartScript 
+_0807EF80 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x000f
+Call sub_0807F338
+StopScript 
+WaitForSomething2 0x00000200
+_0807EF80 0x0007
+_0807EDD4 0x0208, 0x0308
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000400
+WaitForSomething2 0x00000200
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+.byte 0x7b
+.byte 0x8
+.byte 0x7c
diff --git a/data/scripts/gUnk_0800CB07.inc b/data/scripts/gUnk_0800CB07.inc
new file mode 100644
index 00000000..2c35bb6d
--- /dev/null
+++ b/data/scripts/gUnk_0800CB07.inc
@@ -0,0 +1,78 @@
+SCRIPT_START gUnk_0800CB07
+.byte 0x0
+.byte 0x78
+.byte 0xc
+.byte 0x80
+.byte 0x1
+.byte 0x30
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x2
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x8
+.byte 0x2
+.byte 0x28
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x8
+.byte 0x2
+.byte 0xb0
+.byte 0x2
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800CB54.inc b/data/scripts/gUnk_0800CB54.inc
new file mode 100644
index 00000000..08bcac45
--- /dev/null
+++ b/data/scripts/gUnk_0800CB54.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800CB54
+StartScript 
+_0807EF80 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x000f
+Call sub_0807F338
+StopScript 
+WaitForSomething2 0x00000800
+_0807EF80 0x0007
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807EDD4 0x01a8, 0x0330
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x000f
+.byte 0x73
diff --git a/data/scripts/gUnk_0800CBA3.inc b/data/scripts/gUnk_0800CBA3.inc
new file mode 100644
index 00000000..2fc60cdf
--- /dev/null
+++ b/data/scripts/gUnk_0800CBA3.inc
@@ -0,0 +1,50 @@
+SCRIPT_START gUnk_0800CBA3
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x48
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x78
+.byte 0x1
+.byte 0x28
+.byte 0x3
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800CBD4.inc b/data/scripts/gUnk_0800CBD4.inc
new file mode 100644
index 00000000..fa24f49b
--- /dev/null
+++ b/data/scripts/gUnk_0800CBD4.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800CBD4
+StartScript 
+_0807EF80 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x000f
+Call sub_0807F338
+StopScript 
+WaitForSomething2 0x00002000
+_0807EF80 0x0007
+_0807EDD4 0x0258, 0x0330
+_0807EB44 0x0006
+_0807EF80 0x0000
+.short 0x0c28
diff --git a/data/scripts/gUnk_0800CC08.inc b/data/scripts/gUnk_0800CC08.inc
new file mode 100644
index 00000000..773e3acd
--- /dev/null
+++ b/data/scripts/gUnk_0800CC08.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800CC08
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
diff --git a/data/scripts/gUnk_0800CC0D.inc b/data/scripts/gUnk_0800CC0D.inc
new file mode 100644
index 00000000..5e4e8ef3
--- /dev/null
+++ b/data/scripts/gUnk_0800CC0D.inc
@@ -0,0 +1,54 @@
+SCRIPT_START gUnk_0800CC0D
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x2
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x18
+.byte 0x2
+.byte 0x40
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x7c
+.byte 0x0
+.byte 0x78
+.byte 0xc
+.byte 0x80
+.byte 0x1
+.byte 0x30
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x7c
+.byte 0x0
+.byte 0x78
+.byte 0xc
+.byte 0x80
+.byte 0x1
diff --git a/data/scripts/gUnk_0800CC42.inc b/data/scripts/gUnk_0800CC42.inc
new file mode 100644
index 00000000..21feeeaf
--- /dev/null
+++ b/data/scripts/gUnk_0800CC42.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800CC42
+.short 0x0030
+.short 0x0c28
+.short 0x4000
+.short 0x0000
+.short 0x0c33
+.short 0x2000
+.short 0x0000
+.short 0x0867
+.short 0x0300
+.short 0x0879
+.short 0x000f
+.short 0x0c73
+.short 0x0288
+.short 0x02d8
+.short 0x0c28
+.short 0x4000
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CC6C.inc b/data/scripts/gUnk_0800CC6C.inc
new file mode 100644
index 00000000..c734ddcd
--- /dev/null
+++ b/data/scripts/gUnk_0800CC6C.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_0800CC6C
+StartScript 
+_0807EF80 0x0008
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x000f
+Call sub_0807F338
+StopScript 
+WaitForSomething2 0x00008000
+_0807EF80 0x0007
+_0807EDD4 0x01b8, 0x0320
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x000f
+_0807EDD4 0x01f8, 0x0330
+_0807EF80 0x0000
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+SoundReq 0x007c
+.byte 0x78
diff --git a/data/scripts/gUnk_0800CCCD.inc b/data/scripts/gUnk_0800CCCD.inc
new file mode 100644
index 00000000..8c9f8152
--- /dev/null
+++ b/data/scripts/gUnk_0800CCCD.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800CCCD
+.short 0x800c
+.short 0x3001
+.short 0x7b00
+.short 0x7c08
+.short 0x7800
+.short 0x800c
+.short 0x3001
+.short 0x2800
diff --git a/data/scripts/gUnk_0800CCDD.inc b/data/scripts/gUnk_0800CCDD.inc
new file mode 100644
index 00000000..67703de9
--- /dev/null
+++ b/data/scripts/gUnk_0800CCDD.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800CCDD
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x88
+.byte 0x1
+.byte 0xd8
+.byte 0x2
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800CD04.inc b/data/scripts/gUnk_0800CD04.inc
new file mode 100644
index 00000000..32d7371d
--- /dev/null
+++ b/data/scripts/gUnk_0800CD04.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800CD04
+StartScript 
+.short 0x0879
diff --git a/data/scripts/gUnk_0800CD08.inc b/data/scripts/gUnk_0800CD08.inc
new file mode 100644
index 00000000..43438760
--- /dev/null
+++ b/data/scripts/gUnk_0800CD08.inc
@@ -0,0 +1,96 @@
+SCRIPT_START gUnk_0800CD08
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x39
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x68
+.byte 0x2
+.byte 0x38
+.byte 0x3
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x2
+.byte 0x79
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x18
+.byte 0x2
+.byte 0x50
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x3
+.byte 0x79
+.byte 0x8
+.byte 0xf
diff --git a/data/scripts/gUnk_0800CD67.inc b/data/scripts/gUnk_0800CD67.inc
new file mode 100644
index 00000000..5ca8eadd
--- /dev/null
+++ b/data/scripts/gUnk_0800CD67.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800CD67
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xa8
+.byte 0x2
+.byte 0x28
+.byte 0x3
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc
new file mode 100644
index 00000000..3ce3b7ed
--- /dev/null
+++ b/data/scripts/gUnk_0800CD7C.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800CD7C
+StartScript 
+CheckInventory1 0x005b
+JumpIfNot 0xf87a
+Call sub_08060090
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000c
+Call sub_08060158
+Jump 0xffee
+StopScript 
+_0807E864 
+Call sub_0807DF28
+CheckLocalFlag 0x009d
+JumpIf 0x000e
+SetLocalFlag 0x009d
+TextboxNoOverlap 0x213d
+Jump 0x017e
+CheckGlobalFlag 0x003b
+JumpIf 0x007c
+CheckGlobalFlag 0x0054
+JumpIfNot 0x001a
+CheckRoomFlag 0x0000
+JumpIfNot 0x0150
+SetGlobalFlag 0x003b
+ClearGlobalFlag 0x0054
+TextboxNoOverlap 0x2141
+Jump 0x0156
+TextboxNoOverlap 0x213e
+_0807EA94 
+_0807E48C 0x0023
+JumpIfNot 0x001c
+TextboxNoOverlap 0x214b
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x013c
+.byte 0x7b
diff --git a/data/scripts/gUnk_0800CE07.inc b/data/scripts/gUnk_0800CE07.inc
new file mode 100644
index 00000000..6f712e3f
--- /dev/null
+++ b/data/scripts/gUnk_0800CE07.inc
@@ -0,0 +1,254 @@
+SCRIPT_START gUnk_0800CE07
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x86
+.byte 0x8
+.byte 0x23
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x1f
+.byte 0x8
+.byte 0x22
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x26
+.byte 0x1
+.byte 0x5b
+.byte 0x8
+.byte 0x4b
+.byte 0x21
+.byte 0x59
+.byte 0x4
+.byte 0x1c
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x1a
+.byte 0x1
+.byte 0x7b
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x86
+.byte 0x8
+.byte 0x22
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x2d
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x41
+.byte 0x3
+.byte 0x6
+.byte 0x8
+.byte 0x5b
+.byte 0x8
+.byte 0x3f
+.byte 0x21
+.byte 0x3
+.byte 0x8
+.byte 0xbe
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x5a
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x1a
+.byte 0x0
+.byte 0x15
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xce
+.byte 0x0
+.byte 0x2d
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x2e
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x45
+.byte 0x21
+.byte 0x3
+.byte 0x8
+.byte 0xd4
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x42
+.byte 0x21
+.byte 0x59
+.byte 0x4
+.byte 0x1f
+.byte 0x8
+.byte 0x27
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xc6
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x4c
+.byte 0x21
+.byte 0x59
+.byte 0x4
+.byte 0x1c
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xba
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x86
+.byte 0x8
+.byte 0x27
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x2d
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x41
+.byte 0x3
+.byte 0x6
+.byte 0x8
+.byte 0x5b
+.byte 0x8
+.byte 0x43
+.byte 0x21
+.byte 0x3
+.byte 0x8
+.byte 0x5e
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x3d
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x90
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x1a
+.byte 0x0
+.byte 0x15
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x6e
+.byte 0x0
+.byte 0x2d
+.byte 0x8
+.byte 0x3d
+.byte 0x0
+.byte 0x2e
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x49
+.byte 0x21
+.byte 0x3
+.byte 0x8
+.byte 0x74
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x46
+.byte 0x21
+.byte 0x59
+.byte 0x4
+.byte 0x1f
+.byte 0x8
+.byte 0x24
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x66
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x4d
+.byte 0x21
+.byte 0x59
+.byte 0x4
+.byte 0x1c
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x5a
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x86
+.byte 0x8
+.byte 0x24
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x2d
+.byte 0x8
+.byte 0x54
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x41
+.byte 0x3
+.byte 0x6
+.byte 0x8
+.byte 0x5b
+.byte 0x8
+.byte 0x47
+.byte 0x21
+.byte 0x59
+.byte 0x4
diff --git a/data/scripts/gUnk_0800CF04.inc b/data/scripts/gUnk_0800CF04.inc
new file mode 100644
index 00000000..6ba23d4d
--- /dev/null
+++ b/data/scripts/gUnk_0800CF04.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800CF04
+Call sub_0807DF50
+_0807E878 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+.short 0x0804
+.short 0x000c
diff --git a/data/scripts/gUnk_0800CF16.inc b/data/scripts/gUnk_0800CF16.inc
new file mode 100644
index 00000000..febff378
--- /dev/null
+++ b/data/scripts/gUnk_0800CF16.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800CF16
+Call sub_08060158
+Jump 0xffee
+StopScript 
+_0807E864 
+Call sub_0807DF28
+TextboxNoOverlap 0x2140
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+Jump 0xffd2
+TextboxNoOverlap 0x214a
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+.byte 0x3
diff --git a/data/scripts/gUnk_0800CF4B.inc b/data/scripts/gUnk_0800CF4B.inc
new file mode 100644
index 00000000..89e503ec
--- /dev/null
+++ b/data/scripts/gUnk_0800CF4B.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800CF4B
+.byte 0x8
+.byte 0x46
+.byte 0xfe
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800CF50.inc b/data/scripts/gUnk_0800CF50.inc
new file mode 100644
index 00000000..9de29634
--- /dev/null
+++ b/data/scripts/gUnk_0800CF50.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800CF50
+StartScript 
+Call sub_08068104
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call sub_0806811C
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+.byte 0xb
+.byte 0xc
+.byte 0x91
+.byte 0x81
+.byte 0x6
diff --git a/data/scripts/gUnk_0800CF7B.inc b/data/scripts/gUnk_0800CF7B.inc
new file mode 100644
index 00000000..f6e35584
--- /dev/null
+++ b/data/scripts/gUnk_0800CF7B.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800CF7B
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xd8
+.byte 0xff
diff --git a/data/scripts/gUnk_0800CF88.inc b/data/scripts/gUnk_0800CF88.inc
new file mode 100644
index 00000000..ac27b808
--- /dev/null
+++ b/data/scripts/gUnk_0800CF88.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800CF88
+StartScript 
+Call sub_08068104
+_0807EF80 0x000a
+.byte 0x2
diff --git a/data/scripts/gUnk_0800CF95.inc b/data/scripts/gUnk_0800CF95.inc
new file mode 100644
index 00000000..e7f6e643
--- /dev/null
+++ b/data/scripts/gUnk_0800CF95.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800CF95
+.short 0x5104
+.short 0x4304
+.short 0x0b04
+.short 0x910c
+.short 0x0681
+.short 0x5908
+.short 0x3104
+.short 0x0f08
+.short 0x4400
+.short 0x0304
diff --git a/data/scripts/gUnk_0800CFA9.inc b/data/scripts/gUnk_0800CFA9.inc
new file mode 100644
index 00000000..42d52b94
--- /dev/null
+++ b/data/scripts/gUnk_0800CFA9.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800CFA9
+.byte 0x8
+.byte 0xec
+.byte 0xff
diff --git a/data/scripts/gUnk_0800CFAC.inc b/data/scripts/gUnk_0800CFAC.inc
new file mode 100644
index 00000000..dc738500
--- /dev/null
+++ b/data/scripts/gUnk_0800CFAC.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800CFAC
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+CheckInventory1 0x0041
+JumpIf 0x000e
+CheckLocalFlag 0x007e
+JumpIfNot 0x0006
+_0807E930 0x0008
+CheckInventory1 0x0002
+JumpIf 0x0022
+CheckInventory1 0x0041
+JumpIfNot 0x000c
+_0807E5F8 0x00000020
+Jump 0x0010
+CheckLocalFlag 0x007e
+JumpIfNot 0x0008
+_0807E5F8 0x00000010
+StopScript 
+StartScript 
+Call sub_08068910
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+.byte 0xb
+.byte 0xc
+.byte 0x29
diff --git a/data/scripts/gUnk_0800D011.inc b/data/scripts/gUnk_0800D011.inc
new file mode 100644
index 00000000..ab7c8952
--- /dev/null
+++ b/data/scripts/gUnk_0800D011.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800D011
+.short 0x07df
+.short 0x0f08
+.short 0x0208
+.short 0x0500
+.short 0x1808
+.short 0x6300
+.short 0x4e04
+.short 0x000c
+.short 0x0000
+.short 0x0b00
+.short 0x290c
+.short 0x06c0
+.short 0x5b08
+.short 0x1908
+.short 0x0312
+.short 0x4c08
+.short 0x0f01
+.short 0x4108
+.short 0x0500
+.short 0x6008
+.short 0x4700
+.short 0x900c
+.short 0x00d1
+.short 0x3308
+.short 0x080c
+.short 0x0000
+.short 0x6300
+.short 0x4e04
+.short 0x000c
+.short 0x0000
+.short 0x0b00
+.short 0x290c
+.short 0x06c0
+.short 0x5c08
+.short 0x5c0c
+.short 0x0212
+.short 0x5900
+.short 0x4704
+.short 0xb40c
diff --git a/data/scripts/gUnk_0800D05F.inc b/data/scripts/gUnk_0800D05F.inc
new file mode 100644
index 00000000..06b48077
--- /dev/null
+++ b/data/scripts/gUnk_0800D05F.inc
@@ -0,0 +1,112 @@
+SCRIPT_START gUnk_0800D05F
+.byte 0xd1
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xc0
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x47
+.byte 0xc
+.byte 0xe0
+.byte 0xd1
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x5d
+.byte 0x12
+.byte 0x2
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xe6
+.byte 0x0
+.byte 0x12
+.byte 0x8
+.byte 0x7e
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x3e
+.byte 0x12
+.byte 0x3
+.byte 0x8
+.byte 0xd6
+.byte 0x0
+.byte 0x47
+.byte 0xc
+.byte 0x90
+.byte 0xd1
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x63
+.byte 0x4
diff --git a/data/scripts/gUnk_0800D0CE.inc b/data/scripts/gUnk_0800D0CE.inc
new file mode 100644
index 00000000..8b55a70d
--- /dev/null
+++ b/data/scripts/gUnk_0800D0CE.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800D0CE
+_0807E914 0x00000000
+Call sub_0806C028
+TextboxNoOverlapFollowPos 0x123d, 0x0002
+_0807EA94 
+StartPlayerScript 0x0800d1b4
+WaitForSomething2 0x00000008
+_0807EB44 0x0002
+_0807E914 0x00000000
+Call sub_0806C028
+SoundReq 0x00cd
+Call sub_08068964
+ComparePlayerAction 0x0008
+JumpIf 0xfffa
+SoundReq 0x00f8
+_0807E5F8 0x00000010
+SetLocalFlag 0x007e
+TextboxNoOverlapFollowPos 0x123e, 0x0002
+_0807EA94 
+.byte 0x31
diff --git a/data/scripts/gUnk_0800D127.inc b/data/scripts/gUnk_0800D127.inc
new file mode 100644
index 00000000..8d62eaff
--- /dev/null
+++ b/data/scripts/gUnk_0800D127.inc
@@ -0,0 +1,106 @@
+SCRIPT_START gUnk_0800D127
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x9
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x3f
+.byte 0x12
+.byte 0x2
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x65
+.byte 0x51
+.byte 0x9
+.byte 0x8
+.byte 0x5f
+.byte 0x8
+.byte 0x40
+.byte 0x12
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x8
+.byte 0x6e
+.byte 0xfe
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800D190.inc b/data/scripts/gUnk_0800D190.inc
new file mode 100644
index 00000000..e03152f1
--- /dev/null
+++ b/data/scripts/gUnk_0800D190.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800D190
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0170, 0x0140
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800D1B4.inc b/data/scripts/gUnk_0800D1B4.inc
new file mode 100644
index 00000000..0393b5dc
--- /dev/null
+++ b/data/scripts/gUnk_0800D1B4.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800D1B4
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0170, 0x0120
+.short 0x0c73
diff --git a/data/scripts/gUnk_0800D1C4.inc b/data/scripts/gUnk_0800D1C4.inc
new file mode 100644
index 00000000..da71414e
--- /dev/null
+++ b/data/scripts/gUnk_0800D1C4.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800D1C4
+.short 0x01a8
+.short 0x0120
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0008
diff --git a/data/scripts/gUnk_0800D1D4.inc b/data/scripts/gUnk_0800D1D4.inc
new file mode 100644
index 00000000..66cf3692
--- /dev/null
+++ b/data/scripts/gUnk_0800D1D4.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800D1D4
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc
new file mode 100644
index 00000000..58cc2e6e
--- /dev/null
+++ b/data/scripts/gUnk_0800D1E0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800D1E0
+_0807F078 0x0002, 0x0001
+CallWithArg sub_0807F918, 0x00000002
+SoundReq 0x0109
+CallWithArg sub_0807F238, 0x000001e2
+Call sub_0807F304
+.byte 0x5b
+.byte 0x8
+.byte 0x2
diff --git a/data/scripts/gUnk_0800D207.inc b/data/scripts/gUnk_0800D207.inc
new file mode 100644
index 00000000..73150653
--- /dev/null
+++ b/data/scripts/gUnk_0800D207.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800D207
+.byte 0x5
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800D218.inc b/data/scripts/gUnk_0800D218.inc
new file mode 100644
index 00000000..7f9f590d
--- /dev/null
+++ b/data/scripts/gUnk_0800D218.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_0800D218
+StartScript 
+CheckInventory1 0x0041
+JumpIf 0x002c
+CheckLocalFlag 0x007e
+JumpIf 0x001a
+_0807EF80 0x0008
+StopScript 
+WaitForSomething2 0x00000010
+_0807EF80 0x0007
+WaitForSomething2 0x00000010
+SCRIPT_END
+.short 0x0879
+.short 0x0007
+.short 0x0850
+.short 0x0003
+.short 0xffff
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D254.inc b/data/scripts/gUnk_0800D254.inc
new file mode 100644
index 00000000..67a6dc70
--- /dev/null
+++ b/data/scripts/gUnk_0800D254.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800D254
+StartScript 
+_0807EF80 0x0008
+StopScript 
+WaitForSomething2 0x00000020
+_0807EF80 0x0007
+WaitForSomething2 0x00000020
+_0807EF80 0x0008
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D278.inc b/data/scripts/gUnk_0800D278.inc
new file mode 100644
index 00000000..ce4ee7d9
--- /dev/null
+++ b/data/scripts/gUnk_0800D278.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800D278
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckInventory1 0x0041
+JumpIf 0x000a
+CheckLocalFlag 0x007e
+JumpIf 0x005a
+StartScript 
+TestBit 0x00000001
+JumpIf 0x002a
+CheckEntityInteractType 
+JumpIf 0x000e
+Call sub_0806811C
+StopScript 
+Jump 0xffd4
+StopScript 
+_0807E864 
+Call sub_08068190
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffbe
+StopScript 
+.short 0x0c28
+.short 0x0004
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D2CE.inc b/data/scripts/gUnk_0800D2CE.inc
new file mode 100644
index 00000000..69012311
--- /dev/null
+++ b/data/scripts/gUnk_0800D2CE.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800D2CE
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000004
+_0807E930 0x000c
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000004
+_0807E930 0x000b
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_08068190
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
diff --git a/data/scripts/gUnk_0800D306.inc b/data/scripts/gUnk_0800D306.inc
new file mode 100644
index 00000000..cb728fbb
--- /dev/null
+++ b/data/scripts/gUnk_0800D306.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800D306
+.short 0xffe8
diff --git a/data/scripts/gUnk_0800D308.inc b/data/scripts/gUnk_0800D308.inc
new file mode 100644
index 00000000..ef86c3ed
--- /dev/null
+++ b/data/scripts/gUnk_0800D308.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800D308
+StartScript 
+.byte 0xb
+.byte 0xc
+.byte 0x85
+.byte 0x88
+.byte 0x6
diff --git a/data/scripts/gUnk_0800D30F.inc b/data/scripts/gUnk_0800D30F.inc
new file mode 100644
index 00000000..6a8a29a2
--- /dev/null
+++ b/data/scripts/gUnk_0800D30F.inc
@@ -0,0 +1,66 @@
+SCRIPT_START gUnk_0800D30F
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x2
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0x89
+.byte 0x6
+.byte 0x8
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xf2
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0x4e
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xc0
+.byte 0x6
+.byte 0x8
+.byte 0x5a
+.byte 0x8
+.byte 0x19
+.byte 0x12
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xd0
+.byte 0xff
diff --git a/data/scripts/gUnk_0800D350.inc b/data/scripts/gUnk_0800D350.inc
new file mode 100644
index 00000000..e651a656
--- /dev/null
+++ b/data/scripts/gUnk_0800D350.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800D350
+StartScript 
+Call sub_08068104
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call sub_0806811C
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call sub_08068190
+_0807EA94 
+Wait 0x000f
+CheckLocalFlag 0x007f
+JumpIf 0x005c
+CheckLocalFlag 0x007e
+JumpIfNot 0x0054
+_0807EF80 0x000b
+SetEntityNonPlanarMovement 0x0100
+CheckPlayerInRegion 0x0090, 0x0130, 0x0810
+JumpIfNot 0x000e
+StartPlayerScript 0x0800d3ec
+WaitForSomething2 0x00000001
+_0807EB44 0x0002
+_0807E930 0x0005
+_0807EDD4 0x00a0, 0x0130
+_0807EB44 0x0006
+_0807E930 0x0003
+_0807E914 0x00000004
+Call sub_080681D8
+SoundReq 0x00cd
+Wait 0x001e
+_0807EF80 0x000a
+SetLocalFlag 0x007f
+_0807E878 
+Jump 0xff76
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D3EC.inc b/data/scripts/gUnk_0800D3EC.inc
new file mode 100644
index 00000000..d2d514cb
--- /dev/null
+++ b/data/scripts/gUnk_0800D3EC.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800D3EC
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x000d
+_0807ECC4 0x0020
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc
new file mode 100644
index 00000000..4ed59eb9
--- /dev/null
+++ b/data/scripts/gUnk_0800D414.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800D414
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+Call sub_08068104
+_0807EF80 0x000a
+StopScript 
+_0807EB44 0x0002
+_0807E914 0x00000000
+Call sub_0806AF60
+Wait 0x0014
+_0807EB44 0x0004
+_0807E914 0x00000000
+Call sub_0806AF60
+.short 0x0831
diff --git a/data/scripts/gUnk_0800D44C.inc b/data/scripts/gUnk_0800D44C.inc
new file mode 100644
index 00000000..884704fb
--- /dev/null
+++ b/data/scripts/gUnk_0800D44C.inc
@@ -0,0 +1,116 @@
+SCRIPT_START gUnk_0800D44C
+.byte 0x14
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x73
+.byte 0xc
+.byte 0xa8
+.byte 0x0
+.byte 0xe8
+.byte 0x1
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x4e
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
diff --git a/data/scripts/gUnk_0800D4BF.inc b/data/scripts/gUnk_0800D4BF.inc
new file mode 100644
index 00000000..bf2d12ce
--- /dev/null
+++ b/data/scripts/gUnk_0800D4BF.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800D4BF
+.byte 0xc
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x73
+.byte 0xc
+.byte 0x28
+.byte 0x2
+.byte 0xe8
+.byte 0x1
+.byte 0x3
+.byte 0x8
+.byte 0x5a
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x49
+.byte 0x2a
+.byte 0x6
+.byte 0x8
diff --git a/data/scripts/gUnk_0800D4DC.inc b/data/scripts/gUnk_0800D4DC.inc
new file mode 100644
index 00000000..3bf260fd
--- /dev/null
+++ b/data/scripts/gUnk_0800D4DC.inc
@@ -0,0 +1,87 @@
+SCRIPT_START gUnk_0800D4DC
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+Call sub_08062698
+Call sub_080626AC
+CallWithArg sub_0807F0EC, 0x00000009
+.short 0x2806
+.short 0x0012
+.short 0x001a
+.short 0x0022
+.short 0x002a
+.short 0x0032
+.short 0x003a
+.short 0x0042
+.short 0x004a
+.short 0x0052
+.short 0x0c74
+.short 0x0038
+.short 0x0068
+.short 0x0803
+.short 0x004e
+.short 0x0c74
+.short 0x0078
+.short 0x0068
+.short 0x0803
+.short 0x0044
+.short 0x0c74
+.short 0x00b8
+.short 0x0068
+.short 0x0803
+.short 0x003a
+.short 0x0c74
+.short 0x0038
+.short 0x0090
+.short 0x0803
+.short 0x0030
+.short 0x0c74
+.short 0x0078
+.short 0x0090
+.short 0x0803
+.short 0x0026
+.short 0x0c74
+.short 0x00b8
+.short 0x0090
+.short 0x0803
+.short 0x001c
+.short 0x0c74
+.short 0x0038
+.short 0x00b8
+.short 0x0803
+.short 0x0012
+.short 0x0c74
+.short 0x0078
+.short 0x00b8
+.short 0x0803
+.short 0x0008
+.short 0x0c74
+.short 0x00b8
+.short 0x00b8
+.short 0x0402
+.short 0x0401
+.short 0x0c0b
+.short 0x26c1
+.short 0x0806
+.short 0x0804
+.short 0xff72
+.short 0x0418
+.short 0x0804
+.short 0x000c
+.short 0x0475
+.short 0x0805
+.short 0xffe8
+.short 0x0803
+.short 0xff62
+.short 0x0402
+.short 0x0443
+.short 0x0463
+.short 0x0c0b
+.short 0x265d
+.short 0x0806
+.short 0x0459
+.short 0x0831
+.short 0x000f
+.short 0x0444
+.short 0x0803
+.short 0xff4a
diff --git a/data/scripts/gUnk_0800D59C.inc b/data/scripts/gUnk_0800D59C.inc
new file mode 100644
index 00000000..66251bb0
--- /dev/null
+++ b/data/scripts/gUnk_0800D59C.inc
@@ -0,0 +1,42 @@
+SCRIPT_START gUnk_0800D59C
+StartScript 
+_0807EF80 0x000a
+Call sub_08062A48
+_0807EF80 0x0000
+StopScript 
+Call sub_08062698
+Call sub_080626AC
+CallWithArg sub_0807F0EC, 0x00000004
+.byte 0x6
+.byte 0x14
+.byte 0x8
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x18
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x74
+.byte 0xc
+.byte 0x38
+.byte 0x0
+.byte 0x98
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x1c
+.byte 0x0
+.byte 0x74
+.byte 0xc
+.byte 0x58
+.byte 0x0
+.byte 0x98
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x12
+.byte 0x0
+.byte 0x74
+.byte 0xc
+.byte 0x38
diff --git a/data/scripts/gUnk_0800D5E5.inc b/data/scripts/gUnk_0800D5E5.inc
new file mode 100644
index 00000000..de9f96a1
--- /dev/null
+++ b/data/scripts/gUnk_0800D5E5.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800D5E5
+.byte 0x0
+.byte 0xc8
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x74
+.byte 0xc
+.byte 0x58
+.byte 0x0
+.byte 0xc8
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xc1
+.byte 0x26
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x8
+.byte 0xae
+.byte 0xff
+.byte 0x75
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xee
+.byte 0xff
+.byte 0x3
+.byte 0x8
+.byte 0xa4
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800D60C.inc b/data/scripts/gUnk_0800D60C.inc
new file mode 100644
index 00000000..cd7d6b5d
--- /dev/null
+++ b/data/scripts/gUnk_0800D60C.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800D60C
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000b
+_0807EF80 0x0008
+Call sub_0806DAAC
+JumpIf 0x008c
+Call sub_0806DAD0
+.byte 0xc
diff --git a/data/scripts/gUnk_0800D62B.inc b/data/scripts/gUnk_0800D62B.inc
new file mode 100644
index 00000000..ec328708
--- /dev/null
+++ b/data/scripts/gUnk_0800D62B.inc
@@ -0,0 +1,138 @@
+SCRIPT_START gUnk_0800D62B
+.byte 0x14
+.byte 0x5
+.byte 0xda
+.byte 0x6
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x57
+.byte 0x4
+.byte 0x56
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xad
+.byte 0xda
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe8
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xc5
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xa1
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x7
+.byte 0x89
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x87
+.byte 0x4
+.byte 0x73
+.byte 0xc
+.byte 0xe8
+.byte 0x1
+.byte 0xb8
+.byte 0x1
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xe9
+.byte 0xda
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0xdb
+.byte 0x6
+.byte 0x8
+.byte 0x5
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0xd
+.byte 0xc
+.byte 0x30
+.byte 0xd7
+.byte 0xd
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x76
+.byte 0x4
+.byte 0x89
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x88
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xcd
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800D6B4.inc b/data/scripts/gUnk_0800D6B4.inc
new file mode 100644
index 00000000..8b4de011
--- /dev/null
+++ b/data/scripts/gUnk_0800D6B4.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800D6B4
+StartScript 
+.short 0x0879
+.short 0x0007
diff --git a/data/scripts/gUnk_0800D6BA.inc b/data/scripts/gUnk_0800D6BA.inc
new file mode 100644
index 00000000..c92d039e
--- /dev/null
+++ b/data/scripts/gUnk_0800D6BA.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800D6BA
+_0807EF80 0x0011
+Call sub_0807F158
+Call sub_0807F738
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D6D0.inc b/data/scripts/gUnk_0800D6D0.inc
new file mode 100644
index 00000000..0313c541
--- /dev/null
+++ b/data/scripts/gUnk_0800D6D0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800D6D0
+StartScript 
+CheckLocalFlag 0x00f3
+JumpIf 0x0010
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x00f3
+JumpIfNot 0xfffa
+_0807EF80 0x0007
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D6F0.inc b/data/scripts/gUnk_0800D6F0.inc
new file mode 100644
index 00000000..0f9916c8
--- /dev/null
+++ b/data/scripts/gUnk_0800D6F0.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800D6F0
+StartScript 
+CheckLocalFlag 0x00f5
+JumpIf 0xfff0
+_0807EF80 0x0008
+StopScript 
+.short 0x0812
diff --git a/data/scripts/gUnk_0800D702.inc b/data/scripts/gUnk_0800D702.inc
new file mode 100644
index 00000000..d47e6ab0
--- /dev/null
+++ b/data/scripts/gUnk_0800D702.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800D702
+.byte 0xf5
diff --git a/data/scripts/gUnk_0800D703.inc b/data/scripts/gUnk_0800D703.inc
new file mode 100644
index 00000000..286f67c3
--- /dev/null
+++ b/data/scripts/gUnk_0800D703.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800D703
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xfa
+.byte 0xff
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800D710.inc b/data/scripts/gUnk_0800D710.inc
new file mode 100644
index 00000000..1658f0df
--- /dev/null
+++ b/data/scripts/gUnk_0800D710.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800D710
+StartScript 
+Call sub_0807F360
+SetEntityNonPlanarMovement 0x0700
+_0807F0B4 0x0007
+CameraTargetEntity 
+.byte 0xb
+.byte 0xc
+.byte 0xc5
diff --git a/data/scripts/gUnk_0800D725.inc b/data/scripts/gUnk_0800D725.inc
new file mode 100644
index 00000000..d1a157cb
--- /dev/null
+++ b/data/scripts/gUnk_0800D725.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800D725
+.byte 0xfb
+.byte 0x7
+.byte 0x8
diff --git a/data/scripts/gUnk_0800D728.inc b/data/scripts/gUnk_0800D728.inc
new file mode 100644
index 00000000..93c3530a
--- /dev/null
+++ b/data/scripts/gUnk_0800D728.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800D728
+StopScript 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000010
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E5F8 0x0000000a
+WaitForSomething2 0x00000004
+_0807EEB4 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807FBCC
+_0807E878 
+Call sub_0807DF50
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc
new file mode 100644
index 00000000..06386591
--- /dev/null
+++ b/data/scripts/gUnk_0800D76C.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_0800D76C
+StartScript 
+Call sub_0807F360
+_0807EF80 0x000b
+SetEntityNonPlanarMovement 0x0200
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000008
+_0807EF80 0x0004
+Wait 0x003c
+SoundReq 0x0123
+CallWithArg sub_0807F464, 0x000001e0
+_0807EDD4 0x01e0, 0x01d8
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000010
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+_0807EB44 0x0002
+.byte 0x79
diff --git a/data/scripts/gUnk_0800D7CF.inc b/data/scripts/gUnk_0800D7CF.inc
new file mode 100644
index 00000000..34cb6e66
--- /dev/null
+++ b/data/scripts/gUnk_0800D7CF.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800D7CF
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x32
+.byte 0x0
diff --git a/data/scripts/gUnk_0800D7DC.inc b/data/scripts/gUnk_0800D7DC.inc
new file mode 100644
index 00000000..a8fec942
--- /dev/null
+++ b/data/scripts/gUnk_0800D7DC.inc
@@ -0,0 +1,44 @@
+SCRIPT_START gUnk_0800D7DC
+StartScript 
+Call sub_0807F360
+_0807EF80 0x000b
+SetEntityPositionRelative 0x01d80268
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+WaitForSomething2 0x00000002
+_0807EDD4 0x01f0, 0x01d8
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EEF4 0x0000, 0xffe0
+_0807EF80 0x000e
+Call sub_0806CA5C
+SetEntity0x20 0x00040000
+SoundReq 0x00f5
+CallWithArg sub_0807F8D0, 0xffffe000
+Call sub_0807F8BC
+JumpIf 0xffee
+_0807E5F8 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0402
+.short 0x0815
+.short 0x0000
+.short 0x0805
+.short 0xfffa
+.short 0x0443
+.short 0x0c0b
+.short 0xdf29
+.short 0x0807
+.short 0x0831
+.short 0x003c
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc
new file mode 100644
index 00000000..649fe5f5
--- /dev/null
+++ b/data/scripts/gUnk_0800D874.inc
@@ -0,0 +1,29 @@
+SCRIPT_START gUnk_0800D874
+StartScript 
+Call sub_0807F934
+_0807EF80 0x0008
+_0807E914 0x00000001
+Call sub_0806DA04
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+CheckLocalFlag 0x0045
+JumpIf 0x000e
+StartPlayerScript 0x0800d92c
+WaitForSomething2 0x00000001
+_0807E8E4_0 
+TextboxNoOverlap 0x1324
+_0807EA94 
+CheckInventory1 0x0017
+JumpIf 0x0018
+CheckLocalFlag 0x0045
+JumpIf 0x0010
+LoadRoomEntityList 0x080e3830
+CheckLocalFlag 0x0045
+JumpIfNot 0xfffa
+Call sub_0807DF50
+_0807E878 
+Jump 0xffae
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D8E4.inc b/data/scripts/gUnk_0800D8E4.inc
new file mode 100644
index 00000000..2c0e9c91
--- /dev/null
+++ b/data/scripts/gUnk_0800D8E4.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800D8E4
+StartScript 
+_0807EF80 0x0008
+CheckInventory1 0x0017
+JumpIf 0x0034
+StopScript 
+CheckInventory1 0x0017
+JumpIfNot 0xfffa
+Call sub_0807DF28
+_0807E864 
+WaitPlayerAction8 
diff --git a/data/scripts/gUnk_0800D906.inc b/data/scripts/gUnk_0800D906.inc
new file mode 100644
index 00000000..ebe410e4
--- /dev/null
+++ b/data/scripts/gUnk_0800D906.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800D906
+_0807EB28 0x1325
+_0807EA94 
+SoundReq 0x0113
+_0807E914 0x00000000
+Call sub_0806DA1C
+_0807E878 
+Call sub_0807DF50
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0080
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x00a0
+.short 0x0078
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_0800D954.inc b/data/scripts/gUnk_0800D954.inc
new file mode 100644
index 00000000..92193d4c
--- /dev/null
+++ b/data/scripts/gUnk_0800D954.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800D954
+StartScript 
+_0807EF80 0x0008
+Call sub_0807F180
+StopScript 
+CheckPlayerInRegion 0x0118, 0x0038, 0x3050
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+.byte 0x47
diff --git a/data/scripts/gUnk_0800D97D.inc b/data/scripts/gUnk_0800D97D.inc
new file mode 100644
index 00000000..4bab4af2
--- /dev/null
+++ b/data/scripts/gUnk_0800D97D.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800D97D
+.short 0x000c
+.short 0x00da
diff --git a/data/scripts/gUnk_0800D981.inc b/data/scripts/gUnk_0800D981.inc
new file mode 100644
index 00000000..88ca163b
--- /dev/null
+++ b/data/scripts/gUnk_0800D981.inc
@@ -0,0 +1,73 @@
+SCRIPT_START gUnk_0800D981
+.short 0x3308
+.short 0x010c
+.short 0x0000
+.short 0x3100
+.short 0x3c08
+.short 0x6100
+.short 0x0408
+.short 0x7900
+.short 0x0008
+.short 0x7900
+.short 0x0708
+.short 0x7b00
+.short 0xce08
+.short 0x6801
+.short 0x000c
+.short 0xff80
+.short 0x5bff
+.short 0x0108
+.short 0x5917
+.short 0x2804
+.short 0x040c
+.short 0x0000
+.short 0x3300
+.short 0x020c
+.short 0x0000
+.short 0x5b00
+.short 0x0208
+.short 0x5917
+.short 0x6804
+.short 0x000c
+.short 0x0100
+.short 0x2800
+.short 0x040c
+.short 0x0000
+.short 0x3300
+.short 0x020c
+.short 0x0000
+.short 0x8300
+.short 0x6d08
+.short 0x3400
+.short 0x5f04
+.short 0x0308
+.short 0x5917
+.short 0x3104
+.short 0x3c08
+.short 0x2a00
+.short 0x3208
+.short 0x7b00
+.short 0x1308
+.short 0x4e01
+.short 0x010c
+.short 0x0000
+.short 0x0b00
+.short 0x1d0c
+.short 0x06da
+.short 0x0b08
+.short 0x510c
+.short 0x07df
+.short 0x4408
+.short 0x7904
+.short 0x0608
+.short 0xff00
+.short 0x00ff
+.short 0x0100
+.short 0x6704
+.short 0x8008
+.short 0x0200
+.short 0x7904
+.short 0x0108
+.short 0x7300
+.short 0x180c
+.short 0x6001
diff --git a/data/scripts/gUnk_0800DA11.inc b/data/scripts/gUnk_0800DA11.inc
new file mode 100644
index 00000000..cbcd480a
--- /dev/null
+++ b/data/scripts/gUnk_0800DA11.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800DA11
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800DA28.inc b/data/scripts/gUnk_0800DA28.inc
new file mode 100644
index 00000000..fa14520a
--- /dev/null
+++ b/data/scripts/gUnk_0800DA28.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800DA28
+StartScript 
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+WaitForSomething2 0x00000004
+_0807EF80 0x0007
+Wait 0x003c
+_0807E5F8 0x00000002
+.short 0x0c33
+.short 0x0004
diff --git a/data/scripts/gUnk_0800DA4C.inc b/data/scripts/gUnk_0800DA4C.inc
new file mode 100644
index 00000000..a9f03fb0
--- /dev/null
+++ b/data/scripts/gUnk_0800DA4C.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800DA4C
+.byte 0x0
diff --git a/data/scripts/gUnk_0800DA4D.inc b/data/scripts/gUnk_0800DA4D.inc
new file mode 100644
index 00000000..90e834cb
--- /dev/null
+++ b/data/scripts/gUnk_0800DA4D.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800DA4D
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x18
+.byte 0x1
+.byte 0x60
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc
new file mode 100644
index 00000000..76a96408
--- /dev/null
+++ b/data/scripts/gUnk_0800DA60.inc
@@ -0,0 +1,43 @@
+SCRIPT_START gUnk_0800DA60
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x0078, 0x0148, 0x4040
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807E8E4_0 
+Call sub_0807F3F8
+Wait 0x003c
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x00800078
+CameraTargetEntity 
+Call sub_0807F5C0
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+TextboxNoOverlapFollowPos 0x162d, 0x0002
+_0807EA94 
+_0807E5F8 0x00000001
+Wait 0x001e
+TextboxNoOverlapFollowPos 0x162e, 0x0002
+_0807EA94 
+_0807E8E4_0 
+CallWithArg sub_0807F75C, 0x00780138
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807F5C0
+SetRoomFlag 0x0000
+Call sub_0807F40C
+Wait 0x001e
+_0807E8E4_1 
+Wait 0x000a
+_0807E8E4_3 
+Wait 0x000a
+_0807E8E4_2 
+Call sub_0807F3F8
+Wait 0x003c
+SetRoomFlag 0x0001
+SetLocalFlag 0x0077
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
diff --git a/data/scripts/gUnk_0800DB0E.inc b/data/scripts/gUnk_0800DB0E.inc
new file mode 100644
index 00000000..7692db5d
--- /dev/null
+++ b/data/scripts/gUnk_0800DB0E.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800DB0E
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DB18.inc b/data/scripts/gUnk_0800DB18.inc
new file mode 100644
index 00000000..9017228d
--- /dev/null
+++ b/data/scripts/gUnk_0800DB18.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800DB18
+StartScript 
+_0807EF80 0x000a
+Call sub_08066E38
+StopScript 
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DB28.inc b/data/scripts/gUnk_0800DB28.inc
new file mode 100644
index 00000000..74d6ca16
--- /dev/null
+++ b/data/scripts/gUnk_0800DB28.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800DB28
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0000
+_0807EF80 0x0014
+StopScript 
+WaitForSomething2 0x00000001
+Wait 0x003c
+_0807EF80 0x0004
+.short 0x0831
+.short 0x003c
diff --git a/data/scripts/gUnk_0800DB4A.inc b/data/scripts/gUnk_0800DB4A.inc
new file mode 100644
index 00000000..1885d12e
--- /dev/null
+++ b/data/scripts/gUnk_0800DB4A.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800DB4A
+_0807EB44 0x0004
+_0807EF80 0x001c
+Call sub_0807F2D4
+_0807EF80 0x0000
+Wait 0x003c
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB44 0x0004
+_0807EF80 0x0014
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc
new file mode 100644
index 00000000..88ffc18a
--- /dev/null
+++ b/data/scripts/gUnk_0800DB78.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800DB78
+StartScript 
+StopScript 
+CallWithArg sub_0807F6B4, 0x000000a0
+.short 0x0804
diff --git a/data/scripts/gUnk_0800DB88.inc b/data/scripts/gUnk_0800DB88.inc
new file mode 100644
index 00000000..5f084e07
--- /dev/null
+++ b/data/scripts/gUnk_0800DB88.inc
@@ -0,0 +1,69 @@
+SCRIPT_START gUnk_0800DB88
+.short 0xfff4
+.short 0x0443
+.short 0x0c0b
+.short 0xf9a5
+.short 0x0807
+.short 0x0c0b
+.short 0xdf29
+.short 0x0807
+.short 0x0889
+.short 0x0001
+.short 0x0c69
+.short 0x0078
+.short 0x0078
+.short 0x0487
+.short 0x0c0b
+.short 0xf5c1
+.short 0x0807
+.short 0x085f
+.short 0x1648
+.short 0x0459
+.short 0x0c0b
+.short 0xd7ed
+.short 0x0804
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0815
+.short 0x0000
+.short 0x0805
+.short 0xfffa
+.short 0x0443
+.short 0x0c0b
+.short 0xf9a5
+.short 0x0807
+.short 0x0c0b
+.short 0xdf29
+.short 0x0807
+.short 0x0c0b
+.short 0xd811
+.short 0x0804
+.short 0x0c0b
+.short 0xf3f9
+.short 0x0807
+.short 0x0831
+.short 0x003c
+.short 0x0c47
+.short 0xddd0
+.short 0x0800
+.short 0x0c33
+.short 0x0004
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c47
diff --git a/data/scripts/gUnk_0800DC10.inc b/data/scripts/gUnk_0800DC10.inc
new file mode 100644
index 00000000..3354f111
--- /dev/null
+++ b/data/scripts/gUnk_0800DC10.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DC10
+.byte 0x0
+.byte 0xde
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x6
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800DC19.inc b/data/scripts/gUnk_0800DC19.inc
new file mode 100644
index 00000000..2ce37552
--- /dev/null
+++ b/data/scripts/gUnk_0800DC19.inc
@@ -0,0 +1,61 @@
+SCRIPT_START gUnk_0800DC19
+.short 0x5c00
+.short 0x430c
+.short 0x0216
+.short 0x5900
+.short 0x5f04
+.short 0x4508
+.short 0x5916
+.short 0x0b04
+.short 0xf90c
+.short 0x07f3
+.short 0x2808
+.short 0x010c
+.short 0x0000
+.short 0x7e00
+.short 0x0b04
+.short 0x990c
+.short 0x094f
+.short 0x0c08
+.short 0xed14
+.short 0x05dd
+.short 0x0108
+.short 0x0000
+.short 0x8a00
+.short 0xff0c
+.short 0x00ff
+.short 0x3100
+.short 0x3c08
+.short 0x7c00
+.short 0x3108
+.short 0x4700
+.short 0x500c
+.short 0x00de
+.short 0x3308
+.short 0x060c
+.short 0x0000
+.short 0x5f00
+.short 0x4608
+.short 0x5916
+.short 0x2804
+.short 0x010c
+.short 0x0000
+.short 0x4700
+.short 0x2c0c
+.short 0x00de
+.short 0x8808
+.short 0x3804
+.short 0x0408
+.short 0x4100
+.short 0x000c
+.short 0x0000
+.short 0x3700
+.short 0x0c04
+.short 0x1914
+.short 0x05de
+.short 0x0108
+.short 0x0000
+.short 0x8a00
+.short 0x000c
+.short 0x0000
+.short 0x2a00
diff --git a/data/scripts/gUnk_0800DC91.inc b/data/scripts/gUnk_0800DC91.inc
new file mode 100644
index 00000000..71c48c82
--- /dev/null
+++ b/data/scripts/gUnk_0800DC91.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800DC91
+.byte 0x8
+.byte 0x79
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x1d
+.byte 0xda
+.byte 0x6
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc
new file mode 100644
index 00000000..bf543e78
--- /dev/null
+++ b/data/scripts/gUnk_0800DCAC.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800DCAC
+StartScript 
+_0807EF80 0x000a
+Call sub_08066E38
+StopScript 
+WaitForSomething2 0x00000001
+CallWithArg sub_0807F8E8, 0x00000000
+_0807E5F8 0x00000002
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+.short 0x0879
+.short 0x0010
diff --git a/data/scripts/gUnk_0800DCDC.inc b/data/scripts/gUnk_0800DCDC.inc
new file mode 100644
index 00000000..beb9af3b
--- /dev/null
+++ b/data/scripts/gUnk_0800DCDC.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DCDC
+Wait 0x003c
+_0807EF80 0x0010
+SetEntityPositionRelative 0x00680078
+WaitForSomething2 0x00000001
+SoundReq0x80100000 
+Call sub_08066E50
+SoundReq 0x01c9
+Call sub_0807F2D4
+.short 0x087b
diff --git a/data/scripts/gUnk_0800DD04.inc b/data/scripts/gUnk_0800DD04.inc
new file mode 100644
index 00000000..1a7f42c1
--- /dev/null
+++ b/data/scripts/gUnk_0800DD04.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800DD04
+.short 0x01ca
+.short 0x0831
+.short 0x003c
+.short 0x0879
+.short 0x0004
+.short 0x087c
diff --git a/data/scripts/gUnk_0800DD10.inc b/data/scripts/gUnk_0800DD10.inc
new file mode 100644
index 00000000..8612e296
--- /dev/null
+++ b/data/scripts/gUnk_0800DD10.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DD10
+.byte 0xb
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
diff --git a/data/scripts/gUnk_0800DD19.inc b/data/scripts/gUnk_0800DD19.inc
new file mode 100644
index 00000000..44db9bce
--- /dev/null
+++ b/data/scripts/gUnk_0800DD19.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DD19
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
diff --git a/data/scripts/gUnk_0800DD22.inc b/data/scripts/gUnk_0800DD22.inc
new file mode 100644
index 00000000..d42d1020
--- /dev/null
+++ b/data/scripts/gUnk_0800DD22.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_0800DD22
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x003c
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x0100
+_0807EEF4 0x0000, 0x0008
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x001e
+Call sub_08066E80
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EF80 0x0004
+Wait 0x003c
+.byte 0x61
+.byte 0x8
+.byte 0x2
diff --git a/data/scripts/gUnk_0800DD8D.inc b/data/scripts/gUnk_0800DD8D.inc
new file mode 100644
index 00000000..836543b8
--- /dev/null
+++ b/data/scripts/gUnk_0800DD8D.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800DD8D
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
diff --git a/data/scripts/gUnk_0800DDAA.inc b/data/scripts/gUnk_0800DDAA.inc
new file mode 100644
index 00000000..b54cfa42
--- /dev/null
+++ b/data/scripts/gUnk_0800DDAA.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800DDAA
+Wait 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x0100
+_0807EEF4 0x0000, 0x0080
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x140c
+.short 0xf4f9
+.short 0x0807
+.short 0x00a0
+.short 0x0000
+.short 0x0c73
+.short 0x0078
+.short 0x00a0
diff --git a/data/scripts/gUnk_0800DDE8.inc b/data/scripts/gUnk_0800DDE8.inc
new file mode 100644
index 00000000..f7f3205b
--- /dev/null
+++ b/data/scripts/gUnk_0800DDE8.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800DDE8
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
diff --git a/data/scripts/gUnk_0800DDFC.inc b/data/scripts/gUnk_0800DDFC.inc
new file mode 100644
index 00000000..e06fa928
--- /dev/null
+++ b/data/scripts/gUnk_0800DDFC.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800DDFC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DE00.inc b/data/scripts/gUnk_0800DE00.inc
new file mode 100644
index 00000000..6151a959
--- /dev/null
+++ b/data/scripts/gUnk_0800DE00.inc
@@ -0,0 +1,51 @@
+SCRIPT_START gUnk_0800DE00
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EB44 0x0000
+_0807EF80 0x000d
+_0807EF80 0x0000
+_0807ECC4 0x0010
+_0807EF80 0x000c
+_0807E5F8 0x00000004
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c77
+.short 0x0000
+.short 0x0080
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0402
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x140c
+.short 0xf239
+.short 0x0807
+.short 0x03c5
+.short 0x0000
+.short 0x0c0b
+.short 0xf305
+.short 0x0807
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_0800DE78.inc b/data/scripts/gUnk_0800DE78.inc
new file mode 100644
index 00000000..075549bb
--- /dev/null
+++ b/data/scripts/gUnk_0800DE78.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800DE78
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x0800deb0
+WaitForSomething2 0x00000001
+WaitForSomething2 0x00000002
+_0807EB28 0x1647
+_0807EA94 
+SetLocalFlag 0x007a
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DEB0.inc b/data/scripts/gUnk_0800DEB0.inc
new file mode 100644
index 00000000..9f9cb7d8
--- /dev/null
+++ b/data/scripts/gUnk_0800DEB0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DEB0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0198, 0x01c8
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DED4.inc b/data/scripts/gUnk_0800DED4.inc
new file mode 100644
index 00000000..1524793f
--- /dev/null
+++ b/data/scripts/gUnk_0800DED4.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800DED4
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x000b
+Call sub_08066D04
+StopScript 
+StartScript 
+.short 0x0c0b
+.short 0x6d15
+.short 0x0806
diff --git a/data/scripts/gUnk_0800DEF6.inc b/data/scripts/gUnk_0800DEF6.inc
new file mode 100644
index 00000000..af54a3f7
--- /dev/null
+++ b/data/scripts/gUnk_0800DEF6.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800DEF6
+SetEntityPositionRelative 0x01480198
+_0807EF80 0x0007
+StopScript 
+.byte 0x73
+.byte 0xc
+.byte 0x98
+.byte 0x1
+.byte 0xa8
diff --git a/data/scripts/gUnk_0800DF07.inc b/data/scripts/gUnk_0800DF07.inc
new file mode 100644
index 00000000..c2033e78
--- /dev/null
+++ b/data/scripts/gUnk_0800DF07.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800DF07
+.byte 0x1
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x4d
+.byte 0x6d
+.byte 0x6
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc
new file mode 100644
index 00000000..842a183a
--- /dev/null
+++ b/data/scripts/gUnk_0800DF24.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_0800DF24
+StartScript 
+_0807EF80 0x0008
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+SoundReq0x80100000 
+_0807E8E4_2 
+Wait 0x005a
+Call sub_0807F3F8
+Wait 0x003c
+_0807E8E4_0 
+_0807F0B4 0x0001
+CameraTargetEntity 
+Call sub_0807F5C0
+Call sub_08066C94
+Wait 0x00e9
+_0807EF80 0x0007
+TextboxNoOverlapFollowPos 0x162f, 0x0002
+_0807EA94 
+SoundReq2 0x002f
+_0807EF80 0x0019
+SoundReq 0x0198
+Call sub_0807F2D4
+SetRoomFlag 0x0000
+_0807EF80 0x0008
+Wait 0x0080
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807F5C0
+SetLocalFlag 0x0078
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc
new file mode 100644
index 00000000..7697f328
--- /dev/null
+++ b/data/scripts/gUnk_0800DFB4.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DFB4
+StopScript 
+CheckRoomFlag 0x0001
+JumpIfNot 0xfffa
+SoundReq0x80100000 
+_0807E864 
+Call sub_0807DF28
+SoundReq 0x00f6
+.short 0x140c
+.short 0xda1d
diff --git a/data/scripts/gUnk_0800DFD0.inc b/data/scripts/gUnk_0800DFD0.inc
new file mode 100644
index 00000000..3ff0be81
--- /dev/null
+++ b/data/scripts/gUnk_0800DFD0.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800DFD0
+_0807E078 0x0004
+.byte 0x0
+.byte 0x0
+.byte 0xb
diff --git a/data/scripts/gUnk_0800DFD7.inc b/data/scripts/gUnk_0800DFD7.inc
new file mode 100644
index 00000000..ff2789b8
--- /dev/null
+++ b/data/scripts/gUnk_0800DFD7.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800DFD7
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
diff --git a/data/scripts/gUnk_0800DFDE.inc b/data/scripts/gUnk_0800DFDE.inc
new file mode 100644
index 00000000..d2d8c0eb
--- /dev/null
+++ b/data/scripts/gUnk_0800DFDE.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800DFDE
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc
new file mode 100644
index 00000000..fa5c2ad2
--- /dev/null
+++ b/data/scripts/gUnk_0800DFE4.inc
@@ -0,0 +1,29 @@
+SCRIPT_START gUnk_0800DFE4
+StartScript 
+Call sub_0807DF28
+_0807E864 
+StopScript 
+SoundReq0x80100000 
+TextboxNoOverlapFollowPos 0x1632, 0x0002
+_0807EA94 
+SetRoomFlag 0x0003
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+SoundReq2 0x0030
+Call sub_0807DF50
+_0807E878 
+CheckRoomFlag 0x0002
+JumpIfNot 0xfffa
+_0807E864 
+Call sub_0807DF28
+SetLocalFlag 0x007b
+TextboxNoOverlapFollowPos 0x1639, 0x000c
+_0807EA94 
+Wait 0x0096
+SoundReq 0x00f6
+CallWithArg sub_0806DA1C, 0x00000005
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E050.inc b/data/scripts/gUnk_0800E050.inc
new file mode 100644
index 00000000..d3d3ee42
--- /dev/null
+++ b/data/scripts/gUnk_0800E050.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800E050
+StartScript 
+Call sub_0807DF28
+_0807E864 
+StopScript 
+SoundReq0x80100000 
+SoundReq0x80100000 
+Wait 0x0078
+_0807EB28 0x1638
+_0807EA94 
+SetRoomFlag 0x0000
+Wait 0x001e
+_0807E5F8 0x00000001
+StartPlayerScript 0x0800e094
+WaitForSomething2 0x00000002
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x00c0
+.short 0x0402
+.short 0x0c33
+.short 0x0001
+.short 0x0000
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x00a8
+.short 0x002c
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc
new file mode 100644
index 00000000..3c5626c5
--- /dev/null
+++ b/data/scripts/gUnk_0800E0BC.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800E0BC
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0093
+JumpIf 0x0062
+_0807E930 0x0008
+CallWithArg sub_0807F8E8, 0x00000000
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+.short 0x0850
diff --git a/data/scripts/gUnk_0800E0F6.inc b/data/scripts/gUnk_0800E0F6.inc
new file mode 100644
index 00000000..aae1f893
--- /dev/null
+++ b/data/scripts/gUnk_0800E0F6.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_0800E0F6
+.short 0x0009
+.short 0x0831
+.short 0x003c
+.short 0x087b
+.short 0x01ca
+.short 0x0879
+.short 0x0010
+.short 0x0831
+.short 0x001e
+.short 0x087b
+.short 0x0072
+.short 0x0831
+.short 0x0078
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x001e
+.short 0x0879
+.short 0x0000
+.short 0x0464
+.short 0x0463
+.short 0x0831
+.short 0x000a
+.short 0x085b
+.short 0x2402
+.short 0x0459
+.short 0x082a
+.short 0x0093
+.short 0x0c0b
+.short 0x68f1
+.short 0x0806
+.short 0x0444
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
diff --git a/data/scripts/gUnk_0800E140.inc b/data/scripts/gUnk_0800E140.inc
new file mode 100644
index 00000000..1c76ce25
--- /dev/null
+++ b/data/scripts/gUnk_0800E140.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800E140
+_0807EB74 
+TextboxNoOverlap 0x2402
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+.byte 0x0
diff --git a/data/scripts/gUnk_0800E153.inc b/data/scripts/gUnk_0800E153.inc
new file mode 100644
index 00000000..dc8aa199
--- /dev/null
+++ b/data/scripts/gUnk_0800E153.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800E153
+.byte 0x0
diff --git a/data/scripts/gUnk_0800E154.inc b/data/scripts/gUnk_0800E154.inc
new file mode 100644
index 00000000..8120e6dd
--- /dev/null
+++ b/data/scripts/gUnk_0800E154.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800E154
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0094
+JumpIf 0x006c
+_0807E930 0x0010
+CallWithArg sub_0807F8E8, 0x00000001
+StopScript 
+CheckRoomFlag 0x0001
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+_0807E930 0x0015
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB8C 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+.byte 0x31
+.byte 0x8
+.byte 0xa
diff --git a/data/scripts/gUnk_0800E1C5.inc b/data/scripts/gUnk_0800E1C5.inc
new file mode 100644
index 00000000..b1fb4da9
--- /dev/null
+++ b/data/scripts/gUnk_0800E1C5.inc
@@ -0,0 +1,60 @@
+SCRIPT_START gUnk_0800E1C5
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x1
+.byte 0x24
+.byte 0x59
+.byte 0x4
+.byte 0x2a
+.byte 0x8
+.byte 0x94
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x53
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x1
+.byte 0x24
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe2
+.byte 0xff
diff --git a/data/scripts/gUnk_0800E200.inc b/data/scripts/gUnk_0800E200.inc
new file mode 100644
index 00000000..287a4365
--- /dev/null
+++ b/data/scripts/gUnk_0800E200.inc
@@ -0,0 +1,64 @@
+SCRIPT_START gUnk_0800E200
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0073
+JumpIfNot 0x001e
+_0807E9D4 
+SetEntityPositionRelative 0x01680070
+_0807EB44 0x0002
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+Jump 0x00fe
+CheckLocalFlag 0x0095
+JumpIf 0x0062
+_0807E930 0x0010
+CallWithArg sub_0807F8E8, 0x00000002
+StopScript 
+CheckRoomFlag 0x0002
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+_0807E930 0x0015
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB8C 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+SetLocalFlag 0x0095
+_0807EF80 0x0000
+CallWithArg sub_0807F3D8, 0x00000000
+_0807E9D4 
+_0807E878 
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x005c
+CheckLocalFlag 0x0093
+JumpIfNot 0xfff0
+CheckLocalFlag 0x0094
+JumpIfNot 0xffe8
+CheckLocalFlag 0x0095
+JumpIfNot 0xffe0
+_0807E9DC 
+SetLocalFlag 0x0073
+StopScript 
+_0807EB44 0x0000
+CallWithArg sub_0807F3D8, 0x00000004
+_0807EDD4 0x0088, 0x0168
+_0807EB44 0x0006
+CallWithArg sub_0807F3D8, 0x00000004
+.short 0x0c73
+.short 0x0070
+.short 0x0168
diff --git a/data/scripts/gUnk_0800E300.inc b/data/scripts/gUnk_0800E300.inc
new file mode 100644
index 00000000..e94132c2
--- /dev/null
+++ b/data/scripts/gUnk_0800E300.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800E300
+_0807EB74 
+.byte 0xc
+.byte 0x14
+.byte 0xd9
diff --git a/data/scripts/gUnk_0800E305.inc b/data/scripts/gUnk_0800E305.inc
new file mode 100644
index 00000000..cdb3ea4d
--- /dev/null
+++ b/data/scripts/gUnk_0800E305.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800E305
+.short 0x07f3
diff --git a/data/scripts/gUnk_0800E307.inc b/data/scripts/gUnk_0800E307.inc
new file mode 100644
index 00000000..5d62dd31
--- /dev/null
+++ b/data/scripts/gUnk_0800E307.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800E307
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800E30C.inc b/data/scripts/gUnk_0800E30C.inc
new file mode 100644
index 00000000..88f350a3
--- /dev/null
+++ b/data/scripts/gUnk_0800E30C.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800E30C
+_0807E9D4 
+Jump 0x001e
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+TextboxNoOverlap 0x2404
+_0807EA94 
+.byte 0x44
diff --git a/data/scripts/gUnk_0800E329.inc b/data/scripts/gUnk_0800E329.inc
new file mode 100644
index 00000000..f1d61aad
--- /dev/null
+++ b/data/scripts/gUnk_0800E329.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800E329
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x82
+.byte 0xff
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x3
+.byte 0x24
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe2
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800E350.inc b/data/scripts/gUnk_0800E350.inc
new file mode 100644
index 00000000..9a0449e6
--- /dev/null
+++ b/data/scripts/gUnk_0800E350.inc
@@ -0,0 +1,47 @@
+SCRIPT_START gUnk_0800E350
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0071
+JumpIf 0x0088
+CheckLocalFlag 0x0096
+JumpIf 0x0056
+_0807E930 0x000c
+CallWithArg sub_0807F8E8, 0x00000000
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+_0807E930 0x000d
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB74 
+SetLocalFlag 0x0096
+_0807EF80 0x0000
+_0807E9D4 
+_0807E878 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x240c
+_0807EA94 
+Wait 0x000f
+_0807F034 0x0053
+WaitPlayerAction8 
+SetLocalFlag 0x0071
+_0807E878 
+_0807E9D4 
+_0807E878 
+StopScript 
diff --git a/data/scripts/gUnk_0800E3EE.inc b/data/scripts/gUnk_0800E3EE.inc
new file mode 100644
index 00000000..12ba23bc
--- /dev/null
+++ b/data/scripts/gUnk_0800E3EE.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800E3EE
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+.byte 0x5b
diff --git a/data/scripts/gUnk_0800E3F9.inc b/data/scripts/gUnk_0800E3F9.inc
new file mode 100644
index 00000000..c1c452d1
--- /dev/null
+++ b/data/scripts/gUnk_0800E3F9.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800E3F9
+.byte 0x8
diff --git a/data/scripts/gUnk_0800E3FA.inc b/data/scripts/gUnk_0800E3FA.inc
new file mode 100644
index 00000000..4c052ab0
--- /dev/null
+++ b/data/scripts/gUnk_0800E3FA.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800E3FA
+.short 0x240d
diff --git a/data/scripts/gUnk_0800E3FC.inc b/data/scripts/gUnk_0800E3FC.inc
new file mode 100644
index 00000000..282136e7
--- /dev/null
+++ b/data/scripts/gUnk_0800E3FC.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800E3FC
+_0807EA94 
+.short 0x0831
diff --git a/data/scripts/gUnk_0800E400.inc b/data/scripts/gUnk_0800E400.inc
new file mode 100644
index 00000000..e22e6d14
--- /dev/null
+++ b/data/scripts/gUnk_0800E400.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800E400
+.short 0x000f
+.short 0x0444
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_0800E408.inc b/data/scripts/gUnk_0800E408.inc
new file mode 100644
index 00000000..2f60c694
--- /dev/null
+++ b/data/scripts/gUnk_0800E408.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800E408
+StartScript 
+.byte 0x61
diff --git a/data/scripts/gUnk_0800E40B.inc b/data/scripts/gUnk_0800E40B.inc
new file mode 100644
index 00000000..224feb8f
--- /dev/null
+++ b/data/scripts/gUnk_0800E40B.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800E40B
+.short 0x0208
+.short 0x7900
+.short 0x0a08
diff --git a/data/scripts/gUnk_0800E411.inc b/data/scripts/gUnk_0800E411.inc
new file mode 100644
index 00000000..c9db5d83
--- /dev/null
+++ b/data/scripts/gUnk_0800E411.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_0800E411
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xf1
+.byte 0x68
+.byte 0x6
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0x5b
+.byte 0x8
+.byte 0x6
+.byte 0x24
+.byte 0x59
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
diff --git a/data/scripts/gUnk_0800E430.inc b/data/scripts/gUnk_0800E430.inc
new file mode 100644
index 00000000..3af172e9
--- /dev/null
+++ b/data/scripts/gUnk_0800E430.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800E430
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_0800E434.inc b/data/scripts/gUnk_0800E434.inc
new file mode 100644
index 00000000..0780d5bc
--- /dev/null
+++ b/data/scripts/gUnk_0800E434.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800E434
+StartScript 
+_0807EB44 0x0002
+CallWithArg sub_0807F3D8, 0x00000000
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+TextboxNoOverlap 0x2405
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffe2
diff --git a/data/scripts/gUnk_0800E46C.inc b/data/scripts/gUnk_0800E46C.inc
new file mode 100644
index 00000000..598e5559
--- /dev/null
+++ b/data/scripts/gUnk_0800E46C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800E46C
+StartScript 
+_0807EB44 0x0004
+CallWithArg sub_0807F3D8, 0x00000000
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+.byte 0x5
+.byte 0x8
+.byte 0xfc
diff --git a/data/scripts/gUnk_0800E489.inc b/data/scripts/gUnk_0800E489.inc
new file mode 100644
index 00000000..2bedfe87
--- /dev/null
+++ b/data/scripts/gUnk_0800E489.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800E489
+.short 0x43ff
+.short 0x6304
+.short 0x0c04
+.short 0xd914
+.short 0x07f3
+.short 0x0008
+.short 0x0000
+.short 0x5b00
diff --git a/data/scripts/gUnk_0800E499.inc b/data/scripts/gUnk_0800E499.inc
new file mode 100644
index 00000000..6970feeb
--- /dev/null
+++ b/data/scripts/gUnk_0800E499.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800E499
+.byte 0x8
+.byte 0x7
+.byte 0x24
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe2
+.byte 0xff
diff --git a/data/scripts/gUnk_0800E4A4.inc b/data/scripts/gUnk_0800E4A4.inc
new file mode 100644
index 00000000..51402646
--- /dev/null
+++ b/data/scripts/gUnk_0800E4A4.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800E4A4
+StartScript 
+Call sub_0807F354
+StopScript 
+CheckLocalFlag 0x007c
+JumpIf 0x0046
+CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
+JumpIfNot 0xfff6
+StartScript 
+_0807E864 
+StopScript 
+Call sub_0807F3F8
+Wait 0x003c
+TextboxNoOverlapFollow 0x160c
+_0807EA94 
+Wait 0x001e
+TextboxNoOverlapFollow 0x160d
+_0807EA94 
+.byte 0x31
diff --git a/data/scripts/gUnk_0800E4E3.inc b/data/scripts/gUnk_0800E4E3.inc
new file mode 100644
index 00000000..dfbba668
--- /dev/null
+++ b/data/scripts/gUnk_0800E4E3.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_0800E4E3
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x5f
+.byte 0x8
+.byte 0xe
+.byte 0x16
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0x7c
+.byte 0x8
+.byte 0x33
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0x7c
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800E504.inc b/data/scripts/gUnk_0800E504.inc
new file mode 100644
index 00000000..5466e088
--- /dev/null
+++ b/data/scripts/gUnk_0800E504.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800E504
+StartScript 
+StopScript 
+.short 0x0812
+.short 0x007d
diff --git a/data/scripts/gUnk_0800E50C.inc b/data/scripts/gUnk_0800E50C.inc
new file mode 100644
index 00000000..75f145fe
--- /dev/null
+++ b/data/scripts/gUnk_0800E50C.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800E50C
+JumpIf 0x002e
+CheckPlayerInRegion 0x00a8, 0x0178, 0x1080
+JumpIfNot 0xfff6
+_0807E864 
+Wait 0x001e
+Call sub_0807F3F8
+Wait 0x003c
+SoundReq 0x0105
+Wait 0x001e
+_0807EB28 0x1617
+SetLocalFlag 0x007d
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E544.inc b/data/scripts/gUnk_0800E544.inc
new file mode 100644
index 00000000..3b997d96
--- /dev/null
+++ b/data/scripts/gUnk_0800E544.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800E544
+StartScript 
+StopScript 
+CheckLocalFlag 0x007e
+JumpIf 0x0034
+CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880
+JumpIfNot 0xfff6
+_0807E864 
+Wait 0x001e
+Call sub_0807F3F8
+Wait 0x003c
+SoundReq 0x0105
+Wait 0x001e
+_0807EB28 0x1622
+Call sub_08053494
+SetLocalFlag 0x007e
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E58C.inc b/data/scripts/gUnk_0800E58C.inc
new file mode 100644
index 00000000..db10f91a
--- /dev/null
+++ b/data/scripts/gUnk_0800E58C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800E58C
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0000
+_0807EF80 0x0014
+StopScript 
+Wait 0x003c
+SoundReq 0x0105
+Wait 0x003c
+SoundReq 0x009b
+Wait 0x001e
+TextboxNoOverlap 0x1625
+_0807EA94 
+Wait 0x003c
+Call sub_08053C84
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E5C4.inc b/data/scripts/gUnk_0800E5C4.inc
new file mode 100644
index 00000000..80384901
--- /dev/null
+++ b/data/scripts/gUnk_0800E5C4.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800E5C4
+StartScript 
+CheckLocalFlag 0x0086
+JumpIfNot 0x000a
+_0807EF80 0x0006
+StopScript 
+SCRIPT_END
+.short 0x0402
+.short 0x0812
+.short 0x0086
+.short 0x0805
+.short 0xfffa
+.short 0x0443
+.short 0x0831
+.short 0x003c
+.short 0x0c4e
+.short 0x0905
+.short 0x0000
+.short 0x0c0b
+.short 0xf421
+.short 0x0807
+.short 0x082f
+.short 0x0001
+.short 0x0831
+.short 0x001e
+.short 0x0444
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E600.inc b/data/scripts/gUnk_0800E600.inc
new file mode 100644
index 00000000..b61b17a2
--- /dev/null
+++ b/data/scripts/gUnk_0800E600.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800E600
+StartScript 
+SetEntityNonPlanarMovement 0x0140
+SetEntityDirection 0x0000
+_0807E864 
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800E60E.inc b/data/scripts/gUnk_0800E60E.inc
new file mode 100644
index 00000000..0982add4
--- /dev/null
+++ b/data/scripts/gUnk_0800E60E.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800E60E
+.short 0xf355
+.short 0x0807
+.short 0x0402
+.short 0x0435
+.short 0x0449
+.short 0x0879
+.short 0x0001
+.short 0x0c0b
+.short 0x52ad
+.short 0x0807
+.short 0x0444
+.short 0x0c0b
+.short 0x91d1
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_0800E62C.inc b/data/scripts/gUnk_0800E62C.inc
new file mode 100644
index 00000000..b2267bf5
--- /dev/null
+++ b/data/scripts/gUnk_0800E62C.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800E62C
+StartScript 
+SetEntityNonPlanarMovement 0x0140
+SetEntityDirection 0x0008
+_0807E864 
+Call sub_0807F354
+StopScript 
+WaitForPlayerAction0x17 
+_0807E8E4_1 
+_0807EF80 0x0001
+Call sub_080752AC
+_0807E878 
+Call sub_080791D0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E658.inc b/data/scripts/gUnk_0800E658.inc
new file mode 100644
index 00000000..f51cd3cf
--- /dev/null
+++ b/data/scripts/gUnk_0800E658.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800E658
+StartScript 
+SetEntityNonPlanarMovement 0x0140
+SetEntityDirection 0x0010
+_0807E864 
+Call sub_0807F354
+StopScript 
+WaitForPlayerAction0x17 
+_0807E8E4_2 
+_0807EF80 0x0001
+Call sub_080752AC
+_0807E878 
+Call sub_080791D0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E684.inc b/data/scripts/gUnk_0800E684.inc
new file mode 100644
index 00000000..d59676bc
--- /dev/null
+++ b/data/scripts/gUnk_0800E684.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800E684
+StartScript 
+SetEntityNonPlanarMovement 0x0140
+SetEntityDirection 0x0018
+_0807E864 
+Call sub_0807F354
+StopScript 
+WaitForPlayerAction0x17 
+_0807E8E4_3 
+_0807EF80 0x0001
+Call sub_080752AC
+_0807E878 
+Call sub_080791D0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc
new file mode 100644
index 00000000..e85b52c7
--- /dev/null
+++ b/data/scripts/gUnk_0800E6B0.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800E6B0
+StartScript 
+Call sub_08060090
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call sub_08060158
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call sub_0806025C
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffd8
diff --git a/data/scripts/gUnk_0800E6E8.inc b/data/scripts/gUnk_0800E6E8.inc
new file mode 100644
index 00000000..413751e4
--- /dev/null
+++ b/data/scripts/gUnk_0800E6E8.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800E6E8
+StartScript 
+Call sub_0806ADFC
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000c
+Call sub_0806AEE4
+.byte 0x3
+.byte 0x8
+.byte 0xee
diff --git a/data/scripts/gUnk_0800E707.inc b/data/scripts/gUnk_0800E707.inc
new file mode 100644
index 00000000..8035a1e5
--- /dev/null
+++ b/data/scripts/gUnk_0800E707.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800E707
+.byte 0xff
+.byte 0x2
+.byte 0x4
diff --git a/data/scripts/gUnk_0800E70A.inc b/data/scripts/gUnk_0800E70A.inc
new file mode 100644
index 00000000..da9019d6
--- /dev/null
+++ b/data/scripts/gUnk_0800E70A.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800E70A
+_0807E864 
+Call sub_0806AFE8
+JumpIf 0x000e
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd4
+_0807EA94 
+_0807F034 0x0057
+WaitPlayerAction8 
+_0807EA94 
+_0807E878 
+Jump 0xffc4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E734.inc b/data/scripts/gUnk_0800E734.inc
new file mode 100644
index 00000000..da7702f0
--- /dev/null
+++ b/data/scripts/gUnk_0800E734.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800E734
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0806AF60, 0x00000000
+Call sub_0806AFE8
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffe0
diff --git a/data/scripts/gUnk_0800E760.inc b/data/scripts/gUnk_0800E760.inc
new file mode 100644
index 00000000..7874911e
--- /dev/null
+++ b/data/scripts/gUnk_0800E760.inc
@@ -0,0 +1,33 @@
+SCRIPT_START gUnk_0800E760
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+SetEntityNonPlanarMovement 0x0200
+CheckGlobalFlag 0x0029
+JumpIfNot 0x000a
+CheckGlobalFlag 0x002a
+JumpIfNot 0x000c
+SetEntityPositionRelative 0x00980188
+Jump 0xff70
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002a
+JumpIf 0x002a
+CheckEntityInteractType 
+JumpIf 0x000e
+Call sub_0806AEE4
+StopScript 
+Jump 0xffe6
+StopScript 
+_0807E864 
+Call sub_0806AFE8
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd0
+_0807EF80 0x000f
+_0807EB44 0x0002
+CallWithArg sub_0806AF60, 0x00000004
+Call sub_0806AF70
+_0807EE04 0x0188, 0x0058
+.byte 0x2
diff --git a/data/scripts/gUnk_0800E7D9.inc b/data/scripts/gUnk_0800E7D9.inc
new file mode 100644
index 00000000..a52e81a7
--- /dev/null
+++ b/data/scripts/gUnk_0800E7D9.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800E7D9
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x79
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x75
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xf2
+.byte 0xff
+.byte 0x25
+.byte 0x4
+.byte 0x4
+.byte 0x8
+.byte 0xec
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x2
+.byte 0xff
diff --git a/data/scripts/gUnk_0800E7F4.inc b/data/scripts/gUnk_0800E7F4.inc
new file mode 100644
index 00000000..79a91c3e
--- /dev/null
+++ b/data/scripts/gUnk_0800E7F4.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800E7F4
+StartScript 
+.short 0x0c0b
+.short 0xc675
diff --git a/data/scripts/gUnk_0800E7FA.inc b/data/scripts/gUnk_0800E7FA.inc
new file mode 100644
index 00000000..d0195f28
--- /dev/null
+++ b/data/scripts/gUnk_0800E7FA.inc
@@ -0,0 +1,39 @@
+SCRIPT_START gUnk_0800E7FA
+_0807E078 0x0879
+.byte 0xa
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xd
+.byte 0xc7
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xe6
+.byte 0xff
+.byte 0x0
diff --git a/data/scripts/gUnk_0800E823.inc b/data/scripts/gUnk_0800E823.inc
new file mode 100644
index 00000000..2b318c88
--- /dev/null
+++ b/data/scripts/gUnk_0800E823.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800E823
+.byte 0x0
diff --git a/data/scripts/gUnk_0800E824.inc b/data/scripts/gUnk_0800E824.inc
new file mode 100644
index 00000000..4167d136
--- /dev/null
+++ b/data/scripts/gUnk_0800E824.inc
@@ -0,0 +1,133 @@
+SCRIPT_START gUnk_0800E824
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB44 0x0004
+StartScript 
+TextboxNoOverlapFollow 0x4501
+CallWithArg sub_0807F854, 0x00010032
+CallWithArg sub_0807F854, 0x000200c8
+CallWithArg sub_0807F854, 0x00030190
+StopScript 
+_0807EA94 
+_0807EB38 
+.byte 0x6
+.byte 0x14
+.byte 0xa6
+.byte 0x0
+.byte 0x6a
+.byte 0x0
+.byte 0x36
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x5
+.byte 0x45
+.byte 0xc
+.byte 0x14
+.byte 0x55
+.byte 0xf8
+.byte 0x7
+.byte 0x8
+.byte 0x90
+.byte 0x1
+.byte 0x1
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x59
+.byte 0x4
+.byte 0x1a
+.byte 0x8
+.byte 0x90
+.byte 0x1
+.byte 0x5
+.byte 0x8
+.byte 0x7c
+.byte 0x0
+.byte 0x7f
+.byte 0x8
+.byte 0x70
+.byte 0xfe
+.byte 0x2a
+.byte 0x8
+.byte 0x91
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x8
+.byte 0x45
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x79
+.byte 0xc5
+.byte 0x6
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x1
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x4
+.byte 0x45
+.byte 0xc
+.byte 0x14
+.byte 0x55
+.byte 0xf8
+.byte 0x7
+.byte 0x8
+.byte 0xc8
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x59
+.byte 0x4
+.byte 0x1a
+.byte 0x8
+.byte 0xc8
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x4a
+.byte 0x0
+.byte 0x7f
+.byte 0x8
+.byte 0x38
+.byte 0xff
+.byte 0x2a
+.byte 0x8
+.byte 0x91
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x8
+.byte 0x45
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x89
+.byte 0xc5
+.byte 0x6
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x1
+.byte 0x4
+.byte 0x5a
+.byte 0x8
+.byte 0x3
diff --git a/data/scripts/gUnk_0800E8DB.inc b/data/scripts/gUnk_0800E8DB.inc
new file mode 100644
index 00000000..0387d346
--- /dev/null
+++ b/data/scripts/gUnk_0800E8DB.inc
@@ -0,0 +1,70 @@
+SCRIPT_START gUnk_0800E8DB
+.byte 0x45
+.byte 0xc
+.byte 0x14
+.byte 0x55
+.byte 0xf8
+.byte 0x7
+.byte 0x8
+.byte 0x32
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x59
+.byte 0x4
+.byte 0x1a
+.byte 0x8
+.byte 0x32
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x18
+.byte 0x0
+.byte 0x7f
+.byte 0x8
+.byte 0xce
+.byte 0xff
+.byte 0x2a
+.byte 0x8
+.byte 0x91
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x8
+.byte 0x45
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x99
+.byte 0xc5
+.byte 0x6
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x5a
+.byte 0x8
+.byte 0x7
+.byte 0x45
+.byte 0x3
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x9
+.byte 0x45
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x14
+.byte 0xff
diff --git a/data/scripts/gUnk_0800E920.inc b/data/scripts/gUnk_0800E920.inc
new file mode 100644
index 00000000..4d9a3ccf
--- /dev/null
+++ b/data/scripts/gUnk_0800E920.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800E920
+StartScript 
+Call sub_0806C4F8
+_0807EF80 0x000a
+_0807EB44 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB44 0x0004
+_0807E930 0x0004
+Call sub_0806C4A8
+JumpIfNot 0xfff8
+Call sub_0806C4DC
+_0807EA94 
+_0807E878 
+_0807EB44 0x0000
+_0807E930 0x0000
+Jump 0xffd2
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E964.inc b/data/scripts/gUnk_0800E964.inc
new file mode 100644
index 00000000..79094ddf
--- /dev/null
+++ b/data/scripts/gUnk_0800E964.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800E964
+StartScript 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E930 0x0008
+Call sub_0807F2D4
+_0807E930 0x0009
+Call sub_0806B260
+JumpIfNot 0x0052
+_0807EA94 
+_0807EF80 0x000b
+StartPlayerScript 0x0800e9f4
+WaitForSomething2 0x00000001
+_0807EF80 0x000a
+TextboxNoOverlapFollow 0x4a24
+_0807EA94 
+_0807E930 0x000a
+Wait 0x0014
+TextboxNoOverlapFollow 0x4a25
+_0807EA94 
+_0807E930 0x0000
+StartPlayerScript 0x0800ea1c
+WaitForSomething2 0x00000001
+SetLocalFlag 0x0074
+.short 0x087b
+.short 0x0072
diff --git a/data/scripts/gUnk_0800E9D6.inc b/data/scripts/gUnk_0800E9D6.inc
new file mode 100644
index 00000000..e8ebfeed
--- /dev/null
+++ b/data/scripts/gUnk_0800E9D6.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800E9D6
+Wait 0x00f0
+TextboxNoOverlapFollow 0x4a26
+_0807EA94 
+SetLocalFlag 0x0075
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807E930 0x0000
+.short 0x0803
+.short 0xff82
diff --git a/data/scripts/gUnk_0800E9F4.inc b/data/scripts/gUnk_0800E9F4.inc
new file mode 100644
index 00000000..029ea843
--- /dev/null
+++ b/data/scripts/gUnk_0800E9F4.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800E9F4
+StartScript 
+_0807EB44 0x0004
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0078, 0x0080
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800EA1C.inc b/data/scripts/gUnk_0800EA1C.inc
new file mode 100644
index 00000000..49a32db0
--- /dev/null
+++ b/data/scripts/gUnk_0800EA1C.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800EA1C
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x0014
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x0014
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x0005
+Wait 0x003c
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc
new file mode 100644
index 00000000..baf1c112
--- /dev/null
+++ b/data/scripts/gUnk_0800EA54.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800EA54
+StartScript 
+Call sub_0806CE5C
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0008
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000004
+Call sub_0807F2D4
+_0807E930 0x0009
+Call sub_0806CE80
+_0807EA94 
+_0807E878 
+_0807E930 0x000a
+Call sub_0807F2D4
+_0807E930 0x0008
+.short 0x0803
+.short 0xffc8
diff --git a/data/scripts/gUnk_0800EAA4.inc b/data/scripts/gUnk_0800EAA4.inc
new file mode 100644
index 00000000..626dc0dd
--- /dev/null
+++ b/data/scripts/gUnk_0800EAA4.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_0800EAA4
+StartScript 
+_0807E9D4 
+Call sub_0806C09C
+_0807EF80 0x000a
+_0807E930 0x0000
+_0807EB44 0x0004
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+StartScript 
+_0807E864 
+_0807EB74 
+CallWithArg sub_0806C028, 0x00000004
+StopScript 
+Call sub_0806C00C
+JumpIfNot 0xfff8
+_0807E930 0x0008
+Call sub_0806C038
+_0807EA94 
+.byte 0x31
diff --git a/data/scripts/gUnk_0800EAEB.inc b/data/scripts/gUnk_0800EAEB.inc
new file mode 100644
index 00000000..11bceabe
--- /dev/null
+++ b/data/scripts/gUnk_0800EAEB.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800EAEB
+.byte 0x8
+.byte 0xf
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x50
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xc6
+.byte 0xff
diff --git a/data/scripts/gUnk_0800EAF8.inc b/data/scripts/gUnk_0800EAF8.inc
new file mode 100644
index 00000000..1a376bd3
--- /dev/null
+++ b/data/scripts/gUnk_0800EAF8.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800EAF8
+StartScript 
+Call sub_0806C870
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EB2C.inc b/data/scripts/gUnk_0800EB2C.inc
new file mode 100644
index 00000000..bf9bb96b
--- /dev/null
+++ b/data/scripts/gUnk_0800EB2C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800EB2C
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call sub_08061FD8
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FD8
+Call sub_08062048
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EB64.inc b/data/scripts/gUnk_0800EB64.inc
new file mode 100644
index 00000000..4b9c3f44
--- /dev/null
+++ b/data/scripts/gUnk_0800EB64.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0800EB64
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+_0807EB44 0x0006
+Call sub_08061FD8
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FD8
+Call sub_08062048
+_0807EA94 
+_0807E878 
+_0807EB44 0x0006
+Call sub_08061FD8
+Jump 0xffda
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+_0807EB44 0x0002
+Call sub_08061FD8
+StopScript 
+.short 0x0803
+.short 0x0036
diff --git a/data/scripts/gUnk_0800EBC0.inc b/data/scripts/gUnk_0800EBC0.inc
new file mode 100644
index 00000000..5d826fef
--- /dev/null
+++ b/data/scripts/gUnk_0800EBC0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800EBC0
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call sub_08061FD8
+StopScript 
+.short 0x0803
+.short 0x001a
diff --git a/data/scripts/gUnk_0800EBDC.inc b/data/scripts/gUnk_0800EBDC.inc
new file mode 100644
index 00000000..ed2c5da1
--- /dev/null
+++ b/data/scripts/gUnk_0800EBDC.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800EBDC
+StartScript 
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800EBE0.inc b/data/scripts/gUnk_0800EBE0.inc
new file mode 100644
index 00000000..b1480401
--- /dev/null
+++ b/data/scripts/gUnk_0800EBE0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800EBE0
+.short 0x1e71
+.short 0x0806
+.short 0x0879
+.short 0x000a
+.short 0x0861
+.short 0x0006
+.short 0x0c0b
+.short 0x1fd9
diff --git a/data/scripts/gUnk_0800EBF0.inc b/data/scripts/gUnk_0800EBF0.inc
new file mode 100644
index 00000000..c5a4bdd0
--- /dev/null
+++ b/data/scripts/gUnk_0800EBF0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800EBF0
+_0807E078 0x0402
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FD8
+.short 0x0c0b
+.short 0x2049
diff --git a/data/scripts/gUnk_0800EC08.inc b/data/scripts/gUnk_0800EC08.inc
new file mode 100644
index 00000000..4c6e46e4
--- /dev/null
+++ b/data/scripts/gUnk_0800EC08.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800EC08
+_0807E078 0x0459
+_0807E878 
+Jump 0xffe4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EC14.inc b/data/scripts/gUnk_0800EC14.inc
new file mode 100644
index 00000000..40d32fda
--- /dev/null
+++ b/data/scripts/gUnk_0800EC14.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800EC14
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+_0807EB44 0x0002
+Call sub_08061FD8
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FD8
+Call sub_08062048
+_0807EA94 
+_0807E878 
+_0807EB44 0x0002
+Call sub_08061FD8
+.short 0x0803
+.short 0xffda
diff --git a/data/scripts/gUnk_0800EC54.inc b/data/scripts/gUnk_0800EC54.inc
new file mode 100644
index 00000000..74b8261c
--- /dev/null
+++ b/data/scripts/gUnk_0800EC54.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800EC54
+StartScript 
+Call sub_08061E70
+_0807EF80 0x000a
+.byte 0x61
diff --git a/data/scripts/gUnk_0800EC61.inc b/data/scripts/gUnk_0800EC61.inc
new file mode 100644
index 00000000..64187010
--- /dev/null
+++ b/data/scripts/gUnk_0800EC61.inc
@@ -0,0 +1,44 @@
+SCRIPT_START gUnk_0800EC61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0x1f
+.byte 0x6
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0x1f
+.byte 0x6
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0x49
+.byte 0x20
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe4
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800EC8C.inc b/data/scripts/gUnk_0800EC8C.inc
new file mode 100644
index 00000000..093d3ac9
--- /dev/null
+++ b/data/scripts/gUnk_0800EC8C.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0800EC8C
+StartScript 
+_0807E9D4 
+CallWithArg sub_08061FB8, 0x00000001
+SetEntityNonPlanarMovement 0x0040
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0002
+StopScript 
+_0807EB44 0x0006
+_0807E930 0x0007
+_0807EDD4 0x0028, 0x0050
+Wait 0x001e
+_0807EB44 0x0004
+_0807E930 0x0002
+Wait 0x001e
+_0807EB44 0x0002
+_0807E930 0x0001
+Wait 0x001e
+_0807EB44 0x0002
+_0807E930 0x0005
+_0807EDD4 0x0048, 0x0050
+Wait 0x001e
+_0807EB44 0x0004
+_0807E930 0x0002
+.byte 0x31
diff --git a/data/scripts/gUnk_0800ECF1.inc b/data/scripts/gUnk_0800ECF1.inc
new file mode 100644
index 00000000..70ec0120
--- /dev/null
+++ b/data/scripts/gUnk_0800ECF1.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800ECF1
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xaa
+.byte 0xff
diff --git a/data/scripts/gUnk_0800ED04.inc b/data/scripts/gUnk_0800ED04.inc
new file mode 100644
index 00000000..1300437f
--- /dev/null
+++ b/data/scripts/gUnk_0800ED04.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800ED04
+StartScript 
+.short 0x0c0b
+.short 0x39d1
+.short 0x0806
diff --git a/data/scripts/gUnk_0800ED0C.inc b/data/scripts/gUnk_0800ED0C.inc
new file mode 100644
index 00000000..45527289
--- /dev/null
+++ b/data/scripts/gUnk_0800ED0C.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800ED0C
+.byte 0x79
diff --git a/data/scripts/gUnk_0800ED0D.inc b/data/scripts/gUnk_0800ED0D.inc
new file mode 100644
index 00000000..2a01bd1e
--- /dev/null
+++ b/data/scripts/gUnk_0800ED0D.inc
@@ -0,0 +1,80 @@
+SCRIPT_START gUnk_0800ED0D
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0x51
+.byte 0x38
+.byte 0x6
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0x51
+.byte 0x38
+.byte 0x6
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0x39
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x83
+.byte 0x8
+.byte 0x70
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x75
+.byte 0x38
+.byte 0x6
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x51
+.byte 0x38
+.byte 0x6
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xc6
+.byte 0xff
diff --git a/data/scripts/gUnk_0800ED5C.inc b/data/scripts/gUnk_0800ED5C.inc
new file mode 100644
index 00000000..96ca6a5c
--- /dev/null
+++ b/data/scripts/gUnk_0800ED5C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800ED5C
+StartScript 
+Call sub_08064CC0
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0002
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+_0807EB74 
+Call sub_08064CD8
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
diff --git a/data/scripts/gUnk_0800ED90.inc b/data/scripts/gUnk_0800ED90.inc
new file mode 100644
index 00000000..5aece36e
--- /dev/null
+++ b/data/scripts/gUnk_0800ED90.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800ED90
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x0016
+TestBit 0x00000001
+JumpIf 0x0068
+Call sub_0806AEE4
+Jump 0xffe4
+StopScript 
+_0807E864 
+Call sub_0807DF28
+CheckLocalFlag 0x00ae
+JumpIf 0x0078
+Wait 0x000a
+_0807E5F8 0x00000001
+TextboxNoOverlapFollow 0x4c07
+_0807EA94 
+.byte 0x28
diff --git a/data/scripts/gUnk_0800EDD9.inc b/data/scripts/gUnk_0800EDD9.inc
new file mode 100644
index 00000000..cc1fab74
--- /dev/null
+++ b/data/scripts/gUnk_0800EDD9.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800EDD9
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5a
+.byte 0x8
diff --git a/data/scripts/gUnk_0800EDE0.inc b/data/scripts/gUnk_0800EDE0.inc
new file mode 100644
index 00000000..d48a3a8d
--- /dev/null
+++ b/data/scripts/gUnk_0800EDE0.inc
@@ -0,0 +1,42 @@
+SCRIPT_START gUnk_0800EDE0
+.byte 0x8
+.byte 0x4c
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5a
+.byte 0x8
+.byte 0x9
+.byte 0x4c
+.byte 0x59
+.byte 0x4
+.byte 0x4e
+.byte 0xc
+.byte 0x3
+.byte 0x5
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x21
+.byte 0xf4
+.byte 0x7
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
diff --git a/data/scripts/gUnk_0800EE09.inc b/data/scripts/gUnk_0800EE09.inc
new file mode 100644
index 00000000..3c8f7938
--- /dev/null
+++ b/data/scripts/gUnk_0800EE09.inc
@@ -0,0 +1,72 @@
+SCRIPT_START gUnk_0800EE09
+.byte 0x4
+.byte 0x2a
+.byte 0x8
+.byte 0xae
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x88
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0xae
+.byte 0x6
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x5c
+.byte 0xff
+.byte 0x5a
+.byte 0x8
+.byte 0x16
+.byte 0x4c
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x4a
+.byte 0xff
diff --git a/data/scripts/gUnk_0800EE50.inc b/data/scripts/gUnk_0800EE50.inc
new file mode 100644
index 00000000..15c15625
--- /dev/null
+++ b/data/scripts/gUnk_0800EE50.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800EE50
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x0016
+TestBit 0x00000001
+JumpIf 0x0068
+Call sub_0806AEE4
+Jump 0xffe4
+StopScript 
+_0807E864 
+Call sub_0807DF28
+CheckLocalFlag 0x00ae
+JumpIf 0x0078
+.short 0x0831
+.short 0x000a
diff --git a/data/scripts/gUnk_0800EE8C.inc b/data/scripts/gUnk_0800EE8C.inc
new file mode 100644
index 00000000..d8927be4
--- /dev/null
+++ b/data/scripts/gUnk_0800EE8C.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_0800EE8C
+_0807E5F8 0x00000001
+TextboxNoOverlapFollow 0x4c07
+_0807EA94 
+_0807E5F8 0x00000002
+TextboxNoOverlapFollow 0x4c08
+_0807EA94 
+_0807E5F8 0x00000004
+TextboxNoOverlapFollow 0x4c09
+_0807EA94 
+_0807E914 0x00000503
+Call sub_0807F420
+_0807E5F8 0x00000008
+Call sub_0807DF50
+_0807E878 
+SetLocalFlag 0x00ae
+Jump 0xff88
+StopScript 
+WaitForSomething2 0x00000010
+_0807EB44 0x0006
+.short 0x140c
diff --git a/data/scripts/gUnk_0800EEE0.inc b/data/scripts/gUnk_0800EEE0.inc
new file mode 100644
index 00000000..1d58b622
--- /dev/null
+++ b/data/scripts/gUnk_0800EEE0.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_0800EEE0
+.byte 0x61
+.byte 0xaf
+.byte 0x6
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd9
+.byte 0xae
+.byte 0x6
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x5c
diff --git a/data/scripts/gUnk_0800EEFD.inc b/data/scripts/gUnk_0800EEFD.inc
new file mode 100644
index 00000000..75d66b81
--- /dev/null
+++ b/data/scripts/gUnk_0800EEFD.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800EEFD
+.short 0x5aff
+.short 0x1508
+.short 0x594c
+.short 0x0b04
+.short 0x510c
diff --git a/data/scripts/gUnk_0800EF07.inc b/data/scripts/gUnk_0800EF07.inc
new file mode 100644
index 00000000..97e9c0f2
--- /dev/null
+++ b/data/scripts/gUnk_0800EF07.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800EF07
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x4a
+.byte 0xff
+.byte 0x5a
+.byte 0x8
diff --git a/data/scripts/gUnk_0800EF12.inc b/data/scripts/gUnk_0800EF12.inc
new file mode 100644
index 00000000..b1a6ce36
--- /dev/null
+++ b/data/scripts/gUnk_0800EF12.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800EF12
+.short 0x4c07
+.short 0x0459
+.short 0x0c28
+.short 0x0012
+.short 0x0000
+.short 0x0831
+.short 0x000a
+.short 0x085a
+.short 0x4c08
+.short 0x0459
+.short 0x0c28
+.short 0x0024
+.short 0x0000
+.short 0x085a
+.short 0x4c09
+.short 0x0459
+.short 0x0c28
+.short 0x0048
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_0800EF40.inc b/data/scripts/gUnk_0800EF40.inc
new file mode 100644
index 00000000..25e4c7c8
--- /dev/null
+++ b/data/scripts/gUnk_0800EF40.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800EF40
+StartScript 
+_0807EF80 0x0007
+CheckGlobalFlag 0x001f
+JumpIf 0x0046
+StopScript 
+Call sub_080869A4
+JumpIfNot 0xfff8
+_0807E864 
+CheckLocalFlagByOffset 0x0200, 0x006d
+JumpIf 0x001e
+TextboxNoOverlapFollow 0x4d01
+_0807EA94 
+StartPlayerScript 0x0800ef9c
+WaitForSomething2 0x00000001
+Wait 0x000f
+_0807E878 
+Jump 0xffd0
+SetGlobalFlag 0x001f
+TextboxNoOverlapFollow 0x4d02
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.byte 0xb
diff --git a/data/scripts/gUnk_0800EF93.inc b/data/scripts/gUnk_0800EF93.inc
new file mode 100644
index 00000000..241bef5f
--- /dev/null
+++ b/data/scripts/gUnk_0800EF93.inc
@@ -0,0 +1,46 @@
+SCRIPT_START gUnk_0800EF93
+.byte 0xc
+.byte 0x2d
+.byte 0x69
+.byte 0x8
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x2
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x70
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc
new file mode 100644
index 00000000..38b323e8
--- /dev/null
+++ b/data/scripts/gUnk_0800EFC0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800EFC0
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807E9D4 
+_0807EF80 0x000a
+CheckLocalFlag 0x007b
+JumpIf 0x00b0
+StopScript 
+Jump 0x0026
+_0807EB44 0x0006
+.short 0x140c
diff --git a/data/scripts/gUnk_0800EFE0.inc b/data/scripts/gUnk_0800EFE0.inc
new file mode 100644
index 00000000..9d7068c2
--- /dev/null
+++ b/data/scripts/gUnk_0800EFE0.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800EFE0
+.short 0xaf61
+.short 0x0806
diff --git a/data/scripts/gUnk_0800EFE4.inc b/data/scripts/gUnk_0800EFE4.inc
new file mode 100644
index 00000000..7a23461a
--- /dev/null
+++ b/data/scripts/gUnk_0800EFE4.inc
@@ -0,0 +1,87 @@
+SCRIPT_START gUnk_0800EFE4
+.short 0x0008
+.short 0x0000
+.short 0x0831
+.short 0x0004
+.short 0x0861
+.short 0x0004
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+.short 0x0831
+.short 0x0004
+.short 0x0861
+.short 0x0002
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+.short 0x0831
+.short 0x0004
+.short 0x0861
+.short 0x0002
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+.short 0x0c73
+.short 0x0088
+.short 0x0040
+.short 0x0879
+.short 0x000a
+.short 0x0861
+.short 0x0002
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+.short 0x0831
+.short 0x0004
+.short 0x0861
+.short 0x0004
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+.short 0x0831
+.short 0x0004
+.short 0x0861
+.short 0x0006
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+.short 0x0831
+.short 0x0004
+.short 0x0861
+.short 0x0006
+.short 0x140c
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+.short 0x0c73
+.short 0x0068
+.short 0x0040
+.short 0x0879
+.short 0x000a
+.short 0x0812
+.short 0x007b
+.short 0x0804
+.short 0x0006
+.short 0x0803
+.short 0xff5a
+.short 0x0402
+.short 0x0c0b
+.short 0xaee5
+.short 0x0806
+.short 0x0803
+.short 0xfff6
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F090.inc b/data/scripts/gUnk_0800F090.inc
new file mode 100644
index 00000000..77414fc0
--- /dev/null
+++ b/data/scripts/gUnk_0800F090.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F090
+StartScript 
+.short 0x0889
diff --git a/data/scripts/gUnk_0800F094.inc b/data/scripts/gUnk_0800F094.inc
new file mode 100644
index 00000000..72e8cab2
--- /dev/null
+++ b/data/scripts/gUnk_0800F094.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_0800F094
+.short 0x0001
+.short 0x0488
+.short 0x0402
+.short 0x1016
+.short 0x01f8
+.short 0x0338
+.short 0x1030
+.short 0x0805
+.short 0xfff6
+.short 0x0443
+.short 0x0c0b
+.short 0xf9a5
+.short 0x0807
+.short 0x0c0b
+.short 0xdf29
+.short 0x0807
+.short 0x0c0d
+.short 0xe8ac
+.short 0x080e
+.short 0x0c47
+.short 0xf14c
+.short 0x0800
+.short 0x0c33
+.short 0x0001
+.short 0x0000
+.short 0x0c28
+.short 0x001e
+.short 0x0000
+.short 0x0c33
+.short 0x0040
+.short 0x0000
+.short 0x0c5c
+.short 0x1201
diff --git a/data/scripts/gUnk_0800F0D6.inc b/data/scripts/gUnk_0800F0D6.inc
new file mode 100644
index 00000000..15c8839e
--- /dev/null
+++ b/data/scripts/gUnk_0800F0D6.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F0D6
+.short 0x000c
+.short 0x0459
+.short 0x0c33
+.short 0x03c0
+.short 0x0000
+.short 0x0449
diff --git a/data/scripts/gUnk_0800F0E2.inc b/data/scripts/gUnk_0800F0E2.inc
new file mode 100644
index 00000000..27b15b7d
--- /dev/null
+++ b/data/scripts/gUnk_0800F0E2.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F0E2
+TextboxNoOverlapFollowPos 0x1202, 0x000c
+_0807EA94 
+_0807F034 0x0067
+WaitPlayerAction8 
+_0807E8E4_0 
diff --git a/data/scripts/gUnk_0800F0F2.inc b/data/scripts/gUnk_0800F0F2.inc
new file mode 100644
index 00000000..ed25a718
--- /dev/null
+++ b/data/scripts/gUnk_0800F0F2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F0F2
+.byte 0x28
diff --git a/data/scripts/gUnk_0800F0F3.inc b/data/scripts/gUnk_0800F0F3.inc
new file mode 100644
index 00000000..599503fc
--- /dev/null
+++ b/data/scripts/gUnk_0800F0F3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F0F3
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F0F4.inc b/data/scripts/gUnk_0800F0F4.inc
new file mode 100644
index 00000000..62397ca1
--- /dev/null
+++ b/data/scripts/gUnk_0800F0F4.inc
@@ -0,0 +1,45 @@
+SCRIPT_START gUnk_0800F0F4
+.short 0x0002
+.short 0x0000
+.short 0x0c33
+.short 0x0040
+.short 0x0000
+.short 0x0c5c
+.short 0x1203
+.short 0x000c
+.short 0x0459
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0c33
+.short 0x0040
+.short 0x0000
+.short 0x081d
+.short 0x0032
+.short 0x0805
+.short 0xfffa
+.short 0x0443
+.short 0x0c0b
+.short 0xdf29
+.short 0x0807
+.short 0x0c28
+.short 0x001e
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x044a
+.short 0x0c33
+.short 0x03c0
+.short 0x0000
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F14C.inc b/data/scripts/gUnk_0800F14C.inc
new file mode 100644
index 00000000..d0f0517e
--- /dev/null
+++ b/data/scripts/gUnk_0800F14C.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800F14C
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EF80 0x0000
+_0807EB44 0x0006
+_0807EF80 0x0004
+Wait 0x003c
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x0338
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc
new file mode 100644
index 00000000..356ec88d
--- /dev/null
+++ b/data/scripts/gUnk_0800F184.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800F184
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0008
+_0807EF80 0x000a
+StopScript 
+Call sub_0807F348
+_0807EB44 0x0002
+WaitForSomething2 0x00000002
+_0807EF80 0x0007
+_0807EDD4 0x01b8, 0x0328
+_0807E5F8 0x00000040
+_0807EDD4 0x01f8, 0x0328
+_0807EB44 0x0004
+_0807E930 0x0008
+_0807E8E4_0 
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+Call sub_0806E440
+Wait 0x0078
+.short 0x0c28
+.short 0x0040
diff --git a/data/scripts/gUnk_0800F1DE.inc b/data/scripts/gUnk_0800F1DE.inc
new file mode 100644
index 00000000..6258fd46
--- /dev/null
+++ b/data/scripts/gUnk_0800F1DE.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F1DE
+.byte 0x0
+.byte 0x0
+.byte 0x33
diff --git a/data/scripts/gUnk_0800F1E1.inc b/data/scripts/gUnk_0800F1E1.inc
new file mode 100644
index 00000000..8304b6ce
--- /dev/null
+++ b/data/scripts/gUnk_0800F1E1.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F1E1
+.short 0x020c
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F1E5.inc b/data/scripts/gUnk_0800F1E5.inc
new file mode 100644
index 00000000..6e7bf469
--- /dev/null
+++ b/data/scripts/gUnk_0800F1E5.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F1E5
+.short 0x0200
diff --git a/data/scripts/gUnk_0800F1E7.inc b/data/scripts/gUnk_0800F1E7.inc
new file mode 100644
index 00000000..754af852
--- /dev/null
+++ b/data/scripts/gUnk_0800F1E7.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F1E7
+.short 0x0104
+.short 0x0c04
+.short 0x8114
diff --git a/data/scripts/gUnk_0800F1ED.inc b/data/scripts/gUnk_0800F1ED.inc
new file mode 100644
index 00000000..e581a907
--- /dev/null
+++ b/data/scripts/gUnk_0800F1ED.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F1ED
+.short 0x07f6
+.short 0xc008
+.short 0x0001
+.short 0x0400
+.short 0x3408
+.short 0x0200
+.short 0x4304
diff --git a/data/scripts/gUnk_0800F1FB.inc b/data/scripts/gUnk_0800F1FB.inc
new file mode 100644
index 00000000..fb1d7825
--- /dev/null
+++ b/data/scripts/gUnk_0800F1FB.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F1FB
+.short 0x0b04
diff --git a/data/scripts/gUnk_0800F1FD.inc b/data/scripts/gUnk_0800F1FD.inc
new file mode 100644
index 00000000..a6e73a6c
--- /dev/null
+++ b/data/scripts/gUnk_0800F1FD.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F1FD
+.short 0xa50c
+.short 0x07f9
+.short 0x6308
diff --git a/data/scripts/gUnk_0800F203.inc b/data/scripts/gUnk_0800F203.inc
new file mode 100644
index 00000000..e3382c32
--- /dev/null
+++ b/data/scripts/gUnk_0800F203.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F203
+.short 0x5004
+.short 0x0808
diff --git a/data/scripts/gUnk_0800F207.inc b/data/scripts/gUnk_0800F207.inc
new file mode 100644
index 00000000..a9b8ee3b
--- /dev/null
+++ b/data/scripts/gUnk_0800F207.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800F207
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F210.inc b/data/scripts/gUnk_0800F210.inc
new file mode 100644
index 00000000..8fa88e89
--- /dev/null
+++ b/data/scripts/gUnk_0800F210.inc
@@ -0,0 +1,53 @@
+SCRIPT_START gUnk_0800F210
+TextboxNoOverlapFollowPos 0x1206, 0x000c
+_0807EA94 
+StartPlayerScript 0x0800f33c
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xffbe
+CallWithArg sub_0807F680, 0x00000230
+JumpIfNot 0x0034
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos 0x1206, 0x000c
+_0807EA94 
+StartPlayerScript 0x0800f354
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xff7e
+CallWithArg sub_0807F6B4, 0x00000310
+JumpIf 0x0034
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos 0x1206, 0x000c
+_0807EA94 
+StartPlayerScript 0x0800f36c
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xff3e
+CallWithArg sub_0807F6B4, 0x00000340
+JumpIfNot 0x0034
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos 0x1206, 0x000c
+_0807EA94 
+StartPlayerScript 0x0800f384
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xfefe
+.byte 0x2
diff --git a/data/scripts/gUnk_0800F2EB.inc b/data/scripts/gUnk_0800F2EB.inc
new file mode 100644
index 00000000..5292d064
--- /dev/null
+++ b/data/scripts/gUnk_0800F2EB.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F2EB
+.byte 0x4
+.byte 0x1
+.byte 0x4
+.byte 0x1d
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F2F0.inc b/data/scripts/gUnk_0800F2F0.inc
new file mode 100644
index 00000000..8eddb220
--- /dev/null
+++ b/data/scripts/gUnk_0800F2F0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F2F0
+.short 0x0032
diff --git a/data/scripts/gUnk_0800F2F2.inc b/data/scripts/gUnk_0800F2F2.inc
new file mode 100644
index 00000000..8bb256c2
--- /dev/null
+++ b/data/scripts/gUnk_0800F2F2.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F2F2
+JumpIf 0x0020
+CheckEntityInteractType 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+_0807EB74 
+.byte 0x50
diff --git a/data/scripts/gUnk_0800F303.inc b/data/scripts/gUnk_0800F303.inc
new file mode 100644
index 00000000..855cbddc
--- /dev/null
+++ b/data/scripts/gUnk_0800F303.inc
@@ -0,0 +1,154 @@
+SCRIPT_START gUnk_0800F303
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x8
+.byte 0x12
+.byte 0xc
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xd4
+.byte 0xfe
+.byte 0x2
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0xc0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x6f
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x71
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x70
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x6e
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F39C.inc b/data/scripts/gUnk_0800F39C.inc
new file mode 100644
index 00000000..fdfdbecf
--- /dev/null
+++ b/data/scripts/gUnk_0800F39C.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800F39C
+StartScript 
+_0807E9D4 
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x000b
+StopScript 
+Call sub_0807F348
+WaitForSomething2 0x00000004
+_0807EF80 0x0007
+_0807EDD4 0x01f8, 0x0318
+_0807EDD4 0x0208, 0x0318
+_0807EDD4 0x0208, 0x0338
+.byte 0x61
+.byte 0x8
+.byte 0x6
diff --git a/data/scripts/gUnk_0800F3DB.inc b/data/scripts/gUnk_0800F3DB.inc
new file mode 100644
index 00000000..05dd228a
--- /dev/null
+++ b/data/scripts/gUnk_0800F3DB.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F3DB
+.short 0x7900
+.short 0x0008
+.short 0x7900
+.short 0x0a08
+.short 0x2800
diff --git a/data/scripts/gUnk_0800F3E5.inc b/data/scripts/gUnk_0800F3E5.inc
new file mode 100644
index 00000000..fabd6bc6
--- /dev/null
+++ b/data/scripts/gUnk_0800F3E5.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F3E5
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F3E6.inc b/data/scripts/gUnk_0800F3E6.inc
new file mode 100644
index 00000000..50e2a1ff
--- /dev/null
+++ b/data/scripts/gUnk_0800F3E6.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F3E6
+.short 0x0080
diff --git a/data/scripts/gUnk_0800F3E8.inc b/data/scripts/gUnk_0800F3E8.inc
new file mode 100644
index 00000000..82f0aeb2
--- /dev/null
+++ b/data/scripts/gUnk_0800F3E8.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F3E8
+.byte 0x0
+.byte 0x0
+.byte 0x2
diff --git a/data/scripts/gUnk_0800F3EB.inc b/data/scripts/gUnk_0800F3EB.inc
new file mode 100644
index 00000000..a9954b8e
--- /dev/null
+++ b/data/scripts/gUnk_0800F3EB.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F3EB
+.short 0x0104
diff --git a/data/scripts/gUnk_0800F3ED.inc b/data/scripts/gUnk_0800F3ED.inc
new file mode 100644
index 00000000..614f4b38
--- /dev/null
+++ b/data/scripts/gUnk_0800F3ED.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800F3ED
+.short 0x1804
+.short 0x0504
+.short 0x1008
+.short 0x0200
diff --git a/data/scripts/gUnk_0800F3F5.inc b/data/scripts/gUnk_0800F3F5.inc
new file mode 100644
index 00000000..e16fbc6f
--- /dev/null
+++ b/data/scripts/gUnk_0800F3F5.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F3F5
+.short 0x4304
+.short 0x6304
diff --git a/data/scripts/gUnk_0800F3F9.inc b/data/scripts/gUnk_0800F3F9.inc
new file mode 100644
index 00000000..db02cae5
--- /dev/null
+++ b/data/scripts/gUnk_0800F3F9.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F3F9
+.byte 0x4
+.byte 0x5b
+.byte 0x8
+.byte 0x37
+.byte 0x12
+.byte 0x59
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F400.inc b/data/scripts/gUnk_0800F400.inc
new file mode 100644
index 00000000..a607008f
--- /dev/null
+++ b/data/scripts/gUnk_0800F400.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800F400
+_0807E878 
+.short 0x0c0e
+.short 0x0004
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F408.inc b/data/scripts/gUnk_0800F408.inc
new file mode 100644
index 00000000..253909b8
--- /dev/null
+++ b/data/scripts/gUnk_0800F408.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F408
+.byte 0x5
diff --git a/data/scripts/gUnk_0800F409.inc b/data/scripts/gUnk_0800F409.inc
new file mode 100644
index 00000000..be4798ae
--- /dev/null
+++ b/data/scripts/gUnk_0800F409.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F409
+.byte 0x8
+.byte 0xe0
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x79
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F410.inc b/data/scripts/gUnk_0800F410.inc
new file mode 100644
index 00000000..b80cf8d5
--- /dev/null
+++ b/data/scripts/gUnk_0800F410.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800F410
+.short 0x000b
+.short 0x0831
+.short 0x0010
+.short 0x0867
+.short 0x0100
+.short 0x086e
+.short 0x0010
+.short 0x0c73
+.short 0x0288
+.short 0x0328
+.short 0x0c28
diff --git a/data/scripts/gUnk_0800F426.inc b/data/scripts/gUnk_0800F426.inc
new file mode 100644
index 00000000..7ca38cee
--- /dev/null
+++ b/data/scripts/gUnk_0800F426.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F426
+.short 0x0080
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_0800F430.inc b/data/scripts/gUnk_0800F430.inc
new file mode 100644
index 00000000..94e2ad26
--- /dev/null
+++ b/data/scripts/gUnk_0800F430.inc
@@ -0,0 +1,41 @@
+SCRIPT_START gUnk_0800F430
+StartScript 
+_0807E9D4 
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x000b
+StopScript 
+Call sub_0807F348
+WaitForSomething2 0x00000008
+_0807EF80 0x0007
+_0807EDD4 0x01d8, 0x0328
+_0807EDD4 0x01f8, 0x0348
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E5F8 0x00000100
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0x0010
+StopScript 
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x1238
+_0807EA94 
+_0807E878 
+TestBit 0x00000008
+JumpIfNot 0xffe0
+StopScript 
+_0807EF80 0x000b
+Wait 0x0018
+SetEntityNonPlanarMovement 0x0100
+_0807EC94 0x0010
+_0807EC64 0x0020
+_0807EDD4 0x0288, 0x0328
+_0807E5F8 0x00000100
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F4C4.inc b/data/scripts/gUnk_0800F4C4.inc
new file mode 100644
index 00000000..74a6202a
--- /dev/null
+++ b/data/scripts/gUnk_0800F4C4.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800F4C4
+StartScript 
+_0807E9D4 
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x000b
+StopScript 
+Call sub_0807F348
+.short 0x0c33
+.short 0x0010
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F4EA.inc b/data/scripts/gUnk_0800F4EA.inc
new file mode 100644
index 00000000..a8a3c9bf
--- /dev/null
+++ b/data/scripts/gUnk_0800F4EA.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F4EA
+.byte 0x79
diff --git a/data/scripts/gUnk_0800F4EB.inc b/data/scripts/gUnk_0800F4EB.inc
new file mode 100644
index 00000000..435d785c
--- /dev/null
+++ b/data/scripts/gUnk_0800F4EB.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F4EB
+.short 0x0708
+.short 0x7300
diff --git a/data/scripts/gUnk_0800F4EF.inc b/data/scripts/gUnk_0800F4EF.inc
new file mode 100644
index 00000000..631b4796
--- /dev/null
+++ b/data/scripts/gUnk_0800F4EF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F4EF
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F4F0.inc b/data/scripts/gUnk_0800F4F0.inc
new file mode 100644
index 00000000..1e075f39
--- /dev/null
+++ b/data/scripts/gUnk_0800F4F0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F4F0
+.byte 0xc8
diff --git a/data/scripts/gUnk_0800F4F1.inc b/data/scripts/gUnk_0800F4F1.inc
new file mode 100644
index 00000000..32a58387
--- /dev/null
+++ b/data/scripts/gUnk_0800F4F1.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F4F1
+.short 0x2801
diff --git a/data/scripts/gUnk_0800F4F3.inc b/data/scripts/gUnk_0800F4F3.inc
new file mode 100644
index 00000000..2962f037
--- /dev/null
+++ b/data/scripts/gUnk_0800F4F3.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F4F3
+.short 0x7303
+.short 0xe80c
diff --git a/data/scripts/gUnk_0800F4F7.inc b/data/scripts/gUnk_0800F4F7.inc
new file mode 100644
index 00000000..421f1073
--- /dev/null
+++ b/data/scripts/gUnk_0800F4F7.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F4F7
+.short 0x3801
diff --git a/data/scripts/gUnk_0800F4F9.inc b/data/scripts/gUnk_0800F4F9.inc
new file mode 100644
index 00000000..e84329b5
--- /dev/null
+++ b/data/scripts/gUnk_0800F4F9.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800F4F9
+.short 0x6103
+.short 0x0208
+.short 0x7900
+.short 0x0008
diff --git a/data/scripts/gUnk_0800F501.inc b/data/scripts/gUnk_0800F501.inc
new file mode 100644
index 00000000..405d2b4d
--- /dev/null
+++ b/data/scripts/gUnk_0800F501.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800F501
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F50E.inc b/data/scripts/gUnk_0800F50E.inc
new file mode 100644
index 00000000..3c8649cc
--- /dev/null
+++ b/data/scripts/gUnk_0800F50E.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0800F50E
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0x0010
+StopScript 
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x1239
+_0807EA94 
+_0807E878 
+TestBit 0x00000010
+JumpIfNot 0xffe0
+StopScript 
+_0807EF80 0x000b
+Wait 0x0028
+SetEntityNonPlanarMovement 0x0100
+_0807EC64 0x0010
+_0807EDD4 0x0288, 0x0328
+_0807E5F8 0x00000200
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc
new file mode 100644
index 00000000..9165b792
--- /dev/null
+++ b/data/scripts/gUnk_0800F554.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800F554
+StartScript 
+Call sub_08061FE4
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FE4
+Call sub_08061FF4
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F584.inc b/data/scripts/gUnk_0800F584.inc
new file mode 100644
index 00000000..7c8cebd3
--- /dev/null
+++ b/data/scripts/gUnk_0800F584.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F584
+StartScript 
+_0807EF80 0x0001
+_0807E9D4 
+.byte 0x79
+.byte 0x8
+.byte 0xa
diff --git a/data/scripts/gUnk_0800F58F.inc b/data/scripts/gUnk_0800F58F.inc
new file mode 100644
index 00000000..5388e13e
--- /dev/null
+++ b/data/scripts/gUnk_0800F58F.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_0800F58F
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0x63
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x5d
+.byte 0x26
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xe6
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F5B0.inc b/data/scripts/gUnk_0800F5B0.inc
new file mode 100644
index 00000000..fb29c6f8
--- /dev/null
+++ b/data/scripts/gUnk_0800F5B0.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_0800F5B0
+StartScript 
+_0807EB44 0x0006
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x00000008
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000008
+Call sub_08064428
+_0807EA94 
+_0807E878 
+.byte 0x3
+.byte 0x8
+.byte 0xe0
diff --git a/data/scripts/gUnk_0800F5E9.inc b/data/scripts/gUnk_0800F5E9.inc
new file mode 100644
index 00000000..17d68420
--- /dev/null
+++ b/data/scripts/gUnk_0800F5E9.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F5E9
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F5EC.inc b/data/scripts/gUnk_0800F5EC.inc
new file mode 100644
index 00000000..b99ac058
--- /dev/null
+++ b/data/scripts/gUnk_0800F5EC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F5EC
+.byte 0x1
diff --git a/data/scripts/gUnk_0800F5ED.inc b/data/scripts/gUnk_0800F5ED.inc
new file mode 100644
index 00000000..be79dc66
--- /dev/null
+++ b/data/scripts/gUnk_0800F5ED.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F5ED
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F5EE.inc b/data/scripts/gUnk_0800F5EE.inc
new file mode 100644
index 00000000..3f450a2a
--- /dev/null
+++ b/data/scripts/gUnk_0800F5EE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F5EE
+.byte 0x61
diff --git a/data/scripts/gUnk_0800F5EF.inc b/data/scripts/gUnk_0800F5EF.inc
new file mode 100644
index 00000000..dd283283
--- /dev/null
+++ b/data/scripts/gUnk_0800F5EF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F5EF
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F5F0.inc b/data/scripts/gUnk_0800F5F0.inc
new file mode 100644
index 00000000..a0d9cb65
--- /dev/null
+++ b/data/scripts/gUnk_0800F5F0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F5F0
+.short 0x0004
diff --git a/data/scripts/gUnk_0800F5F2.inc b/data/scripts/gUnk_0800F5F2.inc
new file mode 100644
index 00000000..ce7b9e1b
--- /dev/null
+++ b/data/scripts/gUnk_0800F5F2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F5F2
+.short 0x0850
diff --git a/data/scripts/gUnk_0800F5F4.inc b/data/scripts/gUnk_0800F5F4.inc
new file mode 100644
index 00000000..7288c55b
--- /dev/null
+++ b/data/scripts/gUnk_0800F5F4.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800F5F4
+.short 0x0000
+.short 0x0453
+.short 0x0879
+.short 0x000a
diff --git a/data/scripts/gUnk_0800F5FC.inc b/data/scripts/gUnk_0800F5FC.inc
new file mode 100644
index 00000000..430d56f5
--- /dev/null
+++ b/data/scripts/gUnk_0800F5FC.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F5FC
+.byte 0xb
+.byte 0xc
+.byte 0x49
diff --git a/data/scripts/gUnk_0800F5FF.inc b/data/scripts/gUnk_0800F5FF.inc
new file mode 100644
index 00000000..f5b8fd49
--- /dev/null
+++ b/data/scripts/gUnk_0800F5FF.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F5FF
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x18
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F606.inc b/data/scripts/gUnk_0800F606.inc
new file mode 100644
index 00000000..d9a88bb7
--- /dev/null
+++ b/data/scripts/gUnk_0800F606.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F606
+.byte 0x5
diff --git a/data/scripts/gUnk_0800F607.inc b/data/scripts/gUnk_0800F607.inc
new file mode 100644
index 00000000..30ad22a2
--- /dev/null
+++ b/data/scripts/gUnk_0800F607.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F607
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F608.inc b/data/scripts/gUnk_0800F608.inc
new file mode 100644
index 00000000..cb8cc66d
--- /dev/null
+++ b/data/scripts/gUnk_0800F608.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F608
+.short 0xfffc
diff --git a/data/scripts/gUnk_0800F60A.inc b/data/scripts/gUnk_0800F60A.inc
new file mode 100644
index 00000000..3ac06e79
--- /dev/null
+++ b/data/scripts/gUnk_0800F60A.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800F60A
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000008
+TextboxNoOverlap 0x2511
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffde
diff --git a/data/scripts/gUnk_0800F628.inc b/data/scripts/gUnk_0800F628.inc
new file mode 100644
index 00000000..2ecdb62e
--- /dev/null
+++ b/data/scripts/gUnk_0800F628.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800F628
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EF80 0x0001
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+_0807E878 
+Jump 0xffea
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F650.inc b/data/scripts/gUnk_0800F650.inc
new file mode 100644
index 00000000..ab6d77c9
--- /dev/null
+++ b/data/scripts/gUnk_0800F650.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800F650
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0001
+Call sub_0806B4F0
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F688.inc b/data/scripts/gUnk_0800F688.inc
new file mode 100644
index 00000000..0fcfacf3
--- /dev/null
+++ b/data/scripts/gUnk_0800F688.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F688
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+Call sub_0807F348
+StopScript 
diff --git a/data/scripts/gUnk_0800F6A0.inc b/data/scripts/gUnk_0800F6A0.inc
new file mode 100644
index 00000000..cbc613ef
--- /dev/null
+++ b/data/scripts/gUnk_0800F6A0.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800F6A0
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000004
+CheckLocalFlag 0x00cd
+JumpIf 0x000a
+TextboxNoOverlap 0x2512
+Jump 0x0006
+.short 0x085b
+.short 0x251f
diff --git a/data/scripts/gUnk_0800F6C8.inc b/data/scripts/gUnk_0800F6C8.inc
new file mode 100644
index 00000000..0eaf28e0
--- /dev/null
+++ b/data/scripts/gUnk_0800F6C8.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F6C8
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg sub_0807F3D8, 0x00000000
+Jump 0xffc4
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F6E0.inc b/data/scripts/gUnk_0800F6E0.inc
new file mode 100644
index 00000000..ab65b54f
--- /dev/null
+++ b/data/scripts/gUnk_0800F6E0.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0800F6E0
+StartScript 
+_0807EF80 0x0001
+_0807E9D4 
+.byte 0x79
diff --git a/data/scripts/gUnk_0800F6E9.inc b/data/scripts/gUnk_0800F6E9.inc
new file mode 100644
index 00000000..f7de9bf3
--- /dev/null
+++ b/data/scripts/gUnk_0800F6E9.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F6E9
+.byte 0x8
+.byte 0xa
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F6EC.inc b/data/scripts/gUnk_0800F6EC.inc
new file mode 100644
index 00000000..aad40ce2
--- /dev/null
+++ b/data/scripts/gUnk_0800F6EC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6EC
+.byte 0xb
diff --git a/data/scripts/gUnk_0800F6ED.inc b/data/scripts/gUnk_0800F6ED.inc
new file mode 100644
index 00000000..73bd769d
--- /dev/null
+++ b/data/scripts/gUnk_0800F6ED.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6ED
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F6EE.inc b/data/scripts/gUnk_0800F6EE.inc
new file mode 100644
index 00000000..d528ca30
--- /dev/null
+++ b/data/scripts/gUnk_0800F6EE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6EE
+.byte 0x89
diff --git a/data/scripts/gUnk_0800F6EF.inc b/data/scripts/gUnk_0800F6EF.inc
new file mode 100644
index 00000000..f15c37fb
--- /dev/null
+++ b/data/scripts/gUnk_0800F6EF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6EF
+.byte 0x27
diff --git a/data/scripts/gUnk_0800F6F0.inc b/data/scripts/gUnk_0800F6F0.inc
new file mode 100644
index 00000000..3774af96
--- /dev/null
+++ b/data/scripts/gUnk_0800F6F0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6F0
+.byte 0x6
diff --git a/data/scripts/gUnk_0800F6F1.inc b/data/scripts/gUnk_0800F6F1.inc
new file mode 100644
index 00000000..646ff764
--- /dev/null
+++ b/data/scripts/gUnk_0800F6F1.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6F1
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F6F2.inc b/data/scripts/gUnk_0800F6F2.inc
new file mode 100644
index 00000000..c4258905
--- /dev/null
+++ b/data/scripts/gUnk_0800F6F2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6F2
+.byte 0x2
diff --git a/data/scripts/gUnk_0800F6F3.inc b/data/scripts/gUnk_0800F6F3.inc
new file mode 100644
index 00000000..a265e213
--- /dev/null
+++ b/data/scripts/gUnk_0800F6F3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F6F3
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F6F4.inc b/data/scripts/gUnk_0800F6F4.inc
new file mode 100644
index 00000000..842f18d5
--- /dev/null
+++ b/data/scripts/gUnk_0800F6F4.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F6F4
+CheckLocalFlag 0x00cd
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F6F9.inc b/data/scripts/gUnk_0800F6F9.inc
new file mode 100644
index 00000000..812fd700
--- /dev/null
+++ b/data/scripts/gUnk_0800F6F9.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F6F9
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x18
+.byte 0x4
diff --git a/data/scripts/gUnk_0800F6FE.inc b/data/scripts/gUnk_0800F6FE.inc
new file mode 100644
index 00000000..3d0f90e1
--- /dev/null
+++ b/data/scripts/gUnk_0800F6FE.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F6FE
+.short 0x0805
+.short 0xfff4
diff --git a/data/scripts/gUnk_0800F702.inc b/data/scripts/gUnk_0800F702.inc
new file mode 100644
index 00000000..0676c592
--- /dev/null
+++ b/data/scripts/gUnk_0800F702.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F702
+_0807E864 
+_0807EB74 
diff --git a/data/scripts/gUnk_0800F706.inc b/data/scripts/gUnk_0800F706.inc
new file mode 100644
index 00000000..c0d86b0d
--- /dev/null
+++ b/data/scripts/gUnk_0800F706.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800F706
+Call sub_0806265C
+_0807EA94 
+_0807E878 
+_0807EF80 0x0001
+Jump 0xffde
+.short 0x0c0b
+.short 0x27e9
+.short 0x0806
diff --git a/data/scripts/gUnk_0800F71E.inc b/data/scripts/gUnk_0800F71E.inc
new file mode 100644
index 00000000..7d059899
--- /dev/null
+++ b/data/scripts/gUnk_0800F71E.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F71E
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc
new file mode 100644
index 00000000..a6ec34d6
--- /dev/null
+++ b/data/scripts/gUnk_0800F724.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F724
+StartScript 
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x00cd
+.short 0x0805
+.short 0xfffa
diff --git a/data/scripts/gUnk_0800F734.inc b/data/scripts/gUnk_0800F734.inc
new file mode 100644
index 00000000..d0e49b47
--- /dev/null
+++ b/data/scripts/gUnk_0800F734.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F734
+_0807EF80 0x0007
+.short 0x0803
+.short 0xfe4a
diff --git a/data/scripts/gUnk_0800F73C.inc b/data/scripts/gUnk_0800F73C.inc
new file mode 100644
index 00000000..4222c77f
--- /dev/null
+++ b/data/scripts/gUnk_0800F73C.inc
@@ -0,0 +1,37 @@
+SCRIPT_START gUnk_0800F73C
+CheckLocalFlag 0x00cd
+JumpIf 0x030a
+_0807E864 
+Call sub_0807DF28
+SetEntityPositionRelative 0x014800c8
+Call sub_0807F844
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+StartPlayerScript 0x0800fa54
+_0807E5F8 0x00000002
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x021800c8
+Call sub_0807F5C0
+Wait 0x0064
+_0807F0B4 0x0002
+SetEntityPositionRelative 0x036800c8
+Call sub_0807F5C0
+WaitForSomething2 0x00000001
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos 0x2501, 0x0000
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807DF50
+_0807E878 
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000004
+_0807E864 
+Call sub_0807DF28
+StartPlayerScript 0x0800fa78
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000002
+.short 0x0c33
diff --git a/data/scripts/gUnk_0800F7E6.inc b/data/scripts/gUnk_0800F7E6.inc
new file mode 100644
index 00000000..953fde86
--- /dev/null
+++ b/data/scripts/gUnk_0800F7E6.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F7E6
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
diff --git a/data/scripts/gUnk_0800F7EB.inc b/data/scripts/gUnk_0800F7EB.inc
new file mode 100644
index 00000000..3d459670
--- /dev/null
+++ b/data/scripts/gUnk_0800F7EB.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F7EB
+.byte 0xc
+.byte 0x3
+.byte 0x25
diff --git a/data/scripts/gUnk_0800F7EE.inc b/data/scripts/gUnk_0800F7EE.inc
new file mode 100644
index 00000000..944c3718
--- /dev/null
+++ b/data/scripts/gUnk_0800F7EE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7EE
+.byte 0xe
diff --git a/data/scripts/gUnk_0800F7EF.inc b/data/scripts/gUnk_0800F7EF.inc
new file mode 100644
index 00000000..11367ef6
--- /dev/null
+++ b/data/scripts/gUnk_0800F7EF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7EF
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F7F0.inc b/data/scripts/gUnk_0800F7F0.inc
new file mode 100644
index 00000000..bc74cb92
--- /dev/null
+++ b/data/scripts/gUnk_0800F7F0.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800F7F0
+_0807EA94 
+.short 0x0c28
diff --git a/data/scripts/gUnk_0800F7F4.inc b/data/scripts/gUnk_0800F7F4.inc
new file mode 100644
index 00000000..08dfcc8c
--- /dev/null
+++ b/data/scripts/gUnk_0800F7F4.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7F4
+.byte 0x2
diff --git a/data/scripts/gUnk_0800F7F5.inc b/data/scripts/gUnk_0800F7F5.inc
new file mode 100644
index 00000000..756de5ad
--- /dev/null
+++ b/data/scripts/gUnk_0800F7F5.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7F5
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F7F7.inc b/data/scripts/gUnk_0800F7F7.inc
new file mode 100644
index 00000000..2e69551b
--- /dev/null
+++ b/data/scripts/gUnk_0800F7F7.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F7F7
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F7FC.inc b/data/scripts/gUnk_0800F7FC.inc
new file mode 100644
index 00000000..4153960a
--- /dev/null
+++ b/data/scripts/gUnk_0800F7FC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7FC
+.byte 0x0
diff --git a/data/scripts/gUnk_0800F7FD.inc b/data/scripts/gUnk_0800F7FD.inc
new file mode 100644
index 00000000..18c9cbd5
--- /dev/null
+++ b/data/scripts/gUnk_0800F7FD.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7FD
+.short 0x0b00
diff --git a/data/scripts/gUnk_0800F7FF.inc b/data/scripts/gUnk_0800F7FF.inc
new file mode 100644
index 00000000..ea7923f1
--- /dev/null
+++ b/data/scripts/gUnk_0800F7FF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F7FF
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F800.inc b/data/scripts/gUnk_0800F800.inc
new file mode 100644
index 00000000..73788381
--- /dev/null
+++ b/data/scripts/gUnk_0800F800.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F800
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
diff --git a/data/scripts/gUnk_0800F805.inc b/data/scripts/gUnk_0800F805.inc
new file mode 100644
index 00000000..f6ae29d7
--- /dev/null
+++ b/data/scripts/gUnk_0800F805.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F805
+.byte 0x4
+.byte 0x33
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F808.inc b/data/scripts/gUnk_0800F808.inc
new file mode 100644
index 00000000..6bce11ac
--- /dev/null
+++ b/data/scripts/gUnk_0800F808.inc
@@ -0,0 +1,232 @@
+SCRIPT_START gUnk_0800F808
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x47
+.byte 0xc
+.byte 0x9c
+.byte 0xfa
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x4
+.byte 0x25
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x47
+.byte 0xc
+.byte 0xc0
+.byte 0xfa
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x5
+.byte 0x25
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0x5d
+.byte 0x3c
+.byte 0x6
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xe2
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x49
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xf9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x21
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0xe4
+.byte 0xfa
+.byte 0x0
+.byte 0x8
+.byte 0x69
+.byte 0xc
+.byte 0xf0
+.byte 0x0
+.byte 0x58
+.byte 0x2
+.byte 0x89
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x87
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x2d
+.byte 0x3c
+.byte 0x6
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x22
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x49
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x15
+.byte 0x3c
+.byte 0x6
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xdd
diff --git a/data/scripts/gUnk_0800F8EF.inc b/data/scripts/gUnk_0800F8EF.inc
new file mode 100644
index 00000000..397b00d6
--- /dev/null
+++ b/data/scripts/gUnk_0800F8EF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8EF
+.byte 0x4c
diff --git a/data/scripts/gUnk_0800F8F0.inc b/data/scripts/gUnk_0800F8F0.inc
new file mode 100644
index 00000000..9ba8ee23
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8F0
+.byte 0x9
diff --git a/data/scripts/gUnk_0800F8F1.inc b/data/scripts/gUnk_0800F8F1.inc
new file mode 100644
index 00000000..0ee53ef7
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F1.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8F1
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F8F2.inc b/data/scripts/gUnk_0800F8F2.inc
new file mode 100644
index 00000000..e2fd314d
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8F2
+.byte 0x31
diff --git a/data/scripts/gUnk_0800F8F3.inc b/data/scripts/gUnk_0800F8F3.inc
new file mode 100644
index 00000000..4d0967ba
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8F3
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F8F4.inc b/data/scripts/gUnk_0800F8F4.inc
new file mode 100644
index 00000000..60bde4ad
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F4.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8F4
+.byte 0x1e
diff --git a/data/scripts/gUnk_0800F8F5.inc b/data/scripts/gUnk_0800F8F5.inc
new file mode 100644
index 00000000..8bde204a
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F5.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800F8F5
+.byte 0x0
+.byte 0x5c
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F8F8.inc b/data/scripts/gUnk_0800F8F8.inc
new file mode 100644
index 00000000..01353483
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F8.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F8F8
+.byte 0x23
diff --git a/data/scripts/gUnk_0800F8F9.inc b/data/scripts/gUnk_0800F8F9.inc
new file mode 100644
index 00000000..ce2fbabc
--- /dev/null
+++ b/data/scripts/gUnk_0800F8F9.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800F8F9
+.byte 0x10
+.byte 0xe
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F900.inc b/data/scripts/gUnk_0800F900.inc
new file mode 100644
index 00000000..eb4fc475
--- /dev/null
+++ b/data/scripts/gUnk_0800F900.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F900
+.short 0x3c15
diff --git a/data/scripts/gUnk_0800F902.inc b/data/scripts/gUnk_0800F902.inc
new file mode 100644
index 00000000..f02849a5
--- /dev/null
+++ b/data/scripts/gUnk_0800F902.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800F902
+_0807E078 0x0c0b
+.short 0x4dd9
+.short 0x0809
+.short 0x0831
+.short 0x001e
+.short 0x0c5c
+.short 0x1024
+.short 0x000e
+.short 0x0459
diff --git a/data/scripts/gUnk_0800F916.inc b/data/scripts/gUnk_0800F916.inc
new file mode 100644
index 00000000..5d2bafce
--- /dev/null
+++ b/data/scripts/gUnk_0800F916.inc
@@ -0,0 +1,49 @@
+SCRIPT_START gUnk_0800F916
+Call sub_08063C14
+Call sub_08094D34
+Wait 0x001e
+TextboxNoOverlapFollowPos 0x1025, 0x000e
+_0807EA94 
+Call sub_08063C5C
+TextboxNoOverlapFollowPos 0x1026, 0x000e
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E8E4_1 
+Call sub_08063C2C
+TextboxNoOverlapFollowPos 0x1027, 0x0000
+_0807EA94 
+Call sub_08063C74
+Wait 0x003c
+Call sub_08063C14
+_0807E8E4_0 
+TextboxNoOverlapFollowPos 0x1028, 0x000e
+_0807EA94 
+_0807E8E4_1 
+TextboxNoOverlapFollowPos 0x1029, 0x0000
+_0807EA94 
+_0807E8E4_0 
+TextboxNoOverlapFollowPos 0x102a, 0x000e
+_0807EA94 
+Call sub_08063C14
+Call sub_08094D70
+SoundReq 0x0103
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Call sub_08063C14
+Call sub_08094D10
+Wait 0x001e
+Call sub_08094E0C
+Wait 0x001e
+_0807E8E4_1 
+Call sub_0807F3F8
+Wait 0x003c
+TextboxNoOverlapFollowPos 0x102b, 0x0000
+_0807EA94 
+_0807F034 0x000d
+WaitPlayerAction8 
+Call sub_0806DC3C
+Call sub_080791BC
+CallWithArg sub_0807F244, 0x0000000d
+.short 0x0c4e
+.short 0x00ff
diff --git a/data/scripts/gUnk_0800F9F0.inc b/data/scripts/gUnk_0800F9F0.inc
new file mode 100644
index 00000000..bab942c3
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F9F0
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F9F2.inc b/data/scripts/gUnk_0800F9F2.inc
new file mode 100644
index 00000000..6b6f43e7
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F9F2
+.byte 0xb
diff --git a/data/scripts/gUnk_0800F9F3.inc b/data/scripts/gUnk_0800F9F3.inc
new file mode 100644
index 00000000..27975d22
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F9F3
+.byte 0xc
diff --git a/data/scripts/gUnk_0800F9F4.inc b/data/scripts/gUnk_0800F9F4.inc
new file mode 100644
index 00000000..bd4ba954
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F4.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F9F4
+.short 0xf5b1
diff --git a/data/scripts/gUnk_0800F9F6.inc b/data/scripts/gUnk_0800F9F6.inc
new file mode 100644
index 00000000..5bc2894b
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F6.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F9F6
+.byte 0x7
diff --git a/data/scripts/gUnk_0800F9F7.inc b/data/scripts/gUnk_0800F9F7.inc
new file mode 100644
index 00000000..0dbc4a29
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F7.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800F9F7
+.byte 0x8
diff --git a/data/scripts/gUnk_0800F9F8.inc b/data/scripts/gUnk_0800F9F8.inc
new file mode 100644
index 00000000..409c328c
--- /dev/null
+++ b/data/scripts/gUnk_0800F9F8.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800F9F8
+.short 0x140c
+.short 0xf29d
+.short 0x0807
+.short 0x49d6
+.short 0x0800
diff --git a/data/scripts/gUnk_0800FA02.inc b/data/scripts/gUnk_0800FA02.inc
new file mode 100644
index 00000000..f708cb2b
--- /dev/null
+++ b/data/scripts/gUnk_0800FA02.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FA02
+Wait 0x00b7
+.byte 0x4e
diff --git a/data/scripts/gUnk_0800FA07.inc b/data/scripts/gUnk_0800FA07.inc
new file mode 100644
index 00000000..a2b21a30
--- /dev/null
+++ b/data/scripts/gUnk_0800FA07.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FA07
+.byte 0xc
diff --git a/data/scripts/gUnk_0800FA08.inc b/data/scripts/gUnk_0800FA08.inc
new file mode 100644
index 00000000..0b09498d
--- /dev/null
+++ b/data/scripts/gUnk_0800FA08.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FA08
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FA09.inc b/data/scripts/gUnk_0800FA09.inc
new file mode 100644
index 00000000..f05952c3
--- /dev/null
+++ b/data/scripts/gUnk_0800FA09.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FA09
+.short 0x0000
+.short 0x0b00
diff --git a/data/scripts/gUnk_0800FA0D.inc b/data/scripts/gUnk_0800FA0D.inc
new file mode 100644
index 00000000..4d48ce5c
--- /dev/null
+++ b/data/scripts/gUnk_0800FA0D.inc
@@ -0,0 +1,108 @@
+SCRIPT_START gUnk_0800FA0D
+.byte 0xc
+.byte 0xb1
+.byte 0xf5
+.byte 0x7
+.byte 0x8
+.byte 0x5c
+.byte 0xc
+.byte 0x2c
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0x9d
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0xdc
+.byte 0x6
+.byte 0x8
+.byte 0x89
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x88
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0x3c
+.byte 0x6
+.byte 0x8
+.byte 0x2a
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x2
+.byte 0x4
+.byte 0x69
+.byte 0xc
+.byte 0xd8
+.byte 0x0
+.byte 0x98
+.byte 0x3
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800FA78.inc b/data/scripts/gUnk_0800FA78.inc
new file mode 100644
index 00000000..d62af1bf
--- /dev/null
+++ b/data/scripts/gUnk_0800FA78.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800FA78
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x00a0, 0x0278
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0c73
+.short 0x0078
+.short 0x01c0
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_0800FAC0.inc b/data/scripts/gUnk_0800FAC0.inc
new file mode 100644
index 00000000..202b3a20
--- /dev/null
+++ b/data/scripts/gUnk_0800FAC0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800FAC0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0108, 0x01c8
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc
new file mode 100644
index 00000000..06d7fca4
--- /dev/null
+++ b/data/scripts/gUnk_0800FAE4.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800FAE4
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+Call sub_0807F584
+.byte 0x6
diff --git a/data/scripts/gUnk_0800FAF3.inc b/data/scripts/gUnk_0800FAF3.inc
new file mode 100644
index 00000000..0f932d1d
--- /dev/null
+++ b/data/scripts/gUnk_0800FAF3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAF3
+.short 0x1214
diff --git a/data/scripts/gUnk_0800FAF5.inc b/data/scripts/gUnk_0800FAF5.inc
new file mode 100644
index 00000000..6c76b8e0
--- /dev/null
+++ b/data/scripts/gUnk_0800FAF5.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAF5
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FAF6.inc b/data/scripts/gUnk_0800FAF6.inc
new file mode 100644
index 00000000..00f8c4e5
--- /dev/null
+++ b/data/scripts/gUnk_0800FAF6.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAF6
+.byte 0x1a
diff --git a/data/scripts/gUnk_0800FAF7.inc b/data/scripts/gUnk_0800FAF7.inc
new file mode 100644
index 00000000..cbb90022
--- /dev/null
+++ b/data/scripts/gUnk_0800FAF7.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAF7
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FAF8.inc b/data/scripts/gUnk_0800FAF8.inc
new file mode 100644
index 00000000..ea809c7c
--- /dev/null
+++ b/data/scripts/gUnk_0800FAF8.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800FAF8
+.byte 0xe
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0xc
diff --git a/data/scripts/gUnk_0800FAFD.inc b/data/scripts/gUnk_0800FAFD.inc
new file mode 100644
index 00000000..aad4b905
--- /dev/null
+++ b/data/scripts/gUnk_0800FAFD.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAFD
+.byte 0x14
diff --git a/data/scripts/gUnk_0800FAFE.inc b/data/scripts/gUnk_0800FAFE.inc
new file mode 100644
index 00000000..b6e56c6d
--- /dev/null
+++ b/data/scripts/gUnk_0800FAFE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAFE
+.byte 0xf9
diff --git a/data/scripts/gUnk_0800FAFF.inc b/data/scripts/gUnk_0800FAFF.inc
new file mode 100644
index 00000000..70b8910d
--- /dev/null
+++ b/data/scripts/gUnk_0800FAFF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FAFF
+.byte 0xf4
diff --git a/data/scripts/gUnk_0800FB00.inc b/data/scripts/gUnk_0800FB00.inc
new file mode 100644
index 00000000..a6ec0cae
--- /dev/null
+++ b/data/scripts/gUnk_0800FB00.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FB00
+.byte 0x7
diff --git a/data/scripts/gUnk_0800FB01.inc b/data/scripts/gUnk_0800FB01.inc
new file mode 100644
index 00000000..0ea92a29
--- /dev/null
+++ b/data/scripts/gUnk_0800FB01.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FB01
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FB02.inc b/data/scripts/gUnk_0800FB02.inc
new file mode 100644
index 00000000..ba6e9447
--- /dev/null
+++ b/data/scripts/gUnk_0800FB02.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FB02
+.short 0x027c
diff --git a/data/scripts/gUnk_0800FB04.inc b/data/scripts/gUnk_0800FB04.inc
new file mode 100644
index 00000000..cd6fa411
--- /dev/null
+++ b/data/scripts/gUnk_0800FB04.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FB04
+.short 0x0000
+.short 0x140c
diff --git a/data/scripts/gUnk_0800FB08.inc b/data/scripts/gUnk_0800FB08.inc
new file mode 100644
index 00000000..bb95d840
--- /dev/null
+++ b/data/scripts/gUnk_0800FB08.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FB08
+.short 0xf465
diff --git a/data/scripts/gUnk_0800FB0A.inc b/data/scripts/gUnk_0800FB0A.inc
new file mode 100644
index 00000000..842689e6
--- /dev/null
+++ b/data/scripts/gUnk_0800FB0A.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_0800FB0A
+.byte 0x7
+.byte 0x8
+.byte 0xe8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xe8
+.byte 0x0
+.byte 0x70
+.byte 0x2
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x79
diff --git a/data/scripts/gUnk_0800FB31.inc b/data/scripts/gUnk_0800FB31.inc
new file mode 100644
index 00000000..8ac8fa60
--- /dev/null
+++ b/data/scripts/gUnk_0800FB31.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800FB31
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FB44.inc b/data/scripts/gUnk_0800FB44.inc
new file mode 100644
index 00000000..3e81d840
--- /dev/null
+++ b/data/scripts/gUnk_0800FB44.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800FB44
+StartScript 
+_0807EF80 0x0008
+_0807EF80 0x000b
+SetEntityNonPlanarMovement 0x0080
+Call sub_08066D04
+StopScript 
+WaitForSomething2 0x00000002
+Call sub_08066D14
+JumpIf 0x0004
+MoveEntityToPlayer 
+_0807EF80 0x0007
+SetEntityPositionRelative 0x039800b8
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0200
+_0807EDD4 0x00b8, 0x0318
+SetEntityPositionRelative 0x026000a0
+_0807EB44 0x0000
+_0807EF80 0x0001
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+_0807E9D4 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807EF80 0x000b
+.byte 0x28
+.byte 0xc
+.byte 0x4
diff --git a/data/scripts/gUnk_0800FBBB.inc b/data/scripts/gUnk_0800FBBB.inc
new file mode 100644
index 00000000..418f5e0f
--- /dev/null
+++ b/data/scripts/gUnk_0800FBBB.inc
@@ -0,0 +1,54 @@
+SCRIPT_START gUnk_0800FBBB
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x2
+.byte 0x73
+.byte 0xc
+.byte 0xa0
+.byte 0x0
+.byte 0x68
+.byte 0x2
+.byte 0x73
+.byte 0xc
+.byte 0x70
+.byte 0x0
+.byte 0x68
+.byte 0x2
+.byte 0x73
+.byte 0xc
+.byte 0x70
+.byte 0x0
+.byte 0x8
+.byte 0x2
+.byte 0x69
+.byte 0xc
diff --git a/data/scripts/gUnk_0800FBF0.inc b/data/scripts/gUnk_0800FBF0.inc
new file mode 100644
index 00000000..26a37a5d
--- /dev/null
+++ b/data/scripts/gUnk_0800FBF0.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FBF0
+.byte 0x78
+.byte 0x0
+.byte 0xa8
diff --git a/data/scripts/gUnk_0800FBF3.inc b/data/scripts/gUnk_0800FBF3.inc
new file mode 100644
index 00000000..8114b485
--- /dev/null
+++ b/data/scripts/gUnk_0800FBF3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBF3
+.short 0x6101
diff --git a/data/scripts/gUnk_0800FBF5.inc b/data/scripts/gUnk_0800FBF5.inc
new file mode 100644
index 00000000..61ae4f2e
--- /dev/null
+++ b/data/scripts/gUnk_0800FBF5.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBF5
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FBF6.inc b/data/scripts/gUnk_0800FBF6.inc
new file mode 100644
index 00000000..a9e0082c
--- /dev/null
+++ b/data/scripts/gUnk_0800FBF6.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBF6
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FBF8.inc b/data/scripts/gUnk_0800FBF8.inc
new file mode 100644
index 00000000..48e69ee6
--- /dev/null
+++ b/data/scripts/gUnk_0800FBF8.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBF8
+.byte 0x79
diff --git a/data/scripts/gUnk_0800FBF9.inc b/data/scripts/gUnk_0800FBF9.inc
new file mode 100644
index 00000000..fd7511fd
--- /dev/null
+++ b/data/scripts/gUnk_0800FBF9.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBF9
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FBFA.inc b/data/scripts/gUnk_0800FBFA.inc
new file mode 100644
index 00000000..80ad3291
--- /dev/null
+++ b/data/scripts/gUnk_0800FBFA.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBFA
+.byte 0x1
diff --git a/data/scripts/gUnk_0800FBFB.inc b/data/scripts/gUnk_0800FBFB.inc
new file mode 100644
index 00000000..72e45f0b
--- /dev/null
+++ b/data/scripts/gUnk_0800FBFB.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBFB
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FBFC.inc b/data/scripts/gUnk_0800FBFC.inc
new file mode 100644
index 00000000..c514be46
--- /dev/null
+++ b/data/scripts/gUnk_0800FBFC.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FBFC
+.byte 0x28
+.byte 0xc
+.byte 0x4
diff --git a/data/scripts/gUnk_0800FBFF.inc b/data/scripts/gUnk_0800FBFF.inc
new file mode 100644
index 00000000..7324b708
--- /dev/null
+++ b/data/scripts/gUnk_0800FBFF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FBFF
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FC00.inc b/data/scripts/gUnk_0800FC00.inc
new file mode 100644
index 00000000..8bb598f9
--- /dev/null
+++ b/data/scripts/gUnk_0800FC00.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FC00
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FC01.inc b/data/scripts/gUnk_0800FC01.inc
new file mode 100644
index 00000000..e991fed2
--- /dev/null
+++ b/data/scripts/gUnk_0800FC01.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FC01
+.short 0x7900
+.short 0x0a08
diff --git a/data/scripts/gUnk_0800FC05.inc b/data/scripts/gUnk_0800FC05.inc
new file mode 100644
index 00000000..58d00fc8
--- /dev/null
+++ b/data/scripts/gUnk_0800FC05.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FC05
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FC06.inc b/data/scripts/gUnk_0800FC06.inc
new file mode 100644
index 00000000..2df03479
--- /dev/null
+++ b/data/scripts/gUnk_0800FC06.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FC06
+_0807E30C 
diff --git a/data/scripts/gUnk_0800FC08.inc b/data/scripts/gUnk_0800FC08.inc
new file mode 100644
index 00000000..394fef96
--- /dev/null
+++ b/data/scripts/gUnk_0800FC08.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FC08
+.byte 0x5
diff --git a/data/scripts/gUnk_0800FC09.inc b/data/scripts/gUnk_0800FC09.inc
new file mode 100644
index 00000000..39b96508
--- /dev/null
+++ b/data/scripts/gUnk_0800FC09.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800FC09
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x79
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FC0E.inc b/data/scripts/gUnk_0800FC0E.inc
new file mode 100644
index 00000000..ca3a3558
--- /dev/null
+++ b/data/scripts/gUnk_0800FC0E.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800FC0E
+.short 0x000b
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FC24.inc b/data/scripts/gUnk_0800FC24.inc
new file mode 100644
index 00000000..66f5447b
--- /dev/null
+++ b/data/scripts/gUnk_0800FC24.inc
@@ -0,0 +1,44 @@
+SCRIPT_START gUnk_0800FC24
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0200
+_0807EDD4 0x00f8, 0x01a8
+SetEntityPositionRelative 0x01c80118
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+_0807E30C 
+JumpIfNot 0xfffc
+_0807EF80 0x000b
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0200
+_0807EDD4 0x0118, 0x0260
+SetEntityPositionRelative 0x027000f8
+_0807EB44 0x0000
+_0807EF80 0x0001
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807EF80 0x000b
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+_0807EF80 0x0004
+WaitForSomething2 0x00000002
+_0807EF80 0x000d
+SetEntityNonPlanarMovement 0x0040
+_0807EC94 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EF80 0x000c
+SetEntityNonPlanarMovement 0x0040
+.short 0x0871
diff --git a/data/scripts/gUnk_0800FCEA.inc b/data/scripts/gUnk_0800FCEA.inc
new file mode 100644
index 00000000..b7a6d6b9
--- /dev/null
+++ b/data/scripts/gUnk_0800FCEA.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FCEA
+.short 0x0020
+.short 0x0861
diff --git a/data/scripts/gUnk_0800FCEE.inc b/data/scripts/gUnk_0800FCEE.inc
new file mode 100644
index 00000000..19e10314
--- /dev/null
+++ b/data/scripts/gUnk_0800FCEE.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FCEE
+.short 0x0006
+.short 0x0879
diff --git a/data/scripts/gUnk_0800FCF2.inc b/data/scripts/gUnk_0800FCF2.inc
new file mode 100644
index 00000000..dee9566c
--- /dev/null
+++ b/data/scripts/gUnk_0800FCF2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCF2
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FCF3.inc b/data/scripts/gUnk_0800FCF3.inc
new file mode 100644
index 00000000..0d8e6f96
--- /dev/null
+++ b/data/scripts/gUnk_0800FCF3.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCF3
+.short 0x2800
diff --git a/data/scripts/gUnk_0800FCF5.inc b/data/scripts/gUnk_0800FCF5.inc
new file mode 100644
index 00000000..dd3ea251
--- /dev/null
+++ b/data/scripts/gUnk_0800FCF5.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCF5
+.short 0x040c
diff --git a/data/scripts/gUnk_0800FCF7.inc b/data/scripts/gUnk_0800FCF7.inc
new file mode 100644
index 00000000..e979829f
--- /dev/null
+++ b/data/scripts/gUnk_0800FCF7.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCF7
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FCF8.inc b/data/scripts/gUnk_0800FCF8.inc
new file mode 100644
index 00000000..db7535d3
--- /dev/null
+++ b/data/scripts/gUnk_0800FCF8.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCF8
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FCFA.inc b/data/scripts/gUnk_0800FCFA.inc
new file mode 100644
index 00000000..336031e2
--- /dev/null
+++ b/data/scripts/gUnk_0800FCFA.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCFA
+.byte 0x33
diff --git a/data/scripts/gUnk_0800FCFB.inc b/data/scripts/gUnk_0800FCFB.inc
new file mode 100644
index 00000000..74d38000
--- /dev/null
+++ b/data/scripts/gUnk_0800FCFB.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCFB
+.byte 0xc
diff --git a/data/scripts/gUnk_0800FCFC.inc b/data/scripts/gUnk_0800FCFC.inc
new file mode 100644
index 00000000..e9bd84a0
--- /dev/null
+++ b/data/scripts/gUnk_0800FCFC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCFC
+.short 0x0002
diff --git a/data/scripts/gUnk_0800FCFE.inc b/data/scripts/gUnk_0800FCFE.inc
new file mode 100644
index 00000000..a9de73b3
--- /dev/null
+++ b/data/scripts/gUnk_0800FCFE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCFE
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FCFF.inc b/data/scripts/gUnk_0800FCFF.inc
new file mode 100644
index 00000000..33aefa42
--- /dev/null
+++ b/data/scripts/gUnk_0800FCFF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FCFF
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FD00.inc b/data/scripts/gUnk_0800FD00.inc
new file mode 100644
index 00000000..d5a025ca
--- /dev/null
+++ b/data/scripts/gUnk_0800FD00.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FD00
+.byte 0xb
diff --git a/data/scripts/gUnk_0800FD01.inc b/data/scripts/gUnk_0800FD01.inc
new file mode 100644
index 00000000..67d4d124
--- /dev/null
+++ b/data/scripts/gUnk_0800FD01.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FD01
+.byte 0xc
+.byte 0x4d
+.byte 0x6d
diff --git a/data/scripts/gUnk_0800FD04.inc b/data/scripts/gUnk_0800FD04.inc
new file mode 100644
index 00000000..99de7f42
--- /dev/null
+++ b/data/scripts/gUnk_0800FD04.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FD04
+.byte 0x6
diff --git a/data/scripts/gUnk_0800FD05.inc b/data/scripts/gUnk_0800FD05.inc
new file mode 100644
index 00000000..26d17a5f
--- /dev/null
+++ b/data/scripts/gUnk_0800FD05.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800FD05
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc
new file mode 100644
index 00000000..fc4feb68
--- /dev/null
+++ b/data/scripts/gUnk_0800FD0C.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FD0C
+CheckLocalFlag 0x00cd
+JumpIf 0x003e
+.short 0x0c33
diff --git a/data/scripts/gUnk_0800FD16.inc b/data/scripts/gUnk_0800FD16.inc
new file mode 100644
index 00000000..8bea3c87
--- /dev/null
+++ b/data/scripts/gUnk_0800FD16.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800FD16
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x16
+.byte 0x10
+.byte 0xc8
+.byte 0x0
+.byte 0xc0
+.byte 0x3
+.byte 0x40
diff --git a/data/scripts/gUnk_0800FD21.inc b/data/scripts/gUnk_0800FD21.inc
new file mode 100644
index 00000000..da112cc2
--- /dev/null
+++ b/data/scripts/gUnk_0800FD21.inc
@@ -0,0 +1,96 @@
+SCRIPT_START gUnk_0800FD21
+.byte 0x10
+.byte 0x5
+.byte 0x8
+.byte 0xf6
+.byte 0xff
+.byte 0x12
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x30
+.byte 0x0
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0xf9
+.byte 0x7
+.byte 0x8
+.byte 0x5c
+.byte 0xc
+.byte 0x6
+.byte 0x25
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0x80
+.byte 0xfd
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xcc
+.byte 0xff
+.byte 0x16
+.byte 0x10
+.byte 0xc8
+.byte 0x0
+.byte 0xc0
+.byte 0x3
+.byte 0x40
+.byte 0x10
+.byte 0x5
+.byte 0x8
+.byte 0xf6
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0xf9
+.byte 0x7
+.byte 0x8
+.byte 0x5c
+.byte 0xc
+.byte 0x6c
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0x80
+.byte 0xfd
+.byte 0x0
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xd4
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FD80.inc b/data/scripts/gUnk_0800FD80.inc
new file mode 100644
index 00000000..b01200e6
--- /dev/null
+++ b/data/scripts/gUnk_0800FD80.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800FD80
+SetEntityNonPlanarMovement 0x0080
+_0807EC64 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc
new file mode 100644
index 00000000..2722de54
--- /dev/null
+++ b/data/scripts/gUnk_0800FDA0.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800FDA0
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08069888
+_0807EA94 
+_0807E878 
+Jump 0xffea
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FDCC.inc b/data/scripts/gUnk_0800FDCC.inc
new file mode 100644
index 00000000..55fccfd9
--- /dev/null
+++ b/data/scripts/gUnk_0800FDCC.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800FDCC
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+SetEntityNonPlanarMovement 0x0040
+StopScript 
+Call sub_08069A60
+Call sub_0806991C
+StopScript 
+StartScript 
diff --git a/data/scripts/gUnk_0800FDF2.inc b/data/scripts/gUnk_0800FDF2.inc
new file mode 100644
index 00000000..afb0db10
--- /dev/null
+++ b/data/scripts/gUnk_0800FDF2.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FDF2
+.byte 0xb
diff --git a/data/scripts/gUnk_0800FDF3.inc b/data/scripts/gUnk_0800FDF3.inc
new file mode 100644
index 00000000..c35fa031
--- /dev/null
+++ b/data/scripts/gUnk_0800FDF3.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800FDF3
+.byte 0xc
+.byte 0xcd
+.byte 0x9a
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FDFA.inc b/data/scripts/gUnk_0800FDFA.inc
new file mode 100644
index 00000000..d423efaf
--- /dev/null
+++ b/data/scripts/gUnk_0800FDFA.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FDFA
+.short 0x000c
diff --git a/data/scripts/gUnk_0800FDFC.inc b/data/scripts/gUnk_0800FDFC.inc
new file mode 100644
index 00000000..44b9a2f2
--- /dev/null
+++ b/data/scripts/gUnk_0800FDFC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FDFC
+_0807EE30 
diff --git a/data/scripts/gUnk_0800FDFE.inc b/data/scripts/gUnk_0800FDFE.inc
new file mode 100644
index 00000000..05cbc9f7
--- /dev/null
+++ b/data/scripts/gUnk_0800FDFE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FDFE
+.byte 0x5
diff --git a/data/scripts/gUnk_0800FDFF.inc b/data/scripts/gUnk_0800FDFF.inc
new file mode 100644
index 00000000..a751c61c
--- /dev/null
+++ b/data/scripts/gUnk_0800FDFF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FDFF
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FE00.inc b/data/scripts/gUnk_0800FE00.inc
new file mode 100644
index 00000000..1e5aa79f
--- /dev/null
+++ b/data/scripts/gUnk_0800FE00.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE00
+.byte 0xee
diff --git a/data/scripts/gUnk_0800FE01.inc b/data/scripts/gUnk_0800FE01.inc
new file mode 100644
index 00000000..dc0a4b1f
--- /dev/null
+++ b/data/scripts/gUnk_0800FE01.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE01
+.byte 0xff
diff --git a/data/scripts/gUnk_0800FE02.inc b/data/scripts/gUnk_0800FE02.inc
new file mode 100644
index 00000000..b02cc101
--- /dev/null
+++ b/data/scripts/gUnk_0800FE02.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE02
+.short 0x0803
diff --git a/data/scripts/gUnk_0800FE04.inc b/data/scripts/gUnk_0800FE04.inc
new file mode 100644
index 00000000..27f5f86a
--- /dev/null
+++ b/data/scripts/gUnk_0800FE04.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE04
+.short 0xffde
diff --git a/data/scripts/gUnk_0800FE06.inc b/data/scripts/gUnk_0800FE06.inc
new file mode 100644
index 00000000..dde1e4b5
--- /dev/null
+++ b/data/scripts/gUnk_0800FE06.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE06
+.byte 0x2
diff --git a/data/scripts/gUnk_0800FE07.inc b/data/scripts/gUnk_0800FE07.inc
new file mode 100644
index 00000000..77deec42
--- /dev/null
+++ b/data/scripts/gUnk_0800FE07.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE07
+.byte 0x4
diff --git a/data/scripts/gUnk_0800FE08.inc b/data/scripts/gUnk_0800FE08.inc
new file mode 100644
index 00000000..8aed1d89
--- /dev/null
+++ b/data/scripts/gUnk_0800FE08.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FE08
+.byte 0x61
diff --git a/data/scripts/gUnk_0800FE09.inc b/data/scripts/gUnk_0800FE09.inc
new file mode 100644
index 00000000..819f3a14
--- /dev/null
+++ b/data/scripts/gUnk_0800FE09.inc
@@ -0,0 +1,56 @@
+SCRIPT_START gUnk_0800FE09
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x3d
+.byte 0x9a
+.byte 0x6
+.byte 0x8
+.byte 0x3
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FE40.inc b/data/scripts/gUnk_0800FE40.inc
new file mode 100644
index 00000000..2c66c8e8
--- /dev/null
+++ b/data/scripts/gUnk_0800FE40.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0800FE40
+.short 0xffa8
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FE44.inc b/data/scripts/gUnk_0800FE44.inc
new file mode 100644
index 00000000..3b95f478
--- /dev/null
+++ b/data/scripts/gUnk_0800FE44.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800FE44
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+SetEntityNonPlanarMovement 0x0040
+StopScript 
+Call sub_08069AA8
+.short 0x0c0b
+.short 0x99ad
diff --git a/data/scripts/gUnk_0800FE64.inc b/data/scripts/gUnk_0800FE64.inc
new file mode 100644
index 00000000..03f17235
--- /dev/null
+++ b/data/scripts/gUnk_0800FE64.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800FE64
+_0807E078 0x0402
+StartScript 
+Call sub_08069ACC
+JumpIf 0x000c
+_0807EE30 
+JumpIfNot 0xffee
+Jump 0xffde
+StopScript 
+_0807EB44 0x0002
+.short 0x0879
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FE88.inc b/data/scripts/gUnk_0800FE88.inc
new file mode 100644
index 00000000..9dfb7dbd
--- /dev/null
+++ b/data/scripts/gUnk_0800FE88.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800FE88
+Wait 0x001e
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x003c
+Call sub_08069A84
+Jump 0xffa8
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FEBC.inc b/data/scripts/gUnk_0800FEBC.inc
new file mode 100644
index 00000000..2596aca9
--- /dev/null
+++ b/data/scripts/gUnk_0800FEBC.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0800FEBC
+StartScript 
+CheckInventory1 0x0012
+JumpIf 0x004a
+_0807EB44 0x0006
+_0807E9D4 
+CallWithArg sub_0807F3D8, 0x00000008
+StopScript 
+StopScript 
+StartScript 
+_0807EF80 0x000b
+Call sub_080642B8
+CheckEntityInteractType 
+JumpIfNot 0xffee
+StopScript 
+_0807E864 
diff --git a/data/scripts/gUnk_0800FEF0.inc b/data/scripts/gUnk_0800FEF0.inc
new file mode 100644
index 00000000..94aa905f
--- /dev/null
+++ b/data/scripts/gUnk_0800FEF0.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FEF0
+_0807EB74 
diff --git a/data/scripts/gUnk_0800FEF2.inc b/data/scripts/gUnk_0800FEF2.inc
new file mode 100644
index 00000000..d625c7d9
--- /dev/null
+++ b/data/scripts/gUnk_0800FEF2.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0800FEF2
+.byte 0xc
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FEF9.inc b/data/scripts/gUnk_0800FEF9.inc
new file mode 100644
index 00000000..1f786b7c
--- /dev/null
+++ b/data/scripts/gUnk_0800FEF9.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FEF9
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0800FEFC.inc b/data/scripts/gUnk_0800FEFC.inc
new file mode 100644
index 00000000..b4a70e1a
--- /dev/null
+++ b/data/scripts/gUnk_0800FEFC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FEFC
+.short 0x0c0b
diff --git a/data/scripts/gUnk_0800FEFE.inc b/data/scripts/gUnk_0800FEFE.inc
new file mode 100644
index 00000000..2a770ed0
--- /dev/null
+++ b/data/scripts/gUnk_0800FEFE.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FEFE
+.byte 0x29
+.byte 0x44
+.byte 0x6
diff --git a/data/scripts/gUnk_0800FF01.inc b/data/scripts/gUnk_0800FF01.inc
new file mode 100644
index 00000000..01b6dc34
--- /dev/null
+++ b/data/scripts/gUnk_0800FF01.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FF01
+.short 0x5908
diff --git a/data/scripts/gUnk_0800FF03.inc b/data/scripts/gUnk_0800FF03.inc
new file mode 100644
index 00000000..884ddfb3
--- /dev/null
+++ b/data/scripts/gUnk_0800FF03.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FF03
+.byte 0x4
diff --git a/data/scripts/gUnk_0800FF04.inc b/data/scripts/gUnk_0800FF04.inc
new file mode 100644
index 00000000..28f5293d
--- /dev/null
+++ b/data/scripts/gUnk_0800FF04.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FF04
+.byte 0x31
diff --git a/data/scripts/gUnk_0800FF05.inc b/data/scripts/gUnk_0800FF05.inc
new file mode 100644
index 00000000..c03ba842
--- /dev/null
+++ b/data/scripts/gUnk_0800FF05.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FF05
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FF06.inc b/data/scripts/gUnk_0800FF06.inc
new file mode 100644
index 00000000..0c5ecc22
--- /dev/null
+++ b/data/scripts/gUnk_0800FF06.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FF06
+.short 0x000f
diff --git a/data/scripts/gUnk_0800FF08.inc b/data/scripts/gUnk_0800FF08.inc
new file mode 100644
index 00000000..854f0268
--- /dev/null
+++ b/data/scripts/gUnk_0800FF08.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0800FF08
+_0807E878 
+Jump 0xffcc
+_0807EF80 0x0008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc
new file mode 100644
index 00000000..e3c6eed5
--- /dev/null
+++ b/data/scripts/gUnk_0800FF18.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800FF18
+StartScript 
+CheckInventory1 0x0012
+JumpIf 0x004a
+_0807EB44 0x0006
+_0807E9D4 
+.short 0x140c
diff --git a/data/scripts/gUnk_0800FF2A.inc b/data/scripts/gUnk_0800FF2A.inc
new file mode 100644
index 00000000..3a4ea9a8
--- /dev/null
+++ b/data/scripts/gUnk_0800FF2A.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_0800FF2A
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+.short 0x0402
+.short 0x0402
+.short 0x0401
+.short 0x0879
+.short 0x000b
+.short 0x0c0b
+.short 0x4199
+.short 0x0806
+.short 0x0418
+.short 0x0805
+.short 0xffee
+.short 0x0402
+.short 0x0443
+.short 0x0463
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+.short 0x0c0b
+.short 0x4429
+.short 0x0806
+.short 0x0459
+.short 0x0831
+.short 0x000f
+.short 0x0444
+.short 0x0803
+.short 0xffcc
+.short 0x0879
+.short 0x0008
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc
new file mode 100644
index 00000000..f9826974
--- /dev/null
+++ b/data/scripts/gUnk_0800FF74.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800FF74
+StartScript 
+_0807EB44 0x0002
+_0807E9D4 
+CallWithArg sub_0807F3D8, 0x00000008
+Call sub_080644A4
+ClearLocalFlag 0x00c7
+StopScript 
+StopScript 
+StartScript 
+_0807EF80 0x000a
+CheckLocalFlag 0x00ce
+JumpIf 0x002c
+_0807EF80 0x000b
+Call sub_08064198
+.short 0x0812
+.short 0x00c7
diff --git a/data/scripts/gUnk_0800FFB0.inc b/data/scripts/gUnk_0800FFB0.inc
new file mode 100644
index 00000000..da0ea75d
--- /dev/null
+++ b/data/scripts/gUnk_0800FFB0.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FFB0
+JumpIfNot 0x001a
+Call sub_08064488
+.byte 0x17
diff --git a/data/scripts/gUnk_0800FFBB.inc b/data/scripts/gUnk_0800FFBB.inc
new file mode 100644
index 00000000..1f1d07c0
--- /dev/null
+++ b/data/scripts/gUnk_0800FFBB.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0800FFBB
+.byte 0x8
+.byte 0x40
+.byte 0x40
+.byte 0x5
+.byte 0x8
+.byte 0xc
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x71
+.byte 0x44
+.byte 0x6
+.byte 0x8
+.byte 0x4
+.byte 0x8
+.byte 0x4a
+.byte 0x0
+.byte 0x18
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xc2
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x2a
+.byte 0x8
diff --git a/data/scripts/gUnk_0800FFD6.inc b/data/scripts/gUnk_0800FFD6.inc
new file mode 100644
index 00000000..fed76005
--- /dev/null
+++ b/data/scripts/gUnk_0800FFD6.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800FFD6
+.short 0x00c7
+.short 0x0443
+.short 0x0463
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+.short 0x080f
+.short 0x0048
+.short 0x0804
+.short 0x000c
diff --git a/data/scripts/gUnk_0800FFEE.inc b/data/scripts/gUnk_0800FFEE.inc
new file mode 100644
index 00000000..70a8ec79
--- /dev/null
+++ b/data/scripts/gUnk_0800FFEE.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FFEE
+TextboxNoOverlap 0x3401
+_0807EA94 
+.short 0x0803
diff --git a/data/scripts/gUnk_0800FFF6.inc b/data/scripts/gUnk_0800FFF6.inc
new file mode 100644
index 00000000..9a227734
--- /dev/null
+++ b/data/scripts/gUnk_0800FFF6.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800FFF6
+.short 0x006a
+.short 0x0812
+.short 0x00ce
diff --git a/data/scripts/gUnk_0800FFFC.inc b/data/scripts/gUnk_0800FFFC.inc
new file mode 100644
index 00000000..8d498d5f
--- /dev/null
+++ b/data/scripts/gUnk_0800FFFC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FFFC
+.byte 0x5
diff --git a/data/scripts/gUnk_0800FFFD.inc b/data/scripts/gUnk_0800FFFD.inc
new file mode 100644
index 00000000..a128975b
--- /dev/null
+++ b/data/scripts/gUnk_0800FFFD.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FFFD
+.short 0x0c08
diff --git a/data/scripts/gUnk_0800FFFF.inc b/data/scripts/gUnk_0800FFFF.inc
new file mode 100644
index 00000000..ebd79cd4
--- /dev/null
+++ b/data/scripts/gUnk_0800FFFF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0800FFFF
+.byte 0x0
diff --git a/data/scripts/gUnk_08010000.inc b/data/scripts/gUnk_08010000.inc
new file mode 100644
index 00000000..1cd1f602
--- /dev/null
+++ b/data/scripts/gUnk_08010000.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010000
+.byte 0x5b
diff --git a/data/scripts/gUnk_08010001.inc b/data/scripts/gUnk_08010001.inc
new file mode 100644
index 00000000..cae61ada
--- /dev/null
+++ b/data/scripts/gUnk_08010001.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010001
+.byte 0x8
diff --git a/data/scripts/gUnk_08010002.inc b/data/scripts/gUnk_08010002.inc
new file mode 100644
index 00000000..c9ae46bc
--- /dev/null
+++ b/data/scripts/gUnk_08010002.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010002
+.byte 0xb
diff --git a/data/scripts/gUnk_08010003.inc b/data/scripts/gUnk_08010003.inc
new file mode 100644
index 00000000..5d0de773
--- /dev/null
+++ b/data/scripts/gUnk_08010003.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010003
+.short 0x5934
diff --git a/data/scripts/gUnk_08010005.inc b/data/scripts/gUnk_08010005.inc
new file mode 100644
index 00000000..8ce7e773
--- /dev/null
+++ b/data/scripts/gUnk_08010005.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010005
+.short 0x0304
diff --git a/data/scripts/gUnk_08010007.inc b/data/scripts/gUnk_08010007.inc
new file mode 100644
index 00000000..d648f0dd
--- /dev/null
+++ b/data/scripts/gUnk_08010007.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010007
+.byte 0x8
diff --git a/data/scripts/gUnk_08010008.inc b/data/scripts/gUnk_08010008.inc
new file mode 100644
index 00000000..de2257b7
--- /dev/null
+++ b/data/scripts/gUnk_08010008.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010008
+.byte 0x58
diff --git a/data/scripts/gUnk_08010009.inc b/data/scripts/gUnk_08010009.inc
new file mode 100644
index 00000000..113ed8c9
--- /dev/null
+++ b/data/scripts/gUnk_08010009.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010009
+.byte 0x0
diff --git a/data/scripts/gUnk_0801000A.inc b/data/scripts/gUnk_0801000A.inc
new file mode 100644
index 00000000..4080b6d6
--- /dev/null
+++ b/data/scripts/gUnk_0801000A.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801000A
+.short 0x085b
diff --git a/data/scripts/gUnk_0801000C.inc b/data/scripts/gUnk_0801000C.inc
new file mode 100644
index 00000000..3e3efeea
--- /dev/null
+++ b/data/scripts/gUnk_0801000C.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801000C
+.byte 0x2
diff --git a/data/scripts/gUnk_0801000D.inc b/data/scripts/gUnk_0801000D.inc
new file mode 100644
index 00000000..9c9307db
--- /dev/null
+++ b/data/scripts/gUnk_0801000D.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801000D
+.byte 0x34
diff --git a/data/scripts/gUnk_0801000E.inc b/data/scripts/gUnk_0801000E.inc
new file mode 100644
index 00000000..e9e445b3
--- /dev/null
+++ b/data/scripts/gUnk_0801000E.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801000E
+.byte 0x59
diff --git a/data/scripts/gUnk_0801000F.inc b/data/scripts/gUnk_0801000F.inc
new file mode 100644
index 00000000..82484056
--- /dev/null
+++ b/data/scripts/gUnk_0801000F.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0801000F
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0x4e
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x45
+.byte 0x4
diff --git a/data/scripts/gUnk_08010018.inc b/data/scripts/gUnk_08010018.inc
new file mode 100644
index 00000000..d5fb7c34
--- /dev/null
+++ b/data/scripts/gUnk_08010018.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08010018
+.byte 0xb
+.byte 0xc
+.byte 0x95
diff --git a/data/scripts/gUnk_0801001B.inc b/data/scripts/gUnk_0801001B.inc
new file mode 100644
index 00000000..071bb38c
--- /dev/null
+++ b/data/scripts/gUnk_0801001B.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801001B
+.short 0x07f5
diff --git a/data/scripts/gUnk_0801001D.inc b/data/scripts/gUnk_0801001D.inc
new file mode 100644
index 00000000..b68e92d8
--- /dev/null
+++ b/data/scripts/gUnk_0801001D.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0801001D
+.short 0x4308
+.short 0x6304
+.short 0x0c04
diff --git a/data/scripts/gUnk_08010023.inc b/data/scripts/gUnk_08010023.inc
new file mode 100644
index 00000000..e0ae33ff
--- /dev/null
+++ b/data/scripts/gUnk_08010023.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_08010023
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0xa
+.byte 0x34
+.byte 0x59
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08010044.inc b/data/scripts/gUnk_08010044.inc
new file mode 100644
index 00000000..4fe595b5
--- /dev/null
+++ b/data/scripts/gUnk_08010044.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_08010044
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0018, 0x0108
+_0807EB44 0x0002
+CallWithArg sub_0807F3D8, 0x00000008
+SetLocalFlag 0x00ce
+Call sub_080644A4
+CallWithArg sub_0807F5B0, 0x0000000a
+_0807E878 
+Jump 0xff1e
+.short 0x0000
+.short 0x0401
+.short 0x0453
+.short 0x0879
+.short 0x000a
+.short 0x0861
+.short 0x0004
+.short 0x140c
+.short 0x72b1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
diff --git a/data/scripts/gUnk_08010098.inc b/data/scripts/gUnk_08010098.inc
new file mode 100644
index 00000000..d7fcc70d
--- /dev/null
+++ b/data/scripts/gUnk_08010098.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010098
+.byte 0x63
diff --git a/data/scripts/gUnk_08010099.inc b/data/scripts/gUnk_08010099.inc
new file mode 100644
index 00000000..5ce5f5be
--- /dev/null
+++ b/data/scripts/gUnk_08010099.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_08010099
+.short 0x0c04
+.short 0xb114
+.short 0x0672
+.short 0x0408
+.short 0x0000
+.short 0x5a00
+.short 0x0108
+.short 0x590a
+.short 0x3104
+.short 0x0f08
+.short 0x4400
+.short 0x6104
+.short 0x0408
+.short 0x0c00
+.short 0xb114
+.short 0x0672
+.short 0x0008
+.short 0x0000
+.short 0x0300
+.short 0xd008
diff --git a/data/scripts/gUnk_080100C1.inc b/data/scripts/gUnk_080100C1.inc
new file mode 100644
index 00000000..9f9977f0
--- /dev/null
+++ b/data/scripts/gUnk_080100C1.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_080100C1
+.byte 0xff
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc
new file mode 100644
index 00000000..b9bce9cf
--- /dev/null
+++ b/data/scripts/gUnk_080100C8.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_080100C8
+StartScript 
+Call sub_08061FE4
+Call sub_08061E70
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08061FE4
+Call sub_08062048
+_0807EA94 
+.byte 0x44
diff --git a/data/scripts/gUnk_080100F5.inc b/data/scripts/gUnk_080100F5.inc
new file mode 100644
index 00000000..8a8ad5fa
--- /dev/null
+++ b/data/scripts/gUnk_080100F5.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_080100F5
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xe4
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_080100FC.inc b/data/scripts/gUnk_080100FC.inc
new file mode 100644
index 00000000..291eb908
--- /dev/null
+++ b/data/scripts/gUnk_080100FC.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080100FC
+StartScript 
diff --git a/data/scripts/gUnk_080100FE.inc b/data/scripts/gUnk_080100FE.inc
new file mode 100644
index 00000000..1712947c
--- /dev/null
+++ b/data/scripts/gUnk_080100FE.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080100FE
+.byte 0xb
diff --git a/data/scripts/gUnk_080100FF.inc b/data/scripts/gUnk_080100FF.inc
new file mode 100644
index 00000000..0f7d435c
--- /dev/null
+++ b/data/scripts/gUnk_080100FF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080100FF
+.byte 0xc
diff --git a/data/scripts/gUnk_08010100.inc b/data/scripts/gUnk_08010100.inc
new file mode 100644
index 00000000..d03a986a
--- /dev/null
+++ b/data/scripts/gUnk_08010100.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010100
+.short 0x1fe5
diff --git a/data/scripts/gUnk_08010102.inc b/data/scripts/gUnk_08010102.inc
new file mode 100644
index 00000000..5994ce71
--- /dev/null
+++ b/data/scripts/gUnk_08010102.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010102
+.byte 0x6
diff --git a/data/scripts/gUnk_08010103.inc b/data/scripts/gUnk_08010103.inc
new file mode 100644
index 00000000..6cf4510d
--- /dev/null
+++ b/data/scripts/gUnk_08010103.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010103
+.short 0x0b08
diff --git a/data/scripts/gUnk_08010105.inc b/data/scripts/gUnk_08010105.inc
new file mode 100644
index 00000000..d8139a83
--- /dev/null
+++ b/data/scripts/gUnk_08010105.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010105
+.byte 0xc
diff --git a/data/scripts/gUnk_08010106.inc b/data/scripts/gUnk_08010106.inc
new file mode 100644
index 00000000..2f861ad9
--- /dev/null
+++ b/data/scripts/gUnk_08010106.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_08010106
+.short 0x1e71
+.short 0x0806
diff --git a/data/scripts/gUnk_0801010A.inc b/data/scripts/gUnk_0801010A.inc
new file mode 100644
index 00000000..5143a001
--- /dev/null
+++ b/data/scripts/gUnk_0801010A.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0801010A
+_0807EF80 0x000a
+StopScript 
+.byte 0x31
diff --git a/data/scripts/gUnk_08010111.inc b/data/scripts/gUnk_08010111.inc
new file mode 100644
index 00000000..4f897f7a
--- /dev/null
+++ b/data/scripts/gUnk_08010111.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08010111
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x91
+.byte 0x1e
+.byte 0x6
+.byte 0x8
+.byte 0x3
+.byte 0x8
+.byte 0xf4
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08010120.inc b/data/scripts/gUnk_08010120.inc
new file mode 100644
index 00000000..b1bb210e
--- /dev/null
+++ b/data/scripts/gUnk_08010120.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_08010120
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+.short 0x0879
+.short 0x000a
diff --git a/data/scripts/gUnk_08010130.inc b/data/scripts/gUnk_08010130.inc
new file mode 100644
index 00000000..b3348e00
--- /dev/null
+++ b/data/scripts/gUnk_08010130.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08010130
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x4f22
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffec
diff --git a/data/scripts/gUnk_08010148.inc b/data/scripts/gUnk_08010148.inc
new file mode 100644
index 00000000..79a7781f
--- /dev/null
+++ b/data/scripts/gUnk_08010148.inc
@@ -0,0 +1,47 @@
+SCRIPT_START gUnk_08010148
+StartScript 
+_0807EF80 0x0001
+Call sub_0806C354
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CheckRoomFlag 0x0001
+JumpIf 0x0034
+TextboxNoOverlapFollowPos 0x3001, 0x0000
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x002e
+Call sub_080A1608
+_0807EA94 
+_0807E878 
+CallWithArg sub_080A1550, 0x080101ac
+JumpIfNot 0xffca
+SoundReq2 0x0015
+SetRoomFlag 0x0001
+Jump 0xffbe
+Call sub_080A1608
+_0807EA94 
+_0807E878 
+Jump 0xffb0
+StartScript 
+_0807EF80 0x0008
+Call sub_080A1648
+StopScript 
+Call sub_080A1270
+_0807E864 
+Call sub_0807DF28
+TextboxNoOverlapFollowPos 0x3004, 0x0007
+_0807EA94 
+SoundReq0x80100000 
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+CallWithArg sub_0807F75C, 0x03400378
+Call sub_080791BC
+Call sub_0807FB74
+_0807E8E4_1 
+Call sub_0807F168
+.short 0x0c0b
diff --git a/data/scripts/gUnk_080101FA.inc b/data/scripts/gUnk_080101FA.inc
new file mode 100644
index 00000000..dd309431
--- /dev/null
+++ b/data/scripts/gUnk_080101FA.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_080101FA
+.byte 0x89
+.byte 0x13
+.byte 0xa
diff --git a/data/scripts/gUnk_080101FD.inc b/data/scripts/gUnk_080101FD.inc
new file mode 100644
index 00000000..779edf8a
--- /dev/null
+++ b/data/scripts/gUnk_080101FD.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080101FD
+.short 0x0b08
diff --git a/data/scripts/gUnk_080101FF.inc b/data/scripts/gUnk_080101FF.inc
new file mode 100644
index 00000000..efb3de9c
--- /dev/null
+++ b/data/scripts/gUnk_080101FF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080101FF
+.byte 0xc
diff --git a/data/scripts/gUnk_08010200.inc b/data/scripts/gUnk_08010200.inc
new file mode 100644
index 00000000..d148e2b0
--- /dev/null
+++ b/data/scripts/gUnk_08010200.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08010200
+.byte 0x39
+.byte 0xec
+.byte 0x6
diff --git a/data/scripts/gUnk_08010203.inc b/data/scripts/gUnk_08010203.inc
new file mode 100644
index 00000000..0e68e4d1
--- /dev/null
+++ b/data/scripts/gUnk_08010203.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_08010203
+.short 0x0108
+.short 0x6b04
diff --git a/data/scripts/gUnk_08010207.inc b/data/scripts/gUnk_08010207.inc
new file mode 100644
index 00000000..a4f46d80
--- /dev/null
+++ b/data/scripts/gUnk_08010207.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010207
+.byte 0x4
diff --git a/data/scripts/gUnk_08010208.inc b/data/scripts/gUnk_08010208.inc
new file mode 100644
index 00000000..84630568
--- /dev/null
+++ b/data/scripts/gUnk_08010208.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_08010208
+.short 0x0c0b
+.short 0xf845
diff --git a/data/scripts/gUnk_0801020C.inc b/data/scripts/gUnk_0801020C.inc
new file mode 100644
index 00000000..7eab1e47
--- /dev/null
+++ b/data/scripts/gUnk_0801020C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0801020C
+.short 0x0807
+.short 0x0488
+.short 0x0402
+.short 0x0838
+.short 0x0004
+.short 0x043c
+.short 0x0437
+.short 0x087c
+.short 0xffff
+.short 0x0c0b
diff --git a/data/scripts/gUnk_08010220.inc b/data/scripts/gUnk_08010220.inc
new file mode 100644
index 00000000..ac8d2032
--- /dev/null
+++ b/data/scripts/gUnk_08010220.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08010220
+.short 0x13b5
+.short 0x080a
+.short 0x0459
+.short 0x0805
+.short 0x0018
+.short 0x0c0b
+.short 0x13e9
+.short 0x080a
+.short 0x0434
+.short 0x0c0b
+.short 0x1461
diff --git a/data/scripts/gUnk_08010236.inc b/data/scripts/gUnk_08010236.inc
new file mode 100644
index 00000000..9e8ddc21
--- /dev/null
+++ b/data/scripts/gUnk_08010236.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_08010236
+.short 0x080a
+.short 0x0459
+.short 0x0c0b
+.short 0x14a9
+.short 0x080a
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x140c
+.short 0xf5b1
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0830
+.short 0x0001
+.short 0x0c0b
+.short 0x169d
+.short 0x080a
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc
new file mode 100644
index 00000000..c935ed9d
--- /dev/null
+++ b/data/scripts/gUnk_08010264.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08010264
+StartScript 
+_0807EF80 0x0007
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0006
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08065F64
+_0807EA94 
+_0807E878 
+Jump 0xffea
+.short 0x0000
diff --git a/data/scripts/gUnk_08010294.inc b/data/scripts/gUnk_08010294.inc
new file mode 100644
index 00000000..bc2727c2
--- /dev/null
+++ b/data/scripts/gUnk_08010294.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_08010294
+StartScript 
+_0807EF80 0x0000
+Call sub_08062A48
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+CheckRoomFlag 0x0009
+JumpIfNot 0x001a
+_0807E864 
+_0807EB74 
+Call sub_0806265C
+_0807EA94 
+_0807E878 
+Call sub_08062500
+Jump 0xffdc
+_0807E864 
+_0807EB74 
+Call sub_0806265C
+_0807EA94 
+_0807E878 
+Jump 0xffca
+.short 0x0000
diff --git a/data/scripts/gUnk_080102E0.inc b/data/scripts/gUnk_080102E0.inc
new file mode 100644
index 00000000..2e9f2ea3
--- /dev/null
+++ b/data/scripts/gUnk_080102E0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080102E0
+StartScript 
+_0807EF80 0x0000
+Call sub_08062A48
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+.byte 0x63
diff --git a/data/scripts/gUnk_080102FB.inc b/data/scripts/gUnk_080102FB.inc
new file mode 100644
index 00000000..2b492607
--- /dev/null
+++ b/data/scripts/gUnk_080102FB.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080102FB
+.short 0x0b04
diff --git a/data/scripts/gUnk_080102FD.inc b/data/scripts/gUnk_080102FD.inc
new file mode 100644
index 00000000..87eb5162
--- /dev/null
+++ b/data/scripts/gUnk_080102FD.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080102FD
+.byte 0xc
diff --git a/data/scripts/gUnk_080102FE.inc b/data/scripts/gUnk_080102FE.inc
new file mode 100644
index 00000000..1a1206d9
--- /dev/null
+++ b/data/scripts/gUnk_080102FE.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_080102FE
+.byte 0x5d
+.byte 0x26
+.byte 0x6
+.byte 0x8
+.byte 0x59
diff --git a/data/scripts/gUnk_08010303.inc b/data/scripts/gUnk_08010303.inc
new file mode 100644
index 00000000..ebe7d11d
--- /dev/null
+++ b/data/scripts/gUnk_08010303.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010303
+.byte 0x4
diff --git a/data/scripts/gUnk_08010304.inc b/data/scripts/gUnk_08010304.inc
new file mode 100644
index 00000000..ca26c485
--- /dev/null
+++ b/data/scripts/gUnk_08010304.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010304
+.byte 0x44
diff --git a/data/scripts/gUnk_08010305.inc b/data/scripts/gUnk_08010305.inc
new file mode 100644
index 00000000..f30a6549
--- /dev/null
+++ b/data/scripts/gUnk_08010305.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08010305
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xea
+.byte 0xff
diff --git a/data/scripts/gUnk_0801030A.inc b/data/scripts/gUnk_0801030A.inc
new file mode 100644
index 00000000..8a6e1943
--- /dev/null
+++ b/data/scripts/gUnk_0801030A.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801030A
+.short 0x0000
diff --git a/data/scripts/gUnk_0801030C.inc b/data/scripts/gUnk_0801030C.inc
new file mode 100644
index 00000000..73c73cc4
--- /dev/null
+++ b/data/scripts/gUnk_0801030C.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0801030C
+StartScript 
+_0807EF80 0x0000
+StopScript 
+StopScript 
+Call sub_08062698
+.short 0x0c0b
+.short 0x26ad
diff --git a/data/scripts/gUnk_08010320.inc b/data/scripts/gUnk_08010320.inc
new file mode 100644
index 00000000..a6d079e5
--- /dev/null
+++ b/data/scripts/gUnk_08010320.inc
@@ -0,0 +1,72 @@
+SCRIPT_START gUnk_08010320
+_0807E078 0x140c
+.short 0xf0ed
+.short 0x0807
+.short 0x0009
+.short 0x0000
+.short 0x2806
+.short 0x0012
+.short 0x001a
+.short 0x0022
+.short 0x002a
+.short 0x0032
+.short 0x003a
+.short 0x0042
+.short 0x004a
+.short 0x0052
+.short 0x0c74
+.short 0x0358
+.short 0x0078
+.short 0x0803
+.short 0x004e
+.short 0x0c74
+.short 0x0390
+.short 0x0078
+.short 0x0803
+.short 0x0044
+.short 0x0c74
+.short 0x03c8
+.short 0x0078
+.short 0x0803
+.short 0x003a
+.short 0x0c74
+.short 0x0358
+.short 0x0098
+.short 0x0803
+.short 0x0030
+.short 0x0c74
+.short 0x0390
+.short 0x0098
+.short 0x0803
+.short 0x0026
+.short 0x0c74
+.short 0x03c8
+.short 0x0098
+.short 0x0803
+.short 0x001c
+.short 0x0c74
+.short 0x0358
+.short 0x00b8
+.short 0x0803
+.short 0x0012
+.short 0x0c74
+.short 0x0390
+.short 0x00b8
+.short 0x0803
+.short 0x0008
+.short 0x0c74
+.short 0x03c8
+.short 0x00b8
+.short 0x0402
+.short 0x0401
+.short 0x0c0b
+.short 0x26c1
+.short 0x0806
+.short 0x0804
+.short 0xff72
+.short 0x0475
+.short 0x0805
+.short 0xffee
+.short 0x0803
+.short 0xff68
+.short 0x0000
diff --git a/data/scripts/gUnk_080103B0.inc b/data/scripts/gUnk_080103B0.inc
new file mode 100644
index 00000000..3452e41c
--- /dev/null
+++ b/data/scripts/gUnk_080103B0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080103B0
+StartScript 
+_0807EF80 0x0000
+Call sub_08062A48
+_0807EF80 0x000a
+StopScript 
+Wait 0x001e
+Call sub_08062948
+.short 0x0803
+.short 0xfff4
diff --git a/data/scripts/gUnk_080103D0.inc b/data/scripts/gUnk_080103D0.inc
new file mode 100644
index 00000000..52d533b3
--- /dev/null
+++ b/data/scripts/gUnk_080103D0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_080103D0
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x00000004
+StopScript 
+Wait 0x003c
+Call sub_0806407C
+Jump 0xfff4
+.short 0x0000
diff --git a/data/scripts/gUnk_080103F8.inc b/data/scripts/gUnk_080103F8.inc
new file mode 100644
index 00000000..1c37a174
--- /dev/null
+++ b/data/scripts/gUnk_080103F8.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_080103F8
+StartScript 
+_0807E9D4 
+.byte 0x61
diff --git a/data/scripts/gUnk_080103FD.inc b/data/scripts/gUnk_080103FD.inc
new file mode 100644
index 00000000..373fdd74
--- /dev/null
+++ b/data/scripts/gUnk_080103FD.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_080103FD
+.byte 0x8
+.byte 0x4
+.byte 0x0
diff --git a/data/scripts/gUnk_08010400.inc b/data/scripts/gUnk_08010400.inc
new file mode 100644
index 00000000..c179786a
--- /dev/null
+++ b/data/scripts/gUnk_08010400.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_08010400
+_0807EF80 0x000a
+.short 0x140c
diff --git a/data/scripts/gUnk_08010406.inc b/data/scripts/gUnk_08010406.inc
new file mode 100644
index 00000000..c6bc0a11
--- /dev/null
+++ b/data/scripts/gUnk_08010406.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010406
+.byte 0xd9
diff --git a/data/scripts/gUnk_08010407.inc b/data/scripts/gUnk_08010407.inc
new file mode 100644
index 00000000..94b10c62
--- /dev/null
+++ b/data/scripts/gUnk_08010407.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08010407
+.byte 0xf3
+.byte 0x7
+.byte 0x8
diff --git a/data/scripts/gUnk_0801040A.inc b/data/scripts/gUnk_0801040A.inc
new file mode 100644
index 00000000..ec8fcf81
--- /dev/null
+++ b/data/scripts/gUnk_0801040A.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_0801040A
+.short 0x0000
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
+.short 0x0463
+.short 0x0c0b
+.short 0x4429
+.short 0x0806
+.short 0x0459
+.short 0x0444
+.short 0x0803
+.short 0xffea
diff --git a/data/scripts/gUnk_08010428.inc b/data/scripts/gUnk_08010428.inc
new file mode 100644
index 00000000..7af9206e
--- /dev/null
+++ b/data/scripts/gUnk_08010428.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_08010428
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E914 0x08064689
+Call sub_08064644
+StopScript 
+Wait 0x003c
+Call sub_080646A4
+.short 0x0803
+.short 0xfff4
diff --git a/data/scripts/gUnk_08010454.inc b/data/scripts/gUnk_08010454.inc
new file mode 100644
index 00000000..49c46b95
--- /dev/null
+++ b/data/scripts/gUnk_08010454.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08010454
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+Call sub_080636F4
+_0807EF80 0x000a
+Call sub_0807F348
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
diff --git a/data/scripts/gUnk_08010480.inc b/data/scripts/gUnk_08010480.inc
new file mode 100644
index 00000000..b658751a
--- /dev/null
+++ b/data/scripts/gUnk_08010480.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08010480
+.short 0x0004
+.short 0x0000
+.short 0x0c0b
+.short 0x36d9
+.short 0x0806
+.short 0x0459
+.short 0x0831
+.short 0x000f
+.short 0x0444
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0803
+.short 0xffd2
diff --git a/data/scripts/gUnk_080104A0.inc b/data/scripts/gUnk_080104A0.inc
new file mode 100644
index 00000000..76258d60
--- /dev/null
+++ b/data/scripts/gUnk_080104A0.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_080104A0
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+Call sub_08063CAC
+_0807EF80 0x000a
+Call sub_0807F348
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000004
+Call sub_08063C90
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg sub_0807F3D8, 0x00000000
+.short 0x0803
+.short 0xffd2
diff --git a/data/scripts/gUnk_080104EC.inc b/data/scripts/gUnk_080104EC.inc
new file mode 100644
index 00000000..c719c1f6
--- /dev/null
+++ b/data/scripts/gUnk_080104EC.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080104EC
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807EF80 0x000a
+.byte 0xb
+.byte 0xc
+.byte 0x49
+.byte 0xf3
+.byte 0x7
diff --git a/data/scripts/gUnk_080104FF.inc b/data/scripts/gUnk_080104FF.inc
new file mode 100644
index 00000000..15db1023
--- /dev/null
+++ b/data/scripts/gUnk_080104FF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080104FF
+.short 0x0208
diff --git a/data/scripts/gUnk_08010501.inc b/data/scripts/gUnk_08010501.inc
new file mode 100644
index 00000000..2611c18f
--- /dev/null
+++ b/data/scripts/gUnk_08010501.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010501
+.byte 0x4
diff --git a/data/scripts/gUnk_08010502.inc b/data/scripts/gUnk_08010502.inc
new file mode 100644
index 00000000..c73cb139
--- /dev/null
+++ b/data/scripts/gUnk_08010502.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010502
+.byte 0x18
diff --git a/data/scripts/gUnk_08010503.inc b/data/scripts/gUnk_08010503.inc
new file mode 100644
index 00000000..cb2d8df5
--- /dev/null
+++ b/data/scripts/gUnk_08010503.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08010503
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0xfc
+.byte 0xff
+.byte 0x43
+.byte 0x4
diff --git a/data/scripts/gUnk_0801050A.inc b/data/scripts/gUnk_0801050A.inc
new file mode 100644
index 00000000..258ea077
--- /dev/null
+++ b/data/scripts/gUnk_0801050A.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801050A
+.byte 0xb
diff --git a/data/scripts/gUnk_0801050B.inc b/data/scripts/gUnk_0801050B.inc
new file mode 100644
index 00000000..11a8536a
--- /dev/null
+++ b/data/scripts/gUnk_0801050B.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_0801050B
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x63
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0xd9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x15
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0xc
+.byte 0x0
+.byte 0x2f
+.byte 0x8
diff --git a/data/scripts/gUnk_08010526.inc b/data/scripts/gUnk_08010526.inc
new file mode 100644
index 00000000..a24869fe
--- /dev/null
+++ b/data/scripts/gUnk_08010526.inc
@@ -0,0 +1,122 @@
+SCRIPT_START gUnk_08010526
+.byte 0xe
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x10
+.byte 0x2b
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xe5
+.byte 0x34
+.byte 0x6
+.byte 0x8
+.byte 0x6
+.byte 0x20
+.byte 0xe
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x36
+.byte 0x0
+.byte 0x34
+.byte 0x0
+.byte 0xe
+.byte 0x0
+.byte 0x24
+.byte 0x0
+.byte 0x2e
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0xd
+.byte 0x2b
+.byte 0x3
+.byte 0x8
+.byte 0x96
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x3d
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x8a
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x1a
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x7e
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x3b
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x72
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xed
+.byte 0x34
+.byte 0x6
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x8d
+.byte 0xf7
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x1c
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x5a
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0xc5
+.byte 0xf7
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x30
+.byte 0x0
+.byte 0x1f
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x30
+.byte 0x0
+.byte 0xb
diff --git a/data/scripts/gUnk_0801059F.inc b/data/scripts/gUnk_0801059F.inc
new file mode 100644
index 00000000..79a5f085
--- /dev/null
+++ b/data/scripts/gUnk_0801059F.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_0801059F
+.short 0x050c
+.short 0x0635
+.short 0x0408
+.short 0x2e08
+.short 0x5b00
+.short 0x0708
+.short 0x592b
+.short 0x0c04
+.short 0x0114
+.short 0x07f8
+.short 0x0008
+.short 0x0000
+.short 0x3400
+.short 0x5904
+.short 0x5b04
+.short 0x0c08
+.short 0x032b
+.short 0x1e08
+.short 0x5b00
+.short 0x0908
+.short 0x032b
diff --git a/data/scripts/gUnk_080105C9.inc b/data/scripts/gUnk_080105C9.inc
new file mode 100644
index 00000000..72741aeb
--- /dev/null
+++ b/data/scripts/gUnk_080105C9.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_080105C9
+.short 0x1608
+.short 0x5b00
+.short 0x0a08
+.short 0x032b
+.short 0x0e08
+.short 0x5b00
+.short 0x0b08
+.short 0x032b
+.short 0x0608
+.short 0x5b00
+.short 0x0e08
+.short 0x592b
+.short 0x0b04
+.short 0x510c
+.short 0x07df
+.short 0x4408
+.short 0x0304
+.short 0x1608
+.short 0x00ff
+.short 0x0100
+.short 0x5304
+.short 0x7904
+.short 0x0a08
+.short 0x6100
+.short 0x0408
diff --git a/data/scripts/gUnk_080105FB.inc b/data/scripts/gUnk_080105FB.inc
new file mode 100644
index 00000000..44ee5099
--- /dev/null
+++ b/data/scripts/gUnk_080105FB.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_080105FB
+.short 0x7900
+.short 0x0008
diff --git a/data/scripts/gUnk_080105FF.inc b/data/scripts/gUnk_080105FF.inc
new file mode 100644
index 00000000..bb4e73f1
--- /dev/null
+++ b/data/scripts/gUnk_080105FF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_080105FF
+.byte 0x0
diff --git a/data/scripts/gUnk_08010600.inc b/data/scripts/gUnk_08010600.inc
new file mode 100644
index 00000000..7ad3a139
--- /dev/null
+++ b/data/scripts/gUnk_08010600.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08010600
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
diff --git a/data/scripts/gUnk_0801060A.inc b/data/scripts/gUnk_0801060A.inc
new file mode 100644
index 00000000..3290a296
--- /dev/null
+++ b/data/scripts/gUnk_0801060A.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0801060A
+_0807EB74 
+.byte 0x5a
diff --git a/data/scripts/gUnk_0801060D.inc b/data/scripts/gUnk_0801060D.inc
new file mode 100644
index 00000000..23014324
--- /dev/null
+++ b/data/scripts/gUnk_0801060D.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0801060D
+.short 0x0108
+.short 0x590a
+.short 0x4404
+.short 0x6104
+.short 0x0408
diff --git a/data/scripts/gUnk_08010617.inc b/data/scripts/gUnk_08010617.inc
new file mode 100644
index 00000000..16e00132
--- /dev/null
+++ b/data/scripts/gUnk_08010617.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08010617
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0xe8
+.byte 0xff
diff --git a/data/scripts/gUnk_0801061C.inc b/data/scripts/gUnk_0801061C.inc
new file mode 100644
index 00000000..2a98dd79
--- /dev/null
+++ b/data/scripts/gUnk_0801061C.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0801061C
+StartScript 
+_0807E930 0x0008
+Call sub_08062A48
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0806265C
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffec
diff --git a/data/scripts/gUnk_08010644.inc b/data/scripts/gUnk_08010644.inc
new file mode 100644
index 00000000..122663b5
--- /dev/null
+++ b/data/scripts/gUnk_08010644.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08010644
+StartScript 
+_0807E930 0x0009
+Jump 0xffd6
+.short 0x0000
diff --git a/data/scripts/gUnk_08010650.inc b/data/scripts/gUnk_08010650.inc
new file mode 100644
index 00000000..0b754402
--- /dev/null
+++ b/data/scripts/gUnk_08010650.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08010650
+StartScript 
+_0807E930 0x000b
+Jump 0xffca
+.short 0x0000
+.short 0x0401
+.short 0x0850
+.short 0x000c
+.short 0x0803
+.short 0xffbe
+.short 0x0000
+.short 0x0401
+.short 0x0850
+.short 0x000d
+.short 0x0803
+.short 0xffb2
+.short 0x0000
diff --git a/data/scripts/gUnk_08010674.inc b/data/scripts/gUnk_08010674.inc
new file mode 100644
index 00000000..26548735
--- /dev/null
+++ b/data/scripts/gUnk_08010674.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08010674
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+.short 0x0411
+.short 0x0c0b
+.short 0xf77d
+.short 0x0807
+.short 0x0c5d
+.short 0x3c08
+.short 0x3c09
+.short 0x0459
+.short 0x0444
+.short 0x0861
+.short 0x0004
+.short 0x0803
+.short 0xffde
+.short 0x0000
diff --git a/data/scripts/gUnk_080106AC.inc b/data/scripts/gUnk_080106AC.inc
new file mode 100644
index 00000000..d62c28b0
--- /dev/null
+++ b/data/scripts/gUnk_080106AC.inc
@@ -0,0 +1,36 @@
+SCRIPT_START gUnk_080106AC
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0807F2D4
+_0807EF80 0x0000
+.short 0x0411
+.short 0x0804
+.short 0x000a
+.short 0x085b
+.short 0x3c07
+.short 0x0803
+.short 0x0048
+.short 0x0c0b
+.short 0x2eb9
+.short 0x0806
+.short 0x140c
+.short 0xf78d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0459
+.short 0x041c
+.short 0x0805
+.short 0x0030
+.short 0x0459
+.short 0x0c1e
+.short 0x0000
+.short 0x0000
diff --git a/data/scripts/gUnk_08010700.inc b/data/scripts/gUnk_08010700.inc
new file mode 100644
index 00000000..85baa923
--- /dev/null
+++ b/data/scripts/gUnk_08010700.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010700
+.byte 0x4
diff --git a/data/scripts/gUnk_08010701.inc b/data/scripts/gUnk_08010701.inc
new file mode 100644
index 00000000..b664b498
--- /dev/null
+++ b/data/scripts/gUnk_08010701.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_08010701
+.short 0x0a08
+.short 0x5b00
diff --git a/data/scripts/gUnk_08010705.inc b/data/scripts/gUnk_08010705.inc
new file mode 100644
index 00000000..f1404ea2
--- /dev/null
+++ b/data/scripts/gUnk_08010705.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08010705
+.byte 0x8
+.byte 0x4
+.byte 0x3c
+.byte 0x3
+.byte 0x8
+.byte 0x1c
+.byte 0x0
+.byte 0x34
+.byte 0x4
diff --git a/data/scripts/gUnk_0801070E.inc b/data/scripts/gUnk_0801070E.inc
new file mode 100644
index 00000000..0e579364
--- /dev/null
+++ b/data/scripts/gUnk_0801070E.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0801070E
+ModHealth 0x0008
+Call sub_08062EDC
+JumpIf 0x000a
+TextboxNoOverlap 0x3c06
+Jump 0x0004
+WaitPlayerAction8 
+_0807EA94 
+_0807E878 
+_0807EF80 0x0001
+Jump 0xff8e
+.short 0x0000
diff --git a/data/scripts/gUnk_08010734.inc b/data/scripts/gUnk_08010734.inc
new file mode 100644
index 00000000..933e7517
--- /dev/null
+++ b/data/scripts/gUnk_08010734.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_08010734
+StartScript 
+_0807EF80 0x0007
+_0807E9D4 
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E930 0x0004
+StartScript 
+Call sub_08062D18
+JumpIfNot 0x002a
+StopScript 
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0020
+HasRupees 0x00c8
+JumpIf 0x000a
+TextboxNoOverlap 0x4008
+Jump 0x0010
+ModRupees 0xff38
+Call sub_08062E14
+TextboxNoOverlap 0x4007
+StopScript 
+_0807EA94 
+_0807E878 
+_0807E930 0x0008
+.short 0x0803
+.short 0xffb4
diff --git a/data/scripts/gUnk_08010794.inc b/data/scripts/gUnk_08010794.inc
new file mode 100644
index 00000000..dd310869
--- /dev/null
+++ b/data/scripts/gUnk_08010794.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08010794
+StartScript 
+_0807EF80 0x0007
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807F2D4
+_0807EF80 0x0001
+Call sub_08062CBC
+_0807EA94 
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
diff --git a/data/scripts/gUnk_080107D0.inc b/data/scripts/gUnk_080107D0.inc
new file mode 100644
index 00000000..5b25dc91
--- /dev/null
+++ b/data/scripts/gUnk_080107D0.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_080107D0
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807E9D4 
+Call sub_0807F348
+Call sub_08069684
+StopScript 
+StopScript 
+StartScript 
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0xfff6
+Call sub_080696B0
+StopScript 
+StartScript 
+.short 0x0817
diff --git a/data/scripts/gUnk_0801080A.inc b/data/scripts/gUnk_0801080A.inc
new file mode 100644
index 00000000..c856312b
--- /dev/null
+++ b/data/scripts/gUnk_0801080A.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_0801080A
+.byte 0x30
diff --git a/data/scripts/gUnk_0801080B.inc b/data/scripts/gUnk_0801080B.inc
new file mode 100644
index 00000000..aa65a41e
--- /dev/null
+++ b/data/scripts/gUnk_0801080B.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_0801080B
+.short 0x0530
+.short 0xe408
+.short 0x11ff
+.short 0x0404
+.short 0x4c08
diff --git a/data/scripts/gUnk_08010815.inc b/data/scripts/gUnk_08010815.inc
new file mode 100644
index 00000000..0797910a
--- /dev/null
+++ b/data/scripts/gUnk_08010815.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08010815
+.short 0x1800
+.short 0x0504
+.short 0xea08
diff --git a/data/scripts/gUnk_0801081B.inc b/data/scripts/gUnk_0801081B.inc
new file mode 100644
index 00000000..4d5dbb9d
--- /dev/null
+++ b/data/scripts/gUnk_0801081B.inc
@@ -0,0 +1,182 @@
+SCRIPT_START gUnk_0801081B
+.byte 0xff
+.byte 0x2
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x63
+.byte 0x4
+.byte 0x14
+.byte 0x8
+.byte 0x42
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x2a
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x43
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x22
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x44
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x1a
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x41
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x39
+.byte 0x3f
+.byte 0x3
+.byte 0x8
+.byte 0x6c
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x1b
+.byte 0x2c
+.byte 0x3
+.byte 0x8
+.byte 0x64
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x1a
+.byte 0x2c
+.byte 0x3
+.byte 0x8
+.byte 0x5c
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x39
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x63
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0x96
+.byte 0x6
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0x1c
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x3a
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x19
+.byte 0x97
+.byte 0x6
+.byte 0x8
+.byte 0x5
+.byte 0x8
+.byte 0x30
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x59
+.byte 0x4
+.byte 0x64
+.byte 0x4
+.byte 0x14
+.byte 0x8
+.byte 0x42
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x1a
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x43
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x12
+.byte 0x0
+.byte 0x14
+.byte 0x8
+.byte 0x44
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x21
+.byte 0x2c
+.byte 0x3
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0xfa
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x20
+.byte 0x2c
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x3d
+.byte 0xf8
+.byte 0x7
+.byte 0x8
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x36
+.byte 0xff
diff --git a/data/scripts/gUnk_080108D0.inc b/data/scripts/gUnk_080108D0.inc
new file mode 100644
index 00000000..2e2ff739
--- /dev/null
+++ b/data/scripts/gUnk_080108D0.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_080108D0
+CheckPlayerInRegion2 0x0808
+JumpIfNot 0xfffa
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x080109f0
+WaitForSomething2 0x00000001
+CheckRoomFlag 0x0001
+JumpIf 0x0008
+_0807EB28 0x0b63
+.byte 0x59
diff --git a/data/scripts/gUnk_080108FF.inc b/data/scripts/gUnk_080108FF.inc
new file mode 100644
index 00000000..a3f0a622
--- /dev/null
+++ b/data/scripts/gUnk_080108FF.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_080108FF
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xc6
+.byte 0xff
diff --git a/data/scripts/gUnk_0801090C.inc b/data/scripts/gUnk_0801090C.inc
new file mode 100644
index 00000000..9c211086
--- /dev/null
+++ b/data/scripts/gUnk_0801090C.inc
@@ -0,0 +1,3 @@
+SCRIPT_START gUnk_0801090C
+StartScript 
+.byte 0x79
diff --git a/data/scripts/gUnk_0801090F.inc b/data/scripts/gUnk_0801090F.inc
new file mode 100644
index 00000000..83da14e6
--- /dev/null
+++ b/data/scripts/gUnk_0801090F.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0801090F
+.short 0x0708
+.short 0x1d00
+.short 0x1b08
+.short 0x0400
diff --git a/data/scripts/gUnk_08010917.inc b/data/scripts/gUnk_08010917.inc
new file mode 100644
index 00000000..6b4b6066
--- /dev/null
+++ b/data/scripts/gUnk_08010917.inc
@@ -0,0 +1,78 @@
+SCRIPT_START gUnk_08010917
+.byte 0x8
+.byte 0x7a
+.byte 0xe6
+.byte 0x2
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0x69
+.byte 0x8
+.byte 0x8
+.byte 0x5
+.byte 0x8
+.byte 0xf8
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0xf9
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x15
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x5f
+.byte 0x8
+.byte 0x62
+.byte 0xb
+.byte 0x59
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0xf0
+.byte 0x9
+.byte 0x1
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x3
+.byte 0x8
+.byte 0xc4
+.byte 0xff
+.byte 0xb
+.byte 0xc
+.byte 0x2d
+.byte 0x69
+.byte 0x8
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08010964.inc b/data/scripts/gUnk_08010964.inc
new file mode 100644
index 00000000..b81a190a
--- /dev/null
+++ b/data/scripts/gUnk_08010964.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08010964
+CheckPlayerInRegion2 0x0808
+JumpIfNot 0xfffa
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x08010a38
+WaitForSomething2 0x00000001
+CheckRoomFlag 0x0001
+JumpIf 0x0008
+_0807EB28 0x0b63
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+.short 0x0803
+.short 0xffc6
diff --git a/data/scripts/gUnk_080109A0.inc b/data/scripts/gUnk_080109A0.inc
new file mode 100644
index 00000000..f4af9a29
--- /dev/null
+++ b/data/scripts/gUnk_080109A0.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_080109A0
+StartScript 
+StopScript 
+CheckLocalFlag 0x00d1
+JumpIf 0x0040
+CheckPlayerInRegion2 0x0808
+JumpIfNot 0xffee
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x08010a38
+WaitForSomething2 0x00000001
+CheckRoomFlag 0x0001
+JumpIf 0x0008
+_0807EB28 0x0b64
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+Jump 0xffb8
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080109F0.inc b/data/scripts/gUnk_080109F0.inc
new file mode 100644
index 00000000..fe757f1d
--- /dev/null
+++ b/data/scripts/gUnk_080109F0.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_080109F0
+StartScript 
+.short 0x0867
+.short 0x0100
diff --git a/data/scripts/gUnk_080109F6.inc b/data/scripts/gUnk_080109F6.inc
new file mode 100644
index 00000000..a0d515fc
--- /dev/null
+++ b/data/scripts/gUnk_080109F6.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_080109F6
+StopScript 
+_0807ECC4 0x0010
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010A14.inc b/data/scripts/gUnk_08010A14.inc
new file mode 100644
index 00000000..d533dca7
--- /dev/null
+++ b/data/scripts/gUnk_08010A14.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_08010A14
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+.byte 0x6e
+.byte 0x8
+.byte 0x10
diff --git a/data/scripts/gUnk_08010A1F.inc b/data/scripts/gUnk_08010A1F.inc
new file mode 100644
index 00000000..a6e7ccdc
--- /dev/null
+++ b/data/scripts/gUnk_08010A1F.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_08010A1F
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08010A38.inc b/data/scripts/gUnk_08010A38.inc
new file mode 100644
index 00000000..9687579a
--- /dev/null
+++ b/data/scripts/gUnk_08010A38.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08010A38
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EC94 0x0010
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010A5C.inc b/data/scripts/gUnk_08010A5C.inc
new file mode 100644
index 00000000..298feea6
--- /dev/null
+++ b/data/scripts/gUnk_08010A5C.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08010A5C
+StartScript 
+Call sub_0807DF28
+_0807E864 
+ModHealth 0x00a0
+StopScript 
+Wait 0x003c
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+Call sub_0807F0D8
+JumpIfNot 0xfff8
+_0807EF80 0x0014
+_0807E878 
+Call sub_0807DF50
+Call sub_080791D0
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc
new file mode 100644
index 00000000..cdddcece
--- /dev/null
+++ b/data/scripts/gUnk_08010A98.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08010A98
+StartScript 
+_0807EB44 0x0004
+CallWithArg sub_080672B0, 0x00000000
+_0807EF80 0x000a
+Call sub_08067314
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_080672B0, 0x00000004
+Call sub_08067304
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+CallWithArg sub_080672B0, 0x00000000
+.short 0x0803
+.short 0xffd2
diff --git a/data/scripts/gUnk_08010AE4.inc b/data/scripts/gUnk_08010AE4.inc
new file mode 100644
index 00000000..d5eb2458
--- /dev/null
+++ b/data/scripts/gUnk_08010AE4.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08010AE4
+StartScript 
+CheckInventory1 0x0067
+JumpIfNot 0x0076
+_0807EB44 0x0004
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0180
+.short 0x0c0c
+.short 0xf349
+.short 0x0807
+.short 0x0c0b
+.short 0x075d
diff --git a/data/scripts/gUnk_08010B04.inc b/data/scripts/gUnk_08010B04.inc
new file mode 100644
index 00000000..bd07881d
--- /dev/null
+++ b/data/scripts/gUnk_08010B04.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_08010B04
+_0807E078 0x0402
+_0807EA94 
+Call sub_080606C0
+StopScript 
+Call sub_0806076C
+_0807EF80 0x0007
+Call sub_08060700
+StopScript 
+StartScript 
+_0807E564 
+JumpIf 0x0010
+CallWithArg sub_080608E4, 0x00000000
+JumpIf 0x000c
+_0807EE30 
+JumpIfNot 0xffe4
+Jump 0xffce
+StopScript 
+_0807EF80 0x0000
+StopScript 
+StartScript 
+CallWithArg sub_080608E4, 0x00000001
+JumpIf 0xfff0
+StopScript 
+Jump 0xffbc
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08010B68.inc b/data/scripts/gUnk_08010B68.inc
new file mode 100644
index 00000000..36afe5e4
--- /dev/null
+++ b/data/scripts/gUnk_08010B68.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_08010B68
+StartScript 
+_0807E564 
+JumpIfNot 0x003e
+Call sub_0807F924
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x0007
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+_0807E564 
+JumpIfNot 0x001c
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+_0807EB74 
+Call sub_0806E2DC
+_0807EA94 
+_0807E878 
+Jump 0xffde
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc
new file mode 100644
index 00000000..fce27cee
--- /dev/null
+++ b/data/scripts/gUnk_08010BB4.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08010BB4
+StartScript 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0008
+Call sub_0806E440
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+Call sub_0806E418
+_0807EA94 
+_0807E878 
+_0807E930 0x0008
+Jump 0xffe2
+.short 0x0000
diff --git a/data/scripts/gUnk_08010BEC.inc b/data/scripts/gUnk_08010BEC.inc
new file mode 100644
index 00000000..702de0a5
--- /dev/null
+++ b/data/scripts/gUnk_08010BEC.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08010BEC
+_0807E864 
+Call sub_0807F9A4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
diff --git a/data/scripts/gUnk_08010BF9.inc b/data/scripts/gUnk_08010BF9.inc
new file mode 100644
index 00000000..039aa440
--- /dev/null
+++ b/data/scripts/gUnk_08010BF9.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08010BF9
+.byte 0x8
+.byte 0x47
+.byte 0xc
+.byte 0x74
+.byte 0x10
diff --git a/data/scripts/gUnk_08010BFE.inc b/data/scripts/gUnk_08010BFE.inc
new file mode 100644
index 00000000..67042c7d
--- /dev/null
+++ b/data/scripts/gUnk_08010BFE.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08010BFE
+.short 0x0801
+.short 0x0c33
+.short 0x0400
+.short 0x0000
+.short 0x0c85
+.short 0x0034
+.short 0x0002
+.short 0x0c5c
+.short 0x1036
+.short 0x000c
+.short 0x0459
+.short 0x0c28
+.short 0x0010
+.short 0x0000
diff --git a/data/scripts/gUnk_08010C1A.inc b/data/scripts/gUnk_08010C1A.inc
new file mode 100644
index 00000000..fc363f6b
--- /dev/null
+++ b/data/scripts/gUnk_08010C1A.inc
@@ -0,0 +1,53 @@
+SCRIPT_START gUnk_08010C1A
+WaitForSomething2 0x00000020
+TextboxNoOverlapFollowPos 0x1037, 0x0002
+_0807EA94 
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+TextboxNoOverlapFollowPos 0x1038, 0x000c
+_0807EA94 
+SoundReq0x80100000 
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+LoadRoomEntityList 0x080f06e0
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+StartPlayerScript 0x08011098
+WaitForSomething2 0x00000400
+SetEntityPositionRelative 0x005001f8
+_0807F0B4 0x0007
+CameraTargetEntity 
+Wait 0x000a
+_0807F0B4 0x0001
+_0807E778 0x0001
+DoFade4 
+_0807E5F8 0x0002a800
+WaitForSomething2 0x00055000
+SetEntityPositionRelative 0x007801f8
+Wait 0x003c
+_0807E5F8 0x00800000
+WaitForSomething2 0x01000000
+_0807E5F8 0x0002a800
+WaitForSomething2 0x00055000
+_0807E8E4_1 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollowPos 0x1039, 0x000c
+_0807EA94 
+SoundReq2 0x0001
+_0807E8E4_2 
+_0807E5F8 0x00000004
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08010D03.inc b/data/scripts/gUnk_08010D03.inc
new file mode 100644
index 00000000..289798d4
--- /dev/null
+++ b/data/scripts/gUnk_08010D03.inc
@@ -0,0 +1,254 @@
+SCRIPT_START gUnk_08010D03
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x2c
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x3a
+.byte 0x10
+.byte 0xc
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x69
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0xc0
+.byte 0x1
+.byte 0x89
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x69
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x20
+.byte 0x2
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x73
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x98
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0x0
+.byte 0x7e
+.byte 0x4
+.byte 0x7b
+.byte 0x8
+.byte 0x9b
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x43
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x7c
+.byte 0x8
+.byte 0xd
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0xa8
+.byte 0x2
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x50
+.byte 0x5
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xc7
+.byte 0x1
+.byte 0x7b
+.byte 0x8
+.byte 0xe5
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x28
+.byte 0x0
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x50
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x2
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x5
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x44
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x69
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x98
+.byte 0x0
+.byte 0x7e
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x7c
+.byte 0x8
+.byte 0x2f
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x2
+.byte 0x0
+.byte 0x28
+.byte 0xc
diff --git a/data/scripts/gUnk_08010E00.inc b/data/scripts/gUnk_08010E00.inc
new file mode 100644
index 00000000..3c90433d
--- /dev/null
+++ b/data/scripts/gUnk_08010E00.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_08010E00
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
diff --git a/data/scripts/gUnk_08010E0D.inc b/data/scripts/gUnk_08010E0D.inc
new file mode 100644
index 00000000..73e24ad0
--- /dev/null
+++ b/data/scripts/gUnk_08010E0D.inc
@@ -0,0 +1,244 @@
+SCRIPT_START gUnk_08010E0D
+.byte 0x0
+.byte 0x5
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xe5
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x2
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x5
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x25
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0xed
+.byte 0xdd
+.byte 0x5
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8a
+.byte 0xc
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x25
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x25
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x25
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x2c
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x38
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x3f
+.byte 0x4
+.byte 0x37
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xab
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xc2
+.byte 0x1
+.byte 0xd
+.byte 0xc
+.byte 0x70
+.byte 0x7
+.byte 0xf
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x38
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x3e
+.byte 0x4
+.byte 0x37
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0x19
+.byte 0xde
+.byte 0x5
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8a
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x3d
+.byte 0xdc
+.byte 0x6
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x45
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0xd
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x9d
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0xf6
+.byte 0x49
diff --git a/data/scripts/gUnk_08010F00.inc b/data/scripts/gUnk_08010F00.inc
new file mode 100644
index 00000000..90b72291
--- /dev/null
+++ b/data/scripts/gUnk_08010F00.inc
@@ -0,0 +1,256 @@
+SCRIPT_START gUnk_08010F00
+.byte 0x0
+.byte 0x8
+.byte 0x89
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x69
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x68
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xc3
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x20
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x9d
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0xdc
+.byte 0x6
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x40
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x45
+.byte 0x10
+.byte 0xc
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x5c
+.byte 0xc
+.byte 0x46
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0xed
+.byte 0xdd
+.byte 0x5
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8a
+.byte 0xc
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x47
+.byte 0xc
+.byte 0xbc
+.byte 0x10
+.byte 0x1
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x47
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x3d
+.byte 0xdc
+.byte 0x6
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x45
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0xd
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x9d
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0xf6
+.byte 0x49
+.byte 0x0
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x9d
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0xdc
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0x25
+.byte 0x1
+.byte 0xc
+.byte 0x14
+.byte 0x29
+.byte 0xfb
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08010FFF.inc b/data/scripts/gUnk_08010FFF.inc
new file mode 100644
index 00000000..d319abb4
--- /dev/null
+++ b/data/scripts/gUnk_08010FFF.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08010FFF
+.byte 0x0
diff --git a/data/scripts/gUnk_08011000.inc b/data/scripts/gUnk_08011000.inc
new file mode 100644
index 00000000..4a387917
--- /dev/null
+++ b/data/scripts/gUnk_08011000.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08011000
+.byte 0x31
diff --git a/data/scripts/gUnk_08011001.inc b/data/scripts/gUnk_08011001.inc
new file mode 100644
index 00000000..1c184d98
--- /dev/null
+++ b/data/scripts/gUnk_08011001.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08011001
+.short 0x0f08
+.short 0x7b00
+.short 0x2508
+.short 0x0c01
+.short 0x2914
+.short 0x07fb
+.short 0x0308
+.short 0x0000
+.short 0x0c00
+.short 0x1914
+.short 0x05de
+.short 0x0208
+.short 0x0000
+.short 0x8a00
+.short 0x000c
diff --git a/data/scripts/gUnk_0801101F.inc b/data/scripts/gUnk_0801101F.inc
new file mode 100644
index 00000000..6a0e859a
--- /dev/null
+++ b/data/scripts/gUnk_0801101F.inc
@@ -0,0 +1,86 @@
+SCRIPT_START gUnk_0801101F
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x7e
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x4a
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x5c
+.byte 0xc
+.byte 0x49
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x59
+.byte 0x4
+.byte 0x69
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x98
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xdd
+.byte 0xbc
+.byte 0x4
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08011074.inc b/data/scripts/gUnk_08011074.inc
new file mode 100644
index 00000000..76e1eb81
--- /dev/null
+++ b/data/scripts/gUnk_08011074.inc
@@ -0,0 +1,6 @@
+SCRIPT_START gUnk_08011074
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EDD4 0x01e8, 0x0050
+.byte 0x61
diff --git a/data/scripts/gUnk_08011083.inc b/data/scripts/gUnk_08011083.inc
new file mode 100644
index 00000000..e398b2fe
--- /dev/null
+++ b/data/scripts/gUnk_08011083.inc
@@ -0,0 +1,90 @@
+SCRIPT_START gUnk_08011083
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x69
+.byte 0xc
+.byte 0xa8
+.byte 0x1
+.byte 0x58
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x29
+.byte 0xc
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xbd
+.byte 0x91
+.byte 0x7
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0x1
+.byte 0x4
+.byte 0x67
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x2
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xd8
+.byte 0x1
+.byte 0x68
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
diff --git a/data/scripts/gUnk_080110DC.inc b/data/scripts/gUnk_080110DC.inc
new file mode 100644
index 00000000..2378181b
--- /dev/null
+++ b/data/scripts/gUnk_080110DC.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_080110DC
+ScriptCommandNop 
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_080110E8.inc b/data/scripts/gUnk_080110E8.inc
new file mode 100644
index 00000000..888fb7cd
--- /dev/null
+++ b/data/scripts/gUnk_080110E8.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_080110E8
+SoundReq 0x007a
+_0807EB44 0x0004
+_0807EF80 0x000d
+SoundReq 0x0086
+Call sub_0807F36C
+SetEntityNonPlanarMovement 0x0400
+_0807ECF4 0x0008
+StartScript 
+Call sub_0807F1E8
+_0807EF80 0x0011
+StopScript 
+Call sub_0807F2D4
+WaitForSomething 0x80000000
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc
new file mode 100644
index 00000000..9ff7e44a
--- /dev/null
+++ b/data/scripts/gUnk_08011128.inc
@@ -0,0 +1,36 @@
+SCRIPT_START gUnk_08011128
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
+JumpIfNot 0xfff6
+LoadRoomEntityList 0x080f06b0
+_0807EF80 0x000b
+WaitForSomething2 0x00000004
+SetEntityPositionRelative 0x005801b8
+_0807EB44 0x0004
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EB44 0x0006
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EB44 0x0004
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x0001
+_0807ECC4 0x0010
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0010
+Wait 0x001e
+_0807EF80 0x0010
+Call sub_0807F3C8
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x001c
+_0807EC1C 0x003c
+_0807E5F8 0x00000008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080111CC.inc b/data/scripts/gUnk_080111CC.inc
new file mode 100644
index 00000000..8b1d7f41
--- /dev/null
+++ b/data/scripts/gUnk_080111CC.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_080111CC
+StartScript 
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0100
+Call sub_08066D04
+StopScript 
+Call sub_0807F338
+WaitForSomething2 0x00000010
+Call sub_08066D14
+JumpIf 0x0004
+MoveEntityToPlayer 
+Call sub_0807F8BC
+JumpIf 0x0008
+SetEntityPositionRelative 0x00b801f8
+.short 0x0879
diff --git a/data/scripts/gUnk_08011208.inc b/data/scripts/gUnk_08011208.inc
new file mode 100644
index 00000000..59486065
--- /dev/null
+++ b/data/scripts/gUnk_08011208.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_08011208
+.byte 0x7
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x50
+.byte 0x0
+.byte 0x63
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x20
diff --git a/data/scripts/gUnk_0801121D.inc b/data/scripts/gUnk_0801121D.inc
new file mode 100644
index 00000000..193f502a
--- /dev/null
+++ b/data/scripts/gUnk_0801121D.inc
@@ -0,0 +1,168 @@
+SCRIPT_START gUnk_0801121D
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xf8
+.byte 0x1
+.byte 0x20
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xe8
+.byte 0x1
+.byte 0x40
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0x58
+.byte 0x9
+.byte 0x8
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0xd8
+.byte 0x1
+.byte 0x58
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0xc9
+.byte 0x1
+.byte 0x79
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x21
+.byte 0x6e
+.byte 0x6
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xd5
+.byte 0xf2
+.byte 0x7
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xca
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc
new file mode 100644
index 00000000..0286410e
--- /dev/null
+++ b/data/scripts/gUnk_080112C4.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_080112C4
+StartScript 
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0100
+Call sub_08095244
+Call sub_0807F338
+StopScript 
+WaitForSomething 0x0002a800
+_0807EF80 0x0007
+_0807E930 0x0006
+_0807ECC4 0x0010
+Wait 0x003c
+_0807ECC4 0x0010
+Wait 0x003c
+_0807ECC4 0x0010
+_0807E930 0x0002
+Call sub_08064050
+.byte 0x6
+.byte 0x14
+.byte 0x8
+.byte 0x0
+.byte 0x9e
+.byte 0x0
+.byte 0x34
diff --git a/data/scripts/gUnk_0801130F.inc b/data/scripts/gUnk_0801130F.inc
new file mode 100644
index 00000000..38738813
--- /dev/null
+++ b/data/scripts/gUnk_0801130F.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_0801130F
+.byte 0x1
+.byte 0xf8
+.byte 0x1
+.byte 0x29
+.byte 0xc
+.byte 0x0
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x7
+.byte 0x0
diff --git a/data/scripts/gUnk_08011328.inc b/data/scripts/gUnk_08011328.inc
new file mode 100644
index 00000000..7f80777c
--- /dev/null
+++ b/data/scripts/gUnk_08011328.inc
@@ -0,0 +1,119 @@
+SCRIPT_START gUnk_08011328
+_0807EB44 0x0006
+_0807ECF4 0x0010
+_0807EB44 0x0004
+_0807E930 0x0002
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0012
+SoundReq 0x011e
+Wait 0x003c
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x01f0, 0x0098
+_0807EDD4 0x01f0, 0x00c8
+_0807E930 0x0013
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807EF80 0x0010
+Wait 0x000a
+_0807EF80 0x0010
+Call sub_0807F3C8
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x001e
+_0807EC1C 0x003c
+_0807E5F8 0x00001000
+_0807EF80 0x0006
+SCRIPT_END
+.byte 0x29
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x5
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x6f
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x12
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x1e
+.byte 0x1
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x73
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x98
+.byte 0x0
+.byte 0x73
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0xc8
diff --git a/data/scripts/gUnk_08011403.inc b/data/scripts/gUnk_08011403.inc
new file mode 100644
index 00000000..2ac5a910
--- /dev/null
+++ b/data/scripts/gUnk_08011403.inc
@@ -0,0 +1,462 @@
+SCRIPT_START gUnk_08011403
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x13
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x20
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xc9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x4
+.byte 0x65
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x6d
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x40
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x29
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x7
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x71
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x70
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x12
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x1e
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x73
+.byte 0xc
+.byte 0xe8
+.byte 0x1
+.byte 0x98
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x13
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xd
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xf0
+.byte 0xff
+.byte 0x50
+.byte 0x8
+.byte 0x13
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x80
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xc9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x4
+.byte 0x65
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x6d
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x29
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x5
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x6f
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x70
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x12
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x1e
+.byte 0x1
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x73
+.byte 0xc
+.byte 0x8
+.byte 0x2
+.byte 0x98
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x40
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x10
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x13
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0xd
+.byte 0x0
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x77
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0xf0
+.byte 0xff
+.byte 0x50
+.byte 0x8
+.byte 0x13
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x10
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xc9
+.byte 0xf3
+.byte 0x7
+.byte 0x8
+.byte 0x50
+.byte 0x8
+.byte 0x14
+.byte 0x0
+.byte 0x67
+.byte 0x8
+.byte 0x0
+.byte 0x4
+.byte 0x65
+.byte 0x8
+.byte 0x2
+.byte 0x0
+.byte 0x6d
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_080115D0.inc b/data/scripts/gUnk_080115D0.inc
new file mode 100644
index 00000000..b17ba750
--- /dev/null
+++ b/data/scripts/gUnk_080115D0.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_080115D0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0002
+_0807E930 0x0001
+StopScript 
+WaitForSomething2 0x00080000
+_0807E930 0x0005
+SoundReq 0x011c
+_0807ECF4 0x0010
+_0807E930 0x0001
+_0807E5F8 0x00100000
+WaitForSomething2 0x00080000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011608.inc b/data/scripts/gUnk_08011608.inc
new file mode 100644
index 00000000..3ba60683
--- /dev/null
+++ b/data/scripts/gUnk_08011608.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08011608
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0006
+_0807E930 0x0003
+StopScript 
+WaitForSomething2 0x00200000
+_0807E930 0x0007
+SoundReq 0x011c
+_0807EC94 0x0010
+_0807E930 0x0003
+_0807E5F8 0x00400000
+WaitForSomething2 0x00200000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011640.inc b/data/scripts/gUnk_08011640.inc
new file mode 100644
index 00000000..a78e490d
--- /dev/null
+++ b/data/scripts/gUnk_08011640.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08011640
+StartScript 
+_0807EF80 0x0008
+_0807EB44 0x0004
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+Call sub_0807F338
+WaitForSomething2 0x00000040
+_0807EF80 0x0007
+_0807EF80 0x0001
+SetEntityNonPlanarMovement 0x0040
+_0807EDD4 0x01f8, 0x0048
+_0807EF80 0x0000
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000040
+_0807EF80 0x0010
+Wait 0x001e
+_0807EF80 0x0010
+Call sub_0807F3C8
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x0008
+_0807EC1C 0x003c
+_0807E5F8 0x00000080
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc
new file mode 100644
index 00000000..6d6462f1
--- /dev/null
+++ b/data/scripts/gUnk_080116A8.inc
@@ -0,0 +1,74 @@
+SCRIPT_START gUnk_080116A8
+StartScript 
+_0807EB44 0x0000
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+Call sub_0807F338
+WaitForSomething2 0x00000100
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x00d0
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+_0807EB44 0x0004
+_0807EF80 0x001c
+Call sub_0807F2D4
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+_0807EB44 0x0000
+_0807EF80 0x001c
+Call sub_0807F2D4
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+_0807EB44 0x0000
+_0807EF80 0x001a
+Call sub_0807F2D4
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+_0807EB44 0x0000
+_0807EF80 0x0014
+SoundReq 0x0120
+CallWithArg sub_08095420, 0x08011890
+Wait 0x00f0
+_0807EF80 0x0016
+SoundReq 0x01cb
+WaitForSomething2 0x10000000
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0001
+_0807EDD4 0x01d8, 0x00a8
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+_0807EF80 0x0014
+SoundReq 0x01c4
+CallWithArg sub_0809545C, 0x080118d4
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+Wait 0x003c
+_0807EF80 0x0016
+SoundReq 0x01c5
+_0807E5F8 0x08000000
+WaitForSomething2 0x10000000
+_0807EF80 0x0000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x0098
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x0004
+Wait 0x005a
+_0807EB44 0x0004
+_0807EF80 0x001c
+Call sub_0807F2D4
+.byte 0x61
diff --git a/data/scripts/gUnk_08011809.inc b/data/scripts/gUnk_08011809.inc
new file mode 100644
index 00000000..74582ec9
--- /dev/null
+++ b/data/scripts/gUnk_08011809.inc
@@ -0,0 +1,52 @@
+SCRIPT_START gUnk_08011809
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x0
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0x6c
+.byte 0x6
+.byte 0x8
+.byte 0x79
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x78
+.byte 0x0
+.byte 0x28
+.byte 0xc
+.byte 0x0
+.byte 0x2
+.byte 0x0
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0801183C.inc b/data/scripts/gUnk_0801183C.inc
new file mode 100644
index 00000000..f0ae1d32
--- /dev/null
+++ b/data/scripts/gUnk_0801183C.inc
@@ -0,0 +1,53 @@
+SCRIPT_START gUnk_0801183C
+StartScript 
+Call sub_08095330
+StopScript 
+WaitForSomething2 0x00800000
+_0807EF3C 0x0000, 0x0020
+_0807E5F8 0x01000000
+WaitForSomething2 0x00800000
+Call sub_08095364
+SoundReq 0x0122
+Wait 0x003c
+_0807E5F8 0x01000000
+WaitForSomething2 0x00800000
+_0807E930 0x0002
+_0807E5F8 0x01000000
+WaitForSomething2 0x00800000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0850
+.short 0x0000
+.short 0x0867
+.short 0x0200
+.short 0x0c0b
+.short 0x5459
+.short 0x0809
+.short 0x0c0b
+.short 0x4b81
+.short 0x0809
+.short 0x0402
+.short 0x0831
+.short 0x00f0
+.short 0x0c0b
+.short 0x4b6d
+.short 0x0809
+.short 0x0c73
+.short 0x01f8
+.short 0x0088
+.short 0x0c0b
+.short 0x4b81
+.short 0x0809
+.short 0x087b
+.short 0x01cc
+.short 0x0c28
+.short 0x0000
+.short 0x1000
+.short 0x0c33
+.short 0x0000
+.short 0x0800
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_080118D4.inc b/data/scripts/gUnk_080118D4.inc
new file mode 100644
index 00000000..057f405b
--- /dev/null
+++ b/data/scripts/gUnk_080118D4.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_080118D4
+StartScript 
+_0807E930 0x0000
+SetEntityNonPlanarMovement 0x0200
+Call nullsub_527
+Call sub_08094B80
+StopScript 
+WaitForSomething2 0x08000000
+Call sub_08094B6C
+_0807EDD4 0x01d8, 0x0078
+StartPlayerScript 0x080110e8
+_0807EDD4 0x01d8, 0x0058
+Call sub_08094B80
+SoundReq 0x009a
+SoundReq 0x01c6
+_0807E5F8 0x10000000
+WaitForSomething2 0x08000000
+SoundReq 0x011d
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011930.inc b/data/scripts/gUnk_08011930.inc
new file mode 100644
index 00000000..586cc75a
--- /dev/null
+++ b/data/scripts/gUnk_08011930.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08011930
+WaitForSomething 0x20000000
+Call sub_0809567C
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011940.inc b/data/scripts/gUnk_08011940.inc
new file mode 100644
index 00000000..5670f098
--- /dev/null
+++ b/data/scripts/gUnk_08011940.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08011940
+WaitForSomething 0x40000000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc
new file mode 100644
index 00000000..4d8ee99c
--- /dev/null
+++ b/data/scripts/gUnk_0801194C.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_0801194C
+StartScript 
+_0807EB44 0x0002
+Jump 0x0016
+.short 0x0000
diff --git a/data/scripts/gUnk_08011958.inc b/data/scripts/gUnk_08011958.inc
new file mode 100644
index 00000000..0683cad2
--- /dev/null
+++ b/data/scripts/gUnk_08011958.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08011958
+StartScript 
+_0807EB44 0x0006
+Jump 0x000a
+.short 0x0000
diff --git a/data/scripts/gUnk_08011964.inc b/data/scripts/gUnk_08011964.inc
new file mode 100644
index 00000000..c2176022
--- /dev/null
+++ b/data/scripts/gUnk_08011964.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_08011964
+StartScript 
+_0807EB44 0x0004
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+CheckGlobalFlag 0x0015
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x103d
+Jump 0x0006
+TextboxNoOverlapFollow 0x103f
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffce
diff --git a/data/scripts/gUnk_080119B0.inc b/data/scripts/gUnk_080119B0.inc
new file mode 100644
index 00000000..76d4b5ab
--- /dev/null
+++ b/data/scripts/gUnk_080119B0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_080119B0
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x0000000c
+StopScript 
+Wait 0x003c
+Call sub_0806407C
+Jump 0xfff4
+.short 0x0000
diff --git a/data/scripts/gUnk_080119D8.inc b/data/scripts/gUnk_080119D8.inc
new file mode 100644
index 00000000..59e2a558
--- /dev/null
+++ b/data/scripts/gUnk_080119D8.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_080119D8
+StartScript 
+_0807EB44 0x0002
+Jump 0x0016
+.short 0x0000
diff --git a/data/scripts/gUnk_080119E4.inc b/data/scripts/gUnk_080119E4.inc
new file mode 100644
index 00000000..5d6df4fd
--- /dev/null
+++ b/data/scripts/gUnk_080119E4.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_080119E4
+StartScript 
+_0807EB44 0x0004
+Jump 0x000a
+.short 0x0000
diff --git a/data/scripts/gUnk_080119F0.inc b/data/scripts/gUnk_080119F0.inc
new file mode 100644
index 00000000..46614110
--- /dev/null
+++ b/data/scripts/gUnk_080119F0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_080119F0
+StartScript 
+_0807EB44 0x0006
+_0807E9D4 
+_0807EF80 0x000a
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
diff --git a/data/scripts/gUnk_08011A04.inc b/data/scripts/gUnk_08011A04.inc
new file mode 100644
index 00000000..64d320a2
--- /dev/null
+++ b/data/scripts/gUnk_08011A04.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_08011A04
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
+.short 0x0463
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0c0b
+.short 0x4429
+.short 0x0806
+.short 0x0459
+.short 0x0444
+.short 0x0803
+.short 0xffe0
+.short 0x0000
diff --git a/data/scripts/gUnk_08011A2C.inc b/data/scripts/gUnk_08011A2C.inc
new file mode 100644
index 00000000..a1d29930
--- /dev/null
+++ b/data/scripts/gUnk_08011A2C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08011A2C
+StartScript 
+_0807EB44 0x0004
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+TextboxNoOverlapFollow 0x1320
+_0807EA94 
+_0807E878 
+.short 0x0803
+.short 0xffe2
diff --git a/data/scripts/gUnk_08011A64.inc b/data/scripts/gUnk_08011A64.inc
new file mode 100644
index 00000000..d0163977
--- /dev/null
+++ b/data/scripts/gUnk_08011A64.inc
@@ -0,0 +1,47 @@
+SCRIPT_START gUnk_08011A64
+StartScript 
+_0807EB44 0x0002
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+CallWithArg sub_080644B4, 0x00000006
+JumpIf 0x005e
+TextboxNoOverlapFollow 0x1320
+_0807EA94 
+_0807E878 
+Jump 0xffd4
+.short 0x0000
+.short 0x0401
+.short 0x0861
+.short 0x0004
+.short 0x0453
+.short 0x0879
+.short 0x000a
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
+.short 0x0463
+.short 0x140c
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+.short 0x085a
+.short 0x1322
+.short 0x0459
+.short 0x0444
+.short 0x0803
+.short 0xffe2
diff --git a/data/scripts/gUnk_08011AE4.inc b/data/scripts/gUnk_08011AE4.inc
new file mode 100644
index 00000000..231bc978
--- /dev/null
+++ b/data/scripts/gUnk_08011AE4.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08011AE4
+CheckRoomFlag 0x000f
+JumpIfNot 0xfffa
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+TextboxNoOverlapFollowPos 0x1321, 0x0007
+_0807EA94 
+.short 0x082a
diff --git a/data/scripts/gUnk_08011B04.inc b/data/scripts/gUnk_08011B04.inc
new file mode 100644
index 00000000..dea2fc94
--- /dev/null
+++ b/data/scripts/gUnk_08011B04.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08011B04
+.short 0x0010
+.short 0x140c
+.short 0xda1d
+.short 0x0806
+.short 0x0003
+.short 0x0000
+.short 0x0444
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc
new file mode 100644
index 00000000..a33c964a
--- /dev/null
+++ b/data/scripts/gUnk_08011B20.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08011B20
+_0807E864 
+Call sub_0807DF28
+TextboxNoOverlapFollowPos 0x1320, 0x000c
+_0807EA94 
+_0807E878 
+Call sub_0807DF50
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc
new file mode 100644
index 00000000..c69b2845
--- /dev/null
+++ b/data/scripts/gUnk_08011B40.inc
@@ -0,0 +1,47 @@
+SCRIPT_START gUnk_08011B40
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckGlobalFlag 0x0050
+JumpIfNot 0x002c
+WaitForSomething2 0x00000004
+_0807EB44 0x0006
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB8C 
+TextboxNoOverlap 0x3d07
+_0807EA94 
+_0807EB44 0x0004
+ClearGlobalFlag 0x0050
+Call sub_0807DF50
+_0807E878 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x3d01
+_0807EA94 
+_0807E3E8 
+JumpIf 0x000c
+_0807E878 
+_0807EB44 0x0004
+Jump 0xffe2
+HasRupees 0x000a
+JumpIf 0x0012
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x3d05
+Jump 0xffe0
+ModRupees 0xfff6
+Wait 0x001e
+TextboxNoOverlap 0x3d06
+_0807EA94 
+CallWithArg sub_0806C2A0, 0x00000000
+WaitFor_2 
+Wait 0x003c
+Call sub_0806C224
+.short 0x0803
+.short 0xffb8
diff --git a/data/scripts/gUnk_08011BE4.inc b/data/scripts/gUnk_08011BE4.inc
new file mode 100644
index 00000000..4a474683
--- /dev/null
+++ b/data/scripts/gUnk_08011BE4.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08011BE4
+StartScript 
+_0807E888 
+StopScript 
+CallWithArg sub_0806C2A0, 0x00000001
+WaitFor_2 
+Wait 0x003c
+_0807E878 
+SetRoomFlag 0x0000
+.short 0x087c
+.short 0x0033
diff --git a/data/scripts/gUnk_08011C04.inc b/data/scripts/gUnk_08011C04.inc
new file mode 100644
index 00000000..235fcfeb
--- /dev/null
+++ b/data/scripts/gUnk_08011C04.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_08011C04
+CheckRoomFlag 0x0064
+JumpIfNot 0xfffa
+SoundReq0x80100000 
+_0807E864 
+Wait 0x003c
+CameraTargetEntity 
+Wait 0x003c
+Call Simon_CreateChest
+Wait 0x003c
+CameraTargetPlayer 
+_0807E878 
+CheckLocalFlag 0x0001
+JumpIfNot 0xfffa
+_0807E888 
+WaitPlayerAction8 
+Wait 0x001e
+CallWithArg sub_0806C2A0, 0x00000000
+WaitFor_2 
+Wait 0x003c
+Call sub_0806C280
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc
new file mode 100644
index 00000000..3ef468d6
--- /dev/null
+++ b/data/scripts/gUnk_08011C50.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_08011C50
+StartScript 
+_0807E864 
+StopScript 
+Wait 0x003c
+CallWithArg sub_0806C2A0, 0x00000001
+WaitFor_2 
+Wait 0x003c
+_0807EF80 0x0014
+Wait 0x001e
+_0807E5F8 0x00000004
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc
new file mode 100644
index 00000000..1c3bac33
--- /dev/null
+++ b/data/scripts/gUnk_08011C7C.inc
@@ -0,0 +1,56 @@
+SCRIPT_START gUnk_08011C7C
+StartScript 
+Call sub_08064828
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+CheckGlobalFlag 0x0047
+JumpIf 0x002c
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0xfff8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4515
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffda
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002c
+JumpIf 0xffce
+CheckGlobalFlag 0x002d
+JumpIf 0xffc6
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3105
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffc4
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3108
+_0807EA94 
+SetGlobalFlag 0x002b
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+.short 0x0000
diff --git a/data/scripts/gUnk_08011D28.inc b/data/scripts/gUnk_08011D28.inc
new file mode 100644
index 00000000..9d12e8ce
--- /dev/null
+++ b/data/scripts/gUnk_08011D28.inc
@@ -0,0 +1,56 @@
+SCRIPT_START gUnk_08011D28
+StartScript 
+Call sub_08064928
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+CheckGlobalFlag 0x0047
+JumpIf 0x002c
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0xfff8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4513
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffda
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002b
+JumpIf 0xffce
+CheckGlobalFlag 0x002d
+JumpIf 0xffc6
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3103
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffc4
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3106
+_0807EA94 
+SetGlobalFlag 0x002c
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+.short 0x0000
diff --git a/data/scripts/gUnk_08011DD4.inc b/data/scripts/gUnk_08011DD4.inc
new file mode 100644
index 00000000..c8b2ce29
--- /dev/null
+++ b/data/scripts/gUnk_08011DD4.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08011DD4
+StartScript 
+Call sub_08064A28
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+CheckGlobalFlag 0x0047
+JumpIf 0x002c
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0xfff8
+StopScript 
+_0807E864 
+_0807EB74 
+.short 0x0879
diff --git a/data/scripts/gUnk_08011E04.inc b/data/scripts/gUnk_08011E04.inc
new file mode 100644
index 00000000..5ce63dae
--- /dev/null
+++ b/data/scripts/gUnk_08011E04.inc
@@ -0,0 +1,63 @@
+SCRIPT_START gUnk_08011E04
+.short 0x0000
+.short 0x085b
+.short 0x4514
+.short 0x0459
+.short 0x0444
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0001
+.short 0x0803
+.short 0xffda
+.short 0x0402
+.short 0x0401
+.short 0x0814
+.short 0x002b
+.short 0x0804
+.short 0xffce
+.short 0x0814
+.short 0x002c
+.short 0x0804
+.short 0xffc6
+.short 0x0418
+.short 0x0805
+.short 0xffe8
+.short 0x0402
+.short 0x0443
+.short 0x0463
+.short 0x0879
+.short 0x0000
+.short 0x085b
+.short 0x3104
+.short 0x0459
+.short 0x041c
+.short 0x0804
+.short 0x001e
+.short 0x0444
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0001
+.short 0x0803
+.short 0xffc4
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
+.short 0x0463
+.short 0x0879
+.short 0x0000
+.short 0x085b
+.short 0x3107
+.short 0x0459
+.short 0x082d
+.short 0x002d
+.short 0x0444
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0001
+.short 0x0803
+.short 0xffdc
+.short 0x0000
diff --git a/data/scripts/gUnk_08011E80.inc b/data/scripts/gUnk_08011E80.inc
new file mode 100644
index 00000000..b8bd932f
--- /dev/null
+++ b/data/scripts/gUnk_08011E80.inc
@@ -0,0 +1,45 @@
+SCRIPT_START gUnk_08011E80
+StartScript 
+Call sub_08064828
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002f
+JumpIf 0xfdfa
+CheckGlobalFlag 0x0030
+JumpIf 0xfdf2
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckGlobalFlag 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x4524
+_0807EA94 
+Jump 0x000e
+TextboxNoOverlap 0x3111
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffb2
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3114
+_0807EA94 
+SetGlobalFlag 0x002e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+.short 0x0803
+.short 0xffdc
diff --git a/data/scripts/gUnk_08011F0C.inc b/data/scripts/gUnk_08011F0C.inc
new file mode 100644
index 00000000..9c1ebe00
--- /dev/null
+++ b/data/scripts/gUnk_08011F0C.inc
@@ -0,0 +1,45 @@
+SCRIPT_START gUnk_08011F0C
+StartScript 
+Call sub_08064928
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002e
+JumpIf 0xfe1a
+CheckGlobalFlag 0x0030
+JumpIf 0xfe12
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckGlobalFlag 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x4522
+_0807EA94 
+Jump 0x000e
+TextboxNoOverlap 0x310f
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffb2
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3112
+_0807EA94 
+SetGlobalFlag 0x002f
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+.short 0x0803
+.short 0xffdc
diff --git a/data/scripts/gUnk_08011F98.inc b/data/scripts/gUnk_08011F98.inc
new file mode 100644
index 00000000..0b11163d
--- /dev/null
+++ b/data/scripts/gUnk_08011F98.inc
@@ -0,0 +1,45 @@
+SCRIPT_START gUnk_08011F98
+StartScript 
+Call sub_08064A28
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002e
+JumpIf 0xfe3a
+CheckGlobalFlag 0x002f
+JumpIf 0xfe32
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckGlobalFlag 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x4523
+_0807EA94 
+Jump 0x000e
+TextboxNoOverlap 0x3110
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffb2
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3113
+_0807EA94 
+SetGlobalFlag 0x0030
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+.short 0x0803
+.short 0xffdc
diff --git a/data/scripts/gUnk_08012024.inc b/data/scripts/gUnk_08012024.inc
new file mode 100644
index 00000000..e27a1327
--- /dev/null
+++ b/data/scripts/gUnk_08012024.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_08012024
+StartScript 
+Call sub_08064828
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckLocalFlag 0x0094
+JumpIf 0x0010
+TextboxNoOverlap 0x3122
+_0807EA94 
+SetLocalFlag 0x0094
+Jump 0x0042
+_0807E48C 0x0031
+JumpIfNot 0x000c
+TextboxNoOverlap 0x3123
+_0807EA94 
+Jump 0x0030
+TextboxNoOverlap 0x3124
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0024
+_0807E48C 0x0020
+JumpIfNot 0x0018
+TextboxNoOverlap 0x3125
+_0807EA94 
+_0807F034 0x0031
+WaitPlayerAction8 
+.byte 0xb
diff --git a/data/scripts/gUnk_08012091.inc b/data/scripts/gUnk_08012091.inc
new file mode 100644
index 00000000..46015845
--- /dev/null
+++ b/data/scripts/gUnk_08012091.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_08012091
+.byte 0xc
+.byte 0x25
+.byte 0xfc
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x27
+.byte 0x31
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x8e
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_080120B0.inc b/data/scripts/gUnk_080120B0.inc
new file mode 100644
index 00000000..b3cc5cfd
--- /dev/null
+++ b/data/scripts/gUnk_080120B0.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_080120B0
+StartScript 
+Call sub_08064928
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckLocalFlag 0x0095
+JumpIf 0x0010
+TextboxNoOverlap 0x3116
+_0807EA94 
+SetLocalFlag 0x0095
+Jump 0x0042
+.byte 0x1f
+.byte 0x8
+.byte 0x2f
diff --git a/data/scripts/gUnk_080120ED.inc b/data/scripts/gUnk_080120ED.inc
new file mode 100644
index 00000000..cfe95096
--- /dev/null
+++ b/data/scripts/gUnk_080120ED.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_080120ED
+.short 0x0500
+.short 0x0c08
+.short 0x5b00
+.short 0x1708
+.short 0x5931
+.short 0x0304
+.short 0x3008
diff --git a/data/scripts/gUnk_080120FB.inc b/data/scripts/gUnk_080120FB.inc
new file mode 100644
index 00000000..0313b6b4
--- /dev/null
+++ b/data/scripts/gUnk_080120FB.inc
@@ -0,0 +1,66 @@
+SCRIPT_START gUnk_080120FB
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x18
+.byte 0x31
+.byte 0x59
+.byte 0x4
+.byte 0x1c
+.byte 0x4
+.byte 0x5
+.byte 0x8
+.byte 0x24
+.byte 0x0
+.byte 0x1f
+.byte 0x8
+.byte 0x20
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0x18
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x19
+.byte 0x31
+.byte 0x59
+.byte 0x4
+.byte 0x82
+.byte 0x8
+.byte 0x2f
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x25
+.byte 0xfc
+.byte 0x7
+.byte 0x8
+.byte 0x3
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0x5b
+.byte 0x8
+.byte 0x1b
+.byte 0x31
+.byte 0x59
+.byte 0x4
+.byte 0x44
+.byte 0x4
+.byte 0x61
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x1
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x8e
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0801213C.inc b/data/scripts/gUnk_0801213C.inc
new file mode 100644
index 00000000..3e584133
--- /dev/null
+++ b/data/scripts/gUnk_0801213C.inc
@@ -0,0 +1,42 @@
+SCRIPT_START gUnk_0801213C
+StartScript 
+Call sub_08064A28
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckLocalFlag 0x0096
+JumpIf 0x0010
+TextboxNoOverlap 0x311c
+_0807EA94 
+SetLocalFlag 0x0096
+Jump 0x0042
+_0807E48C 0x0030
+JumpIfNot 0x000c
+TextboxNoOverlap 0x311d
+_0807EA94 
+Jump 0x0030
+TextboxNoOverlap 0x311e
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0024
+_0807E48C 0x0020
+JumpIfNot 0x0018
+TextboxNoOverlap 0x311f
+_0807EA94 
+_0807F034 0x0030
+WaitPlayerAction8 
+Call sub_0807FC24
+Jump 0x0006
+TextboxNoOverlap 0x3121
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xff8e
+.short 0x0000
diff --git a/data/scripts/gUnk_080121C8.inc b/data/scripts/gUnk_080121C8.inc
new file mode 100644
index 00000000..c37ef7e8
--- /dev/null
+++ b/data/scripts/gUnk_080121C8.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_080121C8
+StartScript 
+Call sub_08064828
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4527
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+.short 0x0803
+.short 0xffe0
diff --git a/data/scripts/gUnk_08012200.inc b/data/scripts/gUnk_08012200.inc
new file mode 100644
index 00000000..778d55f1
--- /dev/null
+++ b/data/scripts/gUnk_08012200.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08012200
+StartScript 
+Call sub_08064928
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4525
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+.short 0x0803
+.short 0xffe0
diff --git a/data/scripts/gUnk_08012238.inc b/data/scripts/gUnk_08012238.inc
new file mode 100644
index 00000000..e8846aee
--- /dev/null
+++ b/data/scripts/gUnk_08012238.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08012238
+StartScript 
+Call sub_08064A28
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4526
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+.short 0x0803
+.short 0xffe0
diff --git a/data/scripts/gUnk_08012270.inc b/data/scripts/gUnk_08012270.inc
new file mode 100644
index 00000000..831f71ad
--- /dev/null
+++ b/data/scripts/gUnk_08012270.inc
@@ -0,0 +1,57 @@
+SCRIPT_START gUnk_08012270
+StartScript 
+_0807EB44 0x0004
+Call sub_08061FD8
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x001e
+JumpIfNot 0x000a
+CheckInventory1 0x0015
+JumpIf 0x0024
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807EB74 
+_0807E864 
+Call sub_08061FD8
+TextboxNoOverlapFollow 0x2302
+_0807EA94 
+_0807E878 
+SetGlobalFlag 0x001e
+Jump 0xffcc
+StopScript 
+StartScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0x000a
+CheckRoomFlag 0x0001
+JumpIf 0x0020
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807EB74 
+_0807E864 
+Call sub_08061FD8
+TextboxNoOverlapFollow 0x2303
+_0807EA94 
+_0807E878 
+Jump 0xffd0
+StopScript 
+_0807EB74 
+_0807E864 
+Call sub_08061FD8
+_0807EF80 0x000b
+Call sub_08061FB0
+Call sub_08061F94
+LoadRoomEntityList 0x080f2758
+_0807EF80 0x0008
+Wait 0x003c
+SoundReq 0x0072
+SetLocalFlag 0x0043
+Wait 0x001e
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc
new file mode 100644
index 00000000..0dee1c37
--- /dev/null
+++ b/data/scripts/gUnk_0801232C.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0801232C
+StartScript 
+_0807EB74 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807EB74 
+_0807E864 
+TextboxNoOverlapFollow 0x2304
+_0807EA94 
+CheckLocalFlag 0x0042
+JumpIf 0x000c
+SetLocalFlag 0x0042
+_0807F034 0x0057
+WaitPlayerAction8 
+_0807E878 
+.short 0x0803
+.short 0xffda
diff --git a/data/scripts/gUnk_08012360.inc b/data/scripts/gUnk_08012360.inc
new file mode 100644
index 00000000..34c4b8de
--- /dev/null
+++ b/data/scripts/gUnk_08012360.inc
@@ -0,0 +1,50 @@
+SCRIPT_START gUnk_08012360
+StartScript 
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x0004
+JumpIfNot 0xfffa
+Call sub_0807DF28
+_0807E864 
+SoundReq0x80100000 
+StartScript 
+_0807E778 0x0004
+_0807E788 0x00007fff
+DoFade5 
+_0807E858 0x0080
+StopScript 
+WaitFor_2 
+SoundReq2 0x002c
+_0807EB28 0x1401
+_0807EA94 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x0007
+SoundReq 0x01ce
+SetEntity0x20 0xffff8000
+Wait 0x003c
+_0807E8E4_0 
+StartPlayerScript 0x08012410
+WaitForSomething2 0x00000001
+TextboxNoOverlap 0x1402
+_0807EA94 
+SoundReq0x80100000 
+SetEntity0x20 0x00010000
+Wait 0x003c
+StartScript 
+_0807E778 0x0004
+_0807E788 0xffffffff
+DoFade4 
+_0807E858 0x0080
+StopScript 
+WaitFor_2 
+SoundReq2 0xffff
+_0807EB28 0x1403
+_0807EA94 
+_0807E914 0x00000203
+Call sub_0807F420
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012410.inc b/data/scripts/gUnk_08012410.inc
new file mode 100644
index 00000000..39c087b1
--- /dev/null
+++ b/data/scripts/gUnk_08012410.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08012410
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc
new file mode 100644
index 00000000..2c3efbfb
--- /dev/null
+++ b/data/scripts/gUnk_08012430.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_08012430
+StartScript 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E930 0x0008
+Call sub_0807F2D4
+_0807E930 0x0009
+Call sub_0806B2B4
+_0807EA94 
+CheckLocalFlag 0x00b3
+JumpIf 0x0010
+SetLocalFlag 0x00b3
+_0807F034 0x0062
+WaitPlayerAction8 
+SetLocalFlag 0x00d0
+_0807E878 
+_0807E930 0x0000
+Jump 0xffc4
+.short 0x0000
diff --git a/data/scripts/gUnk_08012480.inc b/data/scripts/gUnk_08012480.inc
new file mode 100644
index 00000000..bbf9f288
--- /dev/null
+++ b/data/scripts/gUnk_08012480.inc
@@ -0,0 +1,132 @@
+SCRIPT_START gUnk_08012480
+StartScript 
+Call sub_08054564
+StopScript 
+CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
+JumpIfNot 0xfff6
+SoundReq0x80100000 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x08012ab0
+TextboxNoOverlapFollowPos 0x1101, 0x0007
+_0807EA94 
+CameraTargetPlayer 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+_0807E858 0x0000
+Call sub_080791BC
+LoadRoomEntityList 0x080f4d70
+Call DeleteAllEnemies
+SetEntityPositionRelative 0x01680388
+Call sub_0807F844
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+SoundReq2 0x000e
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+MoveEntityToPlayer 
+Call sub_0807F844
+CameraTargetPlayer 
+_0807E788 0xffffffff
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+Call sub_0807DF50
+_0807E878 
+SoundReq2 0xffff
+CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0806DC7C
+SoundReq0x80100000 
+StartPlayerScript 0x08012ac8
+WaitForSomething2 0x00000001
+SetEntityPositionRelative 0x01680388
+_0807F0B4 0x0001
+CameraTargetEntity 
+Wait 0x005a
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq2 0x000e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+SoundReq2 0x0033
+Call sub_0807DF50
+_0807E878 
+_0807E5F8 0x00000050
+LoadRoomEntityList 0x080f51d0
+WaitForSomething2 0x00000008
+_0807E864 
+Call sub_0807FA40
+Call sub_0807DF28
+SoundReq 0x0072
+SoundReq0x80100000 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+StartPlayerScript 0x08012af0
+WaitForSomething2 0x00000001
+_0807E8E4_0 
+SoundReq2 0x000e
+Wait 0x001e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+Wait 0x003c
+SoundReq2 0xffff
+Call sub_0806DCA0
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807DF50
+_0807E878 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+Wait 0x003c
+SoundReq2 0xffff
+Call sub_08054570
+SetGlobalFlag 0x0014
+CallWithArg sub_0807F6F8, 0x00000008
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012AB0.inc b/data/scripts/gUnk_08012AB0.inc
new file mode 100644
index 00000000..916f994c
--- /dev/null
+++ b/data/scripts/gUnk_08012AB0.inc
@@ -0,0 +1,120 @@
+SCRIPT_START gUnk_08012AB0
+StopScript 
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+Jump 0xffee
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0080
+.short 0x0402
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x0388
+.short 0x0180
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0879
+.short 0x0015
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0861
+.short 0x0004
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0870
+.short 0x0008
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x140c
+.short 0xfb65
+.short 0x0807
+.short 0xffe2
+.short 0xffff
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0861
+.short 0x0000
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x086e
+.short 0x0008
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x140c
+.short 0xfb65
+.short 0x0807
+.short 0xffe2
+.short 0xffff
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0861
+.short 0x0002
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x086f
+.short 0x0008
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x140c
+.short 0xfb65
+.short 0x0807
+.short 0xffe2
+.short 0xffff
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08012BA8.inc b/data/scripts/gUnk_08012BA8.inc
new file mode 100644
index 00000000..6c22916a
--- /dev/null
+++ b/data/scripts/gUnk_08012BA8.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_08012BA8
+StartScript 
+_0807EB44 0x0002
+_0807EF80 0x0007
+_0807E930 0x0001
+StopScript 
+WaitForSomething2 0x00000040
+_0807E930 0x0005
+Wait 0x001e
+_0807E5F8 0x00000080
+_0807E930 0x0001
+WaitForSomething2 0x00000040
+_0807E930 0x0005
+Wait 0x001e
+_0807E5F8 0x00000080
+_0807E930 0x0001
+WaitForSomething2 0x00000040
+Wait 0x0001
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012BF8.inc b/data/scripts/gUnk_08012BF8.inc
new file mode 100644
index 00000000..0b089a01
--- /dev/null
+++ b/data/scripts/gUnk_08012BF8.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08012BF8
+StartScript 
+_0807EB44 0x0006
+_0807EF80 0x0007
+_0807E930 0x0003
+StopScript 
+.short 0x0c33
+.short 0x0010
diff --git a/data/scripts/gUnk_08012C0C.inc b/data/scripts/gUnk_08012C0C.inc
new file mode 100644
index 00000000..534285f4
--- /dev/null
+++ b/data/scripts/gUnk_08012C0C.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_08012C0C
+.short 0x0000
+.short 0x0850
+.short 0x0007
+.short 0x0831
+.short 0x001e
+.short 0x0c28
+.short 0x0020
+.short 0x0000
+.short 0x0850
+.short 0x0003
+.short 0x0c33
+.short 0x0010
+.short 0x0000
+.short 0x0850
+.short 0x0007
+.short 0x0831
+.short 0x001e
+.short 0x0c28
+.short 0x0020
+.short 0x0000
+.short 0x0850
+.short 0x0003
+.short 0x0c33
+.short 0x0010
+.short 0x0000
+.short 0x0831
+.short 0x0001
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_08012C48.inc b/data/scripts/gUnk_08012C48.inc
new file mode 100644
index 00000000..7be9b1be
--- /dev/null
+++ b/data/scripts/gUnk_08012C48.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_08012C48
+StartScript 
+_0807EF80 0x0007
+SetEntityNonPlanarMovement 0x0280
+StopScript 
+_0807EDD4 0x0388, 0x0168
+_0807E5F8 0x00000100
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0453
+.short 0x0879
+.short 0x0008
+.short 0x0c4e
+.short 0x0000
+.short 0x0000
+.short 0x0c0b
+.short 0xda05
+.short 0x0806
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x0443
+.short 0x0449
+.short 0x085a
+.short 0x111d
+.short 0x0459
+.short 0x082d
+.short 0x0022
+.short 0x0444
+.short 0x0803
+.short 0xffe8
diff --git a/data/scripts/gUnk_08012C98.inc b/data/scripts/gUnk_08012C98.inc
new file mode 100644
index 00000000..2a19764d
--- /dev/null
+++ b/data/scripts/gUnk_08012C98.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08012C98
+CheckGlobalFlag 0x0014
+JumpIfNot 0xfffa
+StopScript 
+StartScript 
+CheckPlayerInRegion 0x0398, 0x03b0, 0x2040
+JumpIfNot 0xfff2
+_0807E564 
+JumpIf 0x001e
+StopScript 
+_0807E864 
+Call sub_0807DF28
+_0807EB28 0x2202
+_0807EA94 
+SetLocalFlag 0x003b
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012CD8.inc b/data/scripts/gUnk_08012CD8.inc
new file mode 100644
index 00000000..6f29b3b4
--- /dev/null
+++ b/data/scripts/gUnk_08012CD8.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08012CD8
+StopScript 
+StartScript 
+_0807E564 
+JumpIfNot 0xfff8
+CheckPlayerInRegion 0x0380, 0x03b0, 0x4040
+JumpIfNot 0xffec
+ComparePlayerAction 0x0015
+JumpIf 0xffe4
+_0807E864 
+Call sub_0807DF28
+StopScript 
+_0807EB28 0x2203
+_0807EA94 
+SetLocalFlag 0x003e
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012D18.inc b/data/scripts/gUnk_08012D18.inc
new file mode 100644
index 00000000..79940cb3
--- /dev/null
+++ b/data/scripts/gUnk_08012D18.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_08012D18
+StopScript 
+StartScript 
+CheckGlobalFlag 0x0014
+JumpIfNot 0xfff6
+CheckLocalFlagByOffset 0x0200, 0x008d
+JumpIf 0x003c
+CheckPlayerInRegion 0x0000, 0x01a8, 0x2010
+JumpIfNot 0xffe0
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807EB28 0x111a
+_0807EA94 
+StartPlayerScript 0x08010a38
+WaitForSomething2 0x00000001
+Call sub_0807DF50
+_0807E878 
+Jump 0xffb2
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012D70.inc b/data/scripts/gUnk_08012D70.inc
new file mode 100644
index 00000000..a594867f
--- /dev/null
+++ b/data/scripts/gUnk_08012D70.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08012D70
+CheckPlayerInRegion 0x0088, 0x0048, 0x3030
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x08012db0
+WaitForSomething2 0x00000001
+_0807EB28 0x132d
+_0807EA94 
+SetLocalFlag 0x0014
+.byte 0xb
diff --git a/data/scripts/gUnk_08012DA1.inc b/data/scripts/gUnk_08012DA1.inc
new file mode 100644
index 00000000..d23dd945
--- /dev/null
+++ b/data/scripts/gUnk_08012DA1.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08012DA1
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_08012DB0.inc b/data/scripts/gUnk_08012DB0.inc
new file mode 100644
index 00000000..0a4d5b99
--- /dev/null
+++ b/data/scripts/gUnk_08012DB0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08012DB0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0088, 0x0068
+_0807EB44 0x0000
+_0807EF80 0x0000
+Wait 0x001e
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012DD8.inc b/data/scripts/gUnk_08012DD8.inc
new file mode 100644
index 00000000..ec98d5e3
--- /dev/null
+++ b/data/scripts/gUnk_08012DD8.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_08012DD8
+StartScript 
+StopScript 
+_0807E888 
+Wait 0x0018
+_0807E864 
+StartPlayerScript 0x08012df8
+WaitForSomething2 0x00000001
+_0807E908 0x0002
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0861
+.short 0x0000
+.short 0x0867
+.short 0x0140
+.short 0x0402
+.short 0x0c73
+.short 0x00b8
+.short 0x0094
+.short 0x0831
+.short 0x0008
+.short 0x0879
+.short 0x0000
+.short 0x0831
+.short 0x0008
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08012E20.inc b/data/scripts/gUnk_08012E20.inc
new file mode 100644
index 00000000..983f694c
--- /dev/null
+++ b/data/scripts/gUnk_08012E20.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08012E20
+StartScript 
+_0807E864 
+StopScript 
+Wait 0x0078
+_0807E908 0x0004
+StartPlayerScript 0x08012e44
+WaitForSomething2 0x00000002
+Wait 0x000c
+_0807E908 0x0005
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012E44.inc b/data/scripts/gUnk_08012E44.inc
new file mode 100644
index 00000000..39ef9c05
--- /dev/null
+++ b/data/scripts/gUnk_08012E44.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08012E44
+StartScript 
+SetEntityNonPlanarMovement 0x0140
+StopScript 
+Wait 0x003c
+_0807EB44 0x0004
+Wait 0x000f
+_0807EB44 0x0002
+Wait 0x0012
+_0807EB44 0x0006
+Wait 0x000c
+_0807EB44 0x0000
+Wait 0x0015
+_0807EB44 0x0004
+Wait 0x0008
+_0807E5F8 0x00000002
+_0807EDD4 0x0088, 0x0158
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc
new file mode 100644
index 00000000..237c8a8f
--- /dev/null
+++ b/data/scripts/gUnk_08012E88.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08012E88
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+Call sub_0806B60C
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0001
+Call sub_0806B4F0
+_0807EA94 
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffe2
+.short 0x0000
diff --git a/data/scripts/gUnk_08012EC0.inc b/data/scripts/gUnk_08012EC0.inc
new file mode 100644
index 00000000..fec0518e
--- /dev/null
+++ b/data/scripts/gUnk_08012EC0.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08012EC0
+StartScript 
+_0807EB44 0x0004
+CallWithArg sub_0807F3D8, 0x00000008
+_0807EF80 0x000a
+Call sub_0806B60C
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x0000000c
+Call sub_0806B4F0
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg sub_0807F3D8, 0x00000008
+.short 0x0803
+.short 0xffd2
diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc
new file mode 100644
index 00000000..bca78990
--- /dev/null
+++ b/data/scripts/gUnk_08012F0C.inc
@@ -0,0 +1,155 @@
+SCRIPT_START gUnk_08012F0C
+StartScript 
+CallWithArg sub_0806A93C, 0x12345678
+_0807EB44 0x0004
+_0807E930 0x0002
+CheckInventory1 0x0015
+JumpIf 0x0190
+CheckLocalFlag 0x0060
+JumpIf 0x00a4
+CheckGlobalFlag 0x001e
+JumpIf 0x0050
+StopScript 
+CheckLocalFlag 0x0062
+JumpIfNot 0x0008
+Call sub_0806A9B0
+CheckLocalFlag 0x0061
+JumpIf 0x001e
+Call sub_0806A96C
+JumpIfNot 0xfff8
+_0807E864 
+TextboxNoOverlap 0x4401
+_0807EA94 
+SetLocalFlag 0x0061
+_0807E878 
+_0807E908 0x0001
+Call sub_0806A96C
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x4402
+_0807EA94 
+_0807E908 0x0001
+Jump 0xffea
+SCRIPT_END
+.byte 0x1
+.byte 0x4
+.byte 0x12
+.byte 0x8
+.byte 0x60
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0x44
+.byte 0x0
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x47
+.byte 0xc
+.byte 0xe4
+.byte 0x30
+.byte 0x1
+.byte 0x8
+.byte 0x2a
+.byte 0x8
+.byte 0x60
+.byte 0x0
+.byte 0x2c
+.byte 0x8
+.byte 0x61
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x33
+.byte 0xc
+.byte 0x4
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x4d
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x59
+.byte 0xa9
+.byte 0x6
+.byte 0x8
+.byte 0xc
+.byte 0x14
+.byte 0x3d
+.byte 0xf9
+.byte 0x7
+.byte 0x8
+.byte 0xf4
+.byte 0xf2
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x2a
+.byte 0x8
+.byte 0x62
+.byte 0x0
+.byte 0x3
+.byte 0x8
+.byte 0x2a
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x50
+.byte 0x8
+.byte 0xd
+.byte 0x0
+.byte 0x4d
+.byte 0x8
+.byte 0x5
+.byte 0x0
+.byte 0x2a
+.byte 0x8
+.byte 0x62
+.byte 0x0
+.byte 0xc
+.byte 0x14
+.byte 0x3d
+.byte 0xf9
+.byte 0x7
+.byte 0x8
+.byte 0xf4
+.byte 0xf2
+.byte 0x0
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x11
+.byte 0xaa
+.byte 0x6
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0xf
+.byte 0x8
+.byte 0x38
+.byte 0x0
+.byte 0x4
+.byte 0x8
+.byte 0xe
+.byte 0x0
+.byte 0x51
+.byte 0x4
+.byte 0x5b
+.byte 0x8
+.byte 0x3
+.byte 0x44
+.byte 0x59
diff --git a/data/scripts/gUnk_08013001.inc b/data/scripts/gUnk_08013001.inc
new file mode 100644
index 00000000..56b02222
--- /dev/null
+++ b/data/scripts/gUnk_08013001.inc
@@ -0,0 +1,2 @@
+SCRIPT_START gUnk_08013001
+.short 0x0304
diff --git a/data/scripts/gUnk_08013003.inc b/data/scripts/gUnk_08013003.inc
new file mode 100644
index 00000000..f91e8535
--- /dev/null
+++ b/data/scripts/gUnk_08013003.inc
@@ -0,0 +1,5 @@
+SCRIPT_START gUnk_08013003
+.short 0xf608
+.short 0x51ff
+.short 0x0104
+.short 0x4304
diff --git a/data/scripts/gUnk_0801300B.inc b/data/scripts/gUnk_0801300B.inc
new file mode 100644
index 00000000..35f3e1ac
--- /dev/null
+++ b/data/scripts/gUnk_0801300B.inc
@@ -0,0 +1,50 @@
+SCRIPT_START gUnk_0801300B
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x2
+.byte 0x4
+.byte 0x7b
+.byte 0x8
+.byte 0xcd
+.byte 0x0
+.byte 0x86
+.byte 0x8
+.byte 0x38
+.byte 0x0
+.byte 0x34
+.byte 0x4
+.byte 0x31
+.byte 0x8
+.byte 0x1e
+.byte 0x0
+.byte 0x49
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x9d
+.byte 0xab
+.byte 0x6
+.byte 0x8
+.byte 0x50
+.byte 0x8
+.byte 0xb
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x79
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x5b
+.byte 0x8
diff --git a/data/scripts/gUnk_0801303C.inc b/data/scripts/gUnk_0801303C.inc
new file mode 100644
index 00000000..db5297a6
--- /dev/null
+++ b/data/scripts/gUnk_0801303C.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_0801303C
+.short 0x4404
+.short 0x0459
+.short 0x0831
+.short 0x001e
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x003c
+.short 0x085b
+.short 0x440e
+.short 0x0459
+.short 0x0831
+.short 0x001e
+.short 0x0c0b
+.short 0xa9e9
+.short 0x0806
+.short 0x0850
+.short 0x000f
+.short 0x0831
+.short 0x00f0
+.short 0x085b
+.short 0x4405
+.short 0x0459
+.short 0x0c28
+.short 0x0200
+.short 0x0000
diff --git a/data/scripts/gUnk_08013070.inc b/data/scripts/gUnk_08013070.inc
new file mode 100644
index 00000000..820bc664
--- /dev/null
+++ b/data/scripts/gUnk_08013070.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08013070
+_0807F034 0x0015
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlap 0x4406
+_0807EA94 
+.byte 0x4d
+.byte 0x8
+.byte 0x1
diff --git a/data/scripts/gUnk_08013081.inc b/data/scripts/gUnk_08013081.inc
new file mode 100644
index 00000000..01b70f57
--- /dev/null
+++ b/data/scripts/gUnk_08013081.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08013081
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x6d
+.byte 0xa9
+.byte 0x6
+.byte 0x8
diff --git a/data/scripts/gUnk_08013090.inc b/data/scripts/gUnk_08013090.inc
new file mode 100644
index 00000000..6abaa52d
--- /dev/null
+++ b/data/scripts/gUnk_08013090.inc
@@ -0,0 +1,36 @@
+SCRIPT_START gUnk_08013090
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x4407
+_0807EA94 
+_0807E908 0x0001
+Call sub_0806A96C
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x440d
+_0807EA94 
+_0807E908 0x0001
+Jump 0xffd6
+CheckLocalFlag 0x0062
+JumpIfNot 0x0008
+Call sub_0806A9B0
+StopScript 
+Call sub_0806A96C
+JumpIfNot 0xfff8
+_0807E864 
+Call sub_0806AA18
+_0807EA94 
+_0807E878 
+_0807E908 0x0001
+Jump 0xffe4
+StartScript 
+_0807EB44 0x0006
+SetEntityNonPlanarMovement 0x0140
+StopScript 
+_0807EDD4 0x00a8, 0x0060
+Wait 0x0008
+_0807EF80 0x0000
+Wait 0x0008
+_0807EF80 0x0004
+Wait 0x000f
+_0807E5F8 0x00000004
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc
new file mode 100644
index 00000000..67ead4ba
--- /dev/null
+++ b/data/scripts/gUnk_08013114.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_08013114
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EF80 0x0012
+Call sub_0807F348
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000c
+Call sub_0806AEE4
+Jump 0xffee
+_0807E864 
+StopScript 
+_0807EB74 
+Call sub_0806AED8
+CallWithArg sub_0806AA50, 0x00000000
+_0807EA94 
+CallWithArg sub_0806AA50, 0x00000001
+_0807EA94 
+CallWithArg sub_0806AA50, 0x00000002
+_0807EA94 
+JumpIf 0x0008
+_0807E878 
+Jump 0xffb4
+_0807E914 0x00000403
+Call sub_0807F420
+_0807E878 
+.short 0x0803
+.short 0xffa2
diff --git a/data/scripts/gUnk_08013188.inc b/data/scripts/gUnk_08013188.inc
new file mode 100644
index 00000000..fb9ad32b
--- /dev/null
+++ b/data/scripts/gUnk_08013188.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08013188
+StartScript 
+CheckLocalFlag 0x0062
+JumpIfNot 0x000a
+_0807EF80 0x0006
+StopScript 
+SCRIPT_END
+.short 0x0402
+.short 0x0401
+.short 0x0487
+.short 0x046b
+.short 0x0c0b
+.short 0xab75
+.short 0x0806
+.short 0x0803
+.short 0xfff0
diff --git a/data/scripts/gUnk_080131AC.inc b/data/scripts/gUnk_080131AC.inc
new file mode 100644
index 00000000..b7608277
--- /dev/null
+++ b/data/scripts/gUnk_080131AC.inc
@@ -0,0 +1,71 @@
+SCRIPT_START gUnk_080131AC
+CheckPlayerInRegion 0x0098, 0x0038, 0x2060
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript 0x080132e4
+WaitForSomething2 0x00000002
+_0807EB28 0x1601
+_0807EA94 
+StartPlayerScript 0x0801330c
+WaitForSomething2 0x00000002
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+LoadRoomEntityList 0x080f5680
+StartPlayerScript 0x08013330
+WaitForSomething2 0x00000002
+MoveEntityToPlayer 
+SetEntityPosition 0x0000, 0xfff0
+Call sub_0807F844
+CameraTargetEntity 
+Call sub_080536B8
+_0807E864 
+Call sub_0807DF28
+WaitFor_2 
+TextboxNoOverlapFollowPos 0x1602, 0x000c
+_0807EA94 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000010
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000040
+SoundReq2 0x000d
+StartPlayerScript 0x0801334c
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000040
+StartPlayerScript 0x08013378
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000042
+TextboxNoOverlapFollowPos 0x1603, 0x000c
+_0807EA94 
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000040
+_0807E788 0xffff7fff
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+SoundReq0x80100000 
+_0807E858 0x0000
+Wait 0x003c
+CameraTargetPlayer 
+Call sub_0807F5C0
+TextboxNoOverlapFollowPos 0x1604, 0x0007
+_0807EA94 
+_0807E788 0xffffffff
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB28 0x1605
+_0807EA94 
+SetLocalFlag 0x0078
+SoundReq2 0x0031
+SetGlobalFlag 0x005d
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080132E4.inc b/data/scripts/gUnk_080132E4.inc
new file mode 100644
index 00000000..02de2083
--- /dev/null
+++ b/data/scripts/gUnk_080132E4.inc
@@ -0,0 +1,29 @@
+SCRIPT_START gUnk_080132E4
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0098, 0x0058
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call sub_080791BC
+SCRIPT_END
+.short 0x0401
+.short 0x0867
+.short 0x0080
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x086e
+.short 0x0020
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08013330.inc b/data/scripts/gUnk_08013330.inc
new file mode 100644
index 00000000..91ed7499
--- /dev/null
+++ b/data/scripts/gUnk_08013330.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08013330
+StartScript 
+_0807EB44 0x0000
+SetEntityPositionRelative 0x00700098
+StopScript 
+_0807E5F8 0x00000002
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0801334C.inc b/data/scripts/gUnk_0801334C.inc
new file mode 100644
index 00000000..2782c624
--- /dev/null
+++ b/data/scripts/gUnk_0801334C.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0801334C
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x000d
+StopScript 
+_0807EF80 0x0001
+_0807ECC4 0x0020
+_0807EF80 0x0000
+_0807EF80 0x000c
+_0807E5F8 0x00000002
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013378.inc b/data/scripts/gUnk_08013378.inc
new file mode 100644
index 00000000..5c3179ad
--- /dev/null
+++ b/data/scripts/gUnk_08013378.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08013378
+Call sub_0807F1C4
+Call sub_0807F2D4
+Call sub_0807F1E8
+Call sub_0807F2D4
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+SoundReq 0x007c
+_0807EB44 0x0004
+Call sub_0807F210
+_0807EF3C 0x0200, 0x0020
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080133C4.inc b/data/scripts/gUnk_080133C4.inc
new file mode 100644
index 00000000..a753fd84
--- /dev/null
+++ b/data/scripts/gUnk_080133C4.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_080133C4
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0007
+_0807EF80 0x000b
+Call sub_0807F338
+StopScript 
+WaitForSomething2 0x00000008
+Call sub_08061F94
+Wait 0x000a
+_0807E5F8 0x00000010
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc
new file mode 100644
index 00000000..3ff652f5
--- /dev/null
+++ b/data/scripts/gUnk_080133F8.inc
@@ -0,0 +1,70 @@
+SCRIPT_START gUnk_080133F8
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0008
+_0807EF80 0x000b
+Call sub_0807F338
+StopScript 
+WaitForSomething2 0x00000020
+SetEntityPositionRelative 0x00480098
+Call sub_08066C94
+Wait 0x00e9
+_0807EF80 0x0007
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+Wait 0x003c
+_0807EF80 0x0014
+SoundReq 0x0120
+CallWithArg sub_08095420, 0x08013494
+Wait 0x005a
+_0807EF80 0x0016
+WaitForSomething2 0x00000080
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+Call sub_08066CA4
+_0807EF80 0x0008
+Wait 0x0078
+_0807E5F8 0x00000040
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0850
+.short 0x0000
+.short 0x0867
+.short 0x0200
+.short 0x0c0b
+.short 0x5459
+.short 0x0809
+.short 0x0c0b
+.short 0x4b81
+.short 0x0809
+.short 0x0402
+.short 0x0831
+.short 0x005a
+.short 0x0c0b
+.short 0x4b6d
+.short 0x0809
+.short 0x0c73
+.short 0x0098
+.short 0x0080
+.short 0x0401
+.short 0x0c0b
+.short 0x4b81
+.short 0x0809
+.short 0x087b
+.short 0x01cc
+.short 0x0c0b
+.short 0xf36d
+.short 0x0807
+.short 0x0c28
+.short 0x0080
+.short 0x0000
+.short 0x0402
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc
new file mode 100644
index 00000000..5838d2d5
--- /dev/null
+++ b/data/scripts/gUnk_080134DC.inc
@@ -0,0 +1,112 @@
+SCRIPT_START gUnk_080134DC
+StartScript 
+_0807EF80 0x0008
+StopScript 
+StartScript 
+Call sub_0807F92C
+CallWithArg sub_0806DA04, 0x00000003
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+StartPlayerScript 0x080136d8
+WaitForSomething2 0x00000001
+CallWithArg sub_08095A1C, 0x08013f04
+SoundReq 0x01cd
+Wait 0x005a
+StartScript 
+SoundReq 0x01ce
+CallWithArg sub_08095D54, 0x08013e04
+CallWithArg sub_08095D54, 0x08013e28
+StopScript 
+WaitForSomething2 0x18000000
+StartScript 
+SoundReq 0x01cf
+CallWithArg sub_08095D8C, 0x08014054
+CallWithArg sub_08095D8C, 0x08014074
+StopScript 
+Wait 0x001e
+StartScript 
+SoundReq 0x01d0
+CallWithArg sub_08095D8C, 0x080140dc
+CallWithArg sub_08095D8C, 0x08014118
+StopScript 
+Wait 0x003c
+CallWithArg sub_0805DDEC, 0x00000000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00002000
+SoundReq 0x01d2
+CallWithArg sub_08095D8C, 0x080141dc
+CallWithArg sub_08095D8C, 0x08014210
+_0807E5F8 0x00000400
+WaitForSomething2 0x00004000
+Wait 0x0078
+_0807E5F8 0x00000060
+CallWithArg sub_0805DE18, 0x00000000
+Wait 0x0078
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+Wait 0x003c
+StartPlayerScript 0x08013b70
+_0807E5F8 0x00000080
+_0807F078 0x0003, 0x0001
+Call sub_0806DC3C
+Call sub_0806DC58
+Call sub_0807F304
+Wait 0x003c
+_0807E778 0x0004
+DoFade7 
+SoundReq 0x00f6
+WaitFor_2 
+Wait 0x003c
+_0807E5F8 0x00000010
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+SoundReq 0x0109
+TextboxNoOverlapFollowPos 0x0503, 0x000c
+_0807EA94 
+_0807E5F8 0x00040000
+CallWithArg sub_0805DDEC, 0x00000001
+_0807F0C8 0xffff, 0x0000
+Call sub_0807F3F8
+Wait 0x003c
+_0807F0B4 0x0007
+SetEntityPositionRelative 0x00a800e8
+CameraTargetEntity 
+Wait 0x003c
+_0807E5F8 0x00000004
+Wait 0x0078
+CallWithArg sub_0805DE18, 0x00000001
+_0807F0C8 0x0000, 0x0000
+StartPlayerScript 0x080136b4
+WaitForSomething2 0x00000002
+_0807EB28 0x1501
+_0807EA94 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetLocalFlag 0x007a
+Call sub_08053250
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0c73
+.short 0x00e8
+.short 0x00a8
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc
new file mode 100644
index 00000000..31efec12
--- /dev/null
+++ b/data/scripts/gUnk_080136D8.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_080136D8
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+Call sub_0807F584
+.short 0x1406
+.short 0x0008
+.short 0x0010
+.short 0x0018
+.short 0x000c
+.short 0x140c
+.short 0xf465
+.short 0x0807
+.short 0x00d0
+.short 0x0000
+.short 0x140c
+.short 0xf4f9
+.short 0x0807
+.short 0x0124
+.short 0x0000
+.short 0x0c73
+.short 0x00e8
+.short 0x0124
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc
new file mode 100644
index 00000000..46af63b4
--- /dev/null
+++ b/data/scripts/gUnk_08013720.inc
@@ -0,0 +1,39 @@
+SCRIPT_START gUnk_08013720
+StartScript 
+_0807EF80 0x0008
+StopScript 
+StartScript 
+Call sub_0807F92C
+CallWithArg sub_0806DA04, 0x00000003
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+StartPlayerScript 0x080136d8
+WaitForSomething2 0x00000001
+CallWithArg sub_08095A1C, 0x08013f34
+SoundReq 0x01cd
+Wait 0x005a
+StartScript 
+SoundReq 0x01ce
+CallWithArg sub_08095D54, 0x08013e4c
+StopScript 
+WaitForSomething2 0x20000000
+StartScript 
+SoundReq 0x01cf
+CallWithArg sub_08095D8C, 0x08014054
+CallWithArg sub_08095D8C, 0x08014074
+CallWithArg sub_08095D8C, 0x08014094
+StopScript 
+Wait 0x001e
+StartScript 
+SoundReq 0x01d0
+CallWithArg sub_08095D8C, 0x080140dc
+CallWithArg sub_08095D8C, 0x08014118
+CallWithArg sub_08095D8C, 0x08014154
+StopScript 
+Wait 0x003c
+.short 0x140c
+.short 0xdded
+.short 0x0805
diff --git a/data/scripts/gUnk_080137DA.inc b/data/scripts/gUnk_080137DA.inc
new file mode 100644
index 00000000..e5295dde
--- /dev/null
+++ b/data/scripts/gUnk_080137DA.inc
@@ -0,0 +1,110 @@
+SCRIPT_START gUnk_080137DA
+.short 0x0000
+.short 0x0000
+.short 0x0c28
+.short 0x0200
+.short 0x0000
+.short 0x0c33
+.short 0x2000
+.short 0x0000
+.short 0x087b
+.short 0x01d2
+.short 0x140c
+.short 0x5d8d
+.short 0x0809
+.short 0x41dc
+.short 0x0801
+.short 0x140c
+.short 0x5d8d
+.short 0x0809
+.short 0x4210
+.short 0x0801
+.short 0x0c28
+.short 0x0400
+.short 0x0000
+.short 0x0c33
+.short 0x4000
+.short 0x0000
+.short 0x0c28
+.short 0x0800
+.short 0x0000
+.short 0x0c33
+.short 0x8000
+.short 0x0000
+.short 0x0831
+.short 0x0078
+.short 0x0c28
+.short 0x0060
+.short 0x0000
+.short 0x140c
+.short 0xde19
+.short 0x0805
+.short 0x0000
+.short 0x0000
+.short 0x0831
+.short 0x0078
+.short 0x0c28
+.short 0x0080
+.short 0x0000
+.short 0x0c33
+.short 0x0100
+.short 0x0000
+.short 0x0831
+.short 0x003c
+.short 0x0c47
+.short 0x3b70
+.short 0x0801
+.short 0x0c28
+.short 0x0080
+.short 0x0000
+.short 0x0c85
+.short 0x0004
+.short 0x0001
+.short 0x0c0b
+.short 0xdc3d
+.short 0x0806
+.short 0x0c0b
+.short 0xdc59
+.short 0x0806
+.short 0x0c0b
+.short 0xf305
+.short 0x0807
+.short 0x0831
+.short 0x003c
+.short 0x0838
+.short 0x0004
+.short 0x043f
+.short 0x087b
+.short 0x00f6
+.short 0x0437
+.short 0x0831
+.short 0x003c
+.short 0x0c28
+.short 0x0010
+.short 0x0000
+.short 0x0838
+.short 0x0002
+.short 0x043e
+.short 0x0437
+.short 0x087b
+.short 0x0109
+.short 0x0c5c
+.short 0x0504
+.short 0x000c
+.short 0x0459
+.short 0x0c28
+.short 0x0000
+.short 0x0004
+.short 0x082a
+.short 0x007b
+.short 0x0c0b
+.short 0x3251
+.short 0x0805
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc
new file mode 100644
index 00000000..7f7e88c1
--- /dev/null
+++ b/data/scripts/gUnk_080138B4.inc
@@ -0,0 +1,118 @@
+SCRIPT_START gUnk_080138B4
+StartScript 
+_0807EF80 0x0008
+StopScript 
+StartScript 
+Call sub_0807F92C
+CallWithArg sub_0806DA04, 0x00000003
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+StartPlayerScript 0x080136d8
+WaitForSomething2 0x00000001
+CallWithArg sub_08095A1C, 0x08013f64
+SoundReq 0x01cd
+Wait 0x005a
+StartScript 
+SoundReq 0x01ce
+CallWithArg sub_08095D54, 0x08013e70
+StopScript 
+WaitForSomething2 0x40000000
+StartScript 
+SoundReq 0x01cf
+CallWithArg sub_08095D8C, 0x08014054
+CallWithArg sub_08095D8C, 0x08014074
+CallWithArg sub_08095D8C, 0x08014094
+CallWithArg sub_08095D8C, 0x080140b8
+StopScript 
+Wait 0x001e
+StartScript 
+SoundReq 0x01d0
+CallWithArg sub_08095D8C, 0x080140dc
+CallWithArg sub_08095D8C, 0x08014118
+CallWithArg sub_08095D8C, 0x08014154
+CallWithArg sub_08095D8C, 0x08014198
+StopScript 
+Wait 0x003c
+CallWithArg sub_0805DDEC, 0x00000000
+_0807E5F8 0x00000200
+WaitForSomething2 0x00002000
+SoundReq 0x01d2
+CallWithArg sub_08095D8C, 0x080141dc
+CallWithArg sub_08095D8C, 0x08014210
+_0807E5F8 0x00000400
+WaitForSomething2 0x00004000
+_0807E5F8 0x00000800
+WaitForSomething2 0x00008000
+_0807E5F8 0x00001000
+WaitForSomething2 0x00010000
+Wait 0x0078
+_0807E5F8 0x00000060
+CallWithArg sub_0805DE18, 0x00000000
+Wait 0x0078
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+Wait 0x003c
+StartPlayerScript 0x08013ba8
+_0807E5F8 0x00000080
+_0807F078 0x0006, 0x0001
+Call sub_0807AEE4
+Call sub_0806DC3C
+Call sub_0806DC58
+Call sub_0807F304
+Wait 0x003c
+_0807E778 0x0004
+DoFade7 
+SoundReq 0x00f6
+WaitFor_2 
+Wait 0x003c
+_0807E5F8 0x00000010
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+SoundReq 0x0109
+TextboxNoOverlapFollowPos 0x0505, 0x000c
+_0807EA94 
+_0807E5F8 0x00040000
+_0807F0B4 0x0002
+SetEntityPositionRelative 0x00d800e8
+CameraTargetEntity 
+Call sub_0806DC3C
+CallWithArg sub_0807F244, 0x00010001
+CallWithArg sub_0807F29C, 0x080049fe
+Wait 0x00c8
+CallWithArg sub_0807F29C, 0x00000000
+Call sub_0806DC58
+CheckRoomFlag 0x0004
+JumpIfNot 0xfffa
+CallWithArg sub_0805DDEC, 0x00000001
+_0807F0C8 0xffff, 0x0000
+Call sub_0807F3F8
+Wait 0x003c
+_0807E5F8 0x00000008
+Wait 0x0078
+CallWithArg sub_0805DE18, 0x00000001
+_0807F0C8 0x0000, 0x0000
+Wait 0x003c
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x005000e8
+CameraTargetEntity 
+Wait 0x003c
+LoadRoomEntityList 0x080f55d8
+Wait 0x0078
+_0807F0B4 0x0007
+MoveEntityToPlayer 
+CameraTargetEntity 
+Wait 0x003c
+_0807EB28 0x1502
+_0807EA94 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetLocalFlag 0x007c
+Call sub_08053250
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc
new file mode 100644
index 00000000..817a9beb
--- /dev/null
+++ b/data/scripts/gUnk_08013B18.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_08013B18
+StartScript 
+_0807EF80 0x0008
+StopScript 
+StartScript 
+CallWithArg sub_0807F6B4, 0x000001c8
+JumpIfNot 0xfff0
+CheckInventory1 0x0006
+JumpIfNot 0xffe8
+CheckLocalFlag 0x0078
+JumpIf 0xffe0
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807EB28 0x1507
+_0807EA94 
+StartPlayerScript 0x08010a14
+WaitForSomething2 0x00000001
+Call sub_0807DF50
+_0807E878 
+Jump 0xffb2
+.short 0x0000
diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc
new file mode 100644
index 00000000..8f2b17b3
--- /dev/null
+++ b/data/scripts/gUnk_08013B70.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08013B70
+SoundReq 0x01d3
+CallWithArg sub_0807F238, 0x000008bf
+Call sub_08096028
+Wait 0x003c
+_0807E5F8 0x00020000
+Call sub_0807F304
+Wait 0x0078
+WaitForSomething2 0x00040000
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc
new file mode 100644
index 00000000..a2337d5a
--- /dev/null
+++ b/data/scripts/gUnk_08013BA8.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08013BA8
+CallWithArg sub_08095E7C, 0x08014248
+SoundReq 0x01d3
+CallWithArg sub_0807F238, 0x000008e3
+Call sub_08096028
+Wait 0x0078
+_0807E5F8 0x00020000
+Call sub_0807F304
+Wait 0x0078
+WaitForSomething2 0x00040000
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc
new file mode 100644
index 00000000..34d54f72
--- /dev/null
+++ b/data/scripts/gUnk_08013BE8.inc
@@ -0,0 +1,51 @@
+SCRIPT_START gUnk_08013BE8
+StartScript 
+CheckLocalFlag 0x007a
+JumpIf 0x003a
+CheckInventory1 0x0003
+JumpIf 0x0032
+CheckInventory1 0x0002
+JumpIfNot 0x0098
+CheckInventory1 0x0040
+JumpIfNot 0x0090
+CheckInventory1 0x0041
+JumpIfNot 0x0088
+StopScript 
+_0807EF80 0x0008
+WaitForSomething2 0x00000004
+_0807E908 0x0002
+SoundReq 0x0134
+Jump 0x000a
+CheckLocalFlag 0x007c
+JumpIf 0x0068
+StartScript 
+_0807EF80 0x0007
+Call sub_0807F934
+_0807EF80 0x000a
+CallWithArg sub_080962F8, 0x00000000
+CallWithArg sub_0807F8E8, 0x00000004
+StopScript 
+StopScript 
+StartScript 
+TestBit 0x00000008
+JumpIf 0x002e
+CheckEntityInteractType 
+JumpIfNot 0xffee
+StopScript 
+_0807E864 
+_0807EB74 
+CheckLocalFlag 0x007d
+JumpIf 0x000a
+_0807EB28 0x1501
+Jump 0x0006
+_0807EB28 0x1506
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffc8
+StopScript 
+_0807E908 0x0004
+_0807EF80 0x0008
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013CA4.inc b/data/scripts/gUnk_08013CA4.inc
new file mode 100644
index 00000000..3a3343b6
--- /dev/null
+++ b/data/scripts/gUnk_08013CA4.inc
@@ -0,0 +1,152 @@
+SCRIPT_START gUnk_08013CA4
+StopScript 
+CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0807F3F8
+Wait 0x003c
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x013800e8
+CameraTargetEntity 
+Call sub_0807F5C0
+Wait 0x0078
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807F5C0
+_0807EB28 0x1504
+_0807EA94 
+SetLocalFlag 0x0079
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0401
+.short 0x0c0b
+.short 0xf92d
+.short 0x0807
+.short 0x0879
+.short 0x0008
+.short 0x140c
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x140c
+.short 0x5d55
+.short 0x0809
+.short 0x0000
+.short 0x0000
+.short 0x087b
+.short 0x01cd
+.short 0x0c28
+.short 0x0000
+.short 0x0800
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0c0b
+.short 0xf92d
+.short 0x0807
+.short 0x0879
+.short 0x0008
+.short 0x140c
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x140c
+.short 0x5d55
+.short 0x0809
+.short 0x0001
+.short 0x0000
+.short 0x087b
+.short 0x01cd
+.short 0x0c28
+.short 0x0000
+.short 0x1000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0c0b
+.short 0xf92d
+.short 0x0807
+.short 0x0879
+.short 0x0008
+.short 0x140c
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x140c
+.short 0x5d55
+.short 0x0809
+.short 0x0002
+.short 0x0000
+.short 0x087b
+.short 0x01cd
+.short 0x0c28
+.short 0x0000
+.short 0x2000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0c0b
+.short 0xf92d
+.short 0x0807
+.short 0x0879
+.short 0x0008
+.short 0x140c
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+.short 0x0402
+.short 0x0418
+.short 0x0805
+.short 0xfffc
+.short 0x140c
+.short 0x5d55
+.short 0x0809
+.short 0x0003
+.short 0x0000
+.short 0x087b
+.short 0x01cd
+.short 0x0c28
+.short 0x0000
+.short 0x4000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08013E04.inc b/data/scripts/gUnk_08013E04.inc
new file mode 100644
index 00000000..b4e3a7d2
--- /dev/null
+++ b/data/scripts/gUnk_08013E04.inc
@@ -0,0 +1,29 @@
+SCRIPT_START gUnk_08013E04
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0000
+StopScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EDD4 0x00b0, 0x00f8
+_0807E930 0x0001
+_0807E5F8 0x08000000
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0879
+.short 0x0007
+.short 0x0850
+.short 0x0002
+.short 0x0402
+.short 0x0867
+.short 0x0080
+.short 0x0c73
+.short 0x0120
+.short 0x00f8
+.short 0x0850
+.short 0x0003
+.short 0x0c28
+.short 0x0000
+.short 0x1000
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08013E4C.inc b/data/scripts/gUnk_08013E4C.inc
new file mode 100644
index 00000000..0268ad68
--- /dev/null
+++ b/data/scripts/gUnk_08013E4C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08013E4C
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0004
+StopScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EDD4 0x0120, 0x0168
+_0807E930 0x0005
+_0807E5F8 0x20000000
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013E70.inc b/data/scripts/gUnk_08013E70.inc
new file mode 100644
index 00000000..4f01de5e
--- /dev/null
+++ b/data/scripts/gUnk_08013E70.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08013E70
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0006
+StopScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EDD4 0x00b0, 0x0168
+_0807E930 0x0007
+_0807E5F8 0x40000000
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013E94.inc b/data/scripts/gUnk_08013E94.inc
new file mode 100644
index 00000000..a70e41b9
--- /dev/null
+++ b/data/scripts/gUnk_08013E94.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08013E94
+StartScript 
+_0807EF80 0x0007
+Call sub_0807F180
+SetEntityPositionRelative 0x00f800b0
+_0807E930 0x0001
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013EB0.inc b/data/scripts/gUnk_08013EB0.inc
new file mode 100644
index 00000000..3a4b3b44
--- /dev/null
+++ b/data/scripts/gUnk_08013EB0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08013EB0
+StartScript 
+_0807EF80 0x0007
+Call sub_0807F180
+SetEntityPositionRelative 0x00f80120
+_0807E930 0x0003
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013ECC.inc b/data/scripts/gUnk_08013ECC.inc
new file mode 100644
index 00000000..65f7af88
--- /dev/null
+++ b/data/scripts/gUnk_08013ECC.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08013ECC
+StartScript 
+_0807EF80 0x0007
+Call sub_0807F180
+SetEntityPositionRelative 0x01680120
+_0807E930 0x0005
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013EE8.inc b/data/scripts/gUnk_08013EE8.inc
new file mode 100644
index 00000000..6d498b41
--- /dev/null
+++ b/data/scripts/gUnk_08013EE8.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08013EE8
+StartScript 
+_0807EF80 0x0007
+Call sub_0807F180
+SetEntityPositionRelative 0x016800b0
+_0807E930 0x0007
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013F04.inc b/data/scripts/gUnk_08013F04.inc
new file mode 100644
index 00000000..e6b22c50
--- /dev/null
+++ b/data/scripts/gUnk_08013F04.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_08013F04
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0008
+StopScript 
+WaitForSomething2 0x00000080
+_0807E930 0x000b
+Call sub_0807F2D4
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013F34.inc b/data/scripts/gUnk_08013F34.inc
new file mode 100644
index 00000000..804fb892
--- /dev/null
+++ b/data/scripts/gUnk_08013F34.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_08013F34
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0009
+StopScript 
+WaitForSomething2 0x00000080
+_0807E930 0x000c
+Call sub_0807F2D4
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013F64.inc b/data/scripts/gUnk_08013F64.inc
new file mode 100644
index 00000000..64131a9a
--- /dev/null
+++ b/data/scripts/gUnk_08013F64.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_08013F64
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x000a
+StopScript 
+WaitForSomething2 0x00000080
+_0807E930 0x000d
+Call sub_0807F2D4
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013F94.inc b/data/scripts/gUnk_08013F94.inc
new file mode 100644
index 00000000..edfefdb8
--- /dev/null
+++ b/data/scripts/gUnk_08013F94.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08013F94
+StartScript 
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x007d
+JumpIf 0x003e
+StopScript 
+StartScript 
+CheckInventory1 0x0003
+JumpIfNot 0xfff6
+CheckPlayerFlags 0x00400000
+JumpIfNot 0xffec
+StopScript 
+Call sub_0807FA40
+_0807E888 
+Call sub_0807DF38
+Wait 0x0078
+_0807EB28 0x1505
+_0807EA94 
+SetLocalFlag 0x007d
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc
new file mode 100644
index 00000000..a62e8d4e
--- /dev/null
+++ b/data/scripts/gUnk_08013FE8.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_08013FE8
+StartScript 
+_0807EF80 0x0008
+StopScript 
+StopScript 
+StartScript 
+CheckLocalFlag 0x007d
+JumpIf 0x0052
+CheckLocalFlag 0x007a
+JumpIfNot 0xffee
+CheckInventory1 0x0003
+JumpIfNot 0xffe6
+CallWithArg sub_0807F6B4, 0x000000d0
+JumpIfNot 0xffd8
+StopScript 
+Call sub_0807F9A4
+StartScript 
+_0807E864 
+Call sub_0807DF28
+StopScript 
+_0807EB28 0x1508
+_0807EA94 
+StartPlayerScript 0x08010a14
+WaitForSomething2 0x00000001
+Call sub_0807DF50
+_0807E878 
+Jump 0xffa6
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014054.inc b/data/scripts/gUnk_08014054.inc
new file mode 100644
index 00000000..134e969b
--- /dev/null
+++ b/data/scripts/gUnk_08014054.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08014054
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0000
+Call sub_0807F738
+StopScript 
+WaitForSomething 0x00000040
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014074.inc b/data/scripts/gUnk_08014074.inc
new file mode 100644
index 00000000..a7b8f9ff
--- /dev/null
+++ b/data/scripts/gUnk_08014074.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08014074
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0001
+Call sub_0807F738
+StopScript 
+WaitForSomething 0x00000040
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014094.inc b/data/scripts/gUnk_08014094.inc
new file mode 100644
index 00000000..7be32608
--- /dev/null
+++ b/data/scripts/gUnk_08014094.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_08014094
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0002
+Call sub_0807F738
+SetEntityPosition 0x0000, 0xfff0
+StopScript 
+WaitForSomething 0x00000040
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0401
+.short 0x0879
+.short 0x0007
+.short 0x0850
+.short 0x0003
+.short 0x0c0b
+.short 0xf739
+.short 0x0807
+.short 0x0c6a
+.short 0x0000
+.short 0xfff0
+.short 0x0402
+.short 0x0c32
+.short 0x0040
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_080140DC.inc b/data/scripts/gUnk_080140DC.inc
new file mode 100644
index 00000000..0bd5c4b8
--- /dev/null
+++ b/data/scripts/gUnk_080140DC.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080140DC
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0004
+StopScript 
+WaitForSomething2 0x00000200
+_0807E930 0x0008
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
diff --git a/data/scripts/gUnk_080140F8.inc b/data/scripts/gUnk_080140F8.inc
new file mode 100644
index 00000000..213a346a
--- /dev/null
+++ b/data/scripts/gUnk_080140F8.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_080140F8
+_0807E930 0x000c
+_0807E5F8 0x00002000
+WaitForSomething 0x00000020
+_0807E930 0x0010
+Call sub_0807F2D4
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014118.inc b/data/scripts/gUnk_08014118.inc
new file mode 100644
index 00000000..5891b34f
--- /dev/null
+++ b/data/scripts/gUnk_08014118.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08014118
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0005
+StopScript 
+WaitForSomething2 0x00000400
+_0807E930 0x0009
+Call sub_0807F2D4
+_0807E930 0x000d
+_0807E5F8 0x00004000
+WaitForSomething 0x00000020
+_0807E930 0x0011
+Call sub_0807F2D4
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014154.inc b/data/scripts/gUnk_08014154.inc
new file mode 100644
index 00000000..ba68aa29
--- /dev/null
+++ b/data/scripts/gUnk_08014154.inc
@@ -0,0 +1,51 @@
+SCRIPT_START gUnk_08014154
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0006
+SetEntityPosition 0x0000, 0xfff0
+StopScript 
+WaitForSomething2 0x00000800
+_0807E930 0x000a
+Call sub_0807F2D4
+_0807E930 0x000e
+_0807E5F8 0x00008000
+WaitForSomething 0x00000020
+_0807E930 0x0012
+Call sub_0807F2D4
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0879
+.short 0x0007
+.short 0x0850
+.short 0x0007
+.short 0x0c6a
+.short 0x0000
+.short 0xfff0
+.short 0x0402
+.short 0x0c33
+.short 0x1000
+.short 0x0000
+.short 0x0850
+.short 0x000b
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0850
+.short 0x000f
+.short 0x0c28
+.short 0x0000
+.short 0x0001
+.short 0x0c32
+.short 0x0020
+.short 0x0000
+.short 0x0850
+.short 0x0013
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc
new file mode 100644
index 00000000..cc06dc39
--- /dev/null
+++ b/data/scripts/gUnk_080141DC.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_080141DC
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0014
+Call sub_0807F714
+CallWithArg sub_0807F994, 0x0000fffc
+StopScript 
+WaitForSomething 0x00000020
+Wait 0x0078
+Call sub_0807F2D4
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc
new file mode 100644
index 00000000..60f7eb8a
--- /dev/null
+++ b/data/scripts/gUnk_08014210.inc
@@ -0,0 +1,35 @@
+SCRIPT_START gUnk_08014210
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0015
+Call sub_0807F714
+Call sub_0807F714
+CallWithArg sub_0807F994, 0x0000fffc
+StopScript 
+WaitForSomething 0x00000020
+Wait 0x0078
+Call sub_0807F2D4
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0c0e
+.short 0x0000
+.short 0x0002
+.short 0x0804
+.short 0x0014
+.short 0x0831
+.short 0x0008
+.short 0x140c
+.short 0x5ead
+.short 0x0809
+.short 0x0000
+.short 0x0000
+.short 0x0803
+.short 0xffe6
+.short 0x140c
+.short 0x5ead
+.short 0x0809
+.short 0x0001
+.short 0x0000
+.short 0x0803
+.short 0xfff4
+.short 0x0000
diff --git a/data/scripts/gUnk_08014274.inc b/data/scripts/gUnk_08014274.inc
new file mode 100644
index 00000000..ccc724fd
--- /dev/null
+++ b/data/scripts/gUnk_08014274.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08014274
+StartScript 
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x0078
+JumpIfNot 0xfffa
+StartScript 
+Call sub_0807F934
+CallWithArg sub_0806DA04, 0x00000008
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+TextboxNoOverlapFollowPos 0x0647, 0x000c
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_080142B0.inc
new file mode 100644
index 00000000..934901e7
--- /dev/null
+++ b/data/scripts/gUnk_080142B0.inc
@@ -0,0 +1,60 @@
+SCRIPT_START gUnk_080142B0
+StartScript 
+CheckLocalFlag 0x0054
+JumpIf 0x00ca
+CheckLocalFlag 0x0053
+JumpIf 0x0070
+StopScript 
+StopScript 
+StartScript 
+_0807E564 
+JumpIfNot 0xfff8
+CheckPlayerInRegion 0x0098, 0x0058, 0x1818
+JumpIfNot 0xffec
+StopScript 
+_0807E864 
+SetLocalFlag 0x0053
+Wait 0x0014
+_0807E908 0x0004
+Call sub_080654DC
+Wait 0x001e
+_0807E930 0x0001
+Wait 0x000a
+_0807E930 0x0003
+Wait 0x000a
+_0807E930 0x0001
+Wait 0x000a
+_0807E930 0x0003
+Wait 0x000a
+_0807E930 0x0002
+Wait 0x001e
+TextboxNoOverlap 0x2c12
+_0807EA94 
+Wait 0x0014
+_0807E930 0x0004
+_0807E878 
+_0807E908 0x0001
+StopScript 
+StartScript 
+_0807E564 
+JumpIf 0xfff8
+EntityHasHeight 
+JumpIf 0xfff2
+CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
+JumpIfNot 0xffe6
+StopScript 
+_0807E864 
+SetLocalFlag 0x0054
+Wait 0x005a
+_0807E908 0x0004
+Call sub_080654EC
+Wait 0x001e
+_0807E930 0x0001
+Wait 0x001e
+TextboxNoOverlap 0x2c13
+_0807EA94 
+Wait 0x0014
+_0807E930 0x0004
+_0807E908 0x0001
+_0807E878 
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014384.inc b/data/scripts/gUnk_08014384.inc
new file mode 100644
index 00000000..731675ae
--- /dev/null
+++ b/data/scripts/gUnk_08014384.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_08014384
+StopScript 
+_0807E864 
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x001e
+Wait 0x001e
+Call sub_08065370
+JumpIfNot 0x0010
+Wait 0x003c
+_0807EA94 
+_0807EB8C 
+Wait 0x001e
+TextboxNoOverlapVar 
+_0807EA94 
+Wait 0x001e
+_0807E930 0x0004
+_0807E908 0x0001
+_0807E878 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080143C0.inc b/data/scripts/gUnk_080143C0.inc
new file mode 100644
index 00000000..ecee7e48
--- /dev/null
+++ b/data/scripts/gUnk_080143C0.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_080143C0
+StopScript 
+_0807E864 
+Call sub_0807DF28
+Call sub_080654FC
+_0807E930 0x0001
+Call sub_080654EC
+Wait 0x003c
+TextboxNoOverlap 0x2c16
+_0807EA94 
+_0807E3E8 
+JumpIf 0x0012
+_0807E914 0x00000002
+Call sub_08065528
+Jump 0x0046
+Call sub_080654EC
+.short 0x0831
diff --git a/data/scripts/gUnk_08014402.inc b/data/scripts/gUnk_08014402.inc
new file mode 100644
index 00000000..bd738b1a
--- /dev/null
+++ b/data/scripts/gUnk_08014402.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_08014402
+.short 0x001e
+.short 0x085b
+.short 0x2c18
+.short 0x0459
+.short 0x0831
+.short 0x000a
+.short 0x0c4e
+.short 0x0000
+.short 0x0000
+.short 0x0c0b
+.short 0x5529
+.short 0x0806
+.short 0x0882
+.short 0x0036
+.short 0x0434
+.short 0x085b
+.short 0x2c19
+.short 0x0459
+.short 0x0c4e
+.short 0x0303
+.short 0x0000
+.short 0x0c0b
+.short 0xf421
+.short 0x0807
+.short 0x0831
+.short 0x001e
+.short 0x0464
+.short 0x085b
+.short 0x2c22
+.short 0x0459
+.short 0x0850
+.short 0x0004
+.short 0x084d
+.short 0x0001
+.short 0x0c0b
+.short 0xdf51
+.short 0x0807
+.short 0x0444
+.short 0xffff
diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc
new file mode 100644
index 00000000..1f36e998
--- /dev/null
+++ b/data/scripts/gUnk_08014450.inc
@@ -0,0 +1,74 @@
+SCRIPT_START gUnk_08014450
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+SetEntityNonPlanarMovement 0x01c0
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E930 0x0008
+Wait 0x0020
+_0807E930 0x0002
+TextboxNoOverlapFollow 0x4202
+TextboxNoOverlapFollow 0x4203
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x006c
+_0807EF80 0x0001
+Wait 0x008c
+_0807EF80 0x0000
+HasRupees 0x000a
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x4204
+Jump 0x005c
+Call sub_0806E250
+JumpIfNot 0x000e
+TextboxNoOverlapFollow 0x420b
+_0807EB38 
+.short 0x0c06
+.short 0x0004
+.short 0x000a
+.short 0x082c
+.short 0x0093
+.short 0x0803
+.short 0x000a
+.short 0x082a
+.short 0x0093
+.short 0x082a
+.short 0x00d3
+.short 0x087f
+.short 0xfff6
+.short 0x085a
+.short 0x420c
+.short 0x087b
+.short 0x010c
+.short 0x0831
+.short 0x0018
+.short 0x082f
+.short 0x0000
+.short 0x082a
+.short 0x0092
+.short 0x0c77
+.short 0x0000
+.short 0xffa0
+.short 0x0c0b
+.short 0xdf39
+.short 0x0807
+.short 0x0803
+.short 0x000e
+.short 0x0850
+.short 0x0009
+.short 0x0831
+.short 0x003c
+.short 0x0850
+.short 0x0002
+.short 0x0444
+.short 0x0815
+.short 0x0000
+.short 0x0805
+.short 0xff5e
+.short 0x0454
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_0801450C.inc b/data/scripts/gUnk_0801450C.inc
new file mode 100644
index 00000000..13f1cc79
--- /dev/null
+++ b/data/scripts/gUnk_0801450C.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0801450C
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+SetEntityNonPlanarMovement 0x01c0
+_0807EF80 0x000a
+StopScript 
+_0807E864 
+Call sub_0807DF28
+Call sub_0806E20C
+_0807EA94 
+Call sub_0806E23C
+ClearLocalFlag 0x0093
+ClearLocalFlag 0x0092
+Call sub_0807DF50
+Jump 0xffb8
+.short 0x0000
diff --git a/data/scripts/gUnk_08014548.inc b/data/scripts/gUnk_08014548.inc
new file mode 100644
index 00000000..7b59ad10
--- /dev/null
+++ b/data/scripts/gUnk_08014548.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_08014548
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x0078, 0x0088, 0x0810
+JumpIfNot 0xfff6
+CheckRoomFlag 0x0000
+JumpIfNot 0xffee
+_0807E864 
+_0807EB28 0x4217
+_0807EA94 
+StartPlayerScript 0x08014588
+Wait 0x0010
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E878 
+Jump 0xffca
+SCRIPT_END
+.short 0x0000
+.short 0x0402
+.short 0x0c33
+.short 0x0001
+.short 0x0000
+.short 0x0867
+.short 0x00e0
+.short 0x0c73
+.short 0x0078
+.short 0x0078
+.short 0x0879
+.short 0x0000
+.short 0x0831
diff --git a/data/scripts/gUnk_080145A0.inc b/data/scripts/gUnk_080145A0.inc
new file mode 100644
index 00000000..c5e52a05
--- /dev/null
+++ b/data/scripts/gUnk_080145A0.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_080145A0
+.short 0x0010
+.short 0x0c28
+.short 0x0002
+.short 0x0000
+.short 0x0c0b
+.short 0x921d
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc
new file mode 100644
index 00000000..38db9194
--- /dev/null
+++ b/data/scripts/gUnk_080145B0.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_080145B0
+StartScript 
+SetEntityPositionRelative 0x00e001f8
+CheckLocalFlag 0x005e
+JumpIf 0x0026
+StopScript 
+CheckRoomFlag 0x0005
+JumpIfNot 0xfffa
+_0807E864 
+ClearRoomFlag 0x0005
+Wait 0x000c
+_0807EB8C 
+TextboxNoOverlapFollowPos 0x432e, 0x000c
+_0807EA94 
+_0807E878 
+Jump 0xffe0
+StopScript 
+SCRIPT_END
diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc
new file mode 100644
index 00000000..f6bd23b8
--- /dev/null
+++ b/data/scripts/gUnk_080145E8.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_080145E8
+StartScript 
+_0807EF80 0x0008
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Call sub_0807DF28
+CheckRoomFlag 0x0004
+JumpIf 0xfffa
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+Call sub_0807DF50
+_0807E878 
+.short 0x0803
+.short 0xffd2
diff --git a/data/scripts/gUnk_08014628.inc b/data/scripts/gUnk_08014628.inc
new file mode 100644
index 00000000..11caa14c
--- /dev/null
+++ b/data/scripts/gUnk_08014628.inc
@@ -0,0 +1,131 @@
+SCRIPT_START gUnk_08014628
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+SetEntityDirection 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIf 0x0062
+TestBit 0x00000004
+JumpIf 0x0132
+CheckRoomFlag 0x0004
+JumpIf 0x0022
+Call sub_0808861C
+JumpIfNot 0xffe0
+CheckLocalFlag 0x005e
+JumpIf 0x003e
+_0807E864 
+_0807EB8C 
+TextboxNoOverlapFollowPos 0x432b, 0x000c
+Jump 0x015e
+Call sub_08088658
+JumpIfNot 0xffc0
+_0807E864 
+_0807EB28 0x431f
+_0807EA94 
+StartPlayerScript 0x080147dc
+Wait 0x0010
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807E878 
+Jump 0xff9c
+_0807E864 
+_0807E930 0x0008
+Wait 0x0010
+_0807EB8C 
+Wait 0x0010
+_0807E930 0x0002
+CheckGlobalFlag 0x0059
+JumpIfNot 0x000c
+TextboxNoOverlapFollowPos 0x432f, 0x000c
+Jump 0x010a
+CheckRoomFlag 0x0004
+JumpIf 0x0028
+CheckLocalFlag 0x005e
+JumpIfNot 0x002a
+CheckRoomFlag 0x0006
+JumpIf 0x0052
+CheckLocalFlag 0x005f
+JumpIf 0x003c
+Call sub_08088574
+SetRoomFlag 0x0009
+Jump 0x004a
+TextboxNoOverlapFollowPos 0x431e, 0x000c
+Jump 0x00d2
+SetRoomFlag 0x0009
+SetLocalFlag 0x005c
+TextboxNoOverlapFollowPos 0x4305, 0x000c
+_0807EA94 
+_0807E3BC 0x0001
+JumpIfNot 0x00b0
+TextboxNoOverlapFollowPos 0x4306, 0x000c
+Jump 0x001e
+SetRoomFlag 0x0009
+Call sub_08088504
+Jump 0x0010
+SetRoomFlag 0x0009
+ClearRoomFlag 0x0006
+Call sub_08088544
+_0807E3E8 
+JumpIfNot 0x0030
+_0807EA94 
+_0807E3BC 0x0001
+JumpIfNot 0x007a
+SetRoomFlag 0x0001
+Wait 0x0014
+CheckRoomFlag 0x0003
+JumpIfNot 0xfffa
+ClearRoomFlag 0x0003
+_0807EA94 
+SetRoomFlag 0x0004
+TextboxNoOverlapFollowPos 0x431e, 0x000c
+Jump 0x0060
+SetRoomFlag 0x0009
+_0807EA94 
+Jump 0x0056
+CheckRoomFlag 0x0008
+JumpIf 0x0034
+CheckRoomFlag 0x0007
+JumpIf 0x001c
+Call sub_08088478
+_0807EA94 
+Call sub_080885B0
+WaitPlayerAction8 
+_0807E5F8 0x00000008
+Jump 0x002c
+_0807E930 0x0009
+Wait 0x003c
+_0807E930 0x0002
+Jump 0xffd8
+_0807E930 0x000a
+Wait 0x008c
+_0807E930 0x0002
+Jump 0xffc8
+SetRoomFlag 0x0009
+TextboxNoOverlapFollowPos 0x4307, 0x000c
+_0807EA94 
+Wait 0x0004
+_0807E878 
+Jump 0xfe62
+.short 0x0000
+.short 0x0402
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0867
+.short 0x00e0
+.short 0x0c73
+.short 0x0078
+.short 0x0068
+.short 0x0879
+.short 0x0000
+.short 0x0831
+.short 0x0010
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x921d
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc
new file mode 100644
index 00000000..85a06e5b
--- /dev/null
+++ b/data/scripts/gUnk_08014804.inc
@@ -0,0 +1,60 @@
+SCRIPT_START gUnk_08014804
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E864 
+Call sub_0807DF38
+Wait 0x0010
+CheckLocalFlag 0x0093
+JumpIf 0x0092
+TextboxNoOverlapFollowPos 0x4215, 0x000c
+_0807E878 
+TestBit 0x00000001
+JumpIf 0x002c
+TestBit 0x00000004
+JumpIf 0x0038
+_0807E30C 
+JumpIfNot 0xffe8
+_0807E864 
+_0807E930 0x0008
+Wait 0x0020
+_0807E930 0x0002
+TextboxNoOverlapFollowPos 0x4215, 0x000c
+_0807E878 
+Jump 0xffce
+_0807E930 0x0008
+Wait 0x0020
+_0807E930 0x0002
+_0807E5F8 0x00000002
+Jump 0xffb8
+_0807E930 0x0009
+Wait 0x003c
+_0807E930 0x0002
+_0807E5F8 0x00000008
+Jump 0xffa2
+TestBit 0x00000001
+JumpIf 0x002c
+TestBit 0x00000004
+JumpIf 0x0038
+_0807E30C 
+JumpIfNot 0xffe8
+_0807E864 
+_0807E930 0x0008
+Wait 0x0020
+_0807E930 0x0002
+TextboxNoOverlapFollowPos 0x4216, 0x000c
+_0807E878 
+Jump 0xffce
+_0807E930 0x0008
+Wait 0x0020
+_0807E930 0x0002
+_0807E5F8 0x00000002
+Jump 0xffb8
+_0807E930 0x0009
+Wait 0x003c
+_0807E930 0x0002
+_0807E5F8 0x00000008
+Jump 0xffa2
+.short 0x0000
diff --git a/data/scripts/gUnk_080148F0.inc b/data/scripts/gUnk_080148F0.inc
new file mode 100644
index 00000000..b2e71487
--- /dev/null
+++ b/data/scripts/gUnk_080148F0.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_080148F0
+StartScript 
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+ClearRoomFlag 0x0000
+Call sub_0806E140
+JumpIfNot 0x002a
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0028
+_0807E864 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Call sub_0806E1E0
+_0807EA94 
+Wait 0x0018
+_0807E878 
+Jump 0xffc4
+_0807EA94 
+Jump 0x0002
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+Call sub_0806E1FC
+Wait 0x001e
+Call sub_0807DF50
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014958.inc b/data/scripts/gUnk_08014958.inc
new file mode 100644
index 00000000..adb2d017
--- /dev/null
+++ b/data/scripts/gUnk_08014958.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08014958
+StartScript 
+Call sub_0806C870
+_0807EF80 0x000a
+CheckGlobalFlag 0x0058
+JumpIf 0x000c
+_0807EB44 0x0004
+SetEntityPositionRelative 0x01280078
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffe6
diff --git a/data/scripts/gUnk_08014994.inc b/data/scripts/gUnk_08014994.inc
new file mode 100644
index 00000000..17b45756
--- /dev/null
+++ b/data/scripts/gUnk_08014994.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08014994
+StartScript 
+Call sub_0806C870
+_0807EF80 0x000a
+CheckGlobalFlag 0x0058
+JumpIfNot 0x0020
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc
new file mode 100644
index 00000000..7751e519
--- /dev/null
+++ b/data/scripts/gUnk_080149CC.inc
@@ -0,0 +1,27 @@
+SCRIPT_START gUnk_080149CC
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806C870
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+CheckLocalFlag 0x0064
+JumpIfNot 0x002a
+CheckLocalFlag 0x00b1
+JumpIf 0x0022
+SetLocalFlag 0x00b1
+_0807EF80 0x000b
+_0807EF80 0x0001
+_0807EDD4 0x0068, 0x00f8
+SoundReq 0x0072
+_0807EB74 
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E878 
+Jump 0xffba
+.short 0x0000
diff --git a/data/scripts/gUnk_08014A28.inc b/data/scripts/gUnk_08014A28.inc
new file mode 100644
index 00000000..7788423f
--- /dev/null
+++ b/data/scripts/gUnk_08014A28.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08014A28
+StartScript 
+Call sub_0806C870
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
diff --git a/data/scripts/gUnk_08014A54.inc b/data/scripts/gUnk_08014A54.inc
new file mode 100644
index 00000000..c9ff8985
--- /dev/null
+++ b/data/scripts/gUnk_08014A54.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_08014A54
+StartScript 
+Call sub_0806C870
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc
new file mode 100644
index 00000000..49eabcbb
--- /dev/null
+++ b/data/scripts/gUnk_08014A80.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_08014A80
+StartScript 
+_0807EF80 0x000a
+StopScript 
+WaitForSomething2 0x00000001
+_0807EB74 
+_0807EF80 0x0004
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+TextboxNoOverlap 0x2f0a
+_0807EA94 
+_0807E5F8 0x00000002
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2f0a
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
diff --git a/data/scripts/gUnk_08014AC4.inc b/data/scripts/gUnk_08014AC4.inc
new file mode 100644
index 00000000..76c5fb81
--- /dev/null
+++ b/data/scripts/gUnk_08014AC4.inc
@@ -0,0 +1,41 @@
+SCRIPT_START gUnk_08014AC4
+StartScript 
+Call sub_0806C870
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+StartPlayerScript 0x08014b10
+WaitForSomething2 0x00000001
+_0807EB74 
+CheckLocalFlag 0x0064
+JumpIf 0x000e
+SetLocalFlag 0x0064
+TextboxNoOverlap 0x2f0b
+Jump 0x0006
+TextboxNoOverlap 0x2f0c
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffc6
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0c73
+.short 0x0078
+.short 0x0040
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08014B34.inc b/data/scripts/gUnk_08014B34.inc
new file mode 100644
index 00000000..10da7252
--- /dev/null
+++ b/data/scripts/gUnk_08014B34.inc
@@ -0,0 +1,66 @@
+SCRIPT_START gUnk_08014B34
+StartScript 
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+CheckLocalFlag 0x0063
+JumpIf 0x00a2
+StopScript 
+StartScript 
+CheckRoomFlag 0x0000
+JumpIf 0x001e
+CheckEntityInteractType 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2f01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffda
+StopScript 
+_0807E864 
+Call sub_0807DF28
+_0807E5F8 0x00000001
+_0807EF80 0x0004
+WaitForSomething2 0x00000002
+_0807E930 0x0010
+Call sub_0806CCF8
+Wait 0x0014
+Call sub_0806CD04
+Wait 0x0014
+Call sub_0806CD14
+Wait 0x0014
+Call sub_0806CD20
+Wait 0x0014
+Call sub_0806CD30
+Wait 0x0014
+Call sub_0806CD3C
+Wait 0x0014
+Call sub_0806CD4C
+SoundReq 0x0072
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Call sub_0807DF50
+_0807E878 
+_0807E930 0x0010
+Call sub_0806CD4C
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+CheckLocalFlag 0x0065
+JumpIf 0x001c
+SetLocalFlag 0x0065
+TextboxNoOverlap 0x2f07
+_0807EA94 
+_0807E914 0x00000064
+_0807F034 0x003f
+WaitPlayerAction8 
+Jump 0x0008
+TextboxNoOverlap 0x2f08
+_0807EA94 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xffc8
diff --git a/data/scripts/gUnk_08014C2C.inc b/data/scripts/gUnk_08014C2C.inc
new file mode 100644
index 00000000..4380341b
--- /dev/null
+++ b/data/scripts/gUnk_08014C2C.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_08014C2C
+StartScript 
+Call sub_0806CD58
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0006
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_0806CCD0
+JumpIfNot 0xfff8
+Call sub_0806CCB4
+JumpIfNot 0xfff8
+CheckLocalFlag 0x0066
+JumpIf 0x0016
+SetLocalFlag 0x0066
+TextboxNoOverlap 0x2f0d
+_0807EA94 
+_0807F034 0x000a
+WaitPlayerAction8 
+Jump 0x0008
+TextboxNoOverlap 0x2f09
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EB44 0x0004
+_0807E930 0x0006
+.short 0x0803
+.short 0xffb0
diff --git a/data/scripts/gUnk_08014C94.inc b/data/scripts/gUnk_08014C94.inc
new file mode 100644
index 00000000..c6b8ee0e
--- /dev/null
+++ b/data/scripts/gUnk_08014C94.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_08014C94
+StartScript 
+CheckGlobalFlag 0x0024
+JumpIf 0x0038
+Call sub_0806C870
+_0807EF80 0x000a
+_0807EF80 0x0000
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x0024
+JumpIf 0x001c
+_0807E30C 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+_0807EB74 
+Call sub_0806C90C
+_0807EA94 
+_0807E878 
+Jump 0xffdc
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc
new file mode 100644
index 00000000..e63a836a
--- /dev/null
+++ b/data/scripts/gUnk_08014CDC.inc
@@ -0,0 +1,57 @@
+SCRIPT_START gUnk_08014CDC
+StartScript 
+SetEntityNonPlanarMovement 0x0180
+_0807EF80 0x000a
+Call sub_08066D04
+Call sub_08066D14
+SetEntityPositionRelative 0x018001e8
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000001
+Call sub_08066E08
+_0807E864 
+TextboxNoOverlapFollowPos 0x1010, 0x000c
+_0807EA94 
+_0807E5F8 0x00000002
+StopScript 
+StartScript 
+CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+TextboxNoOverlap 0x1012
+_0807EA94 
+_0807EC64 0x0040
+_0807EB44 0x0004
+Call sub_08066E08
+SetEntityPositionRelative 0x00c801f8
+Call sub_0807DF50
+_0807E878 
+CallWithArg sub_0807F6B4, 0x000000e8
+JumpIf 0xfff4
+_0807E864 
+Call sub_0807DF28
+TextboxNoOverlap 0x1013
+_0807EA94 
+_0807EC64 0x0040
+_0807EB44 0x0004
+_0807EF80 0x0000
+SetEntityPositionRelative 0x002801e8
+Call sub_0807DF50
+_0807E878 
+CheckPlayerInRegion 0x01f8, 0x0028, 0x2040
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+TextboxNoOverlap 0x1014
+_0807EA94 
+_0807EC64 0x0018
+SetLocalFlag 0x006d
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014DCC.inc b/data/scripts/gUnk_08014DCC.inc
new file mode 100644
index 00000000..48f3362c
--- /dev/null
+++ b/data/scripts/gUnk_08014DCC.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_08014DCC
+StartScript 
+SetEntityPositionRelative 0x01a80238
+Call sub_0807F844
+Call sub_0807F348
+_0807E864 
+Call sub_0807DF28
+StopScript 
+_0807E778 0x0010
+DoFade6 
+WaitFor_2 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc
new file mode 100644
index 00000000..9efdb9d3
--- /dev/null
+++ b/data/scripts/gUnk_08014E14.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08014E14
+StartScript 
+_0807EB44 0x0004
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg sub_0807F3D8, 0x00000000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg sub_0807F3D8, 0x00000000
+Call sub_08064428
+_0807EA94 
+_0807E878 
+Jump 0xffe0
+.short 0x0000
diff --git a/data/scripts/gUnk_08014E50.inc b/data/scripts/gUnk_08014E50.inc
new file mode 100644
index 00000000..609c7029
--- /dev/null
+++ b/data/scripts/gUnk_08014E50.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_08014E50
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+_0807EB74 
+CallWithArg sub_0807F78C, 0x00000022
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0038
+CallWithArg sub_0807F7C4, 0x00000022
+JumpIfNot 0x001e
+_0807E48C 0x0020
+JumpIfNot 0x001e
+CallWithArg sub_0807F800, 0x00000022
+WaitPlayerAction8 
+TextboxNoOverlap 0x0a04
+Jump 0x000e
+TextboxNoOverlap 0x0a03
+Jump 0x0006
+TextboxNoOverlap 0x0a02
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+Jump 0xff9c
+.short 0x0000
diff --git a/data/scripts/gUnk_08014ECC.inc b/data/scripts/gUnk_08014ECC.inc
new file mode 100644
index 00000000..d1fddf30
--- /dev/null
+++ b/data/scripts/gUnk_08014ECC.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08014ECC
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x200d
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
diff --git a/data/scripts/gUnk_08014EF8.inc b/data/scripts/gUnk_08014EF8.inc
new file mode 100644
index 00000000..03b74c8d
--- /dev/null
+++ b/data/scripts/gUnk_08014EF8.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08014EF8
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x200e
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807E930 0x000a
+Jump 0xffe0
+.short 0x0000
diff --git a/data/scripts/gUnk_08014F30.inc b/data/scripts/gUnk_08014F30.inc
new file mode 100644
index 00000000..58905710
--- /dev/null
+++ b/data/scripts/gUnk_08014F30.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_08014F30
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x000e
+StopScript 
+Call sub_08065914
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+_0807EB74 
+_0807EF80 0x0000
+StartScript 
+TextboxNoOverlap 0x3b0b
+CallWithArg sub_0807F854, 0x00010064
+StopScript 
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0030
+HasRupees 0x0064
+JumpIfNot 0x001c
+_0807E48C 0x0020
+JumpIfNot 0x001c
+ModRupees 0xff9c
+_0807F034 0x0022
+WaitPlayerAction8 
+TextboxNoOverlap 0x3b11
+Jump 0x000e
+TextboxNoOverlap 0x3b0e
+Jump 0x0006
+TextboxNoOverlap 0x3b0f
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+_0807EB44 0x0004
+_0807E930 0x000e
+.short 0x0803
+.short 0xff90
diff --git a/data/scripts/gUnk_08014FBC.inc b/data/scripts/gUnk_08014FBC.inc
new file mode 100644
index 00000000..0d4aa108
--- /dev/null
+++ b/data/scripts/gUnk_08014FBC.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08014FBC
+StartScript 
+SetEntityPositionRelative 0x00e001f8
+Call sub_08054564
+StopScript 
+CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+SoundReq0x80100000 
+_0807F0B4 0x0001
+CameraTargetEntity 
+StartPlayerScript 0x080152b4
+WaitForSomething2 0x00000001
+TextboxNoOverlapFollowPos 0x1301, 0x0002
+.byte 0x59
diff --git a/data/scripts/gUnk_08015001.inc b/data/scripts/gUnk_08015001.inc
new file mode 100644
index 00000000..643815df
--- /dev/null
+++ b/data/scripts/gUnk_08015001.inc
@@ -0,0 +1,68 @@
+SCRIPT_START gUnk_08015001
+.short 0x0b04
+.short 0xf90c
+.short 0x07f3
+.short 0x3108
+.short 0x3c08
+.short 0x2800
+.short 0x020c
+.short 0x0000
+.short 0x3300
+.short 0x040c
+.short 0x0000
+.short 0x2800
+.short 0x020c
+.short 0x0000
+.short 0x3300
+.short 0x040c
+.short 0x0000
+.short 0x7c00
+.short 0x0d08
+.short 0x5f00
+.short 0x0208
+.short 0x5913
+.short 0x5c04
+.short 0x030c
+.short 0x0213
+.short 0x5900
+.short 0x5f04
+.short 0x0408
+.short 0x5913
+.short 0x5c04
+.short 0x050c
+.short 0x0213
+.short 0x5900
+.short 0x2804
+.short 0x020c
+.short 0x0000
+.short 0x3300
+.short 0x040c
+.short 0x0000
+.short 0x5f00
+.short 0x0608
+.short 0x5913
+.short 0x7e04
+.short 0x4704
+.short 0xdc0c
+.short 0x0152
+.short 0x8708
+.short 0x8904
+.short 0x0308
+.short 0x6900
+.short 0xf80c
+.short 0x4801
+.short 0x3301
+.short 0x010c
+.short 0x0000
+.short 0x0b00
+.short 0xa90c
+.short 0x04f6
+.short 0x3108
+.short 0x0408
+.short 0x0b00
+.short 0x090c
+.short 0x04f8
+.short 0x7b08
+.short 0x0b08
+.short 0x4701
+.short 0x040c
diff --git a/data/scripts/gUnk_08015087.inc b/data/scripts/gUnk_08015087.inc
new file mode 100644
index 00000000..7579da65
--- /dev/null
+++ b/data/scripts/gUnk_08015087.inc
@@ -0,0 +1,53 @@
+SCRIPT_START gUnk_08015087
+.short 0x0153
+.short 0x0b08
+.short 0xc90c
+.short 0x04f6
+.short 0x3108
+.short 0x0408
+.short 0x0b00
+.short 0x310c
+.short 0x04f8
+.short 0x7b08
+.short 0x0b08
+.short 0x0b01
+.short 0xe90c
+.short 0x04f6
+.short 0x3108
+.short 0x0408
+.short 0x0b00
+.short 0x550c
+.short 0x04f8
+.short 0x7b08
+.short 0x0b08
+.short 0x0b01
+.short 0x250c
+.short 0x04f7
+.short 0x3108
+.short 0x0408
+.short 0x0b00
+.short 0x9d0c
+.short 0x04f8
+.short 0x7b08
+.short 0x0b08
+.short 0x0b01
+.short 0x610c
+.short 0x04f7
+.short 0x3108
+.short 0x0408
+.short 0x0b00
+.short 0xe10c
+.short 0x04f8
+.short 0x7b08
+.short 0x0b08
+.short 0x3101
+.short 0x3c08
+.short 0x3300
+.short 0x010c
+.short 0x0000
+.short 0x7b00
+.short 0xb008
+.short 0x0b01
+.short 0x9d0c
+.short 0x04f7
+.short 0x3108
diff --git a/data/scripts/gUnk_080150EF.inc b/data/scripts/gUnk_080150EF.inc
new file mode 100644
index 00000000..4744ec01
--- /dev/null
+++ b/data/scripts/gUnk_080150EF.inc
@@ -0,0 +1,326 @@
+SCRIPT_START gUnk_080150EF
+.byte 0x8
+.byte 0xa
+.byte 0x0
+.byte 0xd
+.byte 0xc
+.byte 0xc0
+.byte 0x7f
+.byte 0xf
+.byte 0x8
+.byte 0x7c
+.byte 0x8
+.byte 0x2d
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x15
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x5
+.byte 0x8
+.byte 0xfa
+.byte 0xff
+.byte 0x43
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0xa5
+.byte 0xf9
+.byte 0x7
+.byte 0x8
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x7e
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0x38
+.byte 0x53
+.byte 0x1
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xa9
+.byte 0xf6
+.byte 0x4
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x29
+.byte 0xf9
+.byte 0x4
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xb
+.byte 0x1
+.byte 0xb
+.byte 0xc
+.byte 0xc9
+.byte 0xf6
+.byte 0x4
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x45
+.byte 0xf9
+.byte 0x4
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xb
+.byte 0x1
+.byte 0xb
+.byte 0xc
+.byte 0xe9
+.byte 0xf6
+.byte 0x4
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xf9
+.byte 0x4
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xb
+.byte 0x1
+.byte 0xb
+.byte 0xc
+.byte 0x25
+.byte 0xf7
+.byte 0x4
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0x95
+.byte 0xf9
+.byte 0x4
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xb
+.byte 0x1
+.byte 0xb
+.byte 0xc
+.byte 0x61
+.byte 0xf7
+.byte 0x4
+.byte 0x8
+.byte 0x31
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0xb
+.byte 0xc
+.byte 0xc9
+.byte 0xf9
+.byte 0x4
+.byte 0x8
+.byte 0x7b
+.byte 0x8
+.byte 0xb
+.byte 0x1
+.byte 0x31
+.byte 0x8
+.byte 0x3c
+.byte 0x0
+.byte 0x7b
+.byte 0x8
+.byte 0x72
+.byte 0x0
+.byte 0x89
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x88
+.byte 0x4
+.byte 0x2a
+.byte 0x8
+.byte 0x8c
+.byte 0x0
+.byte 0x5f
+.byte 0x8
+.byte 0xc
+.byte 0x13
+.byte 0x59
+.byte 0x4
+.byte 0x88
+.byte 0x4
+.byte 0x38
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x41
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x37
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x3d
+.byte 0x3b
+.byte 0x5
+.byte 0x8
+.byte 0x1
+.byte 0x4
+.byte 0x43
+.byte 0x4
+.byte 0xc
+.byte 0x14
+.byte 0xe9
+.byte 0xf6
+.byte 0x7
+.byte 0x8
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x6b
+.byte 0x4
+.byte 0x89
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x87
+.byte 0x4
+.byte 0x38
+.byte 0x8
+.byte 0x0
+.byte 0x1
+.byte 0x3c
+.byte 0x4
+.byte 0x41
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x2
+.byte 0x4
+.byte 0x47
+.byte 0xc
+.byte 0x60
+.byte 0x53
+.byte 0x1
+.byte 0x8
+.byte 0x33
+.byte 0xc
+.byte 0x1
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0xd
+.byte 0xc
+.byte 0xb0
+.byte 0x7c
+.byte 0xf
+.byte 0x8
+.byte 0x38
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x40
+.byte 0xc
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x37
+.byte 0x4
+.byte 0x28
+.byte 0xc
+.byte 0x8
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x33
+.byte 0xc
+.byte 0x10
+.byte 0x0
+.byte 0x0
+.byte 0x0
+.byte 0x1
+.byte 0x4
+.byte 0x4b
+.byte 0x4
+.byte 0x5f
+.byte 0x8
+.byte 0x15
+.byte 0x13
+.byte 0x2
+.byte 0x4
+.byte 0x59
+.byte 0x4
+.byte 0x89
+.byte 0x8
+.byte 0x4
+.byte 0x0
+.byte 0x88
+.byte 0x4
+.byte 0xb
+.byte 0xc
+.byte 0x71
+.byte 0x45
+.byte 0x5
+.byte 0x8
+.byte 0x7c
+.byte 0x8
+.byte 0xff
+.byte 0xff
+.byte 0xb
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
diff --git a/data/scripts/gUnk_08015234.inc b/data/scripts/gUnk_08015234.inc
new file mode 100644
index 00000000..55a848f6
--- /dev/null
+++ b/data/scripts/gUnk_08015234.inc
@@ -0,0 +1,30 @@
+SCRIPT_START gUnk_08015234
+StartScript 
+_0807EF80 0x0008
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call sub_0807F354
+StopScript 
+WaitForSomething2 0x00000002
+Call sub_08066C94
+Wait 0x00e9
+_0807EF80 0x0007
+_0807EF80 0x001e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+Wait 0x0014
+_0807EB44 0x0000
+_0807EF80 0x001c
+Call sub_0807F2D4
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SoundReq 0x00f5
+_0807EF80 0x001f
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x000d
+_0807EF80 0x0000
+_0807ECC4 0x0030
+_0807E5F8 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080152B4.inc b/data/scripts/gUnk_080152B4.inc
new file mode 100644
index 00000000..57590d03
--- /dev/null
+++ b/data/scripts/gUnk_080152B4.inc
@@ -0,0 +1,101 @@
+SCRIPT_START gUnk_080152B4
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x00b8
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0401
+.short 0x0867
+.short 0x0200
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x01f8
+.short 0x0148
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0861
+.short 0x0002
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0006
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0002
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0006
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0004
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x01f8
+.short 0x0148
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0401
+.short 0x0867
+.short 0x0100
+.short 0x0c69
+.short 0x0208
+.short 0x0148
+.short 0x0402
+.short 0x0861
+.short 0x0006
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0879
+.short 0x0015
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc
new file mode 100644
index 00000000..435c729d
--- /dev/null
+++ b/data/scripts/gUnk_08015390.inc
@@ -0,0 +1,23 @@
+SCRIPT_START gUnk_08015390
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+StopScript 
+_0807E930 0x001f
+Call sub_0806D944
+WaitForSomething2 0x00000008
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1314, 0x000c
+_0807EA94 
+_0807E930 0x0018
+Call sub_0806D8A0
+_0807EE30 
+JumpIfNot 0xfffc
+_0807E930 0x001f
+StartPlayerScript 0x08015384
+Call sub_0806D9A4
+_0807EF80 0x0008
+Wait 0x0078
+_0807E5F8 0x00000010
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc
new file mode 100644
index 00000000..815df56e
--- /dev/null
+++ b/data/scripts/gUnk_080153EC.inc
@@ -0,0 +1,61 @@
+SCRIPT_START gUnk_080153EC
+StartScript 
+_0807F0B4 0x0007
+SetEntityPositionRelative 0x00680078
+CameraTargetEntity 
+StopScript 
+SoundReq2 0x002a
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+Wait 0x003c
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000800
+WaitForSomething2 0x00001000
+_0807E5F8 0x00000880
+WaitForSomething2 0x00001100
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x00900078
+TextboxNoOverlapFollowPos 0x1330, 0x0002
+_0807EA94 
+_0807E5F8 0x00008000
+WaitForSomething2 0x00010000
+_0807E5F8 0x00000880
+WaitForSomething2 0x00001000
+Wait 0x003c
+TextboxNoOverlapFollowPos 0x130d, 0x0002
+_0807EA94 
+TextboxNoOverlapFollowPos 0x130e, 0x000c
+_0807EA94 
+TextboxNoOverlapFollowPos 0x130f, 0x0002
+_0807EA94 
+TextboxNoOverlapFollowPos 0x1310, 0x000c
+_0807EA94 
+CallWithArg sub_0805DDEC, 0x00000001
+_0807F0C8 0xffff, 0x0000
+_0807E5F8 0x00000800
+WaitForSomething2 0x00001000
+SoundReq 0x0125
+CallWithArg sub_0807FB28, 0x00000003
+_0807E5F8 0x00048000
+WaitForSomething2 0x00090000
+TextboxNoOverlapFollowPos 0x1311, 0x0002
+_0807EA94 
+_0807E5F8 0x00008000
+WaitForSomething2 0x00010000
+_0807E5F8 0x00048000
+WaitForSomething2 0x00010000
+CallWithArg sub_0805DE18, 0x00000001
+_0807F0C8 0x0000, 0x0000
+TextboxNoOverlapFollowPos 0x1312, 0x000c
+_0807EA94 
+_0807E5F8 0x00000800
+WaitForSomething2 0x00001000
+SoundReq0x80100000 
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+SetRoomFlag 0x0001
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc
new file mode 100644
index 00000000..2d3718a8
--- /dev/null
+++ b/data/scripts/gUnk_0801550C.inc
@@ -0,0 +1,62 @@
+SCRIPT_START gUnk_0801550C
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EB44 0x0000
+Call sub_0807F338
+StopScript 
+CallWithArg sub_0806AF60, 0x00000000
+WaitForSomething2 0x00008000
+CallWithArg sub_0806AF60, 0x00000004
+_0807EDD4 0x0078, 0x00b8
+_0807EB44 0x0000
+CallWithArg sub_0806AF60, 0x00000000
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807EF80 0x000d
+_0807EB44 0x0000
+CallWithArg sub_0806AF60, 0x00000004
+_0807EDD4 0x0078, 0x00c8
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807EB44 0x0000
+CallWithArg sub_0806AF60, 0x00000000
+_0807EF80 0x0010
+Wait 0x0028
+SoundReq 0x0125
+CallWithArg sub_0807FB28, 0x00000003
+Wait 0x000a
+SoundReq 0x0125
+CallWithArg sub_0807FB28, 0x00000003
+Wait 0x000a
+_0807EF80 0x0010
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807E930 0x000d
+Call sub_0807F2D4
+_0807E5F8 0x00010000
+Wait 0x003c
+_0807EF80 0x0005
+Wait 0x003c
+CheckRoomFlag 0x0001
+JumpIfNot 0xfffa
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0c33
+.short 0x0020
+.short 0x0000
+.short 0x0850
+.short 0x0000
+.short 0x0831
+.short 0x0014
+.short 0x0c28
+.short 0x0040
+.short 0x0000
+.short 0x0815
+.short 0x0001
+.short 0x0805
+.short 0xfffa
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc
new file mode 100644
index 00000000..fa0553ff
--- /dev/null
+++ b/data/scripts/gUnk_08015618.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_08015618
+StartScript 
+_0807EF80 0x0007
+SetEntityNonPlanarMovement 0x0040
+Call sub_08094B80
+StopScript 
+WaitForSomething2 0x00000080
+CallWithArg sub_0805DDEC, 0x00000003
+Call sub_08094B0C
+_0807EDD4 0x0078, 0x0068
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807EF3C 0xff80, 0x0000
+CallWithArg sub_0805DE18, 0x00000003
+Wait 0x003c
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0001
+Call sub_0807F2D4
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc
new file mode 100644
index 00000000..5c1d6312
--- /dev/null
+++ b/data/scripts/gUnk_08015684.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08015684
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807EB44 0x0000
+_0807EF80 0x0017
+Call sub_0807F180
+StopScript 
+.short 0x0c33
diff --git a/data/scripts/gUnk_080156A0.inc b/data/scripts/gUnk_080156A0.inc
new file mode 100644
index 00000000..32d56bef
--- /dev/null
+++ b/data/scripts/gUnk_080156A0.inc
@@ -0,0 +1,91 @@
+SCRIPT_START gUnk_080156A0
+.short 0x0800
+.short 0x0000
+.short 0x0861
+.short 0x0002
+.short 0x0879
+.short 0x0017
+.short 0x0831
+.short 0x000a
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0017
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x001b
+.short 0x0c28
+.short 0x1000
+.short 0x0000
+.short 0x0c33
+.short 0x0800
+.short 0x0000
+.short 0x0831
+.short 0x0078
+.short 0x0879
+.short 0x0004
+.short 0x0831
+.short 0x0014
+.short 0x0c28
+.short 0x1000
+.short 0x0000
+.short 0x0c33
+.short 0x0800
+.short 0x0000
+.short 0x0879
+.short 0x0018
+.short 0x0c0b
+.short 0xf2d5
+.short 0x0807
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x1000
+.short 0x0000
+.short 0x0c33
+.short 0x0800
+.short 0x0000
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0014
+.short 0x140c
+.short 0x545d
+.short 0x0809
+.short 0x5754
+.short 0x0801
+.short 0x087b
+.short 0x01c4
+.short 0x0831
+.short 0x0078
+.short 0x0879
+.short 0x0016
+.short 0x0c33
+.short 0x0000
+.short 0x0002
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x1000
+.short 0x0000
+.short 0x0c33
+.short 0x0800
+.short 0x0000
+.short 0x0c0b
+.short 0x6ca5
+.short 0x0806
+.short 0x0879
+.short 0x0008
+.short 0x0831
+.short 0x0078
+.short 0x0c28
+.short 0x1000
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
diff --git a/data/scripts/gUnk_08015754.inc b/data/scripts/gUnk_08015754.inc
new file mode 100644
index 00000000..8ec9bfa5
--- /dev/null
+++ b/data/scripts/gUnk_08015754.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_08015754
+StartScript 
+_0807E930 0x0000
+SetEntityNonPlanarMovement 0x0200
+Call sub_08094B80
+StopScript 
+Wait 0x0078
+SoundReq 0x01c5
+Call sub_08094B6C
+_0807EDD4 0x0078, 0x00b8
+SoundReq 0x01c6
+Call sub_08094B80
+_0807E5F8 0x00020000
+SetEntityNonPlanarMovement 0x0080
+WaitForSomething2 0x00040000
+_0807EDD4 0x0078, 0x00c8
+_0807E5F8 0x00080000
+WaitForSomething2 0x00040000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc
new file mode 100644
index 00000000..18f90a4e
--- /dev/null
+++ b/data/scripts/gUnk_080157AC.inc
@@ -0,0 +1,70 @@
+SCRIPT_START gUnk_080157AC
+CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Call sub_0807DF50
+_0807E878 
+CheckPlayerInRegion 0x0250, 0x0230, 0x3040
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0807F3F8
+Wait 0x003c
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+StartPlayerScript 0x080158f8
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x02180248
+CameraTargetEntity 
+Call sub_0807F5C0
+WaitForSomething2 0x00000010
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000020
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+StartPlayerScript 0x08015918
+WaitForSomething2 0x00000010
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+TextboxNoOverlapFollowPos 0x1066, 0x0002
+_0807EA94 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Call sub_0807DF50
+_0807E878 
+Call sub_08066F94
+_0807E5F8 0x00000008
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807EA94 
+ComparePlayerAction 0x001c
+JumpIf 0xfff8
+_0807E864 
+Call sub_0807DF28
+_0807F0B4 0x0002
+SetEntityPositionRelative 0x02080248
+CameraTargetEntity 
+StartPlayerScript 0x08015938
+WaitForSomething2 0x00000010
+TextboxNoOverlapFollowPos 0x106a, 0x000c
+_0807EA94 
+_0807E5F8 0x00000008
+Wait 0x0078
+_0807E8E4_2 
+TextboxNoOverlapFollowPos 0x1068, 0x0002
+_0807EA94 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+SetLocalFlag 0x008b
+Call sub_08066FB8
+Call sub_0807DF50
+_0807E878 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080158F8.inc b/data/scripts/gUnk_080158F8.inc
new file mode 100644
index 00000000..82062ada
--- /dev/null
+++ b/data/scripts/gUnk_080158F8.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_080158F8
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0218, 0x0238
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000010
+Call sub_080791BC
+SCRIPT_END
+.short 0x0867
+.short 0x0100
+.short 0x0c73
+.short 0x0238
+.short 0x0228
+.short 0x0861
+.short 0x0002
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0010
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08015938.inc b/data/scripts/gUnk_08015938.inc
new file mode 100644
index 00000000..e2045e39
--- /dev/null
+++ b/data/scripts/gUnk_08015938.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08015938
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0248, 0x0208
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000010
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc
new file mode 100644
index 00000000..f8f8c913
--- /dev/null
+++ b/data/scripts/gUnk_08015958.inc
@@ -0,0 +1,107 @@
+SCRIPT_START gUnk_08015958
+StartScript 
+SetEntityNonPlanarMovement 0x0180
+_0807EF80 0x0008
+_0807EF80 0x000b
+Call sub_08066D04
+StopScript 
+WaitForSomething2 0x00000001
+StartScript 
+Call sub_08066D14
+MoveEntityToPlayer 
+StopScript 
+_0807EF80 0x0007
+_0807EB74 
+_0807EDD4 0x01f8, 0x02f8
+_0807EB44 0x0004
+_0807EF80 0x0000
+TextboxNoOverlapFollowPos 0x1011, 0x0002
+_0807EA94 
+_0807EDD4 0x01f8, 0x0268
+SetEntityPositionRelative 0x02180248
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+Call sub_0807F3C8
+SoundReq 0x0096
+SetEntityNonPlanarMovement 0x0200
+_0807ECC4 0x0008
+_0807E930 0x0040
+Call sub_0807F2D4
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0238, 0x0238
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000002
+StopScript 
+StartScript 
+_0807EB74 
+CheckRoomFlag 0x0000
+JumpIf 0x0016
+CheckEntityInteractType 
+JumpIfNot 0xffee
+StopScript 
+TextboxNoOverlapFollowPos 0x1067, 0x0002
+_0807EA94 
+Jump 0xffe0
+StopScript 
+_0807EF80 0x000b
+_0807EB44 0x0000
+_0807EF80 0x0000
+WaitForSomething2 0x00000001
+Call sub_08066D4C
+_0807E5F8 0x00000002
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0867
+.short 0x0100
+.short 0x0879
+.short 0x0001
+.short 0x086e
+.short 0x0010
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
+.short 0x0867
+.short 0x0100
+.short 0x0879
+.short 0x0001
+.short 0x086f
+.short 0x0010
+.short 0x0861
+.short 0x0002
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0004
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08015AC4.inc b/data/scripts/gUnk_08015AC4.inc
new file mode 100644
index 00000000..754b2b65
--- /dev/null
+++ b/data/scripts/gUnk_08015AC4.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_08015AC4
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000008
+_0807E908 0x0007
+WaitForSomething2 0x00000008
+_0807E908 0x0006
+SetRoomFlag 0x0000
+_0807EB44 0x0004
+_0807EF80 0x0000
+WaitForSomething2 0x00000008
+Wait 0x003c
+SoundReq 0x0072
+Call sub_08046078
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015B14.inc b/data/scripts/gUnk_08015B14.inc
new file mode 100644
index 00000000..822f52f1
--- /dev/null
+++ b/data/scripts/gUnk_08015B14.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08015B14
+StartScript 
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0300
+StopScript 
+_0807EDD4 0x0248, 0x0218
+_0807E5F8 0x00000020
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc
new file mode 100644
index 00000000..b2215622
--- /dev/null
+++ b/data/scripts/gUnk_08015B34.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_08015B34
+StopScript 
+StartScript 
+CheckLocalFlag 0x008b
+JumpIf 0x0040
+CallWithArg sub_0807F6B4, 0x00000318
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+TextboxNoOverlapFollowPos 0x2506, 0x0002
+_0807EA94 
+StartPlayerScript 0x08015b84
+WaitForSomething2 0x00000004
+Call sub_0807DF50
+_0807E878 
+Jump 0xffb8
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015B84.inc b/data/scripts/gUnk_08015B84.inc
new file mode 100644
index 00000000..7893541f
--- /dev/null
+++ b/data/scripts/gUnk_08015B84.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08015B84
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x0001
+_0807EC64 0x0010
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015BA8.inc b/data/scripts/gUnk_08015BA8.inc
new file mode 100644
index 00000000..7ee39edb
--- /dev/null
+++ b/data/scripts/gUnk_08015BA8.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_08015BA8
+StartScript 
+SetLocalFlag 0x008e
+_0807E864 
+MoveEntityToPlayer 
+CameraTargetEntity 
+SetEntityNonPlanarMovement 0x0200
+StopScript 
+Wait 0x000f
+_0807E8E4_2 
+Call sub_0807F3F8
+Wait 0x001e
+_0807EDD4 0x00b8, 0x0258
+Wait 0x001e
+SetRoomFlag 0x0065
+Wait 0x0078
+_0807EEB4 
+CameraTargetPlayer 
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015BE8.inc b/data/scripts/gUnk_08015BE8.inc
new file mode 100644
index 00000000..17336802
--- /dev/null
+++ b/data/scripts/gUnk_08015BE8.inc
@@ -0,0 +1,83 @@
+SCRIPT_START gUnk_08015BE8
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+CheckPlayerInRegion 0x0160, 0x0020, 0x3040
+JumpIfNot 0xfff6
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0807FBC4
+StartPlayerScript 0x08015c7c
+WaitForSomething2 0x00000100
+CameraTargetPlayer 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+SoundReq0x80100000 
+Call sub_08053BE8
+StartScript 
+_0807E864 
+Call sub_0807FBC4
+CameraTargetPlayer 
+_0807E778 0x0100
+DoFade4 
+_0807E80C 0x00000000
+StopScript 
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+SoundReq2 0xffff
+_0807EB28 0x131f
+_0807EA94 
+SetLocalFlag 0x009c
+Call sub_0807FBCC
+Call sub_0807DF50
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0867
+.short 0x0080
+.short 0x0402
+.short 0x0879
+.short 0x0001
+.short 0x0c73
+.short 0x0168
+.short 0x0058
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x140c
+.short 0xf239
+.short 0x0807
+.short 0x03c5
+.short 0x0000
+.short 0x0c0b
+.short 0xf305
+.short 0x0807
+.short 0x0c5c
+.short 0x1318
+.short 0x000c
+.short 0x0459
+.short 0x140c
+.short 0xf239
+.short 0x0807
+.short 0x03c9
+.short 0x0000
+.short 0x0c0b
+.short 0xf305
+.short 0x0807
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0c28
+.short 0x0100
+.short 0x0000
+.short 0x0c0b
+.short 0x91bd
+.short 0x0807
+.short 0xffff
diff --git a/data/scripts/gUnk_08015CD4.inc b/data/scripts/gUnk_08015CD4.inc
new file mode 100644
index 00000000..05f61e2a
--- /dev/null
+++ b/data/scripts/gUnk_08015CD4.inc
@@ -0,0 +1,67 @@
+SCRIPT_START gUnk_08015CD4
+StartScript 
+_0807F0B4 0x0007
+SetEntityPositionRelative 0x00680088
+CameraTargetEntity 
+StopScript 
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+Wait 0x003c
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x00e00088
+CameraTargetEntity 
+Wait 0x003c
+SoundReq2 0x000d
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x00700088
+CameraTargetEntity 
+Wait 0x003c
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x00e00088
+CameraTargetEntity 
+Wait 0x003c
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x00700088
+CameraTargetEntity 
+Wait 0x003c
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+_0807E5F8 0x00000010
+LoadRoomEntityList 0x080fce30
+SoundReq0x80100000 
+Wait 0x0078
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+SoundReq2 0x0034
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000080
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000200
+Wait 0x003c
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+SoundReq0x80100000 
+SetRoomFlag 0x0000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015DF0.inc b/data/scripts/gUnk_08015DF0.inc
new file mode 100644
index 00000000..44523b73
--- /dev/null
+++ b/data/scripts/gUnk_08015DF0.inc
@@ -0,0 +1,26 @@
+SCRIPT_START gUnk_08015DF0
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x1319
+_0807EA94 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+TextboxNoOverlap 0x131a
+_0807EA94 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+TextboxNoOverlap 0x131d
+_0807EA94 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+TextboxNoOverlap 0x131e
+_0807EA94 
+_0807E5F8 0x00000008
+WaitForSomething 0x00000400
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015E58.inc b/data/scripts/gUnk_08015E58.inc
new file mode 100644
index 00000000..99d6da07
--- /dev/null
+++ b/data/scripts/gUnk_08015E58.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_08015E58
+StartScript 
+_0807EF80 0x0008
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x001d
+StopScript 
+WaitForSomething2 0x00000010
+Call sub_08066C94
+Wait 0x00e9
+_0807EF80 0x0007
+_0807EF80 0x001e
+Wait 0x0014
+_0807EB44 0x0000
+_0807EF80 0x001c
+Call sub_0807F2D4
+_0807EF80 0x0000
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+Call sub_08066CA4
+_0807EF80 0x0008
+Wait 0x00bc
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+SetEntityPositionRelative 0x00680088
+Call sub_08066C94
+Wait 0x00e8
+_0807EF80 0x0007
+_0807EF80 0x001e
+Wait 0x0014
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+_0807EF80 0x0014
+Wait 0x001e
+TextboxNoOverlap 0x131b
+_0807EA94 
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015F08.inc b/data/scripts/gUnk_08015F08.inc
new file mode 100644
index 00000000..41099f65
--- /dev/null
+++ b/data/scripts/gUnk_08015F08.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_08015F08
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000001
+TextboxNoOverlap 0x131c
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething 0x00000200
+_0807EF80 0x0005
+WaitForSomething 0x00000400
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015F3C.inc b/data/scripts/gUnk_08015F3C.inc
new file mode 100644
index 00000000..3e892d7d
--- /dev/null
+++ b/data/scripts/gUnk_08015F3C.inc
@@ -0,0 +1,36 @@
+SCRIPT_START gUnk_08015F3C
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EB44 0x0000
+_0807E930 0x0000
+StopScript 
+WaitForSomething 0x00000040
+_0807E930 0x0004
+_0807EC64 0x00c0
+_0807E930 0x0000
+Wait 0x003c
+_0807E5F8 0x00000080
+WaitForSomething 0x00000200
+_0807EF80 0x0005
+WaitForSomething 0x00000400
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
+.short 0x0401
+.short 0x0861
+.short 0x0004
+.short 0x0879
+.short 0x0000
+.short 0x0402
+.short 0x0c32
+.short 0x0200
+.short 0x0000
+.short 0x0879
+.short 0x0005
+.short 0x0c32
+.short 0x0400
+.short 0x0000
+.short 0x0879
+.short 0x0006
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_08015FA4.inc b/data/scripts/gUnk_08015FA4.inc
new file mode 100644
index 00000000..83e92568
--- /dev/null
+++ b/data/scripts/gUnk_08015FA4.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08015FA4
+StartScript 
+_0807EF80 0x000a
+Call sub_08066E38
+StopScript 
+WaitForSomething 0x00000400
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc
new file mode 100644
index 00000000..54c0124d
--- /dev/null
+++ b/data/scripts/gUnk_08015FC0.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08015FC0
+StartScript 
+Call sub_0806DB84
+CheckKinstoneFused 0x0009
+JumpIf 0x005a
+_0807EA88 0x0009
+CallWithArg sub_0806DA04, 0x00000007
+_0807EF80 0x000a
+StopScript 
+_0807EA4C 
+_0807E9F0 
+_0807E864 
+CheckKinstoneFused 0x0009
+JumpIf 0x000e
+Call sub_0807DF50
+_0807E878 
+Jump 0xffe8
+_0807F0C8 0xffff, 0x0000
+_0807E5F8 0x00000003
+WaitForSomething2 0x0000000c
+_0807F0C8 0x0000, 0x0000
+SoundReq 0x0072
+_0807EB28 0x0b1f
+_0807EA94 
+.byte 0xb
diff --git a/data/scripts/gUnk_08016021.inc b/data/scripts/gUnk_08016021.inc
new file mode 100644
index 00000000..b5897a7b
--- /dev/null
+++ b/data/scripts/gUnk_08016021.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08016021
+.byte 0xc
+.byte 0x51
+.byte 0xdf
+.byte 0x7
+.byte 0x8
+.byte 0x44
+.byte 0x4
+.byte 0x79
+.byte 0x8
+.byte 0x6
+.byte 0x0
+.byte 0xff
+.byte 0xff
+.byte 0x0
+.byte 0x0
diff --git a/data/scripts/gUnk_0801606C.inc b/data/scripts/gUnk_0801606C.inc
new file mode 100644
index 00000000..2565fec2
--- /dev/null
+++ b/data/scripts/gUnk_0801606C.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0801606C
+StartScript 
+CheckKinstoneFused 0x0009
+JumpIf 0x002a
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0010
+Wait 0x003c
+SetEntityNonPlanarMovement 0x0020
+_0807EC94 0x0080
+Wait 0x001e
+_0807EF80 0x0010
+_0807E5F8 0x00000004
+SCRIPT_END
+.short 0x0c6a
+.short 0x0010
+.short 0x0000
+.short 0xffff
+.short 0x0000
diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc
new file mode 100644
index 00000000..fe381115
--- /dev/null
+++ b/data/scripts/gUnk_080160A8.inc
@@ -0,0 +1,22 @@
+SCRIPT_START gUnk_080160A8
+StartScript 
+_0807E9D4 
+_0807E930 0x0008
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x0028
+TestBit 0x00000008
+JumpIf 0x0010
+TestBit 0x00000010
+JumpIf 0x0006
+Jump 0xffe0
+StopScript 
+_0807EB74 
+WaitForSomething2 0x00000004
+Jump 0xffd2
+_0807E864 
+_0807EB74 
+StopScript 
+.short 0x0411
+.short 0x0805
diff --git a/data/scripts/gUnk_080160EA.inc b/data/scripts/gUnk_080160EA.inc
new file mode 100644
index 00000000..2628e3be
--- /dev/null
+++ b/data/scripts/gUnk_080160EA.inc
@@ -0,0 +1,42 @@
+SCRIPT_START gUnk_080160EA
+.short 0x0030
+.short 0x085a
+.short 0x2d07
+.short 0x0459
+.short 0x041c
+.short 0x0805
+.short 0x003c
+.short 0x0c1e
+.short 0x0000
+.short 0x0000
+.short 0x0804
+.short 0x000c
+.short 0x085a
+.short 0x2d0b
+.short 0x0459
+.short 0x0803
+.short 0x0028
+.short 0x0434
+.short 0x0464
+.short 0x085a
+.short 0x2d0d
+.short 0x0459
+.short 0x0803
+.short 0x001a
+.short 0x081d
+.short 0x0014
+.short 0x0805
+.short 0x000c
+.short 0x085a
+.short 0x2d09
+.short 0x0459
+.short 0x0803
+.short 0x0008
+.short 0x085a
+.short 0x2d01
+.short 0x0459
+.short 0x0444
+.short 0x0861
+.short 0x0004
+.short 0x0803
+.short 0xff76
diff --git a/data/scripts/gUnk_0801613C.inc b/data/scripts/gUnk_0801613C.inc
new file mode 100644
index 00000000..c1e74466
--- /dev/null
+++ b/data/scripts/gUnk_0801613C.inc
@@ -0,0 +1,39 @@
+SCRIPT_START gUnk_0801613C
+StartScript 
+Call sub_080787B4
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+GetInventoryValue 0x0025
+.short 0x145d
+.short 0x2d03
+.short 0x2d02
+.short 0x2d02
+.short 0x2d02
+.short 0x041c
+.short 0x0805
+.short 0x002a
+.short 0x081f
+.short 0x0020
+.short 0x0804
+.short 0x000a
+.short 0x085a
+.short 0x2d0c
+.short 0x0803
+.short 0x001a
+.short 0x0c1e
+.short 0x0025
+.short 0x0000
+.short 0x0804
+.short 0x000a
+.short 0x085a
+.short 0x2d0b
+.short 0x0803
+.short 0x0008
+.short 0x0434
+.short 0x085a
+.short 0x2d06
+.short 0x0444
+.short 0x0803
+.short 0xffb8
diff --git a/data/scripts/gUnk_08016190.inc b/data/scripts/gUnk_08016190.inc
new file mode 100644
index 00000000..abab1801
--- /dev/null
+++ b/data/scripts/gUnk_08016190.inc
@@ -0,0 +1,41 @@
+SCRIPT_START gUnk_08016190
+StartScript 
+Call sub_080787B4
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+GetInventoryValue 0x0024
+.short 0x145d
+.short 0x2d05
+.short 0x2d04
+.short 0x2d04
+.short 0x2d04
+.short 0x041c
+.short 0x0805
+.short 0x002e
+.short 0x081f
+.short 0x0020
+.short 0x0804
+.short 0x000a
+.short 0x085a
+.short 0x2d0c
+.short 0x0803
+.short 0x001e
+.short 0x0c1e
+.short 0x0024
+.short 0x0000
+.short 0x0804
+.short 0x000a
+.short 0x085a
+.short 0x2d0b
+.short 0x0803
+.short 0x000c
+.short 0x0434
+.short 0x0459
+.short 0x0464
+.short 0x085b
+.short 0x2d06
+.short 0x0444
+.short 0x0803
+.short 0xffb4
diff --git a/data/scripts/gUnk_080161E8.inc b/data/scripts/gUnk_080161E8.inc
new file mode 100644
index 00000000..665e9e1b
--- /dev/null
+++ b/data/scripts/gUnk_080161E8.inc
@@ -0,0 +1,91 @@
+SCRIPT_START gUnk_080161E8
+StartScript 
+Call sub_0807F348
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+Call sub_08068C28
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call sub_0807DF28
+_0807EB74 
+Call sub_08068CA0
+JumpIf 0x0122
+Call sub_08068CFC
+JumpIfNot 0x010c
+Call sub_08068DB8
+_0807EA94 
+Call sub_08068DD0
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x010a
+StartPlayerScript 0x0801635c
+WaitForSomething2 0x00000001
+_0807EB74 
+Call sub_08068C8C
+JumpIf 0x000e
+Call sub_08068DE8
+_0807EA94 
+Wait 0x001e
+Call sub_08068E00
+_0807EA94 
+_0807EF80 0x0001
+Call sub_0807F2D4
+Call sub_08068E90
+Call sub_08068C8C
+JumpIf 0x009a
+Call sub_08068F00
+Call sub_08068F14
+Call sub_08068BB4
+CallWithArg sub_0807F244, 0x00010001
+Call sub_08068B84
+Call sub_0807F2A8
+Call sub_08068BD0
+Wait 0x001e
+Call sub_08068E18
+_0807EA94 
+Call sub_08068EB4
+Call sub_0807DF50
+_0807E878 
+StopScript 
+StartScript 
+Call sub_08068EC4
+JumpIf 0x001e
+CheckEntityInteractType 
+JumpIf 0x0006
+Jump 0xffea
+StopScript 
+_0807E864 
+Call sub_08068E78
+_0807EA94 
+_0807E878 
+Jump 0xffd8
+StopScript 
+_0807E888 
+Call sub_0807F594
+Call sub_0807DF28
+_0807E864 
+SoundReq0x80100000 
+SoundReq 0x00cd
+Wait 0x003c
+SoundReq2 0x005e
+Call sub_08068F3C
+Call sub_08068E30
+_0807EA94 
+Call sub_08068C6C
+WaitPlayerAction8 
+_0807EA94 
+Jump 0x0016
+Call sub_08068E60
+_0807EA94 
+Jump 0x000a
+Call sub_08068E48
+_0807EA94 
+Call sub_0807DF50
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xfea6
+.short 0x0000
diff --git a/data/scripts/gUnk_0801635C.inc b/data/scripts/gUnk_0801635C.inc
new file mode 100644
index 00000000..d0aff840
--- /dev/null
+++ b/data/scripts/gUnk_0801635C.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0801635C
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0078, 0x0050
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.byte 0x0
diff --git a/data/scripts/gUnk_0801637D.inc b/data/scripts/gUnk_0801637D.inc
new file mode 100644
index 00000000..4575f8da
--- /dev/null
+++ b/data/scripts/gUnk_0801637D.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0801637D
+.byte 0xb5
+.byte 0x8c
+.byte 0xf0
+.byte 0x1d
+.byte 0xfb
+.byte 0x0
+.byte 0xbd
diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc
new file mode 100644
index 00000000..8cfd7cdd
--- /dev/null
+++ b/data/scripts/gUnk_08016384.inc
@@ -0,0 +1,64 @@
+SCRIPT_START gUnk_08016384
+StartScript 
+StopScript 
+Jump 0xfffa
+JumpIf 0xfff6
+JumpIfNot 0xfff2
+.short 0x0c06
+.short 0xffee
+.short 0xffec
+.short 0x0c07
+.short 0x6384
+.short 0x0801
+.short 0x0c08
+.short 0x6384
+.short 0x0801
+.short 0x0c09
+.short 0x6384
+.short 0x0801
+.short 0x140a
+.short 0x6384
+.short 0x0801
+.short 0x6384
+.short 0x0801
+.short 0x0c0b
+.short 0x6384
+.short 0x0801
+.short 0x140c
+.short 0x6384
+.short 0x0801
+.short 0x5678
+.short 0x1234
+.short 0x0c0d
+.short 0x6384
+.short 0x0801
+.short 0x0c0e
+.short 0x0001
+.short 0x0000
+.short 0x080f
+.short 0x0001
+.short 0x0810
+.short 0x0001
+.short 0x0411
+.short 0x0812
+.short 0x0067
+.short 0x0c13
+.short 0x0100
+.short 0x006b
+.short 0x0814
+.short 0x0013
+.short 0x0815
+.short 0x0000
+.short 0x1016
+.short 0x0000
+.short 0x0000
+.short 0x0000
+.short 0x0817
+.short 0x0000
+.short 0x0418
+.short 0x0419
+.short 0x081a
+.short 0x00c8
+.short 0x041c
+.short 0x081d
+.short 0x0001
diff --git a/data/scripts/gUnk_08016408.inc b/data/scripts/gUnk_08016408.inc
new file mode 100644
index 00000000..6136f52b
--- /dev/null
+++ b/data/scripts/gUnk_08016408.inc
@@ -0,0 +1,242 @@
+SCRIPT_START gUnk_08016408
+BuyItem 0x006c, 0x0000
+_0807E48C 0x0020
+_0807E4CC 0x00000000
+_0807E4EC 0x00000000
+.short 0x0c22
+.short 0x0000
+.short 0x0000
+.short 0x0c23
+.short 0x0080
+.short 0x0000
+.short 0x0424
+.short 0x0425
+.short 0x0826
+.short 0x0001
+.short 0x0827
+.short 0x0004
+.short 0x0c28
+.short 0x0001
+.short 0x0000
+.short 0x0c29
+.short 0x0002
+.short 0x0000
+.short 0x082a
+.short 0x0067
+.short 0x0c2b
+.short 0x0100
+.short 0x0001
+.short 0x082c
+.short 0x0067
+.short 0x082d
+.short 0x0013
+.short 0x082e
+.short 0x0013
+.short 0x082f
+.short 0x0000
+.short 0x0830
+.short 0x0000
+.short 0x0831
+.short 0x001e
+.short 0x0c32
+.short 0x0001
+.short 0x0000
+.short 0x0c33
+.short 0x0002
+.short 0x0000
+.short 0x0434
+.short 0x0435
+.short 0x0436
+.short 0x0437
+.short 0x0838
+.short 0x0004
+.short 0x0c39
+.short 0xffff
+.short 0x0000
+.short 0x043a
+.short 0x083b
+.short 0x0080
+.short 0x043c
+.short 0x043d
+.short 0x043e
+.short 0x043f
+.short 0x0c40
+.short 0x0000
+.short 0x0000
+.short 0x0c41
+.short 0x0000
+.short 0x0000
+.short 0x0442
+.short 0x0443
+.short 0x0444
+.short 0x0445
+.short 0x0c46
+.short 0x5408
+.short 0x0000
+.short 0x0c47
+.short 0x6384
+.short 0x0801
+.short 0x0848
+.short 0x03a0
+.short 0x0449
+.short 0x044a
+.short 0x044b
+.short 0x044c
+.short 0x084d
+.short 0x0004
+.short 0x0c4e
+.short 0x0000
+.short 0x0000
+.short 0x044f
+.short 0x0850
+.short 0x0000
+.short 0x0451
+.short 0x0852
+.short 0x0600
+.short 0x0453
+.short 0x0454
+.short 0x0855
+.short 0x0000
+.short 0x0858
+.short 0x0001
+.short 0x0459
+.short 0x085a
+.short 0x0601
+.short 0x085b
+.short 0x0601
+.short 0x085c
+.short 0x0601
+.short 0x105d
+.short 0x0601
+.short 0x0602
+.short 0x0603
+.short 0x045e
+.short 0x085f
+.short 0x0602
+.short 0x0460
+.short 0x0861
+.short 0x0000
+.short 0x0c62
+.short 0x0000
+.short 0x0000
+.short 0x0463
+.short 0x0464
+.short 0x0865
+.short 0x0000
+.short 0x0866
+.short 0x0000
+.short 0x0867
+.short 0x0100
+.short 0x0c68
+.short 0x8000
+.short 0x0001
+.short 0x0c69
+.short 0x0000
+.short 0x0000
+.short 0x046b
+.short 0x046c
+.short 0x086d
+.short 0x0010
+.short 0x086e
+.short 0x0020
+.short 0x086f
+.short 0x0030
+.short 0x0870
+.short 0x0040
+.short 0x0871
+.short 0x0050
+.short 0x1072
+.short 0x0000
+.short 0x0000
+.short 0x0000
+.short 0x0c73
+.short 0x0000
+.short 0x0000
+.short 0x0c74
+.short 0x0000
+.short 0x0000
+.short 0x0475
+.short 0x0476
+.short 0x0c77
+.short 0xfff0
+.short 0x0014
+.short 0x0879
+.short 0x0000
+.short 0x087a
+.short 0x0001
+.short 0x087b
+.short 0x0074
+.short 0x087c
+.short 0x001d
+.short 0x0c7d
+.short 0x0074
+.short 0x0000
+.short 0x047e
+.short 0x087f
+.short 0xff38
+.short 0x0880
+.short 0x0010
+.short 0x0881
+.short 0x0008
+.short 0x0883
+.short 0x0001
+.short 0x0882
+.short 0x0001
+.short 0x0884
+.short 0x0001
+.short 0x0c85
+.short 0x0001
+.short 0x0002
+.short 0x0886
+.short 0x0001
+.short 0x0487
+.short 0x0488
+.short 0x0889
+.short 0x0007
+.short 0x0c8a
+.short 0x003c
+.short 0x0003
+.short 0xffff
+.short 0x0000
+.short 0x0401
+.short 0x0879
+.short 0x000a
+.short 0x0861
+.short 0x0004
+.short 0x0453
+.short 0x0402
+.short 0x0852
+.short 0x0601
+.short 0x0803
+.short 0xfffa
+.short 0x0000
+.short 0x0831
+.short 0x001e
+.short 0x0817
+.short 0x2020
+.short 0x0805
+.short 0xfff6
+.short 0x0879
+.short 0x0003
+.short 0x0c0b
+.short 0x637d
+.short 0x0801
+.short 0x0803
+.short 0xffe8
+.short 0x0000
+.short 0x0831
+.short 0x001e
+.short 0x0817
+.short 0x2020
+.short 0x0c09
+.short 0x65d8
+.short 0x0801
+.short 0x0879
+.short 0x0003
+.short 0x0c0b
+.short 0x637d
+.short 0x0801
+.short 0x0c07
+.short 0x65d8
+.short 0x0801
+.short 0x0000
diff --git a/data/scripts/gUnk_080165F8.inc b/data/scripts/gUnk_080165F8.inc
new file mode 100644
index 00000000..bb0186f4
--- /dev/null
+++ b/data/scripts/gUnk_080165F8.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_080165F8
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+TextboxNoOverlapFollow 0x0601
+.short 0x0803
+.short 0xfff4
diff --git a/data/scripts/gUnk_0801660C.inc b/data/scripts/gUnk_0801660C.inc
new file mode 100644
index 00000000..69212fa6
--- /dev/null
+++ b/data/scripts/gUnk_0801660C.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0801660C
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+TextboxNoOverlapFollow 0x0602
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
diff --git a/data/scripts/gUnk_08016628.inc b/data/scripts/gUnk_08016628.inc
new file mode 100644
index 00000000..06d5766d
--- /dev/null
+++ b/data/scripts/gUnk_08016628.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08016628
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+_0807EB28 0x0603
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
diff --git a/data/scripts/gUnk_08016644.inc b/data/scripts/gUnk_08016644.inc
new file mode 100644
index 00000000..cd23679e
--- /dev/null
+++ b/data/scripts/gUnk_08016644.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08016644
+SetEntityNonPlanarMovement 0x0100
+_0807ECF4 0x0030
+Wait 0x0008
+_0807ECC4 0x0030
+Wait 0x0008
+_0807EC94 0x0030
+Wait 0x0008
+_0807EC64 0x0030
+Wait 0x0008
+.short 0x0803
+.short 0xffde
diff --git a/data/scripts/gUnk_0801666C.inc b/data/scripts/gUnk_0801666C.inc
new file mode 100644
index 00000000..f8ee617f
--- /dev/null
+++ b/data/scripts/gUnk_0801666C.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0801666C
+_0807ED24 0x0055, 0x0039, 0x00b4
+Wait 0x0008
+_0807ED24 0x0075, 0x0076, 0x003c
+Wait 0x0008
+_0807ED24 0x0105, 0x006c, 0x0078
+Wait 0x0008
+_0807ED24 0x018e, 0x007a, 0x0078
+Wait 0x0008
+_0807ED24 0x0173, 0x0023, 0x003c
+Wait 0x0008
+_0807ED24 0x00d8, 0x003f, 0x003c
+Wait 0x0008
+.short 0x0803
+.short 0xffb6
diff --git a/data/scripts/gUnk_080166B8.inc b/data/scripts/gUnk_080166B8.inc
new file mode 100644
index 00000000..d6159306
--- /dev/null
+++ b/data/scripts/gUnk_080166B8.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_080166B8
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0055, 0x0039
+Wait 0x0008
+_0807EDD4 0x0075, 0x0076
+Wait 0x0008
+_0807EDD4 0x0105, 0x006c
+Wait 0x0008
+_0807EDD4 0x018e, 0x007a
+Wait 0x0008
+_0807EDD4 0x0173, 0x0023
+Wait 0x0008
+_0807EDD4 0x00d8, 0x003f
+Wait 0x0008
+.short 0x0803
+.short 0xffc2
diff --git a/data/scripts/gUnk_080166FC.inc b/data/scripts/gUnk_080166FC.inc
new file mode 100644
index 00000000..d3ca9789
--- /dev/null
+++ b/data/scripts/gUnk_080166FC.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_080166FC
+SetEntityNonPlanarMovement 0x0100
+_0807EC94 0x0030
+_0807E5F8 0x00000002
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000001
+_0807E610 0x00000001
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+WaitForSomething 0x00000001
+_0807E610 0x00000001
+_0807ECF4 0x0030
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+Wait 0x001e
+_0807E5F8 0x00000006
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Wait 0x003c
+.short 0x0803
+.short 0xff6a
diff --git a/data/scripts/gUnk_08016798.inc b/data/scripts/gUnk_08016798.inc
new file mode 100644
index 00000000..0d8c3228
--- /dev/null
+++ b/data/scripts/gUnk_08016798.inc
@@ -0,0 +1,40 @@
+SCRIPT_START gUnk_08016798
+SetEntityNonPlanarMovement 0x0100
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EC94 0x0030
+_0807E5F8 0x00000004
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807ECF4 0x0030
+_0807E5F8 0x00000001
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+.short 0x0803
+.short 0xff5a
diff --git a/data/scripts/gUnk_08016844.inc b/data/scripts/gUnk_08016844.inc
new file mode 100644
index 00000000..90ee22ad
--- /dev/null
+++ b/data/scripts/gUnk_08016844.inc
@@ -0,0 +1,38 @@
+SCRIPT_START gUnk_08016844
+SetEntityNonPlanarMovement 0x0100
+WaitForSomething 0x00000004
+_0807E610 0x00000004
+_0807EC94 0x0030
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+Wait 0x001e
+_0807E5F8 0x00000003
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Wait 0x003c
+_0807ECF4 0x0030
+_0807E5F8 0x00000002
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000004
+_0807E610 0x00000004
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+.short 0x0803
+.short 0xff6a
diff --git a/data/scripts/gUnk_080168E0.inc b/data/scripts/gUnk_080168E0.inc
new file mode 100644
index 00000000..11df18ef
--- /dev/null
+++ b/data/scripts/gUnk_080168E0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080168E0
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x000f
+_0807E878 
+.short 0x0803
+.short 0xfff4
diff --git a/data/scripts/gUnk_080168F4.inc b/data/scripts/gUnk_080168F4.inc
new file mode 100644
index 00000000..5e573261
--- /dev/null
+++ b/data/scripts/gUnk_080168F4.inc
@@ -0,0 +1,55 @@
+SCRIPT_START gUnk_080168F4
+StartScript 
+Call sub_08064EA4
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08064F28
+_0807EA94 
+JumpIfNot 0x0008
+_0807F034 0x003d
+WaitPlayerAction8 
+_0807E878 
+SetGlobalFlag 0x005c
+Jump 0xffdc
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x0018
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
+.short 0x0401
+.short 0x0453
+.short 0x0861
+.short 0x0000
+.short 0x0879
+.short 0x000a
+.short 0x0850
+.short 0x0000
+.short 0x0402
+.short 0x0451
+.short 0x0443
+.short 0x0831
+.short 0x0018
+.short 0x085a
+.short 0x0a01
+.short 0x0459
+.short 0x0831
+.short 0x000f
+.short 0x0444
+.short 0x0803
+.short 0xffea
+.short 0x0000
diff --git a/src/code_080A29BC.c b/src/code_080A29BC.c
index d33d3b94..c8476217 100644
--- a/src/code_080A29BC.c
+++ b/src/code_080A29BC.c
@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "room.h"
 
-void sub_080A29BC(Entity* parent) {
+void sub_080A29BC(Entity* parent) { // TODO this is CreateDust, why is it here again? Fogot to delete file?
     CreateFx(parent, 2, 0);
 }
 
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index f4bdb04a..37585ed0 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -69,6 +69,6 @@ void Carpenter_Head(Entity* this) {
     }
 }
 
-void sub_080672b0(Entity* this, u32 param_2) {
+void sub_080672B0(Entity* this, u32 param_2) {
     InitializeAnimation(this, *(u32*)(param_2 + 4) + (this->animationState >> 1) + this->type * 8);
 }
diff --git a/src/npc/librari.c b/src/npc/librari.c
index 9db202b7..72b4dfbe 100644
--- a/src/npc/librari.c
+++ b/src/npc/librari.c
@@ -60,7 +60,7 @@ void sub_0806B260(Entity* this, u32 arg1) {
 
 extern u16 gUnk_08112D50[];
 
-void sub_0806b2b4(Entity* this) {
+void sub_0806B2B4(Entity* this) {
     u32 index;
 
     if (CheckLocalFlag(0xb3)) {
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index f0926e68..330d2a7d 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -5,6 +5,8 @@ import struct
 # Input 'macros' to generate the macros for the script commands
 # Input the script bytes as hex to disassemble the script
 
+# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/script.inc 
+
 @dataclass
 class Context:
     ptr: int
@@ -225,9 +227,10 @@ parameters = {
     },
 }
 
-def build_script_command(name: str):
+# Remove the ScriptCommand_ prefix for the asm macros
+def build_script_command(name: str): 
     name = name.replace("ScriptCommand_", "")
-    if name[0].isdigit():
+    if name[0].isdigit(): # asm macros cannot start with an _
         return '_' + name
     return name
 
@@ -294,7 +297,7 @@ def disassemble_script(input_bytes):
     # Print rest (did not manage to get there)
     if ctx.ptr < len(ctx.data):
         if (len(ctx.data) - ctx.ptr) % 2 != 0:
-            print(ctx.data[ctx.ptr:])
+            print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
             # TODO error
             return
         print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))

From c83c3e60d373b29efef0688f622d061c6cde6a1b Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Fri, 5 Mar 2021 23:39:40 +0100
Subject: [PATCH 15/46] Split scripts at more useful places

---
 asm/macros/scripts.inc                        |  675 ++++
 data/scripts.s                                | 3201 +++++++++++------
 data/scripts/ezlo_angry.inc                   |   22 +-
 data/scripts/gUnk_08008B5C.inc                |  121 +-
 data/scripts/gUnk_08008B90.inc                |   17 -
 data/scripts/gUnk_08008BC0.inc                |   35 -
 data/scripts/gUnk_08008C4E.inc                |   12 -
 data/scripts/gUnk_08008C64.inc                |    4 -
 data/scripts/gUnk_08008C6D.inc                |   18 -
 data/scripts/gUnk_08008C7E.inc                |   60 -
 data/scripts/gUnk_08008CB9.inc                |  152 -
 data/scripts/gUnk_08008D8C.inc                |  117 +-
 data/scripts/gUnk_08008DC0.inc                |   19 -
 data/scripts/gUnk_08008E08.inc                |    2 -
 data/scripts/gUnk_08008E0A.inc                |   51 -
 data/scripts/gUnk_08008F0C.inc                |    6 -
 data/scripts/gUnk_08008F16.inc                |    6 -
 data/scripts/gUnk_08008F26.inc                |   34 -
 data/scripts/gUnk_08008F74.inc                |   19 +
 data/scripts/gUnk_08008F90.inc                |   25 -
 data/scripts/gUnk_08008FC0.inc                |   25 +-
 data/scripts/gUnk_08008FD1.inc                |   44 -
 data/scripts/gUnk_08008FFC.inc                |   13 +
 data/scripts/gUnk_08009008.inc                |    7 -
 data/scripts/gUnk_0800901F.inc                |   30 -
 data/scripts/gUnk_0800903C.inc                |  208 ++
 data/scripts/gUnk_08009080.inc                |   27 -
 data/scripts/gUnk_080090DB.inc                |  190 -
 data/scripts/gUnk_08009198.inc                |   27 -
 data/scripts/gUnk_08009207.inc                |  110 -
 data/scripts/gUnk_08009274.inc                |   17 -
 data/scripts/gUnk_080092A8.inc                |   17 -
 data/scripts/gUnk_080092D4.inc                |    9 -
 data/scripts/gUnk_080092F0.inc                |    9 -
 data/scripts/gUnk_08009308.inc                |    7 -
 data/scripts/gUnk_08009320.inc                |    2 +-
 data/scripts/gUnk_08009348.inc                |   14 +-
 data/scripts/gUnk_08009393.inc                |   35 -
 data/scripts/gUnk_0800939A.inc                |   51 +
 data/scripts/gUnk_080093D7.inc                |   25 -
 data/scripts/gUnk_08009407.inc                |  128 -
 data/scripts/gUnk_08009464.inc                |   28 +
 data/scripts/gUnk_08009486.inc                |   10 -
 data/scripts/gUnk_080094A4.inc                |   12 -
 data/scripts/gUnk_080094CC.inc                |   16 +-
 data/scripts/gUnk_080094D7.inc                |   38 -
 data/scripts/gUnk_080094FC.inc                |   72 +-
 data/scripts/gUnk_08009503.inc                |    6 -
 data/scripts/gUnk_08009508.inc                |   16 -
 data/scripts/gUnk_08009538.inc                |   19 -
 data/scripts/gUnk_08009574.inc                |   23 -
 data/scripts/gUnk_080095CC.inc                |   40 -
 data/scripts/gUnk_080095F2.inc                |   73 +
 data/scripts/gUnk_0800962C.inc                |   32 -
 data/scripts/gUnk_08009698.inc                |   26 -
 data/scripts/gUnk_08009704.inc                |   15 +-
 data/scripts/gUnk_08009706.inc                |   30 -
 data/scripts/gUnk_08009740.inc                |   31 +-
 data/scripts/gUnk_08009778.inc                |    6 -
 data/scripts/gUnk_08009786.inc                |   12 -
 data/scripts/gUnk_080097A1.inc                |   80 -
 data/scripts/gUnk_080097F0.inc                |    6 +-
 data/scripts/gUnk_08009838.inc                |   52 +-
 data/scripts/gUnk_0800987C.inc                |   20 +
 data/scripts/gUnk_080098D4.inc                |    6 +-
 data/scripts/gUnk_08009918.inc                |    9 +-
 data/scripts/gUnk_08009940.inc                |    5 -
 data/scripts/gUnk_08009950.inc                |    4 +-
 data/scripts/gUnk_080099DC.inc                |   16 +-
 data/scripts/gUnk_08009A04.inc                |    4 -
 data/scripts/gUnk_08009A07.inc                |   38 -
 data/scripts/gUnk_08009A2C.inc                |    5 -
 data/scripts/gUnk_08009A34.inc                |   20 +-
 data/scripts/gUnk_08009A50.inc                |   12 -
 data/scripts/gUnk_08009A77.inc                |    6 -
 data/scripts/gUnk_08009A81.inc                |    4 -
 data/scripts/gUnk_08009A84.inc                |   14 +-
 data/scripts/gUnk_08009ABB.inc                |   62 -
 data/scripts/gUnk_08009AF8.inc                |    2 +-
 data/scripts/gUnk_08009B30.inc                |   10 +-
 data/scripts/gUnk_08009B63.inc                |   22 -
 data/scripts/gUnk_08009B78.inc                |   21 +-
 data/scripts/gUnk_08009C68.inc                |   46 +-
 data/scripts/gUnk_08009C7F.inc                |   32 -
 data/scripts/gUnk_08009C9E.inc                |   50 -
 .../{gUnk_08009D00.inc => gUnk_08009CFC.inc}  |    4 +-
 data/scripts/gUnk_08009D6C.inc                |   15 +-
 data/scripts/gUnk_08009D77.inc                |   58 -
 data/scripts/gUnk_08009DB0.inc                |   36 +-
 data/scripts/gUnk_08009DEC.inc                |   20 -
 data/scripts/gUnk_08009E38.inc                |   17 -
 .../{gUnk_0800DB0E.inc => gUnk_08009E4E.inc}  |    2 +-
 data/scripts/gUnk_08009E58.inc                |    6 +-
 .../{gUnk_08009318.inc => gUnk_08009E80.inc}  |    2 +-
 data/scripts/gUnk_08009E88.inc                |   15 +-
 data/scripts/gUnk_08009E9E.inc                |   12 -
 data/scripts/gUnk_08009EA9.inc                |    8 -
 data/scripts/gUnk_08009EB7.inc                |   22 -
 data/scripts/gUnk_08009EF0.inc                |    5 +-
 data/scripts/gUnk_08009F07.inc                |   14 -
 data/scripts/gUnk_08009F14.inc                |  124 +-
 data/scripts/gUnk_08009F39.inc                |   58 -
 data/scripts/gUnk_08009F72.inc                |   74 -
 data/scripts/gUnk_0800A064.inc                |   10 -
 data/scripts/gUnk_0800A081.inc                |   52 -
 data/scripts/gUnk_0800A0B4.inc                |    4 +-
 data/scripts/gUnk_0800A0FC.inc                |   33 +
 data/scripts/gUnk_0800A10A.inc                |    6 -
 data/scripts/gUnk_0800A10F.inc                |   22 -
 data/scripts/gUnk_0800A124.inc                |    5 -
 data/scripts/gUnk_0800A134.inc                |   65 -
 data/scripts/gUnk_0800A160.inc                |   29 +
 data/scripts/gUnk_0800A1B4.inc                |    7 +-
 data/scripts/gUnk_0800A1D8.inc                |   82 +-
 data/scripts/gUnk_0800A224.inc                |   13 -
 data/scripts/gUnk_0800A260.inc                |  113 -
 data/scripts/gUnk_0800A310.inc                |   53 +
 data/scripts/gUnk_0800A340.inc                |   22 -
 data/scripts/gUnk_0800A3A3.inc                |    4 -
 data/scripts/gUnk_0800A3A9.inc                |    2 -
 data/scripts/gUnk_0800A3AA.inc                |   24 -
 data/scripts/gUnk_0800A3D8.inc                |   46 +-
 data/scripts/gUnk_0800A500.inc                |   17 +-
 data/scripts/gUnk_0800A590.inc                |   45 +-
 data/scripts/gUnk_0800A5A6.inc                |   92 -
 data/scripts/gUnk_0800A638.inc                |   15 +
 data/scripts/gUnk_0800A65C.inc                |    8 +-
 data/scripts/gUnk_0800A67E.inc                |    2 -
 data/scripts/gUnk_0800A680.inc                |    7 +-
 data/scripts/gUnk_0800A6A4.inc                |   17 +-
 data/scripts/gUnk_0800A6AB.inc                |   42 -
 data/scripts/gUnk_0800A6D4.inc                |   11 +-
 data/scripts/gUnk_0800A704.inc                |   11 +-
 data/scripts/gUnk_0800A734.inc                |   17 +-
 data/scripts/gUnk_0800A74A.inc                |    7 -
 data/scripts/gUnk_0800A764.inc                |   11 +-
 data/scripts/gUnk_0800A7E4.inc                |   98 +-
 data/scripts/gUnk_0800A7E8.inc                |   24 -
 data/scripts/gUnk_0800A816.inc                |    6 -
 data/scripts/gUnk_0800A820.inc                |   17 -
 data/scripts/gUnk_0800A85C.inc                |   17 -
 data/scripts/gUnk_0800A898.inc                |   17 -
 data/scripts/gUnk_0800A8D4.inc                |   15 -
 data/scripts/gUnk_0800A908.inc                |    4 -
 data/scripts/gUnk_0800A910.inc                |   19 -
 data/scripts/gUnk_0800A964.inc                |    2 +-
 data/scripts/gUnk_0800A988.inc                |    2 +-
 data/scripts/gUnk_0800A9AC.inc                |    2 +-
 data/scripts/gUnk_0800A9D0.inc                |    2 +-
 data/scripts/gUnk_0800A9F4.inc                |   27 +-
 data/scripts/gUnk_0800AA03.inc                |   70 -
 data/scripts/gUnk_0800AA48.inc                |    2 +-
 data/scripts/gUnk_0800AA6C.inc                |    2 +-
 data/scripts/gUnk_0800AA90.inc                |    2 +-
 data/scripts/gUnk_0800AAB4.inc                |    2 +-
 data/scripts/gUnk_0800AAD8.inc                |   11 +-
 data/scripts/gUnk_0800AB08.inc                |   42 +-
 data/scripts/gUnk_0800AB23.inc                |   23 -
 data/scripts/gUnk_0800AB4F.inc                |  162 -
 data/scripts/gUnk_0800AB6E.inc                |   92 +
 data/scripts/gUnk_0800ABF0.inc                |   27 -
 data/scripts/gUnk_0800AC24.inc                |   74 -
 data/scripts/gUnk_0800AC6D.inc                |   37 -
 data/scripts/gUnk_0800ACB5.inc                |    8 -
 data/scripts/gUnk_0800ACBC.inc                |  135 +-
 data/scripts/gUnk_0800ACE0.inc                |   25 -
 data/scripts/gUnk_0800AD74.inc                |   15 -
 data/scripts/gUnk_0800ADA7.inc                |   14 -
 data/scripts/gUnk_0800ADB4.inc                |  121 -
 data/scripts/gUnk_0800AEDC.inc                |    2 +-
 data/scripts/gUnk_0800AF18.inc                |    7 +-
 data/scripts/gUnk_0800AF44.inc                |    4 +-
 data/scripts/gUnk_0800AF68.inc                |    8 +-
 data/scripts/gUnk_0800AF7E.inc                |    8 -
 data/scripts/gUnk_0800AF8C.inc                |    9 +-
 data/scripts/gUnk_0800AFA7.inc                |   10 -
 data/scripts/gUnk_0800AFB0.inc                |    6 +-
 data/scripts/gUnk_0800AFE8.inc                |    4 +-
 data/scripts/gUnk_0800B00C.inc                |   14 +-
 data/scripts/gUnk_0800B0AC.inc                |    8 +
 data/scripts/gUnk_0800B0B0.inc                |    9 -
 data/scripts/gUnk_0800B0D0.inc                |  217 +-
 data/scripts/gUnk_0800B177.inc                |    6 -
 data/scripts/gUnk_0800B17C.inc                |   19 -
 data/scripts/gUnk_0800B1C0.inc                |    2 +-
 data/scripts/gUnk_0800B200.inc                |    4 +-
 data/scripts/gUnk_0800B254.inc                |   41 +-
 data/scripts/gUnk_0800B284.inc                |   16 -
 data/scripts/gUnk_0800B2B4.inc                |   25 -
 data/scripts/gUnk_0800B308.inc                |   34 +-
 data/scripts/gUnk_0800B322.inc                |    5 -
 data/scripts/gUnk_0800B329.inc                |   32 -
 data/scripts/gUnk_0800B348.inc                |    7 -
 data/scripts/gUnk_0800B35C.inc                |    6 -
 data/scripts/gUnk_0800B374.inc                |   14 -
 data/scripts/gUnk_0800B3A4.inc                |   66 +-
 data/scripts/gUnk_0800B40F.inc                |   14 -
 data/scripts/gUnk_0800B41C.inc                |   36 -
 data/scripts/gUnk_0800B4AC.inc                |   20 +-
 data/scripts/gUnk_0800B508.inc                |    4 -
 data/scripts/gUnk_0800B50F.inc                |   62 -
 data/scripts/gUnk_0800B574.inc                |    2 +-
 data/scripts/gUnk_0800B5C4.inc                |    2 +-
 data/scripts/gUnk_0800B5EC.inc                |   59 +-
 data/scripts/gUnk_0800B614.inc                |   47 -
 data/scripts/gUnk_0800B6C8.inc                |   95 +-
 data/scripts/gUnk_0800B708.inc                |    8 -
 data/scripts/gUnk_0800B71F.inc                |   18 -
 data/scripts/gUnk_0800B730.inc                |   38 -
 data/scripts/gUnk_0800B7C4.inc                |   95 -
 data/scripts/gUnk_0800B7FC.inc                |   21 +
 data/scripts/gUnk_0800B828.inc                |  128 +
 data/scripts/gUnk_0800B84F.inc                |   10 -
 data/scripts/gUnk_0800B861.inc                |   40 -
 data/scripts/gUnk_0800B888.inc                |    9 -
 data/scripts/gUnk_0800B8A0.inc                |   10 -
 data/scripts/gUnk_0800B8B8.inc                |   12 -
 data/scripts/gUnk_0800B8E4.inc                |   11 -
 data/scripts/gUnk_0800B906.inc                |    7 -
 data/scripts/gUnk_0800B91C.inc                |   26 -
 data/scripts/gUnk_0800B964.inc                |   21 -
 data/scripts/gUnk_0800B9B4.inc                |  125 +-
 data/scripts/gUnk_0800BA3C.inc                |   19 -
 data/scripts/gUnk_0800BA78.inc                |   22 -
 data/scripts/gUnk_0800BACC.inc                |    4 +-
 data/scripts/gUnk_0800BB00.inc                |   14 +-
 data/scripts/gUnk_0800BB08.inc                |    6 -
 data/scripts/gUnk_0800BB1A.inc                |    7 -
 data/scripts/gUnk_0800BB30.inc                |    4 +-
 data/scripts/gUnk_0800BB64.inc                |   13 +-
 data/scripts/gUnk_0800BB74.inc                |   25 -
 data/scripts/gUnk_0800BBA4.inc                |    6 +-
 data/scripts/gUnk_0800BBDB.inc                |    2 -
 data/scripts/gUnk_0800BBDC.inc                |    2 +-
 data/scripts/gUnk_0800BC08.inc                |   14 +-
 data/scripts/gUnk_0800BC22.inc                |   24 -
 data/scripts/gUnk_0800BC50.inc                |   31 +-
 data/scripts/gUnk_0800BCAE.inc                |   10 -
 data/scripts/gUnk_0800BCB7.inc                |    8 -
 data/scripts/gUnk_0800BCBE.inc                |   10 -
 data/scripts/gUnk_0800BCE8.inc                |   31 +-
 data/scripts/gUnk_0800BD08.inc                |   26 -
 data/scripts/gUnk_0800BD70.inc                |    3 -
 data/scripts/gUnk_0800BD78.inc                |   43 +-
 data/scripts/gUnk_0800BDAC.inc                |   13 -
 data/scripts/gUnk_0800BDC4.inc                |   45 -
 data/scripts/gUnk_0800BE1C.inc                |   32 +-
 data/scripts/gUnk_0800BE54.inc                |   31 -
 data/scripts/gUnk_0800BECC.inc                |   20 +-
 data/scripts/gUnk_0800BF14.inc                |    9 -
 data/scripts/gUnk_0800BF38.inc                |   49 +-
 data/scripts/gUnk_0800BF4A.inc                |   12 -
 data/scripts/gUnk_0800BF70.inc                |   23 -
 data/scripts/gUnk_0800BFBF.inc                |   18 -
 data/scripts/gUnk_0800BFE1.inc                |    2 -
 data/scripts/gUnk_0800BFE3.inc                |   34 -
 data/scripts/gUnk_0800C004.inc                |   50 +-
 data/scripts/gUnk_0800C007.inc                |   30 -
 data/scripts/gUnk_0800C024.inc                |   24 -
 data/scripts/gUnk_0800C07B.inc                |   54 -
 data/scripts/gUnk_0800C0B0.inc                |   45 +-
 data/scripts/gUnk_0800C0C7.inc                |    7 -
 data/scripts/gUnk_0800C0D3.inc                |   22 -
 data/scripts/gUnk_0800C0E8.inc                |   14 -
 data/scripts/gUnk_0800C113.inc                |   27 -
 data/scripts/gUnk_0800C147.inc                |   26 -
 data/scripts/gUnk_0800C160.inc                |   11 +-
 data/scripts/gUnk_0800C1D8.inc                |   43 +-
 data/scripts/gUnk_0800C204.inc                |    4 -
 data/scripts/gUnk_0800C207.inc                |    2 -
 data/scripts/gUnk_0800C208.inc                |    5 -
 data/scripts/gUnk_0800C210.inc                |   24 -
 data/scripts/gUnk_0800C263.inc                |   66 -
 data/scripts/gUnk_0800C2A4.inc                |   50 +-
 data/scripts/gUnk_0800C2A7.inc                |   40 -
 data/scripts/gUnk_0800C2CE.inc                |   66 -
 data/scripts/gUnk_0800C350.inc                |   14 +-
 data/scripts/gUnk_0800C370.inc                |   13 +
 data/scripts/gUnk_0800C396.inc                |   28 -
 data/scripts/gUnk_0800C3B0.inc                |    7 +
 data/scripts/gUnk_0800C3CC.inc                |   25 +-
 data/scripts/gUnk_0800C408.inc                |    5 -
 data/scripts/gUnk_0800C410.inc                |   20 +-
 data/scripts/gUnk_0800C45C.inc                |    2 +-
 data/scripts/gUnk_0800C4D0.inc                |   14 +-
 data/scripts/gUnk_0800C4DB.inc                |   50 -
 data/scripts/gUnk_0800C50C.inc                |   17 +-
 data/scripts/gUnk_0800C521.inc                |   48 -
 data/scripts/gUnk_0800C550.inc                |  253 +-
 data/scripts/gUnk_0800C556.inc                |   23 -
 data/scripts/gUnk_0800C584.inc                |    9 -
 data/scripts/gUnk_0800C59A.inc                |   15 -
 data/scripts/gUnk_0800C5C8.inc                |   18 -
 data/scripts/gUnk_0800C5FC.inc                |    3 -
 data/scripts/gUnk_0800C600.inc                |    8 -
 data/scripts/gUnk_0800C607.inc                |   46 -
 data/scripts/gUnk_0800C634.inc                |   38 -
 data/scripts/gUnk_0800C6C6.inc                |   48 -
 data/scripts/gUnk_0800C774.inc                |    5 -
 data/scripts/gUnk_0800C779.inc                |  144 -
 data/scripts/gUnk_0800C808.inc                |   90 -
 data/scripts/gUnk_0800C861.inc                |   80 -
 data/scripts/gUnk_0800C8B0.inc                |   22 -
 data/scripts/gUnk_0800C8DA.inc                |    6 -
 data/scripts/gUnk_0800C8F0.inc                |    2 +-
 data/scripts/gUnk_0800C91C.inc                |   76 +-
 data/scripts/gUnk_0800C931.inc                |   26 -
 data/scripts/gUnk_0800C963.inc                |  166 -
 data/scripts/gUnk_0800CA08.inc                |   30 -
 data/scripts/gUnk_0800CA8C.inc                |    6 +-
 data/scripts/gUnk_0800CAAA.inc                |   10 -
 data/scripts/gUnk_0800CABC.inc                |   22 +-
 data/scripts/gUnk_0800CB07.inc                |   78 -
 data/scripts/gUnk_0800CB54.inc                |   14 +-
 data/scripts/gUnk_0800CBA3.inc                |   50 -
 data/scripts/gUnk_0800CBD4.inc                |   24 +-
 data/scripts/gUnk_0800CC08.inc                |    6 -
 data/scripts/gUnk_0800CC0D.inc                |   54 -
 data/scripts/gUnk_0800CC42.inc                |   22 -
 data/scripts/gUnk_0800CC6C.inc                |   15 +-
 data/scripts/gUnk_0800CCCD.inc                |    9 -
 data/scripts/gUnk_0800CCDD.inc                |   40 -
 data/scripts/gUnk_0800CD04.inc                |   27 +-
 data/scripts/gUnk_0800CD08.inc                |   96 -
 data/scripts/gUnk_0800CD67.inc                |   22 -
 data/scripts/gUnk_0800CD7C.inc                |  258 +-
 data/scripts/gUnk_0800CE07.inc                |  254 --
 data/scripts/gUnk_0800CF04.inc                |    8 -
 data/scripts/gUnk_0800CF16.inc                |   16 -
 data/scripts/gUnk_0800CF4B.inc                |    6 -
 data/scripts/gUnk_0800CF50.inc                |   18 -
 data/scripts/gUnk_0800CF7B.inc                |   14 -
 data/scripts/gUnk_0800CF88.inc                |    5 -
 data/scripts/gUnk_0800CF95.inc                |   11 -
 data/scripts/gUnk_0800CFA9.inc                |    4 -
 data/scripts/gUnk_0800CFAC.inc                |   31 -
 data/scripts/gUnk_0800D011.inc                |   40 -
 data/scripts/gUnk_0800D05F.inc                |  112 -
 data/scripts/gUnk_0800D0CE.inc                |   20 -
 data/scripts/gUnk_0800D127.inc                |  106 -
 data/scripts/gUnk_0800D190.inc                |   10 -
 data/scripts/gUnk_0800D1B4.inc                |    8 +-
 data/scripts/gUnk_0800D1C4.inc                |    9 -
 data/scripts/gUnk_0800D1D4.inc                |    7 -
 data/scripts/gUnk_0800D1E0.inc                |   24 +-
 data/scripts/gUnk_0800D207.inc                |   18 -
 data/scripts/gUnk_0800D218.inc                |    9 -
 data/scripts/gUnk_0800D242.inc                |    4 +
 data/scripts/gUnk_0800D24C.inc                |    4 +
 data/scripts/gUnk_0800D278.inc                |   91 +-
 data/scripts/gUnk_0800D2CE.inc                |   15 -
 data/scripts/gUnk_0800D306.inc                |    2 -
 data/scripts/gUnk_0800D308.inc                |    7 -
 data/scripts/gUnk_0800D30F.inc                |   66 -
 data/scripts/gUnk_0800D350.inc                |   40 -
 data/scripts/gUnk_0800D414.inc                |  164 +-
 data/scripts/gUnk_0800D44C.inc                |  116 -
 data/scripts/gUnk_0800D4BF.inc                |   30 -
 data/scripts/gUnk_0800D4DC.inc                |   87 -
 data/scripts/gUnk_0800D59C.inc                |   42 -
 data/scripts/gUnk_0800D5E5.inc                |   40 -
 data/scripts/gUnk_0800D60C.inc                |    9 -
 data/scripts/gUnk_0800D62B.inc                |  138 -
 data/scripts/gUnk_0800D698.inc                |    9 +
 data/scripts/gUnk_0800D6B4.inc                |    9 +-
 data/scripts/gUnk_0800D6BA.inc                |    7 -
 data/scripts/gUnk_0800D6F0.inc                |    6 +-
 data/scripts/gUnk_0800D702.inc                |    2 -
 data/scripts/gUnk_0800D703.inc                |   14 -
 data/scripts/gUnk_0800D710.inc                |   22 +-
 data/scripts/gUnk_0800D725.inc                |    4 -
 data/scripts/gUnk_0800D728.inc                |   17 -
 data/scripts/gUnk_0800D76C.inc                |   41 +-
 data/scripts/gUnk_0800D7CF.inc                |   14 -
 data/scripts/gUnk_0800D7DC.inc                |   44 -
 data/scripts/gUnk_0800D84C.inc                |   13 +
 data/scripts/gUnk_0800D874.inc                |   28 +-
 data/scripts/gUnk_0800D8E4.inc                |   11 -
 data/scripts/gUnk_0800D906.inc                |   31 -
 .../{gUnk_0800D3EC.inc => gUnk_0800D92C.inc}  |    9 +-
 data/scripts/gUnk_0800D954.inc                |   38 +-
 data/scripts/gUnk_0800D97D.inc                |    3 -
 data/scripts/gUnk_0800D981.inc                |   73 -
 .../{gUnk_0800AD54.inc => gUnk_0800DA00.inc}  |   10 +-
 data/scripts/gUnk_0800DA11.inc                |   24 -
 data/scripts/gUnk_0800DA28.inc                |    7 +-
 data/scripts/gUnk_0800DA4C.inc                |    2 -
 data/scripts/gUnk_0800DA4D.inc                |   20 -
 data/scripts/gUnk_0800DA60.inc                |   39 +-
 data/scripts/gUnk_0800DB18.inc                |    2 +-
 data/scripts/gUnk_0800DB28.inc                |   14 +-
 data/scripts/gUnk_0800DB4A.inc                |   12 -
 data/scripts/gUnk_0800DB78.inc                |   56 +-
 data/scripts/gUnk_0800DB88.inc                |   69 -
 data/scripts/gUnk_0800DC10.inc                |   10 -
 data/scripts/gUnk_0800DC19.inc                |   61 -
 data/scripts/gUnk_0800DC4C.inc                |   31 +
 data/scripts/gUnk_0800DC91.inc                |   28 -
 data/scripts/gUnk_0800DCAC.inc                |   68 +-
 data/scripts/gUnk_0800DCDC.inc                |   10 -
 data/scripts/gUnk_0800DD04.inc                |    7 -
 data/scripts/gUnk_0800DD10.inc                |   10 -
 data/scripts/gUnk_0800DD19.inc                |   10 -
 data/scripts/gUnk_0800DD22.inc                |   27 -
 data/scripts/gUnk_0800DD8D.inc                |   30 -
 data/scripts/gUnk_0800DDAA.inc                |   22 -
 data/scripts/gUnk_0800DDD0.inc                |   17 +
 data/scripts/gUnk_0800DDE8.inc                |    7 -
 data/scripts/gUnk_0800DDFC.inc                |    3 -
 data/scripts/gUnk_0800DE00.inc                |   40 +-
 data/scripts/gUnk_0800DE2C.inc                |   10 +
 data/scripts/gUnk_0800DE50.inc                |   14 +
 data/scripts/gUnk_0800DE78.inc                |    6 +-
 data/scripts/gUnk_0800DEB0.inc                |    2 +-
 data/scripts/gUnk_0800DED4.inc                |   17 +-
 data/scripts/gUnk_0800DEF6.inc                |    9 -
 data/scripts/gUnk_0800DF07.inc                |   30 -
 data/scripts/gUnk_0800DF24.inc                |   21 +-
 data/scripts/gUnk_0800DFB4.inc                |   12 +-
 data/scripts/gUnk_0800DFD0.inc                |    5 -
 data/scripts/gUnk_0800DFD7.inc                |    8 -
 data/scripts/gUnk_0800DFDE.inc                |    3 -
 data/scripts/gUnk_0800DFE4.inc                |   25 +-
 data/scripts/gUnk_0800E050.inc                |   24 +-
 data/scripts/gUnk_0800E094.inc                |   11 +
 data/scripts/gUnk_0800E0BC.inc                |  381 +-
 data/scripts/gUnk_0800E0F6.inc                |   38 -
 data/scripts/gUnk_0800E140.inc                |    8 -
 data/scripts/gUnk_0800E153.inc                |    2 -
 data/scripts/gUnk_0800E154.inc                |   31 -
 data/scripts/gUnk_0800E1C5.inc                |   60 -
 data/scripts/gUnk_0800E200.inc                |   64 -
 data/scripts/gUnk_0800E300.inc                |    5 -
 data/scripts/gUnk_0800E305.inc                |    2 -
 data/scripts/gUnk_0800E307.inc                |    6 -
 data/scripts/gUnk_0800E30C.inc                |   10 -
 data/scripts/gUnk_0800E329.inc                |   40 -
 data/scripts/gUnk_0800E350.inc                |   47 -
 data/scripts/gUnk_0800E3EE.inc                |    6 -
 data/scripts/gUnk_0800E3F9.inc                |    2 -
 data/scripts/gUnk_0800E3FA.inc                |    2 -
 data/scripts/gUnk_0800E3FC.inc                |    3 -
 data/scripts/gUnk_0800E400.inc                |    5 -
 data/scripts/gUnk_0800E408.inc                |    3 -
 data/scripts/gUnk_0800E40B.inc                |    4 -
 data/scripts/gUnk_0800E411.inc                |   32 -
 data/scripts/gUnk_0800E430.inc                |    3 -
 data/scripts/gUnk_0800E434.inc                |   17 -
 data/scripts/gUnk_0800E46C.inc                |   11 -
 data/scripts/gUnk_0800E489.inc                |    9 -
 data/scripts/gUnk_0800E499.inc                |   12 -
 data/scripts/gUnk_0800E4A4.inc                |   19 -
 data/scripts/gUnk_0800E4E3.inc                |   34 -
 data/scripts/gUnk_0800E504.inc                |   17 +-
 data/scripts/gUnk_0800E50C.inc                |   15 -
 data/scripts/gUnk_0800E544.inc                |    4 +-
 data/scripts/gUnk_0800E58C.inc                |    2 +-
 data/scripts/gUnk_0800E5C4.inc                |   21 -
 data/scripts/gUnk_0800E5D6.inc                |   13 +
 data/scripts/gUnk_0800E600.inc                |   10 +-
 data/scripts/gUnk_0800E60E.inc                |   16 -
 data/scripts/gUnk_0800E62C.inc                |    6 +-
 data/scripts/gUnk_0800E658.inc                |    6 +-
 data/scripts/gUnk_0800E684.inc                |    6 +-
 data/scripts/gUnk_0800E6B0.inc                |  167 +-
 data/scripts/gUnk_0800E6E8.inc                |   12 -
 data/scripts/gUnk_0800E707.inc                |    4 -
 data/scripts/gUnk_0800E70A.inc                |   15 -
 data/scripts/gUnk_0800E734.inc                |   15 -
 data/scripts/gUnk_0800E760.inc                |   33 -
 data/scripts/gUnk_0800E7D9.inc                |   28 -
 data/scripts/gUnk_0800E7F4.inc                |    4 -
 data/scripts/gUnk_0800E7FA.inc                |   39 -
 data/scripts/gUnk_0800E823.inc                |    2 -
 data/scripts/gUnk_0800E824.inc                |  133 -
 data/scripts/gUnk_0800E8A4.inc                |   19 +
 data/scripts/gUnk_0800E8D6.inc                |   19 +
 data/scripts/gUnk_0800E8DB.inc                |   70 -
 data/scripts/gUnk_0800E908.inc                |   75 +
 data/scripts/gUnk_0800E920.inc                |   20 -
 data/scripts/gUnk_0800E964.inc                |   31 -
 data/scripts/gUnk_0800E9D6.inc                |   11 -
 data/scripts/gUnk_0800EA1C.inc                |    2 +-
 data/scripts/gUnk_0800EA54.inc                |  358 +-
 data/scripts/gUnk_0800EAA4.inc                |   21 -
 data/scripts/gUnk_0800EAEB.inc                |   14 -
 data/scripts/gUnk_0800EAF8.inc                |   17 -
 data/scripts/gUnk_0800EB2C.inc                |   17 -
 data/scripts/gUnk_0800EB64.inc                |   26 -
 data/scripts/gUnk_0800EBC0.inc                |    9 -
 data/scripts/gUnk_0800EBDC.inc                |    3 -
 data/scripts/gUnk_0800EBE0.inc                |    9 -
 data/scripts/gUnk_0800EBF0.inc                |    9 -
 data/scripts/gUnk_0800EC08.inc                |    5 -
 data/scripts/gUnk_0800EC14.inc                |   19 -
 data/scripts/gUnk_0800EC54.inc                |    5 -
 data/scripts/gUnk_0800EC61.inc                |   44 -
 data/scripts/gUnk_0800EC8C.inc                |   26 -
 data/scripts/gUnk_0800ECF1.inc                |   20 -
 data/scripts/gUnk_0800ED04.inc                |    5 -
 data/scripts/gUnk_0800ED0C.inc                |    2 -
 data/scripts/gUnk_0800ED0D.inc                |   80 -
 data/scripts/gUnk_0800ED5C.inc                |   17 -
 data/scripts/gUnk_0800ED90.inc                |   22 -
 data/scripts/gUnk_0800EDD9.inc                |    8 -
 data/scripts/gUnk_0800EDE0.inc                |   42 -
 data/scripts/gUnk_0800EE09.inc                |   72 -
 data/scripts/gUnk_0800EE50.inc                |   19 -
 data/scripts/gUnk_0800EE8C.inc                |   21 -
 data/scripts/gUnk_0800EEE0.inc                |   30 -
 data/scripts/gUnk_0800EEFD.inc                |    6 -
 data/scripts/gUnk_0800EF07.inc                |   12 -
 data/scripts/gUnk_0800EF12.inc                |   24 -
 data/scripts/gUnk_0800EF40.inc                |    6 +-
 data/scripts/gUnk_0800EF93.inc                |   46 -
 data/scripts/gUnk_0800EF9C.inc                |   11 +
 data/scripts/gUnk_0800EFC0.inc                |  126 +-
 data/scripts/gUnk_0800EFE0.inc                |    3 -
 data/scripts/gUnk_0800EFE4.inc                |   87 -
 data/scripts/gUnk_0800F090.inc                |    3 -
 data/scripts/gUnk_0800F094.inc                |   34 -
 data/scripts/gUnk_0800F0D6.inc                |    7 -
 data/scripts/gUnk_0800F0E2.inc                |    6 -
 data/scripts/gUnk_0800F0F2.inc                |    2 -
 data/scripts/gUnk_0800F0F3.inc                |    2 -
 data/scripts/gUnk_0800F0F4.inc                |   45 -
 data/scripts/gUnk_0800F14C.inc                |    2 +-
 data/scripts/gUnk_0800F184.inc                |  128 +-
 data/scripts/gUnk_0800F1DE.inc                |    4 -
 data/scripts/gUnk_0800F1E1.inc                |    3 -
 data/scripts/gUnk_0800F1E5.inc                |    2 -
 data/scripts/gUnk_0800F1E7.inc                |    4 -
 data/scripts/gUnk_0800F1ED.inc                |    8 -
 data/scripts/gUnk_0800F1FB.inc                |    2 -
 data/scripts/gUnk_0800F1FD.inc                |    4 -
 data/scripts/gUnk_0800F203.inc                |    3 -
 data/scripts/gUnk_0800F207.inc                |   10 -
 data/scripts/gUnk_0800F210.inc                |   53 -
 data/scripts/gUnk_0800F2EB.inc                |    6 -
 data/scripts/gUnk_0800F2F0.inc                |    2 -
 data/scripts/gUnk_0800F2F2.inc                |    8 -
 data/scripts/gUnk_0800F303.inc                |  154 -
 data/scripts/gUnk_0800F33C.inc                |    7 +
 data/scripts/gUnk_0800F354.inc                |    7 +
 data/scripts/gUnk_0800F36C.inc                |    7 +
 data/scripts/gUnk_0800F384.inc                |    7 +
 data/scripts/gUnk_0800F39C.inc                |   30 +-
 data/scripts/gUnk_0800F3DB.inc                |    6 -
 data/scripts/gUnk_0800F3E5.inc                |    2 -
 data/scripts/gUnk_0800F3E6.inc                |    2 -
 data/scripts/gUnk_0800F3E8.inc                |    4 -
 data/scripts/gUnk_0800F3EB.inc                |    2 -
 data/scripts/gUnk_0800F3ED.inc                |    5 -
 data/scripts/gUnk_0800F3F5.inc                |    3 -
 data/scripts/gUnk_0800F3F9.inc                |    8 -
 data/scripts/gUnk_0800F400.inc                |    5 -
 data/scripts/gUnk_0800F408.inc                |    2 -
 data/scripts/gUnk_0800F409.inc                |    8 -
 data/scripts/gUnk_0800F410.inc                |   12 -
 data/scripts/gUnk_0800F426.inc                |    6 -
 data/scripts/gUnk_0800F430.inc                |    2 +-
 data/scripts/gUnk_0800F4C4.inc                |   33 +-
 data/scripts/gUnk_0800F4EA.inc                |    2 -
 data/scripts/gUnk_0800F4EB.inc                |    3 -
 data/scripts/gUnk_0800F4EF.inc                |    2 -
 data/scripts/gUnk_0800F4F0.inc                |    2 -
 data/scripts/gUnk_0800F4F1.inc                |    2 -
 data/scripts/gUnk_0800F4F3.inc                |    3 -
 data/scripts/gUnk_0800F4F7.inc                |    2 -
 data/scripts/gUnk_0800F4F9.inc                |    5 -
 data/scripts/gUnk_0800F501.inc                |   14 -
 data/scripts/gUnk_0800F50E.inc                |   22 -
 data/scripts/gUnk_0800F554.inc                |  154 +-
 data/scripts/gUnk_0800F584.inc                |    7 -
 data/scripts/gUnk_0800F58F.inc                |   34 -
 data/scripts/gUnk_0800F5B0.inc                |   18 -
 data/scripts/gUnk_0800F5E9.inc                |    4 -
 data/scripts/gUnk_0800F5EC.inc                |    2 -
 data/scripts/gUnk_0800F5ED.inc                |    2 -
 data/scripts/gUnk_0800F5EE.inc                |    2 -
 data/scripts/gUnk_0800F5EF.inc                |    2 -
 data/scripts/gUnk_0800F5F0.inc                |    2 -
 data/scripts/gUnk_0800F5F2.inc                |    2 -
 data/scripts/gUnk_0800F5F4.inc                |    5 -
 data/scripts/gUnk_0800F5FC.inc                |    4 -
 data/scripts/gUnk_0800F5FF.inc                |    8 -
 data/scripts/gUnk_0800F606.inc                |    2 -
 data/scripts/gUnk_0800F607.inc                |    2 -
 data/scripts/gUnk_0800F608.inc                |    2 -
 data/scripts/gUnk_0800F60A.inc                |   10 -
 data/scripts/gUnk_0800F628.inc                |   15 -
 data/scripts/gUnk_0800F650.inc                |   19 -
 data/scripts/gUnk_0800F688.inc                |    8 -
 data/scripts/gUnk_0800F6A0.inc                |   12 -
 data/scripts/gUnk_0800F6C8.inc                |    7 -
 data/scripts/gUnk_0800F6E0.inc                |    5 -
 data/scripts/gUnk_0800F6E9.inc                |    4 -
 data/scripts/gUnk_0800F6EC.inc                |    2 -
 data/scripts/gUnk_0800F6ED.inc                |    2 -
 data/scripts/gUnk_0800F6EE.inc                |    2 -
 data/scripts/gUnk_0800F6EF.inc                |    2 -
 data/scripts/gUnk_0800F6F0.inc                |    2 -
 data/scripts/gUnk_0800F6F1.inc                |    2 -
 data/scripts/gUnk_0800F6F2.inc                |    2 -
 data/scripts/gUnk_0800F6F3.inc                |    2 -
 data/scripts/gUnk_0800F6F4.inc                |    3 -
 data/scripts/gUnk_0800F6F9.inc                |    6 -
 data/scripts/gUnk_0800F6FE.inc                |    3 -
 data/scripts/gUnk_0800F702.inc                |    3 -
 data/scripts/gUnk_0800F706.inc                |    9 -
 data/scripts/gUnk_0800F71E.inc                |    3 -
 data/scripts/gUnk_0800F724.inc                |  234 +-
 data/scripts/gUnk_0800F734.inc                |    4 -
 data/scripts/gUnk_0800F73C.inc                |   37 -
 data/scripts/gUnk_0800F7E6.inc                |    6 -
 data/scripts/gUnk_0800F7EB.inc                |    4 -
 data/scripts/gUnk_0800F7EE.inc                |    2 -
 data/scripts/gUnk_0800F7EF.inc                |    2 -
 data/scripts/gUnk_0800F7F0.inc                |    3 -
 data/scripts/gUnk_0800F7F4.inc                |    2 -
 data/scripts/gUnk_0800F7F5.inc                |    2 -
 data/scripts/gUnk_0800F7F7.inc                |    6 -
 data/scripts/gUnk_0800F7FC.inc                |    2 -
 data/scripts/gUnk_0800F7FD.inc                |    2 -
 data/scripts/gUnk_0800F7FF.inc                |    2 -
 data/scripts/gUnk_0800F800.inc                |    6 -
 data/scripts/gUnk_0800F805.inc                |    4 -
 data/scripts/gUnk_0800F808.inc                |  232 --
 data/scripts/gUnk_0800F8EF.inc                |    2 -
 data/scripts/gUnk_0800F8F0.inc                |    2 -
 data/scripts/gUnk_0800F8F1.inc                |    2 -
 data/scripts/gUnk_0800F8F2.inc                |    2 -
 data/scripts/gUnk_0800F8F3.inc                |    2 -
 data/scripts/gUnk_0800F8F4.inc                |    2 -
 data/scripts/gUnk_0800F8F5.inc                |    4 -
 data/scripts/gUnk_0800F8F8.inc                |    2 -
 data/scripts/gUnk_0800F8F9.inc                |    8 -
 data/scripts/gUnk_0800F900.inc                |    2 -
 data/scripts/gUnk_0800F902.inc                |   10 -
 data/scripts/gUnk_0800F916.inc                |   49 -
 data/scripts/gUnk_0800F9F0.inc                |    2 -
 data/scripts/gUnk_0800F9F2.inc                |    2 -
 data/scripts/gUnk_0800F9F3.inc                |    2 -
 data/scripts/gUnk_0800F9F4.inc                |    2 -
 data/scripts/gUnk_0800F9F6.inc                |    2 -
 data/scripts/gUnk_0800F9F7.inc                |    2 -
 data/scripts/gUnk_0800F9F8.inc                |    6 -
 data/scripts/gUnk_0800FA02.inc                |    3 -
 data/scripts/gUnk_0800FA07.inc                |    2 -
 data/scripts/gUnk_0800FA08.inc                |    2 -
 data/scripts/gUnk_0800FA09.inc                |    3 -
 data/scripts/gUnk_0800FA0D.inc                |  108 -
 data/scripts/gUnk_0800FA54.inc                |   10 +
 data/scripts/gUnk_0800FA78.inc                |   20 +-
 .../{gUnk_0801635C.inc => gUnk_0800FA9C.inc}  |    9 +-
 data/scripts/gUnk_0800FAC0.inc                |    2 +-
 data/scripts/gUnk_0800FAE4.inc                |   27 +-
 data/scripts/gUnk_0800FAF3.inc                |    2 -
 data/scripts/gUnk_0800FAF5.inc                |    2 -
 data/scripts/gUnk_0800FAF6.inc                |    2 -
 data/scripts/gUnk_0800FAF7.inc                |    2 -
 data/scripts/gUnk_0800FAF8.inc                |    6 -
 data/scripts/gUnk_0800FAFD.inc                |    2 -
 data/scripts/gUnk_0800FAFE.inc                |    2 -
 data/scripts/gUnk_0800FAFF.inc                |    2 -
 data/scripts/gUnk_0800FB00.inc                |    2 -
 data/scripts/gUnk_0800FB01.inc                |    2 -
 data/scripts/gUnk_0800FB02.inc                |    2 -
 data/scripts/gUnk_0800FB04.inc                |    3 -
 data/scripts/gUnk_0800FB08.inc                |    2 -
 data/scripts/gUnk_0800FB0A.inc                |   40 -
 data/scripts/gUnk_0800FB2C.inc                |    7 +
 data/scripts/gUnk_0800FB31.inc                |   20 -
 data/scripts/gUnk_0800FB44.inc                |   79 +-
 data/scripts/gUnk_0800FBBB.inc                |   54 -
 data/scripts/gUnk_0800FBF0.inc                |    4 -
 data/scripts/gUnk_0800FBF3.inc                |    2 -
 data/scripts/gUnk_0800FBF5.inc                |    2 -
 data/scripts/gUnk_0800FBF6.inc                |    2 -
 data/scripts/gUnk_0800FBF8.inc                |    2 -
 data/scripts/gUnk_0800FBF9.inc                |    2 -
 data/scripts/gUnk_0800FBFA.inc                |    2 -
 data/scripts/gUnk_0800FBFB.inc                |    2 -
 data/scripts/gUnk_0800FBFC.inc                |    4 -
 data/scripts/gUnk_0800FBFF.inc                |    2 -
 data/scripts/gUnk_0800FC00.inc                |    2 -
 data/scripts/gUnk_0800FC01.inc                |    3 -
 data/scripts/gUnk_0800FC05.inc                |    2 -
 data/scripts/gUnk_0800FC06.inc                |    2 -
 data/scripts/gUnk_0800FC08.inc                |    2 -
 data/scripts/gUnk_0800FC09.inc                |    6 -
 data/scripts/gUnk_0800FC0E.inc                |   12 -
 data/scripts/gUnk_0800FC24.inc                |   44 -
 data/scripts/gUnk_0800FCEA.inc                |    3 -
 data/scripts/gUnk_0800FCEE.inc                |    3 -
 data/scripts/gUnk_0800FCF2.inc                |    2 -
 data/scripts/gUnk_0800FCF3.inc                |    2 -
 data/scripts/gUnk_0800FCF5.inc                |    2 -
 data/scripts/gUnk_0800FCF7.inc                |    2 -
 data/scripts/gUnk_0800FCF8.inc                |    2 -
 data/scripts/gUnk_0800FCFA.inc                |    2 -
 data/scripts/gUnk_0800FCFB.inc                |    2 -
 data/scripts/gUnk_0800FCFC.inc                |    2 -
 data/scripts/gUnk_0800FCFE.inc                |    2 -
 data/scripts/gUnk_0800FCFF.inc                |    2 -
 data/scripts/gUnk_0800FD00.inc                |    2 -
 data/scripts/gUnk_0800FD01.inc                |    4 -
 data/scripts/gUnk_0800FD04.inc                |    2 -
 data/scripts/gUnk_0800FD05.inc                |    8 -
 data/scripts/gUnk_0800FD0C.inc                |   39 +-
 data/scripts/gUnk_0800FD16.inc                |   12 -
 data/scripts/gUnk_0800FD21.inc                |   96 -
 data/scripts/gUnk_0800FD80.inc                |    9 -
 data/scripts/gUnk_0800FDA0.inc                |  101 +-
 data/scripts/gUnk_0800FDCC.inc                |   12 -
 data/scripts/gUnk_0800FDF2.inc                |    2 -
 data/scripts/gUnk_0800FDF3.inc                |    8 -
 data/scripts/gUnk_0800FDFA.inc                |    2 -
 data/scripts/gUnk_0800FDFC.inc                |    2 -
 data/scripts/gUnk_0800FDFE.inc                |    2 -
 data/scripts/gUnk_0800FDFF.inc                |    2 -
 data/scripts/gUnk_0800FE00.inc                |    2 -
 data/scripts/gUnk_0800FE01.inc                |    2 -
 data/scripts/gUnk_0800FE02.inc                |    2 -
 data/scripts/gUnk_0800FE04.inc                |    2 -
 data/scripts/gUnk_0800FE06.inc                |    2 -
 data/scripts/gUnk_0800FE07.inc                |    2 -
 data/scripts/gUnk_0800FE08.inc                |    2 -
 data/scripts/gUnk_0800FE09.inc                |   56 -
 data/scripts/gUnk_0800FE40.inc                |    3 -
 data/scripts/gUnk_0800FE44.inc                |   11 -
 data/scripts/gUnk_0800FE64.inc                |   12 -
 data/scripts/gUnk_0800FE88.inc                |   14 -
 data/scripts/gUnk_0800FEBC.inc                |   16 -
 data/scripts/gUnk_0800FEF0.inc                |    2 -
 data/scripts/gUnk_0800FEF2.inc                |    8 -
 data/scripts/gUnk_0800FEF9.inc                |    4 -
 data/scripts/gUnk_0800FEFC.inc                |    2 -
 data/scripts/gUnk_0800FEFE.inc                |    4 -
 data/scripts/gUnk_0800FF01.inc                |    2 -
 data/scripts/gUnk_0800FF03.inc                |    2 -
 data/scripts/gUnk_0800FF04.inc                |    2 -
 data/scripts/gUnk_0800FF05.inc                |    2 -
 data/scripts/gUnk_0800FF06.inc                |    2 -
 data/scripts/gUnk_0800FF08.inc                |    6 -
 data/scripts/gUnk_0800FF18.inc                |   31 +-
 data/scripts/gUnk_0800FF2A.inc                |   38 -
 data/scripts/gUnk_0800FF74.inc                |  121 +-
 data/scripts/gUnk_0800FFB0.inc                |    4 -
 data/scripts/gUnk_0800FFBB.inc                |   28 -
 data/scripts/gUnk_0800FFD6.inc                |   13 -
 data/scripts/gUnk_0800FFEE.inc                |    4 -
 data/scripts/gUnk_0800FFF6.inc                |    4 -
 data/scripts/gUnk_0800FFFC.inc                |    2 -
 data/scripts/gUnk_0800FFFD.inc                |    2 -
 data/scripts/gUnk_0800FFFF.inc                |    2 -
 data/scripts/gUnk_08010000.inc                |    2 -
 data/scripts/gUnk_08010001.inc                |    2 -
 data/scripts/gUnk_08010002.inc                |    2 -
 data/scripts/gUnk_08010003.inc                |    2 -
 data/scripts/gUnk_08010005.inc                |    2 -
 data/scripts/gUnk_08010007.inc                |    2 -
 data/scripts/gUnk_08010008.inc                |    2 -
 data/scripts/gUnk_08010009.inc                |    2 -
 data/scripts/gUnk_0801000A.inc                |    2 -
 data/scripts/gUnk_0801000C.inc                |    2 -
 data/scripts/gUnk_0801000D.inc                |    2 -
 data/scripts/gUnk_0801000E.inc                |    2 -
 data/scripts/gUnk_0801000F.inc                |   10 -
 data/scripts/gUnk_08010018.inc                |    4 -
 data/scripts/gUnk_0801001B.inc                |    2 -
 data/scripts/gUnk_0801001D.inc                |    4 -
 data/scripts/gUnk_08010023.inc                |   34 -
 data/scripts/gUnk_08010044.inc                |   27 -
 data/scripts/gUnk_08010098.inc                |    2 -
 data/scripts/gUnk_08010099.inc                |   21 -
 data/scripts/gUnk_080100C1.inc                |    8 -
 data/scripts/gUnk_080100C8.inc                |  128 +-
 data/scripts/gUnk_080100F5.inc                |    8 -
 data/scripts/gUnk_080100FC.inc                |    2 -
 data/scripts/gUnk_080100FE.inc                |    2 -
 data/scripts/gUnk_080100FF.inc                |    2 -
 data/scripts/gUnk_08010100.inc                |    2 -
 data/scripts/gUnk_08010102.inc                |    2 -
 data/scripts/gUnk_08010103.inc                |    2 -
 data/scripts/gUnk_08010105.inc                |    2 -
 data/scripts/gUnk_08010106.inc                |    3 -
 data/scripts/gUnk_0801010A.inc                |    4 -
 data/scripts/gUnk_08010111.inc                |   16 -
 data/scripts/gUnk_08010120.inc                |    7 -
 data/scripts/gUnk_08010130.inc                |   11 -
 data/scripts/gUnk_08010148.inc                |   47 -
 data/scripts/gUnk_080101FA.inc                |    4 -
 data/scripts/gUnk_080101FD.inc                |    2 -
 data/scripts/gUnk_080101FF.inc                |    2 -
 data/scripts/gUnk_08010200.inc                |    4 -
 data/scripts/gUnk_08010203.inc                |    3 -
 data/scripts/gUnk_08010207.inc                |    2 -
 data/scripts/gUnk_08010208.inc                |    3 -
 data/scripts/gUnk_0801020C.inc                |   11 -
 data/scripts/gUnk_08010220.inc                |   12 -
 data/scripts/gUnk_08010236.inc                |   24 -
 data/scripts/gUnk_08010264.inc                |  545 ++-
 data/scripts/gUnk_08010294.inc                |   24 -
 data/scripts/gUnk_080102E0.inc                |   10 -
 data/scripts/gUnk_080102FB.inc                |    2 -
 data/scripts/gUnk_080102FD.inc                |    2 -
 data/scripts/gUnk_080102FE.inc                |    6 -
 data/scripts/gUnk_08010303.inc                |    2 -
 data/scripts/gUnk_08010304.inc                |    2 -
 data/scripts/gUnk_08010305.inc                |    6 -
 data/scripts/gUnk_0801030A.inc                |    2 -
 data/scripts/gUnk_0801030C.inc                |    8 -
 data/scripts/gUnk_08010320.inc                |   72 -
 data/scripts/gUnk_080103B0.inc                |   10 -
 data/scripts/gUnk_080103D0.inc                |   11 -
 data/scripts/gUnk_080103F8.inc                |    4 -
 data/scripts/gUnk_080103FD.inc                |    4 -
 data/scripts/gUnk_08010400.inc                |    3 -
 data/scripts/gUnk_08010406.inc                |    2 -
 data/scripts/gUnk_08010407.inc                |    4 -
 data/scripts/gUnk_0801040A.inc                |   16 -
 data/scripts/gUnk_08010428.inc                |   13 -
 data/scripts/gUnk_08010454.inc                |   15 -
 data/scripts/gUnk_08010480.inc                |   17 -
 data/scripts/gUnk_080104A0.inc                |   20 -
 data/scripts/gUnk_080104EC.inc                |   10 -
 data/scripts/gUnk_080104FF.inc                |    2 -
 data/scripts/gUnk_08010501.inc                |    2 -
 data/scripts/gUnk_08010502.inc                |    2 -
 data/scripts/gUnk_08010503.inc                |    8 -
 data/scripts/gUnk_0801050A.inc                |    2 -
 data/scripts/gUnk_0801050B.inc                |   28 -
 data/scripts/gUnk_08010526.inc                |  122 -
 data/scripts/gUnk_0801059F.inc                |   22 -
 data/scripts/gUnk_080105C9.inc                |   26 -
 data/scripts/gUnk_080105FB.inc                |    3 -
 data/scripts/gUnk_080105FF.inc                |    2 -
 data/scripts/gUnk_08010600.inc                |    5 -
 data/scripts/gUnk_0801060A.inc                |    3 -
 data/scripts/gUnk_0801060D.inc                |    6 -
 data/scripts/gUnk_08010617.inc                |    6 -
 data/scripts/gUnk_0801061C.inc                |   14 -
 data/scripts/gUnk_08010644.inc                |    5 -
 data/scripts/gUnk_08010650.inc                |   17 -
 data/scripts/gUnk_08010674.inc                |   25 -
 data/scripts/gUnk_080106AC.inc                |   36 -
 data/scripts/gUnk_08010700.inc                |    2 -
 data/scripts/gUnk_08010701.inc                |    3 -
 data/scripts/gUnk_08010705.inc                |   10 -
 data/scripts/gUnk_0801070E.inc                |   12 -
 data/scripts/gUnk_08010734.inc                |   31 -
 data/scripts/gUnk_08010794.inc                |   19 -
 data/scripts/gUnk_080107D0.inc                |   18 -
 data/scripts/gUnk_0801080A.inc                |    2 -
 data/scripts/gUnk_0801080B.inc                |    6 -
 data/scripts/gUnk_08010815.inc                |    4 -
 data/scripts/gUnk_0801081B.inc                |  182 -
 data/scripts/gUnk_080108D0.inc                |   12 -
 data/scripts/gUnk_080108FF.inc                |   14 -
 data/scripts/gUnk_0801090C.inc                |    3 -
 data/scripts/gUnk_0801090F.inc                |    5 -
 data/scripts/gUnk_08010917.inc                |   78 -
 data/scripts/gUnk_08010964.inc                |   30 +-
 data/scripts/gUnk_080109A0.inc                |   22 -
 data/scripts/gUnk_080109F0.inc                |   11 +-
 data/scripts/gUnk_080109F6.inc                |    9 -
 data/scripts/gUnk_08010A14.inc                |   10 +-
 data/scripts/gUnk_08010A1F.inc                |   26 -
 data/scripts/gUnk_08010A38.inc                |    2 +-
 data/scripts/gUnk_08010A5C.inc                |    8 +-
 data/scripts/gUnk_08010A98.inc                |   75 +-
 data/scripts/gUnk_08010AE4.inc                |   12 -
 data/scripts/gUnk_08010B04.inc                |   27 -
 data/scripts/gUnk_08010B68.inc                |    4 +-
 data/scripts/gUnk_08010BB4.inc                |  164 +-
 data/scripts/gUnk_08010BEC.inc                |    8 -
 data/scripts/gUnk_08010BF9.inc                |    6 -
 data/scripts/gUnk_08010BFE.inc                |   15 -
 data/scripts/gUnk_08010C1A.inc                |   53 -
 data/scripts/gUnk_08010D03.inc                |  254 --
 data/scripts/gUnk_08010E00.inc                |   14 -
 data/scripts/gUnk_08010E0D.inc                |  244 --
 data/scripts/gUnk_08010E5A.inc                |  101 +
 data/scripts/gUnk_08010F00.inc                |  256 --
 data/scripts/gUnk_08010F84.inc                |   83 +
 data/scripts/gUnk_08010FFF.inc                |    2 -
 data/scripts/gUnk_08011000.inc                |    2 -
 data/scripts/gUnk_08011001.inc                |   16 -
 data/scripts/gUnk_0801101F.inc                |   86 -
 data/scripts/gUnk_08011074.inc                |    6 +-
 data/scripts/gUnk_08011083.inc                |   90 -
 data/scripts/gUnk_08011098.inc                |    9 +
 data/scripts/gUnk_080110BC.inc                |   12 +
 data/scripts/gUnk_080110DC.inc                |    7 -
 data/scripts/gUnk_080110E8.inc                |    8 +-
 data/scripts/gUnk_08011128.inc                |    2 +-
 data/scripts/gUnk_080111CC.inc                |   48 +-
 data/scripts/gUnk_08011208.inc                |   22 -
 data/scripts/gUnk_0801121D.inc                |  168 -
 data/scripts/gUnk_080112C4.inc                |   52 +-
 data/scripts/gUnk_0801130F.inc                |   26 -
 data/scripts/gUnk_08011328.inc                |  119 -
 data/scripts/gUnk_080113AA.inc                |   34 +
 data/scripts/gUnk_08011403.inc                |  462 ---
 data/scripts/gUnk_08011442.inc                |   43 +
 data/scripts/gUnk_08011508.inc                |   44 +
 data/scripts/gUnk_08011640.inc                |    4 +-
 data/scripts/gUnk_080116A8.inc                |   37 +-
 data/scripts/gUnk_08011809.inc                |   52 -
 data/scripts/gUnk_0801183C.inc                |   38 +-
 data/scripts/gUnk_08011890.inc                |   16 +
 data/scripts/gUnk_080118D4.inc                |    8 +-
 data/scripts/gUnk_08011930.inc                |    2 +-
 data/scripts/gUnk_0801194C.inc                |  188 +
 data/scripts/gUnk_08011958.inc                |    5 -
 data/scripts/gUnk_08011964.inc                |   22 -
 data/scripts/gUnk_080119B0.inc                |   11 -
 data/scripts/gUnk_080119D8.inc                |    5 -
 data/scripts/gUnk_080119E4.inc                |    5 -
 data/scripts/gUnk_080119F0.inc                |    9 -
 data/scripts/gUnk_08011A04.inc                |   21 -
 data/scripts/gUnk_08011A2C.inc                |   17 -
 data/scripts/gUnk_08011A64.inc                |   47 -
 data/scripts/gUnk_08011AE4.inc                |    9 -
 data/scripts/gUnk_08011B04.inc                |   15 -
 data/scripts/gUnk_08011B20.inc                |    9 +-
 data/scripts/gUnk_08011B40.inc                |   54 +-
 data/scripts/gUnk_08011BE4.inc                |   11 -
 data/scripts/gUnk_08011C04.inc                |   22 -
 data/scripts/gUnk_08011C50.inc                |    7 +-
 data/scripts/gUnk_08011C7C.inc                |  471 ++-
 data/scripts/gUnk_08011D28.inc                |   56 -
 data/scripts/gUnk_08011DD4.inc                |   17 -
 data/scripts/gUnk_08011E04.inc                |   63 -
 data/scripts/gUnk_08011E80.inc                |   45 -
 data/scripts/gUnk_08011F0C.inc                |   45 -
 data/scripts/gUnk_08011F98.inc                |   45 -
 data/scripts/gUnk_08012024.inc                |   34 -
 data/scripts/gUnk_08012091.inc                |   32 -
 data/scripts/gUnk_080120B0.inc                |   21 -
 data/scripts/gUnk_080120ED.inc                |    8 -
 data/scripts/gUnk_080120FB.inc                |   66 -
 data/scripts/gUnk_0801213C.inc                |   42 -
 data/scripts/gUnk_080121C8.inc                |   19 -
 data/scripts/gUnk_08012200.inc                |   19 -
 data/scripts/gUnk_08012238.inc                |   19 -
 data/scripts/gUnk_08012270.inc                |   57 -
 data/scripts/gUnk_0801232C.inc                |   56 +-
 data/scripts/gUnk_08012360.inc                |   50 -
 data/scripts/gUnk_08012410.inc                |    2 +-
 data/scripts/gUnk_08012430.inc                |  145 +-
 data/scripts/gUnk_08012480.inc                |  132 -
 data/scripts/gUnk_080126FC.inc                |  293 ++
 data/scripts/gUnk_08012AB0.inc                |  121 +-
 data/scripts/gUnk_08012AF0.inc                |   11 +
 data/scripts/gUnk_08012B18.inc                |    4 +
 data/scripts/gUnk_08012B24.inc                |   16 +
 data/scripts/gUnk_08012B50.inc                |   16 +
 data/scripts/gUnk_08012B7C.inc                |   16 +
 data/scripts/gUnk_08012BF8.inc                |   16 +-
 data/scripts/gUnk_08012C0C.inc                |   31 -
 data/scripts/gUnk_08012C48.inc                |   24 -
 data/scripts/gUnk_08012C68.inc                |   34 +
 data/scripts/gUnk_08012C98.inc                |   19 -
 data/scripts/gUnk_08012CD8.inc                |    4 +-
 data/scripts/gUnk_08012D18.inc                |    6 +-
 data/scripts/gUnk_08012D70.inc                |   10 +-
 data/scripts/gUnk_08012DA1.inc                |   16 -
 data/scripts/gUnk_08012DB0.inc                |    2 +-
 data/scripts/gUnk_08012DD8.inc                |   20 -
 data/scripts/gUnk_08012DF8.inc                |   12 +
 data/scripts/gUnk_08012E88.inc                |   75 +-
 data/scripts/gUnk_08012EC0.inc                |   19 -
 data/scripts/gUnk_08012F0C.inc                |  155 -
 data/scripts/gUnk_08012F86.inc                |  114 +
 data/scripts/gUnk_08013001.inc                |    2 -
 data/scripts/gUnk_08013003.inc                |    5 -
 data/scripts/gUnk_0801300B.inc                |   50 -
 data/scripts/gUnk_0801303C.inc                |   27 -
 data/scripts/gUnk_08013070.inc                |    9 -
 data/scripts/gUnk_08013081.inc                |   16 -
 data/scripts/gUnk_08013090.inc                |   36 -
 data/scripts/gUnk_08013114.inc                |   38 +-
 data/scripts/gUnk_08013188.inc                |   16 -
 .../{gUnk_080131AC.inc => gUnk_0801319A.inc}  |   41 +-
 data/scripts/gUnk_080132E4.inc                |   20 +-
 data/scripts/gUnk_0801330C.inc                |   11 +
 data/scripts/gUnk_08013330.inc                |    2 +-
 data/scripts/gUnk_0801334C.inc                |    2 +-
 data/scripts/gUnk_08013378.inc                |   12 +-
 data/scripts/gUnk_080133C4.inc                |    4 +-
 data/scripts/gUnk_080133F8.inc                |   49 +-
 data/scripts/gUnk_08013494.inc                |   18 +
 data/scripts/gUnk_080134DC.inc                |  146 +-
 data/scripts/gUnk_08013650.inc                |   28 +
 data/scripts/gUnk_080136B4.inc                |   10 +
 data/scripts/gUnk_080136D8.inc                |   31 +-
 data/scripts/gUnk_08013720.inc                |  133 +-
 data/scripts/gUnk_080137DA.inc                |  110 -
 data/scripts/gUnk_080138B4.inc                |  181 +-
 data/scripts/gUnk_08013AA6.inc                |   33 +
 data/scripts/gUnk_08013B18.inc                |   29 +-
 data/scripts/gUnk_08013B70.inc                |   12 -
 data/scripts/gUnk_08013BA8.inc                |   20 +-
 data/scripts/gUnk_08013BE8.inc                |   16 +-
 data/scripts/gUnk_08013CA4.inc                |  140 +-
 data/scripts/gUnk_08013D04.inc                |   25 +
 data/scripts/gUnk_08013D44.inc                |   25 +
 data/scripts/gUnk_08013D84.inc                |   25 +
 data/scripts/gUnk_08013DC4.inc                |   25 +
 data/scripts/gUnk_08013E04.inc                |   18 -
 data/scripts/gUnk_08013E28.inc                |   11 +
 data/scripts/gUnk_08013E94.inc                |    2 +-
 data/scripts/gUnk_08013EB0.inc                |    2 +-
 data/scripts/gUnk_08013ECC.inc                |    2 +-
 data/scripts/gUnk_08013EE8.inc                |    2 +-
 data/scripts/gUnk_08013F04.inc                |    2 +-
 data/scripts/gUnk_08013F34.inc                |    2 +-
 data/scripts/gUnk_08013F64.inc                |    2 +-
 data/scripts/gUnk_08013F94.inc                |    6 +-
 data/scripts/gUnk_08013FE8.inc                |   13 +-
 data/scripts/gUnk_08014054.inc                |    2 +-
 data/scripts/gUnk_08014074.inc                |    2 +-
 data/scripts/gUnk_08014094.inc                |   20 +-
 data/scripts/gUnk_080140B8.inc                |   10 +
 data/scripts/gUnk_080140DC.inc                |   11 +-
 data/scripts/gUnk_080140F8.inc                |    8 -
 data/scripts/gUnk_08014118.inc                |    4 +-
 data/scripts/gUnk_08014154.inc                |   38 +-
 data/scripts/gUnk_08014198.inc                |   17 +
 data/scripts/gUnk_080141DC.inc                |   11 +-
 data/scripts/gUnk_08014210.inc                |   35 +-
 .../{gUnk_080142B0.inc => gUnk_08014248.inc}  |   52 +-
 data/scripts/gUnk_08014274.inc                |   18 -
 data/scripts/gUnk_08014384.inc                |    2 +-
 data/scripts/gUnk_080143C0.inc                |   32 +-
 data/scripts/gUnk_08014402.inc                |   40 -
 data/scripts/gUnk_08014450.inc                |   67 +-
 data/scripts/gUnk_0801450C.inc                |   25 +-
 data/scripts/gUnk_08014548.inc                |   30 -
 data/scripts/gUnk_08014588.inc                |   10 +
 data/scripts/gUnk_080145A0.inc                |    9 -
 data/scripts/gUnk_080145B0.inc                |    5 +-
 data/scripts/gUnk_080145E8.inc                |  147 +-
 data/scripts/gUnk_08014628.inc                |  131 -
 data/scripts/gUnk_08014804.inc                |   44 +-
 data/scripts/gUnk_080148F0.inc                |   28 -
 data/scripts/gUnk_08014958.inc                |   24 +-
 data/scripts/gUnk_08014994.inc                |   18 -
 data/scripts/gUnk_080149CC.inc                |   86 +-
 data/scripts/gUnk_08014A28.inc                |   15 -
 data/scripts/gUnk_08014A54.inc                |   15 -
 data/scripts/gUnk_08014A80.inc                |   21 -
 data/scripts/gUnk_08014AC4.inc                |   41 -
 data/scripts/gUnk_08014B34.inc                |   75 +-
 data/scripts/gUnk_08014C2C.inc                |   31 -
 data/scripts/gUnk_08014C94.inc                |   24 -
 data/scripts/gUnk_08014CDC.inc                |   36 +-
 data/scripts/gUnk_08014DCC.inc                |    8 +-
 data/scripts/gUnk_08014E14.inc                |  295 +-
 data/scripts/gUnk_08014E50.inc                |   32 -
 data/scripts/gUnk_08014ECC.inc                |   16 -
 data/scripts/gUnk_08014EF8.inc                |   19 -
 data/scripts/gUnk_08014F30.inc                |   40 -
 data/scripts/gUnk_08014FBC.inc                |   17 -
 data/scripts/gUnk_08015001.inc                |   68 -
 data/scripts/gUnk_08015087.inc                |   53 -
 data/scripts/gUnk_080150EF.inc                |  326 --
 data/scripts/gUnk_08015234.inc                |    6 +-
 data/scripts/gUnk_080152B4.inc                |   92 +-
 data/scripts/gUnk_080152DC.inc                |   11 +
 data/scripts/gUnk_08015304.inc                |   14 +
 .../{gUnk_0800E9F4.inc => gUnk_08015338.inc}  |    8 +-
 data/scripts/gUnk_08015360.inc                |   10 +
 data/scripts/gUnk_08015384.inc                |    4 +
 data/scripts/gUnk_08015390.inc                |   11 +-
 data/scripts/gUnk_080153EC.inc                |   57 +-
 data/scripts/gUnk_0801548E.inc                |   42 +
 data/scripts/gUnk_0801550C.inc                |   71 +-
 data/scripts/gUnk_080155F4.inc                |   10 +
 data/scripts/gUnk_08015618.inc                |   20 +-
 data/scripts/gUnk_08015684.inc                |   46 +-
 data/scripts/gUnk_080156A0.inc                |   91 -
 data/scripts/gUnk_08015754.inc                |    6 +-
 data/scripts/gUnk_080157AC.inc                |   39 +-
 data/scripts/gUnk_080158F8.inc                |   18 +-
 data/scripts/gUnk_08015918.inc                |    8 +
 data/scripts/gUnk_08015938.inc                |    2 +-
 data/scripts/gUnk_08015958.inc                |   56 +-
 data/scripts/gUnk_08015A7C.inc                |   10 +
 data/scripts/gUnk_08015AA0.inc                |   10 +
 data/scripts/gUnk_08015AC4.inc                |    2 +-
 data/scripts/gUnk_08015B34.inc                |   18 +-
 data/scripts/gUnk_08015B84.inc                |    2 +-
 data/scripts/gUnk_08015BA8.inc                |    2 +-
 data/scripts/gUnk_08015BE8.inc                |   58 +-
 data/scripts/gUnk_08015C7C.inc                |   32 +
 data/scripts/gUnk_08015E58.inc                |    8 +-
 data/scripts/gUnk_08015F3C.inc                |   18 -
 data/scripts/gUnk_08015F80.inc                |   11 +
 data/scripts/gUnk_08015FA4.inc                |    2 +-
 data/scripts/gUnk_08015FC0.inc                |   18 +-
 data/scripts/gUnk_08016004.inc                |   12 +
 data/scripts/gUnk_08016021.inc                |   16 -
 data/scripts/gUnk_08016030.inc                |   14 +
 data/scripts/gUnk_08016062.inc                |    4 +
 data/scripts/gUnk_0801606C.inc                |    5 -
 data/scripts/gUnk_0801609E.inc                |    4 +
 data/scripts/gUnk_080160A8.inc                |  186 +-
 data/scripts/gUnk_080160EA.inc                |   42 -
 data/scripts/gUnk_0801613C.inc                |   39 -
 data/scripts/gUnk_08016190.inc                |   41 -
 data/scripts/gUnk_080161E8.inc                |   91 -
 data/scripts/gUnk_0801637C.inc                |   69 +
 data/scripts/gUnk_0801637D.inc                |    8 -
 data/scripts/gUnk_08016384.inc                |   64 -
 data/scripts/gUnk_08016408.inc                |  242 --
 data/scripts/gUnk_08016482.inc                |   86 +
 data/scripts/gUnk_080165A4.inc                |  254 ++
 data/scripts/gUnk_080165F8.inc                |    9 -
 data/scripts/gUnk_0801660C.inc                |   12 -
 data/scripts/gUnk_08016628.inc                |   12 -
 data/scripts/gUnk_08016644.inc                |   12 -
 data/scripts/gUnk_0801666C.inc                |   15 -
 data/scripts/gUnk_080166B8.inc                |   16 -
 data/scripts/gUnk_080166FC.inc                |   38 -
 data/scripts/gUnk_08016798.inc                |   40 -
 data/scripts/gUnk_08016844.inc                |   38 -
 data/scripts/gUnk_080168E0.inc                |   10 -
 data/scripts/gUnk_080168F4.inc                |   55 -
 tools/script_disassembler/incbin_parser.py    |   90 +-
 .../script_disassembler.py                    |  181 +-
 1133 files changed, 15199 insertions(+), 21247 deletions(-)
 create mode 100644 asm/macros/scripts.inc
 delete mode 100644 data/scripts/gUnk_08008B90.inc
 delete mode 100644 data/scripts/gUnk_08008BC0.inc
 delete mode 100644 data/scripts/gUnk_08008C4E.inc
 delete mode 100644 data/scripts/gUnk_08008C64.inc
 delete mode 100644 data/scripts/gUnk_08008C6D.inc
 delete mode 100644 data/scripts/gUnk_08008C7E.inc
 delete mode 100644 data/scripts/gUnk_08008CB9.inc
 delete mode 100644 data/scripts/gUnk_08008DC0.inc
 delete mode 100644 data/scripts/gUnk_08008E08.inc
 delete mode 100644 data/scripts/gUnk_08008E0A.inc
 delete mode 100644 data/scripts/gUnk_08008F0C.inc
 delete mode 100644 data/scripts/gUnk_08008F16.inc
 delete mode 100644 data/scripts/gUnk_08008F26.inc
 create mode 100644 data/scripts/gUnk_08008F74.inc
 delete mode 100644 data/scripts/gUnk_08008F90.inc
 delete mode 100644 data/scripts/gUnk_08008FD1.inc
 delete mode 100644 data/scripts/gUnk_08009008.inc
 delete mode 100644 data/scripts/gUnk_0800901F.inc
 delete mode 100644 data/scripts/gUnk_08009080.inc
 delete mode 100644 data/scripts/gUnk_080090DB.inc
 delete mode 100644 data/scripts/gUnk_08009198.inc
 delete mode 100644 data/scripts/gUnk_08009207.inc
 delete mode 100644 data/scripts/gUnk_08009274.inc
 delete mode 100644 data/scripts/gUnk_080092A8.inc
 delete mode 100644 data/scripts/gUnk_080092D4.inc
 delete mode 100644 data/scripts/gUnk_080092F0.inc
 delete mode 100644 data/scripts/gUnk_08009308.inc
 delete mode 100644 data/scripts/gUnk_08009393.inc
 create mode 100644 data/scripts/gUnk_0800939A.inc
 delete mode 100644 data/scripts/gUnk_080093D7.inc
 delete mode 100644 data/scripts/gUnk_08009407.inc
 create mode 100644 data/scripts/gUnk_08009464.inc
 delete mode 100644 data/scripts/gUnk_08009486.inc
 delete mode 100644 data/scripts/gUnk_080094A4.inc
 delete mode 100644 data/scripts/gUnk_080094D7.inc
 delete mode 100644 data/scripts/gUnk_08009503.inc
 delete mode 100644 data/scripts/gUnk_08009508.inc
 delete mode 100644 data/scripts/gUnk_08009538.inc
 delete mode 100644 data/scripts/gUnk_08009574.inc
 delete mode 100644 data/scripts/gUnk_080095CC.inc
 create mode 100644 data/scripts/gUnk_080095F2.inc
 delete mode 100644 data/scripts/gUnk_0800962C.inc
 delete mode 100644 data/scripts/gUnk_08009698.inc
 delete mode 100644 data/scripts/gUnk_08009706.inc
 delete mode 100644 data/scripts/gUnk_08009778.inc
 delete mode 100644 data/scripts/gUnk_08009786.inc
 delete mode 100644 data/scripts/gUnk_080097A1.inc
 create mode 100644 data/scripts/gUnk_0800987C.inc
 delete mode 100644 data/scripts/gUnk_08009940.inc
 delete mode 100644 data/scripts/gUnk_08009A04.inc
 delete mode 100644 data/scripts/gUnk_08009A07.inc
 delete mode 100644 data/scripts/gUnk_08009A2C.inc
 delete mode 100644 data/scripts/gUnk_08009A50.inc
 delete mode 100644 data/scripts/gUnk_08009A77.inc
 delete mode 100644 data/scripts/gUnk_08009A81.inc
 delete mode 100644 data/scripts/gUnk_08009ABB.inc
 delete mode 100644 data/scripts/gUnk_08009B63.inc
 delete mode 100644 data/scripts/gUnk_08009C7F.inc
 delete mode 100644 data/scripts/gUnk_08009C9E.inc
 rename data/scripts/{gUnk_08009D00.inc => gUnk_08009CFC.inc} (89%)
 delete mode 100644 data/scripts/gUnk_08009D77.inc
 delete mode 100644 data/scripts/gUnk_08009DEC.inc
 delete mode 100644 data/scripts/gUnk_08009E38.inc
 rename data/scripts/{gUnk_0800DB0E.inc => gUnk_08009E4E.inc} (66%)
 rename data/scripts/{gUnk_08009318.inc => gUnk_08009E80.inc} (64%)
 delete mode 100644 data/scripts/gUnk_08009E9E.inc
 delete mode 100644 data/scripts/gUnk_08009EA9.inc
 delete mode 100644 data/scripts/gUnk_08009EB7.inc
 delete mode 100644 data/scripts/gUnk_08009F07.inc
 delete mode 100644 data/scripts/gUnk_08009F39.inc
 delete mode 100644 data/scripts/gUnk_08009F72.inc
 delete mode 100644 data/scripts/gUnk_0800A064.inc
 delete mode 100644 data/scripts/gUnk_0800A081.inc
 delete mode 100644 data/scripts/gUnk_0800A10A.inc
 delete mode 100644 data/scripts/gUnk_0800A10F.inc
 delete mode 100644 data/scripts/gUnk_0800A124.inc
 delete mode 100644 data/scripts/gUnk_0800A134.inc
 create mode 100644 data/scripts/gUnk_0800A160.inc
 delete mode 100644 data/scripts/gUnk_0800A224.inc
 delete mode 100644 data/scripts/gUnk_0800A260.inc
 create mode 100644 data/scripts/gUnk_0800A310.inc
 delete mode 100644 data/scripts/gUnk_0800A340.inc
 delete mode 100644 data/scripts/gUnk_0800A3A3.inc
 delete mode 100644 data/scripts/gUnk_0800A3A9.inc
 delete mode 100644 data/scripts/gUnk_0800A3AA.inc
 delete mode 100644 data/scripts/gUnk_0800A5A6.inc
 create mode 100644 data/scripts/gUnk_0800A638.inc
 delete mode 100644 data/scripts/gUnk_0800A67E.inc
 delete mode 100644 data/scripts/gUnk_0800A6AB.inc
 delete mode 100644 data/scripts/gUnk_0800A74A.inc
 delete mode 100644 data/scripts/gUnk_0800A7E8.inc
 delete mode 100644 data/scripts/gUnk_0800A816.inc
 delete mode 100644 data/scripts/gUnk_0800A820.inc
 delete mode 100644 data/scripts/gUnk_0800A85C.inc
 delete mode 100644 data/scripts/gUnk_0800A898.inc
 delete mode 100644 data/scripts/gUnk_0800A8D4.inc
 delete mode 100644 data/scripts/gUnk_0800A908.inc
 delete mode 100644 data/scripts/gUnk_0800A910.inc
 delete mode 100644 data/scripts/gUnk_0800AA03.inc
 delete mode 100644 data/scripts/gUnk_0800AB23.inc
 delete mode 100644 data/scripts/gUnk_0800AB4F.inc
 create mode 100644 data/scripts/gUnk_0800AB6E.inc
 delete mode 100644 data/scripts/gUnk_0800ABF0.inc
 delete mode 100644 data/scripts/gUnk_0800AC24.inc
 delete mode 100644 data/scripts/gUnk_0800AC6D.inc
 delete mode 100644 data/scripts/gUnk_0800ACB5.inc
 delete mode 100644 data/scripts/gUnk_0800ACE0.inc
 delete mode 100644 data/scripts/gUnk_0800AD74.inc
 delete mode 100644 data/scripts/gUnk_0800ADA7.inc
 delete mode 100644 data/scripts/gUnk_0800ADB4.inc
 delete mode 100644 data/scripts/gUnk_0800AF7E.inc
 delete mode 100644 data/scripts/gUnk_0800AFA7.inc
 delete mode 100644 data/scripts/gUnk_0800B0B0.inc
 delete mode 100644 data/scripts/gUnk_0800B177.inc
 delete mode 100644 data/scripts/gUnk_0800B17C.inc
 delete mode 100644 data/scripts/gUnk_0800B284.inc
 delete mode 100644 data/scripts/gUnk_0800B2B4.inc
 delete mode 100644 data/scripts/gUnk_0800B322.inc
 delete mode 100644 data/scripts/gUnk_0800B329.inc
 delete mode 100644 data/scripts/gUnk_0800B348.inc
 delete mode 100644 data/scripts/gUnk_0800B35C.inc
 delete mode 100644 data/scripts/gUnk_0800B374.inc
 delete mode 100644 data/scripts/gUnk_0800B40F.inc
 delete mode 100644 data/scripts/gUnk_0800B41C.inc
 delete mode 100644 data/scripts/gUnk_0800B508.inc
 delete mode 100644 data/scripts/gUnk_0800B50F.inc
 delete mode 100644 data/scripts/gUnk_0800B614.inc
 delete mode 100644 data/scripts/gUnk_0800B708.inc
 delete mode 100644 data/scripts/gUnk_0800B71F.inc
 delete mode 100644 data/scripts/gUnk_0800B730.inc
 delete mode 100644 data/scripts/gUnk_0800B7C4.inc
 create mode 100644 data/scripts/gUnk_0800B7FC.inc
 create mode 100644 data/scripts/gUnk_0800B828.inc
 delete mode 100644 data/scripts/gUnk_0800B84F.inc
 delete mode 100644 data/scripts/gUnk_0800B861.inc
 delete mode 100644 data/scripts/gUnk_0800B888.inc
 delete mode 100644 data/scripts/gUnk_0800B8A0.inc
 delete mode 100644 data/scripts/gUnk_0800B8B8.inc
 delete mode 100644 data/scripts/gUnk_0800B8E4.inc
 delete mode 100644 data/scripts/gUnk_0800B906.inc
 delete mode 100644 data/scripts/gUnk_0800B91C.inc
 delete mode 100644 data/scripts/gUnk_0800B964.inc
 delete mode 100644 data/scripts/gUnk_0800BA3C.inc
 delete mode 100644 data/scripts/gUnk_0800BA78.inc
 delete mode 100644 data/scripts/gUnk_0800BB08.inc
 delete mode 100644 data/scripts/gUnk_0800BB1A.inc
 delete mode 100644 data/scripts/gUnk_0800BB74.inc
 delete mode 100644 data/scripts/gUnk_0800BBDB.inc
 delete mode 100644 data/scripts/gUnk_0800BC22.inc
 delete mode 100644 data/scripts/gUnk_0800BCAE.inc
 delete mode 100644 data/scripts/gUnk_0800BCB7.inc
 delete mode 100644 data/scripts/gUnk_0800BCBE.inc
 delete mode 100644 data/scripts/gUnk_0800BD08.inc
 delete mode 100644 data/scripts/gUnk_0800BD70.inc
 delete mode 100644 data/scripts/gUnk_0800BDAC.inc
 delete mode 100644 data/scripts/gUnk_0800BDC4.inc
 delete mode 100644 data/scripts/gUnk_0800BE54.inc
 delete mode 100644 data/scripts/gUnk_0800BF14.inc
 delete mode 100644 data/scripts/gUnk_0800BF4A.inc
 delete mode 100644 data/scripts/gUnk_0800BF70.inc
 delete mode 100644 data/scripts/gUnk_0800BFBF.inc
 delete mode 100644 data/scripts/gUnk_0800BFE1.inc
 delete mode 100644 data/scripts/gUnk_0800BFE3.inc
 delete mode 100644 data/scripts/gUnk_0800C007.inc
 delete mode 100644 data/scripts/gUnk_0800C024.inc
 delete mode 100644 data/scripts/gUnk_0800C07B.inc
 delete mode 100644 data/scripts/gUnk_0800C0C7.inc
 delete mode 100644 data/scripts/gUnk_0800C0D3.inc
 delete mode 100644 data/scripts/gUnk_0800C0E8.inc
 delete mode 100644 data/scripts/gUnk_0800C113.inc
 delete mode 100644 data/scripts/gUnk_0800C147.inc
 delete mode 100644 data/scripts/gUnk_0800C204.inc
 delete mode 100644 data/scripts/gUnk_0800C207.inc
 delete mode 100644 data/scripts/gUnk_0800C208.inc
 delete mode 100644 data/scripts/gUnk_0800C210.inc
 delete mode 100644 data/scripts/gUnk_0800C263.inc
 delete mode 100644 data/scripts/gUnk_0800C2A7.inc
 delete mode 100644 data/scripts/gUnk_0800C2CE.inc
 create mode 100644 data/scripts/gUnk_0800C370.inc
 delete mode 100644 data/scripts/gUnk_0800C396.inc
 create mode 100644 data/scripts/gUnk_0800C3B0.inc
 delete mode 100644 data/scripts/gUnk_0800C408.inc
 delete mode 100644 data/scripts/gUnk_0800C4DB.inc
 delete mode 100644 data/scripts/gUnk_0800C521.inc
 delete mode 100644 data/scripts/gUnk_0800C556.inc
 delete mode 100644 data/scripts/gUnk_0800C584.inc
 delete mode 100644 data/scripts/gUnk_0800C59A.inc
 delete mode 100644 data/scripts/gUnk_0800C5C8.inc
 delete mode 100644 data/scripts/gUnk_0800C5FC.inc
 delete mode 100644 data/scripts/gUnk_0800C600.inc
 delete mode 100644 data/scripts/gUnk_0800C607.inc
 delete mode 100644 data/scripts/gUnk_0800C634.inc
 delete mode 100644 data/scripts/gUnk_0800C6C6.inc
 delete mode 100644 data/scripts/gUnk_0800C774.inc
 delete mode 100644 data/scripts/gUnk_0800C779.inc
 delete mode 100644 data/scripts/gUnk_0800C808.inc
 delete mode 100644 data/scripts/gUnk_0800C861.inc
 delete mode 100644 data/scripts/gUnk_0800C8B0.inc
 delete mode 100644 data/scripts/gUnk_0800C8DA.inc
 delete mode 100644 data/scripts/gUnk_0800C931.inc
 delete mode 100644 data/scripts/gUnk_0800C963.inc
 delete mode 100644 data/scripts/gUnk_0800CA08.inc
 delete mode 100644 data/scripts/gUnk_0800CAAA.inc
 delete mode 100644 data/scripts/gUnk_0800CB07.inc
 delete mode 100644 data/scripts/gUnk_0800CBA3.inc
 delete mode 100644 data/scripts/gUnk_0800CC08.inc
 delete mode 100644 data/scripts/gUnk_0800CC0D.inc
 delete mode 100644 data/scripts/gUnk_0800CC42.inc
 delete mode 100644 data/scripts/gUnk_0800CCCD.inc
 delete mode 100644 data/scripts/gUnk_0800CCDD.inc
 delete mode 100644 data/scripts/gUnk_0800CD08.inc
 delete mode 100644 data/scripts/gUnk_0800CD67.inc
 delete mode 100644 data/scripts/gUnk_0800CE07.inc
 delete mode 100644 data/scripts/gUnk_0800CF04.inc
 delete mode 100644 data/scripts/gUnk_0800CF16.inc
 delete mode 100644 data/scripts/gUnk_0800CF4B.inc
 delete mode 100644 data/scripts/gUnk_0800CF50.inc
 delete mode 100644 data/scripts/gUnk_0800CF7B.inc
 delete mode 100644 data/scripts/gUnk_0800CF88.inc
 delete mode 100644 data/scripts/gUnk_0800CF95.inc
 delete mode 100644 data/scripts/gUnk_0800CFA9.inc
 delete mode 100644 data/scripts/gUnk_0800CFAC.inc
 delete mode 100644 data/scripts/gUnk_0800D011.inc
 delete mode 100644 data/scripts/gUnk_0800D05F.inc
 delete mode 100644 data/scripts/gUnk_0800D0CE.inc
 delete mode 100644 data/scripts/gUnk_0800D127.inc
 delete mode 100644 data/scripts/gUnk_0800D190.inc
 delete mode 100644 data/scripts/gUnk_0800D1C4.inc
 delete mode 100644 data/scripts/gUnk_0800D1D4.inc
 delete mode 100644 data/scripts/gUnk_0800D207.inc
 create mode 100644 data/scripts/gUnk_0800D242.inc
 create mode 100644 data/scripts/gUnk_0800D24C.inc
 delete mode 100644 data/scripts/gUnk_0800D2CE.inc
 delete mode 100644 data/scripts/gUnk_0800D306.inc
 delete mode 100644 data/scripts/gUnk_0800D308.inc
 delete mode 100644 data/scripts/gUnk_0800D30F.inc
 delete mode 100644 data/scripts/gUnk_0800D350.inc
 delete mode 100644 data/scripts/gUnk_0800D44C.inc
 delete mode 100644 data/scripts/gUnk_0800D4BF.inc
 delete mode 100644 data/scripts/gUnk_0800D4DC.inc
 delete mode 100644 data/scripts/gUnk_0800D59C.inc
 delete mode 100644 data/scripts/gUnk_0800D5E5.inc
 delete mode 100644 data/scripts/gUnk_0800D60C.inc
 delete mode 100644 data/scripts/gUnk_0800D62B.inc
 create mode 100644 data/scripts/gUnk_0800D698.inc
 delete mode 100644 data/scripts/gUnk_0800D6BA.inc
 delete mode 100644 data/scripts/gUnk_0800D702.inc
 delete mode 100644 data/scripts/gUnk_0800D703.inc
 delete mode 100644 data/scripts/gUnk_0800D725.inc
 delete mode 100644 data/scripts/gUnk_0800D728.inc
 delete mode 100644 data/scripts/gUnk_0800D7CF.inc
 delete mode 100644 data/scripts/gUnk_0800D7DC.inc
 create mode 100644 data/scripts/gUnk_0800D84C.inc
 delete mode 100644 data/scripts/gUnk_0800D8E4.inc
 delete mode 100644 data/scripts/gUnk_0800D906.inc
 rename data/scripts/{gUnk_0800D3EC.inc => gUnk_0800D92C.inc} (57%)
 delete mode 100644 data/scripts/gUnk_0800D97D.inc
 delete mode 100644 data/scripts/gUnk_0800D981.inc
 rename data/scripts/{gUnk_0800AD54.inc => gUnk_0800DA00.inc} (54%)
 delete mode 100644 data/scripts/gUnk_0800DA11.inc
 delete mode 100644 data/scripts/gUnk_0800DA4C.inc
 delete mode 100644 data/scripts/gUnk_0800DA4D.inc
 delete mode 100644 data/scripts/gUnk_0800DB4A.inc
 delete mode 100644 data/scripts/gUnk_0800DB88.inc
 delete mode 100644 data/scripts/gUnk_0800DC10.inc
 delete mode 100644 data/scripts/gUnk_0800DC19.inc
 create mode 100644 data/scripts/gUnk_0800DC4C.inc
 delete mode 100644 data/scripts/gUnk_0800DC91.inc
 delete mode 100644 data/scripts/gUnk_0800DCDC.inc
 delete mode 100644 data/scripts/gUnk_0800DD04.inc
 delete mode 100644 data/scripts/gUnk_0800DD10.inc
 delete mode 100644 data/scripts/gUnk_0800DD19.inc
 delete mode 100644 data/scripts/gUnk_0800DD22.inc
 delete mode 100644 data/scripts/gUnk_0800DD8D.inc
 delete mode 100644 data/scripts/gUnk_0800DDAA.inc
 create mode 100644 data/scripts/gUnk_0800DDD0.inc
 delete mode 100644 data/scripts/gUnk_0800DDE8.inc
 delete mode 100644 data/scripts/gUnk_0800DDFC.inc
 create mode 100644 data/scripts/gUnk_0800DE2C.inc
 create mode 100644 data/scripts/gUnk_0800DE50.inc
 delete mode 100644 data/scripts/gUnk_0800DEF6.inc
 delete mode 100644 data/scripts/gUnk_0800DF07.inc
 delete mode 100644 data/scripts/gUnk_0800DFD0.inc
 delete mode 100644 data/scripts/gUnk_0800DFD7.inc
 delete mode 100644 data/scripts/gUnk_0800DFDE.inc
 create mode 100644 data/scripts/gUnk_0800E094.inc
 delete mode 100644 data/scripts/gUnk_0800E0F6.inc
 delete mode 100644 data/scripts/gUnk_0800E140.inc
 delete mode 100644 data/scripts/gUnk_0800E153.inc
 delete mode 100644 data/scripts/gUnk_0800E154.inc
 delete mode 100644 data/scripts/gUnk_0800E1C5.inc
 delete mode 100644 data/scripts/gUnk_0800E200.inc
 delete mode 100644 data/scripts/gUnk_0800E300.inc
 delete mode 100644 data/scripts/gUnk_0800E305.inc
 delete mode 100644 data/scripts/gUnk_0800E307.inc
 delete mode 100644 data/scripts/gUnk_0800E30C.inc
 delete mode 100644 data/scripts/gUnk_0800E329.inc
 delete mode 100644 data/scripts/gUnk_0800E350.inc
 delete mode 100644 data/scripts/gUnk_0800E3EE.inc
 delete mode 100644 data/scripts/gUnk_0800E3F9.inc
 delete mode 100644 data/scripts/gUnk_0800E3FA.inc
 delete mode 100644 data/scripts/gUnk_0800E3FC.inc
 delete mode 100644 data/scripts/gUnk_0800E400.inc
 delete mode 100644 data/scripts/gUnk_0800E408.inc
 delete mode 100644 data/scripts/gUnk_0800E40B.inc
 delete mode 100644 data/scripts/gUnk_0800E411.inc
 delete mode 100644 data/scripts/gUnk_0800E430.inc
 delete mode 100644 data/scripts/gUnk_0800E434.inc
 delete mode 100644 data/scripts/gUnk_0800E46C.inc
 delete mode 100644 data/scripts/gUnk_0800E489.inc
 delete mode 100644 data/scripts/gUnk_0800E499.inc
 delete mode 100644 data/scripts/gUnk_0800E4A4.inc
 delete mode 100644 data/scripts/gUnk_0800E4E3.inc
 delete mode 100644 data/scripts/gUnk_0800E50C.inc
 create mode 100644 data/scripts/gUnk_0800E5D6.inc
 delete mode 100644 data/scripts/gUnk_0800E60E.inc
 delete mode 100644 data/scripts/gUnk_0800E6E8.inc
 delete mode 100644 data/scripts/gUnk_0800E707.inc
 delete mode 100644 data/scripts/gUnk_0800E70A.inc
 delete mode 100644 data/scripts/gUnk_0800E734.inc
 delete mode 100644 data/scripts/gUnk_0800E760.inc
 delete mode 100644 data/scripts/gUnk_0800E7D9.inc
 delete mode 100644 data/scripts/gUnk_0800E7F4.inc
 delete mode 100644 data/scripts/gUnk_0800E7FA.inc
 delete mode 100644 data/scripts/gUnk_0800E823.inc
 delete mode 100644 data/scripts/gUnk_0800E824.inc
 create mode 100644 data/scripts/gUnk_0800E8A4.inc
 create mode 100644 data/scripts/gUnk_0800E8D6.inc
 delete mode 100644 data/scripts/gUnk_0800E8DB.inc
 create mode 100644 data/scripts/gUnk_0800E908.inc
 delete mode 100644 data/scripts/gUnk_0800E920.inc
 delete mode 100644 data/scripts/gUnk_0800E964.inc
 delete mode 100644 data/scripts/gUnk_0800E9D6.inc
 delete mode 100644 data/scripts/gUnk_0800EAA4.inc
 delete mode 100644 data/scripts/gUnk_0800EAEB.inc
 delete mode 100644 data/scripts/gUnk_0800EAF8.inc
 delete mode 100644 data/scripts/gUnk_0800EB2C.inc
 delete mode 100644 data/scripts/gUnk_0800EB64.inc
 delete mode 100644 data/scripts/gUnk_0800EBC0.inc
 delete mode 100644 data/scripts/gUnk_0800EBDC.inc
 delete mode 100644 data/scripts/gUnk_0800EBE0.inc
 delete mode 100644 data/scripts/gUnk_0800EBF0.inc
 delete mode 100644 data/scripts/gUnk_0800EC08.inc
 delete mode 100644 data/scripts/gUnk_0800EC14.inc
 delete mode 100644 data/scripts/gUnk_0800EC54.inc
 delete mode 100644 data/scripts/gUnk_0800EC61.inc
 delete mode 100644 data/scripts/gUnk_0800EC8C.inc
 delete mode 100644 data/scripts/gUnk_0800ECF1.inc
 delete mode 100644 data/scripts/gUnk_0800ED04.inc
 delete mode 100644 data/scripts/gUnk_0800ED0C.inc
 delete mode 100644 data/scripts/gUnk_0800ED0D.inc
 delete mode 100644 data/scripts/gUnk_0800ED5C.inc
 delete mode 100644 data/scripts/gUnk_0800ED90.inc
 delete mode 100644 data/scripts/gUnk_0800EDD9.inc
 delete mode 100644 data/scripts/gUnk_0800EDE0.inc
 delete mode 100644 data/scripts/gUnk_0800EE09.inc
 delete mode 100644 data/scripts/gUnk_0800EE50.inc
 delete mode 100644 data/scripts/gUnk_0800EE8C.inc
 delete mode 100644 data/scripts/gUnk_0800EEE0.inc
 delete mode 100644 data/scripts/gUnk_0800EEFD.inc
 delete mode 100644 data/scripts/gUnk_0800EF07.inc
 delete mode 100644 data/scripts/gUnk_0800EF12.inc
 delete mode 100644 data/scripts/gUnk_0800EF93.inc
 create mode 100644 data/scripts/gUnk_0800EF9C.inc
 delete mode 100644 data/scripts/gUnk_0800EFE0.inc
 delete mode 100644 data/scripts/gUnk_0800EFE4.inc
 delete mode 100644 data/scripts/gUnk_0800F090.inc
 delete mode 100644 data/scripts/gUnk_0800F094.inc
 delete mode 100644 data/scripts/gUnk_0800F0D6.inc
 delete mode 100644 data/scripts/gUnk_0800F0E2.inc
 delete mode 100644 data/scripts/gUnk_0800F0F2.inc
 delete mode 100644 data/scripts/gUnk_0800F0F3.inc
 delete mode 100644 data/scripts/gUnk_0800F0F4.inc
 delete mode 100644 data/scripts/gUnk_0800F1DE.inc
 delete mode 100644 data/scripts/gUnk_0800F1E1.inc
 delete mode 100644 data/scripts/gUnk_0800F1E5.inc
 delete mode 100644 data/scripts/gUnk_0800F1E7.inc
 delete mode 100644 data/scripts/gUnk_0800F1ED.inc
 delete mode 100644 data/scripts/gUnk_0800F1FB.inc
 delete mode 100644 data/scripts/gUnk_0800F1FD.inc
 delete mode 100644 data/scripts/gUnk_0800F203.inc
 delete mode 100644 data/scripts/gUnk_0800F207.inc
 delete mode 100644 data/scripts/gUnk_0800F210.inc
 delete mode 100644 data/scripts/gUnk_0800F2EB.inc
 delete mode 100644 data/scripts/gUnk_0800F2F0.inc
 delete mode 100644 data/scripts/gUnk_0800F2F2.inc
 delete mode 100644 data/scripts/gUnk_0800F303.inc
 create mode 100644 data/scripts/gUnk_0800F33C.inc
 create mode 100644 data/scripts/gUnk_0800F354.inc
 create mode 100644 data/scripts/gUnk_0800F36C.inc
 create mode 100644 data/scripts/gUnk_0800F384.inc
 delete mode 100644 data/scripts/gUnk_0800F3DB.inc
 delete mode 100644 data/scripts/gUnk_0800F3E5.inc
 delete mode 100644 data/scripts/gUnk_0800F3E6.inc
 delete mode 100644 data/scripts/gUnk_0800F3E8.inc
 delete mode 100644 data/scripts/gUnk_0800F3EB.inc
 delete mode 100644 data/scripts/gUnk_0800F3ED.inc
 delete mode 100644 data/scripts/gUnk_0800F3F5.inc
 delete mode 100644 data/scripts/gUnk_0800F3F9.inc
 delete mode 100644 data/scripts/gUnk_0800F400.inc
 delete mode 100644 data/scripts/gUnk_0800F408.inc
 delete mode 100644 data/scripts/gUnk_0800F409.inc
 delete mode 100644 data/scripts/gUnk_0800F410.inc
 delete mode 100644 data/scripts/gUnk_0800F426.inc
 delete mode 100644 data/scripts/gUnk_0800F4EA.inc
 delete mode 100644 data/scripts/gUnk_0800F4EB.inc
 delete mode 100644 data/scripts/gUnk_0800F4EF.inc
 delete mode 100644 data/scripts/gUnk_0800F4F0.inc
 delete mode 100644 data/scripts/gUnk_0800F4F1.inc
 delete mode 100644 data/scripts/gUnk_0800F4F3.inc
 delete mode 100644 data/scripts/gUnk_0800F4F7.inc
 delete mode 100644 data/scripts/gUnk_0800F4F9.inc
 delete mode 100644 data/scripts/gUnk_0800F501.inc
 delete mode 100644 data/scripts/gUnk_0800F50E.inc
 delete mode 100644 data/scripts/gUnk_0800F584.inc
 delete mode 100644 data/scripts/gUnk_0800F58F.inc
 delete mode 100644 data/scripts/gUnk_0800F5B0.inc
 delete mode 100644 data/scripts/gUnk_0800F5E9.inc
 delete mode 100644 data/scripts/gUnk_0800F5EC.inc
 delete mode 100644 data/scripts/gUnk_0800F5ED.inc
 delete mode 100644 data/scripts/gUnk_0800F5EE.inc
 delete mode 100644 data/scripts/gUnk_0800F5EF.inc
 delete mode 100644 data/scripts/gUnk_0800F5F0.inc
 delete mode 100644 data/scripts/gUnk_0800F5F2.inc
 delete mode 100644 data/scripts/gUnk_0800F5F4.inc
 delete mode 100644 data/scripts/gUnk_0800F5FC.inc
 delete mode 100644 data/scripts/gUnk_0800F5FF.inc
 delete mode 100644 data/scripts/gUnk_0800F606.inc
 delete mode 100644 data/scripts/gUnk_0800F607.inc
 delete mode 100644 data/scripts/gUnk_0800F608.inc
 delete mode 100644 data/scripts/gUnk_0800F60A.inc
 delete mode 100644 data/scripts/gUnk_0800F628.inc
 delete mode 100644 data/scripts/gUnk_0800F650.inc
 delete mode 100644 data/scripts/gUnk_0800F688.inc
 delete mode 100644 data/scripts/gUnk_0800F6A0.inc
 delete mode 100644 data/scripts/gUnk_0800F6C8.inc
 delete mode 100644 data/scripts/gUnk_0800F6E0.inc
 delete mode 100644 data/scripts/gUnk_0800F6E9.inc
 delete mode 100644 data/scripts/gUnk_0800F6EC.inc
 delete mode 100644 data/scripts/gUnk_0800F6ED.inc
 delete mode 100644 data/scripts/gUnk_0800F6EE.inc
 delete mode 100644 data/scripts/gUnk_0800F6EF.inc
 delete mode 100644 data/scripts/gUnk_0800F6F0.inc
 delete mode 100644 data/scripts/gUnk_0800F6F1.inc
 delete mode 100644 data/scripts/gUnk_0800F6F2.inc
 delete mode 100644 data/scripts/gUnk_0800F6F3.inc
 delete mode 100644 data/scripts/gUnk_0800F6F4.inc
 delete mode 100644 data/scripts/gUnk_0800F6F9.inc
 delete mode 100644 data/scripts/gUnk_0800F6FE.inc
 delete mode 100644 data/scripts/gUnk_0800F702.inc
 delete mode 100644 data/scripts/gUnk_0800F706.inc
 delete mode 100644 data/scripts/gUnk_0800F71E.inc
 delete mode 100644 data/scripts/gUnk_0800F734.inc
 delete mode 100644 data/scripts/gUnk_0800F73C.inc
 delete mode 100644 data/scripts/gUnk_0800F7E6.inc
 delete mode 100644 data/scripts/gUnk_0800F7EB.inc
 delete mode 100644 data/scripts/gUnk_0800F7EE.inc
 delete mode 100644 data/scripts/gUnk_0800F7EF.inc
 delete mode 100644 data/scripts/gUnk_0800F7F0.inc
 delete mode 100644 data/scripts/gUnk_0800F7F4.inc
 delete mode 100644 data/scripts/gUnk_0800F7F5.inc
 delete mode 100644 data/scripts/gUnk_0800F7F7.inc
 delete mode 100644 data/scripts/gUnk_0800F7FC.inc
 delete mode 100644 data/scripts/gUnk_0800F7FD.inc
 delete mode 100644 data/scripts/gUnk_0800F7FF.inc
 delete mode 100644 data/scripts/gUnk_0800F800.inc
 delete mode 100644 data/scripts/gUnk_0800F805.inc
 delete mode 100644 data/scripts/gUnk_0800F808.inc
 delete mode 100644 data/scripts/gUnk_0800F8EF.inc
 delete mode 100644 data/scripts/gUnk_0800F8F0.inc
 delete mode 100644 data/scripts/gUnk_0800F8F1.inc
 delete mode 100644 data/scripts/gUnk_0800F8F2.inc
 delete mode 100644 data/scripts/gUnk_0800F8F3.inc
 delete mode 100644 data/scripts/gUnk_0800F8F4.inc
 delete mode 100644 data/scripts/gUnk_0800F8F5.inc
 delete mode 100644 data/scripts/gUnk_0800F8F8.inc
 delete mode 100644 data/scripts/gUnk_0800F8F9.inc
 delete mode 100644 data/scripts/gUnk_0800F900.inc
 delete mode 100644 data/scripts/gUnk_0800F902.inc
 delete mode 100644 data/scripts/gUnk_0800F916.inc
 delete mode 100644 data/scripts/gUnk_0800F9F0.inc
 delete mode 100644 data/scripts/gUnk_0800F9F2.inc
 delete mode 100644 data/scripts/gUnk_0800F9F3.inc
 delete mode 100644 data/scripts/gUnk_0800F9F4.inc
 delete mode 100644 data/scripts/gUnk_0800F9F6.inc
 delete mode 100644 data/scripts/gUnk_0800F9F7.inc
 delete mode 100644 data/scripts/gUnk_0800F9F8.inc
 delete mode 100644 data/scripts/gUnk_0800FA02.inc
 delete mode 100644 data/scripts/gUnk_0800FA07.inc
 delete mode 100644 data/scripts/gUnk_0800FA08.inc
 delete mode 100644 data/scripts/gUnk_0800FA09.inc
 delete mode 100644 data/scripts/gUnk_0800FA0D.inc
 create mode 100644 data/scripts/gUnk_0800FA54.inc
 rename data/scripts/{gUnk_0801635C.inc => gUnk_0800FA9C.inc} (51%)
 delete mode 100644 data/scripts/gUnk_0800FAF3.inc
 delete mode 100644 data/scripts/gUnk_0800FAF5.inc
 delete mode 100644 data/scripts/gUnk_0800FAF6.inc
 delete mode 100644 data/scripts/gUnk_0800FAF7.inc
 delete mode 100644 data/scripts/gUnk_0800FAF8.inc
 delete mode 100644 data/scripts/gUnk_0800FAFD.inc
 delete mode 100644 data/scripts/gUnk_0800FAFE.inc
 delete mode 100644 data/scripts/gUnk_0800FAFF.inc
 delete mode 100644 data/scripts/gUnk_0800FB00.inc
 delete mode 100644 data/scripts/gUnk_0800FB01.inc
 delete mode 100644 data/scripts/gUnk_0800FB02.inc
 delete mode 100644 data/scripts/gUnk_0800FB04.inc
 delete mode 100644 data/scripts/gUnk_0800FB08.inc
 delete mode 100644 data/scripts/gUnk_0800FB0A.inc
 create mode 100644 data/scripts/gUnk_0800FB2C.inc
 delete mode 100644 data/scripts/gUnk_0800FB31.inc
 delete mode 100644 data/scripts/gUnk_0800FBBB.inc
 delete mode 100644 data/scripts/gUnk_0800FBF0.inc
 delete mode 100644 data/scripts/gUnk_0800FBF3.inc
 delete mode 100644 data/scripts/gUnk_0800FBF5.inc
 delete mode 100644 data/scripts/gUnk_0800FBF6.inc
 delete mode 100644 data/scripts/gUnk_0800FBF8.inc
 delete mode 100644 data/scripts/gUnk_0800FBF9.inc
 delete mode 100644 data/scripts/gUnk_0800FBFA.inc
 delete mode 100644 data/scripts/gUnk_0800FBFB.inc
 delete mode 100644 data/scripts/gUnk_0800FBFC.inc
 delete mode 100644 data/scripts/gUnk_0800FBFF.inc
 delete mode 100644 data/scripts/gUnk_0800FC00.inc
 delete mode 100644 data/scripts/gUnk_0800FC01.inc
 delete mode 100644 data/scripts/gUnk_0800FC05.inc
 delete mode 100644 data/scripts/gUnk_0800FC06.inc
 delete mode 100644 data/scripts/gUnk_0800FC08.inc
 delete mode 100644 data/scripts/gUnk_0800FC09.inc
 delete mode 100644 data/scripts/gUnk_0800FC0E.inc
 delete mode 100644 data/scripts/gUnk_0800FC24.inc
 delete mode 100644 data/scripts/gUnk_0800FCEA.inc
 delete mode 100644 data/scripts/gUnk_0800FCEE.inc
 delete mode 100644 data/scripts/gUnk_0800FCF2.inc
 delete mode 100644 data/scripts/gUnk_0800FCF3.inc
 delete mode 100644 data/scripts/gUnk_0800FCF5.inc
 delete mode 100644 data/scripts/gUnk_0800FCF7.inc
 delete mode 100644 data/scripts/gUnk_0800FCF8.inc
 delete mode 100644 data/scripts/gUnk_0800FCFA.inc
 delete mode 100644 data/scripts/gUnk_0800FCFB.inc
 delete mode 100644 data/scripts/gUnk_0800FCFC.inc
 delete mode 100644 data/scripts/gUnk_0800FCFE.inc
 delete mode 100644 data/scripts/gUnk_0800FCFF.inc
 delete mode 100644 data/scripts/gUnk_0800FD00.inc
 delete mode 100644 data/scripts/gUnk_0800FD01.inc
 delete mode 100644 data/scripts/gUnk_0800FD04.inc
 delete mode 100644 data/scripts/gUnk_0800FD05.inc
 delete mode 100644 data/scripts/gUnk_0800FD16.inc
 delete mode 100644 data/scripts/gUnk_0800FD21.inc
 delete mode 100644 data/scripts/gUnk_0800FD80.inc
 delete mode 100644 data/scripts/gUnk_0800FDCC.inc
 delete mode 100644 data/scripts/gUnk_0800FDF2.inc
 delete mode 100644 data/scripts/gUnk_0800FDF3.inc
 delete mode 100644 data/scripts/gUnk_0800FDFA.inc
 delete mode 100644 data/scripts/gUnk_0800FDFC.inc
 delete mode 100644 data/scripts/gUnk_0800FDFE.inc
 delete mode 100644 data/scripts/gUnk_0800FDFF.inc
 delete mode 100644 data/scripts/gUnk_0800FE00.inc
 delete mode 100644 data/scripts/gUnk_0800FE01.inc
 delete mode 100644 data/scripts/gUnk_0800FE02.inc
 delete mode 100644 data/scripts/gUnk_0800FE04.inc
 delete mode 100644 data/scripts/gUnk_0800FE06.inc
 delete mode 100644 data/scripts/gUnk_0800FE07.inc
 delete mode 100644 data/scripts/gUnk_0800FE08.inc
 delete mode 100644 data/scripts/gUnk_0800FE09.inc
 delete mode 100644 data/scripts/gUnk_0800FE40.inc
 delete mode 100644 data/scripts/gUnk_0800FE44.inc
 delete mode 100644 data/scripts/gUnk_0800FE64.inc
 delete mode 100644 data/scripts/gUnk_0800FE88.inc
 delete mode 100644 data/scripts/gUnk_0800FEBC.inc
 delete mode 100644 data/scripts/gUnk_0800FEF0.inc
 delete mode 100644 data/scripts/gUnk_0800FEF2.inc
 delete mode 100644 data/scripts/gUnk_0800FEF9.inc
 delete mode 100644 data/scripts/gUnk_0800FEFC.inc
 delete mode 100644 data/scripts/gUnk_0800FEFE.inc
 delete mode 100644 data/scripts/gUnk_0800FF01.inc
 delete mode 100644 data/scripts/gUnk_0800FF03.inc
 delete mode 100644 data/scripts/gUnk_0800FF04.inc
 delete mode 100644 data/scripts/gUnk_0800FF05.inc
 delete mode 100644 data/scripts/gUnk_0800FF06.inc
 delete mode 100644 data/scripts/gUnk_0800FF08.inc
 delete mode 100644 data/scripts/gUnk_0800FF2A.inc
 delete mode 100644 data/scripts/gUnk_0800FFB0.inc
 delete mode 100644 data/scripts/gUnk_0800FFBB.inc
 delete mode 100644 data/scripts/gUnk_0800FFD6.inc
 delete mode 100644 data/scripts/gUnk_0800FFEE.inc
 delete mode 100644 data/scripts/gUnk_0800FFF6.inc
 delete mode 100644 data/scripts/gUnk_0800FFFC.inc
 delete mode 100644 data/scripts/gUnk_0800FFFD.inc
 delete mode 100644 data/scripts/gUnk_0800FFFF.inc
 delete mode 100644 data/scripts/gUnk_08010000.inc
 delete mode 100644 data/scripts/gUnk_08010001.inc
 delete mode 100644 data/scripts/gUnk_08010002.inc
 delete mode 100644 data/scripts/gUnk_08010003.inc
 delete mode 100644 data/scripts/gUnk_08010005.inc
 delete mode 100644 data/scripts/gUnk_08010007.inc
 delete mode 100644 data/scripts/gUnk_08010008.inc
 delete mode 100644 data/scripts/gUnk_08010009.inc
 delete mode 100644 data/scripts/gUnk_0801000A.inc
 delete mode 100644 data/scripts/gUnk_0801000C.inc
 delete mode 100644 data/scripts/gUnk_0801000D.inc
 delete mode 100644 data/scripts/gUnk_0801000E.inc
 delete mode 100644 data/scripts/gUnk_0801000F.inc
 delete mode 100644 data/scripts/gUnk_08010018.inc
 delete mode 100644 data/scripts/gUnk_0801001B.inc
 delete mode 100644 data/scripts/gUnk_0801001D.inc
 delete mode 100644 data/scripts/gUnk_08010023.inc
 delete mode 100644 data/scripts/gUnk_08010044.inc
 delete mode 100644 data/scripts/gUnk_08010098.inc
 delete mode 100644 data/scripts/gUnk_08010099.inc
 delete mode 100644 data/scripts/gUnk_080100C1.inc
 delete mode 100644 data/scripts/gUnk_080100F5.inc
 delete mode 100644 data/scripts/gUnk_080100FC.inc
 delete mode 100644 data/scripts/gUnk_080100FE.inc
 delete mode 100644 data/scripts/gUnk_080100FF.inc
 delete mode 100644 data/scripts/gUnk_08010100.inc
 delete mode 100644 data/scripts/gUnk_08010102.inc
 delete mode 100644 data/scripts/gUnk_08010103.inc
 delete mode 100644 data/scripts/gUnk_08010105.inc
 delete mode 100644 data/scripts/gUnk_08010106.inc
 delete mode 100644 data/scripts/gUnk_0801010A.inc
 delete mode 100644 data/scripts/gUnk_08010111.inc
 delete mode 100644 data/scripts/gUnk_08010120.inc
 delete mode 100644 data/scripts/gUnk_08010130.inc
 delete mode 100644 data/scripts/gUnk_08010148.inc
 delete mode 100644 data/scripts/gUnk_080101FA.inc
 delete mode 100644 data/scripts/gUnk_080101FD.inc
 delete mode 100644 data/scripts/gUnk_080101FF.inc
 delete mode 100644 data/scripts/gUnk_08010200.inc
 delete mode 100644 data/scripts/gUnk_08010203.inc
 delete mode 100644 data/scripts/gUnk_08010207.inc
 delete mode 100644 data/scripts/gUnk_08010208.inc
 delete mode 100644 data/scripts/gUnk_0801020C.inc
 delete mode 100644 data/scripts/gUnk_08010220.inc
 delete mode 100644 data/scripts/gUnk_08010236.inc
 delete mode 100644 data/scripts/gUnk_08010294.inc
 delete mode 100644 data/scripts/gUnk_080102E0.inc
 delete mode 100644 data/scripts/gUnk_080102FB.inc
 delete mode 100644 data/scripts/gUnk_080102FD.inc
 delete mode 100644 data/scripts/gUnk_080102FE.inc
 delete mode 100644 data/scripts/gUnk_08010303.inc
 delete mode 100644 data/scripts/gUnk_08010304.inc
 delete mode 100644 data/scripts/gUnk_08010305.inc
 delete mode 100644 data/scripts/gUnk_0801030A.inc
 delete mode 100644 data/scripts/gUnk_0801030C.inc
 delete mode 100644 data/scripts/gUnk_08010320.inc
 delete mode 100644 data/scripts/gUnk_080103B0.inc
 delete mode 100644 data/scripts/gUnk_080103D0.inc
 delete mode 100644 data/scripts/gUnk_080103F8.inc
 delete mode 100644 data/scripts/gUnk_080103FD.inc
 delete mode 100644 data/scripts/gUnk_08010400.inc
 delete mode 100644 data/scripts/gUnk_08010406.inc
 delete mode 100644 data/scripts/gUnk_08010407.inc
 delete mode 100644 data/scripts/gUnk_0801040A.inc
 delete mode 100644 data/scripts/gUnk_08010428.inc
 delete mode 100644 data/scripts/gUnk_08010454.inc
 delete mode 100644 data/scripts/gUnk_08010480.inc
 delete mode 100644 data/scripts/gUnk_080104A0.inc
 delete mode 100644 data/scripts/gUnk_080104EC.inc
 delete mode 100644 data/scripts/gUnk_080104FF.inc
 delete mode 100644 data/scripts/gUnk_08010501.inc
 delete mode 100644 data/scripts/gUnk_08010502.inc
 delete mode 100644 data/scripts/gUnk_08010503.inc
 delete mode 100644 data/scripts/gUnk_0801050A.inc
 delete mode 100644 data/scripts/gUnk_0801050B.inc
 delete mode 100644 data/scripts/gUnk_08010526.inc
 delete mode 100644 data/scripts/gUnk_0801059F.inc
 delete mode 100644 data/scripts/gUnk_080105C9.inc
 delete mode 100644 data/scripts/gUnk_080105FB.inc
 delete mode 100644 data/scripts/gUnk_080105FF.inc
 delete mode 100644 data/scripts/gUnk_08010600.inc
 delete mode 100644 data/scripts/gUnk_0801060A.inc
 delete mode 100644 data/scripts/gUnk_0801060D.inc
 delete mode 100644 data/scripts/gUnk_08010617.inc
 delete mode 100644 data/scripts/gUnk_0801061C.inc
 delete mode 100644 data/scripts/gUnk_08010644.inc
 delete mode 100644 data/scripts/gUnk_08010650.inc
 delete mode 100644 data/scripts/gUnk_08010674.inc
 delete mode 100644 data/scripts/gUnk_080106AC.inc
 delete mode 100644 data/scripts/gUnk_08010700.inc
 delete mode 100644 data/scripts/gUnk_08010701.inc
 delete mode 100644 data/scripts/gUnk_08010705.inc
 delete mode 100644 data/scripts/gUnk_0801070E.inc
 delete mode 100644 data/scripts/gUnk_08010734.inc
 delete mode 100644 data/scripts/gUnk_08010794.inc
 delete mode 100644 data/scripts/gUnk_080107D0.inc
 delete mode 100644 data/scripts/gUnk_0801080A.inc
 delete mode 100644 data/scripts/gUnk_0801080B.inc
 delete mode 100644 data/scripts/gUnk_08010815.inc
 delete mode 100644 data/scripts/gUnk_0801081B.inc
 delete mode 100644 data/scripts/gUnk_080108D0.inc
 delete mode 100644 data/scripts/gUnk_080108FF.inc
 delete mode 100644 data/scripts/gUnk_0801090C.inc
 delete mode 100644 data/scripts/gUnk_0801090F.inc
 delete mode 100644 data/scripts/gUnk_08010917.inc
 delete mode 100644 data/scripts/gUnk_080109A0.inc
 delete mode 100644 data/scripts/gUnk_080109F6.inc
 delete mode 100644 data/scripts/gUnk_08010A1F.inc
 delete mode 100644 data/scripts/gUnk_08010AE4.inc
 delete mode 100644 data/scripts/gUnk_08010B04.inc
 delete mode 100644 data/scripts/gUnk_08010BEC.inc
 delete mode 100644 data/scripts/gUnk_08010BF9.inc
 delete mode 100644 data/scripts/gUnk_08010BFE.inc
 delete mode 100644 data/scripts/gUnk_08010C1A.inc
 delete mode 100644 data/scripts/gUnk_08010D03.inc
 delete mode 100644 data/scripts/gUnk_08010E00.inc
 delete mode 100644 data/scripts/gUnk_08010E0D.inc
 create mode 100644 data/scripts/gUnk_08010E5A.inc
 delete mode 100644 data/scripts/gUnk_08010F00.inc
 create mode 100644 data/scripts/gUnk_08010F84.inc
 delete mode 100644 data/scripts/gUnk_08010FFF.inc
 delete mode 100644 data/scripts/gUnk_08011000.inc
 delete mode 100644 data/scripts/gUnk_08011001.inc
 delete mode 100644 data/scripts/gUnk_0801101F.inc
 delete mode 100644 data/scripts/gUnk_08011083.inc
 create mode 100644 data/scripts/gUnk_08011098.inc
 create mode 100644 data/scripts/gUnk_080110BC.inc
 delete mode 100644 data/scripts/gUnk_080110DC.inc
 delete mode 100644 data/scripts/gUnk_08011208.inc
 delete mode 100644 data/scripts/gUnk_0801121D.inc
 delete mode 100644 data/scripts/gUnk_0801130F.inc
 delete mode 100644 data/scripts/gUnk_08011328.inc
 create mode 100644 data/scripts/gUnk_080113AA.inc
 delete mode 100644 data/scripts/gUnk_08011403.inc
 create mode 100644 data/scripts/gUnk_08011442.inc
 create mode 100644 data/scripts/gUnk_08011508.inc
 delete mode 100644 data/scripts/gUnk_08011809.inc
 create mode 100644 data/scripts/gUnk_08011890.inc
 delete mode 100644 data/scripts/gUnk_08011958.inc
 delete mode 100644 data/scripts/gUnk_08011964.inc
 delete mode 100644 data/scripts/gUnk_080119B0.inc
 delete mode 100644 data/scripts/gUnk_080119D8.inc
 delete mode 100644 data/scripts/gUnk_080119E4.inc
 delete mode 100644 data/scripts/gUnk_080119F0.inc
 delete mode 100644 data/scripts/gUnk_08011A04.inc
 delete mode 100644 data/scripts/gUnk_08011A2C.inc
 delete mode 100644 data/scripts/gUnk_08011A64.inc
 delete mode 100644 data/scripts/gUnk_08011AE4.inc
 delete mode 100644 data/scripts/gUnk_08011B04.inc
 delete mode 100644 data/scripts/gUnk_08011BE4.inc
 delete mode 100644 data/scripts/gUnk_08011C04.inc
 delete mode 100644 data/scripts/gUnk_08011D28.inc
 delete mode 100644 data/scripts/gUnk_08011DD4.inc
 delete mode 100644 data/scripts/gUnk_08011E04.inc
 delete mode 100644 data/scripts/gUnk_08011E80.inc
 delete mode 100644 data/scripts/gUnk_08011F0C.inc
 delete mode 100644 data/scripts/gUnk_08011F98.inc
 delete mode 100644 data/scripts/gUnk_08012024.inc
 delete mode 100644 data/scripts/gUnk_08012091.inc
 delete mode 100644 data/scripts/gUnk_080120B0.inc
 delete mode 100644 data/scripts/gUnk_080120ED.inc
 delete mode 100644 data/scripts/gUnk_080120FB.inc
 delete mode 100644 data/scripts/gUnk_0801213C.inc
 delete mode 100644 data/scripts/gUnk_080121C8.inc
 delete mode 100644 data/scripts/gUnk_08012200.inc
 delete mode 100644 data/scripts/gUnk_08012238.inc
 delete mode 100644 data/scripts/gUnk_08012270.inc
 delete mode 100644 data/scripts/gUnk_08012360.inc
 delete mode 100644 data/scripts/gUnk_08012480.inc
 create mode 100644 data/scripts/gUnk_080126FC.inc
 create mode 100644 data/scripts/gUnk_08012AF0.inc
 create mode 100644 data/scripts/gUnk_08012B18.inc
 create mode 100644 data/scripts/gUnk_08012B24.inc
 create mode 100644 data/scripts/gUnk_08012B50.inc
 create mode 100644 data/scripts/gUnk_08012B7C.inc
 delete mode 100644 data/scripts/gUnk_08012C0C.inc
 create mode 100644 data/scripts/gUnk_08012C68.inc
 delete mode 100644 data/scripts/gUnk_08012C98.inc
 delete mode 100644 data/scripts/gUnk_08012DA1.inc
 create mode 100644 data/scripts/gUnk_08012DF8.inc
 delete mode 100644 data/scripts/gUnk_08012EC0.inc
 delete mode 100644 data/scripts/gUnk_08012F0C.inc
 create mode 100644 data/scripts/gUnk_08012F86.inc
 delete mode 100644 data/scripts/gUnk_08013001.inc
 delete mode 100644 data/scripts/gUnk_08013003.inc
 delete mode 100644 data/scripts/gUnk_0801300B.inc
 delete mode 100644 data/scripts/gUnk_0801303C.inc
 delete mode 100644 data/scripts/gUnk_08013070.inc
 delete mode 100644 data/scripts/gUnk_08013081.inc
 delete mode 100644 data/scripts/gUnk_08013090.inc
 delete mode 100644 data/scripts/gUnk_08013188.inc
 rename data/scripts/{gUnk_080131AC.inc => gUnk_0801319A.inc} (69%)
 create mode 100644 data/scripts/gUnk_0801330C.inc
 create mode 100644 data/scripts/gUnk_08013494.inc
 create mode 100644 data/scripts/gUnk_08013650.inc
 create mode 100644 data/scripts/gUnk_080136B4.inc
 delete mode 100644 data/scripts/gUnk_080137DA.inc
 create mode 100644 data/scripts/gUnk_08013AA6.inc
 delete mode 100644 data/scripts/gUnk_08013B70.inc
 create mode 100644 data/scripts/gUnk_08013D04.inc
 create mode 100644 data/scripts/gUnk_08013D44.inc
 create mode 100644 data/scripts/gUnk_08013D84.inc
 create mode 100644 data/scripts/gUnk_08013DC4.inc
 create mode 100644 data/scripts/gUnk_08013E28.inc
 create mode 100644 data/scripts/gUnk_080140B8.inc
 delete mode 100644 data/scripts/gUnk_080140F8.inc
 create mode 100644 data/scripts/gUnk_08014198.inc
 rename data/scripts/{gUnk_080142B0.inc => gUnk_08014248.inc} (54%)
 delete mode 100644 data/scripts/gUnk_08014274.inc
 delete mode 100644 data/scripts/gUnk_08014402.inc
 delete mode 100644 data/scripts/gUnk_08014548.inc
 create mode 100644 data/scripts/gUnk_08014588.inc
 delete mode 100644 data/scripts/gUnk_080145A0.inc
 delete mode 100644 data/scripts/gUnk_08014628.inc
 delete mode 100644 data/scripts/gUnk_080148F0.inc
 delete mode 100644 data/scripts/gUnk_08014994.inc
 delete mode 100644 data/scripts/gUnk_08014A28.inc
 delete mode 100644 data/scripts/gUnk_08014A54.inc
 delete mode 100644 data/scripts/gUnk_08014A80.inc
 delete mode 100644 data/scripts/gUnk_08014AC4.inc
 delete mode 100644 data/scripts/gUnk_08014C2C.inc
 delete mode 100644 data/scripts/gUnk_08014C94.inc
 delete mode 100644 data/scripts/gUnk_08014E50.inc
 delete mode 100644 data/scripts/gUnk_08014ECC.inc
 delete mode 100644 data/scripts/gUnk_08014EF8.inc
 delete mode 100644 data/scripts/gUnk_08014F30.inc
 delete mode 100644 data/scripts/gUnk_08014FBC.inc
 delete mode 100644 data/scripts/gUnk_08015001.inc
 delete mode 100644 data/scripts/gUnk_08015087.inc
 delete mode 100644 data/scripts/gUnk_080150EF.inc
 create mode 100644 data/scripts/gUnk_080152DC.inc
 create mode 100644 data/scripts/gUnk_08015304.inc
 rename data/scripts/{gUnk_0800E9F4.inc => gUnk_08015338.inc} (66%)
 create mode 100644 data/scripts/gUnk_08015360.inc
 create mode 100644 data/scripts/gUnk_08015384.inc
 create mode 100644 data/scripts/gUnk_0801548E.inc
 create mode 100644 data/scripts/gUnk_080155F4.inc
 delete mode 100644 data/scripts/gUnk_080156A0.inc
 create mode 100644 data/scripts/gUnk_08015918.inc
 create mode 100644 data/scripts/gUnk_08015A7C.inc
 create mode 100644 data/scripts/gUnk_08015AA0.inc
 create mode 100644 data/scripts/gUnk_08015C7C.inc
 create mode 100644 data/scripts/gUnk_08015F80.inc
 create mode 100644 data/scripts/gUnk_08016004.inc
 delete mode 100644 data/scripts/gUnk_08016021.inc
 create mode 100644 data/scripts/gUnk_08016030.inc
 create mode 100644 data/scripts/gUnk_08016062.inc
 create mode 100644 data/scripts/gUnk_0801609E.inc
 delete mode 100644 data/scripts/gUnk_080160EA.inc
 delete mode 100644 data/scripts/gUnk_0801613C.inc
 delete mode 100644 data/scripts/gUnk_08016190.inc
 delete mode 100644 data/scripts/gUnk_080161E8.inc
 create mode 100644 data/scripts/gUnk_0801637C.inc
 delete mode 100644 data/scripts/gUnk_0801637D.inc
 delete mode 100644 data/scripts/gUnk_08016384.inc
 delete mode 100644 data/scripts/gUnk_08016408.inc
 create mode 100644 data/scripts/gUnk_08016482.inc
 create mode 100644 data/scripts/gUnk_080165A4.inc
 delete mode 100644 data/scripts/gUnk_080165F8.inc
 delete mode 100644 data/scripts/gUnk_0801660C.inc
 delete mode 100644 data/scripts/gUnk_08016628.inc
 delete mode 100644 data/scripts/gUnk_08016644.inc
 delete mode 100644 data/scripts/gUnk_0801666C.inc
 delete mode 100644 data/scripts/gUnk_080166B8.inc
 delete mode 100644 data/scripts/gUnk_080166FC.inc
 delete mode 100644 data/scripts/gUnk_08016798.inc
 delete mode 100644 data/scripts/gUnk_08016844.inc
 delete mode 100644 data/scripts/gUnk_080168E0.inc
 delete mode 100644 data/scripts/gUnk_080168F4.inc

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
new file mode 100644
index 00000000..36781ca8
--- /dev/null
+++ b/asm/macros/scripts.inc
@@ -0,0 +1,675 @@
+@ All the macro functions for scripts
+@ Generated by disassemble_script.py
+.macro SCRIPT_START name
+	.globl \name
+	.section .text
+\name:
+.endm
+.macro SCRIPT_END
+	.short 0xffff
+.endm
+
+.macro ScriptCommandNop 
+	.short 0x0000
+.endm
+
+.macro StartScript 
+	.short 0x0401
+.endm
+
+.macro StopScript 
+	.short 0x0402
+.endm
+
+.macro Jump s
+	.short 0x0803
+	.short \s
+.endm
+
+.macro JumpIf s
+	.short 0x0804
+	.short \s
+.endm
+
+.macro JumpIfNot s
+	.short 0x0805
+	.short \s
+.endm
+
+.macro _0807E078 
+	.short 0x0006
+.endm
+
+.macro JumpAbsolute w
+	.short 0x0c07
+	.word \w
+.endm
+
+.macro JumpAbsoluteIf w
+	.short 0x0c08
+	.word \w
+.endm
+
+.macro JumpAbsoluteIfNot w
+	.short 0x0c09
+	.word \w
+.endm
+
+.macro _0807E0E0 a,b
+	.short 0x140a
+	.word \a
+	.word \b
+.endm
+
+.macro Call w
+	.short 0x0c0b
+	.word \w
+.endm
+
+.macro CallWithArg 
+	.short 0x000c
+.endm
+
+.macro LoadRoomEntityList w
+	.short 0x0c0d
+	.word \w
+.endm
+
+.macro TestBit w
+	.short 0x0c0e
+	.word \w
+.endm
+
+.macro CheckInventory1 s
+	.short 0x080f
+	.short \s
+.endm
+
+.macro CheckInventory2 s
+	.short 0x0810
+	.short \s
+.endm
+
+.macro HasRoomItemForSale 
+	.short 0x0411
+.endm
+
+.macro CheckLocalFlag s
+	.short 0x0812
+	.short \s
+.endm
+
+.macro CheckLocalFlagByOffset a,b
+	.short 0x0c13
+	.short \a
+	.short \b
+.endm
+
+.macro CheckGlobalFlag s
+	.short 0x0814
+	.short \s
+.endm
+
+.macro CheckRoomFlag s
+	.short 0x0815
+	.short \s
+.endm
+
+.macro CheckPlayerInRegion a,b,c
+	.short 0x1016
+	.short \a
+	.short \b
+	.short \c
+.endm
+
+.macro CheckPlayerInRegion2 s
+	.short 0x0817
+	.short \s
+.endm
+
+.macro CheckEntityInteractType 
+	.short 0x0418
+.endm
+
+.macro _0807E30C 
+	.short 0x0419
+.endm
+
+.macro HasRupees s
+	.short 0x081a
+	.short \s
+.endm
+
+.macro _0807E3BC s
+	.short 0x081b
+	.short \s
+.endm
+
+.macro _0807E3E8 
+	.short 0x041c
+.endm
+
+.macro CheckKinstoneFused s
+	.short 0x081d
+	.short \s
+.endm
+
+.macro BuyItem a,b
+	.short 0x0c1e
+	.short \a
+	.short \b
+.endm
+
+.macro _0807E48C s
+	.short 0x081f
+	.short \s
+.endm
+
+.macro _0807E4CC w
+	.short 0x0c20
+	.word \w
+.endm
+
+.macro _0807E4EC w
+	.short 0x0c21
+	.word \w
+.endm
+
+.macro _0807E514 w
+	.short 0x0c22
+	.word \w
+.endm
+
+.macro CheckPlayerFlags w
+	.short 0x0c23
+	.word \w
+.endm
+
+.macro _0807E564 
+	.short 0x0424
+.endm
+
+.macro EntityHasHeight 
+	.short 0x0425
+.endm
+
+.macro ComparePlayerAction s
+	.short 0x0826
+	.short \s
+.endm
+
+.macro ComparePlayerAnimationState s
+	.short 0x0827
+	.short \s
+.endm
+
+.macro _0807E5F8 w
+	.short 0x0c28
+	.word \w
+.endm
+
+.macro _0807E610 w
+	.short 0x0c29
+	.word \w
+.endm
+
+.macro SetLocalFlag s
+	.short 0x082a
+	.short \s
+.endm
+
+.macro SetLocalFlagByOffset a,b
+	.short 0x0c2b
+	.short \a
+	.short \b
+.endm
+
+.macro ClearLocalFlag s
+	.short 0x082c
+	.short \s
+.endm
+
+.macro SetGlobalFlag s
+	.short 0x082d
+	.short \s
+.endm
+
+.macro ClearGlobalFlag s
+	.short 0x082e
+	.short \s
+.endm
+
+.macro SetRoomFlag s
+	.short 0x082f
+	.short \s
+.endm
+
+.macro ClearRoomFlag s
+	.short 0x0830
+	.short \s
+.endm
+
+.macro Wait s
+	.short 0x0831
+	.short \s
+.endm
+
+.macro WaitForSomething w
+	.short 0x0c32
+	.word \w
+.endm
+
+.macro WaitForSomething2 w
+	.short 0x0c33
+	.word \w
+.endm
+
+.macro WaitPlayerAction8 
+	.short 0x0434
+.endm
+
+.macro WaitForPlayerAction0x17 
+	.short 0x0435
+.endm
+
+.macro WaitFor_1 
+	.short 0x0436
+.endm
+
+.macro WaitFor_2 
+	.short 0x0437
+.endm
+
+.macro _0807E778 s
+	.short 0x0838
+	.short \s
+.endm
+
+.macro _0807E788 w
+	.short 0x0c39
+	.word \w
+.endm
+
+.macro _0807E79C 
+	.short 0x043a
+.endm
+
+.macro ScriptCommandNop2 s
+	.short 0x083b
+	.short \s
+.endm
+
+.macro DoFade4 
+	.short 0x043c
+.endm
+
+.macro DoFade5 
+	.short 0x043d
+.endm
+
+.macro DoFade6 
+	.short 0x043e
+.endm
+
+.macro DoFade7 
+	.short 0x043f
+.endm
+
+.macro _0807E800 w
+	.short 0x0c40
+	.word \w
+.endm
+
+.macro _0807E80C w
+	.short 0x0c41
+	.word \w
+.endm
+
+.macro _0807E858 
+	.short 0x0042
+.endm
+
+.macro _0807E864 
+	.short 0x0443
+.endm
+
+.macro _0807E878 
+	.short 0x0444
+.endm
+
+.macro _0807E888 
+	.short 0x0445
+.endm
+
+.macro SetPlayerAction w
+	.short 0x0c46
+	.word \w
+.endm
+
+.macro StartPlayerScript w
+	.short 0x0c47
+	.word \w
+.endm
+
+.macro _0807E8D4 s
+	.short 0x0848
+	.short \s
+.endm
+
+.macro _0807E8E4_0 
+	.short 0x0449
+.endm
+
+.macro _0807E8E4_1 
+	.short 0x044a
+.endm
+
+.macro _0807E8E4_2 
+	.short 0x044b
+.endm
+
+.macro _0807E8E4_3 
+	.short 0x044c
+.endm
+
+.macro _0807E908 s
+	.short 0x084d
+	.short \s
+.endm
+
+.macro _0807E914 w
+	.short 0x0c4e
+	.word \w
+.endm
+
+.macro _0807E924 
+	.short 0x044f
+.endm
+
+.macro _0807E930 s
+	.short 0x0850
+	.short \s
+.endm
+
+.macro _0807E944 
+	.short 0x0451
+.endm
+
+.macro _0807E974 s
+	.short 0x0852
+	.short \s
+.endm
+
+.macro _0807E9D4 
+	.short 0x0453
+.endm
+
+.macro _0807E9DC 
+	.short 0x0454
+.endm
+
+.macro _0807E9E4 s
+	.short 0x0855
+	.short \s
+.endm
+
+.macro _0807E9F0 
+	.short 0x0456
+.endm
+
+.macro _0807EA4C 
+	.short 0x0457
+.endm
+
+.macro _0807EA88 s
+	.short 0x0858
+	.short \s
+.endm
+
+.macro _0807EA94 
+	.short 0x0459
+.endm
+
+.macro TextboxNoOverlapFollow s
+	.short 0x085a
+	.short \s
+.endm
+
+.macro TextboxNoOverlap s
+	.short 0x085b
+	.short \s
+.endm
+
+.macro TextboxNoOverlapFollowPos 
+	.short 0x005c
+.endm
+
+.macro _0807EAF0 
+	.short 0x005d
+.endm
+
+.macro TextboxNoOverlapVar 
+	.short 0x045e
+.endm
+
+.macro _0807EB28 s
+	.short 0x085f
+	.short \s
+.endm
+
+.macro _0807EB38 
+	.short 0x0460
+.endm
+
+.macro _0807EB44 s
+	.short 0x0861
+	.short \s
+.endm
+
+.macro _0807EB4C a,b
+	.short 0x0c62
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EB74 
+	.short 0x0463
+.endm
+
+.macro _0807EB8C 
+	.short 0x0464
+.endm
+
+.macro SetEntityDirection s
+	.short 0x0865
+	.short \s
+.endm
+
+.macro SetEntityDirectionWithAnimationState s
+	.short 0x0866
+	.short \s
+.endm
+
+.macro SetEntityNonPlanarMovement s
+	.short 0x0867
+	.short \s
+.endm
+
+.macro SetEntity0x20 w
+	.short 0x0c68
+	.word \w
+.endm
+
+.macro SetEntityPositionRelative w
+	.short 0x0c69
+	.word \w
+.endm
+
+.macro SetEntityPosition a,b
+	.short 0x0c6a
+	.short \a
+	.short \b
+.endm
+
+.macro MoveEntityToPlayer 
+	.short 0x046b
+.endm
+
+.macro ScriptCommandNop3 
+	.short 0x046c
+.endm
+
+.macro _0807EC1C s
+	.short 0x086d
+	.short \s
+.endm
+
+.macro _0807EC64 s
+	.short 0x086e
+	.short \s
+.endm
+
+.macro _0807EC94 s
+	.short 0x086f
+	.short \s
+.endm
+
+.macro _0807ECC4 s
+	.short 0x0870
+	.short \s
+.endm
+
+.macro _0807ECF4 s
+	.short 0x0871
+	.short \s
+.endm
+
+.macro _0807ED24 a,b,c
+	.short 0x1072
+	.short \a
+	.short \b
+	.short \c
+.endm
+
+.macro _0807EDD4 a,b
+	.short 0x0c73
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EE04 a,b
+	.short 0x0c74
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EE30 
+	.short 0x0475
+.endm
+
+.macro _0807EEB4 
+	.short 0x0476
+.endm
+
+.macro _0807EEF4 a,b
+	.short 0x0c77
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EF3C a,b
+	.short 0x0c78
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EF80 s
+	.short 0x0879
+	.short \s
+.endm
+
+.macro _0807EF90 s
+	.short 0x087a
+	.short \s
+.endm
+
+.macro SoundReq s
+	.short 0x087b
+	.short \s
+.endm
+
+.macro SoundReq2 s
+	.short 0x087c
+	.short \s
+.endm
+
+.macro SoundReq3 w
+	.short 0x0c7d
+	.word \w
+.endm
+
+.macro SoundReq0x80100000 
+	.short 0x047e
+.endm
+
+.macro ModRupees s
+	.short 0x087f
+	.short \s
+.endm
+
+.macro ModHealth s
+	.short 0x0880
+	.short \s
+.endm
+
+.macro IncreaseMaxHealth s
+	.short 0x0881
+	.short \s
+.endm
+
+.macro _0807F034 s
+	.short 0x0882
+	.short \s
+.endm
+
+.macro _0807F050 s
+	.short 0x0883
+	.short \s
+.endm
+
+.macro GetInventoryValue s
+	.short 0x0884
+	.short \s
+.endm
+
+.macro _0807F078 a,b
+	.short 0x0c85
+	.short \a
+	.short \b
+.endm
+
+.macro _0807F088 s
+	.short 0x0886
+	.short \s
+.endm
+
+.macro CameraTargetEntity 
+	.short 0x0487
+.endm
+
+.macro CameraTargetPlayer 
+	.short 0x0488
+.endm
+
+.macro _0807F0B4 s
+	.short 0x0889
+	.short \s
+.endm
+
+.macro _0807F0C8 a,b
+	.short 0x0c8a
+	.short \a
+	.short \b
+.endm
+
+
diff --git a/data/scripts.s b/data/scripts.s
index 1f07d4b8..edb0c350 100644
--- a/data/scripts.s
+++ b/data/scripts.s
@@ -7,2141 +7,3208 @@
 
 	.text
 
-.include "data/scripts/gUnk_08008B5C.inc"
+gUnk_08008B5C:: @ 08008B5C
+	.incbin "baserom.gba", 0x008B5C, 0x0000034
 
-.include "data/scripts/gUnk_08008B90.inc"
+gUnk_08008B90:: @ 08008B90
+	.incbin "baserom.gba", 0x008B90, 0x0000030
 
-.include "data/scripts/gUnk_08008BC0.inc"
+gUnk_08008BC0:: @ 08008BC0
+	.incbin "baserom.gba", 0x008BC0, 0x000008E
 
-.include "data/scripts/gUnk_08008C4E.inc"
+gUnk_08008C4E:: @ 08008C4E
+	.incbin "baserom.gba", 0x008C4E, 0x0000016
 
-.include "data/scripts/gUnk_08008C64.inc"
+gUnk_08008C64:: @ 08008C64
+	.incbin "baserom.gba", 0x008C64, 0x0000009
 
-.include "data/scripts/gUnk_08008C6D.inc"
+gUnk_08008C6D:: @ 08008C6D
+	.incbin "baserom.gba", 0x008C6D, 0x0000011
 
-.include "data/scripts/gUnk_08008C7E.inc"
+gUnk_08008C7E:: @ 08008C7E
+	.incbin "baserom.gba", 0x008C7E, 0x000003B
 
-.include "data/scripts/gUnk_08008CB9.inc"
+gUnk_08008CB9:: @ 08008CB9
+	.incbin "baserom.gba", 0x008CB9, 0x0000097
 
-.include "data/scripts/gUnk_08008D50.inc"
+gUnk_08008D50:: @ 08008D50
+	.incbin "baserom.gba", 0x008D50, 0x000003C
 
-.include "data/scripts/gUnk_08008D8C.inc"
+gUnk_08008D8C:: @ 08008D8C
+	.incbin "baserom.gba", 0x008D8C, 0x0000034
 
-.include "data/scripts/gUnk_08008DC0.inc"
+gUnk_08008DC0:: @ 08008DC0
+	.incbin "baserom.gba", 0x008DC0, 0x0000048
 
-.include "data/scripts/gUnk_08008E08.inc"
+gUnk_08008E08:: @ 08008E08
+	.incbin "baserom.gba", 0x008E08, 0x0000002
 
-.include "data/scripts/gUnk_08008E0A.inc"
+gUnk_08008E0A:: @ 08008E0A
+	.incbin "baserom.gba", 0x008E0A, 0x0000102
 
-.include "data/scripts/gUnk_08008F0C.inc"
+gUnk_08008F0C:: @ 08008F0C
+	.incbin "baserom.gba", 0x008F0C, 0x000000A
 
-.include "data/scripts/gUnk_08008F16.inc"
+gUnk_08008F16:: @ 08008F16
+	.incbin "baserom.gba", 0x008F16, 0x0000010
 
-.include "data/scripts/gUnk_08008F26.inc"
+gUnk_08008F26:: @ 08008F26
+	.incbin "baserom.gba", 0x008F26, 0x000006A
 
-.include "data/scripts/gUnk_08008F90.inc"
+gUnk_08008F90:: @ 08008F90
+	.incbin "baserom.gba", 0x008F90, 0x0000030
 
-.include "data/scripts/gUnk_08008FC0.inc"
+gUnk_08008FC0:: @ 08008FC0
+	.incbin "baserom.gba", 0x008FC0, 0x0000011
 
-.include "data/scripts/gUnk_08008FD1.inc"
+gUnk_08008FD1:: @ 08008FD1
+	.incbin "baserom.gba", 0x008FD1, 0x000002B
 
-.include "data/scripts/gUnk_08008FFC.inc"
+gUnk_08008FFC:: @ 08008FFC
+	.incbin "baserom.gba", 0x008FFC, 0x000000C
 
-.include "data/scripts/gUnk_08009008.inc"
+gUnk_08009008:: @ 08009008
+	.incbin "baserom.gba", 0x009008, 0x0000017
 
-.include "data/scripts/gUnk_0800901F.inc"
+gUnk_0800901F:: @ 0800901F
+	.incbin "baserom.gba", 0x00901F, 0x000001D
 
-.include "data/scripts/gUnk_0800903C.inc"
+gUnk_0800903C:: @ 0800903C
+	.incbin "baserom.gba", 0x00903C, 0x0000044
 
-.include "data/scripts/gUnk_08009080.inc"
+gUnk_08009080:: @ 08009080
+	.incbin "baserom.gba", 0x009080, 0x000005B
 
-.include "data/scripts/gUnk_080090DB.inc"
+gUnk_080090DB:: @ 080090DB
+	.incbin "baserom.gba", 0x0090DB, 0x00000BD
 
-.include "data/scripts/gUnk_08009198.inc"
+gUnk_08009198:: @ 08009198
+	.incbin "baserom.gba", 0x009198, 0x000006F
 
-.include "data/scripts/gUnk_08009207.inc"
+gUnk_08009207:: @ 08009207
+	.incbin "baserom.gba", 0x009207, 0x000006D
 
-.include "data/scripts/gUnk_08009274.inc"
+gUnk_08009274:: @ 08009274
+	.incbin "baserom.gba", 0x009274, 0x0000034
 
-.include "data/scripts/gUnk_080092A8.inc"
+gUnk_080092A8:: @ 080092A8
+	.incbin "baserom.gba", 0x0092A8, 0x000002C
 
-.include "data/scripts/gUnk_080092D4.inc"
+gUnk_080092D4:: @ 080092D4
+	.incbin "baserom.gba", 0x0092D4, 0x000001C
 
-.include "data/scripts/gUnk_080092F0.inc"
+gUnk_080092F0:: @ 080092F0
+	.incbin "baserom.gba", 0x0092F0, 0x0000018
 
-.include "data/scripts/gUnk_08009308.inc"
+gUnk_08009308:: @ 08009308
+	.incbin "baserom.gba", 0x009308, 0x0000010
 
-.include "data/scripts/gUnk_08009318.inc"
+gUnk_08009318:: @ 08009318
+	.incbin "baserom.gba", 0x009318, 0x0000008
 
-.include "data/scripts/gUnk_08009320.inc"
+gUnk_08009320:: @ 08009320
+	.incbin "baserom.gba", 0x009320, 0x0000020
 
-.include "data/scripts/gUnk_08009340.inc"
+gUnk_08009340:: @ 08009340
+	.incbin "baserom.gba", 0x009340, 0x0000008
 
-.include "data/scripts/gUnk_08009348.inc"
+gUnk_08009348:: @ 08009348
+	.incbin "baserom.gba", 0x009348, 0x000004B
 
-.include "data/scripts/gUnk_08009393.inc"
+gUnk_08009393:: @ 08009393
+	.incbin "baserom.gba", 0x009393, 0x0000044
 
-.include "data/scripts/gUnk_080093D7.inc"
+gUnk_080093D7:: @ 080093D7
+	.incbin "baserom.gba", 0x0093D7, 0x0000030
 
-.include "data/scripts/gUnk_08009407.inc"
+gUnk_08009407:: @ 08009407
+	.incbin "baserom.gba", 0x009407, 0x000007F
 
-.include "data/scripts/gUnk_08009486.inc"
+gUnk_08009486:: @ 08009486
+	.incbin "baserom.gba", 0x009486, 0x000001E
 
-.include "data/scripts/gUnk_080094A4.inc"
+gUnk_080094A4:: @ 080094A4
+	.incbin "baserom.gba", 0x0094A4, 0x0000028
 
-.include "data/scripts/gUnk_080094CC.inc"
+gUnk_080094CC:: @ 080094CC
+	.incbin "baserom.gba", 0x0094CC, 0x000000B
 
-.include "data/scripts/gUnk_080094D7.inc"
+gUnk_080094D7:: @ 080094D7
+	.incbin "baserom.gba", 0x0094D7, 0x0000025
 
-.include "data/scripts/gUnk_080094FC.inc"
+gUnk_080094FC:: @ 080094FC
+	.incbin "baserom.gba", 0x0094FC, 0x0000007
 
-.include "data/scripts/gUnk_08009503.inc"
+gUnk_08009503:: @ 08009503
+	.incbin "baserom.gba", 0x009503, 0x0000005
 
-.include "data/scripts/gUnk_08009508.inc"
+gUnk_08009508:: @ 08009508
+	.incbin "baserom.gba", 0x009508, 0x0000030
 
-.include "data/scripts/gUnk_08009538.inc"
+gUnk_08009538:: @ 08009538
+	.incbin "baserom.gba", 0x009538, 0x000003C
 
-.include "data/scripts/gUnk_08009574.inc"
+gUnk_08009574:: @ 08009574
+	.incbin "baserom.gba", 0x009574, 0x0000058
 
-.include "data/scripts/gUnk_080095CC.inc"
+gUnk_080095CC:: @ 080095CC
+	.incbin "baserom.gba", 0x0095CC, 0x0000060
 
-.include "data/scripts/gUnk_0800962C.inc"
+gUnk_0800962C:: @ 0800962C
+	.incbin "baserom.gba", 0x00962C, 0x000006C
 
-.include "data/scripts/gUnk_08009698.inc"
+gUnk_08009698:: @ 08009698
+	.incbin "baserom.gba", 0x009698, 0x000006C
 
-.include "data/scripts/gUnk_08009704.inc"
+gUnk_08009704:: @ 08009704
+	.incbin "baserom.gba", 0x009704, 0x0000002
 
-.include "data/scripts/gUnk_08009706.inc"
+gUnk_08009706:: @ 08009706
+	.incbin "baserom.gba", 0x009706, 0x000003A
 
-.include "data/scripts/gUnk_08009740.inc"
+gUnk_08009740:: @ 08009740
+	.incbin "baserom.gba", 0x009740, 0x0000038
 
-.include "data/scripts/gUnk_08009778.inc"
+gUnk_08009778:: @ 08009778
+	.incbin "baserom.gba", 0x009778, 0x000000E
 
-.include "data/scripts/gUnk_08009786.inc"
+gUnk_08009786:: @ 08009786
+	.incbin "baserom.gba", 0x009786, 0x000001B
 
-.include "data/scripts/gUnk_080097A1.inc"
+gUnk_080097A1:: @ 080097A1
+	.incbin "baserom.gba", 0x0097A1, 0x000004F
 
-.include "data/scripts/gUnk_080097F0.inc"
+gUnk_080097F0:: @ 080097F0
+	.incbin "baserom.gba", 0x0097F0, 0x0000048
 
-.include "data/scripts/gUnk_08009838.inc"
+gUnk_08009838:: @ 08009838
+	.incbin "baserom.gba", 0x009838, 0x000009C
 
-.include "data/scripts/gUnk_080098D4.inc"
+gUnk_080098D4:: @ 080098D4
+	.incbin "baserom.gba", 0x0098D4, 0x0000044
 
-.include "data/scripts/gUnk_08009918.inc"
+gUnk_08009918:: @ 08009918
+	.incbin "baserom.gba", 0x009918, 0x0000028
 
-.include "data/scripts/gUnk_08009940.inc"
+gUnk_08009940:: @ 08009940
+	.incbin "baserom.gba", 0x009940, 0x0000010
 
-.include "data/scripts/gUnk_08009950.inc"
+gUnk_08009950:: @ 08009950
+	.incbin "baserom.gba", 0x009950, 0x000008C
 
-.include "data/scripts/gUnk_080099DC.inc"
+gUnk_080099DC:: @ 080099DC
+	.incbin "baserom.gba", 0x0099DC, 0x0000028
 
-.include "data/scripts/gUnk_08009A04.inc"
+gUnk_08009A04:: @ 08009A04
+	.incbin "baserom.gba", 0x009A04, 0x0000003
 
-.include "data/scripts/gUnk_08009A07.inc"
+gUnk_08009A07:: @ 08009A07
+	.incbin "baserom.gba", 0x009A07, 0x0000025
 
-.include "data/scripts/gUnk_08009A2C.inc"
+gUnk_08009A2C:: @ 08009A2C
+	.incbin "baserom.gba", 0x009A2C, 0x0000008
 
-.include "data/scripts/gUnk_08009A34.inc"
+gUnk_08009A34:: @ 08009A34
+	.incbin "baserom.gba", 0x009A34, 0x000001C
 
-.include "data/scripts/gUnk_08009A50.inc"
+gUnk_08009A50:: @ 08009A50
+	.incbin "baserom.gba", 0x009A50, 0x0000027
 
-.include "data/scripts/gUnk_08009A77.inc"
+gUnk_08009A77:: @ 08009A77
+	.incbin "baserom.gba", 0x009A77, 0x000000A
 
-.include "data/scripts/gUnk_08009A81.inc"
+gUnk_08009A81:: @ 08009A81
+	.incbin "baserom.gba", 0x009A81, 0x0000003
 
-.include "data/scripts/gUnk_08009A84.inc"
+gUnk_08009A84:: @ 08009A84
+	.incbin "baserom.gba", 0x009A84, 0x0000037
 
-.include "data/scripts/gUnk_08009ABB.inc"
+gUnk_08009ABB:: @ 08009ABB
+	.incbin "baserom.gba", 0x009ABB, 0x000003D
 
-.include "data/scripts/gUnk_08009AF8.inc"
+gUnk_08009AF8:: @ 08009AF8
+	.incbin "baserom.gba", 0x009AF8, 0x0000038
 
-.include "data/scripts/gUnk_08009B30.inc"
+gUnk_08009B30:: @ 08009B30
+	.incbin "baserom.gba", 0x009B30, 0x0000033
 
-.include "data/scripts/gUnk_08009B63.inc"
+gUnk_08009B63:: @ 08009B63
+	.incbin "baserom.gba", 0x009B63, 0x0000015
 
-.include "data/scripts/gUnk_08009B78.inc"
+gUnk_08009B78:: @ 08009B78
+	.incbin "baserom.gba", 0x009B78, 0x00000F0
 
-.include "data/scripts/gUnk_08009C68.inc"
+gUnk_08009C68:: @ 08009C68
+	.incbin "baserom.gba", 0x009C68, 0x0000017
 
-.include "data/scripts/gUnk_08009C7F.inc"
+gUnk_08009C7F:: @ 08009C7F
+	.incbin "baserom.gba", 0x009C7F, 0x000001F
 
-.include "data/scripts/gUnk_08009C9E.inc"
+gUnk_08009C9E:: @ 08009C9E
+	.incbin "baserom.gba", 0x009C9E, 0x0000062
 
-.include "data/scripts/gUnk_08009D00.inc"
+gUnk_08009D00:: @ 08009D00
+	.incbin "baserom.gba", 0x009D00, 0x000006C
 
-.include "data/scripts/gUnk_08009D6C.inc"
+gUnk_08009D6C:: @ 08009D6C
+	.incbin "baserom.gba", 0x009D6C, 0x000000B
 
-.include "data/scripts/gUnk_08009D77.inc"
+gUnk_08009D77:: @ 08009D77
+	.incbin "baserom.gba", 0x009D77, 0x0000039
 
-.include "data/scripts/gUnk_08009DB0.inc"
+gUnk_08009DB0:: @ 08009DB0
+	.incbin "baserom.gba", 0x009DB0, 0x000003C
 
-.include "data/scripts/gUnk_08009DEC.inc"
+gUnk_08009DEC:: @ 08009DEC
+	.incbin "baserom.gba", 0x009DEC, 0x000004C
 
-.include "data/scripts/gUnk_08009E38.inc"
+gUnk_08009E38:: @ 08009E38
+	.incbin "baserom.gba", 0x009E38, 0x0000020
 
-.include "data/scripts/gUnk_08009E58.inc"
+gUnk_08009E58:: @ 08009E58
+	.incbin "baserom.gba", 0x009E58, 0x0000030
 
-.include "data/scripts/gUnk_08009E88.inc"
+gUnk_08009E88:: @ 08009E88
+	.incbin "baserom.gba", 0x009E88, 0x0000016
 
-.include "data/scripts/gUnk_08009E9E.inc"
+gUnk_08009E9E:: @ 08009E9E
+	.incbin "baserom.gba", 0x009E9E, 0x000000B
 
-.include "data/scripts/gUnk_08009EA9.inc"
+gUnk_08009EA9:: @ 08009EA9
+	.incbin "baserom.gba", 0x009EA9, 0x000000E
 
-.include "data/scripts/gUnk_08009EB7.inc"
+gUnk_08009EB7:: @ 08009EB7
+	.incbin "baserom.gba", 0x009EB7, 0x0000015
 
-.include "data/scripts/gUnk_08009ECC.inc"
+gUnk_08009ECC:: @ 08009ECC
+	.incbin "baserom.gba", 0x009ECC, 0x0000024
 
-.include "data/scripts/gUnk_08009EF0.inc"
+gUnk_08009EF0:: @ 08009EF0
+	.incbin "baserom.gba", 0x009EF0, 0x0000017
 
-.include "data/scripts/gUnk_08009F07.inc"
+gUnk_08009F07:: @ 08009F07
+	.incbin "baserom.gba", 0x009F07, 0x000000D
 
-.include "data/scripts/gUnk_08009F14.inc"
+gUnk_08009F14:: @ 08009F14
+	.incbin "baserom.gba", 0x009F14, 0x0000025
 
-.include "data/scripts/gUnk_08009F39.inc"
+gUnk_08009F39:: @ 08009F39
+	.incbin "baserom.gba", 0x009F39, 0x0000039
 
-.include "data/scripts/gUnk_08009F72.inc"
+gUnk_08009F72:: @ 08009F72
+	.incbin "baserom.gba", 0x009F72, 0x00000F2
 
-.include "data/scripts/gUnk_0800A064.inc"
+gUnk_0800A064:: @ 0800A064
+	.incbin "baserom.gba", 0x00A064, 0x000001D
 
-.include "data/scripts/gUnk_0800A081.inc"
+gUnk_0800A081:: @ 0800A081
+	.incbin "baserom.gba", 0x00A081, 0x0000033
 
-.include "data/scripts/gUnk_0800A0B4.inc"
+gUnk_0800A0B4:: @ 0800A0B4
+	.incbin "baserom.gba", 0x00A0B4, 0x0000048
 
-.include "data/scripts/gUnk_0800A0FC.inc"
+gUnk_0800A0FC:: @ 0800A0FC
+	.incbin "baserom.gba", 0x00A0FC, 0x000000E
 
-.include "data/scripts/gUnk_0800A10A.inc"
+gUnk_0800A10A:: @ 0800A10A
+	.incbin "baserom.gba", 0x00A10A, 0x0000005
 
-.include "data/scripts/gUnk_0800A10F.inc"
+gUnk_0800A10F:: @ 0800A10F
+	.incbin "baserom.gba", 0x00A10F, 0x0000015
 
-.include "data/scripts/gUnk_0800A124.inc"
+gUnk_0800A124:: @ 0800A124
+	.incbin "baserom.gba", 0x00A124, 0x0000010
 
-.include "data/scripts/gUnk_0800A134.inc"
+gUnk_0800A134:: @ 0800A134
+	.incbin "baserom.gba", 0x00A134, 0x0000080
 
-.include "data/scripts/gUnk_0800A1B4.inc"
+gUnk_0800A1B4:: @ 0800A1B4
+	.incbin "baserom.gba", 0x00A1B4, 0x0000024
 
-.include "data/scripts/gUnk_0800A1D8.inc"
+gUnk_0800A1D8:: @ 0800A1D8
+	.incbin "baserom.gba", 0x00A1D8, 0x000004C
 
-.include "data/scripts/gUnk_0800A224.inc"
+gUnk_0800A224:: @ 0800A224
+	.incbin "baserom.gba", 0x00A224, 0x000003C
 
-.include "data/scripts/gUnk_0800A260.inc"
+gUnk_0800A260:: @ 0800A260
+	.incbin "baserom.gba", 0x00A260, 0x00000E0
 
-.include "data/scripts/gUnk_0800A340.inc"
+gUnk_0800A340:: @ 0800A340
+	.incbin "baserom.gba", 0x00A340, 0x0000063
 
-.include "data/scripts/gUnk_0800A3A3.inc"
+gUnk_0800A3A3:: @ 0800A3A3
+	.incbin "baserom.gba", 0x00A3A3, 0x0000006
 
-.include "data/scripts/gUnk_0800A3A9.inc"
+gUnk_0800A3A9:: @ 0800A3A9
+	.incbin "baserom.gba", 0x00A3A9, 0x0000001
 
-.include "data/scripts/gUnk_0800A3AA.inc"
+gUnk_0800A3AA:: @ 0800A3AA
+	.incbin "baserom.gba", 0x00A3AA, 0x000002E
 
-.include "data/scripts/gUnk_0800A3D8.inc"
+gUnk_0800A3D8:: @ 0800A3D8
+	.incbin "baserom.gba", 0x00A3D8, 0x0000128
 
-.include "data/scripts/gUnk_0800A500.inc"
+gUnk_0800A500:: @ 0800A500
+	.incbin "baserom.gba", 0x00A500, 0x0000090
 
-.include "data/scripts/gUnk_0800A590.inc"
+gUnk_0800A590:: @ 0800A590
+	.incbin "baserom.gba", 0x00A590, 0x0000016
 
-.include "data/scripts/gUnk_0800A5A6.inc"
+gUnk_0800A5A6:: @ 0800A5A6
+	.incbin "baserom.gba", 0x00A5A6, 0x00000B6
 
-.include "data/scripts/gUnk_0800A65C.inc"
+gUnk_0800A65C:: @ 0800A65C
+	.incbin "baserom.gba", 0x00A65C, 0x0000022
 
-.include "data/scripts/gUnk_0800A67E.inc"
+gUnk_0800A67E:: @ 0800A67E
+	.incbin "baserom.gba", 0x00A67E, 0x0000002
 
-.include "data/scripts/gUnk_0800A680.inc"
+gUnk_0800A680:: @ 0800A680
+	.incbin "baserom.gba", 0x00A680, 0x0000024
 
-.include "data/scripts/gUnk_0800A6A4.inc"
+gUnk_0800A6A4:: @ 0800A6A4
+	.incbin "baserom.gba", 0x00A6A4, 0x0000007
 
-.include "data/scripts/gUnk_0800A6AB.inc"
+gUnk_0800A6AB:: @ 0800A6AB
+	.incbin "baserom.gba", 0x00A6AB, 0x0000029
 
-.include "data/scripts/gUnk_0800A6D4.inc"
+gUnk_0800A6D4:: @ 0800A6D4
+	.incbin "baserom.gba", 0x00A6D4, 0x0000030
 
-.include "data/scripts/gUnk_0800A704.inc"
+gUnk_0800A704:: @ 0800A704
+	.incbin "baserom.gba", 0x00A704, 0x0000030
 
-.include "data/scripts/gUnk_0800A734.inc"
+gUnk_0800A734:: @ 0800A734
+	.incbin "baserom.gba", 0x00A734, 0x0000016
 
-.include "data/scripts/gUnk_0800A74A.inc"
+gUnk_0800A74A:: @ 0800A74A
+	.incbin "baserom.gba", 0x00A74A, 0x000001A
 
-.include "data/scripts/gUnk_0800A764.inc"
+gUnk_0800A764:: @ 0800A764
+	.incbin "baserom.gba", 0x00A764, 0x0000080
 
-.include "data/scripts/gUnk_0800A7E4.inc"
+gUnk_0800A7E4:: @ 0800A7E4
+	.incbin "baserom.gba", 0x00A7E4, 0x0000004
 
-.include "data/scripts/gUnk_0800A7E8.inc"
+gUnk_0800A7E8:: @ 0800A7E8
+	.incbin "baserom.gba", 0x00A7E8, 0x000002E
 
-.include "data/scripts/gUnk_0800A816.inc"
+gUnk_0800A816:: @ 0800A816
+	.incbin "baserom.gba", 0x00A816, 0x000000A
 
-.include "data/scripts/gUnk_0800A820.inc"
+gUnk_0800A820:: @ 0800A820
+	.incbin "baserom.gba", 0x00A820, 0x000003C
 
-.include "data/scripts/gUnk_0800A85C.inc"
+gUnk_0800A85C:: @ 0800A85C
+	.incbin "baserom.gba", 0x00A85C, 0x000003C
 
-.include "data/scripts/gUnk_0800A898.inc"
+gUnk_0800A898:: @ 0800A898
+	.incbin "baserom.gba", 0x00A898, 0x000003C
 
-.include "data/scripts/gUnk_0800A8D4.inc"
+gUnk_0800A8D4:: @ 0800A8D4
+	.incbin "baserom.gba", 0x00A8D4, 0x0000034
 
-.include "data/scripts/gUnk_0800A908.inc"
+gUnk_0800A908:: @ 0800A908
+	.incbin "baserom.gba", 0x00A908, 0x0000008
 
-.include "data/scripts/gUnk_0800A910.inc"
+gUnk_0800A910:: @ 0800A910
+	.incbin "baserom.gba", 0x00A910, 0x0000054
 
-.include "data/scripts/gUnk_0800A964.inc"
+gUnk_0800A964:: @ 0800A964
+	.incbin "baserom.gba", 0x00A964, 0x0000024
 
-.include "data/scripts/gUnk_0800A988.inc"
+gUnk_0800A988:: @ 0800A988
+	.incbin "baserom.gba", 0x00A988, 0x0000024
 
-.include "data/scripts/gUnk_0800A9AC.inc"
+gUnk_0800A9AC:: @ 0800A9AC
+	.incbin "baserom.gba", 0x00A9AC, 0x0000024
 
-.include "data/scripts/gUnk_0800A9D0.inc"
+gUnk_0800A9D0:: @ 0800A9D0
+	.incbin "baserom.gba", 0x00A9D0, 0x0000024
 
-.include "data/scripts/gUnk_0800A9F4.inc"
+gUnk_0800A9F4:: @ 0800A9F4
+	.incbin "baserom.gba", 0x00A9F4, 0x000000F
 
-.include "data/scripts/gUnk_0800AA03.inc"
+gUnk_0800AA03:: @ 0800AA03
+	.incbin "baserom.gba", 0x00AA03, 0x0000045
 
-.include "data/scripts/gUnk_0800AA48.inc"
+gUnk_0800AA48:: @ 0800AA48
+	.incbin "baserom.gba", 0x00AA48, 0x0000024
 
-.include "data/scripts/gUnk_0800AA6C.inc"
+gUnk_0800AA6C:: @ 0800AA6C
+	.incbin "baserom.gba", 0x00AA6C, 0x0000024
 
-.include "data/scripts/gUnk_0800AA90.inc"
+gUnk_0800AA90:: @ 0800AA90
+	.incbin "baserom.gba", 0x00AA90, 0x0000024
 
-.include "data/scripts/gUnk_0800AAB4.inc"
+gUnk_0800AAB4:: @ 0800AAB4
+	.incbin "baserom.gba", 0x00AAB4, 0x0000024
 
-.include "data/scripts/gUnk_0800AAD8.inc"
+gUnk_0800AAD8:: @ 0800AAD8
+	.incbin "baserom.gba", 0x00AAD8, 0x0000030
 
-.include "data/scripts/gUnk_0800AB08.inc"
+gUnk_0800AB08:: @ 0800AB08
+	.incbin "baserom.gba", 0x00AB08, 0x000001B
 
-.include "data/scripts/gUnk_0800AB23.inc"
+gUnk_0800AB23:: @ 0800AB23
+	.incbin "baserom.gba", 0x00AB23, 0x000002C
 
-.include "data/scripts/gUnk_0800AB4F.inc"
+gUnk_0800AB4F:: @ 0800AB4F
+	.incbin "baserom.gba", 0x00AB4F, 0x00000A1
 
-.include "data/scripts/gUnk_0800ABF0.inc"
+gUnk_0800ABF0:: @ 0800ABF0
+	.incbin "baserom.gba", 0x00ABF0, 0x0000034
 
-.include "data/scripts/gUnk_0800AC24.inc"
+gUnk_0800AC24:: @ 0800AC24
+	.incbin "baserom.gba", 0x00AC24, 0x0000049
 
-.include "data/scripts/gUnk_0800AC6D.inc"
+gUnk_0800AC6D:: @ 0800AC6D
+	.incbin "baserom.gba", 0x00AC6D, 0x0000048
 
-.include "data/scripts/gUnk_0800ACB5.inc"
+gUnk_0800ACB5:: @ 0800ACB5
+	.incbin "baserom.gba", 0x00ACB5, 0x0000007
 
-.include "data/scripts/gUnk_0800ACBC.inc"
+gUnk_0800ACBC:: @ 0800ACBC
+	.incbin "baserom.gba", 0x00ACBC, 0x0000024
 
-.include "data/scripts/gUnk_0800ACE0.inc"
+gUnk_0800ACE0:: @ 0800ACE0
+	.incbin "baserom.gba", 0x00ACE0, 0x0000074
 
-.include "data/scripts/gUnk_0800AD54.inc"
+gUnk_0800AD54:: @ 0800AD54
+	.incbin "baserom.gba", 0x00AD54, 0x0000020
 
-.include "data/scripts/gUnk_0800AD74.inc"
+gUnk_0800AD74:: @ 0800AD74
+	.incbin "baserom.gba", 0x00AD74, 0x0000033
 
-.include "data/scripts/gUnk_0800ADA7.inc"
+gUnk_0800ADA7:: @ 0800ADA7
+	.incbin "baserom.gba", 0x00ADA7, 0x000000D
 
-.include "data/scripts/gUnk_0800ADB4.inc"
+gUnk_0800ADB4:: @ 0800ADB4
+	.incbin "baserom.gba", 0x00ADB4, 0x00000F0
 
-.include "data/scripts/gUnk_0800AEA4.inc"
+gUnk_0800AEA4:: @ 0800AEA4
+	.incbin "baserom.gba", 0x00AEA4, 0x0000038
 
-.include "data/scripts/gUnk_0800AEDC.inc"
+gUnk_0800AEDC:: @ 0800AEDC
+	.incbin "baserom.gba", 0x00AEDC, 0x000003C
 
-.include "data/scripts/gUnk_0800AF18.inc"
+gUnk_0800AF18:: @ 0800AF18
+	.incbin "baserom.gba", 0x00AF18, 0x000002C
 
-.include "data/scripts/gUnk_0800AF44.inc"
+gUnk_0800AF44:: @ 0800AF44
+	.incbin "baserom.gba", 0x00AF44, 0x0000024
 
-.include "data/scripts/gUnk_0800AF68.inc"
+gUnk_0800AF68:: @ 0800AF68
+	.incbin "baserom.gba", 0x00AF68, 0x0000016
 
-.include "data/scripts/gUnk_0800AF7E.inc"
+gUnk_0800AF7E:: @ 0800AF7E
+	.incbin "baserom.gba", 0x00AF7E, 0x000000E
 
-.include "data/scripts/gUnk_0800AF8C.inc"
+gUnk_0800AF8C:: @ 0800AF8C
+	.incbin "baserom.gba", 0x00AF8C, 0x000001B
 
-.include "data/scripts/gUnk_0800AFA7.inc"
+gUnk_0800AFA7:: @ 0800AFA7
+	.incbin "baserom.gba", 0x00AFA7, 0x0000009
 
-.include "data/scripts/gUnk_0800AFB0.inc"
+gUnk_0800AFB0:: @ 0800AFB0
+	.incbin "baserom.gba", 0x00AFB0, 0x0000038
 
-.include "data/scripts/gUnk_0800AFE8.inc"
+gUnk_0800AFE8:: @ 0800AFE8
+	.incbin "baserom.gba", 0x00AFE8, 0x0000024
 
-.include "data/scripts/gUnk_0800B00C.inc"
+gUnk_0800B00C:: @ 0800B00C
+	.incbin "baserom.gba", 0x00B00C, 0x00000A0
 
-.include "data/scripts/gUnk_0800B0AC.inc"
+gUnk_0800B0AC:: @ 0800B0AC
+	.incbin "baserom.gba", 0x00B0AC, 0x0000004
 
-.include "data/scripts/gUnk_0800B0B0.inc"
+gUnk_0800B0B0:: @ 0800B0B0
+	.incbin "baserom.gba", 0x00B0B0, 0x0000020
 
-.include "data/scripts/gUnk_0800B0D0.inc"
+gUnk_0800B0D0:: @ 0800B0D0
+	.incbin "baserom.gba", 0x00B0D0, 0x00000A7
 
-.include "data/scripts/gUnk_0800B177.inc"
+gUnk_0800B177:: @ 0800B177
+	.incbin "baserom.gba", 0x00B177, 0x0000005
 
-.include "data/scripts/gUnk_0800B17C.inc"
+gUnk_0800B17C:: @ 0800B17C
+	.incbin "baserom.gba", 0x00B17C, 0x0000044
 
-.include "data/scripts/gUnk_0800B1C0.inc"
+gUnk_0800B1C0:: @ 0800B1C0
+	.incbin "baserom.gba", 0x00B1C0, 0x0000040
 
-.include "data/scripts/gUnk_0800B200.inc"
+gUnk_0800B200:: @ 0800B200
+	.incbin "baserom.gba", 0x00B200, 0x0000054
 
-.include "data/scripts/gUnk_0800B254.inc"
+gUnk_0800B254:: @ 0800B254
+	.incbin "baserom.gba", 0x00B254, 0x0000030
 
-.include "data/scripts/gUnk_0800B284.inc"
+gUnk_0800B284:: @ 0800B284
+	.incbin "baserom.gba", 0x00B284, 0x0000030
 
-.include "data/scripts/gUnk_0800B2B4.inc"
+gUnk_0800B2B4:: @ 0800B2B4
+	.incbin "baserom.gba", 0x00B2B4, 0x0000054
 
-.include "data/scripts/gUnk_0800B308.inc"
+gUnk_0800B308:: @ 0800B308
+	.incbin "baserom.gba", 0x00B308, 0x000001A
 
-.include "data/scripts/gUnk_0800B322.inc"
+gUnk_0800B322:: @ 0800B322
+	.incbin "baserom.gba", 0x00B322, 0x0000007
 
-.include "data/scripts/gUnk_0800B329.inc"
+gUnk_0800B329:: @ 0800B329
+	.incbin "baserom.gba", 0x00B329, 0x000001F
 
-.include "data/scripts/gUnk_0800B348.inc"
+gUnk_0800B348:: @ 0800B348
+	.incbin "baserom.gba", 0x00B348, 0x0000014
 
-.include "data/scripts/gUnk_0800B35C.inc"
+gUnk_0800B35C:: @ 0800B35C
+	.incbin "baserom.gba", 0x00B35C, 0x0000018
 
-.include "data/scripts/gUnk_0800B374.inc"
+gUnk_0800B374:: @ 0800B374
+	.incbin "baserom.gba", 0x00B374, 0x0000030
 
-.include "data/scripts/gUnk_0800B3A4.inc"
+gUnk_0800B3A4:: @ 0800B3A4
+	.incbin "baserom.gba", 0x00B3A4, 0x000006B
 
-.include "data/scripts/gUnk_0800B40F.inc"
+gUnk_0800B40F:: @ 0800B40F
+	.incbin "baserom.gba", 0x00B40F, 0x000000D
 
-.include "data/scripts/gUnk_0800B41C.inc"
+gUnk_0800B41C:: @ 0800B41C
+	.incbin "baserom.gba", 0x00B41C, 0x0000090
 
-.include "data/scripts/gUnk_0800B4AC.inc"
+gUnk_0800B4AC:: @ 0800B4AC
+	.incbin "baserom.gba", 0x00B4AC, 0x000005C
 
-.include "data/scripts/gUnk_0800B508.inc"
+gUnk_0800B508:: @ 0800B508
+	.incbin "baserom.gba", 0x00B508, 0x0000007
 
-.include "data/scripts/gUnk_0800B50F.inc"
+gUnk_0800B50F:: @ 0800B50F
+	.incbin "baserom.gba", 0x00B50F, 0x000003D
 
-.include "data/scripts/gUnk_0800B54C.inc"
+gUnk_0800B54C:: @ 0800B54C
+	.incbin "baserom.gba", 0x00B54C, 0x0000028
 
-.include "data/scripts/gUnk_0800B574.inc"
+gUnk_0800B574:: @ 0800B574
+	.incbin "baserom.gba", 0x00B574, 0x0000050
 
-.include "data/scripts/gUnk_0800B5C4.inc"
+gUnk_0800B5C4:: @ 0800B5C4
+	.incbin "baserom.gba", 0x00B5C4, 0x0000028
 
-.include "data/scripts/gUnk_0800B5EC.inc"
+gUnk_0800B5EC:: @ 0800B5EC
+	.incbin "baserom.gba", 0x00B5EC, 0x0000028
 
-.include "data/scripts/gUnk_0800B614.inc"
+gUnk_0800B614:: @ 0800B614
+	.incbin "baserom.gba", 0x00B614, 0x00000B4
 
-.include "data/scripts/gUnk_0800B6C8.inc"
+gUnk_0800B6C8:: @ 0800B6C8
+	.incbin "baserom.gba", 0x00B6C8, 0x0000040
 
-.include "data/scripts/gUnk_0800B708.inc"
+gUnk_0800B708:: @ 0800B708
+	.incbin "baserom.gba", 0x00B708, 0x0000017
 
-.include "data/scripts/gUnk_0800B71F.inc"
+gUnk_0800B71F:: @ 0800B71F
+	.incbin "baserom.gba", 0x00B71F, 0x0000011
 
-.include "data/scripts/gUnk_0800B730.inc"
+gUnk_0800B730:: @ 0800B730
+	.incbin "baserom.gba", 0x00B730, 0x0000094
 
-.include "data/scripts/gUnk_0800B7C4.inc"
+gUnk_0800B7C4:: @ 0800B7C4
+	.incbin "baserom.gba", 0x00B7C4, 0x000008B
 
-.include "data/scripts/gUnk_0800B84F.inc"
+gUnk_0800B84F:: @ 0800B84F
+	.incbin "baserom.gba", 0x00B84F, 0x0000012
 
-.include "data/scripts/gUnk_0800B861.inc"
+gUnk_0800B861:: @ 0800B861
+	.incbin "baserom.gba", 0x00B861, 0x0000027
 
-.include "data/scripts/gUnk_0800B888.inc"
+gUnk_0800B888:: @ 0800B888
+	.incbin "baserom.gba", 0x00B888, 0x0000018
 
-.include "data/scripts/gUnk_0800B8A0.inc"
+gUnk_0800B8A0:: @ 0800B8A0
+	.incbin "baserom.gba", 0x00B8A0, 0x0000018
 
-.include "data/scripts/gUnk_0800B8B8.inc"
+gUnk_0800B8B8:: @ 0800B8B8
+	.incbin "baserom.gba", 0x00B8B8, 0x000002C
 
-.include "data/scripts/gUnk_0800B8E4.inc"
+gUnk_0800B8E4:: @ 0800B8E4
+	.incbin "baserom.gba", 0x00B8E4, 0x0000022
 
-.include "data/scripts/gUnk_0800B906.inc"
+gUnk_0800B906:: @ 0800B906
+	.incbin "baserom.gba", 0x00B906, 0x0000016
 
-.include "data/scripts/gUnk_0800B91C.inc"
+gUnk_0800B91C:: @ 0800B91C
+	.incbin "baserom.gba", 0x00B91C, 0x0000048
 
-.include "data/scripts/gUnk_0800B964.inc"
+gUnk_0800B964:: @ 0800B964
+	.incbin "baserom.gba", 0x00B964, 0x0000050
 
-.include "data/scripts/gUnk_0800B9B4.inc"
+gUnk_0800B9B4:: @ 0800B9B4
+	.incbin "baserom.gba", 0x00B9B4, 0x0000088
 
-.include "data/scripts/gUnk_0800BA3C.inc"
+gUnk_0800BA3C:: @ 0800BA3C
+	.incbin "baserom.gba", 0x00BA3C, 0x000003C
 
-.include "data/scripts/gUnk_0800BA78.inc"
+gUnk_0800BA78:: @ 0800BA78
+	.incbin "baserom.gba", 0x00BA78, 0x0000054
 
-.include "data/scripts/gUnk_0800BACC.inc"
+gUnk_0800BACC:: @ 0800BACC
+	.incbin "baserom.gba", 0x00BACC, 0x0000034
 
-.include "data/scripts/gUnk_0800BB00.inc"
+gUnk_0800BB00:: @ 0800BB00
+	.incbin "baserom.gba", 0x00BB00, 0x0000008
 
-.include "data/scripts/gUnk_0800BB08.inc"
+gUnk_0800BB08:: @ 0800BB08
+	.incbin "baserom.gba", 0x00BB08, 0x0000012
 
-.include "data/scripts/gUnk_0800BB1A.inc"
+gUnk_0800BB1A:: @ 0800BB1A
+	.incbin "baserom.gba", 0x00BB1A, 0x0000016
 
-.include "data/scripts/gUnk_0800BB30.inc"
+gUnk_0800BB30:: @ 0800BB30
+	.incbin "baserom.gba", 0x00BB30, 0x0000034
 
-.include "data/scripts/gUnk_0800BB64.inc"
+gUnk_0800BB64:: @ 0800BB64
+	.incbin "baserom.gba", 0x00BB64, 0x0000010
 
-.include "data/scripts/gUnk_0800BB74.inc"
+gUnk_0800BB74:: @ 0800BB74
+	.incbin "baserom.gba", 0x00BB74, 0x0000030
 
-.include "data/scripts/gUnk_0800BBA4.inc"
+gUnk_0800BBA4:: @ 0800BBA4
+	.incbin "baserom.gba", 0x00BBA4, 0x0000037
 
-.include "data/scripts/gUnk_0800BBDB.inc"
+gUnk_0800BBDB:: @ 0800BBDB
+	.incbin "baserom.gba", 0x00BBDB, 0x0000001
 
-.include "data/scripts/gUnk_0800BBDC.inc"
+gUnk_0800BBDC:: @ 0800BBDC
+	.incbin "baserom.gba", 0x00BBDC, 0x000002C
 
-.include "data/scripts/gUnk_0800BC08.inc"
+gUnk_0800BC08:: @ 0800BC08
+	.incbin "baserom.gba", 0x00BC08, 0x000001A
 
-.include "data/scripts/gUnk_0800BC22.inc"
+gUnk_0800BC22:: @ 0800BC22
+	.incbin "baserom.gba", 0x00BC22, 0x000002E
 
-.include "data/scripts/gUnk_0800BC50.inc"
+gUnk_0800BC50:: @ 0800BC50
+	.incbin "baserom.gba", 0x00BC50, 0x000005E
 
-.include "data/scripts/gUnk_0800BCAE.inc"
+gUnk_0800BCAE:: @ 0800BCAE
+	.incbin "baserom.gba", 0x00BCAE, 0x0000009
 
-.include "data/scripts/gUnk_0800BCB7.inc"
+gUnk_0800BCB7:: @ 0800BCB7
+	.incbin "baserom.gba", 0x00BCB7, 0x0000007
 
-.include "data/scripts/gUnk_0800BCBE.inc"
+gUnk_0800BCBE:: @ 0800BCBE
+	.incbin "baserom.gba", 0x00BCBE, 0x000002A
 
-.include "data/scripts/gUnk_0800BCE8.inc"
+gUnk_0800BCE8:: @ 0800BCE8
+	.incbin "baserom.gba", 0x00BCE8, 0x0000020
 
-.include "data/scripts/gUnk_0800BD08.inc"
+gUnk_0800BD08:: @ 0800BD08
+	.incbin "baserom.gba", 0x00BD08, 0x0000068
 
-.include "data/scripts/gUnk_0800BD70.inc"
+gUnk_0800BD70:: @ 0800BD70
+	.incbin "baserom.gba", 0x00BD70, 0x0000008
 
-.include "data/scripts/gUnk_0800BD78.inc"
+gUnk_0800BD78:: @ 0800BD78
+	.incbin "baserom.gba", 0x00BD78, 0x0000034
 
-.include "data/scripts/gUnk_0800BDAC.inc"
+gUnk_0800BDAC:: @ 0800BDAC
+	.incbin "baserom.gba", 0x00BDAC, 0x0000018
 
-.include "data/scripts/gUnk_0800BDC4.inc"
+gUnk_0800BDC4:: @ 0800BDC4
+	.incbin "baserom.gba", 0x00BDC4, 0x0000058
 
-.include "data/scripts/gUnk_0800BE1C.inc"
+gUnk_0800BE1C:: @ 0800BE1C
+	.incbin "baserom.gba", 0x00BE1C, 0x0000038
 
-.include "data/scripts/gUnk_0800BE54.inc"
+gUnk_0800BE54:: @ 0800BE54
+	.incbin "baserom.gba", 0x00BE54, 0x0000078
 
-.include "data/scripts/gUnk_0800BECC.inc"
+gUnk_0800BECC:: @ 0800BECC
+	.incbin "baserom.gba", 0x00BECC, 0x0000048
 
-.include "data/scripts/gUnk_0800BF14.inc"
+gUnk_0800BF14:: @ 0800BF14
+	.incbin "baserom.gba", 0x00BF14, 0x0000024
 
-.include "data/scripts/gUnk_0800BF38.inc"
+gUnk_0800BF38:: @ 0800BF38
+	.incbin "baserom.gba", 0x00BF38, 0x0000012
 
-.include "data/scripts/gUnk_0800BF4A.inc"
+gUnk_0800BF4A:: @ 0800BF4A
+	.incbin "baserom.gba", 0x00BF4A, 0x0000026
 
-.include "data/scripts/gUnk_0800BF70.inc"
+gUnk_0800BF70:: @ 0800BF70
+	.incbin "baserom.gba", 0x00BF70, 0x000004F
 
-.include "data/scripts/gUnk_0800BFBF.inc"
+gUnk_0800BFBF:: @ 0800BFBF
+	.incbin "baserom.gba", 0x00BFBF, 0x0000022
 
-.include "data/scripts/gUnk_0800BFE1.inc"
+gUnk_0800BFE1:: @ 0800BFE1
+	.incbin "baserom.gba", 0x00BFE1, 0x0000002
 
-.include "data/scripts/gUnk_0800BFE3.inc"
+gUnk_0800BFE3:: @ 0800BFE3
+	.incbin "baserom.gba", 0x00BFE3, 0x0000021
 
-.include "data/scripts/gUnk_0800C004.inc"
+gUnk_0800C004:: @ 0800C004
+	.incbin "baserom.gba", 0x00C004, 0x0000003
 
-.include "data/scripts/gUnk_0800C007.inc"
+gUnk_0800C007:: @ 0800C007
+	.incbin "baserom.gba", 0x00C007, 0x000001D
 
-.include "data/scripts/gUnk_0800C024.inc"
+gUnk_0800C024:: @ 0800C024
+	.incbin "baserom.gba", 0x00C024, 0x0000057
 
-.include "data/scripts/gUnk_0800C07B.inc"
+gUnk_0800C07B:: @ 0800C07B
+	.incbin "baserom.gba", 0x00C07B, 0x0000035
 
-.include "data/scripts/gUnk_0800C0B0.inc"
+gUnk_0800C0B0:: @ 0800C0B0
+	.incbin "baserom.gba", 0x00C0B0, 0x0000017
 
-.include "data/scripts/gUnk_0800C0C7.inc"
+gUnk_0800C0C7:: @ 0800C0C7
+	.incbin "baserom.gba", 0x00C0C7, 0x000000C
 
-.include "data/scripts/gUnk_0800C0D3.inc"
+gUnk_0800C0D3:: @ 0800C0D3
+	.incbin "baserom.gba", 0x00C0D3, 0x0000015
 
-.include "data/scripts/gUnk_0800C0E8.inc"
+gUnk_0800C0E8:: @ 0800C0E8
+	.incbin "baserom.gba", 0x00C0E8, 0x000002B
 
-.include "data/scripts/gUnk_0800C113.inc"
+gUnk_0800C113:: @ 0800C113
+	.incbin "baserom.gba", 0x00C113, 0x0000034
 
-.include "data/scripts/gUnk_0800C147.inc"
+gUnk_0800C147:: @ 0800C147
+	.incbin "baserom.gba", 0x00C147, 0x0000019
 
-.include "data/scripts/gUnk_0800C160.inc"
+gUnk_0800C160:: @ 0800C160
+	.incbin "baserom.gba", 0x00C160, 0x0000078
 
-.include "data/scripts/gUnk_0800C1D8.inc"
+gUnk_0800C1D8:: @ 0800C1D8
+	.incbin "baserom.gba", 0x00C1D8, 0x000002C
 
-.include "data/scripts/gUnk_0800C204.inc"
+gUnk_0800C204:: @ 0800C204
+	.incbin "baserom.gba", 0x00C204, 0x0000003
 
-.include "data/scripts/gUnk_0800C207.inc"
+gUnk_0800C207:: @ 0800C207
+	.incbin "baserom.gba", 0x00C207, 0x0000001
 
-.include "data/scripts/gUnk_0800C208.inc"
+gUnk_0800C208:: @ 0800C208
+	.incbin "baserom.gba", 0x00C208, 0x0000008
 
-.include "data/scripts/gUnk_0800C210.inc"
+gUnk_0800C210:: @ 0800C210
+	.incbin "baserom.gba", 0x00C210, 0x0000053
 
-.include "data/scripts/gUnk_0800C263.inc"
+gUnk_0800C263:: @ 0800C263
+	.incbin "baserom.gba", 0x00C263, 0x0000041
 
-.include "data/scripts/gUnk_0800C2A4.inc"
+gUnk_0800C2A4:: @ 0800C2A4
+	.incbin "baserom.gba", 0x00C2A4, 0x0000003
 
-.include "data/scripts/gUnk_0800C2A7.inc"
+gUnk_0800C2A7:: @ 0800C2A7
+	.incbin "baserom.gba", 0x00C2A7, 0x0000027
 
-.include "data/scripts/gUnk_0800C2CE.inc"
+gUnk_0800C2CE:: @ 0800C2CE
+	.incbin "baserom.gba", 0x00C2CE, 0x0000082
 
-.include "data/scripts/gUnk_0800C350.inc"
+gUnk_0800C350:: @ 0800C350
+	.incbin "baserom.gba", 0x00C350, 0x0000046
 
-.include "data/scripts/gUnk_0800C396.inc"
+gUnk_0800C396:: @ 0800C396
+	.incbin "baserom.gba", 0x00C396, 0x0000036
 
-.include "data/scripts/gUnk_0800C3CC.inc"
+gUnk_0800C3CC:: @ 0800C3CC
+	.incbin "baserom.gba", 0x00C3CC, 0x000003C
 
-.include "data/scripts/gUnk_0800C408.inc"
+gUnk_0800C408:: @ 0800C408
+	.incbin "baserom.gba", 0x00C408, 0x0000008
 
-.include "data/scripts/gUnk_0800C410.inc"
+gUnk_0800C410:: @ 0800C410
+	.incbin "baserom.gba", 0x00C410, 0x000004C
 
-.include "data/scripts/gUnk_0800C45C.inc"
+gUnk_0800C45C:: @ 0800C45C
+	.incbin "baserom.gba", 0x00C45C, 0x0000038
 
-.include "data/scripts/gUnk_0800C494.inc"
+gUnk_0800C494:: @ 0800C494
+	.incbin "baserom.gba", 0x00C494, 0x000003C
 
-.include "data/scripts/gUnk_0800C4D0.inc"
+gUnk_0800C4D0:: @ 0800C4D0
+	.incbin "baserom.gba", 0x00C4D0, 0x000000B
 
-.include "data/scripts/gUnk_0800C4DB.inc"
+gUnk_0800C4DB:: @ 0800C4DB
+	.incbin "baserom.gba", 0x00C4DB, 0x0000031
 
-.include "data/scripts/gUnk_0800C50C.inc"
+gUnk_0800C50C:: @ 0800C50C
+	.incbin "baserom.gba", 0x00C50C, 0x0000015
 
-.include "data/scripts/gUnk_0800C521.inc"
+gUnk_0800C521:: @ 0800C521
+	.incbin "baserom.gba", 0x00C521, 0x000002F
 
-.include "data/scripts/gUnk_0800C550.inc"
+gUnk_0800C550:: @ 0800C550
+	.incbin "baserom.gba", 0x00C550, 0x0000006
 
-.include "data/scripts/gUnk_0800C556.inc"
+gUnk_0800C556:: @ 0800C556
+	.incbin "baserom.gba", 0x00C556, 0x000002E
 
-.include "data/scripts/gUnk_0800C584.inc"
+gUnk_0800C584:: @ 0800C584
+	.incbin "baserom.gba", 0x00C584, 0x0000016
 
-.include "data/scripts/gUnk_0800C59A.inc"
+gUnk_0800C59A:: @ 0800C59A
+	.incbin "baserom.gba", 0x00C59A, 0x000002E
 
-.include "data/scripts/gUnk_0800C5C8.inc"
+gUnk_0800C5C8:: @ 0800C5C8
+	.incbin "baserom.gba", 0x00C5C8, 0x0000034
 
-.include "data/scripts/gUnk_0800C5FC.inc"
+gUnk_0800C5FC:: @ 0800C5FC
+	.incbin "baserom.gba", 0x00C5FC, 0x0000004
 
-.include "data/scripts/gUnk_0800C600.inc"
+gUnk_0800C600:: @ 0800C600
+	.incbin "baserom.gba", 0x00C600, 0x0000007
 
-.include "data/scripts/gUnk_0800C607.inc"
+gUnk_0800C607:: @ 0800C607
+	.incbin "baserom.gba", 0x00C607, 0x000002D
 
-.include "data/scripts/gUnk_0800C634.inc"
+gUnk_0800C634:: @ 0800C634
+	.incbin "baserom.gba", 0x00C634, 0x0000092
 
-.include "data/scripts/gUnk_0800C6C6.inc"
+gUnk_0800C6C6:: @ 0800C6C6
+	.incbin "baserom.gba", 0x00C6C6, 0x00000AE
 
-.include "data/scripts/gUnk_0800C774.inc"
+gUnk_0800C774:: @ 0800C774
+	.incbin "baserom.gba", 0x00C774, 0x0000005
 
-.include "data/scripts/gUnk_0800C779.inc"
+gUnk_0800C779:: @ 0800C779
+	.incbin "baserom.gba", 0x00C779, 0x000008F
 
-.include "data/scripts/gUnk_0800C808.inc"
+gUnk_0800C808:: @ 0800C808
+	.incbin "baserom.gba", 0x00C808, 0x0000059
 
-.include "data/scripts/gUnk_0800C861.inc"
+gUnk_0800C861:: @ 0800C861
+	.incbin "baserom.gba", 0x00C861, 0x000004F
 
-.include "data/scripts/gUnk_0800C8B0.inc"
+gUnk_0800C8B0:: @ 0800C8B0
+	.incbin "baserom.gba", 0x00C8B0, 0x000002A
 
-.include "data/scripts/gUnk_0800C8DA.inc"
+gUnk_0800C8DA:: @ 0800C8DA
+	.incbin "baserom.gba", 0x00C8DA, 0x0000016
 
-.include "data/scripts/gUnk_0800C8F0.inc"
+gUnk_0800C8F0:: @ 0800C8F0
+	.incbin "baserom.gba", 0x00C8F0, 0x000002C
 
-.include "data/scripts/gUnk_0800C91C.inc"
+gUnk_0800C91C:: @ 0800C91C
+	.incbin "baserom.gba", 0x00C91C, 0x0000015
 
-.include "data/scripts/gUnk_0800C931.inc"
+gUnk_0800C931:: @ 0800C931
+	.incbin "baserom.gba", 0x00C931, 0x0000032
 
-.include "data/scripts/gUnk_0800C963.inc"
+gUnk_0800C963:: @ 0800C963
+	.incbin "baserom.gba", 0x00C963, 0x00000A5
 
-.include "data/scripts/gUnk_0800CA08.inc"
+gUnk_0800CA08:: @ 0800CA08
+	.incbin "baserom.gba", 0x00CA08, 0x0000084
 
-.include "data/scripts/gUnk_0800CA8C.inc"
+gUnk_0800CA8C:: @ 0800CA8C
+	.incbin "baserom.gba", 0x00CA8C, 0x000001E
 
-.include "data/scripts/gUnk_0800CAAA.inc"
+gUnk_0800CAAA:: @ 0800CAAA
+	.incbin "baserom.gba", 0x00CAAA, 0x0000012
 
-.include "data/scripts/gUnk_0800CABC.inc"
+gUnk_0800CABC:: @ 0800CABC
+	.incbin "baserom.gba", 0x00CABC, 0x000004B
 
-.include "data/scripts/gUnk_0800CB07.inc"
+gUnk_0800CB07:: @ 0800CB07
+	.incbin "baserom.gba", 0x00CB07, 0x000004D
 
-.include "data/scripts/gUnk_0800CB54.inc"
+gUnk_0800CB54:: @ 0800CB54
+	.incbin "baserom.gba", 0x00CB54, 0x000004F
 
-.include "data/scripts/gUnk_0800CBA3.inc"
+gUnk_0800CBA3:: @ 0800CBA3
+	.incbin "baserom.gba", 0x00CBA3, 0x0000031
 
-.include "data/scripts/gUnk_0800CBD4.inc"
+gUnk_0800CBD4:: @ 0800CBD4
+	.incbin "baserom.gba", 0x00CBD4, 0x0000034
 
-.include "data/scripts/gUnk_0800CC08.inc"
+gUnk_0800CC08:: @ 0800CC08
+	.incbin "baserom.gba", 0x00CC08, 0x0000005
 
-.include "data/scripts/gUnk_0800CC0D.inc"
+gUnk_0800CC0D:: @ 0800CC0D
+	.incbin "baserom.gba", 0x00CC0D, 0x0000035
 
-.include "data/scripts/gUnk_0800CC42.inc"
+gUnk_0800CC42:: @ 0800CC42
+	.incbin "baserom.gba", 0x00CC42, 0x000002A
 
-.include "data/scripts/gUnk_0800CC6C.inc"
+gUnk_0800CC6C:: @ 0800CC6C
+	.incbin "baserom.gba", 0x00CC6C, 0x0000061
 
-.include "data/scripts/gUnk_0800CCCD.inc"
+gUnk_0800CCCD:: @ 0800CCCD
+	.incbin "baserom.gba", 0x00CCCD, 0x0000010
 
-.include "data/scripts/gUnk_0800CCDD.inc"
+gUnk_0800CCDD:: @ 0800CCDD
+	.incbin "baserom.gba", 0x00CCDD, 0x0000027
 
-.include "data/scripts/gUnk_0800CD04.inc"
+gUnk_0800CD04:: @ 0800CD04
+	.incbin "baserom.gba", 0x00CD04, 0x0000004
 
-.include "data/scripts/gUnk_0800CD08.inc"
+gUnk_0800CD08:: @ 0800CD08
+	.incbin "baserom.gba", 0x00CD08, 0x000005F
 
-.include "data/scripts/gUnk_0800CD67.inc"
+gUnk_0800CD67:: @ 0800CD67
+	.incbin "baserom.gba", 0x00CD67, 0x0000015
 
-.include "data/scripts/gUnk_0800CD7C.inc"
+gUnk_0800CD7C:: @ 0800CD7C
+	.incbin "baserom.gba", 0x00CD7C, 0x000008B
 
-.include "data/scripts/gUnk_0800CE07.inc"
+gUnk_0800CE07:: @ 0800CE07
+	.incbin "baserom.gba", 0x00CE07, 0x00000FD
 
-.include "data/scripts/gUnk_0800CF04.inc"
+gUnk_0800CF04:: @ 0800CF04
+	.incbin "baserom.gba", 0x00CF04, 0x0000012
 
-.include "data/scripts/gUnk_0800CF16.inc"
+gUnk_0800CF16:: @ 0800CF16
+	.incbin "baserom.gba", 0x00CF16, 0x0000035
 
-.include "data/scripts/gUnk_0800CF4B.inc"
+gUnk_0800CF4B:: @ 0800CF4B
+	.incbin "baserom.gba", 0x00CF4B, 0x0000005
 
-.include "data/scripts/gUnk_0800CF50.inc"
+gUnk_0800CF50:: @ 0800CF50
+	.incbin "baserom.gba", 0x00CF50, 0x000002B
 
-.include "data/scripts/gUnk_0800CF7B.inc"
+gUnk_0800CF7B:: @ 0800CF7B
+	.incbin "baserom.gba", 0x00CF7B, 0x000000D
 
-.include "data/scripts/gUnk_0800CF88.inc"
+gUnk_0800CF88:: @ 0800CF88
+	.incbin "baserom.gba", 0x00CF88, 0x000000D
 
-.include "data/scripts/gUnk_0800CF95.inc"
+gUnk_0800CF95:: @ 0800CF95
+	.incbin "baserom.gba", 0x00CF95, 0x0000014
 
-.include "data/scripts/gUnk_0800CFA9.inc"
+gUnk_0800CFA9:: @ 0800CFA9
+	.incbin "baserom.gba", 0x00CFA9, 0x0000003
 
-.include "data/scripts/gUnk_0800CFAC.inc"
+gUnk_0800CFAC:: @ 0800CFAC
+	.incbin "baserom.gba", 0x00CFAC, 0x0000065
 
-.include "data/scripts/gUnk_0800D011.inc"
+gUnk_0800D011:: @ 0800D011
+	.incbin "baserom.gba", 0x00D011, 0x000004E
 
-.include "data/scripts/gUnk_0800D05F.inc"
+gUnk_0800D05F:: @ 0800D05F
+	.incbin "baserom.gba", 0x00D05F, 0x000006F
 
-.include "data/scripts/gUnk_0800D0CE.inc"
+gUnk_0800D0CE:: @ 0800D0CE
+	.incbin "baserom.gba", 0x00D0CE, 0x0000059
 
-.include "data/scripts/gUnk_0800D127.inc"
+gUnk_0800D127:: @ 0800D127
+	.incbin "baserom.gba", 0x00D127, 0x0000069
 
-.include "data/scripts/gUnk_0800D190.inc"
+gUnk_0800D190:: @ 0800D190
+	.incbin "baserom.gba", 0x00D190, 0x0000024
 
-.include "data/scripts/gUnk_0800D1B4.inc"
+gUnk_0800D1B4:: @ 0800D1B4
+	.incbin "baserom.gba", 0x00D1B4, 0x0000010
 
-.include "data/scripts/gUnk_0800D1C4.inc"
+gUnk_0800D1C4:: @ 0800D1C4
+	.incbin "baserom.gba", 0x00D1C4, 0x0000010
 
-.include "data/scripts/gUnk_0800D1D4.inc"
+gUnk_0800D1D4:: @ 0800D1D4
+	.incbin "baserom.gba", 0x00D1D4, 0x000000C
 
-.include "data/scripts/gUnk_0800D1E0.inc"
+gUnk_0800D1E0:: @ 0800D1E0
+	.incbin "baserom.gba", 0x00D1E0, 0x0000027
 
-.include "data/scripts/gUnk_0800D207.inc"
+gUnk_0800D207:: @ 0800D207
+	.incbin "baserom.gba", 0x00D207, 0x0000011
 
-.include "data/scripts/gUnk_0800D218.inc"
+gUnk_0800D218:: @ 0800D218
+	.incbin "baserom.gba", 0x00D218, 0x000003C
 
-.include "data/scripts/gUnk_0800D254.inc"
+gUnk_0800D254:: @ 0800D254
+	.incbin "baserom.gba", 0x00D254, 0x0000024
 
-.include "data/scripts/gUnk_0800D278.inc"
+gUnk_0800D278:: @ 0800D278
+	.incbin "baserom.gba", 0x00D278, 0x0000056
 
-.include "data/scripts/gUnk_0800D2CE.inc"
+gUnk_0800D2CE:: @ 0800D2CE
+	.incbin "baserom.gba", 0x00D2CE, 0x0000038
 
-.include "data/scripts/gUnk_0800D306.inc"
+gUnk_0800D306:: @ 0800D306
+	.incbin "baserom.gba", 0x00D306, 0x0000002
 
-.include "data/scripts/gUnk_0800D308.inc"
+gUnk_0800D308:: @ 0800D308
+	.incbin "baserom.gba", 0x00D308, 0x0000007
 
-.include "data/scripts/gUnk_0800D30F.inc"
+gUnk_0800D30F:: @ 0800D30F
+	.incbin "baserom.gba", 0x00D30F, 0x0000041
 
-.include "data/scripts/gUnk_0800D350.inc"
+gUnk_0800D350:: @ 0800D350
+	.incbin "baserom.gba", 0x00D350, 0x000009C
 
-.include "data/scripts/gUnk_0800D3EC.inc"
+gUnk_0800D3EC:: @ 0800D3EC
+	.incbin "baserom.gba", 0x00D3EC, 0x0000028
 
-.include "data/scripts/gUnk_0800D414.inc"
+gUnk_0800D414:: @ 0800D414
+	.incbin "baserom.gba", 0x00D414, 0x0000038
 
-.include "data/scripts/gUnk_0800D44C.inc"
+gUnk_0800D44C:: @ 0800D44C
+	.incbin "baserom.gba", 0x00D44C, 0x0000073
 
-.include "data/scripts/gUnk_0800D4BF.inc"
+gUnk_0800D4BF:: @ 0800D4BF
+	.incbin "baserom.gba", 0x00D4BF, 0x000001D
 
-.include "data/scripts/gUnk_0800D4DC.inc"
+gUnk_0800D4DC:: @ 0800D4DC
+	.incbin "baserom.gba", 0x00D4DC, 0x00000C0
 
-.include "data/scripts/gUnk_0800D59C.inc"
+gUnk_0800D59C:: @ 0800D59C
+	.incbin "baserom.gba", 0x00D59C, 0x0000049
 
-.include "data/scripts/gUnk_0800D5E5.inc"
+gUnk_0800D5E5:: @ 0800D5E5
+	.incbin "baserom.gba", 0x00D5E5, 0x0000027
 
-.include "data/scripts/gUnk_0800D60C.inc"
+gUnk_0800D60C:: @ 0800D60C
+	.incbin "baserom.gba", 0x00D60C, 0x000001F
 
-.include "data/scripts/gUnk_0800D62B.inc"
+gUnk_0800D62B:: @ 0800D62B
+	.incbin "baserom.gba", 0x00D62B, 0x0000089
 
-.include "data/scripts/gUnk_0800D6B4.inc"
+gUnk_0800D6B4:: @ 0800D6B4
+	.incbin "baserom.gba", 0x00D6B4, 0x0000006
 
-.include "data/scripts/gUnk_0800D6BA.inc"
+gUnk_0800D6BA:: @ 0800D6BA
+	.incbin "baserom.gba", 0x00D6BA, 0x0000016
 
-.include "data/scripts/gUnk_0800D6D0.inc"
+gUnk_0800D6D0:: @ 0800D6D0
+	.incbin "baserom.gba", 0x00D6D0, 0x0000020
 
-.include "data/scripts/gUnk_0800D6F0.inc"
+gUnk_0800D6F0:: @ 0800D6F0
+	.incbin "baserom.gba", 0x00D6F0, 0x0000012
 
-.include "data/scripts/gUnk_0800D702.inc"
+gUnk_0800D702:: @ 0800D702
+	.incbin "baserom.gba", 0x00D702, 0x0000001
 
-.include "data/scripts/gUnk_0800D703.inc"
+gUnk_0800D703:: @ 0800D703
+	.incbin "baserom.gba", 0x00D703, 0x000000D
 
-.include "data/scripts/gUnk_0800D710.inc"
+gUnk_0800D710:: @ 0800D710
+	.incbin "baserom.gba", 0x00D710, 0x0000015
 
-.include "data/scripts/gUnk_0800D725.inc"
+gUnk_0800D725:: @ 0800D725
+	.incbin "baserom.gba", 0x00D725, 0x0000003
 
-.include "data/scripts/gUnk_0800D728.inc"
+gUnk_0800D728:: @ 0800D728
+	.incbin "baserom.gba", 0x00D728, 0x0000044
 
-.include "data/scripts/gUnk_0800D76C.inc"
+gUnk_0800D76C:: @ 0800D76C
+	.incbin "baserom.gba", 0x00D76C, 0x0000063
 
-.include "data/scripts/gUnk_0800D7CF.inc"
+gUnk_0800D7CF:: @ 0800D7CF
+	.incbin "baserom.gba", 0x00D7CF, 0x000000D
 
-.include "data/scripts/gUnk_0800D7DC.inc"
+gUnk_0800D7DC:: @ 0800D7DC
+	.incbin "baserom.gba", 0x00D7DC, 0x0000098
 
-.include "data/scripts/gUnk_0800D874.inc"
+gUnk_0800D874:: @ 0800D874
+	.incbin "baserom.gba", 0x00D874, 0x0000070
 
-.include "data/scripts/gUnk_0800D8E4.inc"
+gUnk_0800D8E4:: @ 0800D8E4
+	.incbin "baserom.gba", 0x00D8E4, 0x0000022
 
-.include "data/scripts/gUnk_0800D906.inc"
+gUnk_0800D906:: @ 0800D906
+	.incbin "baserom.gba", 0x00D906, 0x000004E
 
-.include "data/scripts/gUnk_0800D954.inc"
+gUnk_0800D954:: @ 0800D954
+	.incbin "baserom.gba", 0x00D954, 0x0000029
 
-.include "data/scripts/gUnk_0800D97D.inc"
+gUnk_0800D97D:: @ 0800D97D
+	.incbin "baserom.gba", 0x00D97D, 0x0000004
 
-.include "data/scripts/gUnk_0800D981.inc"
+gUnk_0800D981:: @ 0800D981
+	.incbin "baserom.gba", 0x00D981, 0x0000090
 
-.include "data/scripts/gUnk_0800DA11.inc"
+gUnk_0800DA11:: @ 0800DA11
+	.incbin "baserom.gba", 0x00DA11, 0x0000017
 
-.include "data/scripts/gUnk_0800DA28.inc"
+gUnk_0800DA28:: @ 0800DA28
+	.incbin "baserom.gba", 0x00DA28, 0x0000024
 
-.include "data/scripts/gUnk_0800DA4C.inc"
+gUnk_0800DA4C:: @ 0800DA4C
+	.incbin "baserom.gba", 0x00DA4C, 0x0000001
 
-.include "data/scripts/gUnk_0800DA4D.inc"
+gUnk_0800DA4D:: @ 0800DA4D
+	.incbin "baserom.gba", 0x00DA4D, 0x0000013
 
-.include "data/scripts/gUnk_0800DA60.inc"
+gUnk_0800DA60:: @ 0800DA60
+	.incbin "baserom.gba", 0x00DA60, 0x00000AE
 
-.include "data/scripts/gUnk_0800DB0E.inc"
+gUnk_0800DB0E:: @ 0800DB0E
+	.incbin "baserom.gba", 0x00DB0E, 0x000000A
 
-.include "data/scripts/gUnk_0800DB18.inc"
+gUnk_0800DB18:: @ 0800DB18
+	.incbin "baserom.gba", 0x00DB18, 0x0000010
 
-.include "data/scripts/gUnk_0800DB28.inc"
+gUnk_0800DB28:: @ 0800DB28
+	.incbin "baserom.gba", 0x00DB28, 0x0000022
 
-.include "data/scripts/gUnk_0800DB4A.inc"
+gUnk_0800DB4A:: @ 0800DB4A
+	.incbin "baserom.gba", 0x00DB4A, 0x000002E
 
-.include "data/scripts/gUnk_0800DB78.inc"
+gUnk_0800DB78:: @ 0800DB78
+	.incbin "baserom.gba", 0x00DB78, 0x0000010
 
-.include "data/scripts/gUnk_0800DB88.inc"
+gUnk_0800DB88:: @ 0800DB88
+	.incbin "baserom.gba", 0x00DB88, 0x0000088
 
-.include "data/scripts/gUnk_0800DC10.inc"
+gUnk_0800DC10:: @ 0800DC10
+	.incbin "baserom.gba", 0x00DC10, 0x0000009
 
-.include "data/scripts/gUnk_0800DC19.inc"
+gUnk_0800DC19:: @ 0800DC19
+	.incbin "baserom.gba", 0x00DC19, 0x0000078
 
-.include "data/scripts/gUnk_0800DC91.inc"
+gUnk_0800DC91:: @ 0800DC91
+	.incbin "baserom.gba", 0x00DC91, 0x000001B
 
-.include "data/scripts/gUnk_0800DCAC.inc"
+gUnk_0800DCAC:: @ 0800DCAC
+	.incbin "baserom.gba", 0x00DCAC, 0x0000030
 
-.include "data/scripts/gUnk_0800DCDC.inc"
+gUnk_0800DCDC:: @ 0800DCDC
+	.incbin "baserom.gba", 0x00DCDC, 0x0000028
 
-.include "data/scripts/gUnk_0800DD04.inc"
+gUnk_0800DD04:: @ 0800DD04
+	.incbin "baserom.gba", 0x00DD04, 0x000000C
 
-.include "data/scripts/gUnk_0800DD10.inc"
+gUnk_0800DD10:: @ 0800DD10
+	.incbin "baserom.gba", 0x00DD10, 0x0000009
 
-.include "data/scripts/gUnk_0800DD19.inc"
+gUnk_0800DD19:: @ 0800DD19
+	.incbin "baserom.gba", 0x00DD19, 0x0000009
 
-.include "data/scripts/gUnk_0800DD22.inc"
+gUnk_0800DD22:: @ 0800DD22
+	.incbin "baserom.gba", 0x00DD22, 0x000006B
 
-.include "data/scripts/gUnk_0800DD8D.inc"
+gUnk_0800DD8D:: @ 0800DD8D
+	.incbin "baserom.gba", 0x00DD8D, 0x000001D
 
-.include "data/scripts/gUnk_0800DDAA.inc"
+gUnk_0800DDAA:: @ 0800DDAA
+	.incbin "baserom.gba", 0x00DDAA, 0x000003E
 
-.include "data/scripts/gUnk_0800DDE8.inc"
+gUnk_0800DDE8:: @ 0800DDE8
+	.incbin "baserom.gba", 0x00DDE8, 0x0000014
 
-.include "data/scripts/gUnk_0800DDFC.inc"
+gUnk_0800DDFC:: @ 0800DDFC
+	.incbin "baserom.gba", 0x00DDFC, 0x0000004
 
-.include "data/scripts/gUnk_0800DE00.inc"
+gUnk_0800DE00:: @ 0800DE00
+	.incbin "baserom.gba", 0x00DE00, 0x0000078
 
-.include "data/scripts/gUnk_0800DE78.inc"
+gUnk_0800DE78:: @ 0800DE78
+	.incbin "baserom.gba", 0x00DE78, 0x0000038
 
-.include "data/scripts/gUnk_0800DEB0.inc"
+gUnk_0800DEB0:: @ 0800DEB0
+	.incbin "baserom.gba", 0x00DEB0, 0x0000024
 
-.include "data/scripts/gUnk_0800DED4.inc"
+gUnk_0800DED4:: @ 0800DED4
+	.incbin "baserom.gba", 0x00DED4, 0x0000022
 
-.include "data/scripts/gUnk_0800DEF6.inc"
+gUnk_0800DEF6:: @ 0800DEF6
+	.incbin "baserom.gba", 0x00DEF6, 0x0000011
 
-.include "data/scripts/gUnk_0800DF07.inc"
+gUnk_0800DF07:: @ 0800DF07
+	.incbin "baserom.gba", 0x00DF07, 0x000001D
 
-.include "data/scripts/gUnk_0800DF24.inc"
+gUnk_0800DF24:: @ 0800DF24
+	.incbin "baserom.gba", 0x00DF24, 0x0000090
 
-.include "data/scripts/gUnk_0800DFB4.inc"
+gUnk_0800DFB4:: @ 0800DFB4
+	.incbin "baserom.gba", 0x00DFB4, 0x000001C
 
-.include "data/scripts/gUnk_0800DFD0.inc"
+gUnk_0800DFD0:: @ 0800DFD0
+	.incbin "baserom.gba", 0x00DFD0, 0x0000007
 
-.include "data/scripts/gUnk_0800DFD7.inc"
+gUnk_0800DFD7:: @ 0800DFD7
+	.incbin "baserom.gba", 0x00DFD7, 0x0000007
 
-.include "data/scripts/gUnk_0800DFDE.inc"
+gUnk_0800DFDE:: @ 0800DFDE
+	.incbin "baserom.gba", 0x00DFDE, 0x0000006
 
-.include "data/scripts/gUnk_0800DFE4.inc"
+gUnk_0800DFE4:: @ 0800DFE4
+	.incbin "baserom.gba", 0x00DFE4, 0x000006C
 
-.include "data/scripts/gUnk_0800E050.inc"
+gUnk_0800E050:: @ 0800E050
+	.incbin "baserom.gba", 0x00E050, 0x000006C
 
-.include "data/scripts/gUnk_0800E0BC.inc"
+gUnk_0800E0BC:: @ 0800E0BC
+	.incbin "baserom.gba", 0x00E0BC, 0x000003A
 
-.include "data/scripts/gUnk_0800E0F6.inc"
+gUnk_0800E0F6:: @ 0800E0F6
+	.incbin "baserom.gba", 0x00E0F6, 0x000004A
 
-.include "data/scripts/gUnk_0800E140.inc"
+gUnk_0800E140:: @ 0800E140
+	.incbin "baserom.gba", 0x00E140, 0x0000013
 
-.include "data/scripts/gUnk_0800E153.inc"
+gUnk_0800E153:: @ 0800E153
+	.incbin "baserom.gba", 0x00E153, 0x0000001
 
-.include "data/scripts/gUnk_0800E154.inc"
+gUnk_0800E154:: @ 0800E154
+	.incbin "baserom.gba", 0x00E154, 0x0000071
 
-.include "data/scripts/gUnk_0800E1C5.inc"
+gUnk_0800E1C5:: @ 0800E1C5
+	.incbin "baserom.gba", 0x00E1C5, 0x000003B
 
-.include "data/scripts/gUnk_0800E200.inc"
+gUnk_0800E200:: @ 0800E200
+	.incbin "baserom.gba", 0x00E200, 0x0000100
 
-.include "data/scripts/gUnk_0800E300.inc"
+gUnk_0800E300:: @ 0800E300
+	.incbin "baserom.gba", 0x00E300, 0x0000005
 
-.include "data/scripts/gUnk_0800E305.inc"
+gUnk_0800E305:: @ 0800E305
+	.incbin "baserom.gba", 0x00E305, 0x0000002
 
-.include "data/scripts/gUnk_0800E307.inc"
+gUnk_0800E307:: @ 0800E307
+	.incbin "baserom.gba", 0x00E307, 0x0000005
 
-.include "data/scripts/gUnk_0800E30C.inc"
+gUnk_0800E30C:: @ 0800E30C
+	.incbin "baserom.gba", 0x00E30C, 0x000001D
 
-.include "data/scripts/gUnk_0800E329.inc"
+gUnk_0800E329:: @ 0800E329
+	.incbin "baserom.gba", 0x00E329, 0x0000027
 
-.include "data/scripts/gUnk_0800E350.inc"
+gUnk_0800E350:: @ 0800E350
+	.incbin "baserom.gba", 0x00E350, 0x000009E
 
-.include "data/scripts/gUnk_0800E3EE.inc"
+gUnk_0800E3EE:: @ 0800E3EE
+	.incbin "baserom.gba", 0x00E3EE, 0x000000B
 
-.include "data/scripts/gUnk_0800E3F9.inc"
+gUnk_0800E3F9:: @ 0800E3F9
+	.incbin "baserom.gba", 0x00E3F9, 0x0000001
 
-.include "data/scripts/gUnk_0800E3FA.inc"
+gUnk_0800E3FA:: @ 0800E3FA
+	.incbin "baserom.gba", 0x00E3FA, 0x0000002
 
-.include "data/scripts/gUnk_0800E3FC.inc"
+gUnk_0800E3FC:: @ 0800E3FC
+	.incbin "baserom.gba", 0x00E3FC, 0x0000004
 
-.include "data/scripts/gUnk_0800E400.inc"
+gUnk_0800E400:: @ 0800E400
+	.incbin "baserom.gba", 0x00E400, 0x0000008
 
-.include "data/scripts/gUnk_0800E408.inc"
+gUnk_0800E408:: @ 0800E408
+	.incbin "baserom.gba", 0x00E408, 0x0000003
 
-.include "data/scripts/gUnk_0800E40B.inc"
+gUnk_0800E40B:: @ 0800E40B
+	.incbin "baserom.gba", 0x00E40B, 0x0000006
 
-.include "data/scripts/gUnk_0800E411.inc"
+gUnk_0800E411:: @ 0800E411
+	.incbin "baserom.gba", 0x00E411, 0x000001F
 
-.include "data/scripts/gUnk_0800E430.inc"
+gUnk_0800E430:: @ 0800E430
+	.incbin "baserom.gba", 0x00E430, 0x0000004
 
-.include "data/scripts/gUnk_0800E434.inc"
+gUnk_0800E434:: @ 0800E434
+	.incbin "baserom.gba", 0x00E434, 0x0000038
 
-.include "data/scripts/gUnk_0800E46C.inc"
+gUnk_0800E46C:: @ 0800E46C
+	.incbin "baserom.gba", 0x00E46C, 0x000001D
 
-.include "data/scripts/gUnk_0800E489.inc"
+gUnk_0800E489:: @ 0800E489
+	.incbin "baserom.gba", 0x00E489, 0x0000010
 
-.include "data/scripts/gUnk_0800E499.inc"
+gUnk_0800E499:: @ 0800E499
+	.incbin "baserom.gba", 0x00E499, 0x000000B
 
-.include "data/scripts/gUnk_0800E4A4.inc"
+gUnk_0800E4A4:: @ 0800E4A4
+	.incbin "baserom.gba", 0x00E4A4, 0x000003F
 
-.include "data/scripts/gUnk_0800E4E3.inc"
+gUnk_0800E4E3:: @ 0800E4E3
+	.incbin "baserom.gba", 0x00E4E3, 0x0000021
 
-.include "data/scripts/gUnk_0800E504.inc"
+gUnk_0800E504:: @ 0800E504
+	.incbin "baserom.gba", 0x00E504, 0x0000008
 
-.include "data/scripts/gUnk_0800E50C.inc"
+gUnk_0800E50C:: @ 0800E50C
+	.incbin "baserom.gba", 0x00E50C, 0x0000038
 
-.include "data/scripts/gUnk_0800E544.inc"
+gUnk_0800E544:: @ 0800E544
+	.incbin "baserom.gba", 0x00E544, 0x0000048
 
-.include "data/scripts/gUnk_0800E58C.inc"
+gUnk_0800E58C:: @ 0800E58C
+	.incbin "baserom.gba", 0x00E58C, 0x0000038
 
-.include "data/scripts/gUnk_0800E5C4.inc"
+gUnk_0800E5C4:: @ 0800E5C4
+	.incbin "baserom.gba", 0x00E5C4, 0x000003C
 
-.include "data/scripts/gUnk_0800E600.inc"
+gUnk_0800E600:: @ 0800E600
+	.incbin "baserom.gba", 0x00E600, 0x000000E
 
-.include "data/scripts/gUnk_0800E60E.inc"
+gUnk_0800E60E:: @ 0800E60E
+	.incbin "baserom.gba", 0x00E60E, 0x000001E
 
-.include "data/scripts/gUnk_0800E62C.inc"
+gUnk_0800E62C:: @ 0800E62C
+	.incbin "baserom.gba", 0x00E62C, 0x000002C
 
-.include "data/scripts/gUnk_0800E658.inc"
+gUnk_0800E658:: @ 0800E658
+	.incbin "baserom.gba", 0x00E658, 0x000002C
 
-.include "data/scripts/gUnk_0800E684.inc"
+gUnk_0800E684:: @ 0800E684
+	.incbin "baserom.gba", 0x00E684, 0x000002C
 
-.include "data/scripts/gUnk_0800E6B0.inc"
+gUnk_0800E6B0:: @ 0800E6B0
+	.incbin "baserom.gba", 0x00E6B0, 0x0000038
 
-.include "data/scripts/gUnk_0800E6E8.inc"
+gUnk_0800E6E8:: @ 0800E6E8
+	.incbin "baserom.gba", 0x00E6E8, 0x000001F
 
-.include "data/scripts/gUnk_0800E707.inc"
+gUnk_0800E707:: @ 0800E707
+	.incbin "baserom.gba", 0x00E707, 0x0000003
 
-.include "data/scripts/gUnk_0800E70A.inc"
+gUnk_0800E70A:: @ 0800E70A
+	.incbin "baserom.gba", 0x00E70A, 0x000002A
 
-.include "data/scripts/gUnk_0800E734.inc"
+gUnk_0800E734:: @ 0800E734
+	.incbin "baserom.gba", 0x00E734, 0x000002C
 
-.include "data/scripts/gUnk_0800E760.inc"
+gUnk_0800E760:: @ 0800E760
+	.incbin "baserom.gba", 0x00E760, 0x0000079
 
-.include "data/scripts/gUnk_0800E7D9.inc"
+gUnk_0800E7D9:: @ 0800E7D9
+	.incbin "baserom.gba", 0x00E7D9, 0x000001B
 
-.include "data/scripts/gUnk_0800E7F4.inc"
+gUnk_0800E7F4:: @ 0800E7F4
+	.incbin "baserom.gba", 0x00E7F4, 0x0000006
 
-.include "data/scripts/gUnk_0800E7FA.inc"
+gUnk_0800E7FA:: @ 0800E7FA
+	.incbin "baserom.gba", 0x00E7FA, 0x0000029
 
-.include "data/scripts/gUnk_0800E823.inc"
+gUnk_0800E823:: @ 0800E823
+	.incbin "baserom.gba", 0x00E823, 0x0000001
 
-.include "data/scripts/gUnk_0800E824.inc"
+gUnk_0800E824:: @ 0800E824
+	.incbin "baserom.gba", 0x00E824, 0x00000B7
 
-.include "data/scripts/gUnk_0800E8DB.inc"
+gUnk_0800E8DB:: @ 0800E8DB
+	.incbin "baserom.gba", 0x00E8DB, 0x0000045
 
-.include "data/scripts/gUnk_0800E920.inc"
+gUnk_0800E920:: @ 0800E920
+	.incbin "baserom.gba", 0x00E920, 0x0000044
 
-.include "data/scripts/gUnk_0800E964.inc"
+gUnk_0800E964:: @ 0800E964
+	.incbin "baserom.gba", 0x00E964, 0x0000072
 
-.include "data/scripts/gUnk_0800E9D6.inc"
+gUnk_0800E9D6:: @ 0800E9D6
+	.incbin "baserom.gba", 0x00E9D6, 0x000001E
 
-.include "data/scripts/gUnk_0800E9F4.inc"
+gUnk_0800E9F4:: @ 0800E9F4
+	.incbin "baserom.gba", 0x00E9F4, 0x0000028
 
-.include "data/scripts/gUnk_0800EA1C.inc"
+gUnk_0800EA1C:: @ 0800EA1C
+	.incbin "baserom.gba", 0x00EA1C, 0x0000038
 
-.include "data/scripts/gUnk_0800EA54.inc"
+gUnk_0800EA54:: @ 0800EA54
+	.incbin "baserom.gba", 0x00EA54, 0x0000050
 
-.include "data/scripts/gUnk_0800EAA4.inc"
+gUnk_0800EAA4:: @ 0800EAA4
+	.incbin "baserom.gba", 0x00EAA4, 0x0000047
 
-.include "data/scripts/gUnk_0800EAEB.inc"
+gUnk_0800EAEB:: @ 0800EAEB
+	.incbin "baserom.gba", 0x00EAEB, 0x000000D
 
-.include "data/scripts/gUnk_0800EAF8.inc"
+gUnk_0800EAF8:: @ 0800EAF8
+	.incbin "baserom.gba", 0x00EAF8, 0x0000034
 
-.include "data/scripts/gUnk_0800EB2C.inc"
+gUnk_0800EB2C:: @ 0800EB2C
+	.incbin "baserom.gba", 0x00EB2C, 0x0000038
 
-.include "data/scripts/gUnk_0800EB64.inc"
+gUnk_0800EB64:: @ 0800EB64
+	.incbin "baserom.gba", 0x00EB64, 0x000005C
 
-.include "data/scripts/gUnk_0800EBC0.inc"
+gUnk_0800EBC0:: @ 0800EBC0
+	.incbin "baserom.gba", 0x00EBC0, 0x000001C
 
-.include "data/scripts/gUnk_0800EBDC.inc"
+gUnk_0800EBDC:: @ 0800EBDC
+	.incbin "baserom.gba", 0x00EBDC, 0x0000004
 
-.include "data/scripts/gUnk_0800EBE0.inc"
+gUnk_0800EBE0:: @ 0800EBE0
+	.incbin "baserom.gba", 0x00EBE0, 0x0000010
 
-.include "data/scripts/gUnk_0800EBF0.inc"
+gUnk_0800EBF0:: @ 0800EBF0
+	.incbin "baserom.gba", 0x00EBF0, 0x0000018
 
-.include "data/scripts/gUnk_0800EC08.inc"
+gUnk_0800EC08:: @ 0800EC08
+	.incbin "baserom.gba", 0x00EC08, 0x000000C
 
-.include "data/scripts/gUnk_0800EC14.inc"
+gUnk_0800EC14:: @ 0800EC14
+	.incbin "baserom.gba", 0x00EC14, 0x0000040
 
-.include "data/scripts/gUnk_0800EC54.inc"
+gUnk_0800EC54:: @ 0800EC54
+	.incbin "baserom.gba", 0x00EC54, 0x000000D
 
-.include "data/scripts/gUnk_0800EC61.inc"
+gUnk_0800EC61:: @ 0800EC61
+	.incbin "baserom.gba", 0x00EC61, 0x000002B
 
-.include "data/scripts/gUnk_0800EC8C.inc"
+gUnk_0800EC8C:: @ 0800EC8C
+	.incbin "baserom.gba", 0x00EC8C, 0x0000065
 
-.include "data/scripts/gUnk_0800ECF1.inc"
+gUnk_0800ECF1:: @ 0800ECF1
+	.incbin "baserom.gba", 0x00ECF1, 0x0000013
 
-.include "data/scripts/gUnk_0800ED04.inc"
+gUnk_0800ED04:: @ 0800ED04
+	.incbin "baserom.gba", 0x00ED04, 0x0000008
 
-.include "data/scripts/gUnk_0800ED0C.inc"
+gUnk_0800ED0C:: @ 0800ED0C
+	.incbin "baserom.gba", 0x00ED0C, 0x0000001
 
-.include "data/scripts/gUnk_0800ED0D.inc"
+gUnk_0800ED0D:: @ 0800ED0D
+	.incbin "baserom.gba", 0x00ED0D, 0x000004F
 
-.include "data/scripts/gUnk_0800ED5C.inc"
+gUnk_0800ED5C:: @ 0800ED5C
+	.incbin "baserom.gba", 0x00ED5C, 0x0000034
 
-.include "data/scripts/gUnk_0800ED90.inc"
+gUnk_0800ED90:: @ 0800ED90
+	.incbin "baserom.gba", 0x00ED90, 0x0000049
 
-.include "data/scripts/gUnk_0800EDD9.inc"
+gUnk_0800EDD9:: @ 0800EDD9
+	.incbin "baserom.gba", 0x00EDD9, 0x0000007
 
-.include "data/scripts/gUnk_0800EDE0.inc"
+gUnk_0800EDE0:: @ 0800EDE0
+	.incbin "baserom.gba", 0x00EDE0, 0x0000029
 
-.include "data/scripts/gUnk_0800EE09.inc"
+gUnk_0800EE09:: @ 0800EE09
+	.incbin "baserom.gba", 0x00EE09, 0x0000047
 
-.include "data/scripts/gUnk_0800EE50.inc"
+gUnk_0800EE50:: @ 0800EE50
+	.incbin "baserom.gba", 0x00EE50, 0x000003C
 
-.include "data/scripts/gUnk_0800EE8C.inc"
+gUnk_0800EE8C:: @ 0800EE8C
+	.incbin "baserom.gba", 0x00EE8C, 0x0000054
 
-.include "data/scripts/gUnk_0800EEE0.inc"
+gUnk_0800EEE0:: @ 0800EEE0
+	.incbin "baserom.gba", 0x00EEE0, 0x000001D
 
-.include "data/scripts/gUnk_0800EEFD.inc"
+gUnk_0800EEFD:: @ 0800EEFD
+	.incbin "baserom.gba", 0x00EEFD, 0x000000A
 
-.include "data/scripts/gUnk_0800EF07.inc"
+gUnk_0800EF07:: @ 0800EF07
+	.incbin "baserom.gba", 0x00EF07, 0x000000B
 
-.include "data/scripts/gUnk_0800EF12.inc"
+gUnk_0800EF12:: @ 0800EF12
+	.incbin "baserom.gba", 0x00EF12, 0x000002E
 
-.include "data/scripts/gUnk_0800EF40.inc"
+gUnk_0800EF40:: @ 0800EF40
+	.incbin "baserom.gba", 0x00EF40, 0x0000053
 
-.include "data/scripts/gUnk_0800EF93.inc"
+gUnk_0800EF93:: @ 0800EF93
+	.incbin "baserom.gba", 0x00EF93, 0x000002D
 
-.include "data/scripts/gUnk_0800EFC0.inc"
+gUnk_0800EFC0:: @ 0800EFC0
+	.incbin "baserom.gba", 0x00EFC0, 0x0000020
 
-.include "data/scripts/gUnk_0800EFE0.inc"
+gUnk_0800EFE0:: @ 0800EFE0
+	.incbin "baserom.gba", 0x00EFE0, 0x0000004
 
-.include "data/scripts/gUnk_0800EFE4.inc"
+gUnk_0800EFE4:: @ 0800EFE4
+	.incbin "baserom.gba", 0x00EFE4, 0x00000AC
 
-.include "data/scripts/gUnk_0800F090.inc"
+gUnk_0800F090:: @ 0800F090
+	.incbin "baserom.gba", 0x00F090, 0x0000004
 
-.include "data/scripts/gUnk_0800F094.inc"
+gUnk_0800F094:: @ 0800F094
+	.incbin "baserom.gba", 0x00F094, 0x0000042
 
-.include "data/scripts/gUnk_0800F0D6.inc"
+gUnk_0800F0D6:: @ 0800F0D6
+	.incbin "baserom.gba", 0x00F0D6, 0x000000C
 
-.include "data/scripts/gUnk_0800F0E2.inc"
+gUnk_0800F0E2:: @ 0800F0E2
+	.incbin "baserom.gba", 0x00F0E2, 0x0000010
 
-.include "data/scripts/gUnk_0800F0F2.inc"
+gUnk_0800F0F2:: @ 0800F0F2
+	.incbin "baserom.gba", 0x00F0F2, 0x0000001
 
-.include "data/scripts/gUnk_0800F0F3.inc"
+gUnk_0800F0F3:: @ 0800F0F3
+	.incbin "baserom.gba", 0x00F0F3, 0x0000001
 
-.include "data/scripts/gUnk_0800F0F4.inc"
+gUnk_0800F0F4:: @ 0800F0F4
+	.incbin "baserom.gba", 0x00F0F4, 0x0000058
 
-.include "data/scripts/gUnk_0800F14C.inc"
+gUnk_0800F14C:: @ 0800F14C
+	.incbin "baserom.gba", 0x00F14C, 0x0000038
 
-.include "data/scripts/gUnk_0800F184.inc"
+gUnk_0800F184:: @ 0800F184
+	.incbin "baserom.gba", 0x00F184, 0x000005A
 
-.include "data/scripts/gUnk_0800F1DE.inc"
+gUnk_0800F1DE:: @ 0800F1DE
+	.incbin "baserom.gba", 0x00F1DE, 0x0000003
 
-.include "data/scripts/gUnk_0800F1E1.inc"
+gUnk_0800F1E1:: @ 0800F1E1
+	.incbin "baserom.gba", 0x00F1E1, 0x0000004
 
-.include "data/scripts/gUnk_0800F1E5.inc"
+gUnk_0800F1E5:: @ 0800F1E5
+	.incbin "baserom.gba", 0x00F1E5, 0x0000002
 
-.include "data/scripts/gUnk_0800F1E7.inc"
+gUnk_0800F1E7:: @ 0800F1E7
+	.incbin "baserom.gba", 0x00F1E7, 0x0000006
 
-.include "data/scripts/gUnk_0800F1ED.inc"
+gUnk_0800F1ED:: @ 0800F1ED
+	.incbin "baserom.gba", 0x00F1ED, 0x000000E
 
-.include "data/scripts/gUnk_0800F1FB.inc"
+gUnk_0800F1FB:: @ 0800F1FB
+	.incbin "baserom.gba", 0x00F1FB, 0x0000002
 
-.include "data/scripts/gUnk_0800F1FD.inc"
+gUnk_0800F1FD:: @ 0800F1FD
+	.incbin "baserom.gba", 0x00F1FD, 0x0000006
 
-.include "data/scripts/gUnk_0800F203.inc"
+gUnk_0800F203:: @ 0800F203
+	.incbin "baserom.gba", 0x00F203, 0x0000004
 
-.include "data/scripts/gUnk_0800F207.inc"
+gUnk_0800F207:: @ 0800F207
+	.incbin "baserom.gba", 0x00F207, 0x0000009
 
-.include "data/scripts/gUnk_0800F210.inc"
+gUnk_0800F210:: @ 0800F210
+	.incbin "baserom.gba", 0x00F210, 0x00000DB
 
-.include "data/scripts/gUnk_0800F2EB.inc"
+gUnk_0800F2EB:: @ 0800F2EB
+	.incbin "baserom.gba", 0x00F2EB, 0x0000005
 
-.include "data/scripts/gUnk_0800F2F0.inc"
+gUnk_0800F2F0:: @ 0800F2F0
+	.incbin "baserom.gba", 0x00F2F0, 0x0000002
 
-.include "data/scripts/gUnk_0800F2F2.inc"
+gUnk_0800F2F2:: @ 0800F2F2
+	.incbin "baserom.gba", 0x00F2F2, 0x0000011
 
-.include "data/scripts/gUnk_0800F303.inc"
+gUnk_0800F303:: @ 0800F303
+	.incbin "baserom.gba", 0x00F303, 0x0000099
 
-.include "data/scripts/gUnk_0800F39C.inc"
+gUnk_0800F39C:: @ 0800F39C
+	.incbin "baserom.gba", 0x00F39C, 0x000003F
 
-.include "data/scripts/gUnk_0800F3DB.inc"
+gUnk_0800F3DB:: @ 0800F3DB
+	.incbin "baserom.gba", 0x00F3DB, 0x000000A
 
-.include "data/scripts/gUnk_0800F3E5.inc"
+gUnk_0800F3E5:: @ 0800F3E5
+	.incbin "baserom.gba", 0x00F3E5, 0x0000001
 
-.include "data/scripts/gUnk_0800F3E6.inc"
+gUnk_0800F3E6:: @ 0800F3E6
+	.incbin "baserom.gba", 0x00F3E6, 0x0000002
 
-.include "data/scripts/gUnk_0800F3E8.inc"
+gUnk_0800F3E8:: @ 0800F3E8
+	.incbin "baserom.gba", 0x00F3E8, 0x0000003
 
-.include "data/scripts/gUnk_0800F3EB.inc"
+gUnk_0800F3EB:: @ 0800F3EB
+	.incbin "baserom.gba", 0x00F3EB, 0x0000002
 
-.include "data/scripts/gUnk_0800F3ED.inc"
+gUnk_0800F3ED:: @ 0800F3ED
+	.incbin "baserom.gba", 0x00F3ED, 0x0000008
 
-.include "data/scripts/gUnk_0800F3F5.inc"
+gUnk_0800F3F5:: @ 0800F3F5
+	.incbin "baserom.gba", 0x00F3F5, 0x0000004
 
-.include "data/scripts/gUnk_0800F3F9.inc"
+gUnk_0800F3F9:: @ 0800F3F9
+	.incbin "baserom.gba", 0x00F3F9, 0x0000007
 
-.include "data/scripts/gUnk_0800F400.inc"
+gUnk_0800F400:: @ 0800F400
+	.incbin "baserom.gba", 0x00F400, 0x0000008
 
-.include "data/scripts/gUnk_0800F408.inc"
+gUnk_0800F408:: @ 0800F408
+	.incbin "baserom.gba", 0x00F408, 0x0000001
 
-.include "data/scripts/gUnk_0800F409.inc"
+gUnk_0800F409:: @ 0800F409
+	.incbin "baserom.gba", 0x00F409, 0x0000007
 
-.include "data/scripts/gUnk_0800F410.inc"
+gUnk_0800F410:: @ 0800F410
+	.incbin "baserom.gba", 0x00F410, 0x0000016
 
-.include "data/scripts/gUnk_0800F426.inc"
+gUnk_0800F426:: @ 0800F426
+	.incbin "baserom.gba", 0x00F426, 0x000000A
 
-.include "data/scripts/gUnk_0800F430.inc"
+gUnk_0800F430:: @ 0800F430
+	.incbin "baserom.gba", 0x00F430, 0x0000094
 
-.include "data/scripts/gUnk_0800F4C4.inc"
+gUnk_0800F4C4:: @ 0800F4C4
+	.incbin "baserom.gba", 0x00F4C4, 0x0000026
 
-.include "data/scripts/gUnk_0800F4EA.inc"
+gUnk_0800F4EA:: @ 0800F4EA
+	.incbin "baserom.gba", 0x00F4EA, 0x0000001
 
-.include "data/scripts/gUnk_0800F4EB.inc"
+gUnk_0800F4EB:: @ 0800F4EB
+	.incbin "baserom.gba", 0x00F4EB, 0x0000004
 
-.include "data/scripts/gUnk_0800F4EF.inc"
+gUnk_0800F4EF:: @ 0800F4EF
+	.incbin "baserom.gba", 0x00F4EF, 0x0000001
 
-.include "data/scripts/gUnk_0800F4F0.inc"
+gUnk_0800F4F0:: @ 0800F4F0
+	.incbin "baserom.gba", 0x00F4F0, 0x0000001
 
-.include "data/scripts/gUnk_0800F4F1.inc"
+gUnk_0800F4F1:: @ 0800F4F1
+	.incbin "baserom.gba", 0x00F4F1, 0x0000002
 
-.include "data/scripts/gUnk_0800F4F3.inc"
+gUnk_0800F4F3:: @ 0800F4F3
+	.incbin "baserom.gba", 0x00F4F3, 0x0000004
 
-.include "data/scripts/gUnk_0800F4F7.inc"
+gUnk_0800F4F7:: @ 0800F4F7
+	.incbin "baserom.gba", 0x00F4F7, 0x0000002
 
-.include "data/scripts/gUnk_0800F4F9.inc"
+gUnk_0800F4F9:: @ 0800F4F9
+	.incbin "baserom.gba", 0x00F4F9, 0x0000008
 
-.include "data/scripts/gUnk_0800F501.inc"
+gUnk_0800F501:: @ 0800F501
+	.incbin "baserom.gba", 0x00F501, 0x000000D
 
-.include "data/scripts/gUnk_0800F50E.inc"
+gUnk_0800F50E:: @ 0800F50E
+	.incbin "baserom.gba", 0x00F50E, 0x0000046
 
-.include "data/scripts/gUnk_0800F554.inc"
+gUnk_0800F554:: @ 0800F554
+	.incbin "baserom.gba", 0x00F554, 0x0000030
 
-.include "data/scripts/gUnk_0800F584.inc"
+gUnk_0800F584:: @ 0800F584
+	.incbin "baserom.gba", 0x00F584, 0x000000B
 
-.include "data/scripts/gUnk_0800F58F.inc"
+gUnk_0800F58F:: @ 0800F58F
+	.incbin "baserom.gba", 0x00F58F, 0x0000021
 
-.include "data/scripts/gUnk_0800F5B0.inc"
+gUnk_0800F5B0:: @ 0800F5B0
+	.incbin "baserom.gba", 0x00F5B0, 0x0000039
 
-.include "data/scripts/gUnk_0800F5E9.inc"
+gUnk_0800F5E9:: @ 0800F5E9
+	.incbin "baserom.gba", 0x00F5E9, 0x0000003
 
-.include "data/scripts/gUnk_0800F5EC.inc"
+gUnk_0800F5EC:: @ 0800F5EC
+	.incbin "baserom.gba", 0x00F5EC, 0x0000001
 
-.include "data/scripts/gUnk_0800F5ED.inc"
+gUnk_0800F5ED:: @ 0800F5ED
+	.incbin "baserom.gba", 0x00F5ED, 0x0000001
 
-.include "data/scripts/gUnk_0800F5EE.inc"
+gUnk_0800F5EE:: @ 0800F5EE
+	.incbin "baserom.gba", 0x00F5EE, 0x0000001
 
-.include "data/scripts/gUnk_0800F5EF.inc"
+gUnk_0800F5EF:: @ 0800F5EF
+	.incbin "baserom.gba", 0x00F5EF, 0x0000001
 
-.include "data/scripts/gUnk_0800F5F0.inc"
+gUnk_0800F5F0:: @ 0800F5F0
+	.incbin "baserom.gba", 0x00F5F0, 0x0000002
 
-.include "data/scripts/gUnk_0800F5F2.inc"
+gUnk_0800F5F2:: @ 0800F5F2
+	.incbin "baserom.gba", 0x00F5F2, 0x0000002
 
-.include "data/scripts/gUnk_0800F5F4.inc"
+gUnk_0800F5F4:: @ 0800F5F4
+	.incbin "baserom.gba", 0x00F5F4, 0x0000008
 
-.include "data/scripts/gUnk_0800F5FC.inc"
+gUnk_0800F5FC:: @ 0800F5FC
+	.incbin "baserom.gba", 0x00F5FC, 0x0000003
 
-.include "data/scripts/gUnk_0800F5FF.inc"
+gUnk_0800F5FF:: @ 0800F5FF
+	.incbin "baserom.gba", 0x00F5FF, 0x0000007
 
-.include "data/scripts/gUnk_0800F606.inc"
+gUnk_0800F606:: @ 0800F606
+	.incbin "baserom.gba", 0x00F606, 0x0000001
 
-.include "data/scripts/gUnk_0800F607.inc"
+gUnk_0800F607:: @ 0800F607
+	.incbin "baserom.gba", 0x00F607, 0x0000001
 
-.include "data/scripts/gUnk_0800F608.inc"
+gUnk_0800F608:: @ 0800F608
+	.incbin "baserom.gba", 0x00F608, 0x0000002
 
-.include "data/scripts/gUnk_0800F60A.inc"
+gUnk_0800F60A:: @ 0800F60A
+	.incbin "baserom.gba", 0x00F60A, 0x000001E
 
-.include "data/scripts/gUnk_0800F628.inc"
+gUnk_0800F628:: @ 0800F628
+	.incbin "baserom.gba", 0x00F628, 0x0000028
 
-.include "data/scripts/gUnk_0800F650.inc"
+gUnk_0800F650:: @ 0800F650
+	.incbin "baserom.gba", 0x00F650, 0x0000038
 
-.include "data/scripts/gUnk_0800F688.inc"
+gUnk_0800F688:: @ 0800F688
+	.incbin "baserom.gba", 0x00F688, 0x0000018
 
-.include "data/scripts/gUnk_0800F6A0.inc"
+gUnk_0800F6A0:: @ 0800F6A0
+	.incbin "baserom.gba", 0x00F6A0, 0x0000028
 
-.include "data/scripts/gUnk_0800F6C8.inc"
+gUnk_0800F6C8:: @ 0800F6C8
+	.incbin "baserom.gba", 0x00F6C8, 0x0000018
 
-.include "data/scripts/gUnk_0800F6E0.inc"
+gUnk_0800F6E0:: @ 0800F6E0
+	.incbin "baserom.gba", 0x00F6E0, 0x0000009
 
-.include "data/scripts/gUnk_0800F6E9.inc"
+gUnk_0800F6E9:: @ 0800F6E9
+	.incbin "baserom.gba", 0x00F6E9, 0x0000003
 
-.include "data/scripts/gUnk_0800F6EC.inc"
+gUnk_0800F6EC:: @ 0800F6EC
+	.incbin "baserom.gba", 0x00F6EC, 0x0000001
 
-.include "data/scripts/gUnk_0800F6ED.inc"
+gUnk_0800F6ED:: @ 0800F6ED
+	.incbin "baserom.gba", 0x00F6ED, 0x0000001
 
-.include "data/scripts/gUnk_0800F6EE.inc"
+gUnk_0800F6EE:: @ 0800F6EE
+	.incbin "baserom.gba", 0x00F6EE, 0x0000001
 
-.include "data/scripts/gUnk_0800F6EF.inc"
+gUnk_0800F6EF:: @ 0800F6EF
+	.incbin "baserom.gba", 0x00F6EF, 0x0000001
 
-.include "data/scripts/gUnk_0800F6F0.inc"
+gUnk_0800F6F0:: @ 0800F6F0
+	.incbin "baserom.gba", 0x00F6F0, 0x0000001
 
-.include "data/scripts/gUnk_0800F6F1.inc"
+gUnk_0800F6F1:: @ 0800F6F1
+	.incbin "baserom.gba", 0x00F6F1, 0x0000001
 
-.include "data/scripts/gUnk_0800F6F2.inc"
+gUnk_0800F6F2:: @ 0800F6F2
+	.incbin "baserom.gba", 0x00F6F2, 0x0000001
 
-.include "data/scripts/gUnk_0800F6F3.inc"
+gUnk_0800F6F3:: @ 0800F6F3
+	.incbin "baserom.gba", 0x00F6F3, 0x0000001
 
-.include "data/scripts/gUnk_0800F6F4.inc"
+gUnk_0800F6F4:: @ 0800F6F4
+	.incbin "baserom.gba", 0x00F6F4, 0x0000005
 
-.include "data/scripts/gUnk_0800F6F9.inc"
+gUnk_0800F6F9:: @ 0800F6F9
+	.incbin "baserom.gba", 0x00F6F9, 0x0000005
 
-.include "data/scripts/gUnk_0800F6FE.inc"
+gUnk_0800F6FE:: @ 0800F6FE
+	.incbin "baserom.gba", 0x00F6FE, 0x0000004
 
-.include "data/scripts/gUnk_0800F702.inc"
+gUnk_0800F702:: @ 0800F702
+	.incbin "baserom.gba", 0x00F702, 0x0000004
 
-.include "data/scripts/gUnk_0800F706.inc"
+gUnk_0800F706:: @ 0800F706
+	.incbin "baserom.gba", 0x00F706, 0x0000018
 
-.include "data/scripts/gUnk_0800F71E.inc"
+gUnk_0800F71E:: @ 0800F71E
+	.incbin "baserom.gba", 0x00F71E, 0x0000006
 
-.include "data/scripts/gUnk_0800F724.inc"
+gUnk_0800F724:: @ 0800F724
+	.incbin "baserom.gba", 0x00F724, 0x0000010
 
-.include "data/scripts/gUnk_0800F734.inc"
+gUnk_0800F734:: @ 0800F734
+	.incbin "baserom.gba", 0x00F734, 0x0000008
 
-.include "data/scripts/gUnk_0800F73C.inc"
+gUnk_0800F73C:: @ 0800F73C
+	.incbin "baserom.gba", 0x00F73C, 0x00000AA
 
-.include "data/scripts/gUnk_0800F7E6.inc"
+gUnk_0800F7E6:: @ 0800F7E6
+	.incbin "baserom.gba", 0x00F7E6, 0x0000005
 
-.include "data/scripts/gUnk_0800F7EB.inc"
+gUnk_0800F7EB:: @ 0800F7EB
+	.incbin "baserom.gba", 0x00F7EB, 0x0000003
 
-.include "data/scripts/gUnk_0800F7EE.inc"
+gUnk_0800F7EE:: @ 0800F7EE
+	.incbin "baserom.gba", 0x00F7EE, 0x0000001
 
-.include "data/scripts/gUnk_0800F7EF.inc"
+gUnk_0800F7EF:: @ 0800F7EF
+	.incbin "baserom.gba", 0x00F7EF, 0x0000001
 
-.include "data/scripts/gUnk_0800F7F0.inc"
+gUnk_0800F7F0:: @ 0800F7F0
+	.incbin "baserom.gba", 0x00F7F0, 0x0000004
 
-.include "data/scripts/gUnk_0800F7F4.inc"
+gUnk_0800F7F4:: @ 0800F7F4
+	.incbin "baserom.gba", 0x00F7F4, 0x0000001
 
-.include "data/scripts/gUnk_0800F7F5.inc"
+gUnk_0800F7F5:: @ 0800F7F5
+	.incbin "baserom.gba", 0x00F7F5, 0x0000002
 
-.include "data/scripts/gUnk_0800F7F7.inc"
+gUnk_0800F7F7:: @ 0800F7F7
+	.incbin "baserom.gba", 0x00F7F7, 0x0000005
 
-.include "data/scripts/gUnk_0800F7FC.inc"
+gUnk_0800F7FC:: @ 0800F7FC
+	.incbin "baserom.gba", 0x00F7FC, 0x0000001
 
-.include "data/scripts/gUnk_0800F7FD.inc"
+gUnk_0800F7FD:: @ 0800F7FD
+	.incbin "baserom.gba", 0x00F7FD, 0x0000002
 
-.include "data/scripts/gUnk_0800F7FF.inc"
+gUnk_0800F7FF:: @ 0800F7FF
+	.incbin "baserom.gba", 0x00F7FF, 0x0000001
 
-.include "data/scripts/gUnk_0800F800.inc"
+gUnk_0800F800:: @ 0800F800
+	.incbin "baserom.gba", 0x00F800, 0x0000005
 
-.include "data/scripts/gUnk_0800F805.inc"
+gUnk_0800F805:: @ 0800F805
+	.incbin "baserom.gba", 0x00F805, 0x0000003
 
-.include "data/scripts/gUnk_0800F808.inc"
+gUnk_0800F808:: @ 0800F808
+	.incbin "baserom.gba", 0x00F808, 0x00000E7
 
-.include "data/scripts/gUnk_0800F8EF.inc"
+gUnk_0800F8EF:: @ 0800F8EF
+	.incbin "baserom.gba", 0x00F8EF, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F0.inc"
+gUnk_0800F8F0:: @ 0800F8F0
+	.incbin "baserom.gba", 0x00F8F0, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F1.inc"
+gUnk_0800F8F1:: @ 0800F8F1
+	.incbin "baserom.gba", 0x00F8F1, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F2.inc"
+gUnk_0800F8F2:: @ 0800F8F2
+	.incbin "baserom.gba", 0x00F8F2, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F3.inc"
+gUnk_0800F8F3:: @ 0800F8F3
+	.incbin "baserom.gba", 0x00F8F3, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F4.inc"
+gUnk_0800F8F4:: @ 0800F8F4
+	.incbin "baserom.gba", 0x00F8F4, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F5.inc"
+gUnk_0800F8F5:: @ 0800F8F5
+	.incbin "baserom.gba", 0x00F8F5, 0x0000003
 
-.include "data/scripts/gUnk_0800F8F8.inc"
+gUnk_0800F8F8:: @ 0800F8F8
+	.incbin "baserom.gba", 0x00F8F8, 0x0000001
 
-.include "data/scripts/gUnk_0800F8F9.inc"
+gUnk_0800F8F9:: @ 0800F8F9
+	.incbin "baserom.gba", 0x00F8F9, 0x0000007
 
-.include "data/scripts/gUnk_0800F900.inc"
+gUnk_0800F900:: @ 0800F900
+	.incbin "baserom.gba", 0x00F900, 0x0000002
 
-.include "data/scripts/gUnk_0800F902.inc"
+gUnk_0800F902:: @ 0800F902
+	.incbin "baserom.gba", 0x00F902, 0x0000014
 
-.include "data/scripts/gUnk_0800F916.inc"
+gUnk_0800F916:: @ 0800F916
+	.incbin "baserom.gba", 0x00F916, 0x00000DA
 
-.include "data/scripts/gUnk_0800F9F0.inc"
+gUnk_0800F9F0:: @ 0800F9F0
+	.incbin "baserom.gba", 0x00F9F0, 0x0000002
 
-.include "data/scripts/gUnk_0800F9F2.inc"
+gUnk_0800F9F2:: @ 0800F9F2
+	.incbin "baserom.gba", 0x00F9F2, 0x0000001
 
-.include "data/scripts/gUnk_0800F9F3.inc"
+gUnk_0800F9F3:: @ 0800F9F3
+	.incbin "baserom.gba", 0x00F9F3, 0x0000001
 
-.include "data/scripts/gUnk_0800F9F4.inc"
+gUnk_0800F9F4:: @ 0800F9F4
+	.incbin "baserom.gba", 0x00F9F4, 0x0000002
 
-.include "data/scripts/gUnk_0800F9F6.inc"
+gUnk_0800F9F6:: @ 0800F9F6
+	.incbin "baserom.gba", 0x00F9F6, 0x0000001
 
-.include "data/scripts/gUnk_0800F9F7.inc"
+gUnk_0800F9F7:: @ 0800F9F7
+	.incbin "baserom.gba", 0x00F9F7, 0x0000001
 
-.include "data/scripts/gUnk_0800F9F8.inc"
+gUnk_0800F9F8:: @ 0800F9F8
+	.incbin "baserom.gba", 0x00F9F8, 0x000000A
 
-.include "data/scripts/gUnk_0800FA02.inc"
+gUnk_0800FA02:: @ 0800FA02
+	.incbin "baserom.gba", 0x00FA02, 0x0000005
 
-.include "data/scripts/gUnk_0800FA07.inc"
+gUnk_0800FA07:: @ 0800FA07
+	.incbin "baserom.gba", 0x00FA07, 0x0000001
 
-.include "data/scripts/gUnk_0800FA08.inc"
+gUnk_0800FA08:: @ 0800FA08
+	.incbin "baserom.gba", 0x00FA08, 0x0000001
 
-.include "data/scripts/gUnk_0800FA09.inc"
+gUnk_0800FA09:: @ 0800FA09
+	.incbin "baserom.gba", 0x00FA09, 0x0000004
 
-.include "data/scripts/gUnk_0800FA0D.inc"
+gUnk_0800FA0D:: @ 0800FA0D
+	.incbin "baserom.gba", 0x00FA0D, 0x000006B
 
-.include "data/scripts/gUnk_0800FA78.inc"
+gUnk_0800FA78:: @ 0800FA78
+	.incbin "baserom.gba", 0x00FA78, 0x0000048
 
-.include "data/scripts/gUnk_0800FAC0.inc"
+gUnk_0800FAC0:: @ 0800FAC0
+	.incbin "baserom.gba", 0x00FAC0, 0x0000024
 
-.include "data/scripts/gUnk_0800FAE4.inc"
+gUnk_0800FAE4:: @ 0800FAE4
+	.incbin "baserom.gba", 0x00FAE4, 0x000000F
 
-.include "data/scripts/gUnk_0800FAF3.inc"
+gUnk_0800FAF3:: @ 0800FAF3
+	.incbin "baserom.gba", 0x00FAF3, 0x0000002
 
-.include "data/scripts/gUnk_0800FAF5.inc"
+gUnk_0800FAF5:: @ 0800FAF5
+	.incbin "baserom.gba", 0x00FAF5, 0x0000001
 
-.include "data/scripts/gUnk_0800FAF6.inc"
+gUnk_0800FAF6:: @ 0800FAF6
+	.incbin "baserom.gba", 0x00FAF6, 0x0000001
 
-.include "data/scripts/gUnk_0800FAF7.inc"
+gUnk_0800FAF7:: @ 0800FAF7
+	.incbin "baserom.gba", 0x00FAF7, 0x0000001
 
-.include "data/scripts/gUnk_0800FAF8.inc"
+gUnk_0800FAF8:: @ 0800FAF8
+	.incbin "baserom.gba", 0x00FAF8, 0x0000005
 
-.include "data/scripts/gUnk_0800FAFD.inc"
+gUnk_0800FAFD:: @ 0800FAFD
+	.incbin "baserom.gba", 0x00FAFD, 0x0000001
 
-.include "data/scripts/gUnk_0800FAFE.inc"
+gUnk_0800FAFE:: @ 0800FAFE
+	.incbin "baserom.gba", 0x00FAFE, 0x0000001
 
-.include "data/scripts/gUnk_0800FAFF.inc"
+gUnk_0800FAFF:: @ 0800FAFF
+	.incbin "baserom.gba", 0x00FAFF, 0x0000001
 
-.include "data/scripts/gUnk_0800FB00.inc"
+gUnk_0800FB00:: @ 0800FB00
+	.incbin "baserom.gba", 0x00FB00, 0x0000001
 
-.include "data/scripts/gUnk_0800FB01.inc"
+gUnk_0800FB01:: @ 0800FB01
+	.incbin "baserom.gba", 0x00FB01, 0x0000001
 
-.include "data/scripts/gUnk_0800FB02.inc"
+gUnk_0800FB02:: @ 0800FB02
+	.incbin "baserom.gba", 0x00FB02, 0x0000002
 
-.include "data/scripts/gUnk_0800FB04.inc"
+gUnk_0800FB04:: @ 0800FB04
+	.incbin "baserom.gba", 0x00FB04, 0x0000004
 
-.include "data/scripts/gUnk_0800FB08.inc"
+gUnk_0800FB08:: @ 0800FB08
+	.incbin "baserom.gba", 0x00FB08, 0x0000002
 
-.include "data/scripts/gUnk_0800FB0A.inc"
+gUnk_0800FB0A:: @ 0800FB0A
+	.incbin "baserom.gba", 0x00FB0A, 0x0000027
 
-.include "data/scripts/gUnk_0800FB31.inc"
+gUnk_0800FB31:: @ 0800FB31
+	.incbin "baserom.gba", 0x00FB31, 0x0000013
 
-.include "data/scripts/gUnk_0800FB44.inc"
+gUnk_0800FB44:: @ 0800FB44
+	.incbin "baserom.gba", 0x00FB44, 0x0000077
 
-.include "data/scripts/gUnk_0800FBBB.inc"
+gUnk_0800FBBB:: @ 0800FBBB
+	.incbin "baserom.gba", 0x00FBBB, 0x0000035
 
-.include "data/scripts/gUnk_0800FBF0.inc"
+gUnk_0800FBF0:: @ 0800FBF0
+	.incbin "baserom.gba", 0x00FBF0, 0x0000003
 
-.include "data/scripts/gUnk_0800FBF3.inc"
+gUnk_0800FBF3:: @ 0800FBF3
+	.incbin "baserom.gba", 0x00FBF3, 0x0000002
 
-.include "data/scripts/gUnk_0800FBF5.inc"
+gUnk_0800FBF5:: @ 0800FBF5
+	.incbin "baserom.gba", 0x00FBF5, 0x0000001
 
-.include "data/scripts/gUnk_0800FBF6.inc"
+gUnk_0800FBF6:: @ 0800FBF6
+	.incbin "baserom.gba", 0x00FBF6, 0x0000002
 
-.include "data/scripts/gUnk_0800FBF8.inc"
+gUnk_0800FBF8:: @ 0800FBF8
+	.incbin "baserom.gba", 0x00FBF8, 0x0000001
 
-.include "data/scripts/gUnk_0800FBF9.inc"
+gUnk_0800FBF9:: @ 0800FBF9
+	.incbin "baserom.gba", 0x00FBF9, 0x0000001
 
-.include "data/scripts/gUnk_0800FBFA.inc"
+gUnk_0800FBFA:: @ 0800FBFA
+	.incbin "baserom.gba", 0x00FBFA, 0x0000001
 
-.include "data/scripts/gUnk_0800FBFB.inc"
+gUnk_0800FBFB:: @ 0800FBFB
+	.incbin "baserom.gba", 0x00FBFB, 0x0000001
 
-.include "data/scripts/gUnk_0800FBFC.inc"
+gUnk_0800FBFC:: @ 0800FBFC
+	.incbin "baserom.gba", 0x00FBFC, 0x0000003
 
-.include "data/scripts/gUnk_0800FBFF.inc"
+gUnk_0800FBFF:: @ 0800FBFF
+	.incbin "baserom.gba", 0x00FBFF, 0x0000001
 
-.include "data/scripts/gUnk_0800FC00.inc"
+gUnk_0800FC00:: @ 0800FC00
+	.incbin "baserom.gba", 0x00FC00, 0x0000001
 
-.include "data/scripts/gUnk_0800FC01.inc"
+gUnk_0800FC01:: @ 0800FC01
+	.incbin "baserom.gba", 0x00FC01, 0x0000004
 
-.include "data/scripts/gUnk_0800FC05.inc"
+gUnk_0800FC05:: @ 0800FC05
+	.incbin "baserom.gba", 0x00FC05, 0x0000001
 
-.include "data/scripts/gUnk_0800FC06.inc"
+gUnk_0800FC06:: @ 0800FC06
+	.incbin "baserom.gba", 0x00FC06, 0x0000002
 
-.include "data/scripts/gUnk_0800FC08.inc"
+gUnk_0800FC08:: @ 0800FC08
+	.incbin "baserom.gba", 0x00FC08, 0x0000001
 
-.include "data/scripts/gUnk_0800FC09.inc"
+gUnk_0800FC09:: @ 0800FC09
+	.incbin "baserom.gba", 0x00FC09, 0x0000005
 
-.include "data/scripts/gUnk_0800FC0E.inc"
+gUnk_0800FC0E:: @ 0800FC0E
+	.incbin "baserom.gba", 0x00FC0E, 0x0000016
 
-.include "data/scripts/gUnk_0800FC24.inc"
+gUnk_0800FC24:: @ 0800FC24
+	.incbin "baserom.gba", 0x00FC24, 0x00000C6
 
-.include "data/scripts/gUnk_0800FCEA.inc"
+gUnk_0800FCEA:: @ 0800FCEA
+	.incbin "baserom.gba", 0x00FCEA, 0x0000004
 
-.include "data/scripts/gUnk_0800FCEE.inc"
+gUnk_0800FCEE:: @ 0800FCEE
+	.incbin "baserom.gba", 0x00FCEE, 0x0000004
 
-.include "data/scripts/gUnk_0800FCF2.inc"
+gUnk_0800FCF2:: @ 0800FCF2
+	.incbin "baserom.gba", 0x00FCF2, 0x0000001
 
-.include "data/scripts/gUnk_0800FCF3.inc"
+gUnk_0800FCF3:: @ 0800FCF3
+	.incbin "baserom.gba", 0x00FCF3, 0x0000002
 
-.include "data/scripts/gUnk_0800FCF5.inc"
+gUnk_0800FCF5:: @ 0800FCF5
+	.incbin "baserom.gba", 0x00FCF5, 0x0000002
 
-.include "data/scripts/gUnk_0800FCF7.inc"
+gUnk_0800FCF7:: @ 0800FCF7
+	.incbin "baserom.gba", 0x00FCF7, 0x0000001
 
-.include "data/scripts/gUnk_0800FCF8.inc"
+gUnk_0800FCF8:: @ 0800FCF8
+	.incbin "baserom.gba", 0x00FCF8, 0x0000002
 
-.include "data/scripts/gUnk_0800FCFA.inc"
+gUnk_0800FCFA:: @ 0800FCFA
+	.incbin "baserom.gba", 0x00FCFA, 0x0000001
 
-.include "data/scripts/gUnk_0800FCFB.inc"
+gUnk_0800FCFB:: @ 0800FCFB
+	.incbin "baserom.gba", 0x00FCFB, 0x0000001
 
-.include "data/scripts/gUnk_0800FCFC.inc"
+gUnk_0800FCFC:: @ 0800FCFC
+	.incbin "baserom.gba", 0x00FCFC, 0x0000002
 
-.include "data/scripts/gUnk_0800FCFE.inc"
+gUnk_0800FCFE:: @ 0800FCFE
+	.incbin "baserom.gba", 0x00FCFE, 0x0000001
 
-.include "data/scripts/gUnk_0800FCFF.inc"
+gUnk_0800FCFF:: @ 0800FCFF
+	.incbin "baserom.gba", 0x00FCFF, 0x0000001
 
-.include "data/scripts/gUnk_0800FD00.inc"
+gUnk_0800FD00:: @ 0800FD00
+	.incbin "baserom.gba", 0x00FD00, 0x0000001
 
-.include "data/scripts/gUnk_0800FD01.inc"
+gUnk_0800FD01:: @ 0800FD01
+	.incbin "baserom.gba", 0x00FD01, 0x0000003
 
-.include "data/scripts/gUnk_0800FD04.inc"
+gUnk_0800FD04:: @ 0800FD04
+	.incbin "baserom.gba", 0x00FD04, 0x0000001
 
-.include "data/scripts/gUnk_0800FD05.inc"
+gUnk_0800FD05:: @ 0800FD05
+	.incbin "baserom.gba", 0x00FD05, 0x0000007
 
-.include "data/scripts/gUnk_0800FD0C.inc"
+gUnk_0800FD0C:: @ 0800FD0C
+	.incbin "baserom.gba", 0x00FD0C, 0x000000A
 
-.include "data/scripts/gUnk_0800FD16.inc"
+gUnk_0800FD16:: @ 0800FD16
+	.incbin "baserom.gba", 0x00FD16, 0x000000B
 
-.include "data/scripts/gUnk_0800FD21.inc"
+gUnk_0800FD21:: @ 0800FD21
+	.incbin "baserom.gba", 0x00FD21, 0x000005F
 
-.include "data/scripts/gUnk_0800FD80.inc"
+gUnk_0800FD80:: @ 0800FD80
+	.incbin "baserom.gba", 0x00FD80, 0x0000020
 
-.include "data/scripts/gUnk_0800FDA0.inc"
+gUnk_0800FDA0:: @ 0800FDA0
+	.incbin "baserom.gba", 0x00FDA0, 0x000002C
 
-.include "data/scripts/gUnk_0800FDCC.inc"
+gUnk_0800FDCC:: @ 0800FDCC
+	.incbin "baserom.gba", 0x00FDCC, 0x0000026
 
-.include "data/scripts/gUnk_0800FDF2.inc"
+gUnk_0800FDF2:: @ 0800FDF2
+	.incbin "baserom.gba", 0x00FDF2, 0x0000001
 
-.include "data/scripts/gUnk_0800FDF3.inc"
+gUnk_0800FDF3:: @ 0800FDF3
+	.incbin "baserom.gba", 0x00FDF3, 0x0000007
 
-.include "data/scripts/gUnk_0800FDFA.inc"
+gUnk_0800FDFA:: @ 0800FDFA
+	.incbin "baserom.gba", 0x00FDFA, 0x0000002
 
-.include "data/scripts/gUnk_0800FDFC.inc"
+gUnk_0800FDFC:: @ 0800FDFC
+	.incbin "baserom.gba", 0x00FDFC, 0x0000002
 
-.include "data/scripts/gUnk_0800FDFE.inc"
+gUnk_0800FDFE:: @ 0800FDFE
+	.incbin "baserom.gba", 0x00FDFE, 0x0000001
 
-.include "data/scripts/gUnk_0800FDFF.inc"
+gUnk_0800FDFF:: @ 0800FDFF
+	.incbin "baserom.gba", 0x00FDFF, 0x0000001
 
-.include "data/scripts/gUnk_0800FE00.inc"
+gUnk_0800FE00:: @ 0800FE00
+	.incbin "baserom.gba", 0x00FE00, 0x0000001
 
-.include "data/scripts/gUnk_0800FE01.inc"
+gUnk_0800FE01:: @ 0800FE01
+	.incbin "baserom.gba", 0x00FE01, 0x0000001
 
-.include "data/scripts/gUnk_0800FE02.inc"
+gUnk_0800FE02:: @ 0800FE02
+	.incbin "baserom.gba", 0x00FE02, 0x0000002
 
-.include "data/scripts/gUnk_0800FE04.inc"
+gUnk_0800FE04:: @ 0800FE04
+	.incbin "baserom.gba", 0x00FE04, 0x0000002
 
-.include "data/scripts/gUnk_0800FE06.inc"
+gUnk_0800FE06:: @ 0800FE06
+	.incbin "baserom.gba", 0x00FE06, 0x0000001
 
-.include "data/scripts/gUnk_0800FE07.inc"
+gUnk_0800FE07:: @ 0800FE07
+	.incbin "baserom.gba", 0x00FE07, 0x0000001
 
-.include "data/scripts/gUnk_0800FE08.inc"
+gUnk_0800FE08:: @ 0800FE08
+	.incbin "baserom.gba", 0x00FE08, 0x0000001
 
-.include "data/scripts/gUnk_0800FE09.inc"
+gUnk_0800FE09:: @ 0800FE09
+	.incbin "baserom.gba", 0x00FE09, 0x0000037
 
-.include "data/scripts/gUnk_0800FE40.inc"
+gUnk_0800FE40:: @ 0800FE40
+	.incbin "baserom.gba", 0x00FE40, 0x0000004
 
-.include "data/scripts/gUnk_0800FE44.inc"
+gUnk_0800FE44:: @ 0800FE44
+	.incbin "baserom.gba", 0x00FE44, 0x0000020
 
-.include "data/scripts/gUnk_0800FE64.inc"
+gUnk_0800FE64:: @ 0800FE64
+	.incbin "baserom.gba", 0x00FE64, 0x0000024
 
-.include "data/scripts/gUnk_0800FE88.inc"
+gUnk_0800FE88:: @ 0800FE88
+	.incbin "baserom.gba", 0x00FE88, 0x0000034
 
-.include "data/scripts/gUnk_0800FEBC.inc"
+gUnk_0800FEBC:: @ 0800FEBC
+	.incbin "baserom.gba", 0x00FEBC, 0x0000034
 
-.include "data/scripts/gUnk_0800FEF0.inc"
+gUnk_0800FEF0:: @ 0800FEF0
+	.incbin "baserom.gba", 0x00FEF0, 0x0000002
 
-.include "data/scripts/gUnk_0800FEF2.inc"
+gUnk_0800FEF2:: @ 0800FEF2
+	.incbin "baserom.gba", 0x00FEF2, 0x0000007
 
-.include "data/scripts/gUnk_0800FEF9.inc"
+gUnk_0800FEF9:: @ 0800FEF9
+	.incbin "baserom.gba", 0x00FEF9, 0x0000003
 
-.include "data/scripts/gUnk_0800FEFC.inc"
+gUnk_0800FEFC:: @ 0800FEFC
+	.incbin "baserom.gba", 0x00FEFC, 0x0000002
 
-.include "data/scripts/gUnk_0800FEFE.inc"
+gUnk_0800FEFE:: @ 0800FEFE
+	.incbin "baserom.gba", 0x00FEFE, 0x0000003
 
-.include "data/scripts/gUnk_0800FF01.inc"
+gUnk_0800FF01:: @ 0800FF01
+	.incbin "baserom.gba", 0x00FF01, 0x0000002
 
-.include "data/scripts/gUnk_0800FF03.inc"
+gUnk_0800FF03:: @ 0800FF03
+	.incbin "baserom.gba", 0x00FF03, 0x0000001
 
-.include "data/scripts/gUnk_0800FF04.inc"
+gUnk_0800FF04:: @ 0800FF04
+	.incbin "baserom.gba", 0x00FF04, 0x0000001
 
-.include "data/scripts/gUnk_0800FF05.inc"
+gUnk_0800FF05:: @ 0800FF05
+	.incbin "baserom.gba", 0x00FF05, 0x0000001
 
-.include "data/scripts/gUnk_0800FF06.inc"
+gUnk_0800FF06:: @ 0800FF06
+	.incbin "baserom.gba", 0x00FF06, 0x0000002
 
-.include "data/scripts/gUnk_0800FF08.inc"
+gUnk_0800FF08:: @ 0800FF08
+	.incbin "baserom.gba", 0x00FF08, 0x0000010
 
-.include "data/scripts/gUnk_0800FF18.inc"
+gUnk_0800FF18:: @ 0800FF18
+	.incbin "baserom.gba", 0x00FF18, 0x0000012
 
-.include "data/scripts/gUnk_0800FF2A.inc"
+gUnk_0800FF2A:: @ 0800FF2A
+	.incbin "baserom.gba", 0x00FF2A, 0x000004A
 
-.include "data/scripts/gUnk_0800FF74.inc"
+gUnk_0800FF74:: @ 0800FF74
+	.incbin "baserom.gba", 0x00FF74, 0x000003C
 
-.include "data/scripts/gUnk_0800FFB0.inc"
+gUnk_0800FFB0:: @ 0800FFB0
+	.incbin "baserom.gba", 0x00FFB0, 0x000000B
 
-.include "data/scripts/gUnk_0800FFBB.inc"
+gUnk_0800FFBB:: @ 0800FFBB
+	.incbin "baserom.gba", 0x00FFBB, 0x000001B
 
-.include "data/scripts/gUnk_0800FFD6.inc"
+gUnk_0800FFD6:: @ 0800FFD6
+	.incbin "baserom.gba", 0x00FFD6, 0x0000018
 
-.include "data/scripts/gUnk_0800FFEE.inc"
+gUnk_0800FFEE:: @ 0800FFEE
+	.incbin "baserom.gba", 0x00FFEE, 0x0000008
 
-.include "data/scripts/gUnk_0800FFF6.inc"
+gUnk_0800FFF6:: @ 0800FFF6
+	.incbin "baserom.gba", 0x00FFF6, 0x0000006
 
-.include "data/scripts/gUnk_0800FFFC.inc"
+gUnk_0800FFFC:: @ 0800FFFC
+	.incbin "baserom.gba", 0x00FFFC, 0x0000001
 
-.include "data/scripts/gUnk_0800FFFD.inc"
+gUnk_0800FFFD:: @ 0800FFFD
+	.incbin "baserom.gba", 0x00FFFD, 0x0000002
 
-.include "data/scripts/gUnk_0800FFFF.inc"
+gUnk_0800FFFF:: @ 0800FFFF
+	.incbin "baserom.gba", 0x00FFFF, 0x0000001
 
-.include "data/scripts/gUnk_08010000.inc"
+gUnk_08010000:: @ 08010000
+	.incbin "baserom.gba", 0x010000, 0x0000001
 
-.include "data/scripts/gUnk_08010001.inc"
+gUnk_08010001:: @ 08010001
+	.incbin "baserom.gba", 0x010001, 0x0000001
 
-.include "data/scripts/gUnk_08010002.inc"
+gUnk_08010002:: @ 08010002
+	.incbin "baserom.gba", 0x010002, 0x0000001
 
-.include "data/scripts/gUnk_08010003.inc"
+gUnk_08010003:: @ 08010003
+	.incbin "baserom.gba", 0x010003, 0x0000002
 
-.include "data/scripts/gUnk_08010005.inc"
+gUnk_08010005:: @ 08010005
+	.incbin "baserom.gba", 0x010005, 0x0000002
 
-.include "data/scripts/gUnk_08010007.inc"
+gUnk_08010007:: @ 08010007
+	.incbin "baserom.gba", 0x010007, 0x0000001
 
-.include "data/scripts/gUnk_08010008.inc"
+gUnk_08010008:: @ 08010008
+	.incbin "baserom.gba", 0x010008, 0x0000001
 
-.include "data/scripts/gUnk_08010009.inc"
+gUnk_08010009:: @ 08010009
+	.incbin "baserom.gba", 0x010009, 0x0000001
 
-.include "data/scripts/gUnk_0801000A.inc"
+gUnk_0801000A:: @ 0801000A
+	.incbin "baserom.gba", 0x01000A, 0x0000002
 
-.include "data/scripts/gUnk_0801000C.inc"
+gUnk_0801000C:: @ 0801000C
+	.incbin "baserom.gba", 0x01000C, 0x0000001
 
-.include "data/scripts/gUnk_0801000D.inc"
+gUnk_0801000D:: @ 0801000D
+	.incbin "baserom.gba", 0x01000D, 0x0000001
 
-.include "data/scripts/gUnk_0801000E.inc"
+gUnk_0801000E:: @ 0801000E
+	.incbin "baserom.gba", 0x01000E, 0x0000001
 
-.include "data/scripts/gUnk_0801000F.inc"
+gUnk_0801000F:: @ 0801000F
+	.incbin "baserom.gba", 0x01000F, 0x0000009
 
-.include "data/scripts/gUnk_08010018.inc"
+gUnk_08010018:: @ 08010018
+	.incbin "baserom.gba", 0x010018, 0x0000003
 
-.include "data/scripts/gUnk_0801001B.inc"
+gUnk_0801001B:: @ 0801001B
+	.incbin "baserom.gba", 0x01001B, 0x0000002
 
-.include "data/scripts/gUnk_0801001D.inc"
+gUnk_0801001D:: @ 0801001D
+	.incbin "baserom.gba", 0x01001D, 0x0000006
 
-.include "data/scripts/gUnk_08010023.inc"
+gUnk_08010023:: @ 08010023
+	.incbin "baserom.gba", 0x010023, 0x0000021
 
-.include "data/scripts/gUnk_08010044.inc"
+gUnk_08010044:: @ 08010044
+	.incbin "baserom.gba", 0x010044, 0x0000054
 
-.include "data/scripts/gUnk_08010098.inc"
+gUnk_08010098:: @ 08010098
+	.incbin "baserom.gba", 0x010098, 0x0000001
 
-.include "data/scripts/gUnk_08010099.inc"
+gUnk_08010099:: @ 08010099
+	.incbin "baserom.gba", 0x010099, 0x0000028
 
-.include "data/scripts/gUnk_080100C1.inc"
+gUnk_080100C1:: @ 080100C1
+	.incbin "baserom.gba", 0x0100C1, 0x0000007
 
-.include "data/scripts/gUnk_080100C8.inc"
+gUnk_080100C8:: @ 080100C8
+	.incbin "baserom.gba", 0x0100C8, 0x000002D
 
-.include "data/scripts/gUnk_080100F5.inc"
+gUnk_080100F5:: @ 080100F5
+	.incbin "baserom.gba", 0x0100F5, 0x0000007
 
-.include "data/scripts/gUnk_080100FC.inc"
+gUnk_080100FC:: @ 080100FC
+	.incbin "baserom.gba", 0x0100FC, 0x0000002
 
-.include "data/scripts/gUnk_080100FE.inc"
+gUnk_080100FE:: @ 080100FE
+	.incbin "baserom.gba", 0x0100FE, 0x0000001
 
-.include "data/scripts/gUnk_080100FF.inc"
+gUnk_080100FF:: @ 080100FF
+	.incbin "baserom.gba", 0x0100FF, 0x0000001
 
-.include "data/scripts/gUnk_08010100.inc"
+gUnk_08010100:: @ 08010100
+	.incbin "baserom.gba", 0x010100, 0x0000002
 
-.include "data/scripts/gUnk_08010102.inc"
+gUnk_08010102:: @ 08010102
+	.incbin "baserom.gba", 0x010102, 0x0000001
 
-.include "data/scripts/gUnk_08010103.inc"
+gUnk_08010103:: @ 08010103
+	.incbin "baserom.gba", 0x010103, 0x0000002
 
-.include "data/scripts/gUnk_08010105.inc"
+gUnk_08010105:: @ 08010105
+	.incbin "baserom.gba", 0x010105, 0x0000001
 
-.include "data/scripts/gUnk_08010106.inc"
+gUnk_08010106:: @ 08010106
+	.incbin "baserom.gba", 0x010106, 0x0000004
 
-.include "data/scripts/gUnk_0801010A.inc"
+gUnk_0801010A:: @ 0801010A
+	.incbin "baserom.gba", 0x01010A, 0x0000007
 
-.include "data/scripts/gUnk_08010111.inc"
+gUnk_08010111:: @ 08010111
+	.incbin "baserom.gba", 0x010111, 0x000000F
 
-.include "data/scripts/gUnk_08010120.inc"
+gUnk_08010120:: @ 08010120
+	.incbin "baserom.gba", 0x010120, 0x0000010
 
-.include "data/scripts/gUnk_08010130.inc"
+gUnk_08010130:: @ 08010130
+	.incbin "baserom.gba", 0x010130, 0x0000018
 
-.include "data/scripts/gUnk_08010148.inc"
+gUnk_08010148:: @ 08010148
+	.incbin "baserom.gba", 0x010148, 0x00000B2
 
-.include "data/scripts/gUnk_080101FA.inc"
+gUnk_080101FA:: @ 080101FA
+	.incbin "baserom.gba", 0x0101FA, 0x0000003
 
-.include "data/scripts/gUnk_080101FD.inc"
+gUnk_080101FD:: @ 080101FD
+	.incbin "baserom.gba", 0x0101FD, 0x0000002
 
-.include "data/scripts/gUnk_080101FF.inc"
+gUnk_080101FF:: @ 080101FF
+	.incbin "baserom.gba", 0x0101FF, 0x0000001
 
-.include "data/scripts/gUnk_08010200.inc"
+gUnk_08010200:: @ 08010200
+	.incbin "baserom.gba", 0x010200, 0x0000003
 
-.include "data/scripts/gUnk_08010203.inc"
+gUnk_08010203:: @ 08010203
+	.incbin "baserom.gba", 0x010203, 0x0000004
 
-.include "data/scripts/gUnk_08010207.inc"
+gUnk_08010207:: @ 08010207
+	.incbin "baserom.gba", 0x010207, 0x0000001
 
-.include "data/scripts/gUnk_08010208.inc"
+gUnk_08010208:: @ 08010208
+	.incbin "baserom.gba", 0x010208, 0x0000004
 
-.include "data/scripts/gUnk_0801020C.inc"
+gUnk_0801020C:: @ 0801020C
+	.incbin "baserom.gba", 0x01020C, 0x0000014
 
-.include "data/scripts/gUnk_08010220.inc"
+gUnk_08010220:: @ 08010220
+	.incbin "baserom.gba", 0x010220, 0x0000016
 
-.include "data/scripts/gUnk_08010236.inc"
+gUnk_08010236:: @ 08010236
+	.incbin "baserom.gba", 0x010236, 0x000002E
 
-.include "data/scripts/gUnk_08010264.inc"
+gUnk_08010264:: @ 08010264
+	.incbin "baserom.gba", 0x010264, 0x0000030
 
-.include "data/scripts/gUnk_08010294.inc"
+gUnk_08010294:: @ 08010294
+	.incbin "baserom.gba", 0x010294, 0x000004C
 
-.include "data/scripts/gUnk_080102E0.inc"
+gUnk_080102E0:: @ 080102E0
+	.incbin "baserom.gba", 0x0102E0, 0x000001B
 
-.include "data/scripts/gUnk_080102FB.inc"
+gUnk_080102FB:: @ 080102FB
+	.incbin "baserom.gba", 0x0102FB, 0x0000002
 
-.include "data/scripts/gUnk_080102FD.inc"
+gUnk_080102FD:: @ 080102FD
+	.incbin "baserom.gba", 0x0102FD, 0x0000001
 
-.include "data/scripts/gUnk_080102FE.inc"
+gUnk_080102FE:: @ 080102FE
+	.incbin "baserom.gba", 0x0102FE, 0x0000005
 
-.include "data/scripts/gUnk_08010303.inc"
+gUnk_08010303:: @ 08010303
+	.incbin "baserom.gba", 0x010303, 0x0000001
 
-.include "data/scripts/gUnk_08010304.inc"
+gUnk_08010304:: @ 08010304
+	.incbin "baserom.gba", 0x010304, 0x0000001
 
-.include "data/scripts/gUnk_08010305.inc"
+gUnk_08010305:: @ 08010305
+	.incbin "baserom.gba", 0x010305, 0x0000005
 
-.include "data/scripts/gUnk_0801030A.inc"
+gUnk_0801030A:: @ 0801030A
+	.incbin "baserom.gba", 0x01030A, 0x0000002
 
-.include "data/scripts/gUnk_0801030C.inc"
+gUnk_0801030C:: @ 0801030C
+	.incbin "baserom.gba", 0x01030C, 0x0000014
 
-.include "data/scripts/gUnk_08010320.inc"
+gUnk_08010320:: @ 08010320
+	.incbin "baserom.gba", 0x010320, 0x0000090
 
-.include "data/scripts/gUnk_080103B0.inc"
+gUnk_080103B0:: @ 080103B0
+	.incbin "baserom.gba", 0x0103B0, 0x0000020
 
-.include "data/scripts/gUnk_080103D0.inc"
+gUnk_080103D0:: @ 080103D0
+	.incbin "baserom.gba", 0x0103D0, 0x0000028
 
-.include "data/scripts/gUnk_080103F8.inc"
+gUnk_080103F8:: @ 080103F8
+	.incbin "baserom.gba", 0x0103F8, 0x0000005
 
-.include "data/scripts/gUnk_080103FD.inc"
+gUnk_080103FD:: @ 080103FD
+	.incbin "baserom.gba", 0x0103FD, 0x0000003
 
-.include "data/scripts/gUnk_08010400.inc"
+gUnk_08010400:: @ 08010400
+	.incbin "baserom.gba", 0x010400, 0x0000006
 
-.include "data/scripts/gUnk_08010406.inc"
+gUnk_08010406:: @ 08010406
+	.incbin "baserom.gba", 0x010406, 0x0000001
 
-.include "data/scripts/gUnk_08010407.inc"
+gUnk_08010407:: @ 08010407
+	.incbin "baserom.gba", 0x010407, 0x0000003
 
-.include "data/scripts/gUnk_0801040A.inc"
+gUnk_0801040A:: @ 0801040A
+	.incbin "baserom.gba", 0x01040A, 0x000001E
 
-.include "data/scripts/gUnk_08010428.inc"
+gUnk_08010428:: @ 08010428
+	.incbin "baserom.gba", 0x010428, 0x000002C
 
-.include "data/scripts/gUnk_08010454.inc"
+gUnk_08010454:: @ 08010454
+	.incbin "baserom.gba", 0x010454, 0x000002C
 
-.include "data/scripts/gUnk_08010480.inc"
+gUnk_08010480:: @ 08010480
+	.incbin "baserom.gba", 0x010480, 0x0000020
 
-.include "data/scripts/gUnk_080104A0.inc"
+gUnk_080104A0:: @ 080104A0
+	.incbin "baserom.gba", 0x0104A0, 0x000004C
 
-.include "data/scripts/gUnk_080104EC.inc"
+gUnk_080104EC:: @ 080104EC
+	.incbin "baserom.gba", 0x0104EC, 0x0000013
 
-.include "data/scripts/gUnk_080104FF.inc"
+gUnk_080104FF:: @ 080104FF
+	.incbin "baserom.gba", 0x0104FF, 0x0000002
 
-.include "data/scripts/gUnk_08010501.inc"
+gUnk_08010501:: @ 08010501
+	.incbin "baserom.gba", 0x010501, 0x0000001
 
-.include "data/scripts/gUnk_08010502.inc"
+gUnk_08010502:: @ 08010502
+	.incbin "baserom.gba", 0x010502, 0x0000001
 
-.include "data/scripts/gUnk_08010503.inc"
+gUnk_08010503:: @ 08010503
+	.incbin "baserom.gba", 0x010503, 0x0000007
 
-.include "data/scripts/gUnk_0801050A.inc"
+gUnk_0801050A:: @ 0801050A
+	.incbin "baserom.gba", 0x01050A, 0x0000001
 
-.include "data/scripts/gUnk_0801050B.inc"
+gUnk_0801050B:: @ 0801050B
+	.incbin "baserom.gba", 0x01050B, 0x000001B
 
-.include "data/scripts/gUnk_08010526.inc"
+gUnk_08010526:: @ 08010526
+	.incbin "baserom.gba", 0x010526, 0x0000079
 
-.include "data/scripts/gUnk_0801059F.inc"
+gUnk_0801059F:: @ 0801059F
+	.incbin "baserom.gba", 0x01059F, 0x000002A
 
-.include "data/scripts/gUnk_080105C9.inc"
+gUnk_080105C9:: @ 080105C9
+	.incbin "baserom.gba", 0x0105C9, 0x0000032
 
-.include "data/scripts/gUnk_080105FB.inc"
+gUnk_080105FB:: @ 080105FB
+	.incbin "baserom.gba", 0x0105FB, 0x0000004
 
-.include "data/scripts/gUnk_080105FF.inc"
+gUnk_080105FF:: @ 080105FF
+	.incbin "baserom.gba", 0x0105FF, 0x0000001
 
-.include "data/scripts/gUnk_08010600.inc"
+gUnk_08010600:: @ 08010600
+	.incbin "baserom.gba", 0x010600, 0x000000A
 
-.include "data/scripts/gUnk_0801060A.inc"
+gUnk_0801060A:: @ 0801060A
+	.incbin "baserom.gba", 0x01060A, 0x0000003
 
-.include "data/scripts/gUnk_0801060D.inc"
+gUnk_0801060D:: @ 0801060D
+	.incbin "baserom.gba", 0x01060D, 0x000000A
 
-.include "data/scripts/gUnk_08010617.inc"
+gUnk_08010617:: @ 08010617
+	.incbin "baserom.gba", 0x010617, 0x0000005
 
-.include "data/scripts/gUnk_0801061C.inc"
+gUnk_0801061C:: @ 0801061C
+	.incbin "baserom.gba", 0x01061C, 0x0000028
 
-.include "data/scripts/gUnk_08010644.inc"
+gUnk_08010644:: @ 08010644
+	.incbin "baserom.gba", 0x010644, 0x000000C
 
-.include "data/scripts/gUnk_08010650.inc"
+gUnk_08010650:: @ 08010650
+	.incbin "baserom.gba", 0x010650, 0x0000024
 
-.include "data/scripts/gUnk_08010674.inc"
+gUnk_08010674:: @ 08010674
+	.incbin "baserom.gba", 0x010674, 0x0000038
 
-.include "data/scripts/gUnk_080106AC.inc"
+gUnk_080106AC:: @ 080106AC
+	.incbin "baserom.gba", 0x0106AC, 0x0000054
 
-.include "data/scripts/gUnk_08010700.inc"
+gUnk_08010700:: @ 08010700
+	.incbin "baserom.gba", 0x010700, 0x0000001
 
-.include "data/scripts/gUnk_08010701.inc"
+gUnk_08010701:: @ 08010701
+	.incbin "baserom.gba", 0x010701, 0x0000004
 
-.include "data/scripts/gUnk_08010705.inc"
+gUnk_08010705:: @ 08010705
+	.incbin "baserom.gba", 0x010705, 0x0000009
 
-.include "data/scripts/gUnk_0801070E.inc"
+gUnk_0801070E:: @ 0801070E
+	.incbin "baserom.gba", 0x01070E, 0x0000026
 
-.include "data/scripts/gUnk_08010734.inc"
+gUnk_08010734:: @ 08010734
+	.incbin "baserom.gba", 0x010734, 0x0000060
 
-.include "data/scripts/gUnk_08010794.inc"
+gUnk_08010794:: @ 08010794
+	.incbin "baserom.gba", 0x010794, 0x000003C
 
-.include "data/scripts/gUnk_080107D0.inc"
+gUnk_080107D0:: @ 080107D0
+	.incbin "baserom.gba", 0x0107D0, 0x000003A
 
-.include "data/scripts/gUnk_0801080A.inc"
+gUnk_0801080A:: @ 0801080A
+	.incbin "baserom.gba", 0x01080A, 0x0000001
 
-.include "data/scripts/gUnk_0801080B.inc"
+gUnk_0801080B:: @ 0801080B
+	.incbin "baserom.gba", 0x01080B, 0x000000A
 
-.include "data/scripts/gUnk_08010815.inc"
+gUnk_08010815:: @ 08010815
+	.incbin "baserom.gba", 0x010815, 0x0000006
 
-.include "data/scripts/gUnk_0801081B.inc"
+gUnk_0801081B:: @ 0801081B
+	.incbin "baserom.gba", 0x01081B, 0x00000B5
 
-.include "data/scripts/gUnk_080108D0.inc"
+gUnk_080108D0:: @ 080108D0
+	.incbin "baserom.gba", 0x0108D0, 0x000002F
 
-.include "data/scripts/gUnk_080108FF.inc"
+gUnk_080108FF:: @ 080108FF
+	.incbin "baserom.gba", 0x0108FF, 0x000000D
 
-.include "data/scripts/gUnk_0801090C.inc"
+gUnk_0801090C:: @ 0801090C
+	.incbin "baserom.gba", 0x01090C, 0x0000003
 
-.include "data/scripts/gUnk_0801090F.inc"
+gUnk_0801090F:: @ 0801090F
+	.incbin "baserom.gba", 0x01090F, 0x0000008
 
-.include "data/scripts/gUnk_08010917.inc"
+gUnk_08010917:: @ 08010917
+	.incbin "baserom.gba", 0x010917, 0x000004D
 
-.include "data/scripts/gUnk_08010964.inc"
+gUnk_08010964:: @ 08010964
+	.incbin "baserom.gba", 0x010964, 0x000003C
 
-.include "data/scripts/gUnk_080109A0.inc"
+gUnk_080109A0:: @ 080109A0
+	.incbin "baserom.gba", 0x0109A0, 0x0000050
 
-.include "data/scripts/gUnk_080109F0.inc"
+gUnk_080109F0:: @ 080109F0
+	.incbin "baserom.gba", 0x0109F0, 0x0000006
 
-.include "data/scripts/gUnk_080109F6.inc"
+gUnk_080109F6:: @ 080109F6
+	.incbin "baserom.gba", 0x0109F6, 0x000001E
 
-.include "data/scripts/gUnk_08010A14.inc"
+gUnk_08010A14:: @ 08010A14
+	.incbin "baserom.gba", 0x010A14, 0x000000B
 
-.include "data/scripts/gUnk_08010A1F.inc"
+gUnk_08010A1F:: @ 08010A1F
+	.incbin "baserom.gba", 0x010A1F, 0x0000019
 
-.include "data/scripts/gUnk_08010A38.inc"
+gUnk_08010A38:: @ 08010A38
+	.incbin "baserom.gba", 0x010A38, 0x0000024
 
-.include "data/scripts/gUnk_08010A5C.inc"
+gUnk_08010A5C:: @ 08010A5C
+	.incbin "baserom.gba", 0x010A5C, 0x000003C
 
-.include "data/scripts/gUnk_08010A98.inc"
+gUnk_08010A98:: @ 08010A98
+	.incbin "baserom.gba", 0x010A98, 0x000004C
 
-.include "data/scripts/gUnk_08010AE4.inc"
+gUnk_08010AE4:: @ 08010AE4
+	.incbin "baserom.gba", 0x010AE4, 0x0000020
 
-.include "data/scripts/gUnk_08010B04.inc"
+gUnk_08010B04:: @ 08010B04
+	.incbin "baserom.gba", 0x010B04, 0x0000064
 
-.include "data/scripts/gUnk_08010B68.inc"
+gUnk_08010B68:: @ 08010B68
+	.incbin "baserom.gba", 0x010B68, 0x000004C
 
-.include "data/scripts/gUnk_08010BB4.inc"
+gUnk_08010BB4:: @ 08010BB4
+	.incbin "baserom.gba", 0x010BB4, 0x0000038
 
-.include "data/scripts/gUnk_08010BEC.inc"
+gUnk_08010BEC:: @ 08010BEC
+	.incbin "baserom.gba", 0x010BEC, 0x000000D
 
-.include "data/scripts/gUnk_08010BF9.inc"
+gUnk_08010BF9:: @ 08010BF9
+	.incbin "baserom.gba", 0x010BF9, 0x0000005
 
-.include "data/scripts/gUnk_08010BFE.inc"
+gUnk_08010BFE:: @ 08010BFE
+	.incbin "baserom.gba", 0x010BFE, 0x000001C
 
-.include "data/scripts/gUnk_08010C1A.inc"
+gUnk_08010C1A:: @ 08010C1A
+	.incbin "baserom.gba", 0x010C1A, 0x00000E9
 
-.include "data/scripts/gUnk_08010D03.inc"
+gUnk_08010D03:: @ 08010D03
+	.incbin "baserom.gba", 0x010D03, 0x00000FD
 
-.include "data/scripts/gUnk_08010E00.inc"
+gUnk_08010E00:: @ 08010E00
+	.incbin "baserom.gba", 0x010E00, 0x000000D
 
-.include "data/scripts/gUnk_08010E0D.inc"
+gUnk_08010E0D:: @ 08010E0D
+	.incbin "baserom.gba", 0x010E0D, 0x00000F3
 
-.include "data/scripts/gUnk_08010F00.inc"
+gUnk_08010F00:: @ 08010F00
+	.incbin "baserom.gba", 0x010F00, 0x00000FF
 
-.include "data/scripts/gUnk_08010FFF.inc"
+gUnk_08010FFF:: @ 08010FFF
+	.incbin "baserom.gba", 0x010FFF, 0x0000001
 
-.include "data/scripts/gUnk_08011000.inc"
+gUnk_08011000:: @ 08011000
+	.incbin "baserom.gba", 0x011000, 0x0000001
 
-.include "data/scripts/gUnk_08011001.inc"
+gUnk_08011001:: @ 08011001
+	.incbin "baserom.gba", 0x011001, 0x000001E
 
-.include "data/scripts/gUnk_0801101F.inc"
+gUnk_0801101F:: @ 0801101F
+	.incbin "baserom.gba", 0x01101F, 0x0000055
 
-.include "data/scripts/gUnk_08011074.inc"
+gUnk_08011074:: @ 08011074
+	.incbin "baserom.gba", 0x011074, 0x000000F
 
-.include "data/scripts/gUnk_08011083.inc"
+gUnk_08011083:: @ 08011083
+	.incbin "baserom.gba", 0x011083, 0x0000059
 
-.include "data/scripts/gUnk_080110DC.inc"
+gUnk_080110DC:: @ 080110DC
+	.incbin "baserom.gba", 0x0110DC, 0x000000C
 
-.include "data/scripts/gUnk_080110E8.inc"
+gUnk_080110E8:: @ 080110E8
+	.incbin "baserom.gba", 0x0110E8, 0x0000040
 
-.include "data/scripts/gUnk_08011128.inc"
+gUnk_08011128:: @ 08011128
+	.incbin "baserom.gba", 0x011128, 0x00000A4
 
-.include "data/scripts/gUnk_080111CC.inc"
+gUnk_080111CC:: @ 080111CC
+	.incbin "baserom.gba", 0x0111CC, 0x000003C
 
-.include "data/scripts/gUnk_08011208.inc"
+gUnk_08011208:: @ 08011208
+	.incbin "baserom.gba", 0x011208, 0x0000015
 
-.include "data/scripts/gUnk_0801121D.inc"
+gUnk_0801121D:: @ 0801121D
+	.incbin "baserom.gba", 0x01121D, 0x00000A7
 
-.include "data/scripts/gUnk_080112C4.inc"
+gUnk_080112C4:: @ 080112C4
+	.incbin "baserom.gba", 0x0112C4, 0x000004B
 
-.include "data/scripts/gUnk_0801130F.inc"
+gUnk_0801130F:: @ 0801130F
+	.incbin "baserom.gba", 0x01130F, 0x0000019
 
-.include "data/scripts/gUnk_08011328.inc"
+gUnk_08011328:: @ 08011328
+	.incbin "baserom.gba", 0x011328, 0x00000DB
 
-.include "data/scripts/gUnk_08011403.inc"
+gUnk_08011403:: @ 08011403
+	.incbin "baserom.gba", 0x011403, 0x00001CD
 
-.include "data/scripts/gUnk_080115D0.inc"
+gUnk_080115D0:: @ 080115D0
+	.incbin "baserom.gba", 0x0115D0, 0x0000038
 
-.include "data/scripts/gUnk_08011608.inc"
+gUnk_08011608:: @ 08011608
+	.incbin "baserom.gba", 0x011608, 0x0000038
 
-.include "data/scripts/gUnk_08011640.inc"
+gUnk_08011640:: @ 08011640
+	.incbin "baserom.gba", 0x011640, 0x0000068
 
-.include "data/scripts/gUnk_080116A8.inc"
+gUnk_080116A8:: @ 080116A8
+	.incbin "baserom.gba", 0x0116A8, 0x0000161
 
-.include "data/scripts/gUnk_08011809.inc"
+gUnk_08011809:: @ 08011809
+	.incbin "baserom.gba", 0x011809, 0x0000033
 
-.include "data/scripts/gUnk_0801183C.inc"
+gUnk_0801183C:: @ 0801183C
+	.incbin "baserom.gba", 0x01183C, 0x0000098
 
-.include "data/scripts/gUnk_080118D4.inc"
+gUnk_080118D4:: @ 080118D4
+	.incbin "baserom.gba", 0x0118D4, 0x000005C
 
-.include "data/scripts/gUnk_08011930.inc"
+gUnk_08011930:: @ 08011930
+	.incbin "baserom.gba", 0x011930, 0x0000010
 
-.include "data/scripts/gUnk_08011940.inc"
+gUnk_08011940:: @ 08011940
+	.incbin "baserom.gba", 0x011940, 0x000000C
 
-.include "data/scripts/gUnk_0801194C.inc"
+gUnk_0801194C:: @ 0801194C
+	.incbin "baserom.gba", 0x01194C, 0x000000C
 
-.include "data/scripts/gUnk_08011958.inc"
+gUnk_08011958:: @ 08011958
+	.incbin "baserom.gba", 0x011958, 0x000000C
 
-.include "data/scripts/gUnk_08011964.inc"
+gUnk_08011964:: @ 08011964
+	.incbin "baserom.gba", 0x011964, 0x000004C
 
-.include "data/scripts/gUnk_080119B0.inc"
+gUnk_080119B0:: @ 080119B0
+	.incbin "baserom.gba", 0x0119B0, 0x0000028
 
-.include "data/scripts/gUnk_080119D8.inc"
+gUnk_080119D8:: @ 080119D8
+	.incbin "baserom.gba", 0x0119D8, 0x000000C
 
-.include "data/scripts/gUnk_080119E4.inc"
+gUnk_080119E4:: @ 080119E4
+	.incbin "baserom.gba", 0x0119E4, 0x000000C
 
-.include "data/scripts/gUnk_080119F0.inc"
+gUnk_080119F0:: @ 080119F0
+	.incbin "baserom.gba", 0x0119F0, 0x0000014
 
-.include "data/scripts/gUnk_08011A04.inc"
+gUnk_08011A04:: @ 08011A04
+	.incbin "baserom.gba", 0x011A04, 0x0000028
 
-.include "data/scripts/gUnk_08011A2C.inc"
+gUnk_08011A2C:: @ 08011A2C
+	.incbin "baserom.gba", 0x011A2C, 0x0000038
 
-.include "data/scripts/gUnk_08011A64.inc"
+gUnk_08011A64:: @ 08011A64
+	.incbin "baserom.gba", 0x011A64, 0x0000080
 
-.include "data/scripts/gUnk_08011AE4.inc"
+gUnk_08011AE4:: @ 08011AE4
+	.incbin "baserom.gba", 0x011AE4, 0x0000020
 
-.include "data/scripts/gUnk_08011B04.inc"
+gUnk_08011B04:: @ 08011B04
+	.incbin "baserom.gba", 0x011B04, 0x000001C
 
-.include "data/scripts/gUnk_08011B20.inc"
+gUnk_08011B20:: @ 08011B20
+	.incbin "baserom.gba", 0x011B20, 0x0000020
 
-.include "data/scripts/gUnk_08011B40.inc"
+gUnk_08011B40:: @ 08011B40
+	.incbin "baserom.gba", 0x011B40, 0x00000A4
 
-.include "data/scripts/gUnk_08011BE4.inc"
+gUnk_08011BE4:: @ 08011BE4
+	.incbin "baserom.gba", 0x011BE4, 0x0000020
 
-.include "data/scripts/gUnk_08011C04.inc"
+gUnk_08011C04:: @ 08011C04
+	.incbin "baserom.gba", 0x011C04, 0x000004C
 
-.include "data/scripts/gUnk_08011C50.inc"
+gUnk_08011C50:: @ 08011C50
+	.incbin "baserom.gba", 0x011C50, 0x000002C
 
-.include "data/scripts/gUnk_08011C7C.inc"
+gUnk_08011C7C:: @ 08011C7C
+	.incbin "baserom.gba", 0x011C7C, 0x00000AC
 
-.include "data/scripts/gUnk_08011D28.inc"
+gUnk_08011D28:: @ 08011D28
+	.incbin "baserom.gba", 0x011D28, 0x00000AC
 
-.include "data/scripts/gUnk_08011DD4.inc"
+gUnk_08011DD4:: @ 08011DD4
+	.incbin "baserom.gba", 0x011DD4, 0x0000030
 
-.include "data/scripts/gUnk_08011E04.inc"
+gUnk_08011E04:: @ 08011E04
+	.incbin "baserom.gba", 0x011E04, 0x000007C
 
-.include "data/scripts/gUnk_08011E80.inc"
+gUnk_08011E80:: @ 08011E80
+	.incbin "baserom.gba", 0x011E80, 0x000008C
 
-.include "data/scripts/gUnk_08011F0C.inc"
+gUnk_08011F0C:: @ 08011F0C
+	.incbin "baserom.gba", 0x011F0C, 0x000008C
 
-.include "data/scripts/gUnk_08011F98.inc"
+gUnk_08011F98:: @ 08011F98
+	.incbin "baserom.gba", 0x011F98, 0x000008C
 
-.include "data/scripts/gUnk_08012024.inc"
+gUnk_08012024:: @ 08012024
+	.incbin "baserom.gba", 0x012024, 0x000006D
 
-.include "data/scripts/gUnk_08012091.inc"
+gUnk_08012091:: @ 08012091
+	.incbin "baserom.gba", 0x012091, 0x000001F
 
-.include "data/scripts/gUnk_080120B0.inc"
+gUnk_080120B0:: @ 080120B0
+	.incbin "baserom.gba", 0x0120B0, 0x000003D
 
-.include "data/scripts/gUnk_080120ED.inc"
+gUnk_080120ED:: @ 080120ED
+	.incbin "baserom.gba", 0x0120ED, 0x000000E
 
-.include "data/scripts/gUnk_080120FB.inc"
+gUnk_080120FB:: @ 080120FB
+	.incbin "baserom.gba", 0x0120FB, 0x0000041
 
-.include "data/scripts/gUnk_0801213C.inc"
+gUnk_0801213C:: @ 0801213C
+	.incbin "baserom.gba", 0x01213C, 0x000008C
 
-.include "data/scripts/gUnk_080121C8.inc"
+gUnk_080121C8:: @ 080121C8
+	.incbin "baserom.gba", 0x0121C8, 0x0000038
 
-.include "data/scripts/gUnk_08012200.inc"
+gUnk_08012200:: @ 08012200
+	.incbin "baserom.gba", 0x012200, 0x0000038
 
-.include "data/scripts/gUnk_08012238.inc"
+gUnk_08012238:: @ 08012238
+	.incbin "baserom.gba", 0x012238, 0x0000038
 
-.include "data/scripts/gUnk_08012270.inc"
+gUnk_08012270:: @ 08012270
+	.incbin "baserom.gba", 0x012270, 0x00000BC
 
-.include "data/scripts/gUnk_0801232C.inc"
+gUnk_0801232C:: @ 0801232C
+	.incbin "baserom.gba", 0x01232C, 0x0000034
 
-.include "data/scripts/gUnk_08012360.inc"
+gUnk_08012360:: @ 08012360
+	.incbin "baserom.gba", 0x012360, 0x00000B0
 
-.include "data/scripts/gUnk_08012410.inc"
+gUnk_08012410:: @ 08012410
+	.incbin "baserom.gba", 0x012410, 0x0000020
 
-.include "data/scripts/gUnk_08012430.inc"
+gUnk_08012430:: @ 08012430
+	.incbin "baserom.gba", 0x012430, 0x0000050
 
-.include "data/scripts/gUnk_08012480.inc"
+gUnk_08012480:: @ 08012480
+	.incbin "baserom.gba", 0x012480, 0x000027C
 
 
 .include "data/scripts/ezlo_angry.inc"
 
-.include "data/scripts/gUnk_08012AB0.inc"
+gUnk_08012AB0:: @ 08012AB0
+	.incbin "baserom.gba", 0x012AB0, 0x00000F8
 
-.include "data/scripts/gUnk_08012BA8.inc"
+gUnk_08012BA8:: @ 08012BA8
+	.incbin "baserom.gba", 0x012BA8, 0x0000050
 
-.include "data/scripts/gUnk_08012BF8.inc"
+gUnk_08012BF8:: @ 08012BF8
+	.incbin "baserom.gba", 0x012BF8, 0x0000014
 
-.include "data/scripts/gUnk_08012C0C.inc"
+gUnk_08012C0C:: @ 08012C0C
+	.incbin "baserom.gba", 0x012C0C, 0x000003C
 
-.include "data/scripts/gUnk_08012C48.inc"
+gUnk_08012C48:: @ 08012C48
+	.incbin "baserom.gba", 0x012C48, 0x0000050
 
-.include "data/scripts/gUnk_08012C98.inc"
+gUnk_08012C98:: @ 08012C98
+	.incbin "baserom.gba", 0x012C98, 0x0000040
 
-.include "data/scripts/gUnk_08012CD8.inc"
+gUnk_08012CD8:: @ 08012CD8
+	.incbin "baserom.gba", 0x012CD8, 0x0000040
 
-.include "data/scripts/gUnk_08012D18.inc"
+gUnk_08012D18:: @ 08012D18
+	.incbin "baserom.gba", 0x012D18, 0x0000058
 
-.include "data/scripts/gUnk_08012D70.inc"
+gUnk_08012D70:: @ 08012D70
+	.incbin "baserom.gba", 0x012D70, 0x0000031
 
-.include "data/scripts/gUnk_08012DA1.inc"
+gUnk_08012DA1:: @ 08012DA1
+	.incbin "baserom.gba", 0x012DA1, 0x000000F
 
-.include "data/scripts/gUnk_08012DB0.inc"
+gUnk_08012DB0:: @ 08012DB0
+	.incbin "baserom.gba", 0x012DB0, 0x0000028
 
-.include "data/scripts/gUnk_08012DD8.inc"
+gUnk_08012DD8:: @ 08012DD8
+	.incbin "baserom.gba", 0x012DD8, 0x0000048
 
-.include "data/scripts/gUnk_08012E20.inc"
+gUnk_08012E20:: @ 08012E20
+	.incbin "baserom.gba", 0x012E20, 0x0000024
 
-.include "data/scripts/gUnk_08012E44.inc"
+gUnk_08012E44:: @ 08012E44
+	.incbin "baserom.gba", 0x012E44, 0x0000044
 
-.include "data/scripts/gUnk_08012E88.inc"
+gUnk_08012E88:: @ 08012E88
+	.incbin "baserom.gba", 0x012E88, 0x0000038
 
-.include "data/scripts/gUnk_08012EC0.inc"
+gUnk_08012EC0:: @ 08012EC0
+	.incbin "baserom.gba", 0x012EC0, 0x000004C
 
-.include "data/scripts/gUnk_08012F0C.inc"
+gUnk_08012F0C:: @ 08012F0C
+	.incbin "baserom.gba", 0x012F0C, 0x00000F5
 
-.include "data/scripts/gUnk_08013001.inc"
+gUnk_08013001:: @ 08013001
+	.incbin "baserom.gba", 0x013001, 0x0000002
 
-.include "data/scripts/gUnk_08013003.inc"
+gUnk_08013003:: @ 08013003
+	.incbin "baserom.gba", 0x013003, 0x0000008
 
-.include "data/scripts/gUnk_0801300B.inc"
+gUnk_0801300B:: @ 0801300B
+	.incbin "baserom.gba", 0x01300B, 0x0000031
 
-.include "data/scripts/gUnk_0801303C.inc"
+gUnk_0801303C:: @ 0801303C
+	.incbin "baserom.gba", 0x01303C, 0x0000034
 
-.include "data/scripts/gUnk_08013070.inc"
+gUnk_08013070:: @ 08013070
+	.incbin "baserom.gba", 0x013070, 0x0000011
 
-.include "data/scripts/gUnk_08013081.inc"
+gUnk_08013081:: @ 08013081
+	.incbin "baserom.gba", 0x013081, 0x000000F
 
-.include "data/scripts/gUnk_08013090.inc"
+gUnk_08013090:: @ 08013090
+	.incbin "baserom.gba", 0x013090, 0x0000084
 
-.include "data/scripts/gUnk_08013114.inc"
+gUnk_08013114:: @ 08013114
+	.incbin "baserom.gba", 0x013114, 0x0000074
 
-.include "data/scripts/gUnk_08013188.inc"
+gUnk_08013188:: @ 08013188
+	.incbin "baserom.gba", 0x013188, 0x0000024
 
-.include "data/scripts/gUnk_080131AC.inc"
+gUnk_080131AC:: @ 080131AC
+	.incbin "baserom.gba", 0x0131AC, 0x0000138
 
-.include "data/scripts/gUnk_080132E4.inc"
+gUnk_080132E4:: @ 080132E4
+	.incbin "baserom.gba", 0x0132E4, 0x000004C
 
-.include "data/scripts/gUnk_08013330.inc"
+gUnk_08013330:: @ 08013330
+	.incbin "baserom.gba", 0x013330, 0x000001C
 
-.include "data/scripts/gUnk_0801334C.inc"
+gUnk_0801334C:: @ 0801334C
+	.incbin "baserom.gba", 0x01334C, 0x000002C
 
-.include "data/scripts/gUnk_08013378.inc"
+gUnk_08013378:: @ 08013378
+	.incbin "baserom.gba", 0x013378, 0x000004C
 
-.include "data/scripts/gUnk_080133C4.inc"
+gUnk_080133C4:: @ 080133C4
+	.incbin "baserom.gba", 0x0133C4, 0x0000034
 
-.include "data/scripts/gUnk_080133F8.inc"
+gUnk_080133F8:: @ 080133F8
+	.incbin "baserom.gba", 0x0133F8, 0x00000E4
 
-.include "data/scripts/gUnk_080134DC.inc"
+gUnk_080134DC:: @ 080134DC
+	.incbin "baserom.gba", 0x0134DC, 0x00001FC
 
-.include "data/scripts/gUnk_080136D8.inc"
+gUnk_080136D8:: @ 080136D8
+	.incbin "baserom.gba", 0x0136D8, 0x0000048
 
-.include "data/scripts/gUnk_08013720.inc"
+gUnk_08013720:: @ 08013720
+	.incbin "baserom.gba", 0x013720, 0x00000BA
 
-.include "data/scripts/gUnk_080137DA.inc"
+gUnk_080137DA:: @ 080137DA
+	.incbin "baserom.gba", 0x0137DA, 0x00000DA
 
-.include "data/scripts/gUnk_080138B4.inc"
+gUnk_080138B4:: @ 080138B4
+	.incbin "baserom.gba", 0x0138B4, 0x0000264
 
-.include "data/scripts/gUnk_08013B18.inc"
+gUnk_08013B18:: @ 08013B18
+	.incbin "baserom.gba", 0x013B18, 0x0000058
 
-.include "data/scripts/gUnk_08013B70.inc"
+gUnk_08013B70:: @ 08013B70
+	.incbin "baserom.gba", 0x013B70, 0x0000038
 
-.include "data/scripts/gUnk_08013BA8.inc"
+gUnk_08013BA8:: @ 08013BA8
+	.incbin "baserom.gba", 0x013BA8, 0x0000040
 
-.include "data/scripts/gUnk_08013BE8.inc"
+gUnk_08013BE8:: @ 08013BE8
+	.incbin "baserom.gba", 0x013BE8, 0x00000BC
 
-.include "data/scripts/gUnk_08013CA4.inc"
+gUnk_08013CA4:: @ 08013CA4
+	.incbin "baserom.gba", 0x013CA4, 0x0000160
 
-.include "data/scripts/gUnk_08013E04.inc"
+gUnk_08013E04:: @ 08013E04
+	.incbin "baserom.gba", 0x013E04, 0x0000048
 
-.include "data/scripts/gUnk_08013E4C.inc"
+gUnk_08013E4C:: @ 08013E4C
+	.incbin "baserom.gba", 0x013E4C, 0x0000024
 
-.include "data/scripts/gUnk_08013E70.inc"
+gUnk_08013E70:: @ 08013E70
+	.incbin "baserom.gba", 0x013E70, 0x0000024
 
-.include "data/scripts/gUnk_08013E94.inc"
+gUnk_08013E94:: @ 08013E94
+	.incbin "baserom.gba", 0x013E94, 0x000001C
 
-.include "data/scripts/gUnk_08013EB0.inc"
+gUnk_08013EB0:: @ 08013EB0
+	.incbin "baserom.gba", 0x013EB0, 0x000001C
 
-.include "data/scripts/gUnk_08013ECC.inc"
+gUnk_08013ECC:: @ 08013ECC
+	.incbin "baserom.gba", 0x013ECC, 0x000001C
 
-.include "data/scripts/gUnk_08013EE8.inc"
+gUnk_08013EE8:: @ 08013EE8
+	.incbin "baserom.gba", 0x013EE8, 0x000001C
 
-.include "data/scripts/gUnk_08013F04.inc"
+gUnk_08013F04:: @ 08013F04
+	.incbin "baserom.gba", 0x013F04, 0x0000030
 
-.include "data/scripts/gUnk_08013F34.inc"
+gUnk_08013F34:: @ 08013F34
+	.incbin "baserom.gba", 0x013F34, 0x0000030
 
-.include "data/scripts/gUnk_08013F64.inc"
+gUnk_08013F64:: @ 08013F64
+	.incbin "baserom.gba", 0x013F64, 0x0000030
 
-.include "data/scripts/gUnk_08013F94.inc"
+gUnk_08013F94:: @ 08013F94
+	.incbin "baserom.gba", 0x013F94, 0x0000054
 
-.include "data/scripts/gUnk_08013FE8.inc"
+gUnk_08013FE8:: @ 08013FE8
+	.incbin "baserom.gba", 0x013FE8, 0x000006C
 
-.include "data/scripts/gUnk_08014054.inc"
+gUnk_08014054:: @ 08014054
+	.incbin "baserom.gba", 0x014054, 0x0000020
 
-.include "data/scripts/gUnk_08014074.inc"
+gUnk_08014074:: @ 08014074
+	.incbin "baserom.gba", 0x014074, 0x0000020
 
-.include "data/scripts/gUnk_08014094.inc"
+gUnk_08014094:: @ 08014094
+	.incbin "baserom.gba", 0x014094, 0x0000048
 
-.include "data/scripts/gUnk_080140DC.inc"
+gUnk_080140DC:: @ 080140DC
+	.incbin "baserom.gba", 0x0140DC, 0x000001C
 
-.include "data/scripts/gUnk_080140F8.inc"
+gUnk_080140F8:: @ 080140F8
+	.incbin "baserom.gba", 0x0140F8, 0x0000020
 
-.include "data/scripts/gUnk_08014118.inc"
+gUnk_08014118:: @ 08014118
+	.incbin "baserom.gba", 0x014118, 0x000003C
 
-.include "data/scripts/gUnk_08014154.inc"
+gUnk_08014154:: @ 08014154
+	.incbin "baserom.gba", 0x014154, 0x0000088
 
-.include "data/scripts/gUnk_080141DC.inc"
+gUnk_080141DC:: @ 080141DC
+	.incbin "baserom.gba", 0x0141DC, 0x0000034
 
-.include "data/scripts/gUnk_08014210.inc"
+gUnk_08014210:: @ 08014210
+	.incbin "baserom.gba", 0x014210, 0x0000064
 
-.include "data/scripts/gUnk_08014274.inc"
+gUnk_08014274:: @ 08014274
+	.incbin "baserom.gba", 0x014274, 0x000003C
 
-.include "data/scripts/gUnk_080142B0.inc"
+gUnk_080142B0:: @ 080142B0
+	.incbin "baserom.gba", 0x0142B0, 0x00000D4
 
-.include "data/scripts/gUnk_08014384.inc"
+gUnk_08014384:: @ 08014384
+	.incbin "baserom.gba", 0x014384, 0x000003C
 
-.include "data/scripts/gUnk_080143C0.inc"
+gUnk_080143C0:: @ 080143C0
+	.incbin "baserom.gba", 0x0143C0, 0x0000042
 
-.include "data/scripts/gUnk_08014402.inc"
+gUnk_08014402:: @ 08014402
+	.incbin "baserom.gba", 0x014402, 0x000004E
 
-.include "data/scripts/gUnk_08014450.inc"
+gUnk_08014450:: @ 08014450
+	.incbin "baserom.gba", 0x014450, 0x00000BC
 
-.include "data/scripts/gUnk_0801450C.inc"
+gUnk_0801450C:: @ 0801450C
+	.incbin "baserom.gba", 0x01450C, 0x000003C
 
-.include "data/scripts/gUnk_08014548.inc"
+gUnk_08014548:: @ 08014548
+	.incbin "baserom.gba", 0x014548, 0x0000058
 
-.include "data/scripts/gUnk_080145A0.inc"
+gUnk_080145A0:: @ 080145A0
+	.incbin "baserom.gba", 0x0145A0, 0x0000010
 
-.include "data/scripts/gUnk_080145B0.inc"
+gUnk_080145B0:: @ 080145B0
+	.incbin "baserom.gba", 0x0145B0, 0x0000038
 
-.include "data/scripts/gUnk_080145E8.inc"
+gUnk_080145E8:: @ 080145E8
+	.incbin "baserom.gba", 0x0145E8, 0x0000040
 
-.include "data/scripts/gUnk_08014628.inc"
+gUnk_08014628:: @ 08014628
+	.incbin "baserom.gba", 0x014628, 0x00001DC
 
-.include "data/scripts/gUnk_08014804.inc"
+gUnk_08014804:: @ 08014804
+	.incbin "baserom.gba", 0x014804, 0x00000EC
 
-.include "data/scripts/gUnk_080148F0.inc"
+gUnk_080148F0:: @ 080148F0
+	.incbin "baserom.gba", 0x0148F0, 0x0000068
 
-.include "data/scripts/gUnk_08014958.inc"
+gUnk_08014958:: @ 08014958
+	.incbin "baserom.gba", 0x014958, 0x000003C
 
-.include "data/scripts/gUnk_08014994.inc"
+gUnk_08014994:: @ 08014994
+	.incbin "baserom.gba", 0x014994, 0x0000038
 
-.include "data/scripts/gUnk_080149CC.inc"
+gUnk_080149CC:: @ 080149CC
+	.incbin "baserom.gba", 0x0149CC, 0x000005C
 
-.include "data/scripts/gUnk_08014A28.inc"
+gUnk_08014A28:: @ 08014A28
+	.incbin "baserom.gba", 0x014A28, 0x000002C
 
-.include "data/scripts/gUnk_08014A54.inc"
+gUnk_08014A54:: @ 08014A54
+	.incbin "baserom.gba", 0x014A54, 0x000002C
 
-.include "data/scripts/gUnk_08014A80.inc"
+gUnk_08014A80:: @ 08014A80
+	.incbin "baserom.gba", 0x014A80, 0x0000044
 
-.include "data/scripts/gUnk_08014AC4.inc"
+gUnk_08014AC4:: @ 08014AC4
+	.incbin "baserom.gba", 0x014AC4, 0x0000070
 
-.include "data/scripts/gUnk_08014B34.inc"
+gUnk_08014B34:: @ 08014B34
+	.incbin "baserom.gba", 0x014B34, 0x00000F8
 
-.include "data/scripts/gUnk_08014C2C.inc"
+gUnk_08014C2C:: @ 08014C2C
+	.incbin "baserom.gba", 0x014C2C, 0x0000068
 
-.include "data/scripts/gUnk_08014C94.inc"
+gUnk_08014C94:: @ 08014C94
+	.incbin "baserom.gba", 0x014C94, 0x0000048
 
-.include "data/scripts/gUnk_08014CDC.inc"
+gUnk_08014CDC:: @ 08014CDC
+	.incbin "baserom.gba", 0x014CDC, 0x00000F0
 
-.include "data/scripts/gUnk_08014DCC.inc"
+gUnk_08014DCC:: @ 08014DCC
+	.incbin "baserom.gba", 0x014DCC, 0x0000048
 
-.include "data/scripts/gUnk_08014E14.inc"
+gUnk_08014E14:: @ 08014E14
+	.incbin "baserom.gba", 0x014E14, 0x000003C
 
-.include "data/scripts/gUnk_08014E50.inc"
+gUnk_08014E50:: @ 08014E50
+	.incbin "baserom.gba", 0x014E50, 0x000007C
 
-.include "data/scripts/gUnk_08014ECC.inc"
+gUnk_08014ECC:: @ 08014ECC
+	.incbin "baserom.gba", 0x014ECC, 0x000002C
 
-.include "data/scripts/gUnk_08014EF8.inc"
+gUnk_08014EF8:: @ 08014EF8
+	.incbin "baserom.gba", 0x014EF8, 0x0000038
 
-.include "data/scripts/gUnk_08014F30.inc"
+gUnk_08014F30:: @ 08014F30
+	.incbin "baserom.gba", 0x014F30, 0x000008C
 
-.include "data/scripts/gUnk_08014FBC.inc"
+gUnk_08014FBC:: @ 08014FBC
+	.incbin "baserom.gba", 0x014FBC, 0x0000045
 
-.include "data/scripts/gUnk_08015001.inc"
+gUnk_08015001:: @ 08015001
+	.incbin "baserom.gba", 0x015001, 0x0000086
 
-.include "data/scripts/gUnk_08015087.inc"
+gUnk_08015087:: @ 08015087
+	.incbin "baserom.gba", 0x015087, 0x0000068
 
-.include "data/scripts/gUnk_080150EF.inc"
+gUnk_080150EF:: @ 080150EF
+	.incbin "baserom.gba", 0x0150EF, 0x0000145
 
-.include "data/scripts/gUnk_08015234.inc"
+gUnk_08015234:: @ 08015234
+	.incbin "baserom.gba", 0x015234, 0x0000080
 
-.include "data/scripts/gUnk_080152B4.inc"
+gUnk_080152B4:: @ 080152B4
+	.incbin "baserom.gba", 0x0152B4, 0x00000DC
 
-.include "data/scripts/gUnk_08015390.inc"
+gUnk_08015390:: @ 08015390
+	.incbin "baserom.gba", 0x015390, 0x000005C
 
-.include "data/scripts/gUnk_080153EC.inc"
+gUnk_080153EC:: @ 080153EC
+	.incbin "baserom.gba", 0x0153EC, 0x0000120
 
-.include "data/scripts/gUnk_0801550C.inc"
+gUnk_0801550C:: @ 0801550C
+	.incbin "baserom.gba", 0x01550C, 0x000010C
 
-.include "data/scripts/gUnk_08015618.inc"
+gUnk_08015618:: @ 08015618
+	.incbin "baserom.gba", 0x015618, 0x000006C
 
-.include "data/scripts/gUnk_08015684.inc"
+gUnk_08015684:: @ 08015684
+	.incbin "baserom.gba", 0x015684, 0x000001C
 
-.include "data/scripts/gUnk_080156A0.inc"
+gUnk_080156A0:: @ 080156A0
+	.incbin "baserom.gba", 0x0156A0, 0x00000B4
 
-.include "data/scripts/gUnk_08015754.inc"
+gUnk_08015754:: @ 08015754
+	.incbin "baserom.gba", 0x015754, 0x0000058
 
-.include "data/scripts/gUnk_080157AC.inc"
+gUnk_080157AC:: @ 080157AC
+	.incbin "baserom.gba", 0x0157AC, 0x000014C
 
-.include "data/scripts/gUnk_080158F8.inc"
+gUnk_080158F8:: @ 080158F8
+	.incbin "baserom.gba", 0x0158F8, 0x0000040
 
-.include "data/scripts/gUnk_08015938.inc"
+gUnk_08015938:: @ 08015938
+	.incbin "baserom.gba", 0x015938, 0x0000020
 
-.include "data/scripts/gUnk_08015958.inc"
+gUnk_08015958:: @ 08015958
+	.incbin "baserom.gba", 0x015958, 0x000016C
 
-.include "data/scripts/gUnk_08015AC4.inc"
+gUnk_08015AC4:: @ 08015AC4
+	.incbin "baserom.gba", 0x015AC4, 0x0000050
 
-.include "data/scripts/gUnk_08015B14.inc"
+gUnk_08015B14:: @ 08015B14
+	.incbin "baserom.gba", 0x015B14, 0x0000020
 
-.include "data/scripts/gUnk_08015B34.inc"
+gUnk_08015B34:: @ 08015B34
+	.incbin "baserom.gba", 0x015B34, 0x0000050
 
-.include "data/scripts/gUnk_08015B84.inc"
+gUnk_08015B84:: @ 08015B84
+	.incbin "baserom.gba", 0x015B84, 0x0000024
 
-.include "data/scripts/gUnk_08015BA8.inc"
+gUnk_08015BA8:: @ 08015BA8
+	.incbin "baserom.gba", 0x015BA8, 0x0000040
 
-.include "data/scripts/gUnk_08015BE8.inc"
+gUnk_08015BE8:: @ 08015BE8
+	.incbin "baserom.gba", 0x015BE8, 0x00000EC
 
-.include "data/scripts/gUnk_08015CD4.inc"
+gUnk_08015CD4:: @ 08015CD4
+	.incbin "baserom.gba", 0x015CD4, 0x000011C
 
-.include "data/scripts/gUnk_08015DF0.inc"
+gUnk_08015DF0:: @ 08015DF0
+	.incbin "baserom.gba", 0x015DF0, 0x0000068
 
-.include "data/scripts/gUnk_08015E58.inc"
+gUnk_08015E58:: @ 08015E58
+	.incbin "baserom.gba", 0x015E58, 0x00000B0
 
-.include "data/scripts/gUnk_08015F08.inc"
+gUnk_08015F08:: @ 08015F08
+	.incbin "baserom.gba", 0x015F08, 0x0000034
 
-.include "data/scripts/gUnk_08015F3C.inc"
+gUnk_08015F3C:: @ 08015F3C
+	.incbin "baserom.gba", 0x015F3C, 0x0000068
 
-.include "data/scripts/gUnk_08015FA4.inc"
+gUnk_08015FA4:: @ 08015FA4
+	.incbin "baserom.gba", 0x015FA4, 0x000001C
 
-.include "data/scripts/gUnk_08015FC0.inc"
+gUnk_08015FC0:: @ 08015FC0
+	.incbin "baserom.gba", 0x015FC0, 0x0000061
 
-.include "data/scripts/gUnk_08016021.inc"
+gUnk_08016021:: @ 08016021
+	.incbin "baserom.gba", 0x016021, 0x000000F
 
 .include "data/scripts/npc4e_fusion.inc"
 
-.include "data/scripts/gUnk_0801606C.inc"
+gUnk_0801606C:: @ 0801606C
+	.incbin "baserom.gba", 0x01606C, 0x000003C
 
-.include "data/scripts/gUnk_080160A8.inc"
+gUnk_080160A8:: @ 080160A8
+	.incbin "baserom.gba", 0x0160A8, 0x0000042
 
-.include "data/scripts/gUnk_080160EA.inc"
+gUnk_080160EA:: @ 080160EA
+	.incbin "baserom.gba", 0x0160EA, 0x0000052
 
-.include "data/scripts/gUnk_0801613C.inc"
+gUnk_0801613C:: @ 0801613C
+	.incbin "baserom.gba", 0x01613C, 0x0000054
 
-.include "data/scripts/gUnk_08016190.inc"
+gUnk_08016190:: @ 08016190
+	.incbin "baserom.gba", 0x016190, 0x0000058
 
-.include "data/scripts/gUnk_080161E8.inc"
+gUnk_080161E8:: @ 080161E8
+	.incbin "baserom.gba", 0x0161E8, 0x0000174
 
-.include "data/scripts/gUnk_0801635C.inc"
+gUnk_0801635C:: @ 0801635C
+	.incbin "baserom.gba", 0x01635C, 0x0000021
 
-.include "data/scripts/gUnk_0801637D.inc"
+gUnk_0801637D:: @ 0801637D
+	.incbin "baserom.gba", 0x01637D, 0x0000007
 
-.include "data/scripts/gUnk_08016384.inc"
+gUnk_08016384:: @ 08016384
+	.incbin "baserom.gba", 0x016384, 0x0000084
 
-.include "data/scripts/gUnk_08016408.inc"
+gUnk_08016408:: @ 08016408
+	.incbin "baserom.gba", 0x016408, 0x00001F0
 
-.include "data/scripts/gUnk_080165F8.inc"
+gUnk_080165F8:: @ 080165F8
+	.incbin "baserom.gba", 0x0165F8, 0x0000014
 
-.include "data/scripts/gUnk_0801660C.inc"
+gUnk_0801660C:: @ 0801660C
+	.incbin "baserom.gba", 0x01660C, 0x000001C
 
-.include "data/scripts/gUnk_08016628.inc"
+gUnk_08016628:: @ 08016628
+	.incbin "baserom.gba", 0x016628, 0x000001C
 
-.include "data/scripts/gUnk_08016644.inc"
+gUnk_08016644:: @ 08016644
+	.incbin "baserom.gba", 0x016644, 0x0000028
 
-.include "data/scripts/gUnk_0801666C.inc"
+gUnk_0801666C:: @ 0801666C
+	.incbin "baserom.gba", 0x01666C, 0x000004C
 
-.include "data/scripts/gUnk_080166B8.inc"
+gUnk_080166B8:: @ 080166B8
+	.incbin "baserom.gba", 0x0166B8, 0x0000044
 
-.include "data/scripts/gUnk_080166FC.inc"
+gUnk_080166FC:: @ 080166FC
+	.incbin "baserom.gba", 0x0166FC, 0x000009C
 
-.include "data/scripts/gUnk_08016798.inc"
+gUnk_08016798:: @ 08016798
+	.incbin "baserom.gba", 0x016798, 0x00000AC
 
-.include "data/scripts/gUnk_08016844.inc"
+gUnk_08016844:: @ 08016844
+	.incbin "baserom.gba", 0x016844, 0x000009C
 
-.include "data/scripts/gUnk_080168E0.inc"
+gUnk_080168E0:: @ 080168E0
+	.incbin "baserom.gba", 0x0168E0, 0x0000014
 
-.include "data/scripts/gUnk_080168F4.inc"
+gUnk_080168F4:: @ 080168F4
+	.incbin "baserom.gba", 0x0168F4, 0x0000090
diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc
index fac9d78b..01270dfa 100644
--- a/data/scripts/ezlo_angry.inc
+++ b/data/scripts/ezlo_angry.inc
@@ -35,18 +35,18 @@ Call sub_0807F3C8
 TextboxNoOverlapFollowPos 0x1106,0x000c
 _0807EA94 
 _0807E930 0x001c
-Call sub_0806D96C // Ezlo Angry FX 
+Call sub_0806D96C @ Ezlo Angry FX 
 TextboxNoOverlapFollowPos 0x1107,0x000c
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
-Call sub_0807F3C8 // Ezlo Angry FX 
+Call sub_0807F3C8 @ Ezlo Angry FX 
 TextboxNoOverlapFollowPos 0x1108,0x000c
 _0807EA94 
 _0807E930 0x001c
-Call sub_0806D96C// Ezlo Angry FX 
+Call sub_0806D96C @ Ezlo Angry FX 
 TextboxNoOverlapFollowPos 0x1109,0x000c
 _0807EA94 
 _0807E930 0x0020
@@ -61,7 +61,7 @@ CheckEntityInteractType
 JumpIfNot 0xfff0
 StopScript 
 _0807E864 
-Call sub_0806D944  // Ezlo look at player
+Call sub_0806D944  @ Ezlo look at player
 _0807E930 0x0010
 TextboxNoOverlapFollowPos 0x1114,0x000c
 _0807EA94 
@@ -78,7 +78,7 @@ WaitForSomething2 0x00000004
 _0807EF80 0x000b
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
-Call sub_0806D944// Ezlo look at player
+Call sub_0806D944 @ Ezlo look at player
 _0807E930 0x0010
 TextboxNoOverlapFollowPos 0x110a,0x000c
 _0807EA94 
@@ -118,7 +118,7 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 StopScript 
 StartScript 
-Call sub_0806D944 // Ezlo look at player
+Call sub_0806D944 @ Ezlo look at player
 CheckEntityInteractType 
 JumpIf 0x000e
 CheckPlayerInRegion2 0x3030
@@ -137,7 +137,7 @@ _0807E864
 Call sub_0807F9A4
 Call sub_0807DF28
 _0807EB8C 
-Call sub_0806D944 // Ezlo look at player
+Call sub_0806D944 @ Ezlo look at player
 _0807E930 0x0010
 TextboxNoOverlapFollowPos 0x110f,0x000c
 _0807E930 0x0018
@@ -151,7 +151,7 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 StopScript 
 StartScript 
-Call sub_0806D944 // Ezlo look at player
+Call sub_0806D944 @ Ezlo look at player
 CheckEntityInteractType 
 JumpIf 0x000e
 CheckPlayerInRegion2 0x3030
@@ -170,7 +170,7 @@ _0807E864
 Call sub_0807F9A4 
 Call sub_0807DF28 
 _0807EB8C 
-Call sub_0806D944  // Ezlo look at player
+Call sub_0806D944  @ Ezlo look at player
 _0807E930 0x0010
 TextboxNoOverlapFollowPos 0x1110,0x000c
 _0807E930 0x0018
@@ -185,7 +185,7 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 StopScript 
 StartScript 
-Call sub_0806D944  // Ezlo look at player
+Call sub_0806D944  @ Ezlo look at player
 CheckEntityInteractType 
 JumpIf 0x000e
 CheckPlayerInRegion2 0x3030
@@ -206,7 +206,7 @@ Call sub_0807DF28
 SoundReq0x80100000 
 _0807EF80 0x000b
 _0807EB8C 
-Call sub_0806D944  // Ezlo look at player
+Call sub_0806D944  @ Ezlo look at player
 _0807E930 0x0010
 TextboxNoOverlapFollowPos 0x1111,0x000c
 _0807E930 0x0018
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc
index d60f2088..72bad7bf 100644
--- a/data/scripts/gUnk_08008B5C.inc
+++ b/data/scripts/gUnk_08008B5C.inc
@@ -8,10 +8,127 @@ StopScript
 _0807E944 
 _0807E864 
 _0807E930 0x0004
-Call sub_0807F2D4
-Call sub_0806BBB0
+Call 0x0807f2d5
+Call 0x0806bbb1
 _0807EA94 
 _0807E930 0x0008
 _0807E878 
 Jump 0xffe2
 .short 0x0000
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+_0807E930 0x0004
+Call 0x0807f2d5
+TextboxNoOverlapFollow 0x4912
+_0807EA94 
+_0807E930 0x0008
+_0807E878 
+Jump 0xffe4
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+SetGlobalFlag 0x0061
+_0807E930 0x0004
+Call 0x0807f2d5
+_0807EA94 
+Call 0x0806ba35
+JumpIfNot 0x0066
+_0807EA94 
+CallWithArg
+.short 0xbb1d
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f2d5
+CallWithArg
+.short 0xbb1d
+.short 0x0806
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806bb7d
+JumpIfNot 0x0048
+TextboxNoOverlap 0x490c
+_0807EA94 
+LoadRoomEntityList 0x080d6784
+WaitForSomething 0x00000001
+WaitForSomething 0x00000004
+Wait 0x000f
+SoundReq 0x0072
+_0807E930 0x0004
+Call 0x0807f2d5
+TextboxNoOverlap 0x4913
+_0807EA94 
+_0807E930 0x0008
+Call 0x0807f2d5
+Jump 0x000a
+_0807E930 0x0008
+Wait 0x000f
+_0807EA94 
+_0807E878 
+Jump 0xff70
+StartScript 
+SetEntityPositionRelative 0x00180068
+_0807EF80 0x000f
+_0807EB44 0x0004
+_0807E930 0x0004
+SetEntityNonPlanarMovement 0x0300
+SoundReq 0x0121
+StopScript 
+WaitForSomething 0x00000002
+TextboxNoOverlap 0x490d
+_0807EA94 
+_0807EF80 0x0007
+Call 0x08064d09
+_0807EDD4 0x0068, 0x0078
+Call 0x08064d11
+Wait 0x000f
+_0807EB44 0x0002
+Wait 0x000f
+Call 0x08064d09
+_0807EDD4 0x0098, 0x0078
+Call 0x08064d11
+Wait 0x000f
+_0807EB44 0x0004
+SoundReq 0x007f
+Wait 0x000f
+_0807EB44 0x0002
+_0807EDD4 0x00ac, 0x0078
+Wait 0x000f
+_0807EB44 0x0004
+SoundReq 0x007f
+Wait 0x000f
+_0807EB44 0x0002
+_0807EDD4 0x00c0, 0x0078
+Wait 0x000f
+_0807EB44 0x0004
+SoundReq 0x007f
+Wait 0x000f
+_0807EB44 0x0006
+Wait 0x001e
+Call 0x08064d09
+_0807EDD4 0x0068, 0x0078
+Call 0x08064d11
+Wait 0x000f
+_0807EB44 0x0000
+Wait 0x000f
+Call 0x08064d09
+_0807EDD4 0x0068, 0x0018
+Call 0x08064d11
+SoundReq 0x0121
+_0807E5F8 0x00000001
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08008B90.inc b/data/scripts/gUnk_08008B90.inc
deleted file mode 100644
index 6466fc32..00000000
--- a/data/scripts/gUnk_08008B90.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08008B90
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-_0807E930 0x0004
-Call sub_0807F2D4
-TextboxNoOverlapFollow 0x4912
-_0807EA94 
-_0807E930 0x0008
-_0807E878 
-.short 0x0803
-.short 0xffe4
diff --git a/data/scripts/gUnk_08008BC0.inc b/data/scripts/gUnk_08008BC0.inc
deleted file mode 100644
index 51a2ba13..00000000
--- a/data/scripts/gUnk_08008BC0.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SCRIPT_START gUnk_08008BC0
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-SetGlobalFlag 0x0061
-_0807E930 0x0004
-Call sub_0807F2D4
-_0807EA94 
-Call sub_0806BA34
-JumpIfNot 0x0066
-_0807EA94 
-CallWithArg sub_0806BB1C, 0x00000000
-Call sub_0807F2D4
-CallWithArg sub_0806BB1C, 0x00000001
-Call sub_0806BB7C
-JumpIfNot 0x0048
-TextboxNoOverlap 0x490c
-_0807EA94 
-LoadRoomEntityList 0x080d6784
-WaitForSomething 0x00000001
-WaitForSomething 0x00000004
-Wait 0x000f
-SoundReq 0x0072
-_0807E930 0x0004
-Call sub_0807F2D4
-TextboxNoOverlap 0x4913
-_0807EA94 
-_0807E930 0x0008
-.short 0x0c0b
-.short 0xf2d5
diff --git a/data/scripts/gUnk_08008C4E.inc b/data/scripts/gUnk_08008C4E.inc
deleted file mode 100644
index d3e0563b..00000000
--- a/data/scripts/gUnk_08008C4E.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08008C4E
-.short 0x0807
-.short 0x0803
-.short 0x000a
-.short 0x0850
-.short 0x0008
-.short 0x0831
-.short 0x000f
-.short 0x0459
-.short 0x0444
-.short 0x0803
-.short 0xff70
diff --git a/data/scripts/gUnk_08008C64.inc b/data/scripts/gUnk_08008C64.inc
deleted file mode 100644
index fd75474f..00000000
--- a/data/scripts/gUnk_08008C64.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08008C64
-StartScript 
-SetEntityPositionRelative 0x00180068
-.byte 0x79
diff --git a/data/scripts/gUnk_08008C6D.inc b/data/scripts/gUnk_08008C6D.inc
deleted file mode 100644
index 28bd166a..00000000
--- a/data/scripts/gUnk_08008C6D.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_08008C6D
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x3
-.byte 0x7b
-.byte 0x8
diff --git a/data/scripts/gUnk_08008C7E.inc b/data/scripts/gUnk_08008C7E.inc
deleted file mode 100644
index 022e1d38..00000000
--- a/data/scripts/gUnk_08008C7E.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-SCRIPT_START gUnk_08008C7E
-.byte 0x21
-.byte 0x1
-.byte 0x2
-.byte 0x4
-.byte 0x32
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0xd
-.byte 0x49
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x9
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x73
-.byte 0xc
-.byte 0x68
-.byte 0x0
-.byte 0x78
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x9
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x73
-.byte 0xc
-.byte 0x98
diff --git a/data/scripts/gUnk_08008CB9.inc b/data/scripts/gUnk_08008CB9.inc
deleted file mode 100644
index 20ff7526..00000000
--- a/data/scripts/gUnk_08008CB9.inc
+++ /dev/null
@@ -1,152 +0,0 @@
-SCRIPT_START gUnk_08008CB9
-.byte 0x0
-.byte 0x78
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x7f
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xac
-.byte 0x0
-.byte 0x78
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x7f
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xc0
-.byte 0x0
-.byte 0x78
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x7f
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x9
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x73
-.byte 0xc
-.byte 0x68
-.byte 0x0
-.byte 0x78
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x9
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x73
-.byte 0xc
-.byte 0x68
-.byte 0x0
-.byte 0x18
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0x4d
-.byte 0x6
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0x21
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc
index dc7c641f..0cc0f291 100644
--- a/data/scripts/gUnk_08008D8C.inc
+++ b/data/scripts/gUnk_08008D8C.inc
@@ -1,16 +1,125 @@
 SCRIPT_START gUnk_08008D8C
 StartScript 
-Call sub_08061FD8
-Call sub_08061E70
+Call 0x08061fd9
+Call 0x08061e71
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_08061FD8
-Call sub_08062048
+Call 0x08061fd9
+Call 0x08062049
 _0807EA94 
 _0807E878 
 Jump 0xffe4
 .short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x080643d9
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffd2
+StartScript 
+SetEntityPositionRelative 0x00780088
+StopScript 
+CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+_0807F0B4 0x0001
+CameraTargetEntity 
+WaitForPlayerAction0x17 
+Wait 0x003c
+StartPlayerScript 0x08008f74
+WaitForSomething2 0x00000020
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Wait 0x003c
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Wait 0x000f
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollowPos
+.short 0x1053
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807F034 0x0035
+WaitPlayerAction8 
+StartPlayerScript 0x08008fc0
+WaitForSomething2 0x00000020
+_0807E8E4_0 
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000010
+Wait 0x0078
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807E8E4_1 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807F034 0x0047
+WaitPlayerAction8 
+_0807E914 0x00000003
+Call 0x0807f421
+_0807E8E4_0 
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetGlobalFlag 0x0015
+Call 0x0806dcc1
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08008DC0.inc b/data/scripts/gUnk_08008DC0.inc
deleted file mode 100644
index e00bb2ff..00000000
--- a/data/scripts/gUnk_08008DC0.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08008DC0
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-Call sub_080643D8
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-.short 0x0803
-.short 0xffd2
diff --git a/data/scripts/gUnk_08008E08.inc b/data/scripts/gUnk_08008E08.inc
deleted file mode 100644
index 62659dc7..00000000
--- a/data/scripts/gUnk_08008E08.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08008E08
-StartScript 
diff --git a/data/scripts/gUnk_08008E0A.inc b/data/scripts/gUnk_08008E0A.inc
deleted file mode 100644
index 7e94dd41..00000000
--- a/data/scripts/gUnk_08008E0A.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-SCRIPT_START gUnk_08008E0A
-SetEntityPositionRelative 0x00780088
-StopScript 
-CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807F0B4 0x0001
-CameraTargetEntity 
-WaitForPlayerAction0x17 
-Wait 0x003c
-StartPlayerScript 0x08008f74
-WaitForSomething2 0x00000020
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Wait 0x003c
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Wait 0x000f
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos 0x1053, 0x000e
-_0807EA94 
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807F034 0x0035
-WaitPlayerAction8 
-StartPlayerScript 0x08008fc0
-WaitForSomething2 0x00000020
-_0807E8E4_0 
-_0807E5F8 0x00000080
-.short 0x0c33
diff --git a/data/scripts/gUnk_08008F0C.inc b/data/scripts/gUnk_08008F0C.inc
deleted file mode 100644
index a4861020..00000000
--- a/data/scripts/gUnk_08008F0C.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08008F0C
-.short 0x0100
-.short 0x0000
-.short 0x0c28
-.short 0x0010
-.short 0x0000
diff --git a/data/scripts/gUnk_08008F16.inc b/data/scripts/gUnk_08008F16.inc
deleted file mode 100644
index ad605c23..00000000
--- a/data/scripts/gUnk_08008F16.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08008F16
-Wait 0x0078
-_0807E5F8 0x00000080
-.short 0x0c33
-.short 0x0100
-.short 0x0000
diff --git a/data/scripts/gUnk_08008F26.inc b/data/scripts/gUnk_08008F26.inc
deleted file mode 100644
index 3919213d..00000000
--- a/data/scripts/gUnk_08008F26.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_08008F26
-_0807E8E4_1 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807F034 0x0047
-WaitPlayerAction8 
-_0807E914 0x00000003
-Call sub_0807F420
-_0807E8E4_0 
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetGlobalFlag 0x0015
-Call sub_0806DCC0
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x00b8
-.short 0x0090
-.short 0x0861
-.short 0x0006
-.short 0x0879
-.short 0x0000
-.short 0x0c28
diff --git a/data/scripts/gUnk_08008F74.inc b/data/scripts/gUnk_08008F74.inc
new file mode 100644
index 00000000..6f668430
--- /dev/null
+++ b/data/scripts/gUnk_08008F74.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08008F74
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x00b8, 0x0090
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000040
+_0807EF80 0x0001
+_0807EDD4 0x0088, 0x0078
+_0807EB44 0x0000
+_0807EF80 0x0000
+Wait 0x000f
+_0807E5F8 0x00000020
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08008F90.inc b/data/scripts/gUnk_08008F90.inc
deleted file mode 100644
index 90b432cd..00000000
--- a/data/scripts/gUnk_08008F90.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SCRIPT_START gUnk_08008F90
-.short 0x0020
-.short 0x0000
-.short 0x0c33
-.short 0x0040
-.short 0x0000
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x0088
-.short 0x0078
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0831
-.short 0x000f
-.short 0x0c28
-.short 0x0020
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc
index 9f53cce2..48226d21 100644
--- a/data/scripts/gUnk_08008FC0.inc
+++ b/data/scripts/gUnk_08008FC0.inc
@@ -1,4 +1,25 @@
 SCRIPT_START gUnk_08008FC0
 _0807F078 0x0001, 0x0001
-CallWithArg sub_0807F918, 0x00000001
-.byte 0x7b
+CallWithArg
+.short 0xf919
+.short 0x0807
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x0109
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x045f
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f305
+TextboxNoOverlapFollowPos
+.short 0x0501
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000020
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08008FD1.inc b/data/scripts/gUnk_08008FD1.inc
deleted file mode 100644
index 91ec5f96..00000000
--- a/data/scripts/gUnk_08008FD1.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-SCRIPT_START gUnk_08008FD1
-.byte 0x8
-.byte 0x9
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0x39
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x5f
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x5
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x5c
-.byte 0xc
-.byte 0x1
-.byte 0x5
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08008FFC.inc b/data/scripts/gUnk_08008FFC.inc
index 975b83e9..e65061c3 100644
--- a/data/scripts/gUnk_08008FFC.inc
+++ b/data/scripts/gUnk_08008FFC.inc
@@ -3,3 +3,16 @@ StartScript
 _0807EB44 0x0000
 _0807E930 0x0000
 StopScript 
+WaitForSomething 0x00000010
+SoundReq 0x011c
+_0807E930 0x0001
+Wait 0x0010
+SoundReq 0x011c
+_0807EB44 0x0004
+_0807E930 0x0006
+Wait 0x0010
+_0807EF80 0x000f
+SetEntityNonPlanarMovement 0x0200
+_0807ECC4 0x1c20
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009008.inc b/data/scripts/gUnk_08009008.inc
deleted file mode 100644
index 073f0128..00000000
--- a/data/scripts/gUnk_08009008.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_08009008
-WaitForSomething 0x00000010
-SoundReq 0x011c
-_0807E930 0x0001
-Wait 0x0010
-SoundReq 0x011c
-.byte 0x61
diff --git a/data/scripts/gUnk_0800901F.inc b/data/scripts/gUnk_0800901F.inc
deleted file mode 100644
index c91d9fc0..00000000
--- a/data/scripts/gUnk_0800901F.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800901F
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x2
-.byte 0x70
-.byte 0x8
-.byte 0x20
-.byte 0x1c
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc
index 4ed2438f..09e886c8 100644
--- a/data/scripts/gUnk_0800903C.inc
+++ b/data/scripts/gUnk_0800903C.inc
@@ -16,3 +16,211 @@ _0807E9D4
 _0807EF80 0x000a
 Jump 0x0202
 .short 0x0000
+StartScript 
+Call 0x0807f349
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+WaitForSomething2 0x00000080
+_0807EB44 0x0004
+_0807ECC4 0x0008
+_0807E930 0x0004
+TextboxNoOverlapFollowPos
+.short 0x1050
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0004
+TextboxNoOverlapFollowPos
+.short 0x1052
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807EB44 0x0006
+_0807E930 0x0005
+TextboxNoOverlapFollowPos
+.short 0x1054
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807EB44 0x0004
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0004
+TextboxNoOverlapFollowPos
+.short 0x1056
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0004
+TextboxNoOverlapFollowPos
+.short 0x1057
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0004
+TextboxNoOverlapFollowPos
+.short 0x1058
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000080
+_0807E930 0x0004
+TextboxNoOverlapFollowPos
+.short 0x105c
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806673d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+StartScript 
+Call 0x0807f349
+_0807EB44 0x0006
+_0807EF80 0x0000
+StopScript 
+WaitForSomething2 0x00000001
+_0807EB74 
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos
+.short 0x105b
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EF80 0x0005
+Wait 0x003c
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos
+.short 0x1051
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB74 
+_0807EB8C 
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos
+.short 0x1055
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB74 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0001
+_0807EDD4 0x0098, 0x0078
+_0807EB74 
+_0807EF80 0x0000
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos
+.short 0x1059
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+Jump 0x0042
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call 0x080668f1
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08066905
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
+StartScript 
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x105e
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call 0x0806672d
+_0807EF80 0x000a
+StopScript 
+Jump 0xfe90
+.short 0x0000
+StartScript 
+_0807EF80 0x000a
+Call 0x08066e39
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x1071
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
+StartScript 
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009080.inc b/data/scripts/gUnk_08009080.inc
deleted file mode 100644
index 95ca1475..00000000
--- a/data/scripts/gUnk_08009080.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_08009080
-StartScript 
-Call sub_0807F348
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-WaitForSomething2 0x00000080
-_0807EB44 0x0004
-_0807ECC4 0x0008
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x1050, 0x000e
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x1052, 0x000e
-_0807EA94 
-_0807EF80 0x0000
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
diff --git a/data/scripts/gUnk_080090DB.inc b/data/scripts/gUnk_080090DB.inc
deleted file mode 100644
index c985e235..00000000
--- a/data/scripts/gUnk_080090DB.inc
+++ /dev/null
@@ -1,190 +0,0 @@
-SCRIPT_START gUnk_080090DB
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x5
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x54
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x56
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x57
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x58
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x5c
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x3d
-.byte 0x67
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe6
-.byte 0xff
diff --git a/data/scripts/gUnk_08009198.inc b/data/scripts/gUnk_08009198.inc
deleted file mode 100644
index d65a60e8..00000000
--- a/data/scripts/gUnk_08009198.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_08009198
-StartScript 
-Call sub_0807F348
-_0807EB44 0x0006
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000001
-_0807EB74 
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x105b, 0x0000
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EF80 0x0005
-Wait 0x003c
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x1051, 0x0000
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-.byte 0x79
diff --git a/data/scripts/gUnk_08009207.inc b/data/scripts/gUnk_08009207.inc
deleted file mode 100644
index bee9bb90..00000000
--- a/data/scripts/gUnk_08009207.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-SCRIPT_START gUnk_08009207
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x55
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x98
-.byte 0x0
-.byte 0x78
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x59
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x53
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x42
-.byte 0x0
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08009274.inc b/data/scripts/gUnk_08009274.inc
deleted file mode 100644
index 5a45094a..00000000
--- a/data/scripts/gUnk_08009274.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08009274
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_080668F0
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08066904
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
diff --git a/data/scripts/gUnk_080092A8.inc b/data/scripts/gUnk_080092A8.inc
deleted file mode 100644
index a0ec8edd..00000000
--- a/data/scripts/gUnk_080092A8.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_080092A8
-StartScript 
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x105e
-_0807EA94 
-Wait 0x000f
-_0807E878 
-.short 0x0803
-.short 0xffe8
diff --git a/data/scripts/gUnk_080092D4.inc b/data/scripts/gUnk_080092D4.inc
deleted file mode 100644
index d12ec231..00000000
--- a/data/scripts/gUnk_080092D4.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_080092D4
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0806672C
-_0807EF80 0x000a
-StopScript 
-Jump 0xfe90
-.short 0x0000
diff --git a/data/scripts/gUnk_080092F0.inc b/data/scripts/gUnk_080092F0.inc
deleted file mode 100644
index 78f1e8c2..00000000
--- a/data/scripts/gUnk_080092F0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_080092F0
-StartScript 
-_0807EF80 0x000a
-Call sub_08066E38
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
diff --git a/data/scripts/gUnk_08009308.inc b/data/scripts/gUnk_08009308.inc
deleted file mode 100644
index bd43b0be..00000000
--- a/data/scripts/gUnk_08009308.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_08009308
-_0807EB74 
-TextboxNoOverlap 0x1071
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
diff --git a/data/scripts/gUnk_08009320.inc b/data/scripts/gUnk_08009320.inc
index 381ac07b..090040a3 100644
--- a/data/scripts/gUnk_08009320.inc
+++ b/data/scripts/gUnk_08009320.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009320
 StartScript 
-Call sub_0806D650
+Call 0x0806d651
 SetEntityNonPlanarMovement 0x0010
 StopScript 
 _0807EEF4 0xfff8, 0x0000
diff --git a/data/scripts/gUnk_08009348.inc b/data/scripts/gUnk_08009348.inc
index aab9e58c..9ef9c57c 100644
--- a/data/scripts/gUnk_08009348.inc
+++ b/data/scripts/gUnk_08009348.inc
@@ -5,8 +5,8 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call sub_0807DF28
-Call sub_0806D638
+Call 0x0807df29
+Call 0x0806d639
 _0807F0B4 0x0001
 CameraTargetEntity 
 CheckGlobalFlag 0x0055
@@ -14,14 +14,12 @@ JumpIf 0x002c
 TextboxNoOverlap 0x1d01
 _0807EA94 
 _0807EA94 
-Call sub_0806D640
+Call 0x0806d641
 _0807F0B4 0x0001
 CameraTargetPlayer 
 Wait 0x002d
 _0807F0B4 0x0004
 _0807E878 
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
+Call 0x0807df51
+Jump 0xffb8
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009393.inc b/data/scripts/gUnk_08009393.inc
deleted file mode 100644
index 9aa38ba6..00000000
--- a/data/scripts/gUnk_08009393.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SCRIPT_START gUnk_08009393
-.short 0x0308
-.short 0xb808
-.short 0xffff
-.short 0x12ff
-.short 0xae08
-.short 0x0400
-.short 0x9e08
-.short 0x0f00
-.short 0x0d08
-.short 0x0400
-.short 0x1408
-.short 0x0f00
-.short 0x0e08
-.short 0x0400
-.short 0x0c08
-.short 0x5b00
-.short 0x0208
-.short 0x591d
-.short 0x0304
-.short 0xbc08
-.short 0x0fff
-.short 0x0e08
-.short 0x0500
-.short 0x1808
-.short 0x0b00
-.short 0x890c
-.short 0x06d7
-.short 0x5b08
-.short 0x0308
-.short 0x591d
-.short 0x0b04
-.short 0x0d0c
-.short 0x06d7
-.short 0x0308
diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/gUnk_0800939A.inc
new file mode 100644
index 00000000..2ba22ab9
--- /dev/null
+++ b/data/scripts/gUnk_0800939A.inc
@@ -0,0 +1,51 @@
+SCRIPT_START gUnk_0800939A
+CheckLocalFlag 0x00ae
+JumpIf 0x009e
+CheckInventory1 0x000d
+JumpIf 0x0014
+CheckInventory1 0x000e
+JumpIf 0x000c
+TextboxNoOverlap 0x1d02
+_0807EA94 
+Jump 0xffbc
+CheckInventory1 0x000e
+JumpIfNot 0x0018
+Call 0x0806d789
+TextboxNoOverlap 0x1d03
+_0807EA94 
+Call 0x0806d70d
+Jump 0xff9e
+_0807E914 0x00001d05
+CheckLocalFlag 0x00ad
+JumpIf 0x0008
+_0807E914 0x00001d04
+TextboxNoOverlapVar 
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0xff80
+Wait 0x001e
+TextboxNoOverlap 0x1d08
+_0807EA94 
+LoadRoomEntityList 0x080f9c38
+Wait 0x0078
+Call 0x0806d6d1
+Wait 0x00b4
+Call 0x0806d70d
+Wait 0x0078
+SetLocalFlag 0x00ae
+SetLocalFlag 0x00ad
+Call 0x0806d5d5
+_0807EB8C 
+TextboxNoOverlap 0x1d09
+_0807EA94 
+Wait 0x000a
+Jump 0xff3a
+Call 0x0806d601
+JumpIf 0x000c
+TextboxNoOverlap 0x1d0a
+_0807EA94 
+JumpIfNot 0xff26
+TextboxNoOverlap 0x1d0b
+_0807EA94 
+Call 0x0806d74d
+_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_080093D7.inc b/data/scripts/gUnk_080093D7.inc
deleted file mode 100644
index af980951..00000000
--- a/data/scripts/gUnk_080093D7.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SCRIPT_START gUnk_080093D7
-.short 0x9e08
-.short 0x4eff
-.short 0x050c
-.short 0x001d
-.short 0x1200
-.short 0xad08
-.short 0x0400
-.short 0x0808
-.short 0x4e00
-.short 0x040c
-.short 0x001d
-.short 0x5e00
-.short 0x5904
-.short 0x1c04
-.short 0x0504
-.short 0x8008
-.short 0x31ff
-.short 0x1e08
-.short 0x5b00
-.short 0x0808
-.short 0x591d
-.short 0x0d04
-.short 0x380c
-.short 0x0f9c
diff --git a/data/scripts/gUnk_08009407.inc b/data/scripts/gUnk_08009407.inc
deleted file mode 100644
index 4db8cbf7..00000000
--- a/data/scripts/gUnk_08009407.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-SCRIPT_START gUnk_08009407
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd1
-.byte 0xd6
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0xb4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd
-.byte 0xd7
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0xae
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0xad
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd5
-.byte 0xd5
-.byte 0x6
-.byte 0x8
-.byte 0x64
-.byte 0x4
-.byte 0x5b
-.byte 0x8
-.byte 0x9
-.byte 0x1d
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x3a
-.byte 0xff
-.byte 0xb
-.byte 0xc
-.byte 0x1
-.byte 0xd6
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x8
-.byte 0xc
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0xa
-.byte 0x1d
-.byte 0x59
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x26
-.byte 0xff
-.byte 0x5b
-.byte 0x8
-.byte 0xb
-.byte 0x1d
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x4d
-.byte 0xd7
-.byte 0x6
-.byte 0x8
-.byte 0x8a
-.byte 0xc
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x8a
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xd
-.byte 0xc
-.byte 0x58
-.byte 0x9c
-.byte 0xf
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd
-.byte 0xd7
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x2c
-.byte 0x8
-.byte 0xae
-.byte 0x0
diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/gUnk_08009464.inc
new file mode 100644
index 00000000..b3819468
--- /dev/null
+++ b/data/scripts/gUnk_08009464.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_08009464
+Wait 0x003c
+_0807F0C8 0x0000, 0x0000
+LoadRoomEntityList 0x080f9c58
+Wait 0x003c
+Call 0x0806d70d
+Wait 0x003c
+ClearLocalFlag 0x00ae
+Call 0x0806d621
+Wait 0x003c
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlap 0x1d0c
+_0807EA94 
+Wait 0x000a
+Jump 0xfed6
+.short 0x0000
+StartScript 
+Call 0x0806d7c5
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+Wait 0x003c
+SetEntity0x20 0x00018000
+_0807EE30 
+JumpIfNot 0xfffc
+Wait 0x003c
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009486.inc b/data/scripts/gUnk_08009486.inc
deleted file mode 100644
index 4904ed77..00000000
--- a/data/scripts/gUnk_08009486.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_08009486
-Call sub_0806D620
-Wait 0x003c
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlap 0x1d0c
-_0807EA94 
-Wait 0x000a
-Jump 0xfed6
-.short 0x0000
diff --git a/data/scripts/gUnk_080094A4.inc b/data/scripts/gUnk_080094A4.inc
deleted file mode 100644
index db7ed246..00000000
--- a/data/scripts/gUnk_080094A4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_080094A4
-StartScript 
-Call sub_0806D7C4
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-Wait 0x003c
-SetEntity0x20 0x00018000
-_0807EE30 
-JumpIfNot 0xfffc
-Wait 0x003c
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_080094CC.inc b/data/scripts/gUnk_080094CC.inc
index d276472a..c5645f6e 100644
--- a/data/scripts/gUnk_080094CC.inc
+++ b/data/scripts/gUnk_080094CC.inc
@@ -1,6 +1,14 @@
 SCRIPT_START gUnk_080094CC
 StartScript 
-Call sub_0806D804
-.byte 0x67
-.byte 0x8
-.byte 0x80
+Call 0x0806d805
+SetEntityNonPlanarMovement 0x0180
+StopScript 
+Wait 0x003c
+SetEntity0x20 0x00018000
+Call 0x0806d859
+_0807EE30 
+JumpIfNot 0xfffc
+Wait 0x001e
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080094D7.inc b/data/scripts/gUnk_080094D7.inc
deleted file mode 100644
index f5d95cdd..00000000
--- a/data/scripts/gUnk_080094D7.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_080094D7
-.byte 0x1
-.byte 0x2
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x68
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x1
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0xd8
-.byte 0x6
-.byte 0x8
-.byte 0x75
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_080094FC.inc b/data/scripts/gUnk_080094FC.inc
index 4f661dba..74183f6a 100644
--- a/data/scripts/gUnk_080094FC.inc
+++ b/data/scripts/gUnk_080094FC.inc
@@ -1,7 +1,69 @@
 SCRIPT_START gUnk_080094FC
 StartScript 
-.byte 0xb
-.byte 0xc
-.byte 0x1
-.byte 0x71
-.byte 0x6
+Call 0x08067101
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EF80 0x0001
+_0807EB74 
+Call 0x080670b5
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
+StartScript 
+Call 0x08067101
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EF80 0x0001
+_0807EB74 
+Call 0x080670e5
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
+StartScript 
+Call 0x08067315
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E914 0x00000000
+Call 0x080672b1
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807E914 0x00000004
+Call 0x080672b1
+Call 0x080672c9
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EB44 0x0004
+_0807E914 0x00000000
+Call 0x080672b1
+Jump 0xffca
+.short 0x0000
+StartScript 
+Call 0x0806be3d
+_0807EF80 0x000a
+_0807EF80 0x0007
+StopScript 
+Call 0x0806bf45
+JumpIf 0x000c
+_0807EF80 0x000b
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009503.inc b/data/scripts/gUnk_08009503.inc
deleted file mode 100644
index d3b5e361..00000000
--- a/data/scripts/gUnk_08009503.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08009503
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
diff --git a/data/scripts/gUnk_08009508.inc b/data/scripts/gUnk_08009508.inc
deleted file mode 100644
index 307a6777..00000000
--- a/data/scripts/gUnk_08009508.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08009508
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EF80 0x0001
-_0807EB74 
-Call sub_080670B4
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
diff --git a/data/scripts/gUnk_08009538.inc b/data/scripts/gUnk_08009538.inc
deleted file mode 100644
index 7472c60a..00000000
--- a/data/scripts/gUnk_08009538.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08009538
-StartScript 
-Call sub_08067100
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EF80 0x0001
-_0807EB74 
-Call sub_080670E4
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
diff --git a/data/scripts/gUnk_08009574.inc b/data/scripts/gUnk_08009574.inc
deleted file mode 100644
index 3b89e47a..00000000
--- a/data/scripts/gUnk_08009574.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SCRIPT_START gUnk_08009574
-StartScript 
-Call sub_08067314
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E914 0x00000000
-Call sub_080672B0
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807E914 0x00000004
-Call sub_080672B0
-Call sub_080672C8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EB44 0x0004
-_0807E914 0x00000000
-Call sub_080672B0
-Jump 0xffca
-.short 0x0000
diff --git a/data/scripts/gUnk_080095CC.inc b/data/scripts/gUnk_080095CC.inc
deleted file mode 100644
index 2e964cf0..00000000
--- a/data/scripts/gUnk_080095CC.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_080095CC
-StartScript 
-Call sub_0806BE3C
-_0807EF80 0x000a
-_0807EF80 0x0007
-StopScript 
-Call sub_0806BF44
-JumpIf 0x000c
-_0807EF80 0x000b
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0418
-.short 0x0805
-.short 0xffe8
-.short 0x0443
-.short 0x0463
-.short 0x0879
-.short 0x0001
-.short 0x0c0b
-.short 0xbe85
-.short 0x0806
-.short 0x0459
-.short 0x0805
-.short 0x0018
-.short 0x087b
-.short 0x0109
-.short 0x0886
-.short 0x003c
-.short 0x085a
-.short 0x053c
-.short 0x0434
-.short 0x0459
-.short 0x0c85
-.short 0x003c
-.short 0x0001
-.short 0x0444
-.short 0x0879
-.short 0x0000
-.short 0x0803
-.short 0xffb4
diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/gUnk_080095F2.inc
new file mode 100644
index 00000000..8caf6bad
--- /dev/null
+++ b/data/scripts/gUnk_080095F2.inc
@@ -0,0 +1,73 @@
+SCRIPT_START gUnk_080095F2
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+_0807E864 
+_0807EB74 
+_0807EF80 0x0001
+Call 0x0806be85
+_0807EA94 
+JumpIfNot 0x0018
+SoundReq 0x0109
+_0807F088 0x003c
+TextboxNoOverlapFollow 0x053c
+WaitPlayerAction8 
+_0807EA94 
+_0807F078 0x003c, 0x0001
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffb4
+StartScript 
+_0807EF80 0x000b
+_0807EF80 0x0008
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x0020
+JumpIfNot 0xfff6
+StopScript 
+Call 0x0806bf45
+JumpIf 0xfff8
+StopScript 
+Call 0x0806be3d
+_0807EF80 0x000a
+_0807EF80 0x0007
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0001
+Call 0x0806bec9
+_0807EA94 
+JumpIfNot 0x0016
+SoundReq 0x0111
+SoundReq 0x0072
+_0807F078 0x003c, 0x0002
+Call 0x0806befd
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffca
+StartScript 
+_0807EF80 0x0007
+Jump 0x005c
+CheckGlobalFlag 0x0020
+JumpIf 0x0054
+StopScript 
+CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x08009704
+WaitForSomething2 0x00000001
+SoundReq 0x0111
+_0807EF80 0x0008
+LoadRoomEntityList 0x080d9048
+Wait 0x000f
+SoundReq 0x0111
+_0807EF80 0x0007
+CheckGlobalFlag 0x0020
+JumpIfNot 0xfffa
+Call 0x0807df51
+_0807E878 
+Call 0x0808692d
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800962C.inc b/data/scripts/gUnk_0800962C.inc
deleted file mode 100644
index 2c2ef3fd..00000000
--- a/data/scripts/gUnk_0800962C.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SCRIPT_START gUnk_0800962C
-StartScript 
-_0807EF80 0x000b
-_0807EF80 0x0008
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x0020
-JumpIfNot 0xfff6
-StopScript 
-Call sub_0806BF44
-JumpIf 0xfff8
-StopScript 
-Call sub_0806BE3C
-_0807EF80 0x000a
-_0807EF80 0x0007
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0001
-Call sub_0806BEC8
-_0807EA94 
-JumpIfNot 0x0016
-SoundReq 0x0111
-SoundReq 0x0072
-_0807F078 0x003c, 0x0002
-Call sub_0806BEFC
-_0807E878 
-_0807EF80 0x0000
-.short 0x0803
-.short 0xffca
diff --git a/data/scripts/gUnk_08009698.inc b/data/scripts/gUnk_08009698.inc
deleted file mode 100644
index 8af24e88..00000000
--- a/data/scripts/gUnk_08009698.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_08009698
-StartScript 
-_0807EF80 0x0007
-Jump 0x005c
-CheckGlobalFlag 0x0020
-JumpIf 0x0054
-StopScript 
-CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript 0x08009704
-WaitForSomething2 0x00000001
-SoundReq 0x0111
-_0807EF80 0x0008
-LoadRoomEntityList 0x080d9048
-Wait 0x000f
-SoundReq 0x0111
-_0807EF80 0x0007
-CheckGlobalFlag 0x0020
-JumpIfNot 0xfffa
-Call sub_0807DF50
-_0807E878 
-Call sub_0808692C
-SCRIPT_END
diff --git a/data/scripts/gUnk_08009704.inc b/data/scripts/gUnk_08009704.inc
index 6e733e50..715fd5d9 100644
--- a/data/scripts/gUnk_08009704.inc
+++ b/data/scripts/gUnk_08009704.inc
@@ -1,2 +1,15 @@
 SCRIPT_START gUnk_08009704
-.short 0x0867
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0001
+_0807EDD4 0x01a0, 0x01b0
+_0807EB44 0x0000
+_0807EF80 0x0000
+Wait 0x000a
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EF80 0x000d
+SetEntityNonPlanarMovement 0x0100
+_0807ECC4 0x0010
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009706.inc b/data/scripts/gUnk_08009706.inc
deleted file mode 100644
index 4978f927..00000000
--- a/data/scripts/gUnk_08009706.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_08009706
-.short 0x0080
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x01a0
-.short 0x01b0
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0831
-.short 0x000a
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0879
-.short 0x000d
-.short 0x0867
-.short 0x0100
-.short 0x0870
-.short 0x0010
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08009740.inc b/data/scripts/gUnk_08009740.inc
index 71021433..7f7aed61 100644
--- a/data/scripts/gUnk_08009740.inc
+++ b/data/scripts/gUnk_08009740.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009740
 StartScript 
-Call sub_08065D00
+Call 0x08065d01
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
@@ -11,8 +11,35 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
-Call sub_08065F64
+Call 0x08065f65
 _0807EA94 
 _0807E878 
 Jump 0xffe6
 .short 0x0000
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+SoundReq 0x01f3
+Call 0x0807f40d
+_0807E8E4_1 
+Wait 0x000a
+_0807E8E4_3 
+Wait 0x0032
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+StartPlayerScript 0x0800987c
+WaitForSomething2 0x00000040
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000010
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000040
+_0807F078 0x003c, 0x0000
+SetGlobalFlag 0x0020
+_0807E8E4_3 
+Wait 0x001e
+_0807EB28 0x2809
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009778.inc b/data/scripts/gUnk_08009778.inc
deleted file mode 100644
index ab8d80c6..00000000
--- a/data/scripts/gUnk_08009778.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08009778
-_0807E864 
-Call sub_0807F9A4
-.short 0x0c0b
-.short 0xdf29
-.short 0x0807
diff --git a/data/scripts/gUnk_08009786.inc b/data/scripts/gUnk_08009786.inc
deleted file mode 100644
index 86ce5f88..00000000
--- a/data/scripts/gUnk_08009786.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08009786
-SoundReq 0x01f3
-Call sub_0807F40C
-_0807E8E4_1 
-Wait 0x000a
-_0807E8E4_3 
-Wait 0x0032
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_080097A1.inc b/data/scripts/gUnk_080097A1.inc
deleted file mode 100644
index 541696f5..00000000
--- a/data/scripts/gUnk_080097A1.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-SCRIPT_START gUnk_080097A1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x47
-.byte 0xc
-.byte 0x7c
-.byte 0x98
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x85
-.byte 0xc
-.byte 0x3c
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x2d
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x4c
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x5f
-.byte 0x8
-.byte 0x9
-.byte 0x28
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_080097F0.inc b/data/scripts/gUnk_080097F0.inc
index a6bab11d..bff642f6 100644
--- a/data/scripts/gUnk_080097F0.inc
+++ b/data/scripts/gUnk_080097F0.inc
@@ -3,18 +3,18 @@ StartScript
 _0807E930 0x0003
 _0807EF80 0x0007
 SetEntityNonPlanarMovement 0x0300
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 SoundReq 0x0123
-Call sub_0807F1A0
+Call 0x0807f1a1
 StopScript 
 StartScript 
 _0807EE30 
 JumpIfNot 0xfff8
 StopScript 
 _0807E5F8 0x00000004
-Call sub_0807FBD4
+Call 0x0807fbd5
 SoundReq 0x01f3
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009838.inc b/data/scripts/gUnk_08009838.inc
index 8bb51dfe..0d88acaf 100644
--- a/data/scripts/gUnk_08009838.inc
+++ b/data/scripts/gUnk_08009838.inc
@@ -3,59 +3,15 @@ StartScript
 _0807E930 0x0003
 _0807EF80 0x0007
 SetEntityNonPlanarMovement 0x0300
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000008
-Call sub_0809E0A0
-Call sub_0809E0D4
+Call 0x0809e0a1
+Call 0x0809e0d5
 SoundReq 0x01f3
-Call sub_0807FBD4
+Call 0x0807fbd5
 SoundReq 0x01f3
 _0807E5F8 0x00000010
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x087b
-.short 0x007a
-.short 0x0861
-.short 0x0004
-.short 0x087b
-.short 0x0086
-.short 0x0c0b
-.short 0xf36d
-.short 0x0807
-.short 0x0867
-.short 0x0400
-.short 0x0871
-.short 0x0004
-.short 0x0c0b
-.short 0xf1e9
-.short 0x0807
-.short 0x0831
-.short 0x001e
-.short 0x0c28
-.short 0x0040
-.short 0x0000
-.short 0x0c33
-.short 0x0020
-.short 0x0000
-.short 0x087b
-.short 0x007c
-.short 0x0861
-.short 0x0004
-.short 0x0c0b
-.short 0xf211
-.short 0x0807
-.short 0x0c78
-.short 0x0200
-.short 0x0020
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0040
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800987C.inc b/data/scripts/gUnk_0800987C.inc
new file mode 100644
index 00000000..dac50ce8
--- /dev/null
+++ b/data/scripts/gUnk_0800987C.inc
@@ -0,0 +1,20 @@
+SCRIPT_START gUnk_0800987C
+SoundReq 0x007a
+_0807EB44 0x0004
+SoundReq 0x0086
+Call 0x0807f36d
+SetEntityNonPlanarMovement 0x0400
+_0807ECF4 0x0004
+Call 0x0807f1e9
+Wait 0x001e
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+SoundReq 0x007c
+_0807EB44 0x0004
+Call 0x0807f211
+_0807EF3C 0x0200, 0x0020
+_0807EF80 0x0000
+_0807E5F8 0x00000040
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080098D4.inc b/data/scripts/gUnk_080098D4.inc
index ef2ea423..49891782 100644
--- a/data/scripts/gUnk_080098D4.inc
+++ b/data/scripts/gUnk_080098D4.inc
@@ -9,11 +9,11 @@ CheckLocalFlag 0x005d
 JumpIf 0x0022
 SetLocalFlag 0x005d
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 _0807EB28 0x280a
 _0807EA94 
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009918.inc b/data/scripts/gUnk_08009918.inc
index 9c759fe3..ad958eb6 100644
--- a/data/scripts/gUnk_08009918.inc
+++ b/data/scripts/gUnk_08009918.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009918
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E864 
 _0807E5F8 0x00000000
 StopScript 
@@ -8,5 +8,8 @@ WaitFor_2
 Wait 0x0078
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000001
-.short 0x082d
-.short 0x001c
+SetGlobalFlag 0x001c
+Call 0x0807df51
+_0807E878 
+Call 0x0807921d
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009940.inc b/data/scripts/gUnk_08009940.inc
deleted file mode 100644
index b94a43d3..00000000
--- a/data/scripts/gUnk_08009940.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_08009940
-Call sub_0807DF50
-_0807E878 
-Call sub_0807921C
-SCRIPT_END
diff --git a/data/scripts/gUnk_08009950.inc b/data/scripts/gUnk_08009950.inc
index c4f64c1e..d7c33754 100644
--- a/data/scripts/gUnk_08009950.inc
+++ b/data/scripts/gUnk_08009950.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009950
 StartScript 
-Call sub_0807F348
+Call 0x0807f349
 SetEntityNonPlanarMovement 0x0040
 _0807EB44 0x0004
 _0807E930 0x000c
@@ -33,5 +33,5 @@ Wait 0x001e
 _0807E778 0x0002
 DoFade5 
 WaitFor_2 
-Call sub_08053634
+Call 0x08053635
 SCRIPT_END
diff --git a/data/scripts/gUnk_080099DC.inc b/data/scripts/gUnk_080099DC.inc
index f2aa379b..5b644539 100644
--- a/data/scripts/gUnk_080099DC.inc
+++ b/data/scripts/gUnk_080099DC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_080099DC
 StartScript 
-Call sub_0807F348
+Call 0x0807f349
 SetEntityNonPlanarMovement 0x00c0
 _0807EB44 0x0002
 _0807EF80 0x0008
@@ -8,4 +8,16 @@ StopScript
 WaitForSomething2 0x00000004
 _0807EF80 0x0007
 _0807EDD4 0x0068, 0x0060
-.short 0x0831
+Wait 0x000f
+TextboxNoOverlapFollow 0x1001
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0001
+TextboxNoOverlapFollow 0x1003
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009A04.inc b/data/scripts/gUnk_08009A04.inc
deleted file mode 100644
index 017cff95..00000000
--- a/data/scripts/gUnk_08009A04.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08009A04
-.byte 0xf
-.byte 0x0
-.byte 0x5a
diff --git a/data/scripts/gUnk_08009A07.inc b/data/scripts/gUnk_08009A07.inc
deleted file mode 100644
index 0ea8dd36..00000000
--- a/data/scripts/gUnk_08009A07.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_08009A07
-.byte 0x8
-.byte 0x1
-.byte 0x10
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x3
-.byte 0x10
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
diff --git a/data/scripts/gUnk_08009A2C.inc b/data/scripts/gUnk_08009A2C.inc
deleted file mode 100644
index 361b494b..00000000
--- a/data/scripts/gUnk_08009A2C.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_08009A2C
-.short 0x0008
-.short 0x0000
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08009A34.inc b/data/scripts/gUnk_08009A34.inc
index cddc151e..1b075e04 100644
--- a/data/scripts/gUnk_08009A34.inc
+++ b/data/scripts/gUnk_08009A34.inc
@@ -1,8 +1,20 @@
 SCRIPT_START gUnk_08009A34
 Wait 0x003c
-Call sub_08066258
+Call 0x08066259
 Wait 0x001e
-Call sub_08066258
+Call 0x08066259
 Wait 0x005a
-.short 0x0803
-.short 0xffea
+Jump 0xffea
+SetEntityPositionRelative 0x01780240
+CameraTargetEntity 
+SetEntityNonPlanarMovement 0x0080
+Wait 0x0078
+SoundReq2 0x0036
+_0807E778 0x0002
+DoFade4 
+WaitFor_2 
+Wait 0x0078
+_0807E5F8 0x00000004
+Call 0x08053649
+_0807EDD4 0x0240, 0x0228
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009A50.inc b/data/scripts/gUnk_08009A50.inc
deleted file mode 100644
index c41d6a9d..00000000
--- a/data/scripts/gUnk_08009A50.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08009A50
-SetEntityPositionRelative 0x01780240
-CameraTargetEntity 
-SetEntityNonPlanarMovement 0x0080
-Wait 0x0078
-SoundReq2 0x0036
-_0807E778 0x0002
-DoFade4 
-WaitFor_2 
-Wait 0x0078
-_0807E5F8 0x00000004
-.byte 0xb
diff --git a/data/scripts/gUnk_08009A77.inc b/data/scripts/gUnk_08009A77.inc
deleted file mode 100644
index edb32b26..00000000
--- a/data/scripts/gUnk_08009A77.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08009A77
-.short 0x490c
-.short 0x0536
-.short 0x7308
-.short 0x400c
-.short 0x2802
diff --git a/data/scripts/gUnk_08009A81.inc b/data/scripts/gUnk_08009A81.inc
deleted file mode 100644
index eef0be65..00000000
--- a/data/scripts/gUnk_08009A81.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08009A81
-.byte 0x2
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_08009A84.inc b/data/scripts/gUnk_08009A84.inc
index cd06d4ab..f082bf1f 100644
--- a/data/scripts/gUnk_08009A84.inc
+++ b/data/scripts/gUnk_08009A84.inc
@@ -11,4 +11,16 @@ _0807EDD4 0x01f8, 0x0218
 _0807EDD4 0x0220, 0x0228
 _0807EDD4 0x0240, 0x0228
 CameraTargetEntity 
-.byte 0x73
+_0807EDD4 0x0290, 0x0228
+_0807EDD4 0x0290, 0x01f8
+SetEntityNonPlanarMovement 0x0080
+_0807EDD4 0x0290, 0x01c8
+SetEntityNonPlanarMovement 0x00c0
+_0807EDD4 0x0290, 0x0198
+Wait 0x001e
+_0807E5F8 0x00000010
+_0807EDD4 0x0290, 0x0190
+_0807EF80 0x0008
+_0807EDD4 0x0290, 0x0188
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009ABB.inc b/data/scripts/gUnk_08009ABB.inc
deleted file mode 100644
index 413a352b..00000000
--- a/data/scripts/gUnk_08009ABB.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-SCRIPT_START gUnk_08009ABB
-.byte 0xc
-.byte 0x90
-.byte 0x2
-.byte 0x28
-.byte 0x2
-.byte 0x73
-.byte 0xc
-.byte 0x90
-.byte 0x2
-.byte 0xf8
-.byte 0x1
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x90
-.byte 0x2
-.byte 0xc8
-.byte 0x1
-.byte 0x67
-.byte 0x8
-.byte 0xc0
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x90
-.byte 0x2
-.byte 0x98
-.byte 0x1
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x90
-.byte 0x2
-.byte 0x90
-.byte 0x1
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x90
-.byte 0x2
-.byte 0x88
-.byte 0x1
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08009AF8.inc b/data/scripts/gUnk_08009AF8.inc
index ebcae1d4..d2cdd178 100644
--- a/data/scripts/gUnk_08009AF8.inc
+++ b/data/scripts/gUnk_08009AF8.inc
@@ -11,6 +11,6 @@ Wait 0x005a
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-Call sub_0805367C
+Call 0x0805367d
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08009B30.inc b/data/scripts/gUnk_08009B30.inc
index a4964eca..e24ce455 100644
--- a/data/scripts/gUnk_08009B30.inc
+++ b/data/scripts/gUnk_08009B30.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009B30
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E864 
 SetLocalFlag 0x0046
 StopScript 
@@ -9,8 +9,12 @@ Wait 0x001e
 TextboxNoOverlapFollow 0x1005
 _0807EA94 
 Wait 0x003c
-Call sub_0807529C
+Call 0x0807529d
 Wait 0x003c
 _0807EF80 0x0014
 Wait 0x001e
-.byte 0xb
+Call 0x08053251
+_0807E878 
+Call 0x0807df51
+Call 0x080791d1
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009B63.inc b/data/scripts/gUnk_08009B63.inc
deleted file mode 100644
index 75b26ee3..00000000
--- a/data/scripts/gUnk_08009B63.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_08009B63
-.byte 0xc
-.byte 0x51
-.byte 0x32
-.byte 0x5
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xd1
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc
index 5248ef2a..32e85c18 100644
--- a/data/scripts/gUnk_08009B78.inc
+++ b/data/scripts/gUnk_08009B78.inc
@@ -3,7 +3,7 @@ StartScript
 _0807EB44 0x0006
 SetEntityNonPlanarMovement 0x0080
 _0807E9D4 
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 CheckGlobalFlag 0x0013
 JumpIf 0x00ba
@@ -11,14 +11,17 @@ _0807E888
 Wait 0x000a
 _0807E864 
 StartPlayerScript 0x08009cfc
-Call sub_0807DF28
+Call 0x0807df29
 WaitForSomething2 0x00000008
 _0807EDD4 0x0080, 0x005c
 _0807EB44 0x0006
 _0807EF80 0x0000
 Wait 0x000f
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x1009, 0x0000
+TextboxNoOverlapFollowPos
+.short 0x1009
+.short 0x0000
+@ End of 2 parameters
 _0807E8E4_1 
 _0807EA94 
 _0807EF80 0x0000
@@ -26,7 +29,10 @@ _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
 _0807EB8C 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x100b, 0x0000
+TextboxNoOverlapFollowPos
+.short 0x100b
+.short 0x0000
+@ End of 2 parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -40,12 +46,15 @@ _0807EF80 0x000c
 _0807EF80 0x0000
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000008
-Call sub_08053250
+Call 0x08053251
 _0807F034 0x0034
 WaitPlayerAction8 
 _0807E8E4_1 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x100c, 0x0000
+TextboxNoOverlapFollowPos
+.short 0x100c
+.short 0x0000
+@ End of 2 parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc
index 3b9ae6ae..279008d7 100644
--- a/data/scripts/gUnk_08009C68.inc
+++ b/data/scripts/gUnk_08009C68.inc
@@ -2,10 +2,44 @@ SCRIPT_START gUnk_08009C68
 StartScript 
 _0807EB44 0x0002
 SetEntityNonPlanarMovement 0x0100
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+_0807EB74 
+WaitForSomething2 0x00000004
+_0807EB74 
+WaitForSomething2 0x00000004
+_0807EB74 
+_0807EB8C 
+_0807EF80 0x0001
+TextboxNoOverlapFollowPos
+.short 0x100a
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EB8C 
+_0807EF80 0x0001
+_0807EB8C 
+_0807EB44 0x0002
+TextboxNoOverlapFollowPos
+.short 0x100d
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807EF80 0x0000
+_0807EDD4 0x0028, 0x0060
+_0807EDD4 0x0000, 0x0060
+Call 0x080536a9
+Wait 0x001e
+StartScript 
+SetGlobalFlag 0x0013
+Call 0x0807df51
+Call 0x080791d1
+_0807E878 
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08009C7F.inc b/data/scripts/gUnk_08009C7F.inc
deleted file mode 100644
index 714700f4..00000000
--- a/data/scripts/gUnk_08009C7F.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SCRIPT_START gUnk_08009C7F
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x5c
-.byte 0xc
diff --git a/data/scripts/gUnk_08009C9E.inc b/data/scripts/gUnk_08009C9E.inc
deleted file mode 100644
index 39d4756f..00000000
--- a/data/scripts/gUnk_08009C9E.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SCRIPT_START gUnk_08009C9E
-.short 0x100a
-.short 0x0000
-.short 0x0459
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0008
-.short 0x0000
-.short 0x0c33
-.short 0x0004
-.short 0x0000
-.short 0x0464
-.short 0x0879
-.short 0x0001
-.short 0x0464
-.short 0x0861
-.short 0x0002
-.short 0x0c5c
-.short 0x100d
-.short 0x0000
-.short 0x0459
-.short 0x0879
-.short 0x0000
-.short 0x0c73
-.short 0x0028
-.short 0x0060
-.short 0x0c73
-.short 0x0000
-.short 0x0060
-.short 0x0c0b
-.short 0x36a9
-.short 0x0805
-.short 0x0831
-.short 0x001e
-.short 0x0401
-.short 0x082d
-.short 0x0013
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0c0b
-.short 0x91d1
-.short 0x0807
-.short 0x0444
-.short 0x0402
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x044a
diff --git a/data/scripts/gUnk_08009D00.inc b/data/scripts/gUnk_08009CFC.inc
similarity index 89%
rename from data/scripts/gUnk_08009D00.inc
rename to data/scripts/gUnk_08009CFC.inc
index 67476331..a9564043 100644
--- a/data/scripts/gUnk_08009D00.inc
+++ b/data/scripts/gUnk_08009CFC.inc
@@ -1,4 +1,6 @@
-SCRIPT_START gUnk_08009D00
+SCRIPT_START gUnk_08009CFC
+StartScript 
+_0807E8E4_1 
 SetEntityNonPlanarMovement 0x00c0
 StopScript 
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_08009D6C.inc b/data/scripts/gUnk_08009D6C.inc
index 2fc4629a..9ef086b9 100644
--- a/data/scripts/gUnk_08009D6C.inc
+++ b/data/scripts/gUnk_08009D6C.inc
@@ -2,4 +2,17 @@ SCRIPT_START gUnk_08009D6C
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 _0807EB44 0x0006
-.byte 0x2
+StopScript 
+_0807EDD4 0x0078, 0x0060
+_0807EDD4 0x0078, 0x007c
+Wait 0x001e
+Call 0x0805368d
+Wait 0x0008
+_0807EDD4 0x0078, 0x0098
+_0807EF80 0x0008
+_0807E778 0x0010
+DoFade5 
+WaitFor_2 
+Call 0x08053635
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009D77.inc b/data/scripts/gUnk_08009D77.inc
deleted file mode 100644
index 2102b98e..00000000
--- a/data/scripts/gUnk_08009D77.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-SCRIPT_START gUnk_08009D77
-.byte 0x4
-.byte 0x73
-.byte 0xc
-.byte 0x78
-.byte 0x0
-.byte 0x60
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x78
-.byte 0x0
-.byte 0x7c
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x8d
-.byte 0x36
-.byte 0x5
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x78
-.byte 0x0
-.byte 0x98
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x38
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x3d
-.byte 0x4
-.byte 0x37
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x35
-.byte 0x36
-.byte 0x5
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_08009DB0.inc b/data/scripts/gUnk_08009DB0.inc
index 4789a493..939e5d75 100644
--- a/data/scripts/gUnk_08009DB0.inc
+++ b/data/scripts/gUnk_08009DB0.inc
@@ -1,17 +1,41 @@
 SCRIPT_START gUnk_08009DB0
 StartScript 
-Call sub_0807F348
-Call sub_08066288
-Call sub_08066274
+Call 0x0807f349
+Call 0x08066289
+Call 0x08066275
 _0807EF80 0x000a
 _0807E930 0x000c
 _0807E908 0x0003
 StopScript 
 _0807E944 
 _0807E908 0x0002
-Call sub_0806622C
+Call 0x0806622d
 _0807EA94 
 _0807E908 0x0003
 _0807E930 0x000c
-.short 0x0803
-.short 0xffe8
+Jump 0xffe8
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Wait 0x0008
+_0807EB28 0x3207
+_0807E3E8 
+JumpIfNot 0x003e
+Call 0x0807df29
+_0807E778 0x0002
+DoFade5 
+WaitFor_2 
+Call 0x0804e865
+Wait 0x001e
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB28 0x3209
+Wait 0x000f
+_0807EA94 
+_0807E878 
+Call 0x0807df51
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009DEC.inc b/data/scripts/gUnk_08009DEC.inc
deleted file mode 100644
index c453741e..00000000
--- a/data/scripts/gUnk_08009DEC.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_08009DEC
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Wait 0x0008
-_0807EB28 0x3207
-_0807E3E8 
-JumpIfNot 0x003e
-Call sub_0807DF28
-_0807E778 0x0002
-DoFade5 
-WaitFor_2 
-Call sub_0804E864
-Wait 0x001e
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-.short 0x085f
diff --git a/data/scripts/gUnk_08009E38.inc b/data/scripts/gUnk_08009E38.inc
deleted file mode 100644
index df8b734b..00000000
--- a/data/scripts/gUnk_08009E38.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08009E38
-.short 0x3209
-.short 0x0831
-.short 0x000f
-.short 0x0459
-.short 0x0444
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0444
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800DB0E.inc b/data/scripts/gUnk_08009E4E.inc
similarity index 66%
rename from data/scripts/gUnk_0800DB0E.inc
rename to data/scripts/gUnk_08009E4E.inc
index 7692db5d..9430cdc2 100644
--- a/data/scripts/gUnk_0800DB0E.inc
+++ b/data/scripts/gUnk_08009E4E.inc
@@ -1,4 +1,4 @@
-SCRIPT_START gUnk_0800DB0E
+SCRIPT_START gUnk_08009E4E
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009E58.inc b/data/scripts/gUnk_08009E58.inc
index 4b923498..630c3001 100644
--- a/data/scripts/gUnk_08009E58.inc
+++ b/data/scripts/gUnk_08009E58.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009E58
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 StopScript 
 WaitForSomething2 0x00000002
 _0807E778 0x0002
@@ -10,7 +10,3 @@ _0807EF80 0x0014
 Wait 0x001e
 _0807E5F8 0x00000001
 SCRIPT_END
-.short 0x0401
-.short 0x0402
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08009318.inc b/data/scripts/gUnk_08009E80.inc
similarity index 64%
rename from data/scripts/gUnk_08009318.inc
rename to data/scripts/gUnk_08009E80.inc
index 77ed439b..b79a8e25 100644
--- a/data/scripts/gUnk_08009318.inc
+++ b/data/scripts/gUnk_08009E80.inc
@@ -1,4 +1,4 @@
-SCRIPT_START gUnk_08009318
+SCRIPT_START gUnk_08009E80
 StartScript 
 StopScript 
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009E88.inc b/data/scripts/gUnk_08009E88.inc
index 82fc63fc..4e439873 100644
--- a/data/scripts/gUnk_08009E88.inc
+++ b/data/scripts/gUnk_08009E88.inc
@@ -1,8 +1,19 @@
 SCRIPT_START gUnk_08009E88
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E864 
 SetLocalFlag 0x009f
 StopScript 
 Wait 0x003c
-.short 0x0838
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+Call 0x0807f0d9
+JumpIfNot 0xfff8
+_0807EF80 0x0014
+Wait 0x000a
+Call 0x08053251
+_0807E878 
+Call 0x0807df51
+Call 0x080791d1
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009E9E.inc b/data/scripts/gUnk_08009E9E.inc
deleted file mode 100644
index 310e58fc..00000000
--- a/data/scripts/gUnk_08009E9E.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08009E9E
-.byte 0x4
-.byte 0x0
-.byte 0x3c
-.byte 0x4
-.byte 0x37
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0xf0
-.byte 0x7
diff --git a/data/scripts/gUnk_08009EA9.inc b/data/scripts/gUnk_08009EA9.inc
deleted file mode 100644
index e1883ab6..00000000
--- a/data/scripts/gUnk_08009EA9.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_08009EA9
-.short 0x0508
-.short 0xf808
-.short 0x79ff
-.short 0x1408
-.short 0x3100
-.short 0x0a08
-.short 0x0b00
diff --git a/data/scripts/gUnk_08009EB7.inc b/data/scripts/gUnk_08009EB7.inc
deleted file mode 100644
index 80b0a609..00000000
--- a/data/scripts/gUnk_08009EB7.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_08009EB7
-.byte 0xc
-.byte 0x51
-.byte 0x32
-.byte 0x5
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xd1
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_08009EF0.inc b/data/scripts/gUnk_08009EF0.inc
index 9468e41d..bc7f644a 100644
--- a/data/scripts/gUnk_08009EF0.inc
+++ b/data/scripts/gUnk_08009EF0.inc
@@ -5,4 +5,7 @@ _0807EF80 0x0001
 StopScript 
 WaitForSomething2 0x00000004
 StartScript 
-.byte 0x4e
+_0807E914 0x00000001
+_0807EF80 0x0001
+StopScript 
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009F07.inc b/data/scripts/gUnk_08009F07.inc
deleted file mode 100644
index d1f94779..00000000
--- a/data/scripts/gUnk_08009F07.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_08009F07
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc
index a456299d..094db364 100644
--- a/data/scripts/gUnk_08009F14.inc
+++ b/data/scripts/gUnk_08009F14.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08009F14
 StartScript 
 _0807EB44 0x0004
-Call sub_08060090
+Call 0x08060091
 _0807EF80 0x000a
 CheckKinstoneFused 0x001c
 JumpIf 0x00a8
@@ -9,4 +9,124 @@ CheckInventory1 0x0007
 JumpIf 0x0052
 StopScript 
 StopScript 
-.byte 0x1
+StartScript 
+Call 0x08060159
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+Call 0x0807df29
+_0807EF80 0x000b
+StartPlayerScript 0x0800a088
+WaitForSomething2 0x00000002
+Call 0x0806014d
+TextboxNoOverlapFollowPos
+.short 0x1f01
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+Wait 0x001e
+_0807F034 0x0065
+WaitPlayerAction8 
+_0807EF80 0x000a
+Call 0x0807df51
+_0807E878 
+StopScript 
+StopScript 
+StartScript 
+Call 0x08060159
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+Call 0x080602bd
+_0807EA94 
+CallWithArg
+.short 0xf971
+.short 0x0807
+.short 0x1f03
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x0008
+_0807E878 
+Jump 0xffd2
+Wait 0x0008
+SoundReq 0x0103
+CallWithArg
+.short 0x030d
+.short 0x0806
+.short 0x0063
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0008
+_0807E878 
+Jump 0xffb6
+StopScript 
+CheckLocalFlag 0x00b0
+JumpIf 0x004a
+StopScript 
+StartScript 
+Call 0x08060159
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+TextboxNoOverlap 0x1f0e
+_0807EA94 
+_0807E3E8 
+JumpIf 0x0008
+_0807E878 
+Jump 0xffdc
+Wait 0x0008
+_0807F034 0x0008
+Call 0x08060319
+WaitPlayerAction8 
+Wait 0x0008
+_0807EB8C 
+TextboxNoOverlapFollow 0x1f13
+_0807EA94 
+SetLocalFlag 0x00b0
+_0807E878 
+StopScript 
+StartScript 
+Call 0x08060159
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+CheckInventory1 0x0008
+JumpIf 0x0014
+TextboxNoOverlap 0x1f14
+_0807EA94 
+_0807E3E8 
+JumpIf 0xffb8
+_0807E878 
+Jump 0xffd4
+TextboxNoOverlap 0x1f11
+_0807EA94 
+_0807E3E8 
+JumpIf 0x0008
+_0807E878 
+Jump 0xffc2
+Wait 0x0008
+_0807F034 0x0007
+Call 0x08060319
+WaitPlayerAction8 
+Wait 0x0008
+_0807EB8C 
+TextboxNoOverlapFollow 0x1f10
+_0807EA94 
+_0807E878 
+Jump 0xffa0
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807ECC4 0x0010
+_0807EDD4 0x0078, 0x0060
+_0807EB44 0x0000
+Wait 0x000f
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08009F39.inc b/data/scripts/gUnk_08009F39.inc
deleted file mode 100644
index 843abe36..00000000
--- a/data/scripts/gUnk_08009F39.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-SCRIPT_START gUnk_08009F39
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0x1
-.byte 0x6
-.byte 0x8
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xf2
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0xb
-.byte 0x0
-.byte 0x47
-.byte 0xc
-.byte 0x88
-.byte 0xa0
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x4d
-.byte 0x1
-.byte 0x6
-.byte 0x8
-.byte 0x5c
-.byte 0xc
-.byte 0x1
-.byte 0x1f
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
diff --git a/data/scripts/gUnk_08009F72.inc b/data/scripts/gUnk_08009F72.inc
deleted file mode 100644
index 4691447a..00000000
--- a/data/scripts/gUnk_08009F72.inc
+++ /dev/null
@@ -1,74 +0,0 @@
-SCRIPT_START gUnk_08009F72
-_0807F034 0x0065
-WaitPlayerAction8 
-_0807EF80 0x000a
-Call sub_0807DF50
-_0807E878 
-StopScript 
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-Call sub_080602BC
-_0807EA94 
-CallWithArg sub_0807F970, 0x00001f03
-JumpIf 0x0008
-_0807E878 
-Jump 0xffd2
-Wait 0x0008
-SoundReq 0x0103
-CallWithArg sub_0806030C, 0x00000063
-Wait 0x0008
-_0807E878 
-Jump 0xffb6
-StopScript 
-CheckLocalFlag 0x00b0
-JumpIf 0x004a
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-TextboxNoOverlap 0x1f0e
-_0807EA94 
-_0807E3E8 
-JumpIf 0x0008
-_0807E878 
-Jump 0xffdc
-Wait 0x0008
-_0807F034 0x0008
-Call sub_08060318
-WaitPlayerAction8 
-Wait 0x0008
-_0807EB8C 
-TextboxNoOverlapFollow 0x1f13
-_0807EA94 
-SetLocalFlag 0x00b0
-_0807E878 
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-CheckInventory1 0x0008
-JumpIf 0x0014
-TextboxNoOverlap 0x1f14
-_0807EA94 
-_0807E3E8 
-JumpIf 0xffb8
-_0807E878 
-Jump 0xffd4
-TextboxNoOverlap 0x1f11
-_0807EA94 
-_0807E3E8 
-JumpIf 0x0008
-_0807E878 
-.short 0x0803
-.short 0xffc2
diff --git a/data/scripts/gUnk_0800A064.inc b/data/scripts/gUnk_0800A064.inc
deleted file mode 100644
index cf52c09e..00000000
--- a/data/scripts/gUnk_0800A064.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800A064
-Wait 0x0008
-_0807F034 0x0007
-Call sub_08060318
-WaitPlayerAction8 
-Wait 0x0008
-_0807EB8C 
-TextboxNoOverlapFollow 0x1f10
-_0807EA94 
-.byte 0x44
diff --git a/data/scripts/gUnk_0800A081.inc b/data/scripts/gUnk_0800A081.inc
deleted file mode 100644
index 118f427a..00000000
--- a/data/scripts/gUnk_0800A081.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-SCRIPT_START gUnk_0800A081
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xa0
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x2
-.byte 0x4
-.byte 0x70
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x78
-.byte 0x0
-.byte 0x60
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800A0B4.inc b/data/scripts/gUnk_0800A0B4.inc
index 92f45a45..f32de8ae 100644
--- a/data/scripts/gUnk_0800A0B4.inc
+++ b/data/scripts/gUnk_0800A0B4.inc
@@ -2,11 +2,11 @@ SCRIPT_START gUnk_0800A0B4
 StartScript 
 SetEntityNonPlanarMovement 0x0140
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StopScript 
 Wait 0x0078
 SoundReq2 0x0018
-Call sub_080A0464
+Call 0x080a0465
 _0807EE30 
 JumpIfNot 0xfffc
 _0807E8E4_0 
diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc
index 7eb0530e..18dbea9f 100644
--- a/data/scripts/gUnk_0800A0FC.inc
+++ b/data/scripts/gUnk_0800A0FC.inc
@@ -4,3 +4,36 @@ CheckGlobalFlag 0x0051
 JumpIfNot 0xfffa
 StartScript 
 _0807E864 
+Call 0x0807df29
+SoundReq0x80100000 
+Call 0x0807fbfd
+SetEntityPositionRelative 0x005800b0
+Call 0x0807f845
+_0807E8E4_3 
+CallWithArg
+.short 0xf75d
+.short 0x0807
+.short 0x0060
+.short 0x00d0
+@ End of 4 parameters
+CallWithArg
+.short 0x4ae9
+.short 0x0809
+.short 0xa160
+.short 0x0800
+@ End of 4 parameters
+SoundReq 0x00f7
+_0807E778 0x0002
+DoFade6 
+StopScript 
+WaitFor_2 
+WaitForSomething2 0x00000004
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0006
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A10A.inc b/data/scripts/gUnk_0800A10A.inc
deleted file mode 100644
index 17b2b548..00000000
--- a/data/scripts/gUnk_0800A10A.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800A10A
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
diff --git a/data/scripts/gUnk_0800A10F.inc b/data/scripts/gUnk_0800A10F.inc
deleted file mode 100644
index 0b89d7e4..00000000
--- a/data/scripts/gUnk_0800A10F.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800A10F
-.byte 0x8
-.byte 0x7e
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xfd
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x69
-.byte 0xc
-.byte 0xb0
-.byte 0x0
-.byte 0x58
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0xf8
-.byte 0x7
-.byte 0x8
diff --git a/data/scripts/gUnk_0800A124.inc b/data/scripts/gUnk_0800A124.inc
deleted file mode 100644
index f7d50aa4..00000000
--- a/data/scripts/gUnk_0800A124.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800A124
-_0807E8E4_3 
-CallWithArg sub_0807F75C, 0x00d00060
-.short 0x140c
-.short 0x4ae9
diff --git a/data/scripts/gUnk_0800A134.inc b/data/scripts/gUnk_0800A134.inc
deleted file mode 100644
index 79b32191..00000000
--- a/data/scripts/gUnk_0800A134.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-SCRIPT_START gUnk_0800A134
-.short 0x0809
-.short 0xa160
-.short 0x0800
-.short 0x087b
-.short 0x00f7
-.short 0x0838
-.short 0x0002
-.short 0x043e
-.short 0x0402
-.short 0x0437
-.short 0x0c33
-.short 0x0004
-.short 0x0000
-.short 0x140c
-.short 0xda1d
-.short 0x0806
-.short 0x0006
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0080
-.short 0x0879
-.short 0x0007
-.short 0x0879
-.short 0x000b
-.short 0x0850
-.short 0x0002
-.short 0x0c69
-.short 0x00b0
-.short 0x0080
-.short 0x140c
-.short 0xf98d
-.short 0x0807
-.short 0x0000
-.short 0xff80
-.short 0x140c
-.short 0x60c5
-.short 0x0809
-.short 0xa1b4
-.short 0x0800
-.short 0x0402
-.short 0x087b
-.short 0x0142
-.short 0x0c78
-.short 0xff80
-.short 0x0000
-.short 0x087b
-.short 0x0143
-.short 0x0850
-.short 0x0004
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc
new file mode 100644
index 00000000..de6872cf
--- /dev/null
+++ b/data/scripts/gUnk_0800A160.inc
@@ -0,0 +1,29 @@
+SCRIPT_START gUnk_0800A160
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807E930 0x0002
+SetEntityPositionRelative 0x008000b0
+CallWithArg
+.short 0xf98d
+.short 0x0807
+.short 0x0000
+.short 0xff80
+@ End of 4 parameters
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xa1b4
+.short 0x0800
+@ End of 4 parameters
+StopScript 
+SoundReq 0x0142
+_0807EF3C 0xff80, 0x0000
+SoundReq 0x0143
+_0807E930 0x0004
+_0807E5F8 0x00000002
+Wait 0x003c
+_0807E5F8 0x00000004
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc
index 6c66905f..6600c6ee 100644
--- a/data/scripts/gUnk_0800A1B4.inc
+++ b/data/scripts/gUnk_0800A1B4.inc
@@ -2,7 +2,12 @@ SCRIPT_START gUnk_0800A1B4
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfff8
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 WaitForSomething 0x00000002
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc
index ec26a0f2..cc3d8c01 100644
--- a/data/scripts/gUnk_0800A1D8.inc
+++ b/data/scripts/gUnk_0800A1D8.inc
@@ -1,18 +1,88 @@
 SCRIPT_START gUnk_0800A1D8
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x00800088
-Call sub_0807F844
+Call 0x0807f845
 _0807E8E4_3 
-CallWithArg sub_0807F75C, 0x00a80088
+CallWithArg
+.short 0xf75d
+.short 0x0807
+.short 0x0088
+.short 0x00a8
+@ End of 4 parameters
 StopScript 
 Wait 0x003c
 StartPlayerScript 0x0800a310
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000080
-TextboxNoOverlapFollowPos 0x1659, 0x0000
+TextboxNoOverlapFollowPos
+.short 0x1659
+.short 0x0000
+@ End of 2 parameters
 _0807EA94 
-.short 0x0831
-.short 0x003c
+Wait 0x003c
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000200
+_0807E5F8 0x00000004
+_0807E8E4_0 
+WaitForSomething2 0x00000080
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000200
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000040
+_0807E5F8 0x00000004
+Call 0x0807f3f9
+WaitForSomething2 0x00000080
+TextboxNoOverlapFollowPos
+.short 0x165a
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x165b
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000040
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000100
+Wait 0x003c
+_0807E8E4_3 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000080
+Wait 0x003c
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000006
+WaitForSomething2 0x000000c0
+TextboxNoOverlapFollowPos
+.short 0x165c
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+SoundReq0x80100000 
+TextboxNoOverlapFollowPos
+.short 0x165d
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000006
+WaitForSomething2 0x000000c0
+_0807E5F8 0x00000006
+WaitForSomething2 0x00000080
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000100
+SoundReq2 0x0008
+SoundReq 0x00f7
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0007
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A224.inc b/data/scripts/gUnk_0800A224.inc
deleted file mode 100644
index 9ae17ba9..00000000
--- a/data/scripts/gUnk_0800A224.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SCRIPT_START gUnk_0800A224
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000200
-_0807E5F8 0x00000004
-_0807E8E4_0 
-WaitForSomething2 0x00000080
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000200
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000040
-_0807E5F8 0x00000004
-.short 0x0c0b
-.short 0xf3f9
diff --git a/data/scripts/gUnk_0800A260.inc b/data/scripts/gUnk_0800A260.inc
deleted file mode 100644
index 3dd7f1b9..00000000
--- a/data/scripts/gUnk_0800A260.inc
+++ /dev/null
@@ -1,113 +0,0 @@
-SCRIPT_START gUnk_0800A260
-.short 0x0807
-.short 0x0c33
-.short 0x0080
-.short 0x0000
-.short 0x0c5c
-.short 0x165a
-.short 0x000e
-.short 0x0459
-.short 0x0831
-.short 0x003c
-.short 0x0c5c
-.short 0x165b
-.short 0x000e
-.short 0x0459
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c33
-.short 0x0040
-.short 0x0000
-.short 0x0c28
-.short 0x0008
-.short 0x0000
-.short 0x0c33
-.short 0x0100
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x044c
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0080
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x0008
-.short 0x0000
-.short 0x0c33
-.short 0x0100
-.short 0x0000
-.short 0x0c28
-.short 0x0006
-.short 0x0000
-.short 0x0c33
-.short 0x00c0
-.short 0x0000
-.short 0x0c5c
-.short 0x165c
-.short 0x000e
-.short 0x0459
-.short 0x047e
-.short 0x0c5c
-.short 0x165d
-.short 0x000e
-.short 0x0459
-.short 0x0c28
-.short 0x0006
-.short 0x0000
-.short 0x0c33
-.short 0x00c0
-.short 0x0000
-.short 0x0c28
-.short 0x0006
-.short 0x0000
-.short 0x0c33
-.short 0x0080
-.short 0x0000
-.short 0x0c28
-.short 0x0008
-.short 0x0000
-.short 0x0c33
-.short 0x0100
-.short 0x0000
-.short 0x087c
-.short 0x0008
-.short 0x087b
-.short 0x00f7
-.short 0x140c
-.short 0xda1d
-.short 0x0806
-.short 0x0007
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0402
-.short 0x0861
-.short 0x0002
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0006
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0002
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0006
-.short 0x0831
-.short 0x000a
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0x0000
diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc
new file mode 100644
index 00000000..817b5248
--- /dev/null
+++ b/data/scripts/gUnk_0800A310.inc
@@ -0,0 +1,53 @@
+SCRIPT_START gUnk_0800A310
+StopScript 
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807E5F8 0x00000001
+Call 0x080791bd
+.short 0x0000
+StartScript 
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x000b
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+WaitForSomething2 0x00000002
+_0807E930 0x000e
+_0807EF80 0x0007
+Call 0x0807f2d5
+_0807EF80 0x0004
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+_0807E930 0x000c
+Call 0x0807f2d5
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+_0807E930 0x000f
+Call 0x0807f2d5
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+_0807E930 0x000c
+Call 0x0807f2d5
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xa680
+.short 0x0800
+@ End of 4 parameters
+_0807E5F8 0x00000040
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A340.inc b/data/scripts/gUnk_0800A340.inc
deleted file mode 100644
index c427d35e..00000000
--- a/data/scripts/gUnk_0800A340.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800A340
-StartScript 
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x000b
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-WaitForSomething2 0x00000002
-_0807E930 0x000e
-_0807EF80 0x0007
-Call sub_0807F2D4
-_0807EF80 0x0004
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-_0807E930 0x000c
-Call sub_0807F2D4
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-_0807E930 0x000f
-Call sub_0807F2D4
-.byte 0x28
diff --git a/data/scripts/gUnk_0800A3A3.inc b/data/scripts/gUnk_0800A3A3.inc
deleted file mode 100644
index 952e122c..00000000
--- a/data/scripts/gUnk_0800A3A3.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800A3A3
-.short 0x400c
-.short 0x0000
-.short 0x3300
diff --git a/data/scripts/gUnk_0800A3A9.inc b/data/scripts/gUnk_0800A3A9.inc
deleted file mode 100644
index 861473df..00000000
--- a/data/scripts/gUnk_0800A3A9.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800A3A9
-.byte 0xc
diff --git a/data/scripts/gUnk_0800A3AA.inc b/data/scripts/gUnk_0800A3AA.inc
deleted file mode 100644
index b6654ff9..00000000
--- a/data/scripts/gUnk_0800A3AA.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800A3AA
-.short 0x0002
-.short 0x0000
-.short 0x0850
-.short 0x000c
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0c28
-.short 0x0040
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x140c
-.short 0x60c5
-.short 0x0809
-.short 0xa680
-.short 0x0800
-.short 0x0c28
-.short 0x0040
-.short 0x0000
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc
index ac087eda..d40d23d2 100644
--- a/data/scripts/gUnk_0800A3D8.inc
+++ b/data/scripts/gUnk_0800A3D8.inc
@@ -9,7 +9,7 @@ StopScript
 WaitForSomething2 0x00000004
 StartScript 
 _0807EF80 0x0004
-Call sub_0807F3F8
+Call 0x0807f3f9
 StopScript 
 Wait 0x003c
 _0807EC94 0x0010
@@ -28,30 +28,60 @@ WaitForSomething2 0x00000004
 _0807EB44 0x0004
 _0807EF80 0x0000
 SoundReq 0x0142
-CallWithArg sub_080960C4, 0x0800a638
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xa638
+.short 0x0800
+@ End of 4 parameters
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0143
 _0807E5F8 0x00001000
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
-Call sub_08066E68
+Call 0x08066e69
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0142
-CallWithArg sub_080960C4, 0x0800a680
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xa680
+.short 0x0800
+@ End of 4 parameters
 Wait 0x0078
 SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000003
+CallWithArg
+.short 0xfadd
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 Wait 0x000f
 SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000003
+CallWithArg
+.short 0xfadd
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 Wait 0x000f
 SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000003
+CallWithArg
+.short 0xfadd
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 Wait 0x003c
 SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000001
+CallWithArg
+.short 0xfadd
+.short 0x0807
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
 SoundReq 0x0143
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc
index 0379d003..dc6c9d71 100644
--- a/data/scripts/gUnk_0800A500.inc
+++ b/data/scripts/gUnk_0800A500.inc
@@ -4,26 +4,31 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 _0807EF80 0x000b
 _0807E930 0x0005
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000008
 SoundReq 0x0142
 _0807E610 0x00000800
-CallWithArg sub_080960C4, 0x0800a65c
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xa65c
+.short 0x0800
+@ End of 4 parameters
 _0807E930 0x0002
-Call sub_08094B0C
+Call 0x08094b0d
 _0807EDD4 0x0068, 0x0088
-Call sub_08094B80
+Call 0x08094b81
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000008
-Call sub_08094B3C
+Call 0x08094b3d
 _0807E930 0x0004
 _0807E5F8 0x00000800
 SoundReq 0x0143
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000008
 _0807EF80 0x0008
-Call sub_080961B0
+Call 0x080961b1
 SoundReq 0x00fa
 Wait 0x003c
 _0807E5F8 0x00000100
diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc
index df64eb73..98c1b5c3 100644
--- a/data/scripts/gUnk_0800A590.inc
+++ b/data/scripts/gUnk_0800A590.inc
@@ -4,4 +4,47 @@ SetEntityNonPlanarMovement 0x0080
 SetEntity0x20 0x00000000
 _0807EF80 0x0008
 _0807EB44 0x0000
-.short 0x0c0b
+Call 0x0807f715
+MoveEntityToPlayer 
+CallWithArg
+.short 0xf98d
+.short 0x0807
+.short 0x0000
+.short 0xfff0
+@ End of 4 parameters
+StopScript 
+_0807E930 0x0023
+WaitForSomething2 0x00000010
+CallWithArg
+.short 0xf6e9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0007
+SoundReq 0x0142
+_0807E610 0x00000800
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xa65c
+.short 0x0800
+@ End of 4 parameters
+Wait 0x003c
+_0807EDD4 0x0088, 0x0068
+Wait 0x0078
+_0807E5F8 0x00000800
+SoundReq 0x0143
+_0807EF3C 0x0000, 0x0020
+_0807E930 0x001f
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000010
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000200
+Wait 0x0001
+_0807EF80 0x0008
+WaitForSomething2 0x00000010
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A5A6.inc b/data/scripts/gUnk_0800A5A6.inc
deleted file mode 100644
index 6317298f..00000000
--- a/data/scripts/gUnk_0800A5A6.inc
+++ /dev/null
@@ -1,92 +0,0 @@
-SCRIPT_START gUnk_0800A5A6
-.short 0xf715
-.short 0x0807
-.short 0x046b
-.short 0x140c
-.short 0xf98d
-.short 0x0807
-.short 0x0000
-.short 0xfff0
-.short 0x0402
-.short 0x0850
-.short 0x0023
-.short 0x0c33
-.short 0x0010
-.short 0x0000
-.short 0x140c
-.short 0xf6e9
-.short 0x0807
-.short 0x0008
-.short 0x0000
-.short 0x0879
-.short 0x0007
-.short 0x087b
-.short 0x0142
-.short 0x0c29
-.short 0x0800
-.short 0x0000
-.short 0x140c
-.short 0x60c5
-.short 0x0809
-.short 0xa65c
-.short 0x0800
-.short 0x0831
-.short 0x003c
-.short 0x0c73
-.short 0x0088
-.short 0x0068
-.short 0x0831
-.short 0x0078
-.short 0x0c28
-.short 0x0800
-.short 0x0000
-.short 0x087b
-.short 0x0143
-.short 0x0c78
-.short 0x0000
-.short 0x0020
-.short 0x0850
-.short 0x001f
-.short 0x0c28
-.short 0x0200
-.short 0x0000
-.short 0x0c33
-.short 0x0010
-.short 0x0000
-.short 0x0831
-.short 0x0078
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x0200
-.short 0x0000
-.short 0x0831
-.short 0x0001
-.short 0x0879
-.short 0x0008
-.short 0x0c33
-.short 0x0010
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0401
-.short 0x0879
-.short 0x0007
-.short 0x0879
-.short 0x000b
-.short 0x140c
-.short 0xf995
-.short 0x0807
-.short 0xfff8
-.short 0x0000
-.short 0x0402
-.short 0x0c32
-.short 0x1000
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc
new file mode 100644
index 00000000..534cd728
--- /dev/null
+++ b/data/scripts/gUnk_0800A638.inc
@@ -0,0 +1,15 @@
+SCRIPT_START gUnk_0800A638
+StartScript 
+_0807EF80 0x0007
+_0807EF80 0x000b
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfff8
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+WaitForSomething 0x00001000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc
index e724c755..c89dbee5 100644
--- a/data/scripts/gUnk_0800A65C.inc
+++ b/data/scripts/gUnk_0800A65C.inc
@@ -2,8 +2,14 @@ SCRIPT_START gUnk_0800A65C
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfff8
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 WaitForSomething 0x00000800
 _0807EF80 0x0006
 SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800A67E.inc b/data/scripts/gUnk_0800A67E.inc
deleted file mode 100644
index cc4eb753..00000000
--- a/data/scripts/gUnk_0800A67E.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800A67E
-.short 0x0000
diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc
index b065e201..10446b80 100644
--- a/data/scripts/gUnk_0800A680.inc
+++ b/data/scripts/gUnk_0800A680.inc
@@ -2,7 +2,12 @@ SCRIPT_START gUnk_0800A680
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfff8
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 WaitForSomething 0x00000020
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc
index 6ef55566..f897621c 100644
--- a/data/scripts/gUnk_0800A6A4.inc
+++ b/data/scripts/gUnk_0800A6A4.inc
@@ -1,6 +1,17 @@
 SCRIPT_START gUnk_0800A6A4
 StartScript 
 _0807E864 
-.byte 0xb
-.byte 0xc
-.byte 0x29
+Call 0x0807df29
+SetEntityPositionRelative 0x00680088
+Call 0x0807f845
+StopScript 
+Wait 0x003c
+SoundReq 0x00f6
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A6AB.inc b/data/scripts/gUnk_0800A6AB.inc
deleted file mode 100644
index 581b7885..00000000
--- a/data/scripts/gUnk_0800A6AB.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SCRIPT_START gUnk_0800A6AB
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x69
-.byte 0xc
-.byte 0x88
-.byte 0x0
-.byte 0x68
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0xf8
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xf6
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x1d
-.byte 0xda
-.byte 0x6
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc
index 5e8f1277..f0ae3baf 100644
--- a/data/scripts/gUnk_0800A6D4.inc
+++ b/data/scripts/gUnk_0800A6D4.inc
@@ -1,12 +1,17 @@
 SCRIPT_START gUnk_0800A6D4
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x00700088
-Call sub_0807F844
+Call 0x0807f845
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-CallWithArg sub_0806DA1C, 0x00000009
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0009
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc
index 7fe91929..a4592ef8 100644
--- a/data/scripts/gUnk_0800A704.inc
+++ b/data/scripts/gUnk_0800A704.inc
@@ -1,12 +1,17 @@
 SCRIPT_START gUnk_0800A704
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x01c80198
-Call sub_0807F844
+Call 0x0807f845
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x0000000a
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x000a
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc
index 86e0b3c7..88ff9225 100644
--- a/data/scripts/gUnk_0800A734.inc
+++ b/data/scripts/gUnk_0800A734.inc
@@ -1,8 +1,17 @@
 SCRIPT_START gUnk_0800A734
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x01c800d8
-.short 0x0c0b
-.short 0xf845
-.short 0x0807
+Call 0x0807f845
+SoundReq 0x00f7
+StopScript 
+Wait 0x003c
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x000b
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A74A.inc b/data/scripts/gUnk_0800A74A.inc
deleted file mode 100644
index bd50de98..00000000
--- a/data/scripts/gUnk_0800A74A.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800A74A
-SoundReq 0x00f7
-StopScript 
-Wait 0x003c
-CallWithArg sub_0806DA1C, 0x0000000b
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc
index 8a63af09..1d6be66a 100644
--- a/data/scripts/gUnk_0800A764.inc
+++ b/data/scripts/gUnk_0800A764.inc
@@ -1,9 +1,9 @@
 SCRIPT_START gUnk_0800A764
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x01b800f8
-Call sub_0807F844
+Call 0x0807f845
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
@@ -26,6 +26,11 @@ _0807E5F8 0x00000010
 Wait 0x0002
 _0807E5F8 0x00000020
 Wait 0x0078
-CallWithArg sub_0806DA1C, 0x0000000c
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x000c
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc
index 2ca09744..dad3a8c9 100644
--- a/data/scripts/gUnk_0800A7E4.inc
+++ b/data/scripts/gUnk_0800A7E4.inc
@@ -1,3 +1,99 @@
 SCRIPT_START gUnk_0800A7E4
 StartScript 
-.short 0x0879
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0010
+StopScript 
+WaitForSomething 0x00000001
+_0807E930 0x0002
+WaitForSomething2 0x00000002
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0001
+Wait 0x001e
+_0807E930 0x0003
+Wait 0x001e
+Jump 0xffee
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0010
+StopScript 
+WaitForSomething 0x00000001
+_0807E930 0x0002
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0001
+Wait 0x0014
+_0807E930 0x0003
+Wait 0x0014
+Jump 0xffee
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0010
+StopScript 
+WaitForSomething 0x00000001
+_0807E930 0x0002
+WaitForSomething2 0x00000008
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0001
+Wait 0x000a
+_0807E930 0x0003
+Wait 0x000a
+Jump 0xffee
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0008
+StopScript 
+WaitForSomething 0x00000001
+_0807EF80 0x0000
+WaitForSomething2 0x00000010
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0002
+Wait 0x0019
+_0807EB44 0x0006
+Wait 0x0019
+Jump 0xffee
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0008
+StopScript 
+WaitForSomething 0x00000001
+_0807EF80 0x0000
+WaitForSomething2 0x00000020
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0002
+Wait 0x000f
+_0807EB44 0x0006
+Wait 0x000f
+Jump 0xffee
+StartScript 
+_0807E864 
+Call 0x0807df29
+SetEntityPositionRelative 0x01780378
+Call 0x0807f845
+StopScript 
+Wait 0x003c
+_0807E5F8 0x00000001
+Wait 0x001e
+_0807E5F8 0x00000002
+Wait 0x0014
+_0807E5F8 0x00000004
+Wait 0x000a
+_0807E5F8 0x00000008
+Wait 0x003c
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x000d
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A7E8.inc b/data/scripts/gUnk_0800A7E8.inc
deleted file mode 100644
index b767904a..00000000
--- a/data/scripts/gUnk_0800A7E8.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800A7E8
-.short 0x0007
-.short 0x0861
-.short 0x0004
-.short 0x0850
-.short 0x0010
-.short 0x0402
-.short 0x0c32
-.short 0x0001
-.short 0x0000
-.short 0x0850
-.short 0x0002
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x003c
-.short 0x0850
-.short 0x0001
-.short 0x0831
-.short 0x001e
-.short 0x0850
diff --git a/data/scripts/gUnk_0800A816.inc b/data/scripts/gUnk_0800A816.inc
deleted file mode 100644
index 5e9cd87a..00000000
--- a/data/scripts/gUnk_0800A816.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800A816
-.short 0x0003
-.short 0x0831
-.short 0x001e
-.short 0x0803
-.short 0xffee
diff --git a/data/scripts/gUnk_0800A820.inc b/data/scripts/gUnk_0800A820.inc
deleted file mode 100644
index 0b7dfe6e..00000000
--- a/data/scripts/gUnk_0800A820.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800A820
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0010
-StopScript 
-WaitForSomething 0x00000001
-_0807E930 0x0002
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0001
-Wait 0x0014
-_0807E930 0x0003
-Wait 0x0014
-.short 0x0803
-.short 0xffee
diff --git a/data/scripts/gUnk_0800A85C.inc b/data/scripts/gUnk_0800A85C.inc
deleted file mode 100644
index ea415c26..00000000
--- a/data/scripts/gUnk_0800A85C.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800A85C
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0010
-StopScript 
-WaitForSomething 0x00000001
-_0807E930 0x0002
-WaitForSomething2 0x00000008
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0001
-Wait 0x000a
-_0807E930 0x0003
-Wait 0x000a
-.short 0x0803
-.short 0xffee
diff --git a/data/scripts/gUnk_0800A898.inc b/data/scripts/gUnk_0800A898.inc
deleted file mode 100644
index d187960a..00000000
--- a/data/scripts/gUnk_0800A898.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800A898
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0008
-StopScript 
-WaitForSomething 0x00000001
-_0807EF80 0x0000
-WaitForSomething2 0x00000010
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0002
-Wait 0x0019
-_0807EB44 0x0006
-Wait 0x0019
-.short 0x0803
-.short 0xffee
diff --git a/data/scripts/gUnk_0800A8D4.inc b/data/scripts/gUnk_0800A8D4.inc
deleted file mode 100644
index bfe1d195..00000000
--- a/data/scripts/gUnk_0800A8D4.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800A8D4
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0008
-StopScript 
-WaitForSomething 0x00000001
-_0807EF80 0x0000
-WaitForSomething2 0x00000020
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0002
-Wait 0x000f
-.short 0x0861
-.short 0x0006
diff --git a/data/scripts/gUnk_0800A908.inc b/data/scripts/gUnk_0800A908.inc
deleted file mode 100644
index c0885233..00000000
--- a/data/scripts/gUnk_0800A908.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800A908
-Wait 0x000f
-.short 0x0803
-.short 0xffee
diff --git a/data/scripts/gUnk_0800A910.inc b/data/scripts/gUnk_0800A910.inc
deleted file mode 100644
index e52eb0b9..00000000
--- a/data/scripts/gUnk_0800A910.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800A910
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01780378
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-_0807E5F8 0x00000001
-Wait 0x001e
-_0807E5F8 0x00000002
-Wait 0x0014
-_0807E5F8 0x00000004
-Wait 0x000a
-_0807E5F8 0x00000008
-Wait 0x003c
-CallWithArg sub_0806DA1C, 0x0000000d
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800A964.inc b/data/scripts/gUnk_0800A964.inc
index 558fb639..75cd370b 100644
--- a/data/scripts/gUnk_0800A964.inc
+++ b/data/scripts/gUnk_0800A964.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0001
 StopScript 
 WaitForSomething2 0x00000001
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A988.inc b/data/scripts/gUnk_0800A988.inc
index 9773d029..7deff2ff 100644
--- a/data/scripts/gUnk_0800A988.inc
+++ b/data/scripts/gUnk_0800A988.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0002
 StopScript 
 WaitForSomething2 0x00000002
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A9AC.inc b/data/scripts/gUnk_0800A9AC.inc
index 75aafcd7..aef80139 100644
--- a/data/scripts/gUnk_0800A9AC.inc
+++ b/data/scripts/gUnk_0800A9AC.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000004
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A9D0.inc b/data/scripts/gUnk_0800A9D0.inc
index d70c742c..cae4d653 100644
--- a/data/scripts/gUnk_0800A9D0.inc
+++ b/data/scripts/gUnk_0800A9D0.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0003
 StopScript 
 WaitForSomething2 0x00000008
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc
index 595cf338..4f706377 100644
--- a/data/scripts/gUnk_0800A9F4.inc
+++ b/data/scripts/gUnk_0800A9F4.inc
@@ -1,9 +1,24 @@
 SCRIPT_START gUnk_0800A9F4
 StartScript 
 _0807E864 
-Call sub_0807DF28
-.byte 0x69
-.byte 0xc
-.byte 0x28
-.byte 0x1
-.byte 0x58
+Call 0x0807df29
+SetEntityPositionRelative 0x00580128
+Call 0x0807f845
+StopScript 
+Wait 0x003c
+_0807E5F8 0x00000001
+Wait 0x000a
+_0807E5F8 0x00000002
+Wait 0x0014
+_0807E5F8 0x00000004
+Wait 0x001e
+_0807E5F8 0x00000008
+Wait 0x003c
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x000e
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800AA03.inc b/data/scripts/gUnk_0800AA03.inc
deleted file mode 100644
index e0dc247d..00000000
--- a/data/scripts/gUnk_0800AA03.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-SCRIPT_START gUnk_0800AA03
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0xf8
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x1d
-.byte 0xda
-.byte 0x6
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800AA48.inc b/data/scripts/gUnk_0800AA48.inc
index c4e7fb14..75b9c451 100644
--- a/data/scripts/gUnk_0800AA48.inc
+++ b/data/scripts/gUnk_0800AA48.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000001
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AA6C.inc b/data/scripts/gUnk_0800AA6C.inc
index d9166bb5..3e64b994 100644
--- a/data/scripts/gUnk_0800AA6C.inc
+++ b/data/scripts/gUnk_0800AA6C.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000002
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AA90.inc b/data/scripts/gUnk_0800AA90.inc
index 3f08f7c6..afce2365 100644
--- a/data/scripts/gUnk_0800AA90.inc
+++ b/data/scripts/gUnk_0800AA90.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000004
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AAB4.inc b/data/scripts/gUnk_0800AAB4.inc
index 5af49a63..b2169922 100644
--- a/data/scripts/gUnk_0800AAB4.inc
+++ b/data/scripts/gUnk_0800AAB4.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000008
-Call CreateDust
+Call 0x080a29bd
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc
index 38f1dd36..c2b67154 100644
--- a/data/scripts/gUnk_0800AAD8.inc
+++ b/data/scripts/gUnk_0800AAD8.inc
@@ -1,12 +1,17 @@
 SCRIPT_START gUnk_0800AAD8
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x01480088
-Call sub_0807F844
+Call 0x0807f845
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x0000000f
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x000f
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc
index e84df154..5e5a5ba4 100644
--- a/data/scripts/gUnk_0800AB08.inc
+++ b/data/scripts/gUnk_0800AB08.inc
@@ -1,10 +1,42 @@
 SCRIPT_START gUnk_0800AB08
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetEntityPositionRelative 0x01480088
-Call sub_0807F844
+Call 0x0807f845
 _0807E8E4_3 
-.byte 0xc
-.byte 0x14
-.byte 0xe9
+CallWithArg
+.short 0xf6e9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf75d
+.short 0x0807
+.short 0x0088
+.short 0x00a8
+@ End of 4 parameters
+SoundReq 0x00f7
+StopScript 
+Wait 0x0078
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x00780088
+Call 0x0807f5c1
+TextboxNoOverlapFollowPos
+.short 0x1664
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+TextboxNoOverlapFollowPos
+.short 0x165e
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800AB23.inc b/data/scripts/gUnk_0800AB23.inc
deleted file mode 100644
index 4cc931cd..00000000
--- a/data/scripts/gUnk_0800AB23.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SCRIPT_START gUnk_0800AB23
-.short 0x07f6
-.short 0x0808
-.short 0x0000
-.short 0x0c00
-.short 0x5d14
-.short 0x07f7
-.short 0x8808
-.short 0xa800
-.short 0x7b00
-.short 0xf708
-.short 0x0200
-.short 0x3104
-.short 0x7808
-.short 0x8900
-.short 0x0108
-.short 0x6900
-.short 0x880c
-.short 0x7800
-.short 0x0b00
-.short 0xc10c
-.short 0x07f5
-.short 0x5c08
diff --git a/data/scripts/gUnk_0800AB4F.inc b/data/scripts/gUnk_0800AB4F.inc
deleted file mode 100644
index de5fe07d..00000000
--- a/data/scripts/gUnk_0800AB4F.inc
+++ /dev/null
@@ -1,162 +0,0 @@
-SCRIPT_START gUnk_0800AB4F
-.byte 0xc
-.byte 0x64
-.byte 0x16
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x5c
-.byte 0xc
-.byte 0x5e
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0xed
-.byte 0xdd
-.byte 0x5
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8a
-.byte 0xc
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xcd
-.byte 0xd2
-.byte 0x8
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x49
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x6a
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xe0
-.byte 0xff
-.byte 0xb
-.byte 0xc
-.byte 0xc1
-.byte 0xf5
-.byte 0x7
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x19
-.byte 0xde
-.byte 0x5
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8a
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x5f
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0xbc
-.byte 0xac
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x60
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x61
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc
new file mode 100644
index 00000000..c38d26b2
--- /dev/null
+++ b/data/scripts/gUnk_0800AB6E.inc
@@ -0,0 +1,92 @@
+SCRIPT_START gUnk_0800AB6E
+Call 0x0808d2cd
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E8E4_0 
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000080
+SetEntityPosition 0x0000, 0xffe0
+Call 0x0807f5c1
+Wait 0x003c
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+Wait 0x003c
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos
+.short 0x165f
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800acbc
+WaitForSomething2 0x00000001
+TextboxNoOverlapFollowPos
+.short 0x1660
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos
+.short 0x1661
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000008
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+SetEntityPosition 0x0000, 0x0020
+Call 0x0807f5c1
+WaitForSomething2 0x00000010
+StartPlayerScript 0x0800ace0
+WaitForSomething2 0x00000001
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1662
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+TextboxNoOverlapFollowPos
+.short 0x1663
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+SetEntityPosition 0x0000, 0xffe0
+Call 0x0807f5c1
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+StartPlayerScript 0x0800ad54
+WaitForSomething2 0x00000001
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1665
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Wait 0x0078
+Call 0x0808d281
+Wait 0x0078
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+Call 0x0807fb95
+MoveEntityToPlayer 
+Call 0x0807f845
+_0807F0B4 0x0004
+CameraTargetPlayer 
+_0807E5F8 0x80000000
+DoFade4 
+WaitFor_2 
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800ABF0.inc b/data/scripts/gUnk_0800ABF0.inc
deleted file mode 100644
index 1d5967fe..00000000
--- a/data/scripts/gUnk_0800ABF0.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_0800ABF0
-.short 0x0008
-.short 0x0000
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c33
-.short 0x0004
-.short 0x0000
-.short 0x0c6a
-.short 0x0000
-.short 0x0020
-.short 0x0c0b
-.short 0xf5c1
-.short 0x0807
-.short 0x0c33
-.short 0x0010
-.short 0x0000
-.short 0x0c47
-.short 0xace0
-.short 0x0800
-.short 0x0c33
-.short 0x0001
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x0c5c
diff --git a/data/scripts/gUnk_0800AC24.inc b/data/scripts/gUnk_0800AC24.inc
deleted file mode 100644
index 7582ca47..00000000
--- a/data/scripts/gUnk_0800AC24.inc
+++ /dev/null
@@ -1,74 +0,0 @@
-SCRIPT_START gUnk_0800AC24
-.byte 0x62
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x5c
-.byte 0xc
-.byte 0x63
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x6a
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xe0
-.byte 0xff
-.byte 0xb
-.byte 0xc
-.byte 0xc1
-.byte 0xf5
-.byte 0x7
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x47
-.byte 0xc
-.byte 0x54
-.byte 0xad
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x65
-.byte 0x16
-.byte 0xe
-.byte 0x0
-.byte 0x59
diff --git a/data/scripts/gUnk_0800AC6D.inc b/data/scripts/gUnk_0800AC6D.inc
deleted file mode 100644
index 405ae99b..00000000
--- a/data/scripts/gUnk_0800AC6D.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SCRIPT_START gUnk_0800AC6D
-.short 0x2804
-.short 0x020c
-.short 0x0000
-.short 0x3300
-.short 0x040c
-.short 0x0000
-.short 0x3100
-.short 0x7808
-.short 0x0b00
-.short 0x810c
-.short 0x08d2
-.short 0x3108
-.short 0x7808
-.short 0x3800
-.short 0x0408
-.short 0x3d00
-.short 0x3704
-.short 0x0b04
-.short 0x950c
-.short 0x07fb
-.short 0x6b08
-.short 0x0b04
-.short 0x450c
-.short 0x07f8
-.short 0x8908
-.short 0x0408
-.short 0x8800
-.short 0x2804
-.short 0x000c
-.short 0x0000
-.short 0x3c80
-.short 0x3704
-.short 0x0b04
-.short 0x510c
-.short 0x07df
-.short 0x4408
diff --git a/data/scripts/gUnk_0800ACB5.inc b/data/scripts/gUnk_0800ACB5.inc
deleted file mode 100644
index 7079f097..00000000
--- a/data/scripts/gUnk_0800ACB5.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800ACB5
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc
index 07f8d2d2..5ed4cc19 100644
--- a/data/scripts/gUnk_0800ACBC.inc
+++ b/data/scripts/gUnk_0800ACBC.inc
@@ -6,5 +6,138 @@ _0807EDD4 0x0088, 0x0080
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 .short 0x0000
+StartScript 
+Call 0x08094be1
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x045b
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x0109
+StopScript 
+Call 0x0807f305
+Wait 0x005a
+_0807E5F8 0x00000008
+StartScript 
+CallWithArg
+.short 0xf6f9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x08e4
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+Call 0x0807f305
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x003c
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x0004
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EC64 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0004
+Wait 0x001e
+_0807EB44 0x0002
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0006
+_0807EB44 0x0000
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB44 0x0002
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0014
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807E930 0x000c
+Call 0x0807f2d5
+Call 0x08094b95
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807E930 0x000f
+Call 0x0807f2d5
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+CallWithArg
+.short 0x60c5
+.short 0x0809
+.short 0xaf18
+.short 0x0800
+@ End of 4 parameters
+_0807E930 0x0012
+Call 0x0807f2d5
+Wait 0x001e
+_0807E5F8 0x00000020
+SoundReq0x80100000 
+Call 0x080a29bd
+Call 0x0806305d
+Call 0x080630a5
+_0807EF3C 0x0000, 0x0020
+Wait 0x001e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xfff0
+Wait 0x003c
+_0807EEF4 0x0000, 0xfff0
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EDD4 0x0088, 0x0040
+_0807E5F8 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc
deleted file mode 100644
index 2035165c..00000000
--- a/data/scripts/gUnk_0800ACE0.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SCRIPT_START gUnk_0800ACE0
-StartScript 
-Call sub_08094BE0
-CallWithArg sub_0807F238, 0x0000045b
-SoundReq 0x0109
-StopScript 
-Call sub_0807F304
-Wait 0x005a
-_0807E5F8 0x00000008
-StartScript 
-CallWithArg sub_0807F6F8, 0x00000008
-CallWithArg sub_0807F238, 0x000008e4
-StopScript 
-Call sub_0807F304
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x003c
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x0004
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
-.short 0x0000
diff --git a/data/scripts/gUnk_0800AD74.inc b/data/scripts/gUnk_0800AD74.inc
deleted file mode 100644
index f2eb830e..00000000
--- a/data/scripts/gUnk_0800AD74.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800AD74
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0004
-Wait 0x001e
-_0807EB44 0x0002
-.byte 0xc
-.byte 0x14
-.byte 0xd9
diff --git a/data/scripts/gUnk_0800ADA7.inc b/data/scripts/gUnk_0800ADA7.inc
deleted file mode 100644
index 0fe40272..00000000
--- a/data/scripts/gUnk_0800ADA7.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800ADA7
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x61
-.byte 0x8
diff --git a/data/scripts/gUnk_0800ADB4.inc b/data/scripts/gUnk_0800ADB4.inc
deleted file mode 100644
index b7a6cde0..00000000
--- a/data/scripts/gUnk_0800ADB4.inc
+++ /dev/null
@@ -1,121 +0,0 @@
-SCRIPT_START gUnk_0800ADB4
-.short 0x0000
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0861
-.short 0x0002
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0831
-.short 0x0014
-.short 0x0861
-.short 0x0004
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0850
-.short 0x000c
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0c0b
-.short 0x4b95
-.short 0x0809
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0850
-.short 0x000f
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x140c
-.short 0x60c5
-.short 0x0809
-.short 0xaf18
-.short 0x0800
-.short 0x0850
-.short 0x0012
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0831
-.short 0x001e
-.short 0x0c28
-.short 0x0020
-.short 0x0000
-.short 0x047e
-.short 0x0c0b
-.short 0x29bd
-.short 0x080a
-.short 0x0c0b
-.short 0x305d
-.short 0x0806
-.short 0x0c0b
-.short 0x30a5
-.short 0x0806
-.short 0x0c78
-.short 0x0000
-.short 0x0020
-.short 0x0831
-.short 0x001e
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0867
-.short 0x0080
-.short 0x0c77
-.short 0x0000
-.short 0xfff0
-.short 0x0831
-.short 0x003c
-.short 0x0c77
-.short 0x0000
-.short 0xfff0
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0c73
-.short 0x0088
-.short 0x0040
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_0800AEDC.inc b/data/scripts/gUnk_0800AEDC.inc
index d8650582..16a64ac9 100644
--- a/data/scripts/gUnk_0800AEDC.inc
+++ b/data/scripts/gUnk_0800AEDC.inc
@@ -6,7 +6,7 @@ _0807EF80 0x000b
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000008
-Call sub_08094B80
+Call 0x08094b81
 _0807EF3C 0x0000, 0x0001
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000008
diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc
index a786d6d5..5ba38181 100644
--- a/data/scripts/gUnk_0800AF18.inc
+++ b/data/scripts/gUnk_0800AF18.inc
@@ -2,7 +2,12 @@ SCRIPT_START gUnk_0800AF18
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfff8
+.short 0x0000
+@ End of 4 parameters
 SoundReq 0x0142
 StopScript 
 WaitForSomething 0x00000020
diff --git a/data/scripts/gUnk_0800AF44.inc b/data/scripts/gUnk_0800AF44.inc
index ebfa32bc..da215c73 100644
--- a/data/scripts/gUnk_0800AF44.inc
+++ b/data/scripts/gUnk_0800AF44.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800AF44
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 _0807EB28 0x1c01
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0001
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AF68.inc b/data/scripts/gUnk_0800AF68.inc
index 2b99a066..4209d0f2 100644
--- a/data/scripts/gUnk_0800AF68.inc
+++ b/data/scripts/gUnk_0800AF68.inc
@@ -1,7 +1,11 @@
 SCRIPT_START gUnk_0800AF68
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 _0807EB28 0x1c02
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0002
-.short 0x0c0b
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AF7E.inc b/data/scripts/gUnk_0800AF7E.inc
deleted file mode 100644
index 1a8d0025..00000000
--- a/data/scripts/gUnk_0800AF7E.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800AF7E
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800AF8C.inc b/data/scripts/gUnk_0800AF8C.inc
index f0352fce..b1d27fee 100644
--- a/data/scripts/gUnk_0800AF8C.inc
+++ b/data/scripts/gUnk_0800AF8C.inc
@@ -1,8 +1,11 @@
 SCRIPT_START gUnk_0800AF8C
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 _0807EB28 0x1c03
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0003
-Call sub_0807DF50
-.byte 0x44
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AFA7.inc b/data/scripts/gUnk_0800AFA7.inc
deleted file mode 100644
index 0b73b74c..00000000
--- a/data/scripts/gUnk_0800AFA7.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800AFA7
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800AFB0.inc b/data/scripts/gUnk_0800AFB0.inc
index 123fb79d..6b836bfc 100644
--- a/data/scripts/gUnk_0800AFB0.inc
+++ b/data/scripts/gUnk_0800AFB0.inc
@@ -2,15 +2,15 @@ SCRIPT_START gUnk_0800AFB0
 _0807E864 
 StopScript 
 StartScript 
-Call sub_0807FBB4
+Call 0x0807fbb5
 ComparePlayerAction 0x0001
 JumpIfNot 0xfff0
 StopScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807EB28 0x1c04
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0004
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AFE8.inc b/data/scripts/gUnk_0800AFE8.inc
index c150d8e0..ec04570c 100644
--- a/data/scripts/gUnk_0800AFE8.inc
+++ b/data/scripts/gUnk_0800AFE8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800AFE8
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 _0807EB28 0x1c05
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0005
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B00C.inc b/data/scripts/gUnk_0800B00C.inc
index 8bc5453a..a752472c 100644
--- a/data/scripts/gUnk_0800B00C.inc
+++ b/data/scripts/gUnk_0800B00C.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_0800B00C
 StartScript 
-Call sub_0807F934
-Call sub_080A2124
+Call 0x0807f935
+Call 0x080a2125
 _0807EF80 0x000a
 _0807EF80 0x0007
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 CheckGlobalFlag 0x0052
 JumpIf 0x004a
 CheckGlobalFlag 0x0053
@@ -16,7 +16,7 @@ JumpIf 0x0024
 TextboxNoOverlap 0x3f32
 _0807EA94 
 _0807EF80 0x0008
-Call Windcrest_Unlock
+Call 0x080a2139
 Wait 0x003c
 _0807EB28 0x0b5c
 _0807EA94 
@@ -25,7 +25,7 @@ Jump 0x003a
 TextboxNoOverlap 0x3f32
 _0807EA94 
 _0807EF80 0x0008
-Call Windcrest_Unlock
+Call 0x080a2139
 Wait 0x003c
 _0807EB28 0x0b5d
 _0807EA94 
@@ -33,11 +33,11 @@ Jump 0x001c
 TextboxNoOverlap 0x3f32
 _0807EA94 
 _0807EF80 0x0008
-Call Windcrest_Unlock
+Call 0x080a2139
 Wait 0x003c
 _0807EB28 0x0b5e
 _0807EA94 
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B0AC.inc b/data/scripts/gUnk_0800B0AC.inc
index 93f58f77..6048d180 100644
--- a/data/scripts/gUnk_0800B0AC.inc
+++ b/data/scripts/gUnk_0800B0AC.inc
@@ -1,3 +1,11 @@
 SCRIPT_START gUnk_0800B0AC
 StopScript 
 _0807E864 
+Call 0x0807fa41
+Call 0x0807df29
+_0807EB28 0x0b5f
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B0B0.inc b/data/scripts/gUnk_0800B0B0.inc
deleted file mode 100644
index 60cdd0bb..00000000
--- a/data/scripts/gUnk_0800B0B0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800B0B0
-Call sub_0807FA40
-Call sub_0807DF28
-_0807EB28 0x0b5f
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc
index b6d85120..87034e69 100644
--- a/data/scripts/gUnk_0800B0D0.inc
+++ b/data/scripts/gUnk_0800B0D0.inc
@@ -1,144 +1,81 @@
 SCRIPT_START gUnk_0800B0D0
 StartScript 
-Call sub_0806BCD4
+Call 0x0806bcd5
 _0807EF80 0x000a
-CallWithArg sub_0806BC94, 0x00000000
+CallWithArg
+.short 0xbc95
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 StopScript 
-Call sub_0807F434
-.byte 0x6
-.byte 0x10
-.byte 0xf8
-.byte 0xff
-.byte 0x4
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xd5
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x63
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0x95
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xe9
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xb9
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x95
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xb6
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xd5
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x63
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0x95
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xf6
-.byte 0x7
-.byte 0x8
-.byte 0x56
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xc1
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xb9
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x95
-.byte 0xbc
-.byte 0x6
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
+Call 0x0807f435
+_0807E078
+.short 0xfff8
+.short 0x0004
+.short 0x0040
+@ End of 3 parameters
+_0807E864 
+Call 0x0807df29
+Call 0x0807f2d5
+_0807EB74 
+CallWithArg
+.short 0xbc95
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806bce9
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Call 0x0806bcb9
+CallWithArg
+.short 0xbc95
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffb6
+_0807E864 
+Call 0x0807df29
+Call 0x0807f2d5
+_0807EB74 
+CallWithArg
+.short 0xbc95
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f651
+_0807E9F0 
+JumpIfNot 0x0008
+Call 0x0806bcc1
+Call 0x0807df51
+_0807E878 
+Call 0x0806bcb9
+CallWithArg
+.short 0xbc95
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xff6e
+StartScript 
+Call 0x0807df29
+SetLocalFlag 0x0039
+_0807E864 
+StopScript 
+WaitForPlayerAction0x17 
+StartPlayerScript 0x0800b1c0
+Wait 0x0018
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetRoomFlag 0x0000
+Wait 0x0010
+SoundReq2 0x002d
+_0807EB28 0x2701
+_0807E878 
+Call 0x0807df51
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B177.inc b/data/scripts/gUnk_0800B177.inc
deleted file mode 100644
index 15e5d732..00000000
--- a/data/scripts/gUnk_0800B177.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800B177
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x6e
-.byte 0xff
diff --git a/data/scripts/gUnk_0800B17C.inc b/data/scripts/gUnk_0800B17C.inc
deleted file mode 100644
index 1c3c36a4..00000000
--- a/data/scripts/gUnk_0800B17C.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800B17C
-StartScript 
-Call sub_0807DF28
-SetLocalFlag 0x0039
-_0807E864 
-StopScript 
-WaitForPlayerAction0x17 
-StartPlayerScript 0x0800b1c0
-Wait 0x0018
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetRoomFlag 0x0000
-Wait 0x0010
-SoundReq2 0x002d
-_0807EB28 0x2701
-_0807E878 
-Call sub_0807DF50
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc
index e5ef8a57..7a1a152e 100644
--- a/data/scripts/gUnk_0800B1C0.inc
+++ b/data/scripts/gUnk_0800B1C0.inc
@@ -12,5 +12,5 @@ Wait 0x002c
 LoadRoomEntityList 0x080da260
 Wait 0x001e
 _0807E5F8 0x00000001
-Call sub_0807921C
+Call 0x0807921d
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B200.inc b/data/scripts/gUnk_0800B200.inc
index 8d16d2c1..66d9a626 100644
--- a/data/scripts/gUnk_0800B200.inc
+++ b/data/scripts/gUnk_0800B200.inc
@@ -6,13 +6,13 @@ JumpIf 0x0044
 SetEntityNonPlanarMovement 0x00c0
 StopScript 
 WaitForSomething2 0x00000001
-Call sub_0807DF28
+Call 0x0807df29
 MoveEntityToPlayer 
 CameraTargetEntity 
 _0807EDD4 0x0068, 0x0380
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
-Call sub_0807DF50
+Call 0x0807df51
 Wait 0x000c
 CameraTargetPlayer 
 Wait 0x0008
diff --git a/data/scripts/gUnk_0800B254.inc b/data/scripts/gUnk_0800B254.inc
index 8354b1c8..f6f8fe08 100644
--- a/data/scripts/gUnk_0800B254.inc
+++ b/data/scripts/gUnk_0800B254.inc
@@ -10,7 +10,46 @@ _0807E9F0
 _0807E864 
 CheckKinstoneFused 0x0006
 JumpIf 0x006e
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffe8
 .short 0x0000
+StartScript 
+CheckKinstoneFused 0x0007
+JumpIf 0x0076
+_0807EA88 0x0007
+_0807EB44 0x0002
+StopScript 
+_0807EA4C 
+_0807E9F0 
+_0807E864 
+CheckKinstoneFused 0x0007
+JumpIf 0x003e
+Call 0x0807df51
+_0807E878 
+Jump 0xffe8
+.short 0x0000
+StartScript 
+CheckKinstoneFused 0x0008
+JumpIf 0x0046
+_0807EA88 0x0008
+_0807EB44 0x0002
+StopScript 
+_0807EA4C 
+_0807E9F0 
+_0807E864 
+CheckKinstoneFused 0x0008
+JumpIf 0x000e
+Call 0x0807df51
+_0807E878 
+Jump 0xffe8
+_0807EF80 0x0013
+_0807EB44 0x0004
+_0807E9DC 
+Call 0x080676e1
+Call 0x08067535
+_0807EF80 0x0012
+_0807E5F8 0x00000001
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B284.inc b/data/scripts/gUnk_0800B284.inc
deleted file mode 100644
index 9b1da0f5..00000000
--- a/data/scripts/gUnk_0800B284.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_0800B284
-StartScript 
-CheckKinstoneFused 0x0007
-JumpIf 0x0076
-_0807EA88 0x0007
-_0807EB44 0x0002
-StopScript 
-_0807EA4C 
-_0807E9F0 
-_0807E864 
-CheckKinstoneFused 0x0007
-JumpIf 0x003e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B2B4.inc b/data/scripts/gUnk_0800B2B4.inc
deleted file mode 100644
index c149985a..00000000
--- a/data/scripts/gUnk_0800B2B4.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SCRIPT_START gUnk_0800B2B4
-StartScript 
-CheckKinstoneFused 0x0008
-JumpIf 0x0046
-_0807EA88 0x0008
-_0807EB44 0x0002
-StopScript 
-_0807EA4C 
-_0807E9F0 
-_0807E864 
-CheckKinstoneFused 0x0008
-JumpIf 0x000e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-_0807EF80 0x0013
-_0807EB44 0x0004
-_0807E9DC 
-Call sub_080676E0
-Call sub_08067534
-_0807EF80 0x0012
-_0807E5F8 0x00000001
-StopScript 
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B308.inc b/data/scripts/gUnk_0800B308.inc
index 28e72dba..382aa451 100644
--- a/data/scripts/gUnk_0800B308.inc
+++ b/data/scripts/gUnk_0800B308.inc
@@ -5,5 +5,35 @@ JumpIf 0x008c
 _0807EF80 0x0001
 SetEntityNonPlanarMovement 0x0040
 SetEntityDirection 0x0010
-.short 0x081d
-.short 0x0006
+CheckKinstoneFused 0x0006
+JumpIfNot 0x0008
+Call 0x080676d9
+CheckKinstoneFused 0x0007
+JumpIfNot 0x0008
+Call 0x080676d9
+CheckKinstoneFused 0x0008
+JumpIfNot 0x0008
+Call 0x080676d9
+StopScript 
+Call 0x0806757d
+StopScript 
+WaitForSomething2 0x00000002
+SoundReq 0x00fd
+Call 0x080676d9
+Call 0x0806757d
+Call 0x080675d5
+Wait 0x0014
+StartScript 
+_0807E5F8 0x00000001
+CheckKinstoneFused 0x0006
+JumpIfNot 0xffd0
+CheckKinstoneFused 0x0007
+JumpIfNot 0xffc8
+CheckKinstoneFused 0x0008
+JumpIfNot 0xffc0
+StopScript 
+SetLocalFlag 0x001d
+SoundReq 0x0072
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B322.inc b/data/scripts/gUnk_0800B322.inc
deleted file mode 100644
index ad122e94..00000000
--- a/data/scripts/gUnk_0800B322.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800B322
-JumpIfNot 0x0008
-.byte 0xb
-.byte 0xc
-.byte 0xd9
diff --git a/data/scripts/gUnk_0800B329.inc b/data/scripts/gUnk_0800B329.inc
deleted file mode 100644
index 8e545d3b..00000000
--- a/data/scripts/gUnk_0800B329.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SCRIPT_START gUnk_0800B329
-.byte 0x76
-.byte 0x6
-.byte 0x8
-.byte 0x1d
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0x76
-.byte 0x6
-.byte 0x8
-.byte 0x1d
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0x76
-.byte 0x6
-.byte 0x8
diff --git a/data/scripts/gUnk_0800B348.inc b/data/scripts/gUnk_0800B348.inc
deleted file mode 100644
index 63a72982..00000000
--- a/data/scripts/gUnk_0800B348.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800B348
-StopScript 
-Call sub_0806757C
-StopScript 
-WaitForSomething2 0x00000002
-.short 0x087b
-.short 0x00fd
diff --git a/data/scripts/gUnk_0800B35C.inc b/data/scripts/gUnk_0800B35C.inc
deleted file mode 100644
index eef552e6..00000000
--- a/data/scripts/gUnk_0800B35C.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800B35C
-Call sub_080676D8
-Call sub_0806757C
-Call sub_080675D4
-Wait 0x0014
-StartScript 
diff --git a/data/scripts/gUnk_0800B374.inc b/data/scripts/gUnk_0800B374.inc
deleted file mode 100644
index aab431ab..00000000
--- a/data/scripts/gUnk_0800B374.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800B374
-_0807E5F8 0x00000001
-CheckKinstoneFused 0x0006
-JumpIfNot 0xffd0
-CheckKinstoneFused 0x0007
-JumpIfNot 0xffc8
-CheckKinstoneFused 0x0008
-JumpIfNot 0xffc0
-StopScript 
-SetLocalFlag 0x001d
-SoundReq 0x0072
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc
index cfb8bc0b..79a61350 100644
--- a/data/scripts/gUnk_0800B3A4.inc
+++ b/data/scripts/gUnk_0800B3A4.inc
@@ -1,24 +1,62 @@
 SCRIPT_START gUnk_0800B3A4
 StartScript 
 _0807EF80 0x000a
-Call sub_0807F158
+Call 0x0807f159
 SetEntityNonPlanarMovement 0x0120
 _0807EB44 0x0004
 _0807E908 0x0002
 _0807E914 0x0000200a
 StopScript 
 _0807EDD4 0x0158, 0x0290
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
 _0807EDD4 0x0128, 0x0290
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-.byte 0xb
-.byte 0xc
-.byte 0x81
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Call 0x08065781
+Jump 0xffaa
+
+.globl gUnk_0800B41C
+gUnk_0800B41C:
+StartScript 
+SetEntityNonPlanarMovement 0x00c0
+_0807E908 0x0001
+_0807EF80 0x000b
+_0807E864 
+Call 0x0807fbc5
+StopScript 
+Wait 0x000a
+_0807EF80 0x0004
+_0807E5F8 0x00000008
+StartPlayerScript 0x0800b54c
+_0807EDD4 0x0140, 0x0298
+_0807EB74 
+WaitForSomething2 0x00000004
+_0807EB74 
+Wait 0x003c
+SoundReq 0x00cd
+_0807F088 0x0037
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlapFollow 0x200c
+_0807EA94 
+Wait 0x0014
+_0807EDD4 0x0158, 0x0290
+Wait 0x000a
+_0807EDD4 0x0158, 0x0288
+Wait 0x0014
+_0807E5F8 0x00000010
+_0807EDD4 0x0158, 0x0280
+Wait 0x000a
+_0807EF80 0x0008
+_0807E5F8 0x00000010
+_0807E5F8 0x00000008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B40F.inc b/data/scripts/gUnk_0800B40F.inc
deleted file mode 100644
index b71aa529..00000000
--- a/data/scripts/gUnk_0800B40F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800B40F
-.byte 0x57
-.byte 0x6
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0x81
-.byte 0x57
-.byte 0x6
-.byte 0x8
-.byte 0x3
-.byte 0x8
-.byte 0xaa
-.byte 0xff
diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc
deleted file mode 100644
index 394408ff..00000000
--- a/data/scripts/gUnk_0800B41C.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-SCRIPT_START gUnk_0800B41C
-StartScript 
-SetEntityNonPlanarMovement 0x00c0
-_0807E908 0x0001
-_0807EF80 0x000b
-_0807E864 
-Call sub_0807FBC4
-StopScript 
-Wait 0x000a
-_0807EF80 0x0004
-_0807E5F8 0x00000008
-StartPlayerScript 0x0800b54c
-_0807EDD4 0x0140, 0x0298
-_0807EB74 
-WaitForSomething2 0x00000004
-_0807EB74 
-Wait 0x003c
-SoundReq 0x00cd
-_0807F088 0x0037
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlapFollow 0x200c
-_0807EA94 
-Wait 0x0014
-_0807EDD4 0x0158, 0x0290
-Wait 0x000a
-_0807EDD4 0x0158, 0x0288
-Wait 0x0014
-_0807E5F8 0x00000010
-_0807EDD4 0x0158, 0x0280
-Wait 0x000a
-_0807EF80 0x0008
-_0807E5F8 0x00000010
-_0807E5F8 0x00000008
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800B4AC.inc b/data/scripts/gUnk_0800B4AC.inc
index 5ebfe39b..8fac7d8b 100644
--- a/data/scripts/gUnk_0800B4AC.inc
+++ b/data/scripts/gUnk_0800B4AC.inc
@@ -24,6 +24,20 @@ StopScript
 _0807E610 0x00000008
 _0807EDD4 0x0134, 0x0288
 _0807EB44 0x0004
-.short 0x0c33
-.short 0x0008
-.short 0x0000
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollow 0x2016
+_0807EA94 
+_0807EDD4 0x0158, 0x0288
+_0807EF80 0x0000
+_0807EB44 0x0000
+Wait 0x000a
+_0807E5F8 0x00000010
+_0807EF80 0x0008
+Wait 0x001e
+_0807E5F8 0x00000010
+SetGlobalFlag 0x001d
+Call 0x0807921d
+_0807E878 
+Call 0x0807fbcd
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B508.inc b/data/scripts/gUnk_0800B508.inc
deleted file mode 100644
index 30af8b50..00000000
--- a/data/scripts/gUnk_0800B508.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800B508
-TextboxNoOverlapFollow 0x2016
-_0807EA94 
-.byte 0x73
diff --git a/data/scripts/gUnk_0800B50F.inc b/data/scripts/gUnk_0800B50F.inc
deleted file mode 100644
index 956ec942..00000000
--- a/data/scripts/gUnk_0800B50F.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-SCRIPT_START gUnk_0800B50F
-.byte 0xc
-.byte 0x58
-.byte 0x1
-.byte 0x88
-.byte 0x2
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x2d
-.byte 0x8
-.byte 0x1d
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x1d
-.byte 0x92
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xcd
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800B574.inc b/data/scripts/gUnk_0800B574.inc
index c63c2a13..c07603ba 100644
--- a/data/scripts/gUnk_0800B574.inc
+++ b/data/scripts/gUnk_0800B574.inc
@@ -16,5 +16,5 @@ SoundReq 0x0111
 WaitForSomething2 0x00000010
 _0807EF80 0x0007
 SoundReq 0x0111
-Call sub_0808692C
+Call 0x0808692d
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B5C4.inc b/data/scripts/gUnk_0800B5C4.inc
index e834cb3c..18eb145d 100644
--- a/data/scripts/gUnk_0800B5C4.inc
+++ b/data/scripts/gUnk_0800B5C4.inc
@@ -7,6 +7,6 @@ Wait 0x001e
 SoundReq 0x00d1
 _0807EDD4 0x008a, 0x005a
 Wait 0x000a
-Call sub_08069EE8
+Call 0x08069ee9
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc
index fbbd3b35..dcf2a704 100644
--- a/data/scripts/gUnk_0800B5EC.inc
+++ b/data/scripts/gUnk_0800B5EC.inc
@@ -12,5 +12,60 @@ TextboxNoOverlap 0x2009
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-.short 0x0803
-.short 0xffe8
+Jump 0xffe8
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
+JumpIfNot 0xfff6
+Call 0x08079185
+_0807E864 
+Call 0x0807f9a5
+StartPlayerScript 0x0800b7c4
+WaitForSomething2 0x00000004
+SetRoomFlag 0x0000
+WaitForSomething2 0x00000004
+CheckLocalFlag 0x009e
+JumpIf 0x0154
+TextboxNoOverlap 0x0583
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x002a
+Wait 0x000f
+TextboxNoOverlap 0x0584
+CallWithArg
+.short 0xf971
+.short 0x0807
+.short 0x058b
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x001e
+CallWithArg
+.short 0x7425
+.short 0x0808
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Wait 0x00b4
+Jump 0x0024
+TextboxNoOverlap 0x057d
+_0807EA94 
+Jump 0x001a
+_0807EA94 
+SetLocalFlag 0x009e
+_0807F034 0x0066
+WaitPlayerAction8 
+_0807EB8C 
+Wait 0x001e
+TextboxNoOverlap 0x057f
+_0807EA94 
+_0807E778 0x0004
+DoFade7 
+WaitFor_2 
+Call 0x080873fd
+DoFade6 
+WaitFor_2 
+CameraTargetPlayer 
+Wait 0x001e
+Call 0x0807df51
+_0807E878 
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B614.inc b/data/scripts/gUnk_0800B614.inc
deleted file mode 100644
index 5a4caed2..00000000
--- a/data/scripts/gUnk_0800B614.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-SCRIPT_START gUnk_0800B614
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
-JumpIfNot 0xfff6
-Call sub_08079184
-_0807E864 
-Call sub_0807F9A4
-StartPlayerScript 0x0800b7c4
-WaitForSomething2 0x00000004
-SetRoomFlag 0x0000
-WaitForSomething2 0x00000004
-CheckLocalFlag 0x009e
-JumpIf 0x0154
-TextboxNoOverlap 0x0583
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x002a
-Wait 0x000f
-TextboxNoOverlap 0x0584
-CallWithArg sub_0807F970, 0x0000058b
-JumpIf 0x001e
-CallWithArg sub_08087424, 0x00000000
-Wait 0x00b4
-Jump 0x0024
-TextboxNoOverlap 0x057d
-_0807EA94 
-Jump 0x001a
-_0807EA94 
-SetLocalFlag 0x009e
-_0807F034 0x0066
-WaitPlayerAction8 
-_0807EB8C 
-Wait 0x001e
-TextboxNoOverlap 0x057f
-_0807EA94 
-_0807E778 0x0004
-DoFade7 
-WaitFor_2 
-Call sub_080873FC
-DoFade6 
-WaitFor_2 
-CameraTargetPlayer 
-Wait 0x001e
-Call sub_0807DF50
-_0807E878 
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc
index 4959b7fa..0f76ab54 100644
--- a/data/scripts/gUnk_0800B6C8.inc
+++ b/data/scripts/gUnk_0800B6C8.inc
@@ -5,12 +5,99 @@ HasRupees 0x0001
 JumpIfNot 0xfffa
 CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
 JumpIfNot 0xfff6
-Call sub_08079184
+Call 0x08079185
 _0807E864 
-Call sub_0807F9A4
+Call 0x0807f9a5
 StartPlayerScript 0x0800b7c4
 WaitForSomething2 0x00000004
 SetRoomFlag 0x0000
 WaitForSomething2 0x00000004
-.short 0x0812
-.short 0x009f
+CheckLocalFlag 0x009f
+JumpIf 0x0098
+TextboxNoOverlap 0x057b
+_0807EA94 
+CallWithArg
+.short 0xf971
+.short 0x0807
+.short 0x057d
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0xff88
+_0807EA94 
+SetLocalFlag 0x009f
+_0807F034 0x0064
+Jump 0xff6c
+.short 0x0000
+StartScript 
+StopScript 
+Call 0x0808747d
+JumpIfNot 0xfff8
+Call 0x08079185
+_0807E864 
+Wait 0x000a
+Call 0x0807f9a5
+StartPlayerScript 0x0800b7c4
+WaitForSomething2 0x00000004
+SetRoomFlag 0x0000
+WaitForSomething2 0x00000004
+CheckLocalFlag 0x00a0
+JumpIf 0x0036
+TextboxNoOverlap 0x0580
+_0807EA94 
+CallWithArg
+.short 0xf971
+.short 0x0807
+.short 0x0582
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x0014
+CallWithArg
+.short 0x7425
+.short 0x0808
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+Wait 0x00b4
+Jump 0xff14
+_0807EA94 
+SetLocalFlag 0x00a0
+_0807F034 0x0065
+Jump 0xfef8
+TextboxNoOverlap 0x0590
+_0807EA94 
+_0807E778 0x0010
+DoFade7 
+WaitFor_2 
+ModHealth 0x00a0
+DoFade6 
+WaitFor_2 
+TextboxNoOverlap 0x057f
+_0807EA94 
+Jump 0xfee6
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x0090
+.short 0x0000
+@ End of 4 parameters
+JumpIfNot 0x0024
+CallWithArg
+.short 0xf465
+.short 0x0807
+.short 0x0078
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0090
+.short 0x0000
+@ End of 4 parameters
+_0807E8E4_0 
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B708.inc b/data/scripts/gUnk_0800B708.inc
deleted file mode 100644
index f1eed151..00000000
--- a/data/scripts/gUnk_0800B708.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800B708
-JumpIf 0x0098
-TextboxNoOverlap 0x057b
-_0807EA94 
-CallWithArg sub_0807F970, 0x0000057d
-.byte 0x4
-.byte 0x8
-.byte 0x88
diff --git a/data/scripts/gUnk_0800B71F.inc b/data/scripts/gUnk_0800B71F.inc
deleted file mode 100644
index 1a53d93b..00000000
--- a/data/scripts/gUnk_0800B71F.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_0800B71F
-.byte 0xff
-.byte 0x59
-.byte 0x4
-.byte 0x2a
-.byte 0x8
-.byte 0x9f
-.byte 0x0
-.byte 0x82
-.byte 0x8
-.byte 0x64
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x6c
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800B730.inc b/data/scripts/gUnk_0800B730.inc
deleted file mode 100644
index 8455f72a..00000000
--- a/data/scripts/gUnk_0800B730.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_0800B730
-StartScript 
-StopScript 
-Call sub_0808747C
-JumpIfNot 0xfff8
-Call sub_08079184
-_0807E864 
-Wait 0x000a
-Call sub_0807F9A4
-StartPlayerScript 0x0800b7c4
-WaitForSomething2 0x00000004
-SetRoomFlag 0x0000
-WaitForSomething2 0x00000004
-CheckLocalFlag 0x00a0
-JumpIf 0x0036
-TextboxNoOverlap 0x0580
-_0807EA94 
-CallWithArg sub_0807F970, 0x00000582
-JumpIf 0x0014
-CallWithArg sub_08087424, 0x00000001
-Wait 0x00b4
-Jump 0xff14
-_0807EA94 
-SetLocalFlag 0x00a0
-_0807F034 0x0065
-Jump 0xfef8
-TextboxNoOverlap 0x0590
-_0807EA94 
-_0807E778 0x0010
-DoFade7 
-WaitFor_2 
-ModHealth 0x00a0
-DoFade6 
-WaitFor_2 
-TextboxNoOverlap 0x057f
-_0807EA94 
-Jump 0xfee6
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc
deleted file mode 100644
index 577b81e0..00000000
--- a/data/scripts/gUnk_0800B7C4.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-SCRIPT_START gUnk_0800B7C4
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-CallWithArg sub_0807F6B4, 0x00000090
-JumpIfNot 0x0024
-CallWithArg sub_0807F464, 0x00000078
-CallWithArg sub_0807F4F8, 0x00000090
-_0807E8E4_0 
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-SCRIPT_END
-.byte 0xc
-.byte 0x14
-.byte 0xf9
-.byte 0xf4
-.byte 0x7
-.byte 0x8
-.byte 0x90
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x65
-.byte 0xf4
-.byte 0x7
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xdc
-.byte 0xff
-.byte 0x1
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x53
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x51
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x1
-.byte 0xa
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xee
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x53
diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc
new file mode 100644
index 00000000..669aca86
--- /dev/null
+++ b/data/scripts/gUnk_0800B7FC.inc
@@ -0,0 +1,21 @@
+SCRIPT_START gUnk_0800B7FC
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0090
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf465
+.short 0x0807
+.short 0x0078
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffdc
+StartScript 
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc
new file mode 100644
index 00000000..3d432666
--- /dev/null
+++ b/data/scripts/gUnk_0800B828.inc
@@ -0,0 +1,128 @@
+SCRIPT_START gUnk_0800B828
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E944 
+_0807E864 
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+Wait 0x003c
+Call 0x080646a5
+Jump 0xfff4
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807EF80 0x000a
+StopScript 
+Wait 0x003c
+Call 0x0806407d
+Jump 0xfff4
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+CallWithArg
+.short 0x4645
+.short 0x0806
+.short 0x464d
+.short 0x0806
+@ End of 4 parameters
+StopScript 
+Wait 0x003c
+Call 0x080646a5
+Jump 0xfff4
+.short 0x0000
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call 0x08061fd9
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08061fd9
+Call 0x08062049
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+CheckLocalFlag 0x005f
+JumpIf 0x001c
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x3f19
+_0807EA94 
+SetLocalFlag 0x005f
+_0807E878 
+Jump 0xffe8
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x3f1a
+_0807EA94 
+_0807E878 
+Jump 0xffec
+StartScript 
+_0807EF80 0x000b
+_0807EF80 0x0008
+Call 0x0806daad
+JumpIf 0x0036
+Call 0x0806dad1
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0005
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+_0807EA4C 
+_0807E9F0 
+JumpIf 0x000e
+Call 0x0807df51
+_0807E878 
+Jump 0xffee
+Call 0x0806f189
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800B84F.inc b/data/scripts/gUnk_0800B84F.inc
deleted file mode 100644
index 88b7b333..00000000
--- a/data/scripts/gUnk_0800B84F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800B84F
-.short 0x6104
-.short 0x0408
-.short 0x7900
-.short 0x0008
-.short 0x7900
-.short 0x0a08
-.short 0x0200
-.short 0x3104
-.short 0x3c08
diff --git a/data/scripts/gUnk_0800B861.inc b/data/scripts/gUnk_0800B861.inc
deleted file mode 100644
index e39093e6..00000000
--- a/data/scripts/gUnk_0800B861.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800B861
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0x46
-.byte 0x6
-.byte 0x8
-.byte 0x3
-.byte 0x8
-.byte 0xf4
-.byte 0xff
-.byte 0x1
-.byte 0x4
-.byte 0x53
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x7d
-.byte 0x40
-.byte 0x6
-.byte 0x8
diff --git a/data/scripts/gUnk_0800B888.inc b/data/scripts/gUnk_0800B888.inc
deleted file mode 100644
index cfa4f625..00000000
--- a/data/scripts/gUnk_0800B888.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800B888
-Jump 0xfff4
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
diff --git a/data/scripts/gUnk_0800B8A0.inc b/data/scripts/gUnk_0800B8A0.inc
deleted file mode 100644
index 20de8560..00000000
--- a/data/scripts/gUnk_0800B8A0.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800B8A0
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-.short 0x0803
-.short 0xffe8
diff --git a/data/scripts/gUnk_0800B8B8.inc b/data/scripts/gUnk_0800B8B8.inc
deleted file mode 100644
index 83c890d6..00000000
--- a/data/scripts/gUnk_0800B8B8.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800B8B8
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-CallWithArg sub_08064644, 0x0806464d
-StopScript 
-Wait 0x003c
-Call sub_080646A4
-Jump 0xfff4
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B8E4.inc b/data/scripts/gUnk_0800B8E4.inc
deleted file mode 100644
index f9072d93..00000000
--- a/data/scripts/gUnk_0800B8E4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0800B8E4
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
diff --git a/data/scripts/gUnk_0800B906.inc b/data/scripts/gUnk_0800B906.inc
deleted file mode 100644
index c33d8c11..00000000
--- a/data/scripts/gUnk_0800B906.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800B906
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B91C.inc b/data/scripts/gUnk_0800B91C.inc
deleted file mode 100644
index 9f8a5c8b..00000000
--- a/data/scripts/gUnk_0800B91C.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0800B91C
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-CheckLocalFlag 0x005f
-JumpIf 0x001c
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x3f19
-_0807EA94 
-SetLocalFlag 0x005f
-_0807E878 
-Jump 0xffe8
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x3f1a
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffec
diff --git a/data/scripts/gUnk_0800B964.inc b/data/scripts/gUnk_0800B964.inc
deleted file mode 100644
index 50ab5cd7..00000000
--- a/data/scripts/gUnk_0800B964.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_0800B964
-StartScript 
-_0807EF80 0x000b
-_0807EF80 0x0008
-Call sub_0806DAAC
-JumpIf 0x0036
-Call sub_0806DAD0
-CallWithArg sub_0806DA04, 0x00000005
-StopScript 
-_0807EA4C 
-_0807E9F0 
-JumpIf 0x000e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffee
-Call sub_0806F188
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc
index 7813aa0b..1f5db32c 100644
--- a/data/scripts/gUnk_0800B9B4.inc
+++ b/data/scripts/gUnk_0800B9B4.inc
@@ -1,62 +1,79 @@
 SCRIPT_START gUnk_0800B9B4
 StartScript 
 _0807E9D4 
-Call sub_080694EC
+Call 0x080694ed
 _0807EF80 0x000a
-Call sub_080694B0
+Call 0x080694b1
 StopScript 
-Call sub_0807F434
-.short 0x1006
+Call 0x0807f435
+_0807E078
 .short 0xfff8
 .short 0x0004
 .short 0x001e
-.short 0x0443
-.short 0x0463
-.short 0x0879
-.short 0x0000
-.short 0x0c0b
-.short 0x94d9
-.short 0x0806
-.short 0x0459
-.short 0x0c0b
-.short 0x94ed
-.short 0x0806
-.short 0x0444
-.short 0x0803
-.short 0xffd8
-.short 0x0443
-.short 0x0463
-.short 0x0879
-.short 0x0000
-.short 0x0c0b
-.short 0xf651
-.short 0x0807
-.short 0x0456
-.short 0x0443
-.short 0x0c0b
-.short 0x948d
-.short 0x0806
-.short 0x0804
-.short 0x0016
-.short 0x0459
-.short 0x0c0b
-.short 0x94ed
-.short 0x0806
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0803
-.short 0xffa8
-.short 0x0459
-.short 0x0454
-.short 0x0453
-.short 0x0c0b
-.short 0x94ed
-.short 0x0806
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0803
-.short 0xff90
+@ End of 3 parameters
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+Call 0x080694d9
+_0807EA94 
+Call 0x080694ed
+_0807E878 
+Jump 0xffd8
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+Call 0x0807f651
+_0807E9F0 
+_0807E864 
+Call 0x0806948d
+JumpIf 0x0016
+_0807EA94 
+Call 0x080694ed
+Call 0x0807df51
+_0807E878 
+Jump 0xffa8
+_0807EA94 
+_0807E9DC 
+_0807E9D4 
+Call 0x080694ed
+Call 0x0807df51
+_0807E878 
+Jump 0xff90
+StartScript 
+Call 0x0807f935
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0807df29
+TextboxNoOverlapFollow 0x3301
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x000e
+SoundReq0x80100000 
+Call 0x0806e965
+SoundReq2 0xffff
+Call 0x0807df51
+_0807E878 
+Jump 0xffd0
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0040
+Call 0x0807f349
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EDD4 0x02f8, 0x0350
+Wait 0x001e
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0006
+Wait 0x001e
+_0807EDD4 0x02f0, 0x0350
+Wait 0x001e
+TextboxNoOverlap 0x0e00
+_0807EA94 
+Wait 0x0078
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BA3C.inc b/data/scripts/gUnk_0800BA3C.inc
deleted file mode 100644
index 706dbff6..00000000
--- a/data/scripts/gUnk_0800BA3C.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800BA3C
-StartScript 
-Call sub_0807F934
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlapFollow 0x3301
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x000e
-SoundReq0x80100000 
-Call sub_0806E964
-SoundReq2 0xffff
-Call sub_0807DF50
-_0807E878 
-.short 0x0803
-.short 0xffd0
diff --git a/data/scripts/gUnk_0800BA78.inc b/data/scripts/gUnk_0800BA78.inc
deleted file mode 100644
index a1b5cda4..00000000
--- a/data/scripts/gUnk_0800BA78.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800BA78
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0040
-Call sub_0807F348
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EDD4 0x02f8, 0x0350
-Wait 0x001e
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0006
-Wait 0x001e
-_0807EDD4 0x02f0, 0x0350
-Wait 0x001e
-TextboxNoOverlap 0x0e00
-_0807EA94 
-Wait 0x0078
-Call sub_08054968
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800BACC.inc b/data/scripts/gUnk_0800BACC.inc
index 6272a549..5142d095 100644
--- a/data/scripts/gUnk_0800BACC.inc
+++ b/data/scripts/gUnk_0800BACC.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BACC
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -11,5 +11,5 @@ Wait 0x003c
 TextboxNoOverlap 0x0e01
 _0807EA94 
 Wait 0x0078
-Call sub_08054968
+Call 0x08054969
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB00.inc b/data/scripts/gUnk_0800BB00.inc
index 2adf9e53..b273117b 100644
--- a/data/scripts/gUnk_0800BB00.inc
+++ b/data/scripts/gUnk_0800BB00.inc
@@ -1,5 +1,15 @@
 SCRIPT_START gUnk_0800BB00
 StartScript 
 StopScript 
-.short 0x0815
-.short 0x00ff
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e02
+_0807EA94 
+Wait 0x003c
+_0807EF80 0x000f
+Wait 0x00b4
+Call 0x08054969
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BB08.inc b/data/scripts/gUnk_0800BB08.inc
deleted file mode 100644
index 6a6a69ba..00000000
--- a/data/scripts/gUnk_0800BB08.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800BB08
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e02
-_0807EA94 
diff --git a/data/scripts/gUnk_0800BB1A.inc b/data/scripts/gUnk_0800BB1A.inc
deleted file mode 100644
index df3681ff..00000000
--- a/data/scripts/gUnk_0800BB1A.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800BB1A
-Wait 0x003c
-_0807EF80 0x000f
-Wait 0x00b4
-Call sub_08054968
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800BB30.inc b/data/scripts/gUnk_0800BB30.inc
index 75b33cd3..e10efaf7 100644
--- a/data/scripts/gUnk_0800BB30.inc
+++ b/data/scripts/gUnk_0800BB30.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BB30
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -11,5 +11,5 @@ Wait 0x003c
 TextboxNoOverlap 0x0e05
 _0807EA94 
 Wait 0x0078
-Call sub_08054968
+Call 0x08054969
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB64.inc b/data/scripts/gUnk_0800BB64.inc
index c2c7ed3d..4ce57307 100644
--- a/data/scripts/gUnk_0800BB64.inc
+++ b/data/scripts/gUnk_0800BB64.inc
@@ -3,4 +3,15 @@ StartScript
 _0807EB44 0x0006
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0040
-.short 0x0c0b
+Call 0x0807f349
+StopScript 
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807EDD4 0x03a0, 0x00f8
+Wait 0x001e
+TextboxNoOverlap 0x0e06
+_0807EA94 
+Wait 0x000f
+_0807EDD4 0x0380, 0x00f8
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB74.inc b/data/scripts/gUnk_0800BB74.inc
deleted file mode 100644
index 5c978df5..00000000
--- a/data/scripts/gUnk_0800BB74.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SCRIPT_START gUnk_0800BB74
-.short 0xf349
-.short 0x0807
-.short 0x0402
-.short 0x0815
-.short 0x00ff
-.short 0x0805
-.short 0xfffa
-.short 0x0c73
-.short 0x03a0
-.short 0x00f8
-.short 0x0831
-.short 0x001e
-.short 0x085b
-.short 0x0e06
-.short 0x0459
-.short 0x0831
-.short 0x000f
-.short 0x0c73
-.short 0x0380
-.short 0x00f8
-.short 0x0c0b
-.short 0x4969
-.short 0x0805
-.short 0xffff
diff --git a/data/scripts/gUnk_0800BBA4.inc b/data/scripts/gUnk_0800BBA4.inc
index d482264a..e76223a7 100644
--- a/data/scripts/gUnk_0800BBA4.inc
+++ b/data/scripts/gUnk_0800BBA4.inc
@@ -3,7 +3,7 @@ StartScript
 _0807EF80 0x0007
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -12,5 +12,5 @@ Wait 0x003c
 TextboxNoOverlap 0x0e04
 _0807EA94 
 Wait 0x0078
-Call sub_08054968
-.byte 0xff
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BBDB.inc b/data/scripts/gUnk_0800BBDB.inc
deleted file mode 100644
index 24df52e9..00000000
--- a/data/scripts/gUnk_0800BBDB.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800BBDB
-.byte 0xff
diff --git a/data/scripts/gUnk_0800BBDC.inc b/data/scripts/gUnk_0800BBDC.inc
index 1ddfba44..df713c93 100644
--- a/data/scripts/gUnk_0800BBDC.inc
+++ b/data/scripts/gUnk_0800BBDC.inc
@@ -9,6 +9,6 @@ Wait 0x003c
 TextboxNoOverlap 0x0e03
 _0807EA94 
 Wait 0x0078
-Call sub_08054968
+Call 0x08054969
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800BC08.inc b/data/scripts/gUnk_0800BC08.inc
index eb93a51d..eae03d7c 100644
--- a/data/scripts/gUnk_0800BC08.inc
+++ b/data/scripts/gUnk_0800BC08.inc
@@ -6,4 +6,16 @@ _0807EF80 0x0000
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
-.short 0x0879
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e07
+_0807EA94 
+StartScript 
+_0807EB44 0x0000
+_0807E930 0x0004
+StopScript 
+Wait 0x003c
+Call 0x08065ccd
+Wait 0x0078
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BC22.inc b/data/scripts/gUnk_0800BC22.inc
deleted file mode 100644
index 04efcba5..00000000
--- a/data/scripts/gUnk_0800BC22.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800BC22
-.short 0x0004
-.short 0x0831
-.short 0x003c
-.short 0x085b
-.short 0x0e07
-.short 0x0459
-.short 0x0401
-.short 0x0861
-.short 0x0000
-.short 0x0850
-.short 0x0004
-.short 0x0402
-.short 0x0831
-.short 0x003c
-.short 0x0c0b
-.short 0x5ccd
-.short 0x0806
-.short 0x0831
-.short 0x0078
-.short 0x0c0b
-.short 0x4969
-.short 0x0805
-.short 0xffff
diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc
index d6604a70..c882f9fb 100644
--- a/data/scripts/gUnk_0800BC50.inc
+++ b/data/scripts/gUnk_0800BC50.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BC50
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_08054EB8
+Call 0x08054eb9
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -15,10 +15,33 @@ _0807EA94
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
-Call sub_08054EFC
+Call 0x08054efd
 _0807EB44 0x0000
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0040
 _0807EF80 0x000d
-CallWithArg sub_0807F4F8, 0x00000378
-.short 0x0831
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0378
+.short 0x0000
+@ End of 4 parameters
+Wait 0x003c
+_0807EF80 0x000c
+Wait 0x003c
+TextboxNoOverlap 0x0e09
+_0807EA94 
+Call 0x0807f159
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x035c
+.short 0x0000
+@ End of 4 parameters
+Wait 0x001e
+SoundReq 0x0188
+_0807EF80 0x0008
+Wait 0x0078
+Call 0x08054969
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800BCAE.inc b/data/scripts/gUnk_0800BCAE.inc
deleted file mode 100644
index 24fa0f31..00000000
--- a/data/scripts/gUnk_0800BCAE.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800BCAE
-.byte 0x3c
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xc
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
diff --git a/data/scripts/gUnk_0800BCB7.inc b/data/scripts/gUnk_0800BCB7.inc
deleted file mode 100644
index 2b8b3603..00000000
--- a/data/scripts/gUnk_0800BCB7.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800BCB7
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x9
-.byte 0xe
-.byte 0x59
-.byte 0x4
diff --git a/data/scripts/gUnk_0800BCBE.inc b/data/scripts/gUnk_0800BCBE.inc
deleted file mode 100644
index 7e9644b6..00000000
--- a/data/scripts/gUnk_0800BCBE.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800BCBE
-Call sub_0807F158
-CallWithArg sub_0807F4F8, 0x0000035c
-Wait 0x001e
-SoundReq 0x0188
-_0807EF80 0x0008
-Wait 0x0078
-Call sub_08054968
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800BCE8.inc b/data/scripts/gUnk_0800BCE8.inc
index 821120f8..ae6fa3dc 100644
--- a/data/scripts/gUnk_0800BCE8.inc
+++ b/data/scripts/gUnk_0800BCE8.inc
@@ -2,10 +2,35 @@ SCRIPT_START gUnk_0800BCE8
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitFor_2 
 Wait 0x00f0
 _0807E930 0x0000
-.short 0x0831
-.short 0x003c
+Wait 0x003c
+TextboxNoOverlap 0x0e0a
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e0c
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x0168
+_0807E930 0x0000
+Wait 0x003c
+_0807EB44 0x0002
+WaitForSomething2 0x00000004
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xffe0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BD08.inc b/data/scripts/gUnk_0800BD08.inc
deleted file mode 100644
index c7002b4d..00000000
--- a/data/scripts/gUnk_0800BD08.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0800BD08
-TextboxNoOverlap 0x0e0a
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e0c
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x0168
-_0807E930 0x0000
-Wait 0x003c
-_0807EB44 0x0002
-WaitForSomething2 0x00000004
-.short 0x0867
-.short 0x0080
diff --git a/data/scripts/gUnk_0800BD70.inc b/data/scripts/gUnk_0800BD70.inc
deleted file mode 100644
index b78fa5cf..00000000
--- a/data/scripts/gUnk_0800BD70.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800BD70
-_0807EEF4 0x0000, 0xffe0
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc
index 5b8a2b22..3f21250d 100644
--- a/data/scripts/gUnk_0800BD78.inc
+++ b/data/scripts/gUnk_0800BD78.inc
@@ -4,10 +4,47 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x00000270
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0270
+.short 0x0000
+@ End of 4 parameters
 Wait 0x001e
-.short 0x085b
+TextboxNoOverlap 0x0e0b
+_0807EA94 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0088, 0x0228
+Wait 0x000f
+_0807E5F8 0x00000004
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00b4
+CallWithArg
+.short 0xbf39
+.short 0x0804
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Wait 0x00b4
+CallWithArg
+.short 0xbf39
+.short 0x0804
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+_0807EB44 0x0004
+_0807E930 0x0000
+Wait 0x003c
+_0807EB44 0x0006
+_0807E5F8 0x00000004
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xffe0
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BDAC.inc b/data/scripts/gUnk_0800BDAC.inc
deleted file mode 100644
index f534b72d..00000000
--- a/data/scripts/gUnk_0800BDAC.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SCRIPT_START gUnk_0800BDAC
-.short 0x0e0b
-.short 0x0459
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0867
-.short 0x0100
-.short 0x0c73
-.short 0x0088
diff --git a/data/scripts/gUnk_0800BDC4.inc b/data/scripts/gUnk_0800BDC4.inc
deleted file mode 100644
index 067ea5bb..00000000
--- a/data/scripts/gUnk_0800BDC4.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-SCRIPT_START gUnk_0800BDC4
-.short 0x0228
-.short 0x0831
-.short 0x000f
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0879
-.short 0x000f
-.short 0x0850
-.short 0x0008
-.short 0x0831
-.short 0x00b4
-.short 0x140c
-.short 0xbf39
-.short 0x0804
-.short 0x0000
-.short 0x0000
-.short 0x0831
-.short 0x00b4
-.short 0x140c
-.short 0xbf39
-.short 0x0804
-.short 0x0003
-.short 0x0000
-.short 0x0861
-.short 0x0004
-.short 0x0850
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x0861
-.short 0x0006
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0867
-.short 0x0080
-.short 0x0c77
-.short 0x0000
-.short 0xffe0
-.short 0x0c0b
-.short 0x4969
-.short 0x0805
-.short 0xffff
diff --git a/data/scripts/gUnk_0800BE1C.inc b/data/scripts/gUnk_0800BE1C.inc
index 6b2b425d..b69f18e9 100644
--- a/data/scripts/gUnk_0800BE1C.inc
+++ b/data/scripts/gUnk_0800BE1C.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BE1C
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -15,3 +15,33 @@ _0807E930 0x0008
 Wait 0x003c
 Jump 0x0038
 .short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call 0x0807f349
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e0f
+_0807EA94 
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BE54.inc b/data/scripts/gUnk_0800BE54.inc
deleted file mode 100644
index 42dc4998..00000000
--- a/data/scripts/gUnk_0800BE54.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_0800BE54
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e0f
-_0807EA94 
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc
index 28a6b12a..798e02bd 100644
--- a/data/scripts/gUnk_0800BECC.inc
+++ b/data/scripts/gUnk_0800BECC.inc
@@ -4,15 +4,27 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x000001b8
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x01b8
+.short 0x0000
+@ End of 4 parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e0e
 _0807EA94 
 _0807E5F8 0x0000000c
 WaitForSomething2 0x00000002
-.short 0x0867
-.short 0x0100
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0088, 0x0178
+Wait 0x000f
+_0807E5F8 0x0000000c
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BF14.inc b/data/scripts/gUnk_0800BF14.inc
deleted file mode 100644
index 5b723169..00000000
--- a/data/scripts/gUnk_0800BF14.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800BF14
-_0807EDD4 0x0088, 0x0178
-Wait 0x000f
-_0807E5F8 0x0000000c
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
-Call sub_08054968
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800BF38.inc b/data/scripts/gUnk_0800BF38.inc
index e303ed9b..1d1fb1b8 100644
--- a/data/scripts/gUnk_0800BF38.inc
+++ b/data/scripts/gUnk_0800BF38.inc
@@ -2,5 +2,52 @@ SCRIPT_START gUnk_0800BF38
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0002
+Wait 0x003c
+TextboxNoOverlap 0x0e10
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+Jump 0x0038
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call 0x0807f349
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e12
+_0807EA94 
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x0168
+_0807EB44 0x0004
+_0807E930 0x0000
+Wait 0x003c
+Call 0x08054f65
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xffe0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800BF4A.inc b/data/scripts/gUnk_0800BF4A.inc
deleted file mode 100644
index ddf24f2c..00000000
--- a/data/scripts/gUnk_0800BF4A.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800BF4A
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0002
-Wait 0x003c
-TextboxNoOverlap 0x0e10
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-Jump 0x0038
-.short 0x0000
diff --git a/data/scripts/gUnk_0800BF70.inc b/data/scripts/gUnk_0800BF70.inc
deleted file mode 100644
index 408ef7b0..00000000
--- a/data/scripts/gUnk_0800BF70.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SCRIPT_START gUnk_0800BF70
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-.byte 0x50
-.byte 0x8
-.byte 0x0
diff --git a/data/scripts/gUnk_0800BFBF.inc b/data/scripts/gUnk_0800BFBF.inc
deleted file mode 100644
index a8c6bbcc..00000000
--- a/data/scripts/gUnk_0800BFBF.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_0800BFBF
-.short 0x7900
-.short 0x0408
-.short 0x3100
-.short 0x3c08
-.short 0x5b00
-.short 0x1208
-.short 0x590e
-.short 0x2804
-.short 0x020c
-.short 0x0000
-.short 0x0b00
-.short 0x650c
-.short 0x054f
-.short 0x7908
-.short 0x0f08
-.short 0x5000
-.short 0x0808
diff --git a/data/scripts/gUnk_0800BFE1.inc b/data/scripts/gUnk_0800BFE1.inc
deleted file mode 100644
index 2d042c6e..00000000
--- a/data/scripts/gUnk_0800BFE1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800BFE1
-.short 0x3100
diff --git a/data/scripts/gUnk_0800BFE3.inc b/data/scripts/gUnk_0800BFE3.inc
deleted file mode 100644
index b017f9dc..00000000
--- a/data/scripts/gUnk_0800BFE3.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_0800BFE3
-.byte 0x8
-.byte 0x68
-.byte 0x1
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x65
-.byte 0x4f
-.byte 0x5
-.byte 0x8
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xe0
-.byte 0xff
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc
index 5dec75b5..601bb052 100644
--- a/data/scripts/gUnk_0800C004.inc
+++ b/data/scripts/gUnk_0800C004.inc
@@ -1,3 +1,51 @@
 SCRIPT_START gUnk_0800C004
 StartScript 
-.byte 0x61
+_0807EB44 0x0000
+_0807E930 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+Call 0x0807f349
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0007
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x01b8
+.short 0x0000
+@ End of 4 parameters
+Wait 0x001e
+TextboxNoOverlap 0x0e11
+_0807EA94 
+_0807E5F8 0x0000001c
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0088, 0x0188
+_0807EDD4 0x00a8, 0x0188
+_0807EDD4 0x00a8, 0x0178
+Wait 0x000f
+_0807E5F8 0x0000001c
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00b4
+CallWithArg
+.short 0xbf39
+.short 0x0804
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+Wait 0x00b4
+CallWithArg
+.short 0xbf39
+.short 0x0804
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+_0807EB44 0x0004
+_0807E930 0x0000
+Wait 0x003c
+_0807E5F8 0x0000001c
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xffe0
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C007.inc b/data/scripts/gUnk_0800C007.inc
deleted file mode 100644
index 93a41138..00000000
--- a/data/scripts/gUnk_0800C007.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800C007
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x49
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800C024.inc b/data/scripts/gUnk_0800C024.inc
deleted file mode 100644
index bd53a68a..00000000
--- a/data/scripts/gUnk_0800C024.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800C024
-_0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x000001b8
-Wait 0x001e
-TextboxNoOverlap 0x0e11
-_0807EA94 
-_0807E5F8 0x0000001c
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0088, 0x0188
-_0807EDD4 0x00a8, 0x0188
-_0807EDD4 0x00a8, 0x0178
-Wait 0x000f
-_0807E5F8 0x0000001c
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00b4
-.byte 0xc
-.byte 0x14
-.byte 0x39
-.byte 0xbf
-.byte 0x4
-.byte 0x8
-.byte 0x1
diff --git a/data/scripts/gUnk_0800C07B.inc b/data/scripts/gUnk_0800C07B.inc
deleted file mode 100644
index a4a862a0..00000000
--- a/data/scripts/gUnk_0800C07B.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-SCRIPT_START gUnk_0800C07B
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xb4
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x39
-.byte 0xbf
-.byte 0x4
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1c
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xe0
-.byte 0xff
-.byte 0xb
-.byte 0xc
-.byte 0x69
-.byte 0x49
-.byte 0x5
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800C0B0.inc b/data/scripts/gUnk_0800C0B0.inc
index 15a249fa..c76513b8 100644
--- a/data/scripts/gUnk_0800C0B0.inc
+++ b/data/scripts/gUnk_0800C0B0.inc
@@ -2,9 +2,46 @@ SCRIPT_START gUnk_0800C0B0
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitFor_2 
-.byte 0x31
-.byte 0x8
-.byte 0xf0
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0002
+Wait 0x003c
+TextboxNoOverlap 0x0e13
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+Jump 0x0038
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call 0x0807f349
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e15
+_0807EA94 
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00f0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C0C7.inc b/data/scripts/gUnk_0800C0C7.inc
deleted file mode 100644
index e61e836e..00000000
--- a/data/scripts/gUnk_0800C0C7.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800C0C7
-.short 0x5000
-.short 0x0008
-.short 0x6100
-.short 0x0208
-.short 0x3100
-.short 0x3c08
diff --git a/data/scripts/gUnk_0800C0D3.inc b/data/scripts/gUnk_0800C0D3.inc
deleted file mode 100644
index 618999db..00000000
--- a/data/scripts/gUnk_0800C0D3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800C0D3
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x13
-.byte 0xe
-.byte 0x59
-.byte 0x4
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x38
-.byte 0x0
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800C0E8.inc b/data/scripts/gUnk_0800C0E8.inc
deleted file mode 100644
index 3a9d782b..00000000
--- a/data/scripts/gUnk_0800C0E8.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800C0E8
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-.byte 0x31
diff --git a/data/scripts/gUnk_0800C113.inc b/data/scripts/gUnk_0800C113.inc
deleted file mode 100644
index 84c4b088..00000000
--- a/data/scripts/gUnk_0800C113.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_0800C113
-.short 0x3c08
-.short 0x2800
-.short 0x010c
-.short 0x0000
-.short 0x6100
-.short 0x0408
-.short 0x1500
-.short 0xff08
-.short 0x0500
-.short 0xfa08
-.short 0x28ff
-.short 0x020c
-.short 0x0000
-.short 0x0b00
-.short 0x650c
-.short 0x054f
-.short 0x5008
-.short 0x0008
-.short 0x7900
-.short 0x0408
-.short 0x3100
-.short 0x3c08
-.short 0x5b00
-.short 0x1508
-.short 0x590e
-.short 0x2804
diff --git a/data/scripts/gUnk_0800C147.inc b/data/scripts/gUnk_0800C147.inc
deleted file mode 100644
index b0009dae..00000000
--- a/data/scripts/gUnk_0800C147.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0800C147
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x65
-.byte 0x4f
-.byte 0x5
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf0
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc
index 640e28e1..00822a1e 100644
--- a/data/scripts/gUnk_0800C160.inc
+++ b/data/scripts/gUnk_0800C160.inc
@@ -4,11 +4,16 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x00000128
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0128
+.short 0x0000
+@ End of 4 parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e14
 _0807EA94 
@@ -23,5 +28,5 @@ _0807E5F8 0x0000003c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
-Call sub_08054968
+Call 0x08054969
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C1D8.inc b/data/scripts/gUnk_0800C1D8.inc
index e1cfa5ce..42c3c426 100644
--- a/data/scripts/gUnk_0800C1D8.inc
+++ b/data/scripts/gUnk_0800C1D8.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C1D8
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -11,4 +11,43 @@ _0807EB44 0x0002
 Wait 0x003c
 TextboxNoOverlap 0x0e16
 _0807EA94 
-.short 0x0850
+_0807E930 0x0008
+Wait 0x003c
+Jump 0x0038
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0008
+Call 0x0807f349
+StopScript 
+WaitFor_2 
+Wait 0x00f0
+_0807E930 0x0000
+_0807EB44 0x0006
+Wait 0x003c
+_0807EA94 
+_0807E930 0x0008
+Wait 0x003c
+_0807E5F8 0x00000001
+_0807EB44 0x0004
+CheckRoomFlag 0x00ff
+JumpIfNot 0xfffa
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807E930 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x0e18
+_0807EA94 
+_0807E5F8 0x00000002
+Call 0x08054f65
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x0168
+_0807EB44 0x0004
+_0807E930 0x0000
+Wait 0x003c
+Call 0x08054f65
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xffe0
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C204.inc b/data/scripts/gUnk_0800C204.inc
deleted file mode 100644
index 09738cda..00000000
--- a/data/scripts/gUnk_0800C204.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800C204
-.byte 0x8
-.byte 0x0
-.byte 0x31
diff --git a/data/scripts/gUnk_0800C207.inc b/data/scripts/gUnk_0800C207.inc
deleted file mode 100644
index a5784088..00000000
--- a/data/scripts/gUnk_0800C207.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800C207
-.byte 0x8
diff --git a/data/scripts/gUnk_0800C208.inc b/data/scripts/gUnk_0800C208.inc
deleted file mode 100644
index 8ee04842..00000000
--- a/data/scripts/gUnk_0800C208.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800C208
-.short 0x003c
-.short 0x0803
-.short 0x0038
-.short 0x0000
diff --git a/data/scripts/gUnk_0800C210.inc b/data/scripts/gUnk_0800C210.inc
deleted file mode 100644
index 8910ab47..00000000
--- a/data/scripts/gUnk_0800C210.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800C210
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807E930 0x0000
-.byte 0x79
-.byte 0x8
-.byte 0x4
diff --git a/data/scripts/gUnk_0800C263.inc b/data/scripts/gUnk_0800C263.inc
deleted file mode 100644
index b240a0a8..00000000
--- a/data/scripts/gUnk_0800C263.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-SCRIPT_START gUnk_0800C263
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x18
-.byte 0xe
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x65
-.byte 0x4f
-.byte 0x5
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x68
-.byte 0x1
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x65
-.byte 0x4f
-.byte 0x5
-.byte 0x8
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xe0
-.byte 0xff
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc
index 0b5e3f88..a70e1354 100644
--- a/data/scripts/gUnk_0800C2A4.inc
+++ b/data/scripts/gUnk_0800C2A4.inc
@@ -1,3 +1,51 @@
 SCRIPT_START gUnk_0800C2A4
 StartScript 
-.byte 0x61
+_0807EB44 0x0000
+_0807E930 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0080
+Call 0x0807f349
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0007
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0128
+.short 0x0000
+@ End of 4 parameters
+Wait 0x001e
+TextboxNoOverlap 0x0e17
+_0807EA94 
+_0807E5F8 0x0000007c
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0098, 0x00e8
+_0807EDD4 0x00c8, 0x00e8
+_0807EDD4 0x00c8, 0x00d8
+Wait 0x000f
+_0807E5F8 0x0000007c
+_0807EF80 0x000f
+_0807E930 0x0008
+Wait 0x00b4
+CallWithArg
+.short 0xbf39
+.short 0x0804
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+Wait 0x00b4
+CallWithArg
+.short 0xbf39
+.short 0x0804
+.short 0x0005
+.short 0x0000
+@ End of 4 parameters
+_0807EB44 0x0004
+_0807E930 0x0000
+Wait 0x003c
+_0807E5F8 0x0000007c
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xffe0
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C2A7.inc b/data/scripts/gUnk_0800C2A7.inc
deleted file mode 100644
index af14966b..00000000
--- a/data/scripts/gUnk_0800C2A7.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800C2A7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x49
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0xf9
-.byte 0xf4
-.byte 0x7
-.byte 0x8
diff --git a/data/scripts/gUnk_0800C2CE.inc b/data/scripts/gUnk_0800C2CE.inc
deleted file mode 100644
index e3998876..00000000
--- a/data/scripts/gUnk_0800C2CE.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-SCRIPT_START gUnk_0800C2CE
-.short 0x0128
-.short 0x0000
-.short 0x0831
-.short 0x001e
-.short 0x085b
-.short 0x0e17
-.short 0x0459
-.short 0x0c28
-.short 0x007c
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0867
-.short 0x0100
-.short 0x0c73
-.short 0x0098
-.short 0x00e8
-.short 0x0c73
-.short 0x00c8
-.short 0x00e8
-.short 0x0c73
-.short 0x00c8
-.short 0x00d8
-.short 0x0831
-.short 0x000f
-.short 0x0c28
-.short 0x007c
-.short 0x0000
-.short 0x0879
-.short 0x000f
-.short 0x0850
-.short 0x0008
-.short 0x0831
-.short 0x00b4
-.short 0x140c
-.short 0xbf39
-.short 0x0804
-.short 0x0002
-.short 0x0000
-.short 0x0831
-.short 0x00b4
-.short 0x140c
-.short 0xbf39
-.short 0x0804
-.short 0x0005
-.short 0x0000
-.short 0x0861
-.short 0x0004
-.short 0x0850
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x007c
-.short 0x0000
-.short 0x0867
-.short 0x0080
-.short 0x0c77
-.short 0x0000
-.short 0xffe0
-.short 0x0c0b
-.short 0x4969
-.short 0x0805
-.short 0xffff
diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc
index 1e6ef99c..09f24bd4 100644
--- a/data/scripts/gUnk_0800C350.inc
+++ b/data/scripts/gUnk_0800C350.inc
@@ -1,15 +1,13 @@
 SCRIPT_START gUnk_0800C350
 StartScript 
-CallWithArg sub_0806D658, 0x00000003
+CallWithArg
+.short 0xd659
+.short 0x0806
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 SetEntityNonPlanarMovement 0x0200
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
 _0807F0C8 0xffff, 0x0000
-_0807EEF4 0xfff8, 0x0000
-_0807EEF4 0x0010, 0x0000
-_0807EEF4 0xfff0, 0x0000
-_0807EEF4 0x0010, 0x0000
-_0807EEF4 0xfff8, 0x0000
-_0807F0C8 0x0000, 0x0000
-.short 0x0831
diff --git a/data/scripts/gUnk_0800C370.inc b/data/scripts/gUnk_0800C370.inc
new file mode 100644
index 00000000..fd5fa9a1
--- /dev/null
+++ b/data/scripts/gUnk_0800C370.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800C370
+_0807EEF4 0xfff8, 0x0000
+_0807EEF4 0x0010, 0x0000
+_0807EEF4 0xfff0, 0x0000
+_0807EEF4 0x0010, 0x0000
+_0807EEF4 0xfff8, 0x0000
+_0807F0C8 0x0000, 0x0000
+Wait 0x001e
+TextboxNoOverlap 0x1d00
+_0807EA94 
+_0807E5F8 0x00000006
+WaitForSomething2 0x00000001
+_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800C396.inc b/data/scripts/gUnk_0800C396.inc
deleted file mode 100644
index 7dec0c3d..00000000
--- a/data/scripts/gUnk_0800C396.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SCRIPT_START gUnk_0800C396
-.short 0x001e
-.short 0x085b
-.short 0x1d00
-.short 0x0459
-.short 0x0c28
-.short 0x0006
-.short 0x0000
-.short 0x0c33
-.short 0x0001
-.short 0x0000
-.short 0x0c8a
-.short 0xffff
-.short 0x0000
-.short 0x0867
-.short 0x0080
-.short 0x0c77
-.short 0x0000
-.short 0xff30
-.short 0x0c8a
-.short 0x0000
-.short 0x0000
-.short 0x0831
-.short 0x00b4
-.short 0x0c0b
-.short 0x4969
-.short 0x0805
-.short 0xffff
diff --git a/data/scripts/gUnk_0800C3B0.inc b/data/scripts/gUnk_0800C3B0.inc
new file mode 100644
index 00000000..1f3baa88
--- /dev/null
+++ b/data/scripts/gUnk_0800C3B0.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800C3B0
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xff30
+_0807F0C8 0x0000, 0x0000
+Wait 0x00b4
+Call 0x08054969
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc
index d87deb67..eed6a726 100644
--- a/data/scripts/gUnk_0800C3CC.inc
+++ b/data/scripts/gUnk_0800C3CC.inc
@@ -1,13 +1,24 @@
 SCRIPT_START gUnk_0800C3CC
 StartScript 
-Call sub_0806D660
+Call 0x0806d661
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000002
-CallWithArg sub_0807F4F8, 0x00000048
-Call sub_0806D66C
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0048
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806d66d
 Wait 0x000f
-CallWithArg sub_0807F4F8, 0x00000068
-Call sub_0806D67C
-.short 0x0c8a
-.short 0x001e
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0068
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806d67d
+_0807F0C8 0x001e, 0x0000
+SoundReq 0x010b
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C408.inc b/data/scripts/gUnk_0800C408.inc
deleted file mode 100644
index 137a4b9a..00000000
--- a/data/scripts/gUnk_0800C408.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800C408
-.short 0x0000
-.short 0x087b
-.short 0x010b
-.short 0xffff
diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc
index f3ddc136..765f1946 100644
--- a/data/scripts/gUnk_0800C410.inc
+++ b/data/scripts/gUnk_0800C410.inc
@@ -1,14 +1,24 @@
 SCRIPT_START gUnk_0800C410
 StartScript 
-Call sub_0806D660
+Call 0x0806d661
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000004
-CallWithArg sub_0807F4F8, 0x00000048
-Call sub_0806D66C
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0048
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806d66d
 Wait 0x000f
-CallWithArg sub_0807F4F8, 0x00000068
-Call sub_0806D67C
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x0068
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806d67d
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
 _0807E5F8 0x00000001
diff --git a/data/scripts/gUnk_0800C45C.inc b/data/scripts/gUnk_0800C45C.inc
index 64c371f7..c8521d8a 100644
--- a/data/scripts/gUnk_0800C45C.inc
+++ b/data/scripts/gUnk_0800C45C.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C45C
 StartScript 
 SetEntityNonPlanarMovement 0x0180
 _0807E930 0x0004
-Call sub_080A0B28
+Call 0x080a0b29
 StopScript 
 Wait 0x000a
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800C4D0.inc b/data/scripts/gUnk_0800C4D0.inc
index 8e8f296b..e7a1fff9 100644
--- a/data/scripts/gUnk_0800C4D0.inc
+++ b/data/scripts/gUnk_0800C4D0.inc
@@ -2,4 +2,16 @@ SCRIPT_START gUnk_0800C4D0
 StartScript 
 SetEntityNonPlanarMovement 0x0180
 _0807E930 0x0004
-.byte 0x2
+StopScript 
+Wait 0x000a
+_0807EF80 0x0007
+SoundReq 0x0136
+_0807EEF4 0x00c0, 0x0000
+Wait 0x001e
+_0807EEF4 0x0070, 0x0000
+Wait 0x003c
+SetRoomFlag 0x00ff
+_0807E930 0x0005
+Wait 0x000f
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800C4DB.inc b/data/scripts/gUnk_0800C4DB.inc
deleted file mode 100644
index da705f95..00000000
--- a/data/scripts/gUnk_0800C4DB.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SCRIPT_START gUnk_0800C4DB
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x36
-.byte 0x1
-.byte 0x77
-.byte 0xc
-.byte 0xc0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x70
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x2f
-.byte 0x8
-.byte 0xff
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x5
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800C50C.inc b/data/scripts/gUnk_0800C50C.inc
index 5ca23758..74c33a3a 100644
--- a/data/scripts/gUnk_0800C50C.inc
+++ b/data/scripts/gUnk_0800C50C.inc
@@ -4,8 +4,15 @@ SetEntityNonPlanarMovement 0x0100
 _0807E930 0x0004
 _0807EF80 0x0008
 StopScript 
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
+WaitForSomething2 0x00000001
+Wait 0x000a
+_0807EF80 0x0007
+SoundReq 0x0136
+_0807EEF4 0x0000, 0x0060
+Wait 0x003c
+_0807EEF4 0x0000, 0x0060
+Wait 0x001e
+SetRoomFlag 0x00ff
+_0807E930 0x0005
+Wait 0x000f
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C521.inc b/data/scripts/gUnk_0800C521.inc
deleted file mode 100644
index 2f6c09a3..00000000
--- a/data/scripts/gUnk_0800C521.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-SCRIPT_START gUnk_0800C521
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x36
-.byte 0x1
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x60
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x60
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x2f
-.byte 0x8
-.byte 0xff
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x5
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800C550.inc b/data/scripts/gUnk_0800C550.inc
index 7a0f8f86..ccbc8d09 100644
--- a/data/scripts/gUnk_0800C550.inc
+++ b/data/scripts/gUnk_0800C550.inc
@@ -1,4 +1,253 @@
 SCRIPT_START gUnk_0800C550
 StartScript 
-.short 0x0c0b
-.short 0x0091
+Call 0x08060091
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x08060159
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x08060209
+_0807EA94 
+_0807E878 
+Jump 0xffdc
+StartScript 
+Call 0x08060091
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x08060159
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+CheckInventory1 0x0067
+JumpIfNot 0x000c
+Call 0x08060209
+Jump 0x0006
+TextboxNoOverlap 0x4710
+_0807EA94 
+_0807E878 
+Jump 0xffcc
+StartScript 
+Call 0x08060091
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x08060159
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x08060271
+_0807EA94 
+_0807E878 
+Jump 0xffdc
+StartScript 
+Call 0x08060091
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x08060159
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x0806021d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd8
+StartScript 
+_0807EF80 0x000a
+SetEntityNonPlanarMovement 0x0080
+_0807EB44 0x0004
+CheckLocalFlag 0x0082
+JumpIfNot 0x0008
+SetEntityPosition 0x0010, 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+Call 0x0807df29
+CheckLocalFlag 0x0082
+JumpIf 0x0022
+CheckPlayerInRegion 0x00e8, 0x0028, 0x1810
+JumpIfNot 0x0006
+_0807EF80 0x000b
+StartPlayerScript 0x0800c8c8
+WaitForSomething2 0x00000001
+_0807EF80 0x000a
+CheckInventory1 0x0040
+JumpIf 0x00a6
+CheckInventory1 0x005b
+JumpIf 0x0024
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f16
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+SetLocalFlag 0x0080
+Call 0x0807df51
+_0807E878 
+Jump 0xff9e
+CheckLocalFlag 0x0081
+JumpIf 0x0020
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f1b
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call 0x0807df51
+_0807E878 
+Jump 0xff78
+CheckLocalFlag 0x0082
+JumpIf 0x0030
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f17
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807EC94 0x0020
+_0807EB44 0x0004
+Wait 0x000f
+SoundReq 0x0072
+SetLocalFlag 0x0082
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f18
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call 0x0807df51
+_0807E878 
+Jump 0xff24
+CheckLocalFlag 0x0083
+JumpIf 0x0020
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f19
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call 0x0807df51
+_0807E878 
+Jump 0xfefe
+_0807EF80 0x0002
+TextboxNoOverlapFollow 0x1f1a
+_0807EA94 
+_0807EF80 0x0015
+Wait 0x000a
+Call 0x0807df51
+_0807E878 
+Jump 0xfee0
+StartScript 
+_0807EF80 0x000a
+_0807EB44 0x0004
+StopScript 
+_0807E944 
+_0807E864 
+Call 0x0807df29
+StartPlayerScript 0x0800c8f0
+WaitForSomething2 0x00000001
+CheckInventory1 0x0040
+JumpIf 0x0088
+CheckInventory1 0x005b
+JumpIf 0x001c
+_0807E930 0x0008
+TextboxNoOverlapFollow 0x2122
+_0807EA94 
+_0807EF80 0x0000
+Call 0x0807df51
+_0807E878 
+Jump 0xffc2
+_0807E930 0x0008
+CheckLocalFlag 0x0081
+JumpIf 0x0040
+TextboxNoOverlapFollow 0x1130
+_0807EA94 
+_0807EB28 0x1131
+_0807EA94 
+_0807EB8C 
+TextboxNoOverlapFollow 0x1132
+_0807EA94 
+_0807E914 0x00000103
+Call 0x0807f421
+TextboxNoOverlapFollow 0x1133
+_0807EA94 
+Wait 0x000a
+_0807EF80 0x0000
+SetLocalFlag 0x0081
+Call 0x0807df51
+_0807E878 
+Jump 0xff78
+TextboxNoOverlapFollow 0x1133
+_0807EA94 
+Wait 0x000a
+_0807E930 0x0000
+Call 0x0807df51
+_0807E878 
+Jump 0xff5e
+_0807E930 0x0008
+CheckLocalFlag 0x0083
+JumpIf 0x0080
+TextboxNoOverlapFollow 0x1135
+_0807EA94 
+SetEntityNonPlanarMovement 0x0040
+_0807EDD4 0x0038, 0x0044
+_0807EF80 0x0000
+Wait 0x000f
+SetLocalFlag 0x0083
+Wait 0x003c
+SoundReq 0x0072
+Wait 0x003c
+_0807EB74 
+_0807EB8C 
+TextboxNoOverlapFollow 0x1136
+_0807EA94 
+_0807EB28 0x1137
+_0807EA94 
+Wait 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+Call 0x0807df51
+_0807E878 
+_0807E944 
+_0807E864 
+Call 0x0807df29
+_0807EB74 
+_0807E914 0x00000008
+Call 0x0807f3d9
+TextboxNoOverlapFollow 0x1136
+_0807EA94 
+Wait 0x000a
+_0807EF80 0x0000
+Call 0x0807df51
+_0807E878 
+Jump 0xffd0
+TextboxNoOverlapFollow 0x1136
+_0807EA94 
+Wait 0x000a
+_0807EF80 0x0000
+Call 0x0807df51
+_0807E878 
+Jump 0xfeba
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x00e8, 0x0068
+_0807EB44 0x0000
+Wait 0x000f
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C556.inc b/data/scripts/gUnk_0800C556.inc
deleted file mode 100644
index 5a8ed43c..00000000
--- a/data/scripts/gUnk_0800C556.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SCRIPT_START gUnk_0800C556
-_0807E078 0x0879
-.short 0x000a
-.short 0x0402
-.short 0x0401
-.short 0x0418
-.short 0x0804
-.short 0x000e
-.short 0x0c0b
-.short 0x0159
-.short 0x0806
-.short 0x0402
-.short 0x0803
-.short 0xffee
-.short 0x0402
-.short 0x0443
-.short 0x0c0b
-.short 0x0209
-.short 0x0806
-.short 0x0459
-.short 0x0444
-.short 0x0803
-.short 0xffdc
diff --git a/data/scripts/gUnk_0800C584.inc b/data/scripts/gUnk_0800C584.inc
deleted file mode 100644
index 59348d00..00000000
--- a/data/scripts/gUnk_0800C584.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800C584
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-.short 0x0804
-.short 0x000e
diff --git a/data/scripts/gUnk_0800C59A.inc b/data/scripts/gUnk_0800C59A.inc
deleted file mode 100644
index a49738d8..00000000
--- a/data/scripts/gUnk_0800C59A.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800C59A
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-CheckInventory1 0x0067
-JumpIfNot 0x000c
-Call sub_08060208
-Jump 0x0006
-TextboxNoOverlap 0x4710
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffcc
diff --git a/data/scripts/gUnk_0800C5C8.inc b/data/scripts/gUnk_0800C5C8.inc
deleted file mode 100644
index a6b4ea0b..00000000
--- a/data/scripts/gUnk_0800C5C8.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_0800C5C8
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_08060270
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffdc
diff --git a/data/scripts/gUnk_0800C5FC.inc b/data/scripts/gUnk_0800C5FC.inc
deleted file mode 100644
index 5b7a5d0c..00000000
--- a/data/scripts/gUnk_0800C5FC.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800C5FC
-StartScript 
-.short 0x0c0b
diff --git a/data/scripts/gUnk_0800C600.inc b/data/scripts/gUnk_0800C600.inc
deleted file mode 100644
index bb7b571a..00000000
--- a/data/scripts/gUnk_0800C600.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800C600
-.byte 0x91
-.byte 0x0
-.byte 0x6
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0xa
diff --git a/data/scripts/gUnk_0800C607.inc b/data/scripts/gUnk_0800C607.inc
deleted file mode 100644
index 4fb7cc8b..00000000
--- a/data/scripts/gUnk_0800C607.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-SCRIPT_START gUnk_0800C607
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x4
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0x1
-.byte 0x6
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xee
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x1d
-.byte 0x2
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xd8
-.byte 0xff
diff --git a/data/scripts/gUnk_0800C634.inc b/data/scripts/gUnk_0800C634.inc
deleted file mode 100644
index e338ca4d..00000000
--- a/data/scripts/gUnk_0800C634.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_0800C634
-StartScript 
-_0807EF80 0x000a
-SetEntityNonPlanarMovement 0x0080
-_0807EB44 0x0004
-CheckLocalFlag 0x0082
-JumpIfNot 0x0008
-SetEntityPosition 0x0010, 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x0082
-JumpIf 0x0022
-CheckPlayerInRegion 0x00e8, 0x0028, 0x1810
-JumpIfNot 0x0006
-_0807EF80 0x000b
-StartPlayerScript 0x0800c8c8
-WaitForSomething2 0x00000001
-_0807EF80 0x000a
-CheckInventory1 0x0040
-JumpIf 0x00a6
-CheckInventory1 0x005b
-JumpIf 0x0024
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f16
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-SetLocalFlag 0x0080
-Call sub_0807DF50
-_0807E878 
-Jump 0xff9e
-CheckLocalFlag 0x0081
-JumpIf 0x0020
-_0807EF80 0x0002
-.short 0x085a
-.short 0x1f1b
diff --git a/data/scripts/gUnk_0800C6C6.inc b/data/scripts/gUnk_0800C6C6.inc
deleted file mode 100644
index ac56f554..00000000
--- a/data/scripts/gUnk_0800C6C6.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-SCRIPT_START gUnk_0800C6C6
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xff78
-CheckLocalFlag 0x0082
-JumpIf 0x0030
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f17
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807EC94 0x0020
-_0807EB44 0x0004
-Wait 0x000f
-SoundReq 0x0072
-SetLocalFlag 0x0082
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f18
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xff24
-CheckLocalFlag 0x0083
-JumpIf 0x0020
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f19
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xfefe
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f1a
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-.short 0x0803
-.short 0xfee0
diff --git a/data/scripts/gUnk_0800C774.inc b/data/scripts/gUnk_0800C774.inc
deleted file mode 100644
index d22d801d..00000000
--- a/data/scripts/gUnk_0800C774.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800C774
-StartScript 
-.byte 0x79
-.byte 0x8
-.byte 0xa
diff --git a/data/scripts/gUnk_0800C779.inc b/data/scripts/gUnk_0800C779.inc
deleted file mode 100644
index b1a24810..00000000
--- a/data/scripts/gUnk_0800C779.inc
+++ /dev/null
@@ -1,144 +0,0 @@
-SCRIPT_START gUnk_0800C779
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x51
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x47
-.byte 0xc
-.byte 0xf0
-.byte 0xc8
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xf
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x88
-.byte 0x0
-.byte 0xf
-.byte 0x8
-.byte 0x5b
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x1c
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x22
-.byte 0x21
-.byte 0x59
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xc2
-.byte 0xff
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x12
-.byte 0x8
-.byte 0x81
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x30
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x5f
-.byte 0x8
-.byte 0x31
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x32
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x4e
-.byte 0xc
-.byte 0x3
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x21
-.byte 0xf4
-.byte 0x7
-.byte 0x8
-.byte 0x5a
-.byte 0x8
-.byte 0x33
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0x81
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
diff --git a/data/scripts/gUnk_0800C808.inc b/data/scripts/gUnk_0800C808.inc
deleted file mode 100644
index 4e4b50ab..00000000
--- a/data/scripts/gUnk_0800C808.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-SCRIPT_START gUnk_0800C808
-.byte 0x78
-.byte 0xff
-.byte 0x5a
-.byte 0x8
-.byte 0x33
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x5e
-.byte 0xff
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x12
-.byte 0x8
-.byte 0x83
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x80
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x35
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x67
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x38
-.byte 0x0
-.byte 0x44
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0x83
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x72
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x36
-.byte 0x11
-.byte 0x59
diff --git a/data/scripts/gUnk_0800C861.inc b/data/scripts/gUnk_0800C861.inc
deleted file mode 100644
index ee142128..00000000
--- a/data/scripts/gUnk_0800C861.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-SCRIPT_START gUnk_0800C861
-.byte 0x4
-.byte 0x5f
-.byte 0x8
-.byte 0x37
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x51
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x63
-.byte 0x4
-.byte 0x4e
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x5a
-.byte 0x8
-.byte 0x36
-.byte 0x11
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xd0
-.byte 0xff
-.byte 0x5a
-.byte 0x8
diff --git a/data/scripts/gUnk_0800C8B0.inc b/data/scripts/gUnk_0800C8B0.inc
deleted file mode 100644
index bfde9edf..00000000
--- a/data/scripts/gUnk_0800C8B0.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800C8B0
-.short 0x1136
-.short 0x0459
-.short 0x0831
-.short 0x000a
-.short 0x0879
-.short 0x0000
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0803
-.short 0xfeba
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0c73
-.short 0x00e8
-.short 0x0068
-.short 0x0861
-.short 0x0000
diff --git a/data/scripts/gUnk_0800C8DA.inc b/data/scripts/gUnk_0800C8DA.inc
deleted file mode 100644
index c8c32cdf..00000000
--- a/data/scripts/gUnk_0800C8DA.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800C8DA
-Wait 0x000f
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800C8F0.inc b/data/scripts/gUnk_0800C8F0.inc
index fb281a40..2627062e 100644
--- a/data/scripts/gUnk_0800C8F0.inc
+++ b/data/scripts/gUnk_0800C8F0.inc
@@ -8,5 +8,5 @@ _0807EB44 0x0000
 Wait 0x000f
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C91C.inc b/data/scripts/gUnk_0800C91C.inc
index 34b1e63d..d4379853 100644
--- a/data/scripts/gUnk_0800C91C.inc
+++ b/data/scripts/gUnk_0800C91C.inc
@@ -4,4 +4,78 @@ _0807EB44 0x0004
 SetEntityNonPlanarMovement 0x0300
 StopScript 
 CheckPlayerInRegion 0x0208, 0x0360, 0x2040
-.byte 0x5
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x0800ca8c
+WaitForSomething2 0x00000002
+Wait 0x003c
+_0807EB28 0x1125
+_0807EA94 
+_0807E5F8 0x00000800
+_0807E8E4_3 
+Wait 0x003c
+_0807E5F8 0x00000200
+_0807E8E4_0 
+Wait 0x001e
+_0807E5F8 0x00002000
+_0807E8E4_1 
+Wait 0x0014
+_0807E5F8 0x00020000
+_0807E8E4_1 
+Wait 0x000a
+_0807E5F8 0x00008000
+_0807E8E4_3 
+Wait 0x001e
+WaitForSomething2 0x00000400
+WaitForSomething2 0x00001000
+WaitForSomething2 0x00004000
+WaitForSomething2 0x00010000
+WaitForSomething2 0x00040000
+_0807E8E4_0 
+Wait 0x003c
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000400
+_0807E8E4_0 
+TextboxNoOverlapFollow 0x1126
+Call 0x0807f40d
+_0807EA94 
+_0807E5F8 0x00000200
+_0807E5F8 0x00000800
+_0807E5F8 0x00002000
+_0807E5F8 0x00008000
+_0807E5F8 0x00020000
+WaitForSomething2 0x00000400
+WaitForSomething2 0x00001000
+WaitForSomething2 0x00004000
+WaitForSomething2 0x00010000
+WaitForSomething2 0x00040000
+_0807E5F8 0x00008000
+WaitForSomething2 0x00010000
+_0807E8E4_3 
+TextboxNoOverlapFollow 0x1127
+_0807EA94 
+_0807E5F8 0x00002000
+WaitForSomething2 0x00004000
+_0807E8E4_1 
+TextboxNoOverlapFollow 0x1128
+_0807EA94 
+_0807E5F8 0x00000200
+_0807E5F8 0x00000800
+_0807E5F8 0x00002000
+_0807E5F8 0x00008000
+_0807E5F8 0x00020000
+WaitForSomething2 0x00000400
+WaitForSomething2 0x00001000
+WaitForSomething2 0x00004000
+WaitForSomething2 0x00010000
+WaitForSomething2 0x00040000
+_0807E8E4_0 
+_0807EB28 0x1129
+_0807EA94 
+SetLocalFlag 0x008d
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C931.inc b/data/scripts/gUnk_0800C931.inc
deleted file mode 100644
index 3c9d52b4..00000000
--- a/data/scripts/gUnk_0800C931.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0800C931
-.short 0xf608
-.short 0x43ff
-.short 0x0b04
-.short 0xa50c
-.short 0x07f9
-.short 0x0b08
-.short 0x290c
-.short 0x07df
-.short 0x4708
-.short 0x8c0c
-.short 0x00ca
-.short 0x3308
-.short 0x020c
-.short 0x0000
-.short 0x3100
-.short 0x3c08
-.short 0x5f00
-.short 0x2508
-.short 0x5911
-.short 0x2804
-.short 0x000c
-.short 0x0008
-.short 0x4c00
-.short 0x3104
-.short 0x3c08
diff --git a/data/scripts/gUnk_0800C963.inc b/data/scripts/gUnk_0800C963.inc
deleted file mode 100644
index 50750035..00000000
--- a/data/scripts/gUnk_0800C963.inc
+++ /dev/null
@@ -1,166 +0,0 @@
-SCRIPT_START gUnk_0800C963
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x49
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x4a
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x4a
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x4c
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x49
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x49
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x26
-.byte 0x11
-.byte 0xb
-.byte 0xc
-.byte 0xd
-.byte 0xf4
-.byte 0x7
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
diff --git a/data/scripts/gUnk_0800CA08.inc b/data/scripts/gUnk_0800CA08.inc
deleted file mode 100644
index f49ccebe..00000000
--- a/data/scripts/gUnk_0800CA08.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800CA08
-WaitForSomething2 0x00040000
-_0807E5F8 0x00008000
-WaitForSomething2 0x00010000
-_0807E8E4_3 
-TextboxNoOverlapFollow 0x1127
-_0807EA94 
-_0807E5F8 0x00002000
-WaitForSomething2 0x00004000
-_0807E8E4_1 
-TextboxNoOverlapFollow 0x1128
-_0807EA94 
-_0807E5F8 0x00000200
-_0807E5F8 0x00000800
-_0807E5F8 0x00002000
-_0807E5F8 0x00008000
-_0807E5F8 0x00020000
-WaitForSomething2 0x00000400
-WaitForSomething2 0x00001000
-WaitForSomething2 0x00004000
-WaitForSomething2 0x00010000
-WaitForSomething2 0x00040000
-_0807E8E4_0 
-_0807EB28 0x1129
-_0807EA94 
-SetLocalFlag 0x008d
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800CA8C.inc b/data/scripts/gUnk_0800CA8C.inc
index 30ecb797..70295047 100644
--- a/data/scripts/gUnk_0800CA8C.inc
+++ b/data/scripts/gUnk_0800CA8C.inc
@@ -6,4 +6,8 @@ _0807EF80 0x0001
 _0807EDD4 0x0208, 0x0358
 SetEntityNonPlanarMovement 0x0080
 _0807EDD4 0x0208, 0x0340
-.short 0x0879
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CAAA.inc b/data/scripts/gUnk_0800CAAA.inc
deleted file mode 100644
index 7e8e4cff..00000000
--- a/data/scripts/gUnk_0800CAAA.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800CAAA
-.short 0x0000
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800CABC.inc b/data/scripts/gUnk_0800CABC.inc
index 7827c502..168b926f 100644
--- a/data/scripts/gUnk_0800CABC.inc
+++ b/data/scripts/gUnk_0800CABC.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
 WaitForSomething2 0x00000200
 _0807EF80 0x0007
@@ -15,6 +15,20 @@ _0807E5F8 0x00000400
 WaitForSomething2 0x00000200
 SoundReq 0x007c
 _0807EF3C 0x0180, 0x0030
-.byte 0x7b
-.byte 0x8
-.byte 0x7c
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+_0807E5F8 0x00000400
+WaitForSomething2 0x00000200
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x000f
+_0807EDD4 0x0208, 0x0328
+_0807EF80 0x0000
+_0807E5F8 0x00000400
+WaitForSomething2 0x00000200
+SetEntityNonPlanarMovement 0x0300
+_0807EF80 0x000f
+_0807EDD4 0x0208, 0x02b0
+_0807E5F8 0x00000400
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CB07.inc b/data/scripts/gUnk_0800CB07.inc
deleted file mode 100644
index 2c35bb6d..00000000
--- a/data/scripts/gUnk_0800CB07.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-SCRIPT_START gUnk_0800CB07
-.byte 0x0
-.byte 0x78
-.byte 0xc
-.byte 0x80
-.byte 0x1
-.byte 0x30
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x2
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x8
-.byte 0x2
-.byte 0x28
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x8
-.byte 0x2
-.byte 0xb0
-.byte 0x2
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800CB54.inc b/data/scripts/gUnk_0800CB54.inc
index 08bcac45..284146b8 100644
--- a/data/scripts/gUnk_0800CB54.inc
+++ b/data/scripts/gUnk_0800CB54.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
 WaitForSomething2 0x00000800
 _0807EF80 0x0007
@@ -17,4 +17,14 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
 SetEntityNonPlanarMovement 0x0200
 _0807EF80 0x000f
-.byte 0x73
+_0807EDD4 0x01f8, 0x0348
+_0807EF80 0x0000
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+SetEntityNonPlanarMovement 0x0300
+_0807EF80 0x000f
+_0807EDD4 0x0178, 0x0328
+_0807E5F8 0x00001000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CBA3.inc b/data/scripts/gUnk_0800CBA3.inc
deleted file mode 100644
index 2fc60cdf..00000000
--- a/data/scripts/gUnk_0800CBA3.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SCRIPT_START gUnk_0800CBA3
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x48
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x78
-.byte 0x1
-.byte 0x28
-.byte 0x3
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800CBD4.inc b/data/scripts/gUnk_0800CBD4.inc
index fa24f49b..d1f62aa0 100644
--- a/data/scripts/gUnk_0800CBD4.inc
+++ b/data/scripts/gUnk_0800CBD4.inc
@@ -4,11 +4,31 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
 WaitForSomething2 0x00002000
 _0807EF80 0x0007
 _0807EDD4 0x0258, 0x0330
 _0807EB44 0x0006
 _0807EF80 0x0000
-.short 0x0c28
+_0807E5F8 0x00004000
+WaitForSomething2 0x00002000
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x000f
+_0807EDD4 0x0218, 0x0340
+_0807EF80 0x0000
+_0807E5F8 0x00004000
+WaitForSomething2 0x00002000
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+_0807E5F8 0x00004000
+WaitForSomething2 0x00002000
+SetEntityNonPlanarMovement 0x0300
+_0807EF80 0x000f
+_0807EDD4 0x0288, 0x02d8
+_0807E5F8 0x00004000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CC08.inc b/data/scripts/gUnk_0800CC08.inc
deleted file mode 100644
index 773e3acd..00000000
--- a/data/scripts/gUnk_0800CC08.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800CC08
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
diff --git a/data/scripts/gUnk_0800CC0D.inc b/data/scripts/gUnk_0800CC0D.inc
deleted file mode 100644
index 5e4e8ef3..00000000
--- a/data/scripts/gUnk_0800CC0D.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-SCRIPT_START gUnk_0800CC0D
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x2
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x18
-.byte 0x2
-.byte 0x40
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x7c
-.byte 0x0
-.byte 0x78
-.byte 0xc
-.byte 0x80
-.byte 0x1
-.byte 0x30
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x7c
-.byte 0x0
-.byte 0x78
-.byte 0xc
-.byte 0x80
-.byte 0x1
diff --git a/data/scripts/gUnk_0800CC42.inc b/data/scripts/gUnk_0800CC42.inc
deleted file mode 100644
index 21feeeaf..00000000
--- a/data/scripts/gUnk_0800CC42.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800CC42
-.short 0x0030
-.short 0x0c28
-.short 0x4000
-.short 0x0000
-.short 0x0c33
-.short 0x2000
-.short 0x0000
-.short 0x0867
-.short 0x0300
-.short 0x0879
-.short 0x000f
-.short 0x0c73
-.short 0x0288
-.short 0x02d8
-.short 0x0c28
-.short 0x4000
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800CC6C.inc b/data/scripts/gUnk_0800CC6C.inc
index c734ddcd..23266276 100644
--- a/data/scripts/gUnk_0800CC6C.inc
+++ b/data/scripts/gUnk_0800CC6C.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0008
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
 WaitForSomething2 0x00008000
 _0807EF80 0x0007
@@ -20,4 +20,15 @@ _0807EF80 0x0000
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 SoundReq 0x007c
-.byte 0x78
+_0807EF3C 0x0180, 0x0030
+SoundReq 0x007c
+_0807EF3C 0x0180, 0x0030
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+SetEntityNonPlanarMovement 0x0300
+_0807EF80 0x000f
+_0807EDD4 0x0188, 0x02d8
+_0807E5F8 0x00010000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CCCD.inc b/data/scripts/gUnk_0800CCCD.inc
deleted file mode 100644
index 8c9f8152..00000000
--- a/data/scripts/gUnk_0800CCCD.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800CCCD
-.short 0x800c
-.short 0x3001
-.short 0x7b00
-.short 0x7c08
-.short 0x7800
-.short 0x800c
-.short 0x3001
-.short 0x2800
diff --git a/data/scripts/gUnk_0800CCDD.inc b/data/scripts/gUnk_0800CCDD.inc
deleted file mode 100644
index 67703de9..00000000
--- a/data/scripts/gUnk_0800CCDD.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800CCDD
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x88
-.byte 0x1
-.byte 0xd8
-.byte 0x2
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800CD04.inc b/data/scripts/gUnk_0800CD04.inc
index 32d7371d..a911d324 100644
--- a/data/scripts/gUnk_0800CD04.inc
+++ b/data/scripts/gUnk_0800CD04.inc
@@ -1,3 +1,28 @@
 SCRIPT_START gUnk_0800CD04
 StartScript 
-.short 0x0879
+_0807EF80 0x0000
+_0807EF80 0x0008
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x000f
+Call 0x0807f339
+StopScript 
+WaitForSomething2 0x00020000
+_0807EF80 0x0007
+_0807EDD4 0x0268, 0x0338
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x000f
+_0807EDD4 0x0218, 0x0350
+_0807EF80 0x0000
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+SetEntityNonPlanarMovement 0x0300
+_0807EF80 0x000f
+_0807EDD4 0x02a8, 0x0328
+_0807E5F8 0x00040000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800CD08.inc b/data/scripts/gUnk_0800CD08.inc
deleted file mode 100644
index 43438760..00000000
--- a/data/scripts/gUnk_0800CD08.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-SCRIPT_START gUnk_0800CD08
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x39
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x68
-.byte 0x2
-.byte 0x38
-.byte 0x3
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x2
-.byte 0x79
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x18
-.byte 0x2
-.byte 0x50
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x3
-.byte 0x79
-.byte 0x8
-.byte 0xf
diff --git a/data/scripts/gUnk_0800CD67.inc b/data/scripts/gUnk_0800CD67.inc
deleted file mode 100644
index 5ca8eadd..00000000
--- a/data/scripts/gUnk_0800CD67.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800CD67
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xa8
-.byte 0x2
-.byte 0x28
-.byte 0x3
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc
index 3ce3b7ed..3c4413b3 100644
--- a/data/scripts/gUnk_0800CD7C.inc
+++ b/data/scripts/gUnk_0800CD7C.inc
@@ -2,18 +2,18 @@ SCRIPT_START gUnk_0800CD7C
 StartScript 
 CheckInventory1 0x005b
 JumpIfNot 0xf87a
-Call sub_08060090
+Call 0x08060091
 _0807EF80 0x000a
 StopScript 
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000c
-Call sub_08060158
+Call 0x08060159
 Jump 0xffee
 StopScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 CheckLocalFlag 0x009d
 JumpIf 0x000e
 SetLocalFlag 0x009d
@@ -37,4 +37,254 @@ TextboxNoOverlap 0x214b
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x013c
-.byte 0x7b
+SoundReq 0x00cd
+_0807F088 0x0023
+WaitPlayerAction8 
+Jump 0x0020
+_0807E48C 0x0022
+JumpIfNot 0x0126
+TextboxNoOverlap 0x214b
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x011a
+SoundReq 0x00cd
+_0807F088 0x0022
+WaitPlayerAction8 
+_0807EB8C 
+SetGlobalFlag 0x0054
+Call 0x08060341
+TextboxNoOverlap 0x213f
+Jump 0x00be
+CheckGlobalFlag 0x003c
+JumpIf 0x005a
+CheckGlobalFlag 0x0054
+JumpIfNot 0x001a
+CheckRoomFlag 0x0000
+JumpIfNot 0x00ce
+SetGlobalFlag 0x003c
+ClearGlobalFlag 0x0054
+TextboxNoOverlap 0x2145
+Jump 0x00d4
+TextboxNoOverlap 0x2142
+_0807EA94 
+_0807E48C 0x0027
+JumpIfNot 0x00c6
+TextboxNoOverlap 0x214c
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x00ba
+SoundReq 0x00cd
+_0807F088 0x0027
+WaitPlayerAction8 
+_0807EB8C 
+SetGlobalFlag 0x0054
+Call 0x08060341
+TextboxNoOverlap 0x2143
+Jump 0x005e
+CheckGlobalFlag 0x003d
+JumpIf 0x0090
+CheckGlobalFlag 0x0054
+JumpIfNot 0x001a
+CheckRoomFlag 0x0000
+JumpIfNot 0x006e
+SetGlobalFlag 0x003d
+ClearGlobalFlag 0x0054
+TextboxNoOverlap 0x2149
+Jump 0x0074
+TextboxNoOverlap 0x2146
+_0807EA94 
+_0807E48C 0x0024
+JumpIfNot 0x0066
+TextboxNoOverlap 0x214d
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x005a
+SoundReq 0x00cd
+_0807F088 0x0024
+WaitPlayerAction8 
+_0807EB8C 
+SetGlobalFlag 0x0054
+Call 0x08060341
+TextboxNoOverlap 0x2147
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000c
+Call 0x08060159
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x0807df29
+TextboxNoOverlap 0x2140
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xffd2
+TextboxNoOverlap 0x214a
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xfe46
+.short 0x0000
+StartScript 
+Call 0x08068105
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x0806811d
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x08068191
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd8
+StartScript 
+Call 0x08068105
+_0807EF80 0x000a
+StopScript 
+_0807E944 
+_0807E864 
+Call 0x08068191
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffec
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+CheckInventory1 0x0041
+JumpIf 0x000e
+CheckLocalFlag 0x007e
+JumpIfNot 0x0006
+_0807E930 0x0008
+CheckInventory1 0x0002
+JumpIf 0x0022
+CheckInventory1 0x0041
+JumpIfNot 0x000c
+_0807E5F8 0x00000020
+Jump 0x0010
+CheckLocalFlag 0x007e
+JumpIfNot 0x0008
+_0807E5F8 0x00000010
+StopScript 
+StartScript 
+Call 0x08068911
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+Call 0x0807df29
+CheckInventory1 0x0002
+JumpIfNot 0x0018
+_0807EB74 
+_0807E914 0x00000000
+Call 0x0806c029
+TextboxNoOverlap 0x1219
+Jump 0x014c
+CheckInventory1 0x0041
+JumpIfNot 0x0060
+StartPlayerScript 0x0800d190
+WaitForSomething2 0x00000008
+_0807EB74 
+_0807E914 0x00000000
+Call 0x0806c029
+TextboxNoOverlapFollowPos
+.short 0x125c
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800d1b4
+WaitForSomething2 0x00000008
+_0807EB44 0x0002
+_0807E914 0x00000000
+Call 0x0806c029
+Wait 0x000f
+_0807E5F8 0x00000020
+StartPlayerScript 0x0800d1e0
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollowPos
+.short 0x125d
+.short 0x0002
+@ End of 2 parameters
+Jump 0x00e6
+CheckLocalFlag 0x007e
+JumpIfNot 0x000a
+TextboxNoOverlapFollow 0x123e
+Jump 0x00d6
+StartPlayerScript 0x0800d190
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000004
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000004
+_0807EB74 
+_0807E914 0x00000000
+Call 0x0806c029
+TextboxNoOverlapFollowPos
+.short 0x123d
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800d1b4
+WaitForSomething2 0x00000008
+_0807EB44 0x0002
+_0807E914 0x00000000
+Call 0x0806c029
+SoundReq 0x00cd
+Call 0x08068965
+ComparePlayerAction 0x0008
+JumpIf 0xfffa
+SoundReq 0x00f8
+_0807E5F8 0x00000010
+SetLocalFlag 0x007e
+TextboxNoOverlapFollowPos
+.short 0x123e
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+Wait 0x000f
+_0807E930 0x0009
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Wait 0x001e
+TextboxNoOverlapFollowPos
+.short 0x123f
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000004
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000004
+_0807E930 0x0008
+Wait 0x003c
+Call 0x08095165
+_0807EB28 0x1240
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Call 0x0807df51
+Jump 0xfe6e
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0170, 0x0140
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800CE07.inc b/data/scripts/gUnk_0800CE07.inc
deleted file mode 100644
index 6f712e3f..00000000
--- a/data/scripts/gUnk_0800CE07.inc
+++ /dev/null
@@ -1,254 +0,0 @@
-SCRIPT_START gUnk_0800CE07
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x86
-.byte 0x8
-.byte 0x23
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x1f
-.byte 0x8
-.byte 0x22
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x26
-.byte 0x1
-.byte 0x5b
-.byte 0x8
-.byte 0x4b
-.byte 0x21
-.byte 0x59
-.byte 0x4
-.byte 0x1c
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x1a
-.byte 0x1
-.byte 0x7b
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x86
-.byte 0x8
-.byte 0x22
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x2d
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x41
-.byte 0x3
-.byte 0x6
-.byte 0x8
-.byte 0x5b
-.byte 0x8
-.byte 0x3f
-.byte 0x21
-.byte 0x3
-.byte 0x8
-.byte 0xbe
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x5a
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x1a
-.byte 0x0
-.byte 0x15
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xce
-.byte 0x0
-.byte 0x2d
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x2e
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x45
-.byte 0x21
-.byte 0x3
-.byte 0x8
-.byte 0xd4
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x42
-.byte 0x21
-.byte 0x59
-.byte 0x4
-.byte 0x1f
-.byte 0x8
-.byte 0x27
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xc6
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x4c
-.byte 0x21
-.byte 0x59
-.byte 0x4
-.byte 0x1c
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xba
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x86
-.byte 0x8
-.byte 0x27
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x2d
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x41
-.byte 0x3
-.byte 0x6
-.byte 0x8
-.byte 0x5b
-.byte 0x8
-.byte 0x43
-.byte 0x21
-.byte 0x3
-.byte 0x8
-.byte 0x5e
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x3d
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x90
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x1a
-.byte 0x0
-.byte 0x15
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x6e
-.byte 0x0
-.byte 0x2d
-.byte 0x8
-.byte 0x3d
-.byte 0x0
-.byte 0x2e
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x49
-.byte 0x21
-.byte 0x3
-.byte 0x8
-.byte 0x74
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x46
-.byte 0x21
-.byte 0x59
-.byte 0x4
-.byte 0x1f
-.byte 0x8
-.byte 0x24
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x66
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x4d
-.byte 0x21
-.byte 0x59
-.byte 0x4
-.byte 0x1c
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x5a
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x86
-.byte 0x8
-.byte 0x24
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x2d
-.byte 0x8
-.byte 0x54
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x41
-.byte 0x3
-.byte 0x6
-.byte 0x8
-.byte 0x5b
-.byte 0x8
-.byte 0x47
-.byte 0x21
-.byte 0x59
-.byte 0x4
diff --git a/data/scripts/gUnk_0800CF04.inc b/data/scripts/gUnk_0800CF04.inc
deleted file mode 100644
index 6ba23d4d..00000000
--- a/data/scripts/gUnk_0800CF04.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800CF04
-Call sub_0807DF50
-_0807E878 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-.short 0x0804
-.short 0x000c
diff --git a/data/scripts/gUnk_0800CF16.inc b/data/scripts/gUnk_0800CF16.inc
deleted file mode 100644
index febff378..00000000
--- a/data/scripts/gUnk_0800CF16.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_0800CF16
-Call sub_08060158
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlap 0x2140
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xffd2
-TextboxNoOverlap 0x214a
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-.byte 0x3
diff --git a/data/scripts/gUnk_0800CF4B.inc b/data/scripts/gUnk_0800CF4B.inc
deleted file mode 100644
index 89e503ec..00000000
--- a/data/scripts/gUnk_0800CF4B.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800CF4B
-.byte 0x8
-.byte 0x46
-.byte 0xfe
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800CF50.inc b/data/scripts/gUnk_0800CF50.inc
deleted file mode 100644
index 9de29634..00000000
--- a/data/scripts/gUnk_0800CF50.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_0800CF50
-StartScript 
-Call sub_08068104
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806811C
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-.byte 0xb
-.byte 0xc
-.byte 0x91
-.byte 0x81
-.byte 0x6
diff --git a/data/scripts/gUnk_0800CF7B.inc b/data/scripts/gUnk_0800CF7B.inc
deleted file mode 100644
index f6e35584..00000000
--- a/data/scripts/gUnk_0800CF7B.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800CF7B
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xd8
-.byte 0xff
diff --git a/data/scripts/gUnk_0800CF88.inc b/data/scripts/gUnk_0800CF88.inc
deleted file mode 100644
index ac27b808..00000000
--- a/data/scripts/gUnk_0800CF88.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800CF88
-StartScript 
-Call sub_08068104
-_0807EF80 0x000a
-.byte 0x2
diff --git a/data/scripts/gUnk_0800CF95.inc b/data/scripts/gUnk_0800CF95.inc
deleted file mode 100644
index e7f6e643..00000000
--- a/data/scripts/gUnk_0800CF95.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0800CF95
-.short 0x5104
-.short 0x4304
-.short 0x0b04
-.short 0x910c
-.short 0x0681
-.short 0x5908
-.short 0x3104
-.short 0x0f08
-.short 0x4400
-.short 0x0304
diff --git a/data/scripts/gUnk_0800CFA9.inc b/data/scripts/gUnk_0800CFA9.inc
deleted file mode 100644
index 42d52b94..00000000
--- a/data/scripts/gUnk_0800CFA9.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800CFA9
-.byte 0x8
-.byte 0xec
-.byte 0xff
diff --git a/data/scripts/gUnk_0800CFAC.inc b/data/scripts/gUnk_0800CFAC.inc
deleted file mode 100644
index dc738500..00000000
--- a/data/scripts/gUnk_0800CFAC.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_0800CFAC
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-CheckInventory1 0x0041
-JumpIf 0x000e
-CheckLocalFlag 0x007e
-JumpIfNot 0x0006
-_0807E930 0x0008
-CheckInventory1 0x0002
-JumpIf 0x0022
-CheckInventory1 0x0041
-JumpIfNot 0x000c
-_0807E5F8 0x00000020
-Jump 0x0010
-CheckLocalFlag 0x007e
-JumpIfNot 0x0008
-_0807E5F8 0x00000010
-StopScript 
-StartScript 
-Call sub_08068910
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-.byte 0xb
-.byte 0xc
-.byte 0x29
diff --git a/data/scripts/gUnk_0800D011.inc b/data/scripts/gUnk_0800D011.inc
deleted file mode 100644
index ab7c8952..00000000
--- a/data/scripts/gUnk_0800D011.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800D011
-.short 0x07df
-.short 0x0f08
-.short 0x0208
-.short 0x0500
-.short 0x1808
-.short 0x6300
-.short 0x4e04
-.short 0x000c
-.short 0x0000
-.short 0x0b00
-.short 0x290c
-.short 0x06c0
-.short 0x5b08
-.short 0x1908
-.short 0x0312
-.short 0x4c08
-.short 0x0f01
-.short 0x4108
-.short 0x0500
-.short 0x6008
-.short 0x4700
-.short 0x900c
-.short 0x00d1
-.short 0x3308
-.short 0x080c
-.short 0x0000
-.short 0x6300
-.short 0x4e04
-.short 0x000c
-.short 0x0000
-.short 0x0b00
-.short 0x290c
-.short 0x06c0
-.short 0x5c08
-.short 0x5c0c
-.short 0x0212
-.short 0x5900
-.short 0x4704
-.short 0xb40c
diff --git a/data/scripts/gUnk_0800D05F.inc b/data/scripts/gUnk_0800D05F.inc
deleted file mode 100644
index 06b48077..00000000
--- a/data/scripts/gUnk_0800D05F.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-SCRIPT_START gUnk_0800D05F
-.byte 0xd1
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xc0
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x47
-.byte 0xc
-.byte 0xe0
-.byte 0xd1
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x5d
-.byte 0x12
-.byte 0x2
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xe6
-.byte 0x0
-.byte 0x12
-.byte 0x8
-.byte 0x7e
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x3e
-.byte 0x12
-.byte 0x3
-.byte 0x8
-.byte 0xd6
-.byte 0x0
-.byte 0x47
-.byte 0xc
-.byte 0x90
-.byte 0xd1
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x63
-.byte 0x4
diff --git a/data/scripts/gUnk_0800D0CE.inc b/data/scripts/gUnk_0800D0CE.inc
deleted file mode 100644
index 8b55a70d..00000000
--- a/data/scripts/gUnk_0800D0CE.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_0800D0CE
-_0807E914 0x00000000
-Call sub_0806C028
-TextboxNoOverlapFollowPos 0x123d, 0x0002
-_0807EA94 
-StartPlayerScript 0x0800d1b4
-WaitForSomething2 0x00000008
-_0807EB44 0x0002
-_0807E914 0x00000000
-Call sub_0806C028
-SoundReq 0x00cd
-Call sub_08068964
-ComparePlayerAction 0x0008
-JumpIf 0xfffa
-SoundReq 0x00f8
-_0807E5F8 0x00000010
-SetLocalFlag 0x007e
-TextboxNoOverlapFollowPos 0x123e, 0x0002
-_0807EA94 
-.byte 0x31
diff --git a/data/scripts/gUnk_0800D127.inc b/data/scripts/gUnk_0800D127.inc
deleted file mode 100644
index 8d62eaff..00000000
--- a/data/scripts/gUnk_0800D127.inc
+++ /dev/null
@@ -1,106 +0,0 @@
-SCRIPT_START gUnk_0800D127
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x9
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x3f
-.byte 0x12
-.byte 0x2
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x65
-.byte 0x51
-.byte 0x9
-.byte 0x8
-.byte 0x5f
-.byte 0x8
-.byte 0x40
-.byte 0x12
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x8
-.byte 0x6e
-.byte 0xfe
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800D190.inc b/data/scripts/gUnk_0800D190.inc
deleted file mode 100644
index e03152f1..00000000
--- a/data/scripts/gUnk_0800D190.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800D190
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0170, 0x0140
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call sub_080791BC
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800D1B4.inc b/data/scripts/gUnk_0800D1B4.inc
index 0393b5dc..1f1d73e9 100644
--- a/data/scripts/gUnk_0800D1B4.inc
+++ b/data/scripts/gUnk_0800D1B4.inc
@@ -3,4 +3,10 @@ StartScript
 SetEntityNonPlanarMovement 0x0100
 StopScript 
 _0807EDD4 0x0170, 0x0120
-.short 0x0c73
+_0807EDD4 0x01a8, 0x0120
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D1C4.inc b/data/scripts/gUnk_0800D1C4.inc
deleted file mode 100644
index da71414e..00000000
--- a/data/scripts/gUnk_0800D1C4.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800D1C4
-.short 0x01a8
-.short 0x0120
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0008
diff --git a/data/scripts/gUnk_0800D1D4.inc b/data/scripts/gUnk_0800D1D4.inc
deleted file mode 100644
index 66cf3692..00000000
--- a/data/scripts/gUnk_0800D1D4.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800D1D4
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc
index 58cc2e6e..7a917f09 100644
--- a/data/scripts/gUnk_0800D1E0.inc
+++ b/data/scripts/gUnk_0800D1E0.inc
@@ -1,9 +1,21 @@
 SCRIPT_START gUnk_0800D1E0
 _0807F078 0x0002, 0x0001
-CallWithArg sub_0807F918, 0x00000002
+CallWithArg
+.short 0xf919
+.short 0x0807
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
 SoundReq 0x0109
-CallWithArg sub_0807F238, 0x000001e2
-Call sub_0807F304
-.byte 0x5b
-.byte 0x8
-.byte 0x2
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x01e2
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f305
+TextboxNoOverlap 0x0502
+_0807EA94 
+_0807E5F8 0x00000008
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800D207.inc b/data/scripts/gUnk_0800D207.inc
deleted file mode 100644
index 73150653..00000000
--- a/data/scripts/gUnk_0800D207.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_0800D207
-.byte 0x5
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800D218.inc b/data/scripts/gUnk_0800D218.inc
index 7f9f590d..2f19e4b4 100644
--- a/data/scripts/gUnk_0800D218.inc
+++ b/data/scripts/gUnk_0800D218.inc
@@ -10,12 +10,3 @@ WaitForSomething2 0x00000010
 _0807EF80 0x0007
 WaitForSomething2 0x00000010
 SCRIPT_END
-.short 0x0879
-.short 0x0007
-.short 0x0850
-.short 0x0003
-.short 0xffff
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D242.inc b/data/scripts/gUnk_0800D242.inc
new file mode 100644
index 00000000..52710175
--- /dev/null
+++ b/data/scripts/gUnk_0800D242.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800D242
+_0807EF80 0x0007
+_0807E930 0x0003
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800D24C.inc b/data/scripts/gUnk_0800D24C.inc
new file mode 100644
index 00000000..a1c01651
--- /dev/null
+++ b/data/scripts/gUnk_0800D24C.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0800D24C
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D278.inc b/data/scripts/gUnk_0800D278.inc
index ce4ee7d9..82667aba 100644
--- a/data/scripts/gUnk_0800D278.inc
+++ b/data/scripts/gUnk_0800D278.inc
@@ -12,17 +12,100 @@ TestBit 0x00000001
 JumpIf 0x002a
 CheckEntityInteractType 
 JumpIf 0x000e
-Call sub_0806811C
+Call 0x0806811d
 StopScript 
 Jump 0xffd4
 StopScript 
 _0807E864 
-Call sub_08068190
+Call 0x08068191
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffbe
 StopScript 
-.short 0x0c28
-.short 0x0004
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000004
+_0807E930 0x000c
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000004
+_0807E930 0x000b
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x08068191
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+StartScript 
+Call 0x08068885
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+StopScript 
+StartScript 
+Call 0x08068911
+CheckEntityInteractType 
+JumpIfNot 0xfff2
+StopScript 
+_0807E864 
+_0807EB74 
+_0807E914 0x00000000
+Call 0x0806c029
+TextboxNoOverlapFollow 0x1219
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd0
+StartScript 
+Call 0x08068105
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x0806811d
+StopScript 
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x08068191
+_0807EA94 
+Wait 0x000f
+CheckLocalFlag 0x007f
+JumpIf 0x005c
+CheckLocalFlag 0x007e
+JumpIfNot 0x0054
+_0807EF80 0x000b
+SetEntityNonPlanarMovement 0x0100
+CheckPlayerInRegion 0x0090, 0x0130, 0x0810
+JumpIfNot 0x000e
+StartPlayerScript 0x0800d3ec
+WaitForSomething2 0x00000001
+_0807EB44 0x0002
+_0807E930 0x0005
+_0807EDD4 0x00a0, 0x0130
+_0807EB44 0x0006
+_0807E930 0x0003
+_0807E914 0x00000004
+Call 0x080681d9
+SoundReq 0x00cd
+Wait 0x001e
+_0807EF80 0x000a
+SetLocalFlag 0x007f
+_0807E878 
+Jump 0xff76
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x000d
+_0807ECC4 0x0020
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800D2CE.inc b/data/scripts/gUnk_0800D2CE.inc
deleted file mode 100644
index 69012311..00000000
--- a/data/scripts/gUnk_0800D2CE.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800D2CE
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000004
-_0807E930 0x000c
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000004
-_0807E930 0x000b
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-_0807E878 
-.short 0x0803
diff --git a/data/scripts/gUnk_0800D306.inc b/data/scripts/gUnk_0800D306.inc
deleted file mode 100644
index cb728fbb..00000000
--- a/data/scripts/gUnk_0800D306.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800D306
-.short 0xffe8
diff --git a/data/scripts/gUnk_0800D308.inc b/data/scripts/gUnk_0800D308.inc
deleted file mode 100644
index ef86c3ed..00000000
--- a/data/scripts/gUnk_0800D308.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800D308
-StartScript 
-.byte 0xb
-.byte 0xc
-.byte 0x85
-.byte 0x88
-.byte 0x6
diff --git a/data/scripts/gUnk_0800D30F.inc b/data/scripts/gUnk_0800D30F.inc
deleted file mode 100644
index 6a8a29a2..00000000
--- a/data/scripts/gUnk_0800D30F.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-SCRIPT_START gUnk_0800D30F
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x2
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0x89
-.byte 0x6
-.byte 0x8
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xf2
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0x4e
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xc0
-.byte 0x6
-.byte 0x8
-.byte 0x5a
-.byte 0x8
-.byte 0x19
-.byte 0x12
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xd0
-.byte 0xff
diff --git a/data/scripts/gUnk_0800D350.inc b/data/scripts/gUnk_0800D350.inc
deleted file mode 100644
index e651a656..00000000
--- a/data/scripts/gUnk_0800D350.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800D350
-StartScript 
-Call sub_08068104
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806811C
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-CheckLocalFlag 0x007f
-JumpIf 0x005c
-CheckLocalFlag 0x007e
-JumpIfNot 0x0054
-_0807EF80 0x000b
-SetEntityNonPlanarMovement 0x0100
-CheckPlayerInRegion 0x0090, 0x0130, 0x0810
-JumpIfNot 0x000e
-StartPlayerScript 0x0800d3ec
-WaitForSomething2 0x00000001
-_0807EB44 0x0002
-_0807E930 0x0005
-_0807EDD4 0x00a0, 0x0130
-_0807EB44 0x0006
-_0807E930 0x0003
-_0807E914 0x00000004
-Call sub_080681D8
-SoundReq 0x00cd
-Wait 0x001e
-_0807EF80 0x000a
-SetLocalFlag 0x007f
-_0807E878 
-Jump 0xff76
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc
index 4ed59eb9..9bf015eb 100644
--- a/data/scripts/gUnk_0800D414.inc
+++ b/data/scripts/gUnk_0800D414.inc
@@ -1,14 +1,170 @@
 SCRIPT_START gUnk_0800D414
 StartScript 
 SetEntityNonPlanarMovement 0x0100
-Call sub_08068104
+Call 0x08068105
 _0807EF80 0x000a
 StopScript 
 _0807EB44 0x0002
 _0807E914 0x00000000
-Call sub_0806AF60
+Call 0x0806af61
 Wait 0x0014
 _0807EB44 0x0004
 _0807E914 0x00000000
-Call sub_0806AF60
-.short 0x0831
+Call 0x0806af61
+Wait 0x0014
+_0807EB44 0x0006
+_0807E914 0x00000000
+Call 0x0806af61
+Wait 0x0014
+_0807EB44 0x0006
+_0807E914 0x00000004
+Call 0x0806af61
+_0807EDD4 0x00a8, 0x01e8
+_0807EB44 0x0006
+_0807E914 0x00000000
+Call 0x0806af61
+Wait 0x0014
+_0807EB44 0x0004
+_0807E914 0x00000000
+Call 0x0806af61
+Wait 0x0014
+_0807EB44 0x0002
+_0807E914 0x00000000
+Call 0x0806af61
+Wait 0x0014
+_0807EB44 0x0002
+_0807E914 0x00000004
+Call 0x0806af61
+_0807EDD4 0x0228, 0x01e8
+Jump 0xff5a
+.short 0x0000
+StartScript 
+_0807EF80 0x000a
+Call 0x08062a49
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+Call 0x08062699
+Call 0x080626ad
+CallWithArg
+.short 0xf0ed
+.short 0x0807
+.short 0x0009
+.short 0x0000
+@ End of 4 parameters
+_0807E078
+.short 0x0012
+.short 0x001a
+.short 0x0022
+.short 0x002a
+.short 0x0032
+.short 0x003a
+.short 0x0042
+.short 0x004a
+.short 0x0052
+@ End of 9 parameters
+_0807EE04 0x0038, 0x0068
+Jump 0x004e
+_0807EE04 0x0078, 0x0068
+Jump 0x0044
+_0807EE04 0x00b8, 0x0068
+Jump 0x003a
+_0807EE04 0x0038, 0x0090
+Jump 0x0030
+_0807EE04 0x0078, 0x0090
+Jump 0x0026
+_0807EE04 0x00b8, 0x0090
+Jump 0x001c
+_0807EE04 0x0038, 0x00b8
+Jump 0x0012
+_0807EE04 0x0078, 0x00b8
+Jump 0x0008
+_0807EE04 0x00b8, 0x00b8
+StopScript 
+StartScript 
+Call 0x080626c1
+JumpIf 0xff72
+CheckEntityInteractType 
+JumpIf 0x000c
+_0807EE30 
+JumpIfNot 0xffe8
+Jump 0xff62
+StopScript 
+_0807E864 
+_0807EB74 
+Call 0x0806265d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xff4a
+StartScript 
+_0807EF80 0x000a
+Call 0x08062a49
+_0807EF80 0x0000
+StopScript 
+Call 0x08062699
+Call 0x080626ad
+CallWithArg
+.short 0xf0ed
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+_0807E078
+.short 0x0008
+.short 0x0010
+.short 0x0018
+.short 0x0020
+@ End of 4 parameters
+_0807EE04 0x0038, 0x0098
+Jump 0x001c
+_0807EE04 0x0058, 0x0098
+Jump 0x0012
+_0807EE04 0x0038, 0x00c8
+Jump 0x0008
+_0807EE04 0x0058, 0x00c8
+StopScript 
+StartScript 
+Call 0x080626c1
+JumpIf 0xffae
+_0807EE30 
+JumpIfNot 0xffee
+Jump 0xffa4
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000b
+_0807EF80 0x0008
+Call 0x0806daad
+JumpIf 0x008c
+Call 0x0806dad1
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+_0807EA4C 
+_0807E9F0 
+Call 0x0806daad
+JumpIf 0x000e
+Call 0x0807df51
+_0807E878 
+Jump 0xffe8
+_0807E864 
+Call 0x0807df29
+Call 0x0807fbc5
+Call 0x0807fba1
+SetEntityNonPlanarMovement 0x0700
+_0807F0B4 0x0007
+CameraTargetEntity 
+_0807EDD4 0x01e8, 0x01b8
+Wait 0x003c
+Call 0x0806dae9
+Wait 0x0078
+Call 0x0806db45
+JumpIfNot 0x000e
+LoadRoomEntityList 0x080dd730
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800D44C.inc b/data/scripts/gUnk_0800D44C.inc
deleted file mode 100644
index 884704fb..00000000
--- a/data/scripts/gUnk_0800D44C.inc
+++ /dev/null
@@ -1,116 +0,0 @@
-SCRIPT_START gUnk_0800D44C
-.byte 0x14
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x73
-.byte 0xc
-.byte 0xa8
-.byte 0x0
-.byte 0xe8
-.byte 0x1
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x4e
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
diff --git a/data/scripts/gUnk_0800D4BF.inc b/data/scripts/gUnk_0800D4BF.inc
deleted file mode 100644
index bf2d12ce..00000000
--- a/data/scripts/gUnk_0800D4BF.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800D4BF
-.byte 0xc
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x73
-.byte 0xc
-.byte 0x28
-.byte 0x2
-.byte 0xe8
-.byte 0x1
-.byte 0x3
-.byte 0x8
-.byte 0x5a
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x49
-.byte 0x2a
-.byte 0x6
-.byte 0x8
diff --git a/data/scripts/gUnk_0800D4DC.inc b/data/scripts/gUnk_0800D4DC.inc
deleted file mode 100644
index 3bf260fd..00000000
--- a/data/scripts/gUnk_0800D4DC.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-SCRIPT_START gUnk_0800D4DC
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-Call sub_08062698
-Call sub_080626AC
-CallWithArg sub_0807F0EC, 0x00000009
-.short 0x2806
-.short 0x0012
-.short 0x001a
-.short 0x0022
-.short 0x002a
-.short 0x0032
-.short 0x003a
-.short 0x0042
-.short 0x004a
-.short 0x0052
-.short 0x0c74
-.short 0x0038
-.short 0x0068
-.short 0x0803
-.short 0x004e
-.short 0x0c74
-.short 0x0078
-.short 0x0068
-.short 0x0803
-.short 0x0044
-.short 0x0c74
-.short 0x00b8
-.short 0x0068
-.short 0x0803
-.short 0x003a
-.short 0x0c74
-.short 0x0038
-.short 0x0090
-.short 0x0803
-.short 0x0030
-.short 0x0c74
-.short 0x0078
-.short 0x0090
-.short 0x0803
-.short 0x0026
-.short 0x0c74
-.short 0x00b8
-.short 0x0090
-.short 0x0803
-.short 0x001c
-.short 0x0c74
-.short 0x0038
-.short 0x00b8
-.short 0x0803
-.short 0x0012
-.short 0x0c74
-.short 0x0078
-.short 0x00b8
-.short 0x0803
-.short 0x0008
-.short 0x0c74
-.short 0x00b8
-.short 0x00b8
-.short 0x0402
-.short 0x0401
-.short 0x0c0b
-.short 0x26c1
-.short 0x0806
-.short 0x0804
-.short 0xff72
-.short 0x0418
-.short 0x0804
-.short 0x000c
-.short 0x0475
-.short 0x0805
-.short 0xffe8
-.short 0x0803
-.short 0xff62
-.short 0x0402
-.short 0x0443
-.short 0x0463
-.short 0x0c0b
-.short 0x265d
-.short 0x0806
-.short 0x0459
-.short 0x0831
-.short 0x000f
-.short 0x0444
-.short 0x0803
-.short 0xff4a
diff --git a/data/scripts/gUnk_0800D59C.inc b/data/scripts/gUnk_0800D59C.inc
deleted file mode 100644
index 66251bb0..00000000
--- a/data/scripts/gUnk_0800D59C.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SCRIPT_START gUnk_0800D59C
-StartScript 
-_0807EF80 0x000a
-Call sub_08062A48
-_0807EF80 0x0000
-StopScript 
-Call sub_08062698
-Call sub_080626AC
-CallWithArg sub_0807F0EC, 0x00000004
-.byte 0x6
-.byte 0x14
-.byte 0x8
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x18
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x74
-.byte 0xc
-.byte 0x38
-.byte 0x0
-.byte 0x98
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x1c
-.byte 0x0
-.byte 0x74
-.byte 0xc
-.byte 0x58
-.byte 0x0
-.byte 0x98
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x12
-.byte 0x0
-.byte 0x74
-.byte 0xc
-.byte 0x38
diff --git a/data/scripts/gUnk_0800D5E5.inc b/data/scripts/gUnk_0800D5E5.inc
deleted file mode 100644
index de9f96a1..00000000
--- a/data/scripts/gUnk_0800D5E5.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800D5E5
-.byte 0x0
-.byte 0xc8
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x74
-.byte 0xc
-.byte 0x58
-.byte 0x0
-.byte 0xc8
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xc1
-.byte 0x26
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x8
-.byte 0xae
-.byte 0xff
-.byte 0x75
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xee
-.byte 0xff
-.byte 0x3
-.byte 0x8
-.byte 0xa4
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800D60C.inc b/data/scripts/gUnk_0800D60C.inc
deleted file mode 100644
index cd7d6b5d..00000000
--- a/data/scripts/gUnk_0800D60C.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800D60C
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000b
-_0807EF80 0x0008
-Call sub_0806DAAC
-JumpIf 0x008c
-Call sub_0806DAD0
-.byte 0xc
diff --git a/data/scripts/gUnk_0800D62B.inc b/data/scripts/gUnk_0800D62B.inc
deleted file mode 100644
index ec328708..00000000
--- a/data/scripts/gUnk_0800D62B.inc
+++ /dev/null
@@ -1,138 +0,0 @@
-SCRIPT_START gUnk_0800D62B
-.byte 0x14
-.byte 0x5
-.byte 0xda
-.byte 0x6
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x57
-.byte 0x4
-.byte 0x56
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xad
-.byte 0xda
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe8
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xc5
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xa1
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x7
-.byte 0x89
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x87
-.byte 0x4
-.byte 0x73
-.byte 0xc
-.byte 0xe8
-.byte 0x1
-.byte 0xb8
-.byte 0x1
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xe9
-.byte 0xda
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0xdb
-.byte 0x6
-.byte 0x8
-.byte 0x5
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0xd
-.byte 0xc
-.byte 0x30
-.byte 0xd7
-.byte 0xd
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x76
-.byte 0x4
-.byte 0x89
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x88
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xcd
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800D698.inc b/data/scripts/gUnk_0800D698.inc
new file mode 100644
index 00000000..6413a8a2
--- /dev/null
+++ b/data/scripts/gUnk_0800D698.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800D698
+_0807EEB4 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call 0x0807fbcd
+_0807E878 
+Call 0x0807df51
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800D6B4.inc b/data/scripts/gUnk_0800D6B4.inc
index 8b4de011..c1e96dca 100644
--- a/data/scripts/gUnk_0800D6B4.inc
+++ b/data/scripts/gUnk_0800D6B4.inc
@@ -1,4 +1,9 @@
 SCRIPT_START gUnk_0800D6B4
 StartScript 
-.short 0x0879
-.short 0x0007
+_0807EF80 0x0007
+_0807EF80 0x0011
+Call 0x0807f159
+Call 0x0807f739
+StopScript 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D6BA.inc b/data/scripts/gUnk_0800D6BA.inc
deleted file mode 100644
index c92d039e..00000000
--- a/data/scripts/gUnk_0800D6BA.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800D6BA
-_0807EF80 0x0011
-Call sub_0807F158
-Call sub_0807F738
-StopScript 
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D6F0.inc b/data/scripts/gUnk_0800D6F0.inc
index 0f9916c8..c3a0aa60 100644
--- a/data/scripts/gUnk_0800D6F0.inc
+++ b/data/scripts/gUnk_0800D6F0.inc
@@ -4,4 +4,8 @@ CheckLocalFlag 0x00f5
 JumpIf 0xfff0
 _0807EF80 0x0008
 StopScript 
-.short 0x0812
+CheckLocalFlag 0x00f5
+JumpIfNot 0xfffa
+_0807EF80 0x0007
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D702.inc b/data/scripts/gUnk_0800D702.inc
deleted file mode 100644
index d47e6ab0..00000000
--- a/data/scripts/gUnk_0800D702.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800D702
-.byte 0xf5
diff --git a/data/scripts/gUnk_0800D703.inc b/data/scripts/gUnk_0800D703.inc
deleted file mode 100644
index 286f67c3..00000000
--- a/data/scripts/gUnk_0800D703.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800D703
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xfa
-.byte 0xff
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800D710.inc b/data/scripts/gUnk_0800D710.inc
index 1658f0df..1fc7aacd 100644
--- a/data/scripts/gUnk_0800D710.inc
+++ b/data/scripts/gUnk_0800D710.inc
@@ -1,9 +1,23 @@
 SCRIPT_START gUnk_0800D710
 StartScript 
-Call sub_0807F360
+Call 0x0807f361
 SetEntityNonPlanarMovement 0x0700
 _0807F0B4 0x0007
 CameraTargetEntity 
-.byte 0xb
-.byte 0xc
-.byte 0xc5
+Call 0x0807fbc5
+StopScript 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000010
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E5F8 0x0000000a
+WaitForSomething2 0x00000004
+_0807EEB4 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call 0x0807fbcd
+_0807E878 
+Call 0x0807df51
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D725.inc b/data/scripts/gUnk_0800D725.inc
deleted file mode 100644
index d1a157cb..00000000
--- a/data/scripts/gUnk_0800D725.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800D725
-.byte 0xfb
-.byte 0x7
-.byte 0x8
diff --git a/data/scripts/gUnk_0800D728.inc b/data/scripts/gUnk_0800D728.inc
deleted file mode 100644
index 93c3530a..00000000
--- a/data/scripts/gUnk_0800D728.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800D728
-StopScript 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000010
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E5F8 0x0000000a
-WaitForSomething2 0x00000004
-_0807EEB4 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807FBCC
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc
index 06386591..6203909c 100644
--- a/data/scripts/gUnk_0800D76C.inc
+++ b/data/scripts/gUnk_0800D76C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800D76C
 StartScript 
-Call sub_0807F360
+Call 0x0807f361
 _0807EF80 0x000b
 SetEntityNonPlanarMovement 0x0200
 _0807EB44 0x0004
@@ -10,7 +10,12 @@ WaitForSomething2 0x00000008
 _0807EF80 0x0004
 Wait 0x003c
 SoundReq 0x0123
-CallWithArg sub_0807F464, 0x000001e0
+CallWithArg
+.short 0xf465
+.short 0x0807
+.short 0x01e0
+.short 0x0000
+@ End of 4 parameters
 _0807EDD4 0x01e0, 0x01d8
 _0807EB44 0x0002
 _0807EF80 0x0000
@@ -20,4 +25,34 @@ _0807EF3C 0x0180, 0x0030
 SoundReq 0x007c
 _0807EF3C 0x0180, 0x0030
 _0807EB44 0x0002
-.byte 0x79
+_0807EF80 0x0001
+WaitForSomething2 0x00000008
+Jump 0x0032
+StartScript 
+Call 0x0807f361
+_0807EF80 0x000b
+SetEntityPositionRelative 0x01d80268
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+WaitForSomething2 0x00000002
+_0807EDD4 0x01f0, 0x01d8
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EEF4 0x0000, 0xffe0
+_0807EF80 0x000e
+Call 0x0806ca5d
+SetEntity0x20 0x00040000
+SoundReq 0x00f5
+CallWithArg
+.short 0xf8d1
+.short 0x0807
+.short 0xe000
+.short 0xffff
+@ End of 4 parameters
+Call 0x0807f8bd
+JumpIf 0xffee
+_0807E5F8 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D7CF.inc b/data/scripts/gUnk_0800D7CF.inc
deleted file mode 100644
index 34cb6e66..00000000
--- a/data/scripts/gUnk_0800D7CF.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800D7CF
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x32
-.byte 0x0
diff --git a/data/scripts/gUnk_0800D7DC.inc b/data/scripts/gUnk_0800D7DC.inc
deleted file mode 100644
index a8fec942..00000000
--- a/data/scripts/gUnk_0800D7DC.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-SCRIPT_START gUnk_0800D7DC
-StartScript 
-Call sub_0807F360
-_0807EF80 0x000b
-SetEntityPositionRelative 0x01d80268
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-WaitForSomething2 0x00000002
-_0807EDD4 0x01f0, 0x01d8
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EEF4 0x0000, 0xffe0
-_0807EF80 0x000e
-Call sub_0806CA5C
-SetEntity0x20 0x00040000
-SoundReq 0x00f5
-CallWithArg sub_0807F8D0, 0xffffe000
-Call sub_0807F8BC
-JumpIf 0xffee
-_0807E5F8 0x00000004
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
-.short 0x0401
-.short 0x0402
-.short 0x0815
-.short 0x0000
-.short 0x0805
-.short 0xfffa
-.short 0x0443
-.short 0x0c0b
-.short 0xdf29
-.short 0x0807
-.short 0x0831
-.short 0x003c
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D84C.inc b/data/scripts/gUnk_0800D84C.inc
new file mode 100644
index 00000000..8329c8c8
--- /dev/null
+++ b/data/scripts/gUnk_0800D84C.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800D84C
+StartScript 
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Call 0x0807df29
+Wait 0x003c
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc
index 649fe5f5..34038a2a 100644
--- a/data/scripts/gUnk_0800D874.inc
+++ b/data/scripts/gUnk_0800D874.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_0800D874
 StartScript 
-Call sub_0807F934
+Call 0x0807f935
 _0807EF80 0x0008
 _0807E914 0x00000001
-Call sub_0806DA04
+Call 0x0806da05
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 CheckLocalFlag 0x0045
 JumpIf 0x000e
 StartPlayerScript 0x0800d92c
@@ -23,7 +23,27 @@ JumpIf 0x0010
 LoadRoomEntityList 0x080e3830
 CheckLocalFlag 0x0045
 JumpIfNot 0xfffa
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffae
 .short 0x0000
+StartScript 
+_0807EF80 0x0008
+CheckInventory1 0x0017
+JumpIf 0x0034
+StopScript 
+CheckInventory1 0x0017
+JumpIfNot 0xfffa
+Call 0x0807df29
+_0807E864 
+WaitPlayerAction8 
+_0807EB28 0x1325
+_0807EA94 
+SoundReq 0x0113
+_0807E914 0x00000000
+Call 0x0806da1d
+_0807E878 
+Call 0x0807df51
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D8E4.inc b/data/scripts/gUnk_0800D8E4.inc
deleted file mode 100644
index 2c0e9c91..00000000
--- a/data/scripts/gUnk_0800D8E4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0800D8E4
-StartScript 
-_0807EF80 0x0008
-CheckInventory1 0x0017
-JumpIf 0x0034
-StopScript 
-CheckInventory1 0x0017
-JumpIfNot 0xfffa
-Call sub_0807DF28
-_0807E864 
-WaitPlayerAction8 
diff --git a/data/scripts/gUnk_0800D906.inc b/data/scripts/gUnk_0800D906.inc
deleted file mode 100644
index ebe410e4..00000000
--- a/data/scripts/gUnk_0800D906.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_0800D906
-_0807EB28 0x1325
-_0807EA94 
-SoundReq 0x0113
-_0807E914 0x00000000
-Call sub_0806DA1C
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0080
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x00a0
-.short 0x0078
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_0800D3EC.inc b/data/scripts/gUnk_0800D92C.inc
similarity index 57%
rename from data/scripts/gUnk_0800D3EC.inc
rename to data/scripts/gUnk_0800D92C.inc
index d2d514cb..ceb77657 100644
--- a/data/scripts/gUnk_0800D3EC.inc
+++ b/data/scripts/gUnk_0800D92C.inc
@@ -1,12 +1,11 @@
-SCRIPT_START gUnk_0800D3EC
+SCRIPT_START gUnk_0800D92C
 StartScript 
 SetEntityNonPlanarMovement 0x0080
 StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x00a0, 0x0078
 _0807EB44 0x0000
 _0807EF80 0x0000
-_0807EF80 0x000d
-_0807ECC4 0x0020
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D954.inc b/data/scripts/gUnk_0800D954.inc
index 92193d4c..e62ca105 100644
--- a/data/scripts/gUnk_0800D954.inc
+++ b/data/scripts/gUnk_0800D954.inc
@@ -1,11 +1,41 @@
 SCRIPT_START gUnk_0800D954
 StartScript 
 _0807EF80 0x0008
-Call sub_0807F180
+Call 0x0807f181
 StopScript 
 CheckPlayerInRegion 0x0118, 0x0038, 0x3050
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-.byte 0x47
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x0800da00
+WaitForSomething2 0x00000001
+Wait 0x003c
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x0007
+SoundReq 0x01ce
+SetEntity0x20 0xffff8000
+TextboxNoOverlap 0x1701
+_0807EA94 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+TextboxNoOverlap 0x1702
+_0807EA94 
+SetEntity0x20 0x00010000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807F050 0x006d
+WaitPlayerAction8 
+_0807EB28 0x1703
+_0807EA94 
+Wait 0x003c
+SetLocalFlag 0x0032
+SoundReq 0x0113
+_0807E914 0x00000001
+Call 0x0806da1d
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D97D.inc b/data/scripts/gUnk_0800D97D.inc
deleted file mode 100644
index 4bab4af2..00000000
--- a/data/scripts/gUnk_0800D97D.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800D97D
-.short 0x000c
-.short 0x00da
diff --git a/data/scripts/gUnk_0800D981.inc b/data/scripts/gUnk_0800D981.inc
deleted file mode 100644
index 88ca163b..00000000
--- a/data/scripts/gUnk_0800D981.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-SCRIPT_START gUnk_0800D981
-.short 0x3308
-.short 0x010c
-.short 0x0000
-.short 0x3100
-.short 0x3c08
-.short 0x6100
-.short 0x0408
-.short 0x7900
-.short 0x0008
-.short 0x7900
-.short 0x0708
-.short 0x7b00
-.short 0xce08
-.short 0x6801
-.short 0x000c
-.short 0xff80
-.short 0x5bff
-.short 0x0108
-.short 0x5917
-.short 0x2804
-.short 0x040c
-.short 0x0000
-.short 0x3300
-.short 0x020c
-.short 0x0000
-.short 0x5b00
-.short 0x0208
-.short 0x5917
-.short 0x6804
-.short 0x000c
-.short 0x0100
-.short 0x2800
-.short 0x040c
-.short 0x0000
-.short 0x3300
-.short 0x020c
-.short 0x0000
-.short 0x8300
-.short 0x6d08
-.short 0x3400
-.short 0x5f04
-.short 0x0308
-.short 0x5917
-.short 0x3104
-.short 0x3c08
-.short 0x2a00
-.short 0x3208
-.short 0x7b00
-.short 0x1308
-.short 0x4e01
-.short 0x010c
-.short 0x0000
-.short 0x0b00
-.short 0x1d0c
-.short 0x06da
-.short 0x0b08
-.short 0x510c
-.short 0x07df
-.short 0x4408
-.short 0x7904
-.short 0x0608
-.short 0xff00
-.short 0x00ff
-.short 0x0100
-.short 0x6704
-.short 0x8008
-.short 0x0200
-.short 0x7904
-.short 0x0108
-.short 0x7300
-.short 0x180c
-.short 0x6001
diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800DA00.inc
similarity index 54%
rename from data/scripts/gUnk_0800AD54.inc
rename to data/scripts/gUnk_0800DA00.inc
index 27b91895..d30696df 100644
--- a/data/scripts/gUnk_0800AD54.inc
+++ b/data/scripts/gUnk_0800DA00.inc
@@ -1,11 +1,11 @@
-SCRIPT_START gUnk_0800AD54
+SCRIPT_START gUnk_0800DA00
 StartScript 
 SetEntityNonPlanarMovement 0x0080
 StopScript 
-_0807EC64 0x0020
+_0807EF80 0x0001
+_0807EDD4 0x0118, 0x0060
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DA11.inc b/data/scripts/gUnk_0800DA11.inc
deleted file mode 100644
index cbcd480a..00000000
--- a/data/scripts/gUnk_0800DA11.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800DA11
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800DA28.inc b/data/scripts/gUnk_0800DA28.inc
index fa14520a..9ef7f502 100644
--- a/data/scripts/gUnk_0800DA28.inc
+++ b/data/scripts/gUnk_0800DA28.inc
@@ -7,5 +7,8 @@ WaitForSomething2 0x00000004
 _0807EF80 0x0007
 Wait 0x003c
 _0807E5F8 0x00000002
-.short 0x0c33
-.short 0x0004
+WaitForSomething2 0x00000004
+_0807EDD4 0x0118, 0x0060
+_0807E5F8 0x00000002
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DA4C.inc b/data/scripts/gUnk_0800DA4C.inc
deleted file mode 100644
index a9f03fb0..00000000
--- a/data/scripts/gUnk_0800DA4C.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800DA4C
-.byte 0x0
diff --git a/data/scripts/gUnk_0800DA4D.inc b/data/scripts/gUnk_0800DA4D.inc
deleted file mode 100644
index 90e834cb..00000000
--- a/data/scripts/gUnk_0800DA4D.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_0800DA4D
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x18
-.byte 0x1
-.byte 0x60
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc
index 76a96408..4796cf09 100644
--- a/data/scripts/gUnk_0800DA60.inc
+++ b/data/scripts/gUnk_0800DA60.inc
@@ -4,40 +4,53 @@ StopScript
 CheckPlayerInRegion 0x0078, 0x0148, 0x4040
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 _0807E8E4_0 
-Call sub_0807F3F8
+Call 0x0807f3f9
 Wait 0x003c
 _0807F0B4 0x0004
 SetEntityPositionRelative 0x00800078
 CameraTargetEntity 
-Call sub_0807F5C0
+Call 0x0807f5c1
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-TextboxNoOverlapFollowPos 0x162d, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x162d
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000001
 Wait 0x001e
-TextboxNoOverlapFollowPos 0x162e, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x162e
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 _0807E8E4_0 
-CallWithArg sub_0807F75C, 0x00780138
+CallWithArg
+.short 0xf75d
+.short 0x0807
+.short 0x0138
+.short 0x0078
+@ End of 4 parameters
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call sub_0807F5C0
+Call 0x0807f5c1
 SetRoomFlag 0x0000
-Call sub_0807F40C
+Call 0x0807f40d
 Wait 0x001e
 _0807E8E4_1 
 Wait 0x000a
 _0807E8E4_3 
 Wait 0x000a
 _0807E8E4_2 
-Call sub_0807F3F8
+Call 0x0807f3f9
 Wait 0x003c
 SetRoomFlag 0x0001
 SetLocalFlag 0x0077
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DB18.inc b/data/scripts/gUnk_0800DB18.inc
index 9017228d..ed197a40 100644
--- a/data/scripts/gUnk_0800DB18.inc
+++ b/data/scripts/gUnk_0800DB18.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800DB18
 StartScript 
 _0807EF80 0x000a
-Call sub_08066E38
+Call 0x08066e39
 StopScript 
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DB28.inc b/data/scripts/gUnk_0800DB28.inc
index 74d6ca16..8dbae5d4 100644
--- a/data/scripts/gUnk_0800DB28.inc
+++ b/data/scripts/gUnk_0800DB28.inc
@@ -7,5 +7,15 @@ StopScript
 WaitForSomething2 0x00000001
 Wait 0x003c
 _0807EF80 0x0004
-.short 0x0831
-.short 0x003c
+Wait 0x003c
+_0807EB44 0x0004
+_0807EF80 0x001c
+Call 0x0807f2d5
+_0807EF80 0x0000
+Wait 0x003c
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EB44 0x0004
+_0807EF80 0x0014
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DB4A.inc b/data/scripts/gUnk_0800DB4A.inc
deleted file mode 100644
index 1885d12e..00000000
--- a/data/scripts/gUnk_0800DB4A.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800DB4A
-_0807EB44 0x0004
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EF80 0x0000
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB44 0x0004
-_0807EF80 0x0014
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc
index 88ffc18a..e3ef98fb 100644
--- a/data/scripts/gUnk_0800DB78.inc
+++ b/data/scripts/gUnk_0800DB78.inc
@@ -1,5 +1,57 @@
 SCRIPT_START gUnk_0800DB78
 StartScript 
 StopScript 
-CallWithArg sub_0807F6B4, 0x000000a0
-.short 0x0804
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x00a0
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0xfff4
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x00780078
+CameraTargetEntity 
+Call 0x0807f5c1
+_0807EB28 0x1648
+_0807EA94 
+Call 0x0804d7ed
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Call 0x0807df51
+_0807E878 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+Call 0x0804d811
+Call 0x0807f3f9
+Wait 0x003c
+StartPlayerScript 0x0800ddd0
+WaitForSomething2 0x00000004
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E5F8 0x00000001
+StartPlayerScript 0x0800de00
+WaitForSomething2 0x00000006
+TextboxNoOverlapFollowPos
+.short 0x1643
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+_0807EB28 0x1645
+_0807EA94 
+Call 0x0807f3f9
+_0807E5F8 0x00000001
+SoundReq0x80100000 
+Call 0x08094f99
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800DB88.inc b/data/scripts/gUnk_0800DB88.inc
deleted file mode 100644
index 5f084e07..00000000
--- a/data/scripts/gUnk_0800DB88.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-SCRIPT_START gUnk_0800DB88
-.short 0xfff4
-.short 0x0443
-.short 0x0c0b
-.short 0xf9a5
-.short 0x0807
-.short 0x0c0b
-.short 0xdf29
-.short 0x0807
-.short 0x0889
-.short 0x0001
-.short 0x0c69
-.short 0x0078
-.short 0x0078
-.short 0x0487
-.short 0x0c0b
-.short 0xf5c1
-.short 0x0807
-.short 0x085f
-.short 0x1648
-.short 0x0459
-.short 0x0c0b
-.short 0xd7ed
-.short 0x0804
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0815
-.short 0x0000
-.short 0x0805
-.short 0xfffa
-.short 0x0443
-.short 0x0c0b
-.short 0xf9a5
-.short 0x0807
-.short 0x0c0b
-.short 0xdf29
-.short 0x0807
-.short 0x0c0b
-.short 0xd811
-.short 0x0804
-.short 0x0c0b
-.short 0xf3f9
-.short 0x0807
-.short 0x0831
-.short 0x003c
-.short 0x0c47
-.short 0xddd0
-.short 0x0800
-.short 0x0c33
-.short 0x0004
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c47
diff --git a/data/scripts/gUnk_0800DC10.inc b/data/scripts/gUnk_0800DC10.inc
deleted file mode 100644
index 3354f111..00000000
--- a/data/scripts/gUnk_0800DC10.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800DC10
-.byte 0x0
-.byte 0xde
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x6
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800DC19.inc b/data/scripts/gUnk_0800DC19.inc
deleted file mode 100644
index 2ce37552..00000000
--- a/data/scripts/gUnk_0800DC19.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-SCRIPT_START gUnk_0800DC19
-.short 0x5c00
-.short 0x430c
-.short 0x0216
-.short 0x5900
-.short 0x5f04
-.short 0x4508
-.short 0x5916
-.short 0x0b04
-.short 0xf90c
-.short 0x07f3
-.short 0x2808
-.short 0x010c
-.short 0x0000
-.short 0x7e00
-.short 0x0b04
-.short 0x990c
-.short 0x094f
-.short 0x0c08
-.short 0xed14
-.short 0x05dd
-.short 0x0108
-.short 0x0000
-.short 0x8a00
-.short 0xff0c
-.short 0x00ff
-.short 0x3100
-.short 0x3c08
-.short 0x7c00
-.short 0x3108
-.short 0x4700
-.short 0x500c
-.short 0x00de
-.short 0x3308
-.short 0x060c
-.short 0x0000
-.short 0x5f00
-.short 0x4608
-.short 0x5916
-.short 0x2804
-.short 0x010c
-.short 0x0000
-.short 0x4700
-.short 0x2c0c
-.short 0x00de
-.short 0x8808
-.short 0x3804
-.short 0x0408
-.short 0x4100
-.short 0x000c
-.short 0x0000
-.short 0x3700
-.short 0x0c04
-.short 0x1914
-.short 0x05de
-.short 0x0108
-.short 0x0000
-.short 0x8a00
-.short 0x000c
-.short 0x0000
-.short 0x2a00
diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc
new file mode 100644
index 00000000..0bcebd35
--- /dev/null
+++ b/data/scripts/gUnk_0800DC4C.inc
@@ -0,0 +1,31 @@
+SCRIPT_START gUnk_0800DC4C
+Wait 0x003c
+SoundReq2 0x0031
+StartPlayerScript 0x0800de50
+WaitForSomething2 0x00000006
+_0807EB28 0x1646
+_0807EA94 
+_0807E5F8 0x00000001
+StartPlayerScript 0x0800de2c
+CameraTargetPlayer 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+SetLocalFlag 0x0079
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DC91.inc b/data/scripts/gUnk_0800DC91.inc
deleted file mode 100644
index 71c48c82..00000000
--- a/data/scripts/gUnk_0800DC91.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SCRIPT_START gUnk_0800DC91
-.byte 0x8
-.byte 0x79
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x1d
-.byte 0xda
-.byte 0x6
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc
index bf543e78..64b1df99 100644
--- a/data/scripts/gUnk_0800DCAC.inc
+++ b/data/scripts/gUnk_0800DCAC.inc
@@ -1,12 +1,72 @@
 SCRIPT_START gUnk_0800DCAC
 StartScript 
 _0807EF80 0x000a
-Call sub_08066E38
+Call 0x08066e39
 StopScript 
 WaitForSomething2 0x00000001
-CallWithArg sub_0807F8E8, 0x00000000
+CallWithArg
+.short 0xf8e9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807E5F8 0x00000002
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
-.short 0x0879
-.short 0x0010
+_0807EF80 0x0010
+Wait 0x003c
+_0807EF80 0x0010
+SetEntityPositionRelative 0x00680078
+WaitForSomething2 0x00000001
+SoundReq0x80100000 
+Call 0x08066e51
+SoundReq 0x01c9
+Call 0x0807f2d5
+SoundReq 0x01ca
+Wait 0x003c
+_0807EF80 0x0004
+SoundReq2 0x000b
+Wait 0x0078
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x003c
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x0100
+_0807EEF4 0x0000, 0x0008
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x001e
+Call 0x08066e81
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807EF80 0x0004
+Wait 0x003c
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x0100
+_0807EEF4 0x0000, 0x0080
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DCDC.inc b/data/scripts/gUnk_0800DCDC.inc
deleted file mode 100644
index beb9af3b..00000000
--- a/data/scripts/gUnk_0800DCDC.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800DCDC
-Wait 0x003c
-_0807EF80 0x0010
-SetEntityPositionRelative 0x00680078
-WaitForSomething2 0x00000001
-SoundReq0x80100000 
-Call sub_08066E50
-SoundReq 0x01c9
-Call sub_0807F2D4
-.short 0x087b
diff --git a/data/scripts/gUnk_0800DD04.inc b/data/scripts/gUnk_0800DD04.inc
deleted file mode 100644
index 1a7f42c1..00000000
--- a/data/scripts/gUnk_0800DD04.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800DD04
-.short 0x01ca
-.short 0x0831
-.short 0x003c
-.short 0x0879
-.short 0x0004
-.short 0x087c
diff --git a/data/scripts/gUnk_0800DD10.inc b/data/scripts/gUnk_0800DD10.inc
deleted file mode 100644
index 8612e296..00000000
--- a/data/scripts/gUnk_0800DD10.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800DD10
-.byte 0xb
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
diff --git a/data/scripts/gUnk_0800DD19.inc b/data/scripts/gUnk_0800DD19.inc
deleted file mode 100644
index 44db9bce..00000000
--- a/data/scripts/gUnk_0800DD19.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800DD19
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
diff --git a/data/scripts/gUnk_0800DD22.inc b/data/scripts/gUnk_0800DD22.inc
deleted file mode 100644
index d42d1020..00000000
--- a/data/scripts/gUnk_0800DD22.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_0800DD22
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x0100
-_0807EEF4 0x0000, 0x0008
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x001e
-Call sub_08066E80
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EF80 0x0004
-Wait 0x003c
-.byte 0x61
-.byte 0x8
-.byte 0x2
diff --git a/data/scripts/gUnk_0800DD8D.inc b/data/scripts/gUnk_0800DD8D.inc
deleted file mode 100644
index 836543b8..00000000
--- a/data/scripts/gUnk_0800DD8D.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800DD8D
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
diff --git a/data/scripts/gUnk_0800DDAA.inc b/data/scripts/gUnk_0800DDAA.inc
deleted file mode 100644
index b54cfa42..00000000
--- a/data/scripts/gUnk_0800DDAA.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800DDAA
-Wait 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x0100
-_0807EEF4 0x0000, 0x0080
-SCRIPT_END
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x140c
-.short 0xf4f9
-.short 0x0807
-.short 0x00a0
-.short 0x0000
-.short 0x0c73
-.short 0x0078
-.short 0x00a0
diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc
new file mode 100644
index 00000000..a87382da
--- /dev/null
+++ b/data/scripts/gUnk_0800DDD0.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_0800DDD0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x00a0
+.short 0x0000
+@ End of 4 parameters
+_0807EDD4 0x0078, 0x00a0
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DDE8.inc b/data/scripts/gUnk_0800DDE8.inc
deleted file mode 100644
index f7f3205b..00000000
--- a/data/scripts/gUnk_0800DDE8.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800DDE8
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
diff --git a/data/scripts/gUnk_0800DDFC.inc b/data/scripts/gUnk_0800DDFC.inc
deleted file mode 100644
index e06fa928..00000000
--- a/data/scripts/gUnk_0800DDFC.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800DDFC
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800DE00.inc b/data/scripts/gUnk_0800DE00.inc
index 6151a959..0db24874 100644
--- a/data/scripts/gUnk_0800DE00.inc
+++ b/data/scripts/gUnk_0800DE00.inc
@@ -8,44 +8,6 @@ _0807EF80 0x0000
 _0807ECC4 0x0010
 _0807EF80 0x000c
 _0807E5F8 0x00000004
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c77
-.short 0x0000
-.short 0x0080
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0402
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x140c
-.short 0xf239
-.short 0x0807
-.short 0x03c5
-.short 0x0000
-.short 0x0c0b
-.short 0xf305
-.short 0x0807
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_0800DE2C.inc b/data/scripts/gUnk_0800DE2C.inc
new file mode 100644
index 00000000..4fd1716d
--- /dev/null
+++ b/data/scripts/gUnk_0800DE2C.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800DE2C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EEF4 0x0000, 0x0080
+_0807E5F8 0x00000004
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc
new file mode 100644
index 00000000..3d9860e0
--- /dev/null
+++ b/data/scripts/gUnk_0800DE50.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_0800DE50
+StopScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x03c5
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f305
+_0807E5F8 0x00000004
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DE78.inc b/data/scripts/gUnk_0800DE78.inc
index 075549bb..cc5a1b73 100644
--- a/data/scripts/gUnk_0800DE78.inc
+++ b/data/scripts/gUnk_0800DE78.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_0800DE78
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 StartPlayerScript 0x0800deb0
 WaitForSomething2 0x00000001
 WaitForSomething2 0x00000002
 _0807EB28 0x1647
 _0807EA94 
 SetLocalFlag 0x007a
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DEB0.inc b/data/scripts/gUnk_0800DEB0.inc
index 9f9cb7d8..6d86314c 100644
--- a/data/scripts/gUnk_0800DEB0.inc
+++ b/data/scripts/gUnk_0800DEB0.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x0198, 0x01c8
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DED4.inc b/data/scripts/gUnk_0800DED4.inc
index 1524793f..3e1a8115 100644
--- a/data/scripts/gUnk_0800DED4.inc
+++ b/data/scripts/gUnk_0800DED4.inc
@@ -4,9 +4,18 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000b
-Call sub_08066D04
+Call 0x08066d05
 StopScript 
 StartScript 
-.short 0x0c0b
-.short 0x6d15
-.short 0x0806
+Call 0x08066d15
+SetEntityPositionRelative 0x01480198
+_0807EF80 0x0007
+StopScript 
+_0807EDD4 0x0198, 0x01a8
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call 0x08066d4d
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800DEF6.inc b/data/scripts/gUnk_0800DEF6.inc
deleted file mode 100644
index af54a3f7..00000000
--- a/data/scripts/gUnk_0800DEF6.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800DEF6
-SetEntityPositionRelative 0x01480198
-_0807EF80 0x0007
-StopScript 
-.byte 0x73
-.byte 0xc
-.byte 0x98
-.byte 0x1
-.byte 0xa8
diff --git a/data/scripts/gUnk_0800DF07.inc b/data/scripts/gUnk_0800DF07.inc
deleted file mode 100644
index c2033e78..00000000
--- a/data/scripts/gUnk_0800DF07.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800DF07
-.byte 0x1
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x4d
-.byte 0x6d
-.byte 0x6
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc
index 842a183a..86f06c8d 100644
--- a/data/scripts/gUnk_0800DF24.inc
+++ b/data/scripts/gUnk_0800DF24.inc
@@ -5,34 +5,37 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 StopScript 
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 SoundReq0x80100000 
 _0807E8E4_2 
 Wait 0x005a
-Call sub_0807F3F8
+Call 0x0807f3f9
 Wait 0x003c
 _0807E8E4_0 
 _0807F0B4 0x0001
 CameraTargetEntity 
-Call sub_0807F5C0
-Call sub_08066C94
+Call 0x0807f5c1
+Call 0x08066c95
 Wait 0x00e9
 _0807EF80 0x0007
-TextboxNoOverlapFollowPos 0x162f, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x162f
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 SoundReq2 0x002f
 _0807EF80 0x0019
 SoundReq 0x0198
-Call sub_0807F2D4
+Call 0x0807f2d5
 SetRoomFlag 0x0000
 _0807EF80 0x0008
 Wait 0x0080
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call sub_0807F5C0
+Call 0x0807f5c1
 SetLocalFlag 0x0078
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc
index 7697f328..c1f2c298 100644
--- a/data/scripts/gUnk_0800DFB4.inc
+++ b/data/scripts/gUnk_0800DFB4.inc
@@ -4,7 +4,15 @@ CheckRoomFlag 0x0001
 JumpIfNot 0xfffa
 SoundReq0x80100000 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SoundReq 0x00f6
-.short 0x140c
+CallWithArg
 .short 0xda1d
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFD0.inc b/data/scripts/gUnk_0800DFD0.inc
deleted file mode 100644
index 3ff0be81..00000000
--- a/data/scripts/gUnk_0800DFD0.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800DFD0
-_0807E078 0x0004
-.byte 0x0
-.byte 0x0
-.byte 0xb
diff --git a/data/scripts/gUnk_0800DFD7.inc b/data/scripts/gUnk_0800DFD7.inc
deleted file mode 100644
index ff2789b8..00000000
--- a/data/scripts/gUnk_0800DFD7.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800DFD7
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
diff --git a/data/scripts/gUnk_0800DFDE.inc b/data/scripts/gUnk_0800DFDE.inc
deleted file mode 100644
index d2d8c0eb..00000000
--- a/data/scripts/gUnk_0800DFDE.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800DFDE
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc
index fa5c2ad2..0c9cbd6c 100644
--- a/data/scripts/gUnk_0800DFE4.inc
+++ b/data/scripts/gUnk_0800DFE4.inc
@@ -1,28 +1,39 @@
 SCRIPT_START gUnk_0800DFE4
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E864 
 StopScript 
 SoundReq0x80100000 
-TextboxNoOverlapFollowPos 0x1632, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1632
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 SetRoomFlag 0x0003
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 SoundReq2 0x0030
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 CheckRoomFlag 0x0002
 JumpIfNot 0xfffa
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 SetLocalFlag 0x007b
-TextboxNoOverlapFollowPos 0x1639, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x1639
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 Wait 0x0096
 SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x00000005
-Call sub_0807DF50
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0005
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E050.inc b/data/scripts/gUnk_0800E050.inc
index d3d3ee42..2bfb0644 100644
--- a/data/scripts/gUnk_0800E050.inc
+++ b/data/scripts/gUnk_0800E050.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800E050
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E864 
 StopScript 
 SoundReq0x80100000 
@@ -13,28 +13,8 @@ Wait 0x001e
 _0807E5F8 0x00000001
 StartPlayerScript 0x0800e094
 WaitForSomething2 0x00000002
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x00c0
-.short 0x0402
-.short 0x0c33
-.short 0x0001
-.short 0x0000
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x00a8
-.short 0x002c
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800E094.inc b/data/scripts/gUnk_0800E094.inc
new file mode 100644
index 00000000..c91b7180
--- /dev/null
+++ b/data/scripts/gUnk_0800E094.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800E094
+StartScript 
+SetEntityNonPlanarMovement 0x00c0
+StopScript 
+WaitForSomething2 0x00000001
+_0807EF80 0x0001
+_0807EDD4 0x00a8, 0x002c
+_0807E5F8 0x00000002
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc
index 3c5626c5..aada138e 100644
--- a/data/scripts/gUnk_0800E0BC.inc
+++ b/data/scripts/gUnk_0800E0BC.inc
@@ -5,7 +5,12 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0093
 JumpIf 0x0062
 _0807E930 0x0008
-CallWithArg sub_0807F8E8, 0x00000000
+CallWithArg
+.short 0xf8e9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -13,4 +18,376 @@ _0807E864
 Wait 0x001e
 _0807EF80 0x0010
 SoundReq 0x01c9
-.short 0x0850
+_0807E930 0x0009
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB8C 
+_0807EB74 
+Wait 0x000a
+TextboxNoOverlap 0x2402
+_0807EA94 
+SetLocalFlag 0x0093
+Call 0x080668f1
+_0807E878 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2402
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0094
+JumpIf 0x006c
+_0807E930 0x0010
+CallWithArg
+.short 0xf8e9
+.short 0x0807
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckRoomFlag 0x0001
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+_0807E930 0x0015
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB8C 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Wait 0x000a
+TextboxNoOverlap 0x2401
+_0807EA94 
+SetLocalFlag 0x0094
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807E9D4 
+_0807E878 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlap 0x2401
+_0807EA94 
+_0807E878 
+Jump 0xffe2
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0073
+JumpIfNot 0x001e
+_0807E9D4 
+SetEntityPositionRelative 0x01680070
+_0807EB44 0x0002
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+Jump 0x00fe
+CheckLocalFlag 0x0095
+JumpIf 0x0062
+_0807E930 0x0010
+CallWithArg
+.short 0xf8e9
+.short 0x0807
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckRoomFlag 0x0002
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+_0807E930 0x0015
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB8C 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+SetLocalFlag 0x0095
+_0807EF80 0x0000
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807E9D4 
+_0807E878 
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x005c
+CheckLocalFlag 0x0093
+JumpIfNot 0xfff0
+CheckLocalFlag 0x0094
+JumpIfNot 0xffe8
+CheckLocalFlag 0x0095
+JumpIfNot 0xffe0
+_0807E9DC 
+SetLocalFlag 0x0073
+StopScript 
+_0807EB44 0x0000
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+_0807EDD4 0x0088, 0x0168
+_0807EB44 0x0006
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+_0807EDD4 0x0070, 0x0168
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807E9D4 
+Jump 0x001e
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+TextboxNoOverlap 0x2404
+_0807EA94 
+_0807E878 
+Jump 0xff82
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlap 0x2403
+_0807EA94 
+_0807E878 
+Jump 0xffe2
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CheckLocalFlag 0x0071
+JumpIf 0x0088
+CheckLocalFlag 0x0096
+JumpIf 0x0056
+_0807E930 0x000c
+CallWithArg
+.short 0xf8e9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x001e
+_0807EF80 0x0010
+SoundReq 0x01c9
+_0807E930 0x000d
+Wait 0x003c
+SoundReq 0x01ca
+_0807EF80 0x0010
+Wait 0x001e
+SoundReq 0x0072
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x001e
+_0807EF80 0x0000
+_0807EB74 
+SetLocalFlag 0x0096
+_0807EF80 0x0000
+_0807E9D4 
+_0807E878 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x240c
+_0807EA94 
+Wait 0x000f
+_0807F034 0x0053
+WaitPlayerAction8 
+SetLocalFlag 0x0071
+_0807E878 
+_0807E9D4 
+_0807E878 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x240d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+StartScript 
+_0807EB44 0x0002
+_0807EF80 0x000a
+Call 0x080668f1
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2406
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe8
+StartScript 
+_0807EB44 0x0002
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlap 0x2405
+_0807EA94 
+_0807E878 
+Jump 0xffe2
+StartScript 
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlap 0x2407
+_0807EA94 
+_0807E878 
+Jump 0xffe2
+StartScript 
+Call 0x0807f355
+StopScript 
+CheckLocalFlag 0x007c
+JumpIf 0x0046
+CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
+JumpIfNot 0xfff6
+StartScript 
+_0807E864 
+StopScript 
+Call 0x0807f3f9
+Wait 0x003c
+TextboxNoOverlapFollow 0x160c
+_0807EA94 
+Wait 0x001e
+TextboxNoOverlapFollow 0x160d
+_0807EA94 
+Wait 0x001e
+_0807EB28 0x160e
+Wait 0x003c
+_0807EA94 
+StartScript 
+SoundReq2 0x0033
+SetLocalFlag 0x007c
+_0807E878 
+_0807EF80 0x0006
+StopScript 
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E0F6.inc b/data/scripts/gUnk_0800E0F6.inc
deleted file mode 100644
index aae1f893..00000000
--- a/data/scripts/gUnk_0800E0F6.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_0800E0F6
-.short 0x0009
-.short 0x0831
-.short 0x003c
-.short 0x087b
-.short 0x01ca
-.short 0x0879
-.short 0x0010
-.short 0x0831
-.short 0x001e
-.short 0x087b
-.short 0x0072
-.short 0x0831
-.short 0x0078
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x001e
-.short 0x0879
-.short 0x0000
-.short 0x0464
-.short 0x0463
-.short 0x0831
-.short 0x000a
-.short 0x085b
-.short 0x2402
-.short 0x0459
-.short 0x082a
-.short 0x0093
-.short 0x0c0b
-.short 0x68f1
-.short 0x0806
-.short 0x0444
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
diff --git a/data/scripts/gUnk_0800E140.inc b/data/scripts/gUnk_0800E140.inc
deleted file mode 100644
index 1c76ce25..00000000
--- a/data/scripts/gUnk_0800E140.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800E140
-_0807EB74 
-TextboxNoOverlap 0x2402
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-.byte 0x0
diff --git a/data/scripts/gUnk_0800E153.inc b/data/scripts/gUnk_0800E153.inc
deleted file mode 100644
index dc8aa199..00000000
--- a/data/scripts/gUnk_0800E153.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800E153
-.byte 0x0
diff --git a/data/scripts/gUnk_0800E154.inc b/data/scripts/gUnk_0800E154.inc
deleted file mode 100644
index 8120e6dd..00000000
--- a/data/scripts/gUnk_0800E154.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_0800E154
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0094
-JumpIf 0x006c
-_0807E930 0x0010
-CallWithArg sub_0807F8E8, 0x00000001
-StopScript 
-CheckRoomFlag 0x0001
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x0015
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB8C 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-.byte 0x31
-.byte 0x8
-.byte 0xa
diff --git a/data/scripts/gUnk_0800E1C5.inc b/data/scripts/gUnk_0800E1C5.inc
deleted file mode 100644
index b1fb4da9..00000000
--- a/data/scripts/gUnk_0800E1C5.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-SCRIPT_START gUnk_0800E1C5
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x1
-.byte 0x24
-.byte 0x59
-.byte 0x4
-.byte 0x2a
-.byte 0x8
-.byte 0x94
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x53
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x1
-.byte 0x24
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe2
-.byte 0xff
diff --git a/data/scripts/gUnk_0800E200.inc b/data/scripts/gUnk_0800E200.inc
deleted file mode 100644
index 287a4365..00000000
--- a/data/scripts/gUnk_0800E200.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-SCRIPT_START gUnk_0800E200
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0073
-JumpIfNot 0x001e
-_0807E9D4 
-SetEntityPositionRelative 0x01680070
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-Jump 0x00fe
-CheckLocalFlag 0x0095
-JumpIf 0x0062
-_0807E930 0x0010
-CallWithArg sub_0807F8E8, 0x00000002
-StopScript 
-CheckRoomFlag 0x0002
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x0015
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB8C 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-SetLocalFlag 0x0095
-_0807EF80 0x0000
-CallWithArg sub_0807F3D8, 0x00000000
-_0807E9D4 
-_0807E878 
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x005c
-CheckLocalFlag 0x0093
-JumpIfNot 0xfff0
-CheckLocalFlag 0x0094
-JumpIfNot 0xffe8
-CheckLocalFlag 0x0095
-JumpIfNot 0xffe0
-_0807E9DC 
-SetLocalFlag 0x0073
-StopScript 
-_0807EB44 0x0000
-CallWithArg sub_0807F3D8, 0x00000004
-_0807EDD4 0x0088, 0x0168
-_0807EB44 0x0006
-CallWithArg sub_0807F3D8, 0x00000004
-.short 0x0c73
-.short 0x0070
-.short 0x0168
diff --git a/data/scripts/gUnk_0800E300.inc b/data/scripts/gUnk_0800E300.inc
deleted file mode 100644
index e94132c2..00000000
--- a/data/scripts/gUnk_0800E300.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800E300
-_0807EB74 
-.byte 0xc
-.byte 0x14
-.byte 0xd9
diff --git a/data/scripts/gUnk_0800E305.inc b/data/scripts/gUnk_0800E305.inc
deleted file mode 100644
index cdb3ea4d..00000000
--- a/data/scripts/gUnk_0800E305.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800E305
-.short 0x07f3
diff --git a/data/scripts/gUnk_0800E307.inc b/data/scripts/gUnk_0800E307.inc
deleted file mode 100644
index 5d62dd31..00000000
--- a/data/scripts/gUnk_0800E307.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800E307
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800E30C.inc b/data/scripts/gUnk_0800E30C.inc
deleted file mode 100644
index 88f350a3..00000000
--- a/data/scripts/gUnk_0800E30C.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800E30C
-_0807E9D4 
-Jump 0x001e
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-TextboxNoOverlap 0x2404
-_0807EA94 
-.byte 0x44
diff --git a/data/scripts/gUnk_0800E329.inc b/data/scripts/gUnk_0800E329.inc
deleted file mode 100644
index f1d61aad..00000000
--- a/data/scripts/gUnk_0800E329.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800E329
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x82
-.byte 0xff
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x3
-.byte 0x24
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe2
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800E350.inc b/data/scripts/gUnk_0800E350.inc
deleted file mode 100644
index 9a0449e6..00000000
--- a/data/scripts/gUnk_0800E350.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-SCRIPT_START gUnk_0800E350
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0071
-JumpIf 0x0088
-CheckLocalFlag 0x0096
-JumpIf 0x0056
-_0807E930 0x000c
-CallWithArg sub_0807F8E8, 0x00000000
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x000d
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB74 
-SetLocalFlag 0x0096
-_0807EF80 0x0000
-_0807E9D4 
-_0807E878 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x240c
-_0807EA94 
-Wait 0x000f
-_0807F034 0x0053
-WaitPlayerAction8 
-SetLocalFlag 0x0071
-_0807E878 
-_0807E9D4 
-_0807E878 
-StopScript 
diff --git a/data/scripts/gUnk_0800E3EE.inc b/data/scripts/gUnk_0800E3EE.inc
deleted file mode 100644
index 12ba23bc..00000000
--- a/data/scripts/gUnk_0800E3EE.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800E3EE
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-.byte 0x5b
diff --git a/data/scripts/gUnk_0800E3F9.inc b/data/scripts/gUnk_0800E3F9.inc
deleted file mode 100644
index c1c452d1..00000000
--- a/data/scripts/gUnk_0800E3F9.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800E3F9
-.byte 0x8
diff --git a/data/scripts/gUnk_0800E3FA.inc b/data/scripts/gUnk_0800E3FA.inc
deleted file mode 100644
index 4c052ab0..00000000
--- a/data/scripts/gUnk_0800E3FA.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800E3FA
-.short 0x240d
diff --git a/data/scripts/gUnk_0800E3FC.inc b/data/scripts/gUnk_0800E3FC.inc
deleted file mode 100644
index 282136e7..00000000
--- a/data/scripts/gUnk_0800E3FC.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800E3FC
-_0807EA94 
-.short 0x0831
diff --git a/data/scripts/gUnk_0800E400.inc b/data/scripts/gUnk_0800E400.inc
deleted file mode 100644
index e22e6d14..00000000
--- a/data/scripts/gUnk_0800E400.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800E400
-.short 0x000f
-.short 0x0444
-.short 0x0803
-.short 0xffe8
diff --git a/data/scripts/gUnk_0800E408.inc b/data/scripts/gUnk_0800E408.inc
deleted file mode 100644
index 2f60c694..00000000
--- a/data/scripts/gUnk_0800E408.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800E408
-StartScript 
-.byte 0x61
diff --git a/data/scripts/gUnk_0800E40B.inc b/data/scripts/gUnk_0800E40B.inc
deleted file mode 100644
index 224feb8f..00000000
--- a/data/scripts/gUnk_0800E40B.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800E40B
-.short 0x0208
-.short 0x7900
-.short 0x0a08
diff --git a/data/scripts/gUnk_0800E411.inc b/data/scripts/gUnk_0800E411.inc
deleted file mode 100644
index c9db5d83..00000000
--- a/data/scripts/gUnk_0800E411.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SCRIPT_START gUnk_0800E411
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xf1
-.byte 0x68
-.byte 0x6
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0x5b
-.byte 0x8
-.byte 0x6
-.byte 0x24
-.byte 0x59
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
diff --git a/data/scripts/gUnk_0800E430.inc b/data/scripts/gUnk_0800E430.inc
deleted file mode 100644
index 3af172e9..00000000
--- a/data/scripts/gUnk_0800E430.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800E430
-.short 0x0803
-.short 0xffe8
diff --git a/data/scripts/gUnk_0800E434.inc b/data/scripts/gUnk_0800E434.inc
deleted file mode 100644
index 0780d5bc..00000000
--- a/data/scripts/gUnk_0800E434.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800E434
-StartScript 
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlap 0x2405
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffe2
diff --git a/data/scripts/gUnk_0800E46C.inc b/data/scripts/gUnk_0800E46C.inc
deleted file mode 100644
index 598e5559..00000000
--- a/data/scripts/gUnk_0800E46C.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0800E46C
-StartScript 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-.byte 0x5
-.byte 0x8
-.byte 0xfc
diff --git a/data/scripts/gUnk_0800E489.inc b/data/scripts/gUnk_0800E489.inc
deleted file mode 100644
index 2bedfe87..00000000
--- a/data/scripts/gUnk_0800E489.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800E489
-.short 0x43ff
-.short 0x6304
-.short 0x0c04
-.short 0xd914
-.short 0x07f3
-.short 0x0008
-.short 0x0000
-.short 0x5b00
diff --git a/data/scripts/gUnk_0800E499.inc b/data/scripts/gUnk_0800E499.inc
deleted file mode 100644
index 6970feeb..00000000
--- a/data/scripts/gUnk_0800E499.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800E499
-.byte 0x8
-.byte 0x7
-.byte 0x24
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe2
-.byte 0xff
diff --git a/data/scripts/gUnk_0800E4A4.inc b/data/scripts/gUnk_0800E4A4.inc
deleted file mode 100644
index 51402646..00000000
--- a/data/scripts/gUnk_0800E4A4.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800E4A4
-StartScript 
-Call sub_0807F354
-StopScript 
-CheckLocalFlag 0x007c
-JumpIf 0x0046
-CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
-JumpIfNot 0xfff6
-StartScript 
-_0807E864 
-StopScript 
-Call sub_0807F3F8
-Wait 0x003c
-TextboxNoOverlapFollow 0x160c
-_0807EA94 
-Wait 0x001e
-TextboxNoOverlapFollow 0x160d
-_0807EA94 
-.byte 0x31
diff --git a/data/scripts/gUnk_0800E4E3.inc b/data/scripts/gUnk_0800E4E3.inc
deleted file mode 100644
index dfbba668..00000000
--- a/data/scripts/gUnk_0800E4E3.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_0800E4E3
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x5f
-.byte 0x8
-.byte 0xe
-.byte 0x16
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0x7c
-.byte 0x8
-.byte 0x33
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0x7c
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800E504.inc b/data/scripts/gUnk_0800E504.inc
index 5466e088..6b3ce23d 100644
--- a/data/scripts/gUnk_0800E504.inc
+++ b/data/scripts/gUnk_0800E504.inc
@@ -1,5 +1,18 @@
 SCRIPT_START gUnk_0800E504
 StartScript 
 StopScript 
-.short 0x0812
-.short 0x007d
+CheckLocalFlag 0x007d
+JumpIf 0x002e
+CheckPlayerInRegion 0x00a8, 0x0178, 0x1080
+JumpIfNot 0xfff6
+_0807E864 
+Wait 0x001e
+Call 0x0807f3f9
+Wait 0x003c
+SoundReq 0x0105
+Wait 0x001e
+_0807EB28 0x1617
+SetLocalFlag 0x007d
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E50C.inc b/data/scripts/gUnk_0800E50C.inc
deleted file mode 100644
index 75f145fe..00000000
--- a/data/scripts/gUnk_0800E50C.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800E50C
-JumpIf 0x002e
-CheckPlayerInRegion 0x00a8, 0x0178, 0x1080
-JumpIfNot 0xfff6
-_0807E864 
-Wait 0x001e
-Call sub_0807F3F8
-Wait 0x003c
-SoundReq 0x0105
-Wait 0x001e
-_0807EB28 0x1617
-SetLocalFlag 0x007d
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800E544.inc b/data/scripts/gUnk_0800E544.inc
index 3b997d96..8b5cb87f 100644
--- a/data/scripts/gUnk_0800E544.inc
+++ b/data/scripts/gUnk_0800E544.inc
@@ -7,12 +7,12 @@ CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880
 JumpIfNot 0xfff6
 _0807E864 
 Wait 0x001e
-Call sub_0807F3F8
+Call 0x0807f3f9
 Wait 0x003c
 SoundReq 0x0105
 Wait 0x001e
 _0807EB28 0x1622
-Call sub_08053494
+Call 0x08053495
 SetLocalFlag 0x007e
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800E58C.inc b/data/scripts/gUnk_0800E58C.inc
index db10f91a..09c173f9 100644
--- a/data/scripts/gUnk_0800E58C.inc
+++ b/data/scripts/gUnk_0800E58C.inc
@@ -12,6 +12,6 @@ Wait 0x001e
 TextboxNoOverlap 0x1625
 _0807EA94 
 Wait 0x003c
-Call sub_08053C84
+Call 0x08053c85
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800E5C4.inc b/data/scripts/gUnk_0800E5C4.inc
index 80384901..aa2c3204 100644
--- a/data/scripts/gUnk_0800E5C4.inc
+++ b/data/scripts/gUnk_0800E5C4.inc
@@ -5,24 +5,3 @@ JumpIfNot 0x000a
 _0807EF80 0x0006
 StopScript 
 SCRIPT_END
-.short 0x0402
-.short 0x0812
-.short 0x0086
-.short 0x0805
-.short 0xfffa
-.short 0x0443
-.short 0x0831
-.short 0x003c
-.short 0x0c4e
-.short 0x0905
-.short 0x0000
-.short 0x0c0b
-.short 0xf421
-.short 0x0807
-.short 0x082f
-.short 0x0001
-.short 0x0831
-.short 0x001e
-.short 0x0444
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800E5D6.inc b/data/scripts/gUnk_0800E5D6.inc
new file mode 100644
index 00000000..45eed0b2
--- /dev/null
+++ b/data/scripts/gUnk_0800E5D6.inc
@@ -0,0 +1,13 @@
+SCRIPT_START gUnk_0800E5D6
+StopScript 
+CheckLocalFlag 0x0086
+JumpIfNot 0xfffa
+_0807E864 
+Wait 0x003c
+_0807E914 0x00000905
+Call 0x0807f421
+SetRoomFlag 0x0001
+Wait 0x001e
+_0807E878 
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E600.inc b/data/scripts/gUnk_0800E600.inc
index b61b17a2..e0cf612c 100644
--- a/data/scripts/gUnk_0800E600.inc
+++ b/data/scripts/gUnk_0800E600.inc
@@ -3,4 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0000
 _0807E864 
-.short 0x0c0b
+Call 0x0807f355
+StopScript 
+WaitForPlayerAction0x17 
+_0807E8E4_0 
+_0807EF80 0x0001
+Call 0x080752ad
+_0807E878 
+Call 0x080791d1
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E60E.inc b/data/scripts/gUnk_0800E60E.inc
deleted file mode 100644
index 0982add4..00000000
--- a/data/scripts/gUnk_0800E60E.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_0800E60E
-.short 0xf355
-.short 0x0807
-.short 0x0402
-.short 0x0435
-.short 0x0449
-.short 0x0879
-.short 0x0001
-.short 0x0c0b
-.short 0x52ad
-.short 0x0807
-.short 0x0444
-.short 0x0c0b
-.short 0x91d1
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_0800E62C.inc b/data/scripts/gUnk_0800E62C.inc
index b2267bf5..7c2303ff 100644
--- a/data/scripts/gUnk_0800E62C.inc
+++ b/data/scripts/gUnk_0800E62C.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0008
 _0807E864 
-Call sub_0807F354
+Call 0x0807f355
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_1 
 _0807EF80 0x0001
-Call sub_080752AC
+Call 0x080752ad
 _0807E878 
-Call sub_080791D0
+Call 0x080791d1
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E658.inc b/data/scripts/gUnk_0800E658.inc
index f51cd3cf..7d530b7a 100644
--- a/data/scripts/gUnk_0800E658.inc
+++ b/data/scripts/gUnk_0800E658.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0010
 _0807E864 
-Call sub_0807F354
+Call 0x0807f355
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_2 
 _0807EF80 0x0001
-Call sub_080752AC
+Call 0x080752ad
 _0807E878 
-Call sub_080791D0
+Call 0x080791d1
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E684.inc b/data/scripts/gUnk_0800E684.inc
index d59676bc..98aa719d 100644
--- a/data/scripts/gUnk_0800E684.inc
+++ b/data/scripts/gUnk_0800E684.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0018
 _0807E864 
-Call sub_0807F354
+Call 0x0807f355
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_3 
 _0807EF80 0x0001
-Call sub_080752AC
+Call 0x080752ad
 _0807E878 
-Call sub_080791D0
+Call 0x080791d1
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc
index e85b52c7..033b40e7 100644
--- a/data/scripts/gUnk_0800E6B0.inc
+++ b/data/scripts/gUnk_0800E6B0.inc
@@ -1,19 +1,176 @@
 SCRIPT_START gUnk_0800E6B0
 StartScript 
-Call sub_08060090
+Call 0x08060091
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call sub_08060158
+Call 0x08060159
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call sub_0806025C
+Call 0x0806025d
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x0803
-.short 0xffd8
+Jump 0xffd8
+StartScript 
+Call 0x0806adfd
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x000c
+Call 0x0806aee5
+Jump 0xffee
+StopScript 
+_0807E864 
+Call 0x0806afe9
+JumpIf 0x000e
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd4
+_0807EA94 
+_0807F034 0x0057
+WaitPlayerAction8 
+_0807EA94 
+_0807E878 
+Jump 0xffc4
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806afe9
+_0807EA94 
+_0807E878 
+Jump 0xffe0
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+SetEntityNonPlanarMovement 0x0200
+CheckGlobalFlag 0x0029
+JumpIfNot 0x000a
+CheckGlobalFlag 0x002a
+JumpIfNot 0x000c
+SetEntityPositionRelative 0x00980188
+Jump 0xff70
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002a
+JumpIf 0x002a
+CheckEntityInteractType 
+JumpIf 0x000e
+Call 0x0806aee5
+StopScript 
+Jump 0xffe6
+StopScript 
+_0807E864 
+Call 0x0806afe9
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffd0
+_0807EF80 0x000f
+_0807EB44 0x0002
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806af71
+_0807EE04 0x0188, 0x0058
+StopScript 
+StartScript 
+Call 0x0806af79
+_0807EE30 
+JumpIfNot 0xfff2
+EntityHasHeight 
+JumpIf 0xffec
+StopScript 
+Jump 0xff02
+StartScript 
+Call 0x0806c675
+_0807EF80 0x000a
+_0807EB44 0x0004
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806c70d
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+Jump 0xffe6
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB44 0x0004
+StartScript 
+TextboxNoOverlapFollow 0x4501
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x0032
+.short 0x0001
+@ End of 4 parameters
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x00c8
+.short 0x0002
+@ End of 4 parameters
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x0190
+.short 0x0003
+@ End of 4 parameters
+StopScript 
+_0807EA94 
+_0807EB38 
+_0807E078
+.short 0x00a6
+.short 0x006a
+.short 0x0036
+.short 0x0002
+@ End of 4 parameters
+StartScript 
+TextboxNoOverlapFollow 0x4505
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x0190
+.short 0x0001
+@ End of 4 parameters
+StopScript 
+_0807EA94 
+HasRupees 0x0190
+JumpIfNot 0x007c
+ModRupees 0xfe70
+SetLocalFlag 0x0091
+TextboxNoOverlapFollow 0x4508
+_0807EA94 
+Call 0x0806c579
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E6E8.inc b/data/scripts/gUnk_0800E6E8.inc
deleted file mode 100644
index 413751e4..00000000
--- a/data/scripts/gUnk_0800E6E8.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800E6E8
-StartScript 
-Call sub_0806ADFC
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000c
-Call sub_0806AEE4
-.byte 0x3
-.byte 0x8
-.byte 0xee
diff --git a/data/scripts/gUnk_0800E707.inc b/data/scripts/gUnk_0800E707.inc
deleted file mode 100644
index 8035a1e5..00000000
--- a/data/scripts/gUnk_0800E707.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800E707
-.byte 0xff
-.byte 0x2
-.byte 0x4
diff --git a/data/scripts/gUnk_0800E70A.inc b/data/scripts/gUnk_0800E70A.inc
deleted file mode 100644
index da9019d6..00000000
--- a/data/scripts/gUnk_0800E70A.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800E70A
-_0807E864 
-Call sub_0806AFE8
-JumpIf 0x000e
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd4
-_0807EA94 
-_0807F034 0x0057
-WaitPlayerAction8 
-_0807EA94 
-_0807E878 
-Jump 0xffc4
-.short 0x0000
diff --git a/data/scripts/gUnk_0800E734.inc b/data/scripts/gUnk_0800E734.inc
deleted file mode 100644
index da7702f0..00000000
--- a/data/scripts/gUnk_0800E734.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800E734
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0806AF60, 0x00000000
-Call sub_0806AFE8
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffe0
diff --git a/data/scripts/gUnk_0800E760.inc b/data/scripts/gUnk_0800E760.inc
deleted file mode 100644
index 7874911e..00000000
--- a/data/scripts/gUnk_0800E760.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-SCRIPT_START gUnk_0800E760
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-SetEntityNonPlanarMovement 0x0200
-CheckGlobalFlag 0x0029
-JumpIfNot 0x000a
-CheckGlobalFlag 0x002a
-JumpIfNot 0x000c
-SetEntityPositionRelative 0x00980188
-Jump 0xff70
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002a
-JumpIf 0x002a
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806AEE4
-StopScript 
-Jump 0xffe6
-StopScript 
-_0807E864 
-Call sub_0806AFE8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd0
-_0807EF80 0x000f
-_0807EB44 0x0002
-CallWithArg sub_0806AF60, 0x00000004
-Call sub_0806AF70
-_0807EE04 0x0188, 0x0058
-.byte 0x2
diff --git a/data/scripts/gUnk_0800E7D9.inc b/data/scripts/gUnk_0800E7D9.inc
deleted file mode 100644
index a52e81a7..00000000
--- a/data/scripts/gUnk_0800E7D9.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SCRIPT_START gUnk_0800E7D9
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x79
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x75
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xf2
-.byte 0xff
-.byte 0x25
-.byte 0x4
-.byte 0x4
-.byte 0x8
-.byte 0xec
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x2
-.byte 0xff
diff --git a/data/scripts/gUnk_0800E7F4.inc b/data/scripts/gUnk_0800E7F4.inc
deleted file mode 100644
index 79a91c3e..00000000
--- a/data/scripts/gUnk_0800E7F4.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800E7F4
-StartScript 
-.short 0x0c0b
-.short 0xc675
diff --git a/data/scripts/gUnk_0800E7FA.inc b/data/scripts/gUnk_0800E7FA.inc
deleted file mode 100644
index d0195f28..00000000
--- a/data/scripts/gUnk_0800E7FA.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-SCRIPT_START gUnk_0800E7FA
-_0807E078 0x0879
-.byte 0xa
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xd
-.byte 0xc7
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xe6
-.byte 0xff
-.byte 0x0
diff --git a/data/scripts/gUnk_0800E823.inc b/data/scripts/gUnk_0800E823.inc
deleted file mode 100644
index 2b318c88..00000000
--- a/data/scripts/gUnk_0800E823.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800E823
-.byte 0x0
diff --git a/data/scripts/gUnk_0800E824.inc b/data/scripts/gUnk_0800E824.inc
deleted file mode 100644
index 4167d136..00000000
--- a/data/scripts/gUnk_0800E824.inc
+++ /dev/null
@@ -1,133 +0,0 @@
-SCRIPT_START gUnk_0800E824
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB44 0x0004
-StartScript 
-TextboxNoOverlapFollow 0x4501
-CallWithArg sub_0807F854, 0x00010032
-CallWithArg sub_0807F854, 0x000200c8
-CallWithArg sub_0807F854, 0x00030190
-StopScript 
-_0807EA94 
-_0807EB38 
-.byte 0x6
-.byte 0x14
-.byte 0xa6
-.byte 0x0
-.byte 0x6a
-.byte 0x0
-.byte 0x36
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x5
-.byte 0x45
-.byte 0xc
-.byte 0x14
-.byte 0x55
-.byte 0xf8
-.byte 0x7
-.byte 0x8
-.byte 0x90
-.byte 0x1
-.byte 0x1
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x59
-.byte 0x4
-.byte 0x1a
-.byte 0x8
-.byte 0x90
-.byte 0x1
-.byte 0x5
-.byte 0x8
-.byte 0x7c
-.byte 0x0
-.byte 0x7f
-.byte 0x8
-.byte 0x70
-.byte 0xfe
-.byte 0x2a
-.byte 0x8
-.byte 0x91
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x8
-.byte 0x45
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x79
-.byte 0xc5
-.byte 0x6
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x1
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x4
-.byte 0x45
-.byte 0xc
-.byte 0x14
-.byte 0x55
-.byte 0xf8
-.byte 0x7
-.byte 0x8
-.byte 0xc8
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x59
-.byte 0x4
-.byte 0x1a
-.byte 0x8
-.byte 0xc8
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x4a
-.byte 0x0
-.byte 0x7f
-.byte 0x8
-.byte 0x38
-.byte 0xff
-.byte 0x2a
-.byte 0x8
-.byte 0x91
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x8
-.byte 0x45
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x89
-.byte 0xc5
-.byte 0x6
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x1
-.byte 0x4
-.byte 0x5a
-.byte 0x8
-.byte 0x3
diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc
new file mode 100644
index 00000000..b9d52ee1
--- /dev/null
+++ b/data/scripts/gUnk_0800E8A4.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800E8A4
+StartScript 
+TextboxNoOverlapFollow 0x4504
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x00c8
+.short 0x0001
+@ End of 4 parameters
+StopScript 
+_0807EA94 
+HasRupees 0x00c8
+JumpIfNot 0x004a
+ModRupees 0xff38
+SetLocalFlag 0x0091
+TextboxNoOverlapFollow 0x4508
+_0807EA94 
+Call 0x0806c589
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc
new file mode 100644
index 00000000..0a1f03a1
--- /dev/null
+++ b/data/scripts/gUnk_0800E8D6.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_0800E8D6
+StartScript 
+TextboxNoOverlapFollow 0x4503
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x0032
+.short 0x0001
+@ End of 4 parameters
+StopScript 
+_0807EA94 
+HasRupees 0x0032
+JumpIfNot 0x0018
+ModRupees 0xffce
+SetLocalFlag 0x0091
+TextboxNoOverlapFollow 0x4508
+_0807EA94 
+Call 0x0806c599
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E8DB.inc b/data/scripts/gUnk_0800E8DB.inc
deleted file mode 100644
index 0387d346..00000000
--- a/data/scripts/gUnk_0800E8DB.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-SCRIPT_START gUnk_0800E8DB
-.byte 0x45
-.byte 0xc
-.byte 0x14
-.byte 0x55
-.byte 0xf8
-.byte 0x7
-.byte 0x8
-.byte 0x32
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x59
-.byte 0x4
-.byte 0x1a
-.byte 0x8
-.byte 0x32
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x18
-.byte 0x0
-.byte 0x7f
-.byte 0x8
-.byte 0xce
-.byte 0xff
-.byte 0x2a
-.byte 0x8
-.byte 0x91
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x8
-.byte 0x45
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x99
-.byte 0xc5
-.byte 0x6
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x5a
-.byte 0x8
-.byte 0x7
-.byte 0x45
-.byte 0x3
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x9
-.byte 0x45
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x14
-.byte 0xff
diff --git a/data/scripts/gUnk_0800E908.inc b/data/scripts/gUnk_0800E908.inc
new file mode 100644
index 00000000..a716fb55
--- /dev/null
+++ b/data/scripts/gUnk_0800E908.inc
@@ -0,0 +1,75 @@
+SCRIPT_START gUnk_0800E908
+TextboxNoOverlapFollow 0x4507
+Jump 0x0006
+TextboxNoOverlapFollow 0x4509
+_0807EA94 
+_0807E878 
+_0807EB44 0x0000
+Jump 0xff14
+StartScript 
+Call 0x0806c4f9
+_0807EF80 0x000a
+_0807EB44 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB44 0x0004
+_0807E930 0x0004
+Call 0x0806c4a9
+JumpIfNot 0xfff8
+Call 0x0806c4dd
+_0807EA94 
+_0807E878 
+_0807EB44 0x0000
+_0807E930 0x0000
+Jump 0xffd2
+.short 0x0000
+StartScript 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E930 0x0008
+Call 0x0807f2d5
+_0807E930 0x0009
+Call 0x0806b261
+JumpIfNot 0x0052
+_0807EA94 
+_0807EF80 0x000b
+StartPlayerScript 0x0800e9f4
+WaitForSomething2 0x00000001
+_0807EF80 0x000a
+TextboxNoOverlapFollow 0x4a24
+_0807EA94 
+_0807E930 0x000a
+Wait 0x0014
+TextboxNoOverlapFollow 0x4a25
+_0807EA94 
+_0807E930 0x0000
+StartPlayerScript 0x0800ea1c
+WaitForSomething2 0x00000001
+SetLocalFlag 0x0074
+SoundReq 0x0072
+Wait 0x00f0
+TextboxNoOverlapFollow 0x4a26
+_0807EA94 
+SetLocalFlag 0x0075
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807E930 0x0000
+Jump 0xff82
+StartScript 
+_0807EB44 0x0004
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0078, 0x0080
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800E920.inc b/data/scripts/gUnk_0800E920.inc
deleted file mode 100644
index 4d9a3ccf..00000000
--- a/data/scripts/gUnk_0800E920.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_0800E920
-StartScript 
-Call sub_0806C4F8
-_0807EF80 0x000a
-_0807EB44 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB44 0x0004
-_0807E930 0x0004
-Call sub_0806C4A8
-JumpIfNot 0xfff8
-Call sub_0806C4DC
-_0807EA94 
-_0807E878 
-_0807EB44 0x0000
-_0807E930 0x0000
-Jump 0xffd2
-.short 0x0000
diff --git a/data/scripts/gUnk_0800E964.inc b/data/scripts/gUnk_0800E964.inc
deleted file mode 100644
index 79094ddf..00000000
--- a/data/scripts/gUnk_0800E964.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_0800E964
-StartScript 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E930 0x0008
-Call sub_0807F2D4
-_0807E930 0x0009
-Call sub_0806B260
-JumpIfNot 0x0052
-_0807EA94 
-_0807EF80 0x000b
-StartPlayerScript 0x0800e9f4
-WaitForSomething2 0x00000001
-_0807EF80 0x000a
-TextboxNoOverlapFollow 0x4a24
-_0807EA94 
-_0807E930 0x000a
-Wait 0x0014
-TextboxNoOverlapFollow 0x4a25
-_0807EA94 
-_0807E930 0x0000
-StartPlayerScript 0x0800ea1c
-WaitForSomething2 0x00000001
-SetLocalFlag 0x0074
-.short 0x087b
-.short 0x0072
diff --git a/data/scripts/gUnk_0800E9D6.inc b/data/scripts/gUnk_0800E9D6.inc
deleted file mode 100644
index e8ebfeed..00000000
--- a/data/scripts/gUnk_0800E9D6.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0800E9D6
-Wait 0x00f0
-TextboxNoOverlapFollow 0x4a26
-_0807EA94 
-SetLocalFlag 0x0075
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807E930 0x0000
-.short 0x0803
-.short 0xff82
diff --git a/data/scripts/gUnk_0800EA1C.inc b/data/scripts/gUnk_0800EA1C.inc
index 49a32db0..f940e9b6 100644
--- a/data/scripts/gUnk_0800EA1C.inc
+++ b/data/scripts/gUnk_0800EA1C.inc
@@ -10,6 +10,6 @@ _0807EF80 0x0000
 _0807EF80 0x0005
 Wait 0x003c
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc
index baf1c112..f3bbc0c5 100644
--- a/data/scripts/gUnk_0800EA54.inc
+++ b/data/scripts/gUnk_0800EA54.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800EA54
 StartScript 
-Call sub_0806CE5C
+Call 0x0806ce5d
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0008
@@ -9,14 +9,358 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-Call sub_0807F2D4
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f2d5
 _0807E930 0x0009
-Call sub_0806CE80
+Call 0x0806ce81
 _0807EA94 
 _0807E878 
 _0807E930 0x000a
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E930 0x0008
-.short 0x0803
-.short 0xffc8
+Jump 0xffc8
+StartScript 
+_0807E9D4 
+Call 0x0806c09d
+_0807EF80 0x000a
+_0807E930 0x0000
+_0807EB44 0x0004
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+StartScript 
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xc029
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+Call 0x0806c00d
+JumpIfNot 0xfff8
+_0807E930 0x0008
+Call 0x0806c039
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807E930 0x0000
+Jump 0xffc6
+StartScript 
+Call 0x0806c871
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0000
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806c90d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call 0x08061fd9
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08061fd9
+Call 0x08062049
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0006
+Call 0x08061fd9
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08061fd9
+Call 0x08062049
+_0807EA94 
+_0807E878 
+_0807EB44 0x0006
+Call 0x08061fd9
+Jump 0xffda
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0002
+Call 0x08061fd9
+StopScript 
+Jump 0x0036
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call 0x08061fd9
+StopScript 
+Jump 0x001a
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0006
+Call 0x08061fd9
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08061fd9
+Call 0x08062049
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0002
+Call 0x08061fd9
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08061fd9
+Call 0x08062049
+_0807EA94 
+_0807E878 
+_0807EB44 0x0002
+Call 0x08061fd9
+Jump 0xffda
+StartScript 
+Call 0x08061e71
+_0807EF80 0x000a
+_0807EB44 0x0004
+Call 0x08061fd9
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08061fd9
+Call 0x08062049
+_0807EA94 
+_0807E878 
+Jump 0xffe4
+.short 0x0000
+StartScript 
+_0807E9D4 
+CallWithArg
+.short 0x1fb9
+.short 0x0806
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+SetEntityNonPlanarMovement 0x0040
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0002
+StopScript 
+_0807EB44 0x0006
+_0807E930 0x0007
+_0807EDD4 0x0028, 0x0050
+Wait 0x001e
+_0807EB44 0x0004
+_0807E930 0x0002
+Wait 0x001e
+_0807EB44 0x0002
+_0807E930 0x0001
+Wait 0x001e
+_0807EB44 0x0002
+_0807E930 0x0005
+_0807EDD4 0x0048, 0x0050
+Wait 0x001e
+_0807EB44 0x0004
+_0807E930 0x0002
+Wait 0x001e
+_0807EB44 0x0006
+_0807E930 0x0003
+Wait 0x001e
+Jump 0xffaa
+StartScript 
+Call 0x080639d1
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CallWithArg
+.short 0x3851
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0x3851
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x08063945
+_0807EA94 
+JumpIfNot 0x0008
+_0807F050 0x0070
+WaitPlayerAction8 
+_0807E878 
+Call 0x08063875
+CallWithArg
+.short 0x3851
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffc6
+StartScript 
+Call 0x08064cc1
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0002
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+_0807EB74 
+Call 0x08064cd9
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x0016
+TestBit 0x00000001
+JumpIf 0x0068
+Call 0x0806aee5
+Jump 0xffe4
+StopScript 
+_0807E864 
+Call 0x0807df29
+CheckLocalFlag 0x00ae
+JumpIf 0x0078
+Wait 0x000a
+_0807E5F8 0x00000001
+TextboxNoOverlapFollow 0x4c07
+_0807EA94 
+_0807E5F8 0x00000010
+TextboxNoOverlapFollow 0x4c08
+_0807EA94 
+_0807E5F8 0x00000020
+TextboxNoOverlapFollow 0x4c09
+_0807EA94 
+_0807E914 0x00000503
+Call 0x0807f421
+_0807E5F8 0x00000040
+Call 0x0807df51
+_0807E878 
+SetLocalFlag 0x00ae
+Jump 0xff88
+StopScript 
+WaitForSomething2 0x00000002
+_0807EB44 0x0002
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+WaitForSomething2 0x00000004
+Call 0x0806aed9
+WaitForSomething2 0x00000008
+Jump 0xff5c
+TextboxNoOverlapFollow 0x4c16
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xff4a
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIf 0x0016
+TestBit 0x00000001
+JumpIf 0x0068
+Call 0x0806aee5
+Jump 0xffe4
+StopScript 
+_0807E864 
+Call 0x0807df29
+CheckLocalFlag 0x00ae
+JumpIf 0x0078
+Wait 0x000a
+_0807E5F8 0x00000001
+TextboxNoOverlapFollow 0x4c07
+_0807EA94 
+_0807E5F8 0x00000002
+TextboxNoOverlapFollow 0x4c08
+_0807EA94 
+_0807E5F8 0x00000004
+TextboxNoOverlapFollow 0x4c09
+_0807EA94 
+_0807E914 0x00000503
+Call 0x0807f421
+_0807E5F8 0x00000008
+Call 0x0807df51
+_0807E878 
+SetLocalFlag 0x00ae
+Jump 0xff88
+StopScript 
+WaitForSomething2 0x00000010
+_0807EB44 0x0006
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+WaitForSomething2 0x00000020
+Call 0x0806aed9
+WaitForSomething2 0x00000040
+Jump 0xff5c
+TextboxNoOverlapFollow 0x4c15
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xff4a
+TextboxNoOverlapFollow 0x4c07
+_0807EA94 
+_0807E5F8 0x00000012
+Wait 0x000a
+TextboxNoOverlapFollow 0x4c08
+_0807EA94 
+_0807E5F8 0x00000024
+TextboxNoOverlapFollow 0x4c09
+_0807EA94 
+_0807E5F8 0x00000048
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800EAA4.inc b/data/scripts/gUnk_0800EAA4.inc
deleted file mode 100644
index 626dc0dd..00000000
--- a/data/scripts/gUnk_0800EAA4.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_0800EAA4
-StartScript 
-_0807E9D4 
-Call sub_0806C09C
-_0807EF80 0x000a
-_0807E930 0x0000
-_0807EB44 0x0004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-StartScript 
-_0807E864 
-_0807EB74 
-CallWithArg sub_0806C028, 0x00000004
-StopScript 
-Call sub_0806C00C
-JumpIfNot 0xfff8
-_0807E930 0x0008
-Call sub_0806C038
-_0807EA94 
-.byte 0x31
diff --git a/data/scripts/gUnk_0800EAEB.inc b/data/scripts/gUnk_0800EAEB.inc
deleted file mode 100644
index 11bceabe..00000000
--- a/data/scripts/gUnk_0800EAEB.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800EAEB
-.byte 0x8
-.byte 0xf
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x50
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xc6
-.byte 0xff
diff --git a/data/scripts/gUnk_0800EAF8.inc b/data/scripts/gUnk_0800EAF8.inc
deleted file mode 100644
index 1a376bd3..00000000
--- a/data/scripts/gUnk_0800EAF8.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800EAF8
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
diff --git a/data/scripts/gUnk_0800EB2C.inc b/data/scripts/gUnk_0800EB2C.inc
deleted file mode 100644
index bf9bb96b..00000000
--- a/data/scripts/gUnk_0800EB2C.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800EB2C
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
diff --git a/data/scripts/gUnk_0800EB64.inc b/data/scripts/gUnk_0800EB64.inc
deleted file mode 100644
index 4b9c3f44..00000000
--- a/data/scripts/gUnk_0800EB64.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0800EB64
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0006
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-_0807EB44 0x0006
-Call sub_08061FD8
-Jump 0xffda
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0002
-Call sub_08061FD8
-StopScript 
-.short 0x0803
-.short 0x0036
diff --git a/data/scripts/gUnk_0800EBC0.inc b/data/scripts/gUnk_0800EBC0.inc
deleted file mode 100644
index 5d826fef..00000000
--- a/data/scripts/gUnk_0800EBC0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800EBC0
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-.short 0x0803
-.short 0x001a
diff --git a/data/scripts/gUnk_0800EBDC.inc b/data/scripts/gUnk_0800EBDC.inc
deleted file mode 100644
index ed2c5da1..00000000
--- a/data/scripts/gUnk_0800EBDC.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800EBDC
-StartScript 
-.short 0x0c0b
diff --git a/data/scripts/gUnk_0800EBE0.inc b/data/scripts/gUnk_0800EBE0.inc
deleted file mode 100644
index b1480401..00000000
--- a/data/scripts/gUnk_0800EBE0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800EBE0
-.short 0x1e71
-.short 0x0806
-.short 0x0879
-.short 0x000a
-.short 0x0861
-.short 0x0006
-.short 0x0c0b
-.short 0x1fd9
diff --git a/data/scripts/gUnk_0800EBF0.inc b/data/scripts/gUnk_0800EBF0.inc
deleted file mode 100644
index c5a4bdd0..00000000
--- a/data/scripts/gUnk_0800EBF0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800EBF0
-_0807E078 0x0402
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-.short 0x0c0b
-.short 0x2049
diff --git a/data/scripts/gUnk_0800EC08.inc b/data/scripts/gUnk_0800EC08.inc
deleted file mode 100644
index 4c6e46e4..00000000
--- a/data/scripts/gUnk_0800EC08.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800EC08
-_0807E078 0x0459
-_0807E878 
-Jump 0xffe4
-.short 0x0000
diff --git a/data/scripts/gUnk_0800EC14.inc b/data/scripts/gUnk_0800EC14.inc
deleted file mode 100644
index 40d32fda..00000000
--- a/data/scripts/gUnk_0800EC14.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800EC14
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0002
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-_0807EB44 0x0002
-Call sub_08061FD8
-.short 0x0803
-.short 0xffda
diff --git a/data/scripts/gUnk_0800EC54.inc b/data/scripts/gUnk_0800EC54.inc
deleted file mode 100644
index 74b8261c..00000000
--- a/data/scripts/gUnk_0800EC54.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800EC54
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-.byte 0x61
diff --git a/data/scripts/gUnk_0800EC61.inc b/data/scripts/gUnk_0800EC61.inc
deleted file mode 100644
index 64187010..00000000
--- a/data/scripts/gUnk_0800EC61.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-SCRIPT_START gUnk_0800EC61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0x1f
-.byte 0x6
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0x1f
-.byte 0x6
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0x49
-.byte 0x20
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe4
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800EC8C.inc b/data/scripts/gUnk_0800EC8C.inc
deleted file mode 100644
index 093d3ac9..00000000
--- a/data/scripts/gUnk_0800EC8C.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0800EC8C
-StartScript 
-_0807E9D4 
-CallWithArg sub_08061FB8, 0x00000001
-SetEntityNonPlanarMovement 0x0040
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0002
-StopScript 
-_0807EB44 0x0006
-_0807E930 0x0007
-_0807EDD4 0x0028, 0x0050
-Wait 0x001e
-_0807EB44 0x0004
-_0807E930 0x0002
-Wait 0x001e
-_0807EB44 0x0002
-_0807E930 0x0001
-Wait 0x001e
-_0807EB44 0x0002
-_0807E930 0x0005
-_0807EDD4 0x0048, 0x0050
-Wait 0x001e
-_0807EB44 0x0004
-_0807E930 0x0002
-.byte 0x31
diff --git a/data/scripts/gUnk_0800ECF1.inc b/data/scripts/gUnk_0800ECF1.inc
deleted file mode 100644
index 70ec0120..00000000
--- a/data/scripts/gUnk_0800ECF1.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_0800ECF1
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xaa
-.byte 0xff
diff --git a/data/scripts/gUnk_0800ED04.inc b/data/scripts/gUnk_0800ED04.inc
deleted file mode 100644
index 1300437f..00000000
--- a/data/scripts/gUnk_0800ED04.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800ED04
-StartScript 
-.short 0x0c0b
-.short 0x39d1
-.short 0x0806
diff --git a/data/scripts/gUnk_0800ED0C.inc b/data/scripts/gUnk_0800ED0C.inc
deleted file mode 100644
index 45527289..00000000
--- a/data/scripts/gUnk_0800ED0C.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800ED0C
-.byte 0x79
diff --git a/data/scripts/gUnk_0800ED0D.inc b/data/scripts/gUnk_0800ED0D.inc
deleted file mode 100644
index 2a01bd1e..00000000
--- a/data/scripts/gUnk_0800ED0D.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-SCRIPT_START gUnk_0800ED0D
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0x51
-.byte 0x38
-.byte 0x6
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0x51
-.byte 0x38
-.byte 0x6
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0x39
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x83
-.byte 0x8
-.byte 0x70
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x75
-.byte 0x38
-.byte 0x6
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x51
-.byte 0x38
-.byte 0x6
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xc6
-.byte 0xff
diff --git a/data/scripts/gUnk_0800ED5C.inc b/data/scripts/gUnk_0800ED5C.inc
deleted file mode 100644
index 96ca6a5c..00000000
--- a/data/scripts/gUnk_0800ED5C.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_0800ED5C
-StartScript 
-Call sub_08064CC0
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0002
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-_0807EB74 
-Call sub_08064CD8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
diff --git a/data/scripts/gUnk_0800ED90.inc b/data/scripts/gUnk_0800ED90.inc
deleted file mode 100644
index 5aece36e..00000000
--- a/data/scripts/gUnk_0800ED90.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800ED90
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x0016
-TestBit 0x00000001
-JumpIf 0x0068
-Call sub_0806AEE4
-Jump 0xffe4
-StopScript 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x00ae
-JumpIf 0x0078
-Wait 0x000a
-_0807E5F8 0x00000001
-TextboxNoOverlapFollow 0x4c07
-_0807EA94 
-.byte 0x28
diff --git a/data/scripts/gUnk_0800EDD9.inc b/data/scripts/gUnk_0800EDD9.inc
deleted file mode 100644
index cc1fab74..00000000
--- a/data/scripts/gUnk_0800EDD9.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800EDD9
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5a
-.byte 0x8
diff --git a/data/scripts/gUnk_0800EDE0.inc b/data/scripts/gUnk_0800EDE0.inc
deleted file mode 100644
index d48a3a8d..00000000
--- a/data/scripts/gUnk_0800EDE0.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SCRIPT_START gUnk_0800EDE0
-.byte 0x8
-.byte 0x4c
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5a
-.byte 0x8
-.byte 0x9
-.byte 0x4c
-.byte 0x59
-.byte 0x4
-.byte 0x4e
-.byte 0xc
-.byte 0x3
-.byte 0x5
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x21
-.byte 0xf4
-.byte 0x7
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
diff --git a/data/scripts/gUnk_0800EE09.inc b/data/scripts/gUnk_0800EE09.inc
deleted file mode 100644
index 3c8f7938..00000000
--- a/data/scripts/gUnk_0800EE09.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-SCRIPT_START gUnk_0800EE09
-.byte 0x4
-.byte 0x2a
-.byte 0x8
-.byte 0xae
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x88
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0xae
-.byte 0x6
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x5c
-.byte 0xff
-.byte 0x5a
-.byte 0x8
-.byte 0x16
-.byte 0x4c
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x4a
-.byte 0xff
diff --git a/data/scripts/gUnk_0800EE50.inc b/data/scripts/gUnk_0800EE50.inc
deleted file mode 100644
index 15c15625..00000000
--- a/data/scripts/gUnk_0800EE50.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800EE50
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x0016
-TestBit 0x00000001
-JumpIf 0x0068
-Call sub_0806AEE4
-Jump 0xffe4
-StopScript 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x00ae
-JumpIf 0x0078
-.short 0x0831
-.short 0x000a
diff --git a/data/scripts/gUnk_0800EE8C.inc b/data/scripts/gUnk_0800EE8C.inc
deleted file mode 100644
index d8927be4..00000000
--- a/data/scripts/gUnk_0800EE8C.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_0800EE8C
-_0807E5F8 0x00000001
-TextboxNoOverlapFollow 0x4c07
-_0807EA94 
-_0807E5F8 0x00000002
-TextboxNoOverlapFollow 0x4c08
-_0807EA94 
-_0807E5F8 0x00000004
-TextboxNoOverlapFollow 0x4c09
-_0807EA94 
-_0807E914 0x00000503
-Call sub_0807F420
-_0807E5F8 0x00000008
-Call sub_0807DF50
-_0807E878 
-SetLocalFlag 0x00ae
-Jump 0xff88
-StopScript 
-WaitForSomething2 0x00000010
-_0807EB44 0x0006
-.short 0x140c
diff --git a/data/scripts/gUnk_0800EEE0.inc b/data/scripts/gUnk_0800EEE0.inc
deleted file mode 100644
index 1d58b622..00000000
--- a/data/scripts/gUnk_0800EEE0.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_0800EEE0
-.byte 0x61
-.byte 0xaf
-.byte 0x6
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd9
-.byte 0xae
-.byte 0x6
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x5c
diff --git a/data/scripts/gUnk_0800EEFD.inc b/data/scripts/gUnk_0800EEFD.inc
deleted file mode 100644
index 75d66b81..00000000
--- a/data/scripts/gUnk_0800EEFD.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800EEFD
-.short 0x5aff
-.short 0x1508
-.short 0x594c
-.short 0x0b04
-.short 0x510c
diff --git a/data/scripts/gUnk_0800EF07.inc b/data/scripts/gUnk_0800EF07.inc
deleted file mode 100644
index 97e9c0f2..00000000
--- a/data/scripts/gUnk_0800EF07.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800EF07
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x4a
-.byte 0xff
-.byte 0x5a
-.byte 0x8
diff --git a/data/scripts/gUnk_0800EF12.inc b/data/scripts/gUnk_0800EF12.inc
deleted file mode 100644
index b1a6ce36..00000000
--- a/data/scripts/gUnk_0800EF12.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_0800EF12
-.short 0x4c07
-.short 0x0459
-.short 0x0c28
-.short 0x0012
-.short 0x0000
-.short 0x0831
-.short 0x000a
-.short 0x085a
-.short 0x4c08
-.short 0x0459
-.short 0x0c28
-.short 0x0024
-.short 0x0000
-.short 0x085a
-.short 0x4c09
-.short 0x0459
-.short 0x0c28
-.short 0x0048
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_0800EF40.inc b/data/scripts/gUnk_0800EF40.inc
index 25e4c7c8..7054cbda 100644
--- a/data/scripts/gUnk_0800EF40.inc
+++ b/data/scripts/gUnk_0800EF40.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0007
 CheckGlobalFlag 0x001f
 JumpIf 0x0046
 StopScript 
-Call sub_080869A4
+Call 0x080869a5
 JumpIfNot 0xfff8
 _0807E864 
 CheckLocalFlagByOffset 0x0200, 0x006d
@@ -21,4 +21,6 @@ TextboxNoOverlapFollow 0x4d02
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.byte 0xb
+Call 0x0808692d
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EF93.inc b/data/scripts/gUnk_0800EF93.inc
deleted file mode 100644
index 241bef5f..00000000
--- a/data/scripts/gUnk_0800EF93.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-SCRIPT_START gUnk_0800EF93
-.byte 0xc
-.byte 0x2d
-.byte 0x69
-.byte 0x8
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x2
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x70
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800EF9C.inc b/data/scripts/gUnk_0800EF9C.inc
new file mode 100644
index 00000000..aa4dbcd5
--- /dev/null
+++ b/data/scripts/gUnk_0800EF9C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800EF9C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807ECC4 0x0008
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc
index 38b323e8..e9c5bd82 100644
--- a/data/scripts/gUnk_0800EFC0.inc
+++ b/data/scripts/gUnk_0800EFC0.inc
@@ -8,4 +8,128 @@ JumpIf 0x00b0
 StopScript 
 Jump 0x0026
 _0807EB44 0x0006
-.short 0x140c
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+_0807EB44 0x0004
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+_0807EB44 0x0002
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+_0807EB44 0x0002
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+_0807EDD4 0x0088, 0x0040
+_0807EF80 0x000a
+_0807EB44 0x0002
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+_0807EB44 0x0004
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+_0807EB44 0x0006
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+_0807EB44 0x0006
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+_0807EDD4 0x0068, 0x0040
+_0807EF80 0x000a
+CheckLocalFlag 0x007b
+JumpIf 0x0006
+Jump 0xff5a
+StopScript 
+Call 0x0806aee5
+Jump 0xfff6
+.short 0x0000
+StartScript 
+_0807F0B4 0x0001
+CameraTargetPlayer 
+StopScript 
+CheckPlayerInRegion 0x01f8, 0x0338, 0x1030
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+LoadRoomEntityList 0x080ee8ac
+StartPlayerScript 0x0800f14c
+WaitForSomething2 0x00000001
+_0807E5F8 0x0000001e
+WaitForSomething2 0x00000040
+TextboxNoOverlapFollowPos
+.short 0x1201
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+WaitForSomething2 0x000003c0
+_0807E8E4_0 
+TextboxNoOverlapFollowPos
+.short 0x1202
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807F034 0x0067
+WaitPlayerAction8 
+_0807E8E4_0 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000040
+TextboxNoOverlapFollowPos
+.short 0x1203
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+Call 0x0807df51
+_0807E878 
+WaitForSomething2 0x00000040
+CheckKinstoneFused 0x0032
+JumpIfNot 0xfffa
+_0807E864 
+Call 0x0807df29
+_0807E5F8 0x0000001e
+Wait 0x003c
+_0807E8E4_1 
+WaitForSomething2 0x000003c0
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800EFE0.inc b/data/scripts/gUnk_0800EFE0.inc
deleted file mode 100644
index 9d7068c2..00000000
--- a/data/scripts/gUnk_0800EFE0.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800EFE0
-.short 0xaf61
-.short 0x0806
diff --git a/data/scripts/gUnk_0800EFE4.inc b/data/scripts/gUnk_0800EFE4.inc
deleted file mode 100644
index 7a23461a..00000000
--- a/data/scripts/gUnk_0800EFE4.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-SCRIPT_START gUnk_0800EFE4
-.short 0x0008
-.short 0x0000
-.short 0x0831
-.short 0x0004
-.short 0x0861
-.short 0x0004
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0008
-.short 0x0000
-.short 0x0831
-.short 0x0004
-.short 0x0861
-.short 0x0002
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0008
-.short 0x0000
-.short 0x0831
-.short 0x0004
-.short 0x0861
-.short 0x0002
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0004
-.short 0x0000
-.short 0x0c73
-.short 0x0088
-.short 0x0040
-.short 0x0879
-.short 0x000a
-.short 0x0861
-.short 0x0002
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0008
-.short 0x0000
-.short 0x0831
-.short 0x0004
-.short 0x0861
-.short 0x0004
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0008
-.short 0x0000
-.short 0x0831
-.short 0x0004
-.short 0x0861
-.short 0x0006
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0008
-.short 0x0000
-.short 0x0831
-.short 0x0004
-.short 0x0861
-.short 0x0006
-.short 0x140c
-.short 0xaf61
-.short 0x0806
-.short 0x0004
-.short 0x0000
-.short 0x0c73
-.short 0x0068
-.short 0x0040
-.short 0x0879
-.short 0x000a
-.short 0x0812
-.short 0x007b
-.short 0x0804
-.short 0x0006
-.short 0x0803
-.short 0xff5a
-.short 0x0402
-.short 0x0c0b
-.short 0xaee5
-.short 0x0806
-.short 0x0803
-.short 0xfff6
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F090.inc b/data/scripts/gUnk_0800F090.inc
deleted file mode 100644
index 77414fc0..00000000
--- a/data/scripts/gUnk_0800F090.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F090
-StartScript 
-.short 0x0889
diff --git a/data/scripts/gUnk_0800F094.inc b/data/scripts/gUnk_0800F094.inc
deleted file mode 100644
index 72e8cab2..00000000
--- a/data/scripts/gUnk_0800F094.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_0800F094
-.short 0x0001
-.short 0x0488
-.short 0x0402
-.short 0x1016
-.short 0x01f8
-.short 0x0338
-.short 0x1030
-.short 0x0805
-.short 0xfff6
-.short 0x0443
-.short 0x0c0b
-.short 0xf9a5
-.short 0x0807
-.short 0x0c0b
-.short 0xdf29
-.short 0x0807
-.short 0x0c0d
-.short 0xe8ac
-.short 0x080e
-.short 0x0c47
-.short 0xf14c
-.short 0x0800
-.short 0x0c33
-.short 0x0001
-.short 0x0000
-.short 0x0c28
-.short 0x001e
-.short 0x0000
-.short 0x0c33
-.short 0x0040
-.short 0x0000
-.short 0x0c5c
-.short 0x1201
diff --git a/data/scripts/gUnk_0800F0D6.inc b/data/scripts/gUnk_0800F0D6.inc
deleted file mode 100644
index 15c8839e..00000000
--- a/data/scripts/gUnk_0800F0D6.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800F0D6
-.short 0x000c
-.short 0x0459
-.short 0x0c33
-.short 0x03c0
-.short 0x0000
-.short 0x0449
diff --git a/data/scripts/gUnk_0800F0E2.inc b/data/scripts/gUnk_0800F0E2.inc
deleted file mode 100644
index 27b15b7d..00000000
--- a/data/scripts/gUnk_0800F0E2.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F0E2
-TextboxNoOverlapFollowPos 0x1202, 0x000c
-_0807EA94 
-_0807F034 0x0067
-WaitPlayerAction8 
-_0807E8E4_0 
diff --git a/data/scripts/gUnk_0800F0F2.inc b/data/scripts/gUnk_0800F0F2.inc
deleted file mode 100644
index ed25a718..00000000
--- a/data/scripts/gUnk_0800F0F2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F0F2
-.byte 0x28
diff --git a/data/scripts/gUnk_0800F0F3.inc b/data/scripts/gUnk_0800F0F3.inc
deleted file mode 100644
index 599503fc..00000000
--- a/data/scripts/gUnk_0800F0F3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F0F3
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F0F4.inc b/data/scripts/gUnk_0800F0F4.inc
deleted file mode 100644
index 62397ca1..00000000
--- a/data/scripts/gUnk_0800F0F4.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-SCRIPT_START gUnk_0800F0F4
-.short 0x0002
-.short 0x0000
-.short 0x0c33
-.short 0x0040
-.short 0x0000
-.short 0x0c5c
-.short 0x1203
-.short 0x000c
-.short 0x0459
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0c33
-.short 0x0040
-.short 0x0000
-.short 0x081d
-.short 0x0032
-.short 0x0805
-.short 0xfffa
-.short 0x0443
-.short 0x0c0b
-.short 0xdf29
-.short 0x0807
-.short 0x0c28
-.short 0x001e
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x044a
-.short 0x0c33
-.short 0x03c0
-.short 0x0000
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F14C.inc b/data/scripts/gUnk_0800F14C.inc
index d0f0517e..622ee0eb 100644
--- a/data/scripts/gUnk_0800F14C.inc
+++ b/data/scripts/gUnk_0800F14C.inc
@@ -11,5 +11,5 @@ _0807EDD4 0x01f8, 0x0338
 _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc
index 356ec88d..48f4ed28 100644
--- a/data/scripts/gUnk_0800F184.inc
+++ b/data/scripts/gUnk_0800F184.inc
@@ -4,7 +4,7 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0008
 _0807EF80 0x000a
 StopScript 
-Call sub_0807F348
+Call 0x0807f349
 _0807EB44 0x0002
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
@@ -16,7 +16,127 @@ _0807E930 0x0008
 _0807E8E4_0 
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
-Call sub_0806E440
+Call 0x0806e441
 Wait 0x0078
-.short 0x0c28
-.short 0x0040
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+StopScript 
+StartScript 
+CallWithArg
+.short 0xf681
+.short 0x0807
+.short 0x01c0
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x0034
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1206
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800f33c
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xffbe
+CallWithArg
+.short 0xf681
+.short 0x0807
+.short 0x0230
+.short 0x0000
+@ End of 4 parameters
+JumpIfNot 0x0034
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1206
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800f354
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xff7e
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x0310
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x0034
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1206
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800f36c
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xff3e
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x0340
+.short 0x0000
+@ End of 4 parameters
+JumpIfNot 0x0034
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+_0807EB74 
+_0807E930 0x0008
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1206
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800f384
+WaitForSomething2 0x00000400
+_0807E878 
+Jump 0xfefe
+StopScript 
+StartScript 
+CheckKinstoneFused 0x0032
+JumpIf 0x0020
+CheckEntityInteractType 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+_0807EB74 
+_0807E930 0x0008
+TextboxNoOverlapFollowPos
+.short 0x1208
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E878 
+Jump 0xfed4
+StopScript 
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0002
+_0807EEF4 0x00c0, 0x0000
+_0807E5F8 0x00000040
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800F1DE.inc b/data/scripts/gUnk_0800F1DE.inc
deleted file mode 100644
index 6258fd46..00000000
--- a/data/scripts/gUnk_0800F1DE.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F1DE
-.byte 0x0
-.byte 0x0
-.byte 0x33
diff --git a/data/scripts/gUnk_0800F1E1.inc b/data/scripts/gUnk_0800F1E1.inc
deleted file mode 100644
index 8304b6ce..00000000
--- a/data/scripts/gUnk_0800F1E1.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F1E1
-.short 0x020c
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F1E5.inc b/data/scripts/gUnk_0800F1E5.inc
deleted file mode 100644
index 6e7bf469..00000000
--- a/data/scripts/gUnk_0800F1E5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F1E5
-.short 0x0200
diff --git a/data/scripts/gUnk_0800F1E7.inc b/data/scripts/gUnk_0800F1E7.inc
deleted file mode 100644
index 754af852..00000000
--- a/data/scripts/gUnk_0800F1E7.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F1E7
-.short 0x0104
-.short 0x0c04
-.short 0x8114
diff --git a/data/scripts/gUnk_0800F1ED.inc b/data/scripts/gUnk_0800F1ED.inc
deleted file mode 100644
index e581a907..00000000
--- a/data/scripts/gUnk_0800F1ED.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F1ED
-.short 0x07f6
-.short 0xc008
-.short 0x0001
-.short 0x0400
-.short 0x3408
-.short 0x0200
-.short 0x4304
diff --git a/data/scripts/gUnk_0800F1FB.inc b/data/scripts/gUnk_0800F1FB.inc
deleted file mode 100644
index fb1d7825..00000000
--- a/data/scripts/gUnk_0800F1FB.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F1FB
-.short 0x0b04
diff --git a/data/scripts/gUnk_0800F1FD.inc b/data/scripts/gUnk_0800F1FD.inc
deleted file mode 100644
index a6e73a6c..00000000
--- a/data/scripts/gUnk_0800F1FD.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F1FD
-.short 0xa50c
-.short 0x07f9
-.short 0x6308
diff --git a/data/scripts/gUnk_0800F203.inc b/data/scripts/gUnk_0800F203.inc
deleted file mode 100644
index e3382c32..00000000
--- a/data/scripts/gUnk_0800F203.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F203
-.short 0x5004
-.short 0x0808
diff --git a/data/scripts/gUnk_0800F207.inc b/data/scripts/gUnk_0800F207.inc
deleted file mode 100644
index a9b8ee3b..00000000
--- a/data/scripts/gUnk_0800F207.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800F207
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F210.inc b/data/scripts/gUnk_0800F210.inc
deleted file mode 100644
index 8fa88e89..00000000
--- a/data/scripts/gUnk_0800F210.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-SCRIPT_START gUnk_0800F210
-TextboxNoOverlapFollowPos 0x1206, 0x000c
-_0807EA94 
-StartPlayerScript 0x0800f33c
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xffbe
-CallWithArg sub_0807F680, 0x00000230
-JumpIfNot 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x1206, 0x000c
-_0807EA94 
-StartPlayerScript 0x0800f354
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xff7e
-CallWithArg sub_0807F6B4, 0x00000310
-JumpIf 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x1206, 0x000c
-_0807EA94 
-StartPlayerScript 0x0800f36c
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xff3e
-CallWithArg sub_0807F6B4, 0x00000340
-JumpIfNot 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x1206, 0x000c
-_0807EA94 
-StartPlayerScript 0x0800f384
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xfefe
-.byte 0x2
diff --git a/data/scripts/gUnk_0800F2EB.inc b/data/scripts/gUnk_0800F2EB.inc
deleted file mode 100644
index 5292d064..00000000
--- a/data/scripts/gUnk_0800F2EB.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F2EB
-.byte 0x4
-.byte 0x1
-.byte 0x4
-.byte 0x1d
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F2F0.inc b/data/scripts/gUnk_0800F2F0.inc
deleted file mode 100644
index 8eddb220..00000000
--- a/data/scripts/gUnk_0800F2F0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F2F0
-.short 0x0032
diff --git a/data/scripts/gUnk_0800F2F2.inc b/data/scripts/gUnk_0800F2F2.inc
deleted file mode 100644
index 8bb256c2..00000000
--- a/data/scripts/gUnk_0800F2F2.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F2F2
-JumpIf 0x0020
-CheckEntityInteractType 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-_0807EB74 
-.byte 0x50
diff --git a/data/scripts/gUnk_0800F303.inc b/data/scripts/gUnk_0800F303.inc
deleted file mode 100644
index 855cbddc..00000000
--- a/data/scripts/gUnk_0800F303.inc
+++ /dev/null
@@ -1,154 +0,0 @@
-SCRIPT_START gUnk_0800F303
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x8
-.byte 0x12
-.byte 0xc
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xd4
-.byte 0xfe
-.byte 0x2
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0xc0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x6f
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x71
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x70
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x6e
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F33C.inc b/data/scripts/gUnk_0800F33C.inc
new file mode 100644
index 00000000..d6632d61
--- /dev/null
+++ b/data/scripts/gUnk_0800F33C.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F33C
+SetEntityNonPlanarMovement 0x0100
+_0807EC94 0x0008
+_0807E5F8 0x00000400
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F354.inc b/data/scripts/gUnk_0800F354.inc
new file mode 100644
index 00000000..f84638a3
--- /dev/null
+++ b/data/scripts/gUnk_0800F354.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F354
+SetEntityNonPlanarMovement 0x0100
+_0807ECF4 0x0008
+_0807E5F8 0x00000400
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F36C.inc b/data/scripts/gUnk_0800F36C.inc
new file mode 100644
index 00000000..ce91e138
--- /dev/null
+++ b/data/scripts/gUnk_0800F36C.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F36C
+SetEntityNonPlanarMovement 0x0100
+_0807ECC4 0x0008
+_0807E5F8 0x00000400
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F384.inc b/data/scripts/gUnk_0800F384.inc
new file mode 100644
index 00000000..68bf6162
--- /dev/null
+++ b/data/scripts/gUnk_0800F384.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800F384
+SetEntityNonPlanarMovement 0x0100
+_0807EC64 0x0008
+_0807E5F8 0x00000400
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F39C.inc b/data/scripts/gUnk_0800F39C.inc
index fdfdbecf..34f2ec83 100644
--- a/data/scripts/gUnk_0800F39C.inc
+++ b/data/scripts/gUnk_0800F39C.inc
@@ -7,12 +7,34 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 StopScript 
-Call sub_0807F348
+Call 0x0807f349
 WaitForSomething2 0x00000004
 _0807EF80 0x0007
 _0807EDD4 0x01f8, 0x0318
 _0807EDD4 0x0208, 0x0318
 _0807EDD4 0x0208, 0x0338
-.byte 0x61
-.byte 0x8
-.byte 0x6
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E5F8 0x00000080
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0x0010
+StopScript 
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x1237
+_0807EA94 
+_0807E878 
+TestBit 0x00000004
+JumpIfNot 0xffe0
+StopScript 
+_0807EF80 0x000b
+Wait 0x0010
+SetEntityNonPlanarMovement 0x0100
+_0807EC64 0x0010
+_0807EDD4 0x0288, 0x0328
+_0807E5F8 0x00000080
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800F3DB.inc b/data/scripts/gUnk_0800F3DB.inc
deleted file mode 100644
index 05dd228a..00000000
--- a/data/scripts/gUnk_0800F3DB.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F3DB
-.short 0x7900
-.short 0x0008
-.short 0x7900
-.short 0x0a08
-.short 0x2800
diff --git a/data/scripts/gUnk_0800F3E5.inc b/data/scripts/gUnk_0800F3E5.inc
deleted file mode 100644
index fabd6bc6..00000000
--- a/data/scripts/gUnk_0800F3E5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F3E5
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F3E6.inc b/data/scripts/gUnk_0800F3E6.inc
deleted file mode 100644
index 50e2a1ff..00000000
--- a/data/scripts/gUnk_0800F3E6.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F3E6
-.short 0x0080
diff --git a/data/scripts/gUnk_0800F3E8.inc b/data/scripts/gUnk_0800F3E8.inc
deleted file mode 100644
index 82f0aeb2..00000000
--- a/data/scripts/gUnk_0800F3E8.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F3E8
-.byte 0x0
-.byte 0x0
-.byte 0x2
diff --git a/data/scripts/gUnk_0800F3EB.inc b/data/scripts/gUnk_0800F3EB.inc
deleted file mode 100644
index a9954b8e..00000000
--- a/data/scripts/gUnk_0800F3EB.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F3EB
-.short 0x0104
diff --git a/data/scripts/gUnk_0800F3ED.inc b/data/scripts/gUnk_0800F3ED.inc
deleted file mode 100644
index 614f4b38..00000000
--- a/data/scripts/gUnk_0800F3ED.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800F3ED
-.short 0x1804
-.short 0x0504
-.short 0x1008
-.short 0x0200
diff --git a/data/scripts/gUnk_0800F3F5.inc b/data/scripts/gUnk_0800F3F5.inc
deleted file mode 100644
index e16fbc6f..00000000
--- a/data/scripts/gUnk_0800F3F5.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F3F5
-.short 0x4304
-.short 0x6304
diff --git a/data/scripts/gUnk_0800F3F9.inc b/data/scripts/gUnk_0800F3F9.inc
deleted file mode 100644
index db02cae5..00000000
--- a/data/scripts/gUnk_0800F3F9.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F3F9
-.byte 0x4
-.byte 0x5b
-.byte 0x8
-.byte 0x37
-.byte 0x12
-.byte 0x59
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F400.inc b/data/scripts/gUnk_0800F400.inc
deleted file mode 100644
index a607008f..00000000
--- a/data/scripts/gUnk_0800F400.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800F400
-_0807E878 
-.short 0x0c0e
-.short 0x0004
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F408.inc b/data/scripts/gUnk_0800F408.inc
deleted file mode 100644
index 253909b8..00000000
--- a/data/scripts/gUnk_0800F408.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F408
-.byte 0x5
diff --git a/data/scripts/gUnk_0800F409.inc b/data/scripts/gUnk_0800F409.inc
deleted file mode 100644
index be4798ae..00000000
--- a/data/scripts/gUnk_0800F409.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F409
-.byte 0x8
-.byte 0xe0
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x79
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F410.inc b/data/scripts/gUnk_0800F410.inc
deleted file mode 100644
index b80cf8d5..00000000
--- a/data/scripts/gUnk_0800F410.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800F410
-.short 0x000b
-.short 0x0831
-.short 0x0010
-.short 0x0867
-.short 0x0100
-.short 0x086e
-.short 0x0010
-.short 0x0c73
-.short 0x0288
-.short 0x0328
-.short 0x0c28
diff --git a/data/scripts/gUnk_0800F426.inc b/data/scripts/gUnk_0800F426.inc
deleted file mode 100644
index 7ca38cee..00000000
--- a/data/scripts/gUnk_0800F426.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F426
-.short 0x0080
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_0800F430.inc b/data/scripts/gUnk_0800F430.inc
index 94e2ad26..1570ff8a 100644
--- a/data/scripts/gUnk_0800F430.inc
+++ b/data/scripts/gUnk_0800F430.inc
@@ -7,7 +7,7 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 StopScript 
-Call sub_0807F348
+Call 0x0807f349
 WaitForSomething2 0x00000008
 _0807EF80 0x0007
 _0807EDD4 0x01d8, 0x0328
diff --git a/data/scripts/gUnk_0800F4C4.inc b/data/scripts/gUnk_0800F4C4.inc
index 74a6202a..e9cdb3da 100644
--- a/data/scripts/gUnk_0800F4C4.inc
+++ b/data/scripts/gUnk_0800F4C4.inc
@@ -7,7 +7,34 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 StopScript 
-Call sub_0807F348
-.short 0x0c33
-.short 0x0010
+Call 0x0807f349
+WaitForSomething2 0x00000010
+_0807EF80 0x0007
+_0807EDD4 0x01c8, 0x0328
+_0807EDD4 0x01e8, 0x0338
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E5F8 0x00000200
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0x0010
+StopScript 
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x1239
+_0807EA94 
+_0807E878 
+TestBit 0x00000010
+JumpIfNot 0xffe0
+StopScript 
+_0807EF80 0x000b
+Wait 0x0028
+SetEntityNonPlanarMovement 0x0100
+_0807EC64 0x0010
+_0807EDD4 0x0288, 0x0328
+_0807E5F8 0x00000200
+_0807EF80 0x0006
+SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800F4EA.inc b/data/scripts/gUnk_0800F4EA.inc
deleted file mode 100644
index a8a3c9bf..00000000
--- a/data/scripts/gUnk_0800F4EA.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F4EA
-.byte 0x79
diff --git a/data/scripts/gUnk_0800F4EB.inc b/data/scripts/gUnk_0800F4EB.inc
deleted file mode 100644
index 435d785c..00000000
--- a/data/scripts/gUnk_0800F4EB.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F4EB
-.short 0x0708
-.short 0x7300
diff --git a/data/scripts/gUnk_0800F4EF.inc b/data/scripts/gUnk_0800F4EF.inc
deleted file mode 100644
index 631b4796..00000000
--- a/data/scripts/gUnk_0800F4EF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F4EF
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F4F0.inc b/data/scripts/gUnk_0800F4F0.inc
deleted file mode 100644
index 1e075f39..00000000
--- a/data/scripts/gUnk_0800F4F0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F4F0
-.byte 0xc8
diff --git a/data/scripts/gUnk_0800F4F1.inc b/data/scripts/gUnk_0800F4F1.inc
deleted file mode 100644
index 32a58387..00000000
--- a/data/scripts/gUnk_0800F4F1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F4F1
-.short 0x2801
diff --git a/data/scripts/gUnk_0800F4F3.inc b/data/scripts/gUnk_0800F4F3.inc
deleted file mode 100644
index 2962f037..00000000
--- a/data/scripts/gUnk_0800F4F3.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F4F3
-.short 0x7303
-.short 0xe80c
diff --git a/data/scripts/gUnk_0800F4F7.inc b/data/scripts/gUnk_0800F4F7.inc
deleted file mode 100644
index 421f1073..00000000
--- a/data/scripts/gUnk_0800F4F7.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F4F7
-.short 0x3801
diff --git a/data/scripts/gUnk_0800F4F9.inc b/data/scripts/gUnk_0800F4F9.inc
deleted file mode 100644
index e84329b5..00000000
--- a/data/scripts/gUnk_0800F4F9.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800F4F9
-.short 0x6103
-.short 0x0208
-.short 0x7900
-.short 0x0008
diff --git a/data/scripts/gUnk_0800F501.inc b/data/scripts/gUnk_0800F501.inc
deleted file mode 100644
index 405d2b4d..00000000
--- a/data/scripts/gUnk_0800F501.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800F501
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F50E.inc b/data/scripts/gUnk_0800F50E.inc
deleted file mode 100644
index 3c8649cc..00000000
--- a/data/scripts/gUnk_0800F50E.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0800F50E
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0x0010
-StopScript 
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x1239
-_0807EA94 
-_0807E878 
-TestBit 0x00000010
-JumpIfNot 0xffe0
-StopScript 
-_0807EF80 0x000b
-Wait 0x0028
-SetEntityNonPlanarMovement 0x0100
-_0807EC64 0x0010
-_0807EDD4 0x0288, 0x0328
-_0807E5F8 0x00000200
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc
index 9165b792..bf854ed0 100644
--- a/data/scripts/gUnk_0800F554.inc
+++ b/data/scripts/gUnk_0800F554.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800F554
 StartScript 
-Call sub_08061FE4
+Call 0x08061fe5
 _0807E9D4 
 _0807EF80 0x000a
 StopScript 
@@ -8,9 +8,157 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_08061FE4
-Call sub_08061FF4
+Call 0x08061fe5
+Call 0x08061ff5
 _0807EA94 
 _0807E878 
 Jump 0xffe4
 .short 0x0000
+StartScript 
+_0807EF80 0x0001
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806265d
+_0807EA94 
+_0807E878 
+_0807EF80 0x0001
+Jump 0xffe6
+.short 0x0000
+StartScript 
+_0807EB44 0x0006
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Call 0x08064429
+_0807EA94 
+_0807E878 
+Jump 0xffe0
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+Call 0x0807f349
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlap 0x2511
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffde
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EF80 0x0001
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806c90d
+_0807EA94 
+_0807E878 
+Jump 0xffea
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0001
+Call 0x0806b4f1
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807E9D4 
+_0807EF80 0x000a
+Call 0x0807f349
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+CheckLocalFlag 0x00cd
+JumpIf 0x000a
+TextboxNoOverlap 0x2512
+Jump 0x0006
+TextboxNoOverlap 0x251f
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffc4
+.short 0x0000
+StartScript 
+_0807EF80 0x0001
+_0807E9D4 
+_0807EF80 0x000a
+Call 0x08062789
+StopScript 
+CheckLocalFlag 0x00cd
+JumpIf 0x001e
+CheckEntityInteractType 
+JumpIfNot 0xfff4
+_0807E864 
+_0807EB74 
+Call 0x0806265d
+_0807EA94 
+_0807E878 
+_0807EF80 0x0001
+Jump 0xffde
+Call 0x080627e9
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800F584.inc b/data/scripts/gUnk_0800F584.inc
deleted file mode 100644
index 7c8cebd3..00000000
--- a/data/scripts/gUnk_0800F584.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800F584
-StartScript 
-_0807EF80 0x0001
-_0807E9D4 
-.byte 0x79
-.byte 0x8
-.byte 0xa
diff --git a/data/scripts/gUnk_0800F58F.inc b/data/scripts/gUnk_0800F58F.inc
deleted file mode 100644
index 5388e13e..00000000
--- a/data/scripts/gUnk_0800F58F.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_0800F58F
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0x63
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x5d
-.byte 0x26
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xe6
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F5B0.inc b/data/scripts/gUnk_0800F5B0.inc
deleted file mode 100644
index fb29c6f8..00000000
--- a/data/scripts/gUnk_0800F5B0.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_0800F5B0
-StartScript 
-_0807EB44 0x0006
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000008
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-Call sub_08064428
-_0807EA94 
-_0807E878 
-.byte 0x3
-.byte 0x8
-.byte 0xe0
diff --git a/data/scripts/gUnk_0800F5E9.inc b/data/scripts/gUnk_0800F5E9.inc
deleted file mode 100644
index 17d68420..00000000
--- a/data/scripts/gUnk_0800F5E9.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F5E9
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F5EC.inc b/data/scripts/gUnk_0800F5EC.inc
deleted file mode 100644
index b99ac058..00000000
--- a/data/scripts/gUnk_0800F5EC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F5EC
-.byte 0x1
diff --git a/data/scripts/gUnk_0800F5ED.inc b/data/scripts/gUnk_0800F5ED.inc
deleted file mode 100644
index be79dc66..00000000
--- a/data/scripts/gUnk_0800F5ED.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F5ED
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F5EE.inc b/data/scripts/gUnk_0800F5EE.inc
deleted file mode 100644
index 3f450a2a..00000000
--- a/data/scripts/gUnk_0800F5EE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F5EE
-.byte 0x61
diff --git a/data/scripts/gUnk_0800F5EF.inc b/data/scripts/gUnk_0800F5EF.inc
deleted file mode 100644
index dd283283..00000000
--- a/data/scripts/gUnk_0800F5EF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F5EF
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F5F0.inc b/data/scripts/gUnk_0800F5F0.inc
deleted file mode 100644
index a0d9cb65..00000000
--- a/data/scripts/gUnk_0800F5F0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F5F0
-.short 0x0004
diff --git a/data/scripts/gUnk_0800F5F2.inc b/data/scripts/gUnk_0800F5F2.inc
deleted file mode 100644
index ce7b9e1b..00000000
--- a/data/scripts/gUnk_0800F5F2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F5F2
-.short 0x0850
diff --git a/data/scripts/gUnk_0800F5F4.inc b/data/scripts/gUnk_0800F5F4.inc
deleted file mode 100644
index 7288c55b..00000000
--- a/data/scripts/gUnk_0800F5F4.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800F5F4
-.short 0x0000
-.short 0x0453
-.short 0x0879
-.short 0x000a
diff --git a/data/scripts/gUnk_0800F5FC.inc b/data/scripts/gUnk_0800F5FC.inc
deleted file mode 100644
index 430d56f5..00000000
--- a/data/scripts/gUnk_0800F5FC.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F5FC
-.byte 0xb
-.byte 0xc
-.byte 0x49
diff --git a/data/scripts/gUnk_0800F5FF.inc b/data/scripts/gUnk_0800F5FF.inc
deleted file mode 100644
index f5b8fd49..00000000
--- a/data/scripts/gUnk_0800F5FF.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F5FF
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x18
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F606.inc b/data/scripts/gUnk_0800F606.inc
deleted file mode 100644
index d9a88bb7..00000000
--- a/data/scripts/gUnk_0800F606.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F606
-.byte 0x5
diff --git a/data/scripts/gUnk_0800F607.inc b/data/scripts/gUnk_0800F607.inc
deleted file mode 100644
index 30ad22a2..00000000
--- a/data/scripts/gUnk_0800F607.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F607
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F608.inc b/data/scripts/gUnk_0800F608.inc
deleted file mode 100644
index cb8cc66d..00000000
--- a/data/scripts/gUnk_0800F608.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F608
-.short 0xfffc
diff --git a/data/scripts/gUnk_0800F60A.inc b/data/scripts/gUnk_0800F60A.inc
deleted file mode 100644
index 3ac06e79..00000000
--- a/data/scripts/gUnk_0800F60A.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800F60A
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-TextboxNoOverlap 0x2511
-_0807EA94 
-Wait 0x000f
-_0807E878 
-.short 0x0803
-.short 0xffde
diff --git a/data/scripts/gUnk_0800F628.inc b/data/scripts/gUnk_0800F628.inc
deleted file mode 100644
index 2ecdb62e..00000000
--- a/data/scripts/gUnk_0800F628.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0800F628
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EF80 0x0001
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-_0807E878 
-Jump 0xffea
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F650.inc b/data/scripts/gUnk_0800F650.inc
deleted file mode 100644
index ab6d77c9..00000000
--- a/data/scripts/gUnk_0800F650.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_0800F650
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0001
-Call sub_0806B4F0
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F688.inc b/data/scripts/gUnk_0800F688.inc
deleted file mode 100644
index 0fcfacf3..00000000
--- a/data/scripts/gUnk_0800F688.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F688
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
diff --git a/data/scripts/gUnk_0800F6A0.inc b/data/scripts/gUnk_0800F6A0.inc
deleted file mode 100644
index cbc613ef..00000000
--- a/data/scripts/gUnk_0800F6A0.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800F6A0
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-CheckLocalFlag 0x00cd
-JumpIf 0x000a
-TextboxNoOverlap 0x2512
-Jump 0x0006
-.short 0x085b
-.short 0x251f
diff --git a/data/scripts/gUnk_0800F6C8.inc b/data/scripts/gUnk_0800F6C8.inc
deleted file mode 100644
index 0eaf28e0..00000000
--- a/data/scripts/gUnk_0800F6C8.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_0800F6C8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000000
-Jump 0xffc4
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F6E0.inc b/data/scripts/gUnk_0800F6E0.inc
deleted file mode 100644
index ab65b54f..00000000
--- a/data/scripts/gUnk_0800F6E0.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0800F6E0
-StartScript 
-_0807EF80 0x0001
-_0807E9D4 
-.byte 0x79
diff --git a/data/scripts/gUnk_0800F6E9.inc b/data/scripts/gUnk_0800F6E9.inc
deleted file mode 100644
index f7de9bf3..00000000
--- a/data/scripts/gUnk_0800F6E9.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F6E9
-.byte 0x8
-.byte 0xa
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F6EC.inc b/data/scripts/gUnk_0800F6EC.inc
deleted file mode 100644
index aad40ce2..00000000
--- a/data/scripts/gUnk_0800F6EC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6EC
-.byte 0xb
diff --git a/data/scripts/gUnk_0800F6ED.inc b/data/scripts/gUnk_0800F6ED.inc
deleted file mode 100644
index 73bd769d..00000000
--- a/data/scripts/gUnk_0800F6ED.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6ED
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F6EE.inc b/data/scripts/gUnk_0800F6EE.inc
deleted file mode 100644
index d528ca30..00000000
--- a/data/scripts/gUnk_0800F6EE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6EE
-.byte 0x89
diff --git a/data/scripts/gUnk_0800F6EF.inc b/data/scripts/gUnk_0800F6EF.inc
deleted file mode 100644
index f15c37fb..00000000
--- a/data/scripts/gUnk_0800F6EF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6EF
-.byte 0x27
diff --git a/data/scripts/gUnk_0800F6F0.inc b/data/scripts/gUnk_0800F6F0.inc
deleted file mode 100644
index 3774af96..00000000
--- a/data/scripts/gUnk_0800F6F0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6F0
-.byte 0x6
diff --git a/data/scripts/gUnk_0800F6F1.inc b/data/scripts/gUnk_0800F6F1.inc
deleted file mode 100644
index 646ff764..00000000
--- a/data/scripts/gUnk_0800F6F1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6F1
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F6F2.inc b/data/scripts/gUnk_0800F6F2.inc
deleted file mode 100644
index c4258905..00000000
--- a/data/scripts/gUnk_0800F6F2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6F2
-.byte 0x2
diff --git a/data/scripts/gUnk_0800F6F3.inc b/data/scripts/gUnk_0800F6F3.inc
deleted file mode 100644
index a265e213..00000000
--- a/data/scripts/gUnk_0800F6F3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F6F3
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F6F4.inc b/data/scripts/gUnk_0800F6F4.inc
deleted file mode 100644
index 842f18d5..00000000
--- a/data/scripts/gUnk_0800F6F4.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F6F4
-CheckLocalFlag 0x00cd
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F6F9.inc b/data/scripts/gUnk_0800F6F9.inc
deleted file mode 100644
index 812fd700..00000000
--- a/data/scripts/gUnk_0800F6F9.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F6F9
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x18
-.byte 0x4
diff --git a/data/scripts/gUnk_0800F6FE.inc b/data/scripts/gUnk_0800F6FE.inc
deleted file mode 100644
index 3d0f90e1..00000000
--- a/data/scripts/gUnk_0800F6FE.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F6FE
-.short 0x0805
-.short 0xfff4
diff --git a/data/scripts/gUnk_0800F702.inc b/data/scripts/gUnk_0800F702.inc
deleted file mode 100644
index 0676c592..00000000
--- a/data/scripts/gUnk_0800F702.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F702
-_0807E864 
-_0807EB74 
diff --git a/data/scripts/gUnk_0800F706.inc b/data/scripts/gUnk_0800F706.inc
deleted file mode 100644
index c0d86b0d..00000000
--- a/data/scripts/gUnk_0800F706.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800F706
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-_0807EF80 0x0001
-Jump 0xffde
-.short 0x0c0b
-.short 0x27e9
-.short 0x0806
diff --git a/data/scripts/gUnk_0800F71E.inc b/data/scripts/gUnk_0800F71E.inc
deleted file mode 100644
index 7d059899..00000000
--- a/data/scripts/gUnk_0800F71E.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F71E
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc
index a6ec34d6..1ded33f7 100644
--- a/data/scripts/gUnk_0800F724.inc
+++ b/data/scripts/gUnk_0800F724.inc
@@ -3,5 +3,235 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 CheckLocalFlag 0x00cd
-.short 0x0805
-.short 0xfffa
+JumpIfNot 0xfffa
+_0807EF80 0x0007
+Jump 0xfe4a
+CheckLocalFlag 0x00cd
+JumpIf 0x030a
+_0807E864 
+Call 0x0807df29
+SetEntityPositionRelative 0x014800c8
+Call 0x0807f845
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+StartPlayerScript 0x0800fa54
+_0807E5F8 0x00000002
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x021800c8
+Call 0x0807f5c1
+Wait 0x0064
+_0807F0B4 0x0002
+SetEntityPositionRelative 0x036800c8
+Call 0x0807f5c1
+WaitForSomething2 0x00000001
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos
+.short 0x2501
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call 0x0807df51
+_0807E878 
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000004
+_0807E864 
+Call 0x0807df29
+StartPlayerScript 0x0800fa78
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos
+.short 0x2503
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Call 0x0807df51
+_0807E878 
+WaitForSomething2 0x00000004
+_0807E864 
+Call 0x0807df29
+StartPlayerScript 0x0800fa9c
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos
+.short 0x2504
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Call 0x0807df51
+_0807E878 
+WaitForSomething2 0x00000004
+_0807E864 
+Call 0x0807df29
+StartPlayerScript 0x0800fac0
+WaitForSomething2 0x00000001
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+TextboxNoOverlapFollowPos
+.short 0x2505
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Call 0x0807df51
+_0807E878 
+WaitForSomething2 0x00000004
+_0807E864 
+Call 0x0807df29
+Call 0x08063c5d
+SoundReq 0x00e2
+Wait 0x001e
+_0807E8E4_0 
+Call 0x0807f3f9
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x1021
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800fae4
+SetEntityPositionRelative 0x025800f0
+_0807F0B4 0x0001
+CameraTargetEntity 
+Wait 0x001e
+Call 0x08063c2d
+WaitForSomething2 0x00000001
+TextboxNoOverlapFollowPos
+.short 0x1022
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E8E4_0 
+Call 0x08063c15
+Call 0x08094cdd
+Wait 0x001e
+TextboxNoOverlapFollowPos
+.short 0x1023
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+Call 0x08063c15
+Call 0x08094dd9
+Wait 0x001e
+TextboxNoOverlapFollowPos
+.short 0x1024
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+Call 0x08063c15
+Call 0x08094d35
+Wait 0x001e
+TextboxNoOverlapFollowPos
+.short 0x1025
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+Call 0x08063c5d
+TextboxNoOverlapFollowPos
+.short 0x1026
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E8E4_1 
+Call 0x08063c2d
+TextboxNoOverlapFollowPos
+.short 0x1027
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+Call 0x08063c75
+Wait 0x003c
+Call 0x08063c15
+_0807E8E4_0 
+TextboxNoOverlapFollowPos
+.short 0x1028
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+_0807E8E4_1 
+TextboxNoOverlapFollowPos
+.short 0x1029
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807E8E4_0 
+TextboxNoOverlapFollowPos
+.short 0x102a
+.short 0x000e
+@ End of 2 parameters
+_0807EA94 
+Call 0x08063c15
+Call 0x08094d71
+SoundReq 0x0103
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+Call 0x08063c15
+Call 0x08094d11
+Wait 0x001e
+Call 0x08094e0d
+Wait 0x001e
+_0807E8E4_1 
+Call 0x0807f3f9
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x102b
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807F034 0x000d
+WaitPlayerAction8 
+Call 0x0806dc3d
+Call 0x080791bd
+CallWithArg
+.short 0xf245
+.short 0x0807
+.short 0x000d
+.short 0x0000
+@ End of 4 parameters
+_0807E914 0x000000ff
+Call 0x0807f5b1
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x49d6
+.short 0x0800
+@ End of 4 parameters
+Wait 0x00b7
+_0807E914 0x00000000
+Call 0x0807f5b1
+TextboxNoOverlapFollowPos
+.short 0x102c
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806dc59
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Wait 0x000a
+_0807E5F8 0x00000002
+Call 0x08063c45
+SetLocalFlag 0x00cd
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800F734.inc b/data/scripts/gUnk_0800F734.inc
deleted file mode 100644
index d0e49b47..00000000
--- a/data/scripts/gUnk_0800F734.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F734
-_0807EF80 0x0007
-.short 0x0803
-.short 0xfe4a
diff --git a/data/scripts/gUnk_0800F73C.inc b/data/scripts/gUnk_0800F73C.inc
deleted file mode 100644
index 4222c77f..00000000
--- a/data/scripts/gUnk_0800F73C.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SCRIPT_START gUnk_0800F73C
-CheckLocalFlag 0x00cd
-JumpIf 0x030a
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x014800c8
-Call sub_0807F844
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-StartPlayerScript 0x0800fa54
-_0807E5F8 0x00000002
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x021800c8
-Call sub_0807F5C0
-Wait 0x0064
-_0807F0B4 0x0002
-SetEntityPositionRelative 0x036800c8
-Call sub_0807F5C0
-WaitForSomething2 0x00000001
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x2501, 0x0000
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000004
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript 0x0800fa78
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000002
-.short 0x0c33
diff --git a/data/scripts/gUnk_0800F7E6.inc b/data/scripts/gUnk_0800F7E6.inc
deleted file mode 100644
index 953fde86..00000000
--- a/data/scripts/gUnk_0800F7E6.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F7E6
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
diff --git a/data/scripts/gUnk_0800F7EB.inc b/data/scripts/gUnk_0800F7EB.inc
deleted file mode 100644
index 3d459670..00000000
--- a/data/scripts/gUnk_0800F7EB.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F7EB
-.byte 0xc
-.byte 0x3
-.byte 0x25
diff --git a/data/scripts/gUnk_0800F7EE.inc b/data/scripts/gUnk_0800F7EE.inc
deleted file mode 100644
index 944c3718..00000000
--- a/data/scripts/gUnk_0800F7EE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7EE
-.byte 0xe
diff --git a/data/scripts/gUnk_0800F7EF.inc b/data/scripts/gUnk_0800F7EF.inc
deleted file mode 100644
index 11367ef6..00000000
--- a/data/scripts/gUnk_0800F7EF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7EF
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F7F0.inc b/data/scripts/gUnk_0800F7F0.inc
deleted file mode 100644
index bc74cb92..00000000
--- a/data/scripts/gUnk_0800F7F0.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800F7F0
-_0807EA94 
-.short 0x0c28
diff --git a/data/scripts/gUnk_0800F7F4.inc b/data/scripts/gUnk_0800F7F4.inc
deleted file mode 100644
index 08dfcc8c..00000000
--- a/data/scripts/gUnk_0800F7F4.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7F4
-.byte 0x2
diff --git a/data/scripts/gUnk_0800F7F5.inc b/data/scripts/gUnk_0800F7F5.inc
deleted file mode 100644
index 756de5ad..00000000
--- a/data/scripts/gUnk_0800F7F5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7F5
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F7F7.inc b/data/scripts/gUnk_0800F7F7.inc
deleted file mode 100644
index 2e69551b..00000000
--- a/data/scripts/gUnk_0800F7F7.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F7F7
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F7FC.inc b/data/scripts/gUnk_0800F7FC.inc
deleted file mode 100644
index 4153960a..00000000
--- a/data/scripts/gUnk_0800F7FC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7FC
-.byte 0x0
diff --git a/data/scripts/gUnk_0800F7FD.inc b/data/scripts/gUnk_0800F7FD.inc
deleted file mode 100644
index 18c9cbd5..00000000
--- a/data/scripts/gUnk_0800F7FD.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7FD
-.short 0x0b00
diff --git a/data/scripts/gUnk_0800F7FF.inc b/data/scripts/gUnk_0800F7FF.inc
deleted file mode 100644
index ea7923f1..00000000
--- a/data/scripts/gUnk_0800F7FF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F7FF
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F800.inc b/data/scripts/gUnk_0800F800.inc
deleted file mode 100644
index 73788381..00000000
--- a/data/scripts/gUnk_0800F800.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F800
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
diff --git a/data/scripts/gUnk_0800F805.inc b/data/scripts/gUnk_0800F805.inc
deleted file mode 100644
index f6ae29d7..00000000
--- a/data/scripts/gUnk_0800F805.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F805
-.byte 0x4
-.byte 0x33
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F808.inc b/data/scripts/gUnk_0800F808.inc
deleted file mode 100644
index 6bce11ac..00000000
--- a/data/scripts/gUnk_0800F808.inc
+++ /dev/null
@@ -1,232 +0,0 @@
-SCRIPT_START gUnk_0800F808
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x47
-.byte 0xc
-.byte 0x9c
-.byte 0xfa
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x4
-.byte 0x25
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x47
-.byte 0xc
-.byte 0xc0
-.byte 0xfa
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x5
-.byte 0x25
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0x5d
-.byte 0x3c
-.byte 0x6
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xe2
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x49
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xf9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x21
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0xe4
-.byte 0xfa
-.byte 0x0
-.byte 0x8
-.byte 0x69
-.byte 0xc
-.byte 0xf0
-.byte 0x0
-.byte 0x58
-.byte 0x2
-.byte 0x89
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x87
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x2d
-.byte 0x3c
-.byte 0x6
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x22
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x49
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x15
-.byte 0x3c
-.byte 0x6
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xdd
diff --git a/data/scripts/gUnk_0800F8EF.inc b/data/scripts/gUnk_0800F8EF.inc
deleted file mode 100644
index 397b00d6..00000000
--- a/data/scripts/gUnk_0800F8EF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8EF
-.byte 0x4c
diff --git a/data/scripts/gUnk_0800F8F0.inc b/data/scripts/gUnk_0800F8F0.inc
deleted file mode 100644
index 9ba8ee23..00000000
--- a/data/scripts/gUnk_0800F8F0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8F0
-.byte 0x9
diff --git a/data/scripts/gUnk_0800F8F1.inc b/data/scripts/gUnk_0800F8F1.inc
deleted file mode 100644
index 0ee53ef7..00000000
--- a/data/scripts/gUnk_0800F8F1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8F1
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F8F2.inc b/data/scripts/gUnk_0800F8F2.inc
deleted file mode 100644
index e2fd314d..00000000
--- a/data/scripts/gUnk_0800F8F2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8F2
-.byte 0x31
diff --git a/data/scripts/gUnk_0800F8F3.inc b/data/scripts/gUnk_0800F8F3.inc
deleted file mode 100644
index 4d0967ba..00000000
--- a/data/scripts/gUnk_0800F8F3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8F3
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F8F4.inc b/data/scripts/gUnk_0800F8F4.inc
deleted file mode 100644
index 60bde4ad..00000000
--- a/data/scripts/gUnk_0800F8F4.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8F4
-.byte 0x1e
diff --git a/data/scripts/gUnk_0800F8F5.inc b/data/scripts/gUnk_0800F8F5.inc
deleted file mode 100644
index 8bde204a..00000000
--- a/data/scripts/gUnk_0800F8F5.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800F8F5
-.byte 0x0
-.byte 0x5c
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F8F8.inc b/data/scripts/gUnk_0800F8F8.inc
deleted file mode 100644
index 01353483..00000000
--- a/data/scripts/gUnk_0800F8F8.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F8F8
-.byte 0x23
diff --git a/data/scripts/gUnk_0800F8F9.inc b/data/scripts/gUnk_0800F8F9.inc
deleted file mode 100644
index ce2fbabc..00000000
--- a/data/scripts/gUnk_0800F8F9.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800F8F9
-.byte 0x10
-.byte 0xe
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F900.inc b/data/scripts/gUnk_0800F900.inc
deleted file mode 100644
index eb4fc475..00000000
--- a/data/scripts/gUnk_0800F900.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F900
-.short 0x3c15
diff --git a/data/scripts/gUnk_0800F902.inc b/data/scripts/gUnk_0800F902.inc
deleted file mode 100644
index f02849a5..00000000
--- a/data/scripts/gUnk_0800F902.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0800F902
-_0807E078 0x0c0b
-.short 0x4dd9
-.short 0x0809
-.short 0x0831
-.short 0x001e
-.short 0x0c5c
-.short 0x1024
-.short 0x000e
-.short 0x0459
diff --git a/data/scripts/gUnk_0800F916.inc b/data/scripts/gUnk_0800F916.inc
deleted file mode 100644
index 5d2bafce..00000000
--- a/data/scripts/gUnk_0800F916.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-SCRIPT_START gUnk_0800F916
-Call sub_08063C14
-Call sub_08094D34
-Wait 0x001e
-TextboxNoOverlapFollowPos 0x1025, 0x000e
-_0807EA94 
-Call sub_08063C5C
-TextboxNoOverlapFollowPos 0x1026, 0x000e
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E8E4_1 
-Call sub_08063C2C
-TextboxNoOverlapFollowPos 0x1027, 0x0000
-_0807EA94 
-Call sub_08063C74
-Wait 0x003c
-Call sub_08063C14
-_0807E8E4_0 
-TextboxNoOverlapFollowPos 0x1028, 0x000e
-_0807EA94 
-_0807E8E4_1 
-TextboxNoOverlapFollowPos 0x1029, 0x0000
-_0807EA94 
-_0807E8E4_0 
-TextboxNoOverlapFollowPos 0x102a, 0x000e
-_0807EA94 
-Call sub_08063C14
-Call sub_08094D70
-SoundReq 0x0103
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Call sub_08063C14
-Call sub_08094D10
-Wait 0x001e
-Call sub_08094E0C
-Wait 0x001e
-_0807E8E4_1 
-Call sub_0807F3F8
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x102b, 0x0000
-_0807EA94 
-_0807F034 0x000d
-WaitPlayerAction8 
-Call sub_0806DC3C
-Call sub_080791BC
-CallWithArg sub_0807F244, 0x0000000d
-.short 0x0c4e
-.short 0x00ff
diff --git a/data/scripts/gUnk_0800F9F0.inc b/data/scripts/gUnk_0800F9F0.inc
deleted file mode 100644
index bab942c3..00000000
--- a/data/scripts/gUnk_0800F9F0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F9F0
-.short 0x0000
diff --git a/data/scripts/gUnk_0800F9F2.inc b/data/scripts/gUnk_0800F9F2.inc
deleted file mode 100644
index 6b6f43e7..00000000
--- a/data/scripts/gUnk_0800F9F2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F9F2
-.byte 0xb
diff --git a/data/scripts/gUnk_0800F9F3.inc b/data/scripts/gUnk_0800F9F3.inc
deleted file mode 100644
index 27975d22..00000000
--- a/data/scripts/gUnk_0800F9F3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F9F3
-.byte 0xc
diff --git a/data/scripts/gUnk_0800F9F4.inc b/data/scripts/gUnk_0800F9F4.inc
deleted file mode 100644
index bd4ba954..00000000
--- a/data/scripts/gUnk_0800F9F4.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F9F4
-.short 0xf5b1
diff --git a/data/scripts/gUnk_0800F9F6.inc b/data/scripts/gUnk_0800F9F6.inc
deleted file mode 100644
index 5bc2894b..00000000
--- a/data/scripts/gUnk_0800F9F6.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F9F6
-.byte 0x7
diff --git a/data/scripts/gUnk_0800F9F7.inc b/data/scripts/gUnk_0800F9F7.inc
deleted file mode 100644
index 0dbc4a29..00000000
--- a/data/scripts/gUnk_0800F9F7.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800F9F7
-.byte 0x8
diff --git a/data/scripts/gUnk_0800F9F8.inc b/data/scripts/gUnk_0800F9F8.inc
deleted file mode 100644
index 409c328c..00000000
--- a/data/scripts/gUnk_0800F9F8.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800F9F8
-.short 0x140c
-.short 0xf29d
-.short 0x0807
-.short 0x49d6
-.short 0x0800
diff --git a/data/scripts/gUnk_0800FA02.inc b/data/scripts/gUnk_0800FA02.inc
deleted file mode 100644
index f708cb2b..00000000
--- a/data/scripts/gUnk_0800FA02.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FA02
-Wait 0x00b7
-.byte 0x4e
diff --git a/data/scripts/gUnk_0800FA07.inc b/data/scripts/gUnk_0800FA07.inc
deleted file mode 100644
index a2b21a30..00000000
--- a/data/scripts/gUnk_0800FA07.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FA07
-.byte 0xc
diff --git a/data/scripts/gUnk_0800FA08.inc b/data/scripts/gUnk_0800FA08.inc
deleted file mode 100644
index 0b09498d..00000000
--- a/data/scripts/gUnk_0800FA08.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FA08
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FA09.inc b/data/scripts/gUnk_0800FA09.inc
deleted file mode 100644
index f05952c3..00000000
--- a/data/scripts/gUnk_0800FA09.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FA09
-.short 0x0000
-.short 0x0b00
diff --git a/data/scripts/gUnk_0800FA0D.inc b/data/scripts/gUnk_0800FA0D.inc
deleted file mode 100644
index 4d48ce5c..00000000
--- a/data/scripts/gUnk_0800FA0D.inc
+++ /dev/null
@@ -1,108 +0,0 @@
-SCRIPT_START gUnk_0800FA0D
-.byte 0xc
-.byte 0xb1
-.byte 0xf5
-.byte 0x7
-.byte 0x8
-.byte 0x5c
-.byte 0xc
-.byte 0x2c
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0x9d
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0xdc
-.byte 0x6
-.byte 0x8
-.byte 0x89
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x88
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0x3c
-.byte 0x6
-.byte 0x8
-.byte 0x2a
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x2
-.byte 0x4
-.byte 0x69
-.byte 0xc
-.byte 0xd8
-.byte 0x0
-.byte 0x98
-.byte 0x3
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800FA54.inc b/data/scripts/gUnk_0800FA54.inc
new file mode 100644
index 00000000..0b51b2e4
--- /dev/null
+++ b/data/scripts/gUnk_0800FA54.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800FA54
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+SetEntityPositionRelative 0x039800d8
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FA78.inc b/data/scripts/gUnk_0800FA78.inc
index d62af1bf..fe2366d3 100644
--- a/data/scripts/gUnk_0800FA78.inc
+++ b/data/scripts/gUnk_0800FA78.inc
@@ -6,23 +6,5 @@ _0807EDD4 0x00a0, 0x0278
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0c73
-.short 0x0078
-.short 0x01c0
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_0801635C.inc b/data/scripts/gUnk_0800FA9C.inc
similarity index 51%
rename from data/scripts/gUnk_0801635C.inc
rename to data/scripts/gUnk_0800FA9C.inc
index d0aff840..303070de 100644
--- a/data/scripts/gUnk_0801635C.inc
+++ b/data/scripts/gUnk_0800FA9C.inc
@@ -1,9 +1,10 @@
-SCRIPT_START gUnk_0801635C
+SCRIPT_START gUnk_0800FA9C
+StartScript 
 SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0078, 0x0050
+StopScript 
+_0807EDD4 0x0078, 0x01c0
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FAC0.inc b/data/scripts/gUnk_0800FAC0.inc
index 202b3a20..26a1c150 100644
--- a/data/scripts/gUnk_0800FAC0.inc
+++ b/data/scripts/gUnk_0800FAC0.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x0108, 0x01c8
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc
index 06d7fca4..adc95fc2 100644
--- a/data/scripts/gUnk_0800FAE4.inc
+++ b/data/scripts/gUnk_0800FAE4.inc
@@ -2,5 +2,28 @@ SCRIPT_START gUnk_0800FAE4
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call sub_0807F584
-.byte 0x6
+Call 0x0807f585
+_0807E078
+.short 0x0012
+.short 0x001a
+.short 0x000e
+.short 0x0002
+@ End of 4 parameters
+CallWithArg
+.short 0xf4f9
+.short 0x0807
+.short 0x027c
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf465
+.short 0x0807
+.short 0x00e8
+.short 0x0000
+@ End of 4 parameters
+_0807EDD4 0x00e8, 0x0270
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FAF3.inc b/data/scripts/gUnk_0800FAF3.inc
deleted file mode 100644
index 0f932d1d..00000000
--- a/data/scripts/gUnk_0800FAF3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAF3
-.short 0x1214
diff --git a/data/scripts/gUnk_0800FAF5.inc b/data/scripts/gUnk_0800FAF5.inc
deleted file mode 100644
index 6c76b8e0..00000000
--- a/data/scripts/gUnk_0800FAF5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAF5
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FAF6.inc b/data/scripts/gUnk_0800FAF6.inc
deleted file mode 100644
index 00f8c4e5..00000000
--- a/data/scripts/gUnk_0800FAF6.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAF6
-.byte 0x1a
diff --git a/data/scripts/gUnk_0800FAF7.inc b/data/scripts/gUnk_0800FAF7.inc
deleted file mode 100644
index cbb90022..00000000
--- a/data/scripts/gUnk_0800FAF7.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAF7
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FAF8.inc b/data/scripts/gUnk_0800FAF8.inc
deleted file mode 100644
index ea809c7c..00000000
--- a/data/scripts/gUnk_0800FAF8.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800FAF8
-.byte 0xe
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0xc
diff --git a/data/scripts/gUnk_0800FAFD.inc b/data/scripts/gUnk_0800FAFD.inc
deleted file mode 100644
index aad4b905..00000000
--- a/data/scripts/gUnk_0800FAFD.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAFD
-.byte 0x14
diff --git a/data/scripts/gUnk_0800FAFE.inc b/data/scripts/gUnk_0800FAFE.inc
deleted file mode 100644
index b6e56c6d..00000000
--- a/data/scripts/gUnk_0800FAFE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAFE
-.byte 0xf9
diff --git a/data/scripts/gUnk_0800FAFF.inc b/data/scripts/gUnk_0800FAFF.inc
deleted file mode 100644
index 70b8910d..00000000
--- a/data/scripts/gUnk_0800FAFF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FAFF
-.byte 0xf4
diff --git a/data/scripts/gUnk_0800FB00.inc b/data/scripts/gUnk_0800FB00.inc
deleted file mode 100644
index a6ec0cae..00000000
--- a/data/scripts/gUnk_0800FB00.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FB00
-.byte 0x7
diff --git a/data/scripts/gUnk_0800FB01.inc b/data/scripts/gUnk_0800FB01.inc
deleted file mode 100644
index 0ea92a29..00000000
--- a/data/scripts/gUnk_0800FB01.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FB01
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FB02.inc b/data/scripts/gUnk_0800FB02.inc
deleted file mode 100644
index ba6e9447..00000000
--- a/data/scripts/gUnk_0800FB02.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FB02
-.short 0x027c
diff --git a/data/scripts/gUnk_0800FB04.inc b/data/scripts/gUnk_0800FB04.inc
deleted file mode 100644
index cd6fa411..00000000
--- a/data/scripts/gUnk_0800FB04.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FB04
-.short 0x0000
-.short 0x140c
diff --git a/data/scripts/gUnk_0800FB08.inc b/data/scripts/gUnk_0800FB08.inc
deleted file mode 100644
index bb95d840..00000000
--- a/data/scripts/gUnk_0800FB08.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FB08
-.short 0xf465
diff --git a/data/scripts/gUnk_0800FB0A.inc b/data/scripts/gUnk_0800FB0A.inc
deleted file mode 100644
index 842689e6..00000000
--- a/data/scripts/gUnk_0800FB0A.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_0800FB0A
-.byte 0x7
-.byte 0x8
-.byte 0xe8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xe8
-.byte 0x0
-.byte 0x70
-.byte 0x2
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x79
diff --git a/data/scripts/gUnk_0800FB2C.inc b/data/scripts/gUnk_0800FB2C.inc
new file mode 100644
index 00000000..8a6d1083
--- /dev/null
+++ b/data/scripts/gUnk_0800FB2C.inc
@@ -0,0 +1,7 @@
+SCRIPT_START gUnk_0800FB2C
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FB31.inc b/data/scripts/gUnk_0800FB31.inc
deleted file mode 100644
index 8ac8fa60..00000000
--- a/data/scripts/gUnk_0800FB31.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_0800FB31
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FB44.inc b/data/scripts/gUnk_0800FB44.inc
index 3e81d840..0dba8ca8 100644
--- a/data/scripts/gUnk_0800FB44.inc
+++ b/data/scripts/gUnk_0800FB44.inc
@@ -3,10 +3,10 @@ StartScript
 _0807EF80 0x0008
 _0807EF80 0x000b
 SetEntityNonPlanarMovement 0x0080
-Call sub_08066D04
+Call 0x08066d05
 StopScript 
 WaitForSomething2 0x00000002
-Call sub_08066D14
+Call 0x08066d15
 JumpIf 0x0004
 MoveEntityToPlayer 
 _0807EF80 0x0007
@@ -26,6 +26,75 @@ _0807E9D4
 _0807E30C 
 JumpIfNot 0xfffc
 _0807EF80 0x000b
-.byte 0x28
-.byte 0xc
-.byte 0x4
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0200
+_0807EDD4 0x00a0, 0x0268
+_0807EDD4 0x0070, 0x0268
+_0807EDD4 0x0070, 0x0208
+SetEntityPositionRelative 0x01a80078
+_0807EB44 0x0000
+_0807EF80 0x0001
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+_0807E30C 
+JumpIfNot 0xfffc
+_0807EF80 0x000b
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0200
+_0807EDD4 0x00f8, 0x01a8
+SetEntityPositionRelative 0x01c80118
+_0807EB44 0x0002
+_0807EF80 0x0001
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+_0807E30C 
+JumpIfNot 0xfffc
+_0807EF80 0x000b
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0200
+_0807EDD4 0x0118, 0x0260
+SetEntityPositionRelative 0x027000f8
+_0807EB44 0x0000
+_0807EF80 0x0001
+_0807E5F8 0x00000004
+_0807EF80 0x000a
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807EF80 0x000b
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+_0807EF80 0x0004
+WaitForSomething2 0x00000002
+_0807EF80 0x000d
+SetEntityNonPlanarMovement 0x0040
+_0807EC94 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EF80 0x000c
+SetEntityNonPlanarMovement 0x0040
+_0807ECF4 0x0020
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+Call 0x08066d4d
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FBBB.inc b/data/scripts/gUnk_0800FBBB.inc
deleted file mode 100644
index 418f5e0f..00000000
--- a/data/scripts/gUnk_0800FBBB.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-SCRIPT_START gUnk_0800FBBB
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x2
-.byte 0x73
-.byte 0xc
-.byte 0xa0
-.byte 0x0
-.byte 0x68
-.byte 0x2
-.byte 0x73
-.byte 0xc
-.byte 0x70
-.byte 0x0
-.byte 0x68
-.byte 0x2
-.byte 0x73
-.byte 0xc
-.byte 0x70
-.byte 0x0
-.byte 0x8
-.byte 0x2
-.byte 0x69
-.byte 0xc
diff --git a/data/scripts/gUnk_0800FBF0.inc b/data/scripts/gUnk_0800FBF0.inc
deleted file mode 100644
index 26a37a5d..00000000
--- a/data/scripts/gUnk_0800FBF0.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FBF0
-.byte 0x78
-.byte 0x0
-.byte 0xa8
diff --git a/data/scripts/gUnk_0800FBF3.inc b/data/scripts/gUnk_0800FBF3.inc
deleted file mode 100644
index 8114b485..00000000
--- a/data/scripts/gUnk_0800FBF3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBF3
-.short 0x6101
diff --git a/data/scripts/gUnk_0800FBF5.inc b/data/scripts/gUnk_0800FBF5.inc
deleted file mode 100644
index 61ae4f2e..00000000
--- a/data/scripts/gUnk_0800FBF5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBF5
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FBF6.inc b/data/scripts/gUnk_0800FBF6.inc
deleted file mode 100644
index a9e0082c..00000000
--- a/data/scripts/gUnk_0800FBF6.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBF6
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FBF8.inc b/data/scripts/gUnk_0800FBF8.inc
deleted file mode 100644
index 48e69ee6..00000000
--- a/data/scripts/gUnk_0800FBF8.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBF8
-.byte 0x79
diff --git a/data/scripts/gUnk_0800FBF9.inc b/data/scripts/gUnk_0800FBF9.inc
deleted file mode 100644
index fd7511fd..00000000
--- a/data/scripts/gUnk_0800FBF9.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBF9
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FBFA.inc b/data/scripts/gUnk_0800FBFA.inc
deleted file mode 100644
index 80ad3291..00000000
--- a/data/scripts/gUnk_0800FBFA.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBFA
-.byte 0x1
diff --git a/data/scripts/gUnk_0800FBFB.inc b/data/scripts/gUnk_0800FBFB.inc
deleted file mode 100644
index 72e45f0b..00000000
--- a/data/scripts/gUnk_0800FBFB.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBFB
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FBFC.inc b/data/scripts/gUnk_0800FBFC.inc
deleted file mode 100644
index c514be46..00000000
--- a/data/scripts/gUnk_0800FBFC.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FBFC
-.byte 0x28
-.byte 0xc
-.byte 0x4
diff --git a/data/scripts/gUnk_0800FBFF.inc b/data/scripts/gUnk_0800FBFF.inc
deleted file mode 100644
index 7324b708..00000000
--- a/data/scripts/gUnk_0800FBFF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FBFF
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FC00.inc b/data/scripts/gUnk_0800FC00.inc
deleted file mode 100644
index 8bb598f9..00000000
--- a/data/scripts/gUnk_0800FC00.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FC00
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FC01.inc b/data/scripts/gUnk_0800FC01.inc
deleted file mode 100644
index e991fed2..00000000
--- a/data/scripts/gUnk_0800FC01.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FC01
-.short 0x7900
-.short 0x0a08
diff --git a/data/scripts/gUnk_0800FC05.inc b/data/scripts/gUnk_0800FC05.inc
deleted file mode 100644
index 58d00fc8..00000000
--- a/data/scripts/gUnk_0800FC05.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FC05
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FC06.inc b/data/scripts/gUnk_0800FC06.inc
deleted file mode 100644
index 2df03479..00000000
--- a/data/scripts/gUnk_0800FC06.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FC06
-_0807E30C 
diff --git a/data/scripts/gUnk_0800FC08.inc b/data/scripts/gUnk_0800FC08.inc
deleted file mode 100644
index 394fef96..00000000
--- a/data/scripts/gUnk_0800FC08.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FC08
-.byte 0x5
diff --git a/data/scripts/gUnk_0800FC09.inc b/data/scripts/gUnk_0800FC09.inc
deleted file mode 100644
index 39b96508..00000000
--- a/data/scripts/gUnk_0800FC09.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800FC09
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x79
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FC0E.inc b/data/scripts/gUnk_0800FC0E.inc
deleted file mode 100644
index ca3a3558..00000000
--- a/data/scripts/gUnk_0800FC0E.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800FC0E
-.short 0x000b
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FC24.inc b/data/scripts/gUnk_0800FC24.inc
deleted file mode 100644
index 66f5447b..00000000
--- a/data/scripts/gUnk_0800FC24.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-SCRIPT_START gUnk_0800FC24
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0200
-_0807EDD4 0x00f8, 0x01a8
-SetEntityPositionRelative 0x01c80118
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-_0807E30C 
-JumpIfNot 0xfffc
-_0807EF80 0x000b
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0200
-_0807EDD4 0x0118, 0x0260
-SetEntityPositionRelative 0x027000f8
-_0807EB44 0x0000
-_0807EF80 0x0001
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807EF80 0x000b
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-_0807EF80 0x0004
-WaitForSomething2 0x00000002
-_0807EF80 0x000d
-SetEntityNonPlanarMovement 0x0040
-_0807EC94 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EF80 0x000c
-SetEntityNonPlanarMovement 0x0040
-.short 0x0871
diff --git a/data/scripts/gUnk_0800FCEA.inc b/data/scripts/gUnk_0800FCEA.inc
deleted file mode 100644
index b7a6d6b9..00000000
--- a/data/scripts/gUnk_0800FCEA.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FCEA
-.short 0x0020
-.short 0x0861
diff --git a/data/scripts/gUnk_0800FCEE.inc b/data/scripts/gUnk_0800FCEE.inc
deleted file mode 100644
index 19e10314..00000000
--- a/data/scripts/gUnk_0800FCEE.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FCEE
-.short 0x0006
-.short 0x0879
diff --git a/data/scripts/gUnk_0800FCF2.inc b/data/scripts/gUnk_0800FCF2.inc
deleted file mode 100644
index dee9566c..00000000
--- a/data/scripts/gUnk_0800FCF2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCF2
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FCF3.inc b/data/scripts/gUnk_0800FCF3.inc
deleted file mode 100644
index 0d8e6f96..00000000
--- a/data/scripts/gUnk_0800FCF3.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCF3
-.short 0x2800
diff --git a/data/scripts/gUnk_0800FCF5.inc b/data/scripts/gUnk_0800FCF5.inc
deleted file mode 100644
index dd3ea251..00000000
--- a/data/scripts/gUnk_0800FCF5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCF5
-.short 0x040c
diff --git a/data/scripts/gUnk_0800FCF7.inc b/data/scripts/gUnk_0800FCF7.inc
deleted file mode 100644
index e979829f..00000000
--- a/data/scripts/gUnk_0800FCF7.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCF7
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FCF8.inc b/data/scripts/gUnk_0800FCF8.inc
deleted file mode 100644
index db7535d3..00000000
--- a/data/scripts/gUnk_0800FCF8.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCF8
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FCFA.inc b/data/scripts/gUnk_0800FCFA.inc
deleted file mode 100644
index 336031e2..00000000
--- a/data/scripts/gUnk_0800FCFA.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCFA
-.byte 0x33
diff --git a/data/scripts/gUnk_0800FCFB.inc b/data/scripts/gUnk_0800FCFB.inc
deleted file mode 100644
index 74d38000..00000000
--- a/data/scripts/gUnk_0800FCFB.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCFB
-.byte 0xc
diff --git a/data/scripts/gUnk_0800FCFC.inc b/data/scripts/gUnk_0800FCFC.inc
deleted file mode 100644
index e9bd84a0..00000000
--- a/data/scripts/gUnk_0800FCFC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCFC
-.short 0x0002
diff --git a/data/scripts/gUnk_0800FCFE.inc b/data/scripts/gUnk_0800FCFE.inc
deleted file mode 100644
index a9de73b3..00000000
--- a/data/scripts/gUnk_0800FCFE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCFE
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FCFF.inc b/data/scripts/gUnk_0800FCFF.inc
deleted file mode 100644
index 33aefa42..00000000
--- a/data/scripts/gUnk_0800FCFF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FCFF
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FD00.inc b/data/scripts/gUnk_0800FD00.inc
deleted file mode 100644
index d5a025ca..00000000
--- a/data/scripts/gUnk_0800FD00.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FD00
-.byte 0xb
diff --git a/data/scripts/gUnk_0800FD01.inc b/data/scripts/gUnk_0800FD01.inc
deleted file mode 100644
index 67d4d124..00000000
--- a/data/scripts/gUnk_0800FD01.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FD01
-.byte 0xc
-.byte 0x4d
-.byte 0x6d
diff --git a/data/scripts/gUnk_0800FD04.inc b/data/scripts/gUnk_0800FD04.inc
deleted file mode 100644
index 99de7f42..00000000
--- a/data/scripts/gUnk_0800FD04.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FD04
-.byte 0x6
diff --git a/data/scripts/gUnk_0800FD05.inc b/data/scripts/gUnk_0800FD05.inc
deleted file mode 100644
index 26d17a5f..00000000
--- a/data/scripts/gUnk_0800FD05.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800FD05
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc
index fc4feb68..fbf7f336 100644
--- a/data/scripts/gUnk_0800FD0C.inc
+++ b/data/scripts/gUnk_0800FD0C.inc
@@ -1,4 +1,41 @@
 SCRIPT_START gUnk_0800FD0C
 CheckLocalFlag 0x00cd
 JumpIf 0x003e
-.short 0x0c33
+WaitForSomething2 0x00000010
+CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
+JumpIfNot 0xfff6
+CheckLocalFlag 0x00cd
+JumpIf 0x0030
+_0807E864 
+Call 0x0807f9a5
+TextboxNoOverlapFollowPos
+.short 0x2506
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800fd80
+WaitForSomething2 0x00000008
+_0807E878 
+Jump 0xffcc
+CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+TextboxNoOverlapFollowPos
+.short 0x106c
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+StartPlayerScript 0x0800fd80
+WaitForSomething2 0x00000008
+_0807E878 
+Jump 0xffd4
+.short 0x0000
+SetEntityNonPlanarMovement 0x0080
+_0807EC64 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FD16.inc b/data/scripts/gUnk_0800FD16.inc
deleted file mode 100644
index 8bea3c87..00000000
--- a/data/scripts/gUnk_0800FD16.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800FD16
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x16
-.byte 0x10
-.byte 0xc8
-.byte 0x0
-.byte 0xc0
-.byte 0x3
-.byte 0x40
diff --git a/data/scripts/gUnk_0800FD21.inc b/data/scripts/gUnk_0800FD21.inc
deleted file mode 100644
index da112cc2..00000000
--- a/data/scripts/gUnk_0800FD21.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-SCRIPT_START gUnk_0800FD21
-.byte 0x10
-.byte 0x5
-.byte 0x8
-.byte 0xf6
-.byte 0xff
-.byte 0x12
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x30
-.byte 0x0
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0xf9
-.byte 0x7
-.byte 0x8
-.byte 0x5c
-.byte 0xc
-.byte 0x6
-.byte 0x25
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0x80
-.byte 0xfd
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xcc
-.byte 0xff
-.byte 0x16
-.byte 0x10
-.byte 0xc8
-.byte 0x0
-.byte 0xc0
-.byte 0x3
-.byte 0x40
-.byte 0x10
-.byte 0x5
-.byte 0x8
-.byte 0xf6
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0xf9
-.byte 0x7
-.byte 0x8
-.byte 0x5c
-.byte 0xc
-.byte 0x6c
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0x80
-.byte 0xfd
-.byte 0x0
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xd4
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FD80.inc b/data/scripts/gUnk_0800FD80.inc
deleted file mode 100644
index b01200e6..00000000
--- a/data/scripts/gUnk_0800FD80.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_0800FD80
-SetEntityNonPlanarMovement 0x0080
-_0807EC64 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call sub_080791BC
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc
index 2722de54..74256346 100644
--- a/data/scripts/gUnk_0800FDA0.inc
+++ b/data/scripts/gUnk_0800FDA0.inc
@@ -9,8 +9,107 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_08069888
+Call 0x08069889
 _0807EA94 
 _0807E878 
 Jump 0xffea
 .short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+SetEntityNonPlanarMovement 0x0040
+StopScript 
+Call 0x08069a61
+Call 0x0806991d
+StopScript 
+StartScript 
+Call 0x08069acd
+JumpIf 0x000c
+_0807EE30 
+JumpIfNot 0xffee
+Jump 0xffde
+StopScript 
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x003c
+Call 0x08069a3d
+Jump 0xffa8
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E9D4 
+SetEntityNonPlanarMovement 0x0040
+StopScript 
+Call 0x08069aa9
+Call 0x080699ad
+StopScript 
+StartScript 
+Call 0x08069acd
+JumpIf 0x000c
+_0807EE30 
+JumpIfNot 0xffee
+Jump 0xffde
+StopScript 
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x001e
+_0807EB44 0x0006
+_0807EF80 0x0000
+Wait 0x003c
+Call 0x08069a85
+Jump 0xffa8
+.short 0x0000
+StartScript 
+CheckInventory1 0x0012
+JumpIf 0x004a
+_0807EB44 0x0006
+_0807E9D4 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+StopScript 
+StartScript 
+_0807EF80 0x000b
+Call 0x080642b9
+CheckEntityInteractType 
+JumpIfNot 0xffee
+StopScript 
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Call 0x08064429
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffcc
+_0807EF80 0x0008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FDCC.inc b/data/scripts/gUnk_0800FDCC.inc
deleted file mode 100644
index 55fccfd9..00000000
--- a/data/scripts/gUnk_0800FDCC.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800FDCC
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-SetEntityNonPlanarMovement 0x0040
-StopScript 
-Call sub_08069A60
-Call sub_0806991C
-StopScript 
-StartScript 
diff --git a/data/scripts/gUnk_0800FDF2.inc b/data/scripts/gUnk_0800FDF2.inc
deleted file mode 100644
index afb0db10..00000000
--- a/data/scripts/gUnk_0800FDF2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FDF2
-.byte 0xb
diff --git a/data/scripts/gUnk_0800FDF3.inc b/data/scripts/gUnk_0800FDF3.inc
deleted file mode 100644
index c35fa031..00000000
--- a/data/scripts/gUnk_0800FDF3.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800FDF3
-.byte 0xc
-.byte 0xcd
-.byte 0x9a
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FDFA.inc b/data/scripts/gUnk_0800FDFA.inc
deleted file mode 100644
index d423efaf..00000000
--- a/data/scripts/gUnk_0800FDFA.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FDFA
-.short 0x000c
diff --git a/data/scripts/gUnk_0800FDFC.inc b/data/scripts/gUnk_0800FDFC.inc
deleted file mode 100644
index 44b9a2f2..00000000
--- a/data/scripts/gUnk_0800FDFC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FDFC
-_0807EE30 
diff --git a/data/scripts/gUnk_0800FDFE.inc b/data/scripts/gUnk_0800FDFE.inc
deleted file mode 100644
index 05cbc9f7..00000000
--- a/data/scripts/gUnk_0800FDFE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FDFE
-.byte 0x5
diff --git a/data/scripts/gUnk_0800FDFF.inc b/data/scripts/gUnk_0800FDFF.inc
deleted file mode 100644
index a751c61c..00000000
--- a/data/scripts/gUnk_0800FDFF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FDFF
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FE00.inc b/data/scripts/gUnk_0800FE00.inc
deleted file mode 100644
index 1e5aa79f..00000000
--- a/data/scripts/gUnk_0800FE00.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE00
-.byte 0xee
diff --git a/data/scripts/gUnk_0800FE01.inc b/data/scripts/gUnk_0800FE01.inc
deleted file mode 100644
index dc0a4b1f..00000000
--- a/data/scripts/gUnk_0800FE01.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE01
-.byte 0xff
diff --git a/data/scripts/gUnk_0800FE02.inc b/data/scripts/gUnk_0800FE02.inc
deleted file mode 100644
index b02cc101..00000000
--- a/data/scripts/gUnk_0800FE02.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE02
-.short 0x0803
diff --git a/data/scripts/gUnk_0800FE04.inc b/data/scripts/gUnk_0800FE04.inc
deleted file mode 100644
index 27f5f86a..00000000
--- a/data/scripts/gUnk_0800FE04.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE04
-.short 0xffde
diff --git a/data/scripts/gUnk_0800FE06.inc b/data/scripts/gUnk_0800FE06.inc
deleted file mode 100644
index dde1e4b5..00000000
--- a/data/scripts/gUnk_0800FE06.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE06
-.byte 0x2
diff --git a/data/scripts/gUnk_0800FE07.inc b/data/scripts/gUnk_0800FE07.inc
deleted file mode 100644
index 77deec42..00000000
--- a/data/scripts/gUnk_0800FE07.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE07
-.byte 0x4
diff --git a/data/scripts/gUnk_0800FE08.inc b/data/scripts/gUnk_0800FE08.inc
deleted file mode 100644
index 8aed1d89..00000000
--- a/data/scripts/gUnk_0800FE08.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FE08
-.byte 0x61
diff --git a/data/scripts/gUnk_0800FE09.inc b/data/scripts/gUnk_0800FE09.inc
deleted file mode 100644
index 819f3a14..00000000
--- a/data/scripts/gUnk_0800FE09.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-SCRIPT_START gUnk_0800FE09
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x3d
-.byte 0x9a
-.byte 0x6
-.byte 0x8
-.byte 0x3
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FE40.inc b/data/scripts/gUnk_0800FE40.inc
deleted file mode 100644
index 2c66c8e8..00000000
--- a/data/scripts/gUnk_0800FE40.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0800FE40
-.short 0xffa8
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FE44.inc b/data/scripts/gUnk_0800FE44.inc
deleted file mode 100644
index 3b95f478..00000000
--- a/data/scripts/gUnk_0800FE44.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0800FE44
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-SetEntityNonPlanarMovement 0x0040
-StopScript 
-Call sub_08069AA8
-.short 0x0c0b
-.short 0x99ad
diff --git a/data/scripts/gUnk_0800FE64.inc b/data/scripts/gUnk_0800FE64.inc
deleted file mode 100644
index 03f17235..00000000
--- a/data/scripts/gUnk_0800FE64.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0800FE64
-_0807E078 0x0402
-StartScript 
-Call sub_08069ACC
-JumpIf 0x000c
-_0807EE30 
-JumpIfNot 0xffee
-Jump 0xffde
-StopScript 
-_0807EB44 0x0002
-.short 0x0879
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FE88.inc b/data/scripts/gUnk_0800FE88.inc
deleted file mode 100644
index 9dfb7dbd..00000000
--- a/data/scripts/gUnk_0800FE88.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0800FE88
-Wait 0x001e
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x003c
-Call sub_08069A84
-Jump 0xffa8
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FEBC.inc b/data/scripts/gUnk_0800FEBC.inc
deleted file mode 100644
index 2596aca9..00000000
--- a/data/scripts/gUnk_0800FEBC.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_0800FEBC
-StartScript 
-CheckInventory1 0x0012
-JumpIf 0x004a
-_0807EB44 0x0006
-_0807E9D4 
-CallWithArg sub_0807F3D8, 0x00000008
-StopScript 
-StopScript 
-StartScript 
-_0807EF80 0x000b
-Call sub_080642B8
-CheckEntityInteractType 
-JumpIfNot 0xffee
-StopScript 
-_0807E864 
diff --git a/data/scripts/gUnk_0800FEF0.inc b/data/scripts/gUnk_0800FEF0.inc
deleted file mode 100644
index 94aa905f..00000000
--- a/data/scripts/gUnk_0800FEF0.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FEF0
-_0807EB74 
diff --git a/data/scripts/gUnk_0800FEF2.inc b/data/scripts/gUnk_0800FEF2.inc
deleted file mode 100644
index d625c7d9..00000000
--- a/data/scripts/gUnk_0800FEF2.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0800FEF2
-.byte 0xc
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FEF9.inc b/data/scripts/gUnk_0800FEF9.inc
deleted file mode 100644
index 1f786b7c..00000000
--- a/data/scripts/gUnk_0800FEF9.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FEF9
-.byte 0x0
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0800FEFC.inc b/data/scripts/gUnk_0800FEFC.inc
deleted file mode 100644
index b4a70e1a..00000000
--- a/data/scripts/gUnk_0800FEFC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FEFC
-.short 0x0c0b
diff --git a/data/scripts/gUnk_0800FEFE.inc b/data/scripts/gUnk_0800FEFE.inc
deleted file mode 100644
index 2a770ed0..00000000
--- a/data/scripts/gUnk_0800FEFE.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FEFE
-.byte 0x29
-.byte 0x44
-.byte 0x6
diff --git a/data/scripts/gUnk_0800FF01.inc b/data/scripts/gUnk_0800FF01.inc
deleted file mode 100644
index 01b6dc34..00000000
--- a/data/scripts/gUnk_0800FF01.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FF01
-.short 0x5908
diff --git a/data/scripts/gUnk_0800FF03.inc b/data/scripts/gUnk_0800FF03.inc
deleted file mode 100644
index 884ddfb3..00000000
--- a/data/scripts/gUnk_0800FF03.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FF03
-.byte 0x4
diff --git a/data/scripts/gUnk_0800FF04.inc b/data/scripts/gUnk_0800FF04.inc
deleted file mode 100644
index 28f5293d..00000000
--- a/data/scripts/gUnk_0800FF04.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FF04
-.byte 0x31
diff --git a/data/scripts/gUnk_0800FF05.inc b/data/scripts/gUnk_0800FF05.inc
deleted file mode 100644
index c03ba842..00000000
--- a/data/scripts/gUnk_0800FF05.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FF05
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FF06.inc b/data/scripts/gUnk_0800FF06.inc
deleted file mode 100644
index 0c5ecc22..00000000
--- a/data/scripts/gUnk_0800FF06.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FF06
-.short 0x000f
diff --git a/data/scripts/gUnk_0800FF08.inc b/data/scripts/gUnk_0800FF08.inc
deleted file mode 100644
index 854f0268..00000000
--- a/data/scripts/gUnk_0800FF08.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0800FF08
-_0807E878 
-Jump 0xffcc
-_0807EF80 0x0008
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc
index e3c6eed5..bf31cb48 100644
--- a/data/scripts/gUnk_0800FF18.inc
+++ b/data/scripts/gUnk_0800FF18.inc
@@ -4,4 +4,33 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-.short 0x140c
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+StopScript 
+StartScript 
+_0807EF80 0x000b
+Call 0x08064199
+CheckEntityInteractType 
+JumpIfNot 0xffee
+StopScript 
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Call 0x08064429
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffcc
+_0807EF80 0x0008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FF2A.inc b/data/scripts/gUnk_0800FF2A.inc
deleted file mode 100644
index 3a4ea9a8..00000000
--- a/data/scripts/gUnk_0800FF2A.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_0800FF2A
-.short 0xf3d9
-.short 0x0807
-.short 0x0008
-.short 0x0000
-.short 0x0402
-.short 0x0402
-.short 0x0401
-.short 0x0879
-.short 0x000b
-.short 0x0c0b
-.short 0x4199
-.short 0x0806
-.short 0x0418
-.short 0x0805
-.short 0xffee
-.short 0x0402
-.short 0x0443
-.short 0x0463
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0008
-.short 0x0000
-.short 0x0c0b
-.short 0x4429
-.short 0x0806
-.short 0x0459
-.short 0x0831
-.short 0x000f
-.short 0x0444
-.short 0x0803
-.short 0xffcc
-.short 0x0879
-.short 0x0008
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc
index f9826974..e990d07e 100644
--- a/data/scripts/gUnk_0800FF74.inc
+++ b/data/scripts/gUnk_0800FF74.inc
@@ -2,8 +2,13 @@ SCRIPT_START gUnk_0800FF74
 StartScript 
 _0807EB44 0x0002
 _0807E9D4 
-CallWithArg sub_0807F3D8, 0x00000008
-Call sub_080644A4
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Call 0x080644a5
 ClearLocalFlag 0x00c7
 StopScript 
 StopScript 
@@ -12,6 +17,112 @@ _0807EF80 0x000a
 CheckLocalFlag 0x00ce
 JumpIf 0x002c
 _0807EF80 0x000b
-Call sub_08064198
-.short 0x0812
-.short 0x00c7
+Call 0x08064199
+CheckLocalFlag 0x00c7
+JumpIfNot 0x001a
+Call 0x08064489
+CheckPlayerInRegion2 0x4040
+JumpIfNot 0x000c
+Call 0x08064471
+JumpIf 0x004a
+CheckEntityInteractType 
+JumpIfNot 0xffc2
+StopScript 
+SetLocalFlag 0x00c7
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+CheckInventory1 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x3401
+_0807EA94 
+Jump 0x006a
+CheckLocalFlag 0x00ce
+JumpIfNot 0x000c
+TextboxNoOverlap 0x340b
+_0807EA94 
+Jump 0x0058
+TextboxNoOverlap 0x3402
+_0807EA94 
+Jump 0x004e
+StopScript 
+_0807E888 
+Call 0x0807f595
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x00cd
+TextboxNoOverlap 0x340a
+_0807EA94 
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x000c
+.short 0x0000
+@ End of 4 parameters
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0018, 0x0108
+_0807EB44 0x0002
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+SetLocalFlag 0x00ce
+Call 0x080644a5
+CallWithArg
+.short 0xf5b1
+.short 0x0807
+.short 0x000a
+.short 0x0000
+@ End of 4 parameters
+_0807E878 
+Jump 0xff1e
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+CallWithArg
+.short 0x72b1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0x72b1
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EB44 0x0004
+CallWithArg
+.short 0x72b1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffd0
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800FFB0.inc b/data/scripts/gUnk_0800FFB0.inc
deleted file mode 100644
index da0ea75d..00000000
--- a/data/scripts/gUnk_0800FFB0.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FFB0
-JumpIfNot 0x001a
-Call sub_08064488
-.byte 0x17
diff --git a/data/scripts/gUnk_0800FFBB.inc b/data/scripts/gUnk_0800FFBB.inc
deleted file mode 100644
index 1f1d07c0..00000000
--- a/data/scripts/gUnk_0800FFBB.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SCRIPT_START gUnk_0800FFBB
-.byte 0x8
-.byte 0x40
-.byte 0x40
-.byte 0x5
-.byte 0x8
-.byte 0xc
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x71
-.byte 0x44
-.byte 0x6
-.byte 0x8
-.byte 0x4
-.byte 0x8
-.byte 0x4a
-.byte 0x0
-.byte 0x18
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xc2
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x2a
-.byte 0x8
diff --git a/data/scripts/gUnk_0800FFD6.inc b/data/scripts/gUnk_0800FFD6.inc
deleted file mode 100644
index fed76005..00000000
--- a/data/scripts/gUnk_0800FFD6.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SCRIPT_START gUnk_0800FFD6
-.short 0x00c7
-.short 0x0443
-.short 0x0463
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0008
-.short 0x0000
-.short 0x080f
-.short 0x0048
-.short 0x0804
-.short 0x000c
diff --git a/data/scripts/gUnk_0800FFEE.inc b/data/scripts/gUnk_0800FFEE.inc
deleted file mode 100644
index 70a8ec79..00000000
--- a/data/scripts/gUnk_0800FFEE.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FFEE
-TextboxNoOverlap 0x3401
-_0807EA94 
-.short 0x0803
diff --git a/data/scripts/gUnk_0800FFF6.inc b/data/scripts/gUnk_0800FFF6.inc
deleted file mode 100644
index 9a227734..00000000
--- a/data/scripts/gUnk_0800FFF6.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0800FFF6
-.short 0x006a
-.short 0x0812
-.short 0x00ce
diff --git a/data/scripts/gUnk_0800FFFC.inc b/data/scripts/gUnk_0800FFFC.inc
deleted file mode 100644
index 8d498d5f..00000000
--- a/data/scripts/gUnk_0800FFFC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FFFC
-.byte 0x5
diff --git a/data/scripts/gUnk_0800FFFD.inc b/data/scripts/gUnk_0800FFFD.inc
deleted file mode 100644
index a128975b..00000000
--- a/data/scripts/gUnk_0800FFFD.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FFFD
-.short 0x0c08
diff --git a/data/scripts/gUnk_0800FFFF.inc b/data/scripts/gUnk_0800FFFF.inc
deleted file mode 100644
index ebd79cd4..00000000
--- a/data/scripts/gUnk_0800FFFF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0800FFFF
-.byte 0x0
diff --git a/data/scripts/gUnk_08010000.inc b/data/scripts/gUnk_08010000.inc
deleted file mode 100644
index 1cd1f602..00000000
--- a/data/scripts/gUnk_08010000.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010000
-.byte 0x5b
diff --git a/data/scripts/gUnk_08010001.inc b/data/scripts/gUnk_08010001.inc
deleted file mode 100644
index cae61ada..00000000
--- a/data/scripts/gUnk_08010001.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010001
-.byte 0x8
diff --git a/data/scripts/gUnk_08010002.inc b/data/scripts/gUnk_08010002.inc
deleted file mode 100644
index c9ae46bc..00000000
--- a/data/scripts/gUnk_08010002.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010002
-.byte 0xb
diff --git a/data/scripts/gUnk_08010003.inc b/data/scripts/gUnk_08010003.inc
deleted file mode 100644
index 5d0de773..00000000
--- a/data/scripts/gUnk_08010003.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010003
-.short 0x5934
diff --git a/data/scripts/gUnk_08010005.inc b/data/scripts/gUnk_08010005.inc
deleted file mode 100644
index 8ce7e773..00000000
--- a/data/scripts/gUnk_08010005.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010005
-.short 0x0304
diff --git a/data/scripts/gUnk_08010007.inc b/data/scripts/gUnk_08010007.inc
deleted file mode 100644
index d648f0dd..00000000
--- a/data/scripts/gUnk_08010007.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010007
-.byte 0x8
diff --git a/data/scripts/gUnk_08010008.inc b/data/scripts/gUnk_08010008.inc
deleted file mode 100644
index de2257b7..00000000
--- a/data/scripts/gUnk_08010008.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010008
-.byte 0x58
diff --git a/data/scripts/gUnk_08010009.inc b/data/scripts/gUnk_08010009.inc
deleted file mode 100644
index 113ed8c9..00000000
--- a/data/scripts/gUnk_08010009.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010009
-.byte 0x0
diff --git a/data/scripts/gUnk_0801000A.inc b/data/scripts/gUnk_0801000A.inc
deleted file mode 100644
index 4080b6d6..00000000
--- a/data/scripts/gUnk_0801000A.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801000A
-.short 0x085b
diff --git a/data/scripts/gUnk_0801000C.inc b/data/scripts/gUnk_0801000C.inc
deleted file mode 100644
index 3e3efeea..00000000
--- a/data/scripts/gUnk_0801000C.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801000C
-.byte 0x2
diff --git a/data/scripts/gUnk_0801000D.inc b/data/scripts/gUnk_0801000D.inc
deleted file mode 100644
index 9c9307db..00000000
--- a/data/scripts/gUnk_0801000D.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801000D
-.byte 0x34
diff --git a/data/scripts/gUnk_0801000E.inc b/data/scripts/gUnk_0801000E.inc
deleted file mode 100644
index e9e445b3..00000000
--- a/data/scripts/gUnk_0801000E.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801000E
-.byte 0x59
diff --git a/data/scripts/gUnk_0801000F.inc b/data/scripts/gUnk_0801000F.inc
deleted file mode 100644
index 82484056..00000000
--- a/data/scripts/gUnk_0801000F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_0801000F
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0x4e
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x45
-.byte 0x4
diff --git a/data/scripts/gUnk_08010018.inc b/data/scripts/gUnk_08010018.inc
deleted file mode 100644
index d5fb7c34..00000000
--- a/data/scripts/gUnk_08010018.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08010018
-.byte 0xb
-.byte 0xc
-.byte 0x95
diff --git a/data/scripts/gUnk_0801001B.inc b/data/scripts/gUnk_0801001B.inc
deleted file mode 100644
index 071bb38c..00000000
--- a/data/scripts/gUnk_0801001B.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801001B
-.short 0x07f5
diff --git a/data/scripts/gUnk_0801001D.inc b/data/scripts/gUnk_0801001D.inc
deleted file mode 100644
index b68e92d8..00000000
--- a/data/scripts/gUnk_0801001D.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0801001D
-.short 0x4308
-.short 0x6304
-.short 0x0c04
diff --git a/data/scripts/gUnk_08010023.inc b/data/scripts/gUnk_08010023.inc
deleted file mode 100644
index e0ae33ff..00000000
--- a/data/scripts/gUnk_08010023.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_08010023
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0xa
-.byte 0x34
-.byte 0x59
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08010044.inc b/data/scripts/gUnk_08010044.inc
deleted file mode 100644
index 4fe595b5..00000000
--- a/data/scripts/gUnk_08010044.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_08010044
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0018, 0x0108
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000008
-SetLocalFlag 0x00ce
-Call sub_080644A4
-CallWithArg sub_0807F5B0, 0x0000000a
-_0807E878 
-Jump 0xff1e
-.short 0x0000
-.short 0x0401
-.short 0x0453
-.short 0x0879
-.short 0x000a
-.short 0x0861
-.short 0x0004
-.short 0x140c
-.short 0x72b1
-.short 0x0806
-.short 0x0000
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
diff --git a/data/scripts/gUnk_08010098.inc b/data/scripts/gUnk_08010098.inc
deleted file mode 100644
index d7fcc70d..00000000
--- a/data/scripts/gUnk_08010098.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010098
-.byte 0x63
diff --git a/data/scripts/gUnk_08010099.inc b/data/scripts/gUnk_08010099.inc
deleted file mode 100644
index 5ce5f5be..00000000
--- a/data/scripts/gUnk_08010099.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_08010099
-.short 0x0c04
-.short 0xb114
-.short 0x0672
-.short 0x0408
-.short 0x0000
-.short 0x5a00
-.short 0x0108
-.short 0x590a
-.short 0x3104
-.short 0x0f08
-.short 0x4400
-.short 0x6104
-.short 0x0408
-.short 0x0c00
-.short 0xb114
-.short 0x0672
-.short 0x0008
-.short 0x0000
-.short 0x0300
-.short 0xd008
diff --git a/data/scripts/gUnk_080100C1.inc b/data/scripts/gUnk_080100C1.inc
deleted file mode 100644
index 9f9977f0..00000000
--- a/data/scripts/gUnk_080100C1.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_080100C1
-.byte 0xff
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc
index b9bce9cf..186fda84 100644
--- a/data/scripts/gUnk_080100C8.inc
+++ b/data/scripts/gUnk_080100C8.inc
@@ -1,14 +1,132 @@
 SCRIPT_START gUnk_080100C8
 StartScript 
-Call sub_08061FE4
-Call sub_08061E70
+Call 0x08061fe5
+Call 0x08061e71
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_08061FE4
-Call sub_08062048
+Call 0x08061fe5
+Call 0x08062049
 _0807EA94 
-.byte 0x44
+_0807E878 
+Jump 0xffe4
+.short 0x0000
+StartScript 
+Call 0x08061fe5
+Call 0x08061e71
+_0807EF80 0x000a
+StopScript 
+Wait 0x003c
+Call 0x08061e91
+Jump 0xfff4
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x4f22
+_0807EA94 
+_0807E878 
+Jump 0xffec
+StartScript 
+_0807EF80 0x0001
+Call 0x0806c355
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CheckRoomFlag 0x0001
+JumpIf 0x0034
+TextboxNoOverlapFollowPos
+.short 0x3001
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x002e
+Call 0x080a1609
+_0807EA94 
+_0807E878 
+CallWithArg
+.short 0x1551
+.short 0x080a
+.short 0x01ac
+.short 0x0801
+@ End of 4 parameters
+JumpIfNot 0xffca
+SoundReq2 0x0015
+SetRoomFlag 0x0001
+Jump 0xffbe
+Call 0x080a1609
+_0807EA94 
+_0807E878 
+Jump 0xffb0
+StartScript 
+_0807EF80 0x0008
+Call 0x080a1649
+StopScript 
+Call 0x080a1271
+_0807E864 
+Call 0x0807df29
+TextboxNoOverlapFollowPos
+.short 0x3004
+.short 0x0007
+@ End of 2 parameters
+_0807EA94 
+SoundReq0x80100000 
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+CallWithArg
+.short 0xf75d
+.short 0x0807
+.short 0x0378
+.short 0x0340
+@ End of 4 parameters
+Call 0x080791bd
+Call 0x0807fb75
+_0807E8E4_1 
+Call 0x0807f169
+Call 0x080a1389
+Call 0x0806ec39
+StartScript 
+MoveEntityToPlayer 
+Call 0x0807f845
+CameraTargetPlayer 
+StopScript 
+_0807E778 0x0004
+DoFade4 
+WaitFor_2 
+SoundReq2 0xffff
+Call 0x080a13b5
+_0807EA94 
+JumpIfNot 0x0018
+Call 0x080a13e9
+WaitPlayerAction8 
+Call 0x080a1461
+_0807EA94 
+Call 0x080a14a9
+Call 0x0807df51
+_0807E878 
+CallWithArg
+.short 0xf5b1
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+ClearRoomFlag 0x0001
+Call 0x080a169d
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080100F5.inc b/data/scripts/gUnk_080100F5.inc
deleted file mode 100644
index 8a8ad5fa..00000000
--- a/data/scripts/gUnk_080100F5.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_080100F5
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xe4
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_080100FC.inc b/data/scripts/gUnk_080100FC.inc
deleted file mode 100644
index 291eb908..00000000
--- a/data/scripts/gUnk_080100FC.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080100FC
-StartScript 
diff --git a/data/scripts/gUnk_080100FE.inc b/data/scripts/gUnk_080100FE.inc
deleted file mode 100644
index 1712947c..00000000
--- a/data/scripts/gUnk_080100FE.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080100FE
-.byte 0xb
diff --git a/data/scripts/gUnk_080100FF.inc b/data/scripts/gUnk_080100FF.inc
deleted file mode 100644
index 0f7d435c..00000000
--- a/data/scripts/gUnk_080100FF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080100FF
-.byte 0xc
diff --git a/data/scripts/gUnk_08010100.inc b/data/scripts/gUnk_08010100.inc
deleted file mode 100644
index d03a986a..00000000
--- a/data/scripts/gUnk_08010100.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010100
-.short 0x1fe5
diff --git a/data/scripts/gUnk_08010102.inc b/data/scripts/gUnk_08010102.inc
deleted file mode 100644
index 5994ce71..00000000
--- a/data/scripts/gUnk_08010102.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010102
-.byte 0x6
diff --git a/data/scripts/gUnk_08010103.inc b/data/scripts/gUnk_08010103.inc
deleted file mode 100644
index 6cf4510d..00000000
--- a/data/scripts/gUnk_08010103.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010103
-.short 0x0b08
diff --git a/data/scripts/gUnk_08010105.inc b/data/scripts/gUnk_08010105.inc
deleted file mode 100644
index d8139a83..00000000
--- a/data/scripts/gUnk_08010105.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010105
-.byte 0xc
diff --git a/data/scripts/gUnk_08010106.inc b/data/scripts/gUnk_08010106.inc
deleted file mode 100644
index 2f861ad9..00000000
--- a/data/scripts/gUnk_08010106.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_08010106
-.short 0x1e71
-.short 0x0806
diff --git a/data/scripts/gUnk_0801010A.inc b/data/scripts/gUnk_0801010A.inc
deleted file mode 100644
index 5143a001..00000000
--- a/data/scripts/gUnk_0801010A.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_0801010A
-_0807EF80 0x000a
-StopScript 
-.byte 0x31
diff --git a/data/scripts/gUnk_08010111.inc b/data/scripts/gUnk_08010111.inc
deleted file mode 100644
index 4f897f7a..00000000
--- a/data/scripts/gUnk_08010111.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08010111
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x91
-.byte 0x1e
-.byte 0x6
-.byte 0x8
-.byte 0x3
-.byte 0x8
-.byte 0xf4
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08010120.inc b/data/scripts/gUnk_08010120.inc
deleted file mode 100644
index b1bb210e..00000000
--- a/data/scripts/gUnk_08010120.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_08010120
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-.short 0x0879
-.short 0x000a
diff --git a/data/scripts/gUnk_08010130.inc b/data/scripts/gUnk_08010130.inc
deleted file mode 100644
index b3348e00..00000000
--- a/data/scripts/gUnk_08010130.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_08010130
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x4f22
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffec
diff --git a/data/scripts/gUnk_08010148.inc b/data/scripts/gUnk_08010148.inc
deleted file mode 100644
index 79a7781f..00000000
--- a/data/scripts/gUnk_08010148.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-SCRIPT_START gUnk_08010148
-StartScript 
-_0807EF80 0x0001
-Call sub_0806C354
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CheckRoomFlag 0x0001
-JumpIf 0x0034
-TextboxNoOverlapFollowPos 0x3001, 0x0000
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x002e
-Call sub_080A1608
-_0807EA94 
-_0807E878 
-CallWithArg sub_080A1550, 0x080101ac
-JumpIfNot 0xffca
-SoundReq2 0x0015
-SetRoomFlag 0x0001
-Jump 0xffbe
-Call sub_080A1608
-_0807EA94 
-_0807E878 
-Jump 0xffb0
-StartScript 
-_0807EF80 0x0008
-Call sub_080A1648
-StopScript 
-Call sub_080A1270
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x3004, 0x0007
-_0807EA94 
-SoundReq0x80100000 
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-CallWithArg sub_0807F75C, 0x03400378
-Call sub_080791BC
-Call sub_0807FB74
-_0807E8E4_1 
-Call sub_0807F168
-.short 0x0c0b
diff --git a/data/scripts/gUnk_080101FA.inc b/data/scripts/gUnk_080101FA.inc
deleted file mode 100644
index dd309431..00000000
--- a/data/scripts/gUnk_080101FA.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_080101FA
-.byte 0x89
-.byte 0x13
-.byte 0xa
diff --git a/data/scripts/gUnk_080101FD.inc b/data/scripts/gUnk_080101FD.inc
deleted file mode 100644
index 779edf8a..00000000
--- a/data/scripts/gUnk_080101FD.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080101FD
-.short 0x0b08
diff --git a/data/scripts/gUnk_080101FF.inc b/data/scripts/gUnk_080101FF.inc
deleted file mode 100644
index efb3de9c..00000000
--- a/data/scripts/gUnk_080101FF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080101FF
-.byte 0xc
diff --git a/data/scripts/gUnk_08010200.inc b/data/scripts/gUnk_08010200.inc
deleted file mode 100644
index d148e2b0..00000000
--- a/data/scripts/gUnk_08010200.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08010200
-.byte 0x39
-.byte 0xec
-.byte 0x6
diff --git a/data/scripts/gUnk_08010203.inc b/data/scripts/gUnk_08010203.inc
deleted file mode 100644
index 0e68e4d1..00000000
--- a/data/scripts/gUnk_08010203.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_08010203
-.short 0x0108
-.short 0x6b04
diff --git a/data/scripts/gUnk_08010207.inc b/data/scripts/gUnk_08010207.inc
deleted file mode 100644
index a4f46d80..00000000
--- a/data/scripts/gUnk_08010207.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010207
-.byte 0x4
diff --git a/data/scripts/gUnk_08010208.inc b/data/scripts/gUnk_08010208.inc
deleted file mode 100644
index 84630568..00000000
--- a/data/scripts/gUnk_08010208.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_08010208
-.short 0x0c0b
-.short 0xf845
diff --git a/data/scripts/gUnk_0801020C.inc b/data/scripts/gUnk_0801020C.inc
deleted file mode 100644
index 7eab1e47..00000000
--- a/data/scripts/gUnk_0801020C.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_0801020C
-.short 0x0807
-.short 0x0488
-.short 0x0402
-.short 0x0838
-.short 0x0004
-.short 0x043c
-.short 0x0437
-.short 0x087c
-.short 0xffff
-.short 0x0c0b
diff --git a/data/scripts/gUnk_08010220.inc b/data/scripts/gUnk_08010220.inc
deleted file mode 100644
index ac8d2032..00000000
--- a/data/scripts/gUnk_08010220.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08010220
-.short 0x13b5
-.short 0x080a
-.short 0x0459
-.short 0x0805
-.short 0x0018
-.short 0x0c0b
-.short 0x13e9
-.short 0x080a
-.short 0x0434
-.short 0x0c0b
-.short 0x1461
diff --git a/data/scripts/gUnk_08010236.inc b/data/scripts/gUnk_08010236.inc
deleted file mode 100644
index 9e8ddc21..00000000
--- a/data/scripts/gUnk_08010236.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_08010236
-.short 0x080a
-.short 0x0459
-.short 0x0c0b
-.short 0x14a9
-.short 0x080a
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x140c
-.short 0xf5b1
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0830
-.short 0x0001
-.short 0x0c0b
-.short 0x169d
-.short 0x080a
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc
index c935ed9d..60243475 100644
--- a/data/scripts/gUnk_08010264.inc
+++ b/data/scripts/gUnk_08010264.inc
@@ -10,8 +10,551 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_08065F64
+Call 0x08065f65
 _0807EA94 
 _0807E878 
 Jump 0xffea
 .short 0x0000
+StartScript 
+_0807EF80 0x0000
+Call 0x08062a49
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+CheckRoomFlag 0x0009
+JumpIfNot 0x001a
+_0807E864 
+_0807EB74 
+Call 0x0806265d
+_0807EA94 
+_0807E878 
+Call 0x08062501
+Jump 0xffdc
+_0807E864 
+_0807EB74 
+Call 0x0806265d
+_0807EA94 
+_0807E878 
+Jump 0xffca
+.short 0x0000
+StartScript 
+_0807EF80 0x0000
+Call 0x08062a49
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806265d
+_0807EA94 
+_0807E878 
+Jump 0xffea
+.short 0x0000
+StartScript 
+_0807EF80 0x0000
+StopScript 
+StopScript 
+Call 0x08062699
+Call 0x080626ad
+CallWithArg
+.short 0xf0ed
+.short 0x0807
+.short 0x0009
+.short 0x0000
+@ End of 4 parameters
+_0807E078
+.short 0x0012
+.short 0x001a
+.short 0x0022
+.short 0x002a
+.short 0x0032
+.short 0x003a
+.short 0x0042
+.short 0x004a
+.short 0x0052
+@ End of 9 parameters
+_0807EE04 0x0358, 0x0078
+Jump 0x004e
+_0807EE04 0x0390, 0x0078
+Jump 0x0044
+_0807EE04 0x03c8, 0x0078
+Jump 0x003a
+_0807EE04 0x0358, 0x0098
+Jump 0x0030
+_0807EE04 0x0390, 0x0098
+Jump 0x0026
+_0807EE04 0x03c8, 0x0098
+Jump 0x001c
+_0807EE04 0x0358, 0x00b8
+Jump 0x0012
+_0807EE04 0x0390, 0x00b8
+Jump 0x0008
+_0807EE04 0x03c8, 0x00b8
+StopScript 
+StartScript 
+Call 0x080626c1
+JumpIf 0xff72
+_0807EE30 
+JumpIfNot 0xffee
+Jump 0xff68
+.short 0x0000
+StartScript 
+_0807EF80 0x0000
+Call 0x08062a49
+_0807EF80 0x000a
+StopScript 
+Wait 0x001e
+Call 0x08062949
+Jump 0xfff4
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+Wait 0x003c
+Call 0x0806407d
+Jump 0xfff4
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08064429
+_0807EA94 
+_0807E878 
+Jump 0xffea
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807E914 0x08064689
+Call 0x08064645
+StopScript 
+Wait 0x003c
+Call 0x080646a5
+Jump 0xfff4
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+Call 0x080636f5
+_0807EF80 0x000a
+Call 0x0807f349
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x080636d9
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffd2
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+Call 0x08063cad
+_0807EF80 0x000a
+Call 0x0807f349
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x08063c91
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffd2
+StartScript 
+_0807EB44 0x0004
+_0807E930 0x0000
+_0807EF80 0x000a
+Call 0x0807f349
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0807df29
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+CheckRoomFlag 0x000e
+JumpIf 0x000c
+SetRoomFlag 0x000e
+TextboxNoOverlap 0x2b10
+_0807EA94 
+Call 0x080634e5
+_0807E078
+.short 0x000e
+.short 0x0020
+.short 0x0036
+.short 0x0034
+.short 0x000e
+.short 0x0024
+.short 0x002e
+@ End of 7 parameters
+TextboxNoOverlap 0x2b0d
+Jump 0x0096
+CheckGlobalFlag 0x003d
+JumpIfNot 0x008a
+Jump 0x001a
+CheckGlobalFlag 0x003c
+JumpIfNot 0x007e
+Jump 0x000e
+CheckGlobalFlag 0x003b
+JumpIfNot 0x0072
+Jump 0x0002
+Call 0x080634ed
+CallWithArg
+.short 0xf78d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x005a
+CallWithArg
+.short 0xf7c5
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+JumpIfNot 0x0030
+_0807E48C 0x0020
+JumpIfNot 0x0030
+Call 0x08063505
+JumpIf 0x002e
+TextboxNoOverlap 0x2b07
+_0807EA94 
+CallWithArg
+.short 0xf801
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+WaitPlayerAction8 
+_0807EA94 
+TextboxNoOverlap 0x2b0c
+Jump 0x001e
+TextboxNoOverlap 0x2b09
+Jump 0x0016
+TextboxNoOverlap 0x2b0a
+Jump 0x000e
+TextboxNoOverlap 0x2b0b
+Jump 0x0006
+TextboxNoOverlap 0x2b0e
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xff16
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+Jump 0xffe8
+StartScript 
+_0807E930 0x0008
+Call 0x08062a49
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0806265d
+_0807EA94 
+_0807E878 
+Jump 0xffec
+StartScript 
+_0807E930 0x0009
+Jump 0xffd6
+.short 0x0000
+StartScript 
+_0807E930 0x000b
+Jump 0xffca
+.short 0x0000
+StartScript 
+_0807E930 0x000c
+Jump 0xffbe
+.short 0x0000
+StartScript 
+_0807E930 0x000d
+Jump 0xffb2
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+HasRoomItemForSale 
+Call 0x0807f77d
+_0807EAF0
+.short 0x3c08
+.short 0x3c09
+@ End of 2 parameters
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+Jump 0xffde
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0807f2d5
+_0807EF80 0x0000
+HasRoomItemForSale 
+JumpIf 0x000a
+TextboxNoOverlap 0x3c07
+Jump 0x0048
+Call 0x08062eb9
+CallWithArg
+.short 0xf78d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0030
+_0807EA94 
+BuyItem 0x0000, 0x0000
+JumpIf 0x000a
+TextboxNoOverlap 0x3c04
+Jump 0x001c
+WaitPlayerAction8 
+ModHealth 0x0008
+Call 0x08062edd
+JumpIf 0x000a
+TextboxNoOverlap 0x3c06
+Jump 0x0004
+WaitPlayerAction8 
+_0807EA94 
+_0807E878 
+_0807EF80 0x0001
+Jump 0xff8e
+.short 0x0000
+StartScript 
+_0807EF80 0x0007
+_0807E9D4 
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E930 0x0004
+StartScript 
+Call 0x08062d19
+JumpIfNot 0x002a
+StopScript 
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0020
+HasRupees 0x00c8
+JumpIf 0x000a
+TextboxNoOverlap 0x4008
+Jump 0x0010
+ModRupees 0xff38
+Call 0x08062e15
+TextboxNoOverlap 0x4007
+StopScript 
+_0807EA94 
+_0807E878 
+_0807E930 0x0008
+Jump 0xffb4
+StartScript 
+_0807EF80 0x0007
+_0807E9D4 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0807f2d5
+_0807EF80 0x0001
+Call 0x08062cbd
+_0807EA94 
+_0807E878 
+_0807EF80 0x0000
+Jump 0xffde
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807E9D4 
+Call 0x0807f349
+Call 0x08069685
+StopScript 
+StopScript 
+StartScript 
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0xfff6
+Call 0x080696b1
+StopScript 
+StartScript 
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0xffe4
+HasRoomItemForSale 
+JumpIf 0x004c
+CheckEntityInteractType 
+JumpIfNot 0xffea
+StopScript 
+_0807E864 
+Call 0x0807df29
+_0807EB74 
+CheckGlobalFlag 0x0042
+JumpIfNot 0x002a
+CheckGlobalFlag 0x0043
+JumpIfNot 0x0022
+CheckGlobalFlag 0x0044
+JumpIfNot 0x001a
+CheckGlobalFlag 0x0041
+JumpIfNot 0x000a
+TextboxNoOverlap 0x3f39
+Jump 0x006c
+TextboxNoOverlap 0x2c1b
+Jump 0x0064
+TextboxNoOverlap 0x2c1a
+Jump 0x005c
+StopScript 
+_0807E864 
+Call 0x0807df39
+_0807EB74 
+Call 0x08069661
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x003a
+Call 0x08069719
+JumpIfNot 0x0030
+WaitPlayerAction8 
+_0807EA94 
+_0807EB8C 
+CheckGlobalFlag 0x0042
+JumpIfNot 0x001a
+CheckGlobalFlag 0x0043
+JumpIfNot 0x0012
+CheckGlobalFlag 0x0044
+JumpIfNot 0x000a
+TextboxNoOverlap 0x2c21
+Jump 0x000a
+SetLocalFlag 0x00fa
+TextboxNoOverlap 0x2c20
+_0807EA94 
+Call 0x0807f83d
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xff36
+CheckPlayerInRegion2 0x0808
+JumpIfNot 0xfffa
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x080109f0
+WaitForSomething2 0x00000001
+CheckRoomFlag 0x0001
+JumpIf 0x0008
+_0807EB28 0x0b63
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xffc6
+StartScript 
+_0807EF80 0x0007
+CheckKinstoneFused 0x001b
+JumpIf 0xe67a
+StopScript 
+Call 0x080869a5
+JumpIfNot 0xfff8
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+CheckRoomFlag 0x0001
+JumpIf 0x0008
+_0807EB28 0x0b62
+_0807EA94 
+StartPlayerScript 0x080109f0
+WaitForSomething2 0x00000001
+Call 0x0807df51
+_0807E878 
+Jump 0xffc4
+Call 0x0808692d
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010294.inc b/data/scripts/gUnk_08010294.inc
deleted file mode 100644
index bc2727c2..00000000
--- a/data/scripts/gUnk_08010294.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_08010294
-StartScript 
-_0807EF80 0x0000
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-CheckRoomFlag 0x0009
-JumpIfNot 0x001a
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-Call sub_08062500
-Jump 0xffdc
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-Jump 0xffca
-.short 0x0000
diff --git a/data/scripts/gUnk_080102E0.inc b/data/scripts/gUnk_080102E0.inc
deleted file mode 100644
index 2e9f2ea3..00000000
--- a/data/scripts/gUnk_080102E0.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_080102E0
-StartScript 
-_0807EF80 0x0000
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-.byte 0x63
diff --git a/data/scripts/gUnk_080102FB.inc b/data/scripts/gUnk_080102FB.inc
deleted file mode 100644
index 2b492607..00000000
--- a/data/scripts/gUnk_080102FB.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080102FB
-.short 0x0b04
diff --git a/data/scripts/gUnk_080102FD.inc b/data/scripts/gUnk_080102FD.inc
deleted file mode 100644
index 87eb5162..00000000
--- a/data/scripts/gUnk_080102FD.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080102FD
-.byte 0xc
diff --git a/data/scripts/gUnk_080102FE.inc b/data/scripts/gUnk_080102FE.inc
deleted file mode 100644
index 1a1206d9..00000000
--- a/data/scripts/gUnk_080102FE.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_080102FE
-.byte 0x5d
-.byte 0x26
-.byte 0x6
-.byte 0x8
-.byte 0x59
diff --git a/data/scripts/gUnk_08010303.inc b/data/scripts/gUnk_08010303.inc
deleted file mode 100644
index ebe7d11d..00000000
--- a/data/scripts/gUnk_08010303.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010303
-.byte 0x4
diff --git a/data/scripts/gUnk_08010304.inc b/data/scripts/gUnk_08010304.inc
deleted file mode 100644
index ca26c485..00000000
--- a/data/scripts/gUnk_08010304.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010304
-.byte 0x44
diff --git a/data/scripts/gUnk_08010305.inc b/data/scripts/gUnk_08010305.inc
deleted file mode 100644
index f30a6549..00000000
--- a/data/scripts/gUnk_08010305.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08010305
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xea
-.byte 0xff
diff --git a/data/scripts/gUnk_0801030A.inc b/data/scripts/gUnk_0801030A.inc
deleted file mode 100644
index 8a6e1943..00000000
--- a/data/scripts/gUnk_0801030A.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801030A
-.short 0x0000
diff --git a/data/scripts/gUnk_0801030C.inc b/data/scripts/gUnk_0801030C.inc
deleted file mode 100644
index 73c73cc4..00000000
--- a/data/scripts/gUnk_0801030C.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0801030C
-StartScript 
-_0807EF80 0x0000
-StopScript 
-StopScript 
-Call sub_08062698
-.short 0x0c0b
-.short 0x26ad
diff --git a/data/scripts/gUnk_08010320.inc b/data/scripts/gUnk_08010320.inc
deleted file mode 100644
index a6d079e5..00000000
--- a/data/scripts/gUnk_08010320.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-SCRIPT_START gUnk_08010320
-_0807E078 0x140c
-.short 0xf0ed
-.short 0x0807
-.short 0x0009
-.short 0x0000
-.short 0x2806
-.short 0x0012
-.short 0x001a
-.short 0x0022
-.short 0x002a
-.short 0x0032
-.short 0x003a
-.short 0x0042
-.short 0x004a
-.short 0x0052
-.short 0x0c74
-.short 0x0358
-.short 0x0078
-.short 0x0803
-.short 0x004e
-.short 0x0c74
-.short 0x0390
-.short 0x0078
-.short 0x0803
-.short 0x0044
-.short 0x0c74
-.short 0x03c8
-.short 0x0078
-.short 0x0803
-.short 0x003a
-.short 0x0c74
-.short 0x0358
-.short 0x0098
-.short 0x0803
-.short 0x0030
-.short 0x0c74
-.short 0x0390
-.short 0x0098
-.short 0x0803
-.short 0x0026
-.short 0x0c74
-.short 0x03c8
-.short 0x0098
-.short 0x0803
-.short 0x001c
-.short 0x0c74
-.short 0x0358
-.short 0x00b8
-.short 0x0803
-.short 0x0012
-.short 0x0c74
-.short 0x0390
-.short 0x00b8
-.short 0x0803
-.short 0x0008
-.short 0x0c74
-.short 0x03c8
-.short 0x00b8
-.short 0x0402
-.short 0x0401
-.short 0x0c0b
-.short 0x26c1
-.short 0x0806
-.short 0x0804
-.short 0xff72
-.short 0x0475
-.short 0x0805
-.short 0xffee
-.short 0x0803
-.short 0xff68
-.short 0x0000
diff --git a/data/scripts/gUnk_080103B0.inc b/data/scripts/gUnk_080103B0.inc
deleted file mode 100644
index 3452e41c..00000000
--- a/data/scripts/gUnk_080103B0.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_080103B0
-StartScript 
-_0807EF80 0x0000
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-Wait 0x001e
-Call sub_08062948
-.short 0x0803
-.short 0xfff4
diff --git a/data/scripts/gUnk_080103D0.inc b/data/scripts/gUnk_080103D0.inc
deleted file mode 100644
index 52d533b3..00000000
--- a/data/scripts/gUnk_080103D0.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_080103D0
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000004
-StopScript 
-Wait 0x003c
-Call sub_0806407C
-Jump 0xfff4
-.short 0x0000
diff --git a/data/scripts/gUnk_080103F8.inc b/data/scripts/gUnk_080103F8.inc
deleted file mode 100644
index 1c37a174..00000000
--- a/data/scripts/gUnk_080103F8.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_080103F8
-StartScript 
-_0807E9D4 
-.byte 0x61
diff --git a/data/scripts/gUnk_080103FD.inc b/data/scripts/gUnk_080103FD.inc
deleted file mode 100644
index 373fdd74..00000000
--- a/data/scripts/gUnk_080103FD.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_080103FD
-.byte 0x8
-.byte 0x4
-.byte 0x0
diff --git a/data/scripts/gUnk_08010400.inc b/data/scripts/gUnk_08010400.inc
deleted file mode 100644
index c179786a..00000000
--- a/data/scripts/gUnk_08010400.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_08010400
-_0807EF80 0x000a
-.short 0x140c
diff --git a/data/scripts/gUnk_08010406.inc b/data/scripts/gUnk_08010406.inc
deleted file mode 100644
index c6bc0a11..00000000
--- a/data/scripts/gUnk_08010406.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010406
-.byte 0xd9
diff --git a/data/scripts/gUnk_08010407.inc b/data/scripts/gUnk_08010407.inc
deleted file mode 100644
index 94b10c62..00000000
--- a/data/scripts/gUnk_08010407.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08010407
-.byte 0xf3
-.byte 0x7
-.byte 0x8
diff --git a/data/scripts/gUnk_0801040A.inc b/data/scripts/gUnk_0801040A.inc
deleted file mode 100644
index ec8fcf81..00000000
--- a/data/scripts/gUnk_0801040A.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_0801040A
-.short 0x0000
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
-.short 0x0463
-.short 0x0c0b
-.short 0x4429
-.short 0x0806
-.short 0x0459
-.short 0x0444
-.short 0x0803
-.short 0xffea
diff --git a/data/scripts/gUnk_08010428.inc b/data/scripts/gUnk_08010428.inc
deleted file mode 100644
index 7af9206e..00000000
--- a/data/scripts/gUnk_08010428.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SCRIPT_START gUnk_08010428
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E914 0x08064689
-Call sub_08064644
-StopScript 
-Wait 0x003c
-Call sub_080646A4
-.short 0x0803
-.short 0xfff4
diff --git a/data/scripts/gUnk_08010454.inc b/data/scripts/gUnk_08010454.inc
deleted file mode 100644
index 49c46b95..00000000
--- a/data/scripts/gUnk_08010454.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_08010454
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-Call sub_080636F4
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
diff --git a/data/scripts/gUnk_08010480.inc b/data/scripts/gUnk_08010480.inc
deleted file mode 100644
index b658751a..00000000
--- a/data/scripts/gUnk_08010480.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08010480
-.short 0x0004
-.short 0x0000
-.short 0x0c0b
-.short 0x36d9
-.short 0x0806
-.short 0x0459
-.short 0x0831
-.short 0x000f
-.short 0x0444
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0803
-.short 0xffd2
diff --git a/data/scripts/gUnk_080104A0.inc b/data/scripts/gUnk_080104A0.inc
deleted file mode 100644
index 76258d60..00000000
--- a/data/scripts/gUnk_080104A0.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SCRIPT_START gUnk_080104A0
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-Call sub_08063CAC
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-Call sub_08063C90
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000000
-.short 0x0803
-.short 0xffd2
diff --git a/data/scripts/gUnk_080104EC.inc b/data/scripts/gUnk_080104EC.inc
deleted file mode 100644
index c719c1f6..00000000
--- a/data/scripts/gUnk_080104EC.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_080104EC
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807EF80 0x000a
-.byte 0xb
-.byte 0xc
-.byte 0x49
-.byte 0xf3
-.byte 0x7
diff --git a/data/scripts/gUnk_080104FF.inc b/data/scripts/gUnk_080104FF.inc
deleted file mode 100644
index 15db1023..00000000
--- a/data/scripts/gUnk_080104FF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080104FF
-.short 0x0208
diff --git a/data/scripts/gUnk_08010501.inc b/data/scripts/gUnk_08010501.inc
deleted file mode 100644
index 2611c18f..00000000
--- a/data/scripts/gUnk_08010501.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010501
-.byte 0x4
diff --git a/data/scripts/gUnk_08010502.inc b/data/scripts/gUnk_08010502.inc
deleted file mode 100644
index c73cb139..00000000
--- a/data/scripts/gUnk_08010502.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010502
-.byte 0x18
diff --git a/data/scripts/gUnk_08010503.inc b/data/scripts/gUnk_08010503.inc
deleted file mode 100644
index cb2d8df5..00000000
--- a/data/scripts/gUnk_08010503.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_08010503
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0xfc
-.byte 0xff
-.byte 0x43
-.byte 0x4
diff --git a/data/scripts/gUnk_0801050A.inc b/data/scripts/gUnk_0801050A.inc
deleted file mode 100644
index 258ea077..00000000
--- a/data/scripts/gUnk_0801050A.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801050A
-.byte 0xb
diff --git a/data/scripts/gUnk_0801050B.inc b/data/scripts/gUnk_0801050B.inc
deleted file mode 100644
index 11a8536a..00000000
--- a/data/scripts/gUnk_0801050B.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SCRIPT_START gUnk_0801050B
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x63
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0xd9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x15
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0xc
-.byte 0x0
-.byte 0x2f
-.byte 0x8
diff --git a/data/scripts/gUnk_08010526.inc b/data/scripts/gUnk_08010526.inc
deleted file mode 100644
index a24869fe..00000000
--- a/data/scripts/gUnk_08010526.inc
+++ /dev/null
@@ -1,122 +0,0 @@
-SCRIPT_START gUnk_08010526
-.byte 0xe
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x10
-.byte 0x2b
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xe5
-.byte 0x34
-.byte 0x6
-.byte 0x8
-.byte 0x6
-.byte 0x20
-.byte 0xe
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x36
-.byte 0x0
-.byte 0x34
-.byte 0x0
-.byte 0xe
-.byte 0x0
-.byte 0x24
-.byte 0x0
-.byte 0x2e
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0xd
-.byte 0x2b
-.byte 0x3
-.byte 0x8
-.byte 0x96
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x3d
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x8a
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x1a
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x7e
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x3b
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x72
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xed
-.byte 0x34
-.byte 0x6
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x8d
-.byte 0xf7
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x1c
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x5a
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0xc5
-.byte 0xf7
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x30
-.byte 0x0
-.byte 0x1f
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x30
-.byte 0x0
-.byte 0xb
diff --git a/data/scripts/gUnk_0801059F.inc b/data/scripts/gUnk_0801059F.inc
deleted file mode 100644
index 79a5f085..00000000
--- a/data/scripts/gUnk_0801059F.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_0801059F
-.short 0x050c
-.short 0x0635
-.short 0x0408
-.short 0x2e08
-.short 0x5b00
-.short 0x0708
-.short 0x592b
-.short 0x0c04
-.short 0x0114
-.short 0x07f8
-.short 0x0008
-.short 0x0000
-.short 0x3400
-.short 0x5904
-.short 0x5b04
-.short 0x0c08
-.short 0x032b
-.short 0x1e08
-.short 0x5b00
-.short 0x0908
-.short 0x032b
diff --git a/data/scripts/gUnk_080105C9.inc b/data/scripts/gUnk_080105C9.inc
deleted file mode 100644
index 72741aeb..00000000
--- a/data/scripts/gUnk_080105C9.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_080105C9
-.short 0x1608
-.short 0x5b00
-.short 0x0a08
-.short 0x032b
-.short 0x0e08
-.short 0x5b00
-.short 0x0b08
-.short 0x032b
-.short 0x0608
-.short 0x5b00
-.short 0x0e08
-.short 0x592b
-.short 0x0b04
-.short 0x510c
-.short 0x07df
-.short 0x4408
-.short 0x0304
-.short 0x1608
-.short 0x00ff
-.short 0x0100
-.short 0x5304
-.short 0x7904
-.short 0x0a08
-.short 0x6100
-.short 0x0408
diff --git a/data/scripts/gUnk_080105FB.inc b/data/scripts/gUnk_080105FB.inc
deleted file mode 100644
index 44ee5099..00000000
--- a/data/scripts/gUnk_080105FB.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_080105FB
-.short 0x7900
-.short 0x0008
diff --git a/data/scripts/gUnk_080105FF.inc b/data/scripts/gUnk_080105FF.inc
deleted file mode 100644
index bb4e73f1..00000000
--- a/data/scripts/gUnk_080105FF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_080105FF
-.byte 0x0
diff --git a/data/scripts/gUnk_08010600.inc b/data/scripts/gUnk_08010600.inc
deleted file mode 100644
index 7ad3a139..00000000
--- a/data/scripts/gUnk_08010600.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_08010600
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
diff --git a/data/scripts/gUnk_0801060A.inc b/data/scripts/gUnk_0801060A.inc
deleted file mode 100644
index 3290a296..00000000
--- a/data/scripts/gUnk_0801060A.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0801060A
-_0807EB74 
-.byte 0x5a
diff --git a/data/scripts/gUnk_0801060D.inc b/data/scripts/gUnk_0801060D.inc
deleted file mode 100644
index 23014324..00000000
--- a/data/scripts/gUnk_0801060D.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0801060D
-.short 0x0108
-.short 0x590a
-.short 0x4404
-.short 0x6104
-.short 0x0408
diff --git a/data/scripts/gUnk_08010617.inc b/data/scripts/gUnk_08010617.inc
deleted file mode 100644
index 16e00132..00000000
--- a/data/scripts/gUnk_08010617.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08010617
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0xe8
-.byte 0xff
diff --git a/data/scripts/gUnk_0801061C.inc b/data/scripts/gUnk_0801061C.inc
deleted file mode 100644
index 2a98dd79..00000000
--- a/data/scripts/gUnk_0801061C.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_0801061C
-StartScript 
-_0807E930 0x0008
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffec
diff --git a/data/scripts/gUnk_08010644.inc b/data/scripts/gUnk_08010644.inc
deleted file mode 100644
index 122663b5..00000000
--- a/data/scripts/gUnk_08010644.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_08010644
-StartScript 
-_0807E930 0x0009
-Jump 0xffd6
-.short 0x0000
diff --git a/data/scripts/gUnk_08010650.inc b/data/scripts/gUnk_08010650.inc
deleted file mode 100644
index 0b754402..00000000
--- a/data/scripts/gUnk_08010650.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08010650
-StartScript 
-_0807E930 0x000b
-Jump 0xffca
-.short 0x0000
-.short 0x0401
-.short 0x0850
-.short 0x000c
-.short 0x0803
-.short 0xffbe
-.short 0x0000
-.short 0x0401
-.short 0x0850
-.short 0x000d
-.short 0x0803
-.short 0xffb2
-.short 0x0000
diff --git a/data/scripts/gUnk_08010674.inc b/data/scripts/gUnk_08010674.inc
deleted file mode 100644
index 26548735..00000000
--- a/data/scripts/gUnk_08010674.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SCRIPT_START gUnk_08010674
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-.short 0x0411
-.short 0x0c0b
-.short 0xf77d
-.short 0x0807
-.short 0x0c5d
-.short 0x3c08
-.short 0x3c09
-.short 0x0459
-.short 0x0444
-.short 0x0861
-.short 0x0004
-.short 0x0803
-.short 0xffde
-.short 0x0000
diff --git a/data/scripts/gUnk_080106AC.inc b/data/scripts/gUnk_080106AC.inc
deleted file mode 100644
index d62c28b0..00000000
--- a/data/scripts/gUnk_080106AC.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-SCRIPT_START gUnk_080106AC
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0807F2D4
-_0807EF80 0x0000
-.short 0x0411
-.short 0x0804
-.short 0x000a
-.short 0x085b
-.short 0x3c07
-.short 0x0803
-.short 0x0048
-.short 0x0c0b
-.short 0x2eb9
-.short 0x0806
-.short 0x140c
-.short 0xf78d
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0459
-.short 0x041c
-.short 0x0805
-.short 0x0030
-.short 0x0459
-.short 0x0c1e
-.short 0x0000
-.short 0x0000
diff --git a/data/scripts/gUnk_08010700.inc b/data/scripts/gUnk_08010700.inc
deleted file mode 100644
index 85baa923..00000000
--- a/data/scripts/gUnk_08010700.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010700
-.byte 0x4
diff --git a/data/scripts/gUnk_08010701.inc b/data/scripts/gUnk_08010701.inc
deleted file mode 100644
index b664b498..00000000
--- a/data/scripts/gUnk_08010701.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_08010701
-.short 0x0a08
-.short 0x5b00
diff --git a/data/scripts/gUnk_08010705.inc b/data/scripts/gUnk_08010705.inc
deleted file mode 100644
index f1404ea2..00000000
--- a/data/scripts/gUnk_08010705.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_08010705
-.byte 0x8
-.byte 0x4
-.byte 0x3c
-.byte 0x3
-.byte 0x8
-.byte 0x1c
-.byte 0x0
-.byte 0x34
-.byte 0x4
diff --git a/data/scripts/gUnk_0801070E.inc b/data/scripts/gUnk_0801070E.inc
deleted file mode 100644
index 0e579364..00000000
--- a/data/scripts/gUnk_0801070E.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0801070E
-ModHealth 0x0008
-Call sub_08062EDC
-JumpIf 0x000a
-TextboxNoOverlap 0x3c06
-Jump 0x0004
-WaitPlayerAction8 
-_0807EA94 
-_0807E878 
-_0807EF80 0x0001
-Jump 0xff8e
-.short 0x0000
diff --git a/data/scripts/gUnk_08010734.inc b/data/scripts/gUnk_08010734.inc
deleted file mode 100644
index 933e7517..00000000
--- a/data/scripts/gUnk_08010734.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_08010734
-StartScript 
-_0807EF80 0x0007
-_0807E9D4 
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E930 0x0004
-StartScript 
-Call sub_08062D18
-JumpIfNot 0x002a
-StopScript 
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0020
-HasRupees 0x00c8
-JumpIf 0x000a
-TextboxNoOverlap 0x4008
-Jump 0x0010
-ModRupees 0xff38
-Call sub_08062E14
-TextboxNoOverlap 0x4007
-StopScript 
-_0807EA94 
-_0807E878 
-_0807E930 0x0008
-.short 0x0803
-.short 0xffb4
diff --git a/data/scripts/gUnk_08010794.inc b/data/scripts/gUnk_08010794.inc
deleted file mode 100644
index dd310869..00000000
--- a/data/scripts/gUnk_08010794.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08010794
-StartScript 
-_0807EF80 0x0007
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807F2D4
-_0807EF80 0x0001
-Call sub_08062CBC
-_0807EA94 
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
diff --git a/data/scripts/gUnk_080107D0.inc b/data/scripts/gUnk_080107D0.inc
deleted file mode 100644
index 5b25dc91..00000000
--- a/data/scripts/gUnk_080107D0.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_080107D0
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807E9D4 
-Call sub_0807F348
-Call sub_08069684
-StopScript 
-StopScript 
-StartScript 
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0xfff6
-Call sub_080696B0
-StopScript 
-StartScript 
-.short 0x0817
diff --git a/data/scripts/gUnk_0801080A.inc b/data/scripts/gUnk_0801080A.inc
deleted file mode 100644
index c856312b..00000000
--- a/data/scripts/gUnk_0801080A.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_0801080A
-.byte 0x30
diff --git a/data/scripts/gUnk_0801080B.inc b/data/scripts/gUnk_0801080B.inc
deleted file mode 100644
index aa65a41e..00000000
--- a/data/scripts/gUnk_0801080B.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_0801080B
-.short 0x0530
-.short 0xe408
-.short 0x11ff
-.short 0x0404
-.short 0x4c08
diff --git a/data/scripts/gUnk_08010815.inc b/data/scripts/gUnk_08010815.inc
deleted file mode 100644
index 0797910a..00000000
--- a/data/scripts/gUnk_08010815.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCRIPT_START gUnk_08010815
-.short 0x1800
-.short 0x0504
-.short 0xea08
diff --git a/data/scripts/gUnk_0801081B.inc b/data/scripts/gUnk_0801081B.inc
deleted file mode 100644
index 4d5dbb9d..00000000
--- a/data/scripts/gUnk_0801081B.inc
+++ /dev/null
@@ -1,182 +0,0 @@
-SCRIPT_START gUnk_0801081B
-.byte 0xff
-.byte 0x2
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x63
-.byte 0x4
-.byte 0x14
-.byte 0x8
-.byte 0x42
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x2a
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x43
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x22
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x44
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x1a
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x41
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x39
-.byte 0x3f
-.byte 0x3
-.byte 0x8
-.byte 0x6c
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x1b
-.byte 0x2c
-.byte 0x3
-.byte 0x8
-.byte 0x64
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x1a
-.byte 0x2c
-.byte 0x3
-.byte 0x8
-.byte 0x5c
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x39
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x63
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0x96
-.byte 0x6
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0x1c
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x3a
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x19
-.byte 0x97
-.byte 0x6
-.byte 0x8
-.byte 0x5
-.byte 0x8
-.byte 0x30
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x59
-.byte 0x4
-.byte 0x64
-.byte 0x4
-.byte 0x14
-.byte 0x8
-.byte 0x42
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x1a
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x43
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x12
-.byte 0x0
-.byte 0x14
-.byte 0x8
-.byte 0x44
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x21
-.byte 0x2c
-.byte 0x3
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0xfa
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x20
-.byte 0x2c
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x3d
-.byte 0xf8
-.byte 0x7
-.byte 0x8
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x36
-.byte 0xff
diff --git a/data/scripts/gUnk_080108D0.inc b/data/scripts/gUnk_080108D0.inc
deleted file mode 100644
index 2e2ff739..00000000
--- a/data/scripts/gUnk_080108D0.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_080108D0
-CheckPlayerInRegion2 0x0808
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript 0x080109f0
-WaitForSomething2 0x00000001
-CheckRoomFlag 0x0001
-JumpIf 0x0008
-_0807EB28 0x0b63
-.byte 0x59
diff --git a/data/scripts/gUnk_080108FF.inc b/data/scripts/gUnk_080108FF.inc
deleted file mode 100644
index a3f0a622..00000000
--- a/data/scripts/gUnk_080108FF.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_080108FF
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xc6
-.byte 0xff
diff --git a/data/scripts/gUnk_0801090C.inc b/data/scripts/gUnk_0801090C.inc
deleted file mode 100644
index 9c211086..00000000
--- a/data/scripts/gUnk_0801090C.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPT_START gUnk_0801090C
-StartScript 
-.byte 0x79
diff --git a/data/scripts/gUnk_0801090F.inc b/data/scripts/gUnk_0801090F.inc
deleted file mode 100644
index 83da14e6..00000000
--- a/data/scripts/gUnk_0801090F.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_0801090F
-.short 0x0708
-.short 0x1d00
-.short 0x1b08
-.short 0x0400
diff --git a/data/scripts/gUnk_08010917.inc b/data/scripts/gUnk_08010917.inc
deleted file mode 100644
index 6b4b6066..00000000
--- a/data/scripts/gUnk_08010917.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-SCRIPT_START gUnk_08010917
-.byte 0x8
-.byte 0x7a
-.byte 0xe6
-.byte 0x2
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0x69
-.byte 0x8
-.byte 0x8
-.byte 0x5
-.byte 0x8
-.byte 0xf8
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0xf9
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x15
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x5f
-.byte 0x8
-.byte 0x62
-.byte 0xb
-.byte 0x59
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0xf0
-.byte 0x9
-.byte 0x1
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x3
-.byte 0x8
-.byte 0xc4
-.byte 0xff
-.byte 0xb
-.byte 0xc
-.byte 0x2d
-.byte 0x69
-.byte 0x8
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08010964.inc b/data/scripts/gUnk_08010964.inc
index b81a190a..2f63d2b3 100644
--- a/data/scripts/gUnk_08010964.inc
+++ b/data/scripts/gUnk_08010964.inc
@@ -2,15 +2,35 @@ SCRIPT_START gUnk_08010964
 CheckPlayerInRegion2 0x0808
 JumpIfNot 0xfffa
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 StartPlayerScript 0x08010a38
 WaitForSomething2 0x00000001
 CheckRoomFlag 0x0001
 JumpIf 0x0008
 _0807EB28 0x0b63
 _0807EA94 
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
-.short 0x0803
-.short 0xffc6
+Jump 0xffc6
+StartScript 
+StopScript 
+CheckLocalFlag 0x00d1
+JumpIf 0x0040
+CheckPlayerInRegion2 0x0808
+JumpIfNot 0xffee
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x08010a38
+WaitForSomething2 0x00000001
+CheckRoomFlag 0x0001
+JumpIf 0x0008
+_0807EB28 0x0b64
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xffb8
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080109A0.inc b/data/scripts/gUnk_080109A0.inc
deleted file mode 100644
index f4af9a29..00000000
--- a/data/scripts/gUnk_080109A0.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_080109A0
-StartScript 
-StopScript 
-CheckLocalFlag 0x00d1
-JumpIf 0x0040
-CheckPlayerInRegion2 0x0808
-JumpIfNot 0xffee
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript 0x08010a38
-WaitForSomething2 0x00000001
-CheckRoomFlag 0x0001
-JumpIf 0x0008
-_0807EB28 0x0b64
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xffb8
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_080109F0.inc b/data/scripts/gUnk_080109F0.inc
index fe757f1d..05097e85 100644
--- a/data/scripts/gUnk_080109F0.inc
+++ b/data/scripts/gUnk_080109F0.inc
@@ -1,4 +1,11 @@
 SCRIPT_START gUnk_080109F0
 StartScript 
-.short 0x0867
-.short 0x0100
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807ECC4 0x0010
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080109F6.inc b/data/scripts/gUnk_080109F6.inc
deleted file mode 100644
index a0d515fc..00000000
--- a/data/scripts/gUnk_080109F6.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_080109F6
-StopScript 
-_0807ECC4 0x0010
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08010A14.inc b/data/scripts/gUnk_08010A14.inc
index d533dca7..2a01dc4f 100644
--- a/data/scripts/gUnk_08010A14.inc
+++ b/data/scripts/gUnk_08010A14.inc
@@ -2,6 +2,10 @@ SCRIPT_START gUnk_08010A14
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-.byte 0x6e
-.byte 0x8
-.byte 0x10
+_0807EC64 0x0010
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010A1F.inc b/data/scripts/gUnk_08010A1F.inc
deleted file mode 100644
index a6e7ccdc..00000000
--- a/data/scripts/gUnk_08010A1F.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_08010A1F
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08010A38.inc b/data/scripts/gUnk_08010A38.inc
index 9687579a..77c712ad 100644
--- a/data/scripts/gUnk_08010A38.inc
+++ b/data/scripts/gUnk_08010A38.inc
@@ -6,6 +6,6 @@ _0807EC94 0x0010
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010A5C.inc b/data/scripts/gUnk_08010A5C.inc
index 298feea6..e454f7a6 100644
--- a/data/scripts/gUnk_08010A5C.inc
+++ b/data/scripts/gUnk_08010A5C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08010A5C
 StartScript 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E864 
 ModHealth 0x00a0
 StopScript 
@@ -8,11 +8,11 @@ Wait 0x003c
 _0807E778 0x0004
 DoFade4 
 WaitFor_2 
-Call sub_0807F0D8
+Call 0x0807f0d9
 JumpIfNot 0xfff8
 _0807EF80 0x0014
 _0807E878 
-Call sub_0807DF50
-Call sub_080791D0
+Call 0x0807df51
+Call 0x080791d1
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc
index cdddcece..57150ba0 100644
--- a/data/scripts/gUnk_08010A98.inc
+++ b/data/scripts/gUnk_08010A98.inc
@@ -1,19 +1,80 @@
 SCRIPT_START gUnk_08010A98
 StartScript 
 _0807EB44 0x0004
-CallWithArg sub_080672B0, 0x00000000
+CallWithArg
+.short 0x72b1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x000a
-Call sub_08067314
+Call 0x08067315
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg sub_080672B0, 0x00000004
-Call sub_08067304
+CallWithArg
+.short 0x72b1
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+Call 0x08067305
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-CallWithArg sub_080672B0, 0x00000000
-.short 0x0803
-.short 0xffd2
+CallWithArg
+.short 0x72b1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffd2
+StartScript 
+CheckInventory1 0x0067
+JumpIfNot 0x0076
+_0807EB44 0x0004
+_0807EF80 0x0000
+SetEntityNonPlanarMovement 0x0180
+CallWithArg
+.short 0xf349
+.short 0x0807
+@ End of 2 parameters
+Call 0x0806075d
+StopScript 
+_0807EA94 
+Call 0x080606c1
+StopScript 
+Call 0x0806076d
+_0807EF80 0x0007
+Call 0x08060701
+StopScript 
+StartScript 
+_0807E564 
+JumpIf 0x0010
+CallWithArg
+.short 0x08e5
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x000c
+_0807EE30 
+JumpIfNot 0xffe4
+Jump 0xffce
+StopScript 
+_0807EF80 0x0000
+StopScript 
+StartScript 
+CallWithArg
+.short 0x08e5
+.short 0x0806
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0xfff0
+StopScript 
+Jump 0xffbc
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08010AE4.inc b/data/scripts/gUnk_08010AE4.inc
deleted file mode 100644
index d5eb2458..00000000
--- a/data/scripts/gUnk_08010AE4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08010AE4
-StartScript 
-CheckInventory1 0x0067
-JumpIfNot 0x0076
-_0807EB44 0x0004
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0180
-.short 0x0c0c
-.short 0xf349
-.short 0x0807
-.short 0x0c0b
-.short 0x075d
diff --git a/data/scripts/gUnk_08010B04.inc b/data/scripts/gUnk_08010B04.inc
deleted file mode 100644
index bd07881d..00000000
--- a/data/scripts/gUnk_08010B04.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_08010B04
-_0807E078 0x0402
-_0807EA94 
-Call sub_080606C0
-StopScript 
-Call sub_0806076C
-_0807EF80 0x0007
-Call sub_08060700
-StopScript 
-StartScript 
-_0807E564 
-JumpIf 0x0010
-CallWithArg sub_080608E4, 0x00000000
-JumpIf 0x000c
-_0807EE30 
-JumpIfNot 0xffe4
-Jump 0xffce
-StopScript 
-_0807EF80 0x0000
-StopScript 
-StartScript 
-CallWithArg sub_080608E4, 0x00000001
-JumpIf 0xfff0
-StopScript 
-Jump 0xffbc
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_08010B68.inc b/data/scripts/gUnk_08010B68.inc
index 36afe5e4..cdeb2447 100644
--- a/data/scripts/gUnk_08010B68.inc
+++ b/data/scripts/gUnk_08010B68.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08010B68
 StartScript 
 _0807E564 
 JumpIfNot 0x003e
-Call sub_0807F924
+Call 0x0807f925
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x0007
@@ -17,7 +17,7 @@ JumpIfNot 0xfff2
 StopScript 
 _0807E864 
 _0807EB74 
-Call sub_0806E2DC
+Call 0x0806e2dd
 _0807EA94 
 _0807E878 
 Jump 0xffde
diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc
index fce27cee..ab37e3fa 100644
--- a/data/scripts/gUnk_08010BB4.inc
+++ b/data/scripts/gUnk_08010BB4.inc
@@ -3,16 +3,176 @@ StartScript
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0008
-Call sub_0806E440
+Call 0x0806e441
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
-Call sub_0806E418
+Call 0x0806e419
 _0807EA94 
 _0807E878 
 _0807E930 0x0008
 Jump 0xffe2
 .short 0x0000
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x08011074
+WaitForSomething2 0x00000400
+_0807F078 0x0034, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1036
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+TextboxNoOverlapFollowPos
+.short 0x1037
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+TextboxNoOverlapFollowPos
+.short 0x1038
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+SoundReq0x80100000 
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+Call 0x08064181
+Call 0x08064181
+Call 0x08064181
+Call 0x08064181
+Call 0x08064181
+Call 0x08064181
+Call 0x08064181
+Call 0x08064181
+LoadRoomEntityList 0x080f06e0
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+StartPlayerScript 0x08011098
+WaitForSomething2 0x00000400
+SetEntityPositionRelative 0x005001f8
+_0807F0B4 0x0007
+CameraTargetEntity 
+Wait 0x000a
+_0807F0B4 0x0001
+_0807E778 0x0001
+DoFade4 
+_0807E5F8 0x0002a800
+WaitForSomething2 0x00055000
+SetEntityPositionRelative 0x007801f8
+Wait 0x003c
+_0807E5F8 0x00800000
+WaitForSomething2 0x01000000
+_0807E5F8 0x0002a800
+WaitForSomething2 0x00055000
+_0807E8E4_1 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollowPos
+.short 0x1039
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+SoundReq2 0x0001
+_0807E8E4_2 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000010
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000020
+WaitForSomething2 0x00000080
+Wait 0x012c
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+TextboxNoOverlapFollowPos
+.short 0x103a
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+SetEntityPositionRelative 0x01c001f8
+_0807F0B4 0x0004
+Wait 0x0078
+_0807E5F8 0x00280000
+WaitForSomething2 0x00500000
+_0807E5F8 0x00000100
+SetEntityPositionRelative 0x022001f8
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x01f8, 0x0098
+Wait 0x003c
+WaitForSomething2 0x00000200
+_0807E5F8 0x00280000
+SoundReq0x80100000 
+SoundReq 0x009b
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+TextboxNoOverlapFollowPos
+.short 0x1043
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+SoundReq2 0x000d
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+_0807E5F8 0x0002a800
+WaitForSomething2 0x00055000
+SoundReq 0x01c7
+SoundReq 0x00e5
+_0807E5F8 0x00000100
+_0807E5F8 0x00002800
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+WaitForSomething2 0x00000200
+WaitForSomething2 0x00005000
+_0807E5F8 0x00028000
+WaitForSomething2 0x00050000
+TextboxNoOverlapFollowPos
+.short 0x1044
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+SetEntityPositionRelative 0x009801f8
+SoundReq0x80100000 
+Wait 0x003c
+SoundReq2 0x002f
+_0807E5F8 0x00028000
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+WaitForSomething2 0x00050000
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x00e5
+_0807E5F8 0x00028000
+WaitForSomething2 0x00050000
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+_0807E5F8 0x08000000
+_0807E5F8 0x00800000
+WaitForSomething2 0x01000000
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08010BEC.inc b/data/scripts/gUnk_08010BEC.inc
deleted file mode 100644
index 702de0a5..00000000
--- a/data/scripts/gUnk_08010BEC.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_08010BEC
-_0807E864 
-Call sub_0807F9A4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
diff --git a/data/scripts/gUnk_08010BF9.inc b/data/scripts/gUnk_08010BF9.inc
deleted file mode 100644
index 039aa440..00000000
--- a/data/scripts/gUnk_08010BF9.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_START gUnk_08010BF9
-.byte 0x8
-.byte 0x47
-.byte 0xc
-.byte 0x74
-.byte 0x10
diff --git a/data/scripts/gUnk_08010BFE.inc b/data/scripts/gUnk_08010BFE.inc
deleted file mode 100644
index 67042c7d..00000000
--- a/data/scripts/gUnk_08010BFE.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_08010BFE
-.short 0x0801
-.short 0x0c33
-.short 0x0400
-.short 0x0000
-.short 0x0c85
-.short 0x0034
-.short 0x0002
-.short 0x0c5c
-.short 0x1036
-.short 0x000c
-.short 0x0459
-.short 0x0c28
-.short 0x0010
-.short 0x0000
diff --git a/data/scripts/gUnk_08010C1A.inc b/data/scripts/gUnk_08010C1A.inc
deleted file mode 100644
index fc363f6b..00000000
--- a/data/scripts/gUnk_08010C1A.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-SCRIPT_START gUnk_08010C1A
-WaitForSomething2 0x00000020
-TextboxNoOverlapFollowPos 0x1037, 0x0002
-_0807EA94 
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-TextboxNoOverlapFollowPos 0x1038, 0x000c
-_0807EA94 
-SoundReq0x80100000 
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-LoadRoomEntityList 0x080f06e0
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-StartPlayerScript 0x08011098
-WaitForSomething2 0x00000400
-SetEntityPositionRelative 0x005001f8
-_0807F0B4 0x0007
-CameraTargetEntity 
-Wait 0x000a
-_0807F0B4 0x0001
-_0807E778 0x0001
-DoFade4 
-_0807E5F8 0x0002a800
-WaitForSomething2 0x00055000
-SetEntityPositionRelative 0x007801f8
-Wait 0x003c
-_0807E5F8 0x00800000
-WaitForSomething2 0x01000000
-_0807E5F8 0x0002a800
-WaitForSomething2 0x00055000
-_0807E8E4_1 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos 0x1039, 0x000c
-_0807EA94 
-SoundReq2 0x0001
-_0807E8E4_2 
-_0807E5F8 0x00000004
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08010D03.inc b/data/scripts/gUnk_08010D03.inc
deleted file mode 100644
index 289798d4..00000000
--- a/data/scripts/gUnk_08010D03.inc
+++ /dev/null
@@ -1,254 +0,0 @@
-SCRIPT_START gUnk_08010D03
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x2c
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x3a
-.byte 0x10
-.byte 0xc
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x69
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0xc0
-.byte 0x1
-.byte 0x89
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x69
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x20
-.byte 0x2
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x73
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x98
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0x0
-.byte 0x7e
-.byte 0x4
-.byte 0x7b
-.byte 0x8
-.byte 0x9b
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x43
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x7c
-.byte 0x8
-.byte 0xd
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0xa8
-.byte 0x2
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x50
-.byte 0x5
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xc7
-.byte 0x1
-.byte 0x7b
-.byte 0x8
-.byte 0xe5
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x28
-.byte 0x0
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x50
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x2
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x5
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x44
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x69
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x98
-.byte 0x0
-.byte 0x7e
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x7c
-.byte 0x8
-.byte 0x2f
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x2
-.byte 0x0
-.byte 0x28
-.byte 0xc
diff --git a/data/scripts/gUnk_08010E00.inc b/data/scripts/gUnk_08010E00.inc
deleted file mode 100644
index 3c90433d..00000000
--- a/data/scripts/gUnk_08010E00.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SCRIPT_START gUnk_08010E00
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
diff --git a/data/scripts/gUnk_08010E0D.inc b/data/scripts/gUnk_08010E0D.inc
deleted file mode 100644
index 73e24ad0..00000000
--- a/data/scripts/gUnk_08010E0D.inc
+++ /dev/null
@@ -1,244 +0,0 @@
-SCRIPT_START gUnk_08010E0D
-.byte 0x0
-.byte 0x5
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xe5
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x2
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x5
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x25
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0xed
-.byte 0xdd
-.byte 0x5
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8a
-.byte 0xc
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x25
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x25
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x25
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x2c
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x38
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x3f
-.byte 0x4
-.byte 0x37
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xab
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xc2
-.byte 0x1
-.byte 0xd
-.byte 0xc
-.byte 0x70
-.byte 0x7
-.byte 0xf
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x38
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x3e
-.byte 0x4
-.byte 0x37
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0x19
-.byte 0xde
-.byte 0x5
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8a
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x3d
-.byte 0xdc
-.byte 0x6
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x45
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0xd
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x9d
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0xf6
-.byte 0x49
diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc
new file mode 100644
index 00000000..0154c425
--- /dev/null
+++ b/data/scripts/gUnk_08010E5A.inc
@@ -0,0 +1,101 @@
+SCRIPT_START gUnk_08010E5A
+Wait 0x001e
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+Wait 0x003c
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0004
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+Wait 0x001e
+SoundReq 0x012c
+_0807E5F8 0x00800000
+WaitForSomething2 0x01000000
+_0807E778 0x0004
+DoFade7 
+WaitFor_2 
+Wait 0x003c
+SoundReq 0x00ab
+SoundReq 0x01c2
+LoadRoomEntityList 0x080f0770
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+Call 0x0806dc3d
+Call 0x080791bd
+CallWithArg
+.short 0xf245
+.short 0x0807
+.short 0x000d
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x49f6
+.short 0x0800
+@ End of 4 parameters
+_0807F0B4 0x0001
+SetEntityPositionRelative 0x006801f8
+_0807E5F8 0x00000004
+Wait 0x001e
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000008
+WaitForSomething2 0x00000080
+SoundReq 0x01c3
+_0807E5F8 0x20000000
+Wait 0x0078
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806dc59
+_0807E5F8 0x40000000
+_0807E5F8 0x00000010
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000020
+WaitForSomething2 0x00000200
+TextboxNoOverlapFollowPos
+.short 0x1045
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+TextboxNoOverlapFollowPos
+.short 0x1046
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08010F00.inc b/data/scripts/gUnk_08010F00.inc
deleted file mode 100644
index 90b72291..00000000
--- a/data/scripts/gUnk_08010F00.inc
+++ /dev/null
@@ -1,256 +0,0 @@
-SCRIPT_START gUnk_08010F00
-.byte 0x0
-.byte 0x8
-.byte 0x89
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x69
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x68
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xc3
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x20
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x9d
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0xdc
-.byte 0x6
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x40
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x45
-.byte 0x10
-.byte 0xc
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x5c
-.byte 0xc
-.byte 0x46
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0xed
-.byte 0xdd
-.byte 0x5
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8a
-.byte 0xc
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x47
-.byte 0xc
-.byte 0xbc
-.byte 0x10
-.byte 0x1
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x47
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x3d
-.byte 0xdc
-.byte 0x6
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x45
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0xd
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x9d
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0xf6
-.byte 0x49
-.byte 0x0
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x9d
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0xdc
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0x25
-.byte 0x1
-.byte 0xc
-.byte 0x14
-.byte 0x29
-.byte 0xfb
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc
new file mode 100644
index 00000000..84c28023
--- /dev/null
+++ b/data/scripts/gUnk_08010F84.inc
@@ -0,0 +1,83 @@
+SCRIPT_START gUnk_08010F84
+Wait 0x003c
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+StartPlayerScript 0x080110bc
+WaitForSomething2 0x00000400
+TextboxNoOverlapFollowPos
+.short 0x1047
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+Call 0x0806dc3d
+Call 0x080791bd
+CallWithArg
+.short 0xf245
+.short 0x0807
+.short 0x000d
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x49f6
+.short 0x0800
+@ End of 4 parameters
+Wait 0x001e
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806dc59
+Wait 0x003c
+_0807E5F8 0x08000000
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+Wait 0x000f
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+SoundReq0x80100000 
+Wait 0x003c
+TextboxNoOverlapFollowPos
+.short 0x104a
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+TextboxNoOverlapFollowPos
+.short 0x1049
+.short 0x0000
+@ End of 2 parameters
+_0807EA94 
+SetEntityPositionRelative 0x009801f8
+Wait 0x0078
+_0807E5F8 0x00000100
+WaitForSomething2 0x00000200
+Call 0x0804bcdd
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08010FFF.inc b/data/scripts/gUnk_08010FFF.inc
deleted file mode 100644
index d319abb4..00000000
--- a/data/scripts/gUnk_08010FFF.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08010FFF
-.byte 0x0
diff --git a/data/scripts/gUnk_08011000.inc b/data/scripts/gUnk_08011000.inc
deleted file mode 100644
index 4a387917..00000000
--- a/data/scripts/gUnk_08011000.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08011000
-.byte 0x31
diff --git a/data/scripts/gUnk_08011001.inc b/data/scripts/gUnk_08011001.inc
deleted file mode 100644
index 1c184d98..00000000
--- a/data/scripts/gUnk_08011001.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08011001
-.short 0x0f08
-.short 0x7b00
-.short 0x2508
-.short 0x0c01
-.short 0x2914
-.short 0x07fb
-.short 0x0308
-.short 0x0000
-.short 0x0c00
-.short 0x1914
-.short 0x05de
-.short 0x0208
-.short 0x0000
-.short 0x8a00
-.short 0x000c
diff --git a/data/scripts/gUnk_0801101F.inc b/data/scripts/gUnk_0801101F.inc
deleted file mode 100644
index 6a0e859a..00000000
--- a/data/scripts/gUnk_0801101F.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-SCRIPT_START gUnk_0801101F
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x7e
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x4a
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x5c
-.byte 0xc
-.byte 0x49
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x59
-.byte 0x4
-.byte 0x69
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x98
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xdd
-.byte 0xbc
-.byte 0x4
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08011074.inc b/data/scripts/gUnk_08011074.inc
index 76e1eb81..38da146f 100644
--- a/data/scripts/gUnk_08011074.inc
+++ b/data/scripts/gUnk_08011074.inc
@@ -3,4 +3,8 @@ StartScript
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 _0807EDD4 0x01e8, 0x0050
-.byte 0x61
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000400
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011083.inc b/data/scripts/gUnk_08011083.inc
deleted file mode 100644
index e398b2fe..00000000
--- a/data/scripts/gUnk_08011083.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-SCRIPT_START gUnk_08011083
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x69
-.byte 0xc
-.byte 0xa8
-.byte 0x1
-.byte 0x58
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x29
-.byte 0xc
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xbd
-.byte 0x91
-.byte 0x7
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0x1
-.byte 0x4
-.byte 0x67
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x2
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xd8
-.byte 0x1
-.byte 0x68
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
diff --git a/data/scripts/gUnk_08011098.inc b/data/scripts/gUnk_08011098.inc
new file mode 100644
index 00000000..a86bbcb8
--- /dev/null
+++ b/data/scripts/gUnk_08011098.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_08011098
+SetEntityPositionRelative 0x005801a8
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000400
+_0807E610 0x00000002
+StopScript 
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_080110BC.inc b/data/scripts/gUnk_080110BC.inc
new file mode 100644
index 00000000..5ff9e2a6
--- /dev/null
+++ b/data/scripts/gUnk_080110BC.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_080110BC
+StartScript 
+SetEntityNonPlanarMovement 0x0040
+StopScript 
+SetEntityNonPlanarMovement 0x0200
+_0807EF80 0x0001
+_0807EDD4 0x01d8, 0x0068
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000400
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_080110DC.inc b/data/scripts/gUnk_080110DC.inc
deleted file mode 100644
index 2378181b..00000000
--- a/data/scripts/gUnk_080110DC.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_START gUnk_080110DC
-ScriptCommandNop 
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_080110E8.inc b/data/scripts/gUnk_080110E8.inc
index 888fb7cd..340d4165 100644
--- a/data/scripts/gUnk_080110E8.inc
+++ b/data/scripts/gUnk_080110E8.inc
@@ -3,14 +3,14 @@ SoundReq 0x007a
 _0807EB44 0x0004
 _0807EF80 0x000d
 SoundReq 0x0086
-Call sub_0807F36C
+Call 0x0807f36d
 SetEntityNonPlanarMovement 0x0400
 _0807ECF4 0x0008
 StartScript 
-Call sub_0807F1E8
+Call 0x0807f1e9
 _0807EF80 0x0011
 StopScript 
-Call sub_0807F2D4
+Call 0x0807f2d5
 WaitForSomething 0x80000000
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc
index 9ff7e44a..9f6aef32 100644
--- a/data/scripts/gUnk_08011128.inc
+++ b/data/scripts/gUnk_08011128.inc
@@ -27,7 +27,7 @@ WaitForSomething2 0x00000004
 _0807EF80 0x0010
 Wait 0x001e
 _0807EF80 0x0010
-Call sub_0807F3C8
+Call 0x0807f3c9
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x001c
 _0807EC1C 0x003c
diff --git a/data/scripts/gUnk_080111CC.inc b/data/scripts/gUnk_080111CC.inc
index 8b1d7f41..7f1b7db9 100644
--- a/data/scripts/gUnk_080111CC.inc
+++ b/data/scripts/gUnk_080111CC.inc
@@ -2,14 +2,52 @@ SCRIPT_START gUnk_080111CC
 StartScript 
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
-Call sub_08066D04
+Call 0x08066d05
 StopScript 
-Call sub_0807F338
+Call 0x0807f339
 WaitForSomething2 0x00000010
-Call sub_08066D14
+Call 0x08066d15
 JumpIf 0x0004
 MoveEntityToPlayer 
-Call sub_0807F8BC
+Call 0x0807f8bd
 JumpIf 0x0008
 SetEntityPositionRelative 0x00b801f8
-.short 0x0879
+_0807EF80 0x0007
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x0050
+_0807EB74 
+_0807EF80 0x0000
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x0020
+_0807EF80 0x0008
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+_0807EF80 0x0007
+_0807EF80 0x0001
+SetEntityNonPlanarMovement 0x0040
+_0807EDD4 0x01e8, 0x0040
+_0807EF80 0x0000
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+Call 0x08095811
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+_0807EF80 0x0001
+_0807EDD4 0x01d8, 0x0058
+_0807EF80 0x0000
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+SoundReq 0x01c9
+_0807EF80 0x0010
+Wait 0x0014
+Call 0x08066e21
+Wait 0x0014
+_0807EF80 0x0010
+Call 0x0807f2d5
+SoundReq 0x01ca
+_0807E5F8 0x00000020
+WaitForSomething2 0x00000010
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011208.inc b/data/scripts/gUnk_08011208.inc
deleted file mode 100644
index 59486065..00000000
--- a/data/scripts/gUnk_08011208.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_08011208
-.byte 0x7
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x50
-.byte 0x0
-.byte 0x63
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x20
diff --git a/data/scripts/gUnk_0801121D.inc b/data/scripts/gUnk_0801121D.inc
deleted file mode 100644
index 193f502a..00000000
--- a/data/scripts/gUnk_0801121D.inc
+++ /dev/null
@@ -1,168 +0,0 @@
-SCRIPT_START gUnk_0801121D
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xf8
-.byte 0x1
-.byte 0x20
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xe8
-.byte 0x1
-.byte 0x40
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0x58
-.byte 0x9
-.byte 0x8
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0xd8
-.byte 0x1
-.byte 0x58
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0xc9
-.byte 0x1
-.byte 0x79
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x21
-.byte 0x6e
-.byte 0x6
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xd5
-.byte 0xf2
-.byte 0x7
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xca
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc
index 0286410e..69153313 100644
--- a/data/scripts/gUnk_080112C4.inc
+++ b/data/scripts/gUnk_080112C4.inc
@@ -2,8 +2,8 @@ SCRIPT_START gUnk_080112C4
 StartScript 
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
-Call sub_08095244
-Call sub_0807F338
+Call 0x08095245
+Call 0x0807f339
 StopScript 
 WaitForSomething 0x0002a800
 _0807EF80 0x0007
@@ -14,11 +14,43 @@ _0807ECC4 0x0010
 Wait 0x003c
 _0807ECC4 0x0010
 _0807E930 0x0002
-Call sub_08064050
-.byte 0x6
-.byte 0x14
-.byte 0x8
-.byte 0x0
-.byte 0x9e
-.byte 0x0
-.byte 0x34
+Call 0x08064051
+_0807E078
+.short 0x0008
+.short 0x009e
+.short 0x0134
+.short 0x01f8
+@ End of 4 parameters
+_0807E610 0x00000800
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807E930 0x0007
+_0807EB44 0x0006
+_0807ECF4 0x0010
+_0807EB44 0x0004
+_0807E930 0x0002
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0012
+SoundReq 0x011e
+Wait 0x003c
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x01f0, 0x0098
+_0807EDD4 0x01f0, 0x00c8
+_0807E930 0x0013
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807EF80 0x0010
+Wait 0x000a
+_0807EF80 0x0010
+Call 0x0807f3c9
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x001e
+_0807EC1C 0x003c
+_0807E5F8 0x00001000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0801130F.inc b/data/scripts/gUnk_0801130F.inc
deleted file mode 100644
index 38738813..00000000
--- a/data/scripts/gUnk_0801130F.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SCRIPT_START gUnk_0801130F
-.byte 0x1
-.byte 0xf8
-.byte 0x1
-.byte 0x29
-.byte 0xc
-.byte 0x0
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x7
-.byte 0x0
diff --git a/data/scripts/gUnk_08011328.inc b/data/scripts/gUnk_08011328.inc
deleted file mode 100644
index 7f80777c..00000000
--- a/data/scripts/gUnk_08011328.inc
+++ /dev/null
@@ -1,119 +0,0 @@
-SCRIPT_START gUnk_08011328
-_0807EB44 0x0006
-_0807ECF4 0x0010
-_0807EB44 0x0004
-_0807E930 0x0002
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0012
-SoundReq 0x011e
-Wait 0x003c
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x01f0, 0x0098
-_0807EDD4 0x01f0, 0x00c8
-_0807E930 0x0013
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807EF80 0x0010
-Wait 0x000a
-_0807EF80 0x0010
-Call sub_0807F3C8
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x001e
-_0807EC1C 0x003c
-_0807E5F8 0x00001000
-_0807EF80 0x0006
-SCRIPT_END
-.byte 0x29
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x5
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x6f
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x12
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x1e
-.byte 0x1
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x73
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x98
-.byte 0x0
-.byte 0x73
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0xc8
diff --git a/data/scripts/gUnk_080113AA.inc b/data/scripts/gUnk_080113AA.inc
new file mode 100644
index 00000000..7eee5c8d
--- /dev/null
+++ b/data/scripts/gUnk_080113AA.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_080113AA
+_0807E610 0x00002000
+_0807E5F8 0x00004000
+WaitForSomething2 0x00002000
+_0807E930 0x0005
+_0807EB44 0x0002
+_0807EC94 0x0010
+_0807EB44 0x0004
+_0807E930 0x0002
+_0807E5F8 0x00004000
+WaitForSomething2 0x00002000
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0012
+SoundReq 0x011e
+Wait 0x003c
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0200, 0x0098
+_0807EDD4 0x0200, 0x00c8
+_0807E930 0x0013
+_0807E5F8 0x00004000
+WaitForSomething2 0x00002000
+_0807EF80 0x0010
+Wait 0x000a
+_0807EF80 0x0010
+Call 0x0807f3c9
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x0002
+_0807EC1C 0x003c
+_0807E5F8 0x00004000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011403.inc b/data/scripts/gUnk_08011403.inc
deleted file mode 100644
index 2ac5a910..00000000
--- a/data/scripts/gUnk_08011403.inc
+++ /dev/null
@@ -1,462 +0,0 @@
-SCRIPT_START gUnk_08011403
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x13
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x20
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xc9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x4
-.byte 0x65
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x6d
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x40
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x29
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x7
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x71
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x70
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x12
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x1e
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x73
-.byte 0xc
-.byte 0xe8
-.byte 0x1
-.byte 0x98
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x13
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xd
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xf0
-.byte 0xff
-.byte 0x50
-.byte 0x8
-.byte 0x13
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x80
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xc9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x4
-.byte 0x65
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x6d
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x29
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x5
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x6f
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x70
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x12
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x1e
-.byte 0x1
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x73
-.byte 0xc
-.byte 0x8
-.byte 0x2
-.byte 0x98
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x40
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x10
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x13
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0xd
-.byte 0x0
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x77
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0xf0
-.byte 0xff
-.byte 0x50
-.byte 0x8
-.byte 0x13
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x10
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xc9
-.byte 0xf3
-.byte 0x7
-.byte 0x8
-.byte 0x50
-.byte 0x8
-.byte 0x14
-.byte 0x0
-.byte 0x67
-.byte 0x8
-.byte 0x0
-.byte 0x4
-.byte 0x65
-.byte 0x8
-.byte 0x2
-.byte 0x0
-.byte 0x6d
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08011442.inc b/data/scripts/gUnk_08011442.inc
new file mode 100644
index 00000000..ce71ee93
--- /dev/null
+++ b/data/scripts/gUnk_08011442.inc
@@ -0,0 +1,43 @@
+SCRIPT_START gUnk_08011442
+_0807E610 0x00008000
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807E930 0x0007
+_0807EB44 0x0006
+_0807ECF4 0x0020
+_0807EB44 0x0004
+_0807E930 0x0006
+_0807ECC4 0x0010
+_0807E930 0x0002
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0012
+SoundReq 0x011e
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x01e8, 0x0098
+SetEntityNonPlanarMovement 0x0040
+_0807EEF4 0x0000, 0x0010
+_0807E930 0x0013
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+_0807EF80 0x000d
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0020
+_0807EEF4 0x0000, 0xfff0
+_0807E930 0x0013
+_0807EF80 0x0010
+_0807E5F8 0x00010000
+WaitForSomething2 0x00008000
+Call 0x0807f3c9
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x001e
+_0807EC1C 0x003c
+_0807E5F8 0x00010000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011508.inc b/data/scripts/gUnk_08011508.inc
new file mode 100644
index 00000000..5eda78db
--- /dev/null
+++ b/data/scripts/gUnk_08011508.inc
@@ -0,0 +1,44 @@
+SCRIPT_START gUnk_08011508
+_0807E610 0x00020000
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+_0807E930 0x0005
+_0807EB44 0x0002
+_0807EC94 0x0020
+_0807EB44 0x0004
+_0807E930 0x0006
+_0807ECC4 0x0010
+_0807E930 0x0002
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0012
+SoundReq 0x011e
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0208, 0x0098
+SetEntityNonPlanarMovement 0x0040
+_0807EEF4 0x0000, 0x0010
+_0807E930 0x0013
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+_0807EF80 0x000d
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0020
+_0807EEF4 0x0000, 0xfff0
+_0807E930 0x0013
+_0807EF80 0x0010
+_0807E5F8 0x00040000
+WaitForSomething2 0x00020000
+Call 0x0807f3c9
+_0807E930 0x0014
+SetEntityNonPlanarMovement 0x0400
+SetEntityDirection 0x0002
+_0807EC1C 0x003c
+_0807E5F8 0x00040000
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011640.inc b/data/scripts/gUnk_08011640.inc
index a78e490d..c80b52e3 100644
--- a/data/scripts/gUnk_08011640.inc
+++ b/data/scripts/gUnk_08011640.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0008
 _0807EB44 0x0004
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call sub_0807F338
+Call 0x0807f339
 WaitForSomething2 0x00000040
 _0807EF80 0x0007
 _0807EF80 0x0001
@@ -16,7 +16,7 @@ WaitForSomething2 0x00000040
 _0807EF80 0x0010
 Wait 0x001e
 _0807EF80 0x0010
-Call sub_0807F3C8
+Call 0x0807f3c9
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x0008
 _0807EC1C 0x003c
diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc
index 6d6462f1..88896410 100644
--- a/data/scripts/gUnk_080116A8.inc
+++ b/data/scripts/gUnk_080116A8.inc
@@ -3,7 +3,7 @@ StartScript
 _0807EB44 0x0000
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call sub_0807F338
+Call 0x0807f339
 WaitForSomething2 0x00000100
 _0807EF80 0x0001
 _0807EDD4 0x01f8, 0x00d0
@@ -12,28 +12,33 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0004
 _0807EF80 0x001c
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x001c
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x001a
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x0014
 SoundReq 0x0120
-CallWithArg sub_08095420, 0x08011890
+CallWithArg
+.short 0x5421
+.short 0x0809
+.short 0x1890
+.short 0x0801
+@ End of 4 parameters
 Wait 0x00f0
 _0807EF80 0x0016
 SoundReq 0x01cb
@@ -50,7 +55,12 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EF80 0x0014
 SoundReq 0x01c4
-CallWithArg sub_0809545C, 0x080118d4
+CallWithArg
+.short 0x545d
+.short 0x0809
+.short 0x18d4
+.short 0x0801
+@ End of 4 parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 Wait 0x003c
@@ -70,5 +80,16 @@ _0807EF80 0x0004
 Wait 0x005a
 _0807EB44 0x0004
 _0807EF80 0x001c
-Call sub_0807F2D4
-.byte 0x61
+Call 0x0807f2d5
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x001e
+_0807E5F8 0x00000200
+WaitForSomething2 0x00000100
+Call 0x08066ca5
+_0807EF80 0x0008
+Wait 0x0078
+_0807E5F8 0x00000200
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011809.inc b/data/scripts/gUnk_08011809.inc
deleted file mode 100644
index 74582ec9..00000000
--- a/data/scripts/gUnk_08011809.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-SCRIPT_START gUnk_08011809
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x0
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0x6c
-.byte 0x6
-.byte 0x8
-.byte 0x79
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x78
-.byte 0x0
-.byte 0x28
-.byte 0xc
-.byte 0x0
-.byte 0x2
-.byte 0x0
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0801183C.inc b/data/scripts/gUnk_0801183C.inc
index f0ae1d32..2eb2de7b 100644
--- a/data/scripts/gUnk_0801183C.inc
+++ b/data/scripts/gUnk_0801183C.inc
@@ -1,12 +1,12 @@
 SCRIPT_START gUnk_0801183C
 StartScript 
-Call sub_08095330
+Call 0x08095331
 StopScript 
 WaitForSomething2 0x00800000
 _0807EF3C 0x0000, 0x0020
 _0807E5F8 0x01000000
 WaitForSomething2 0x00800000
-Call sub_08095364
+Call 0x08095365
 SoundReq 0x0122
 Wait 0x003c
 _0807E5F8 0x01000000
@@ -17,37 +17,3 @@ WaitForSomething2 0x00800000
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0850
-.short 0x0000
-.short 0x0867
-.short 0x0200
-.short 0x0c0b
-.short 0x5459
-.short 0x0809
-.short 0x0c0b
-.short 0x4b81
-.short 0x0809
-.short 0x0402
-.short 0x0831
-.short 0x00f0
-.short 0x0c0b
-.short 0x4b6d
-.short 0x0809
-.short 0x0c73
-.short 0x01f8
-.short 0x0088
-.short 0x0c0b
-.short 0x4b81
-.short 0x0809
-.short 0x087b
-.short 0x01cc
-.short 0x0c28
-.short 0x0000
-.short 0x1000
-.short 0x0c33
-.short 0x0000
-.short 0x0800
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_08011890.inc b/data/scripts/gUnk_08011890.inc
new file mode 100644
index 00000000..116e1599
--- /dev/null
+++ b/data/scripts/gUnk_08011890.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08011890
+StartScript 
+_0807E930 0x0000
+SetEntityNonPlanarMovement 0x0200
+Call 0x08095459
+Call 0x08094b81
+StopScript 
+Wait 0x00f0
+Call 0x08094b6d
+_0807EDD4 0x01f8, 0x0088
+Call 0x08094b81
+SoundReq 0x01cc
+_0807E5F8 0x10000000
+WaitForSomething2 0x08000000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080118D4.inc b/data/scripts/gUnk_080118D4.inc
index 057f405b..ccd69ee2 100644
--- a/data/scripts/gUnk_080118D4.inc
+++ b/data/scripts/gUnk_080118D4.inc
@@ -2,15 +2,15 @@ SCRIPT_START gUnk_080118D4
 StartScript 
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0200
-Call nullsub_527
-Call sub_08094B80
+Call 0x08095459
+Call 0x08094b81
 StopScript 
 WaitForSomething2 0x08000000
-Call sub_08094B6C
+Call 0x08094b6d
 _0807EDD4 0x01d8, 0x0078
 StartPlayerScript 0x080110e8
 _0807EDD4 0x01d8, 0x0058
-Call sub_08094B80
+Call 0x08094b81
 SoundReq 0x009a
 SoundReq 0x01c6
 _0807E5F8 0x10000000
diff --git a/data/scripts/gUnk_08011930.inc b/data/scripts/gUnk_08011930.inc
index 586cc75a..909e9250 100644
--- a/data/scripts/gUnk_08011930.inc
+++ b/data/scripts/gUnk_08011930.inc
@@ -1,5 +1,5 @@
 SCRIPT_START gUnk_08011930
 WaitForSomething 0x20000000
-Call sub_0809567C
+Call 0x0809567d
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc
index 4d8ee99c..eaf6c38a 100644
--- a/data/scripts/gUnk_0801194C.inc
+++ b/data/scripts/gUnk_0801194C.inc
@@ -3,3 +3,191 @@ StartScript
 _0807EB44 0x0002
 Jump 0x0016
 .short 0x0000
+StartScript 
+_0807EB44 0x0006
+Jump 0x000a
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+CheckGlobalFlag 0x0015
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x103d
+Jump 0x0006
+TextboxNoOverlapFollow 0x103f
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffce
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x000c
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+Wait 0x003c
+Call 0x0806407d
+Jump 0xfff4
+.short 0x0000
+StartScript 
+_0807EB44 0x0002
+Jump 0x0016
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+Jump 0x000a
+.short 0x0000
+StartScript 
+_0807EB44 0x0006
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x08064429
+_0807EA94 
+_0807E878 
+Jump 0xffe0
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlapFollow 0x1320
+_0807EA94 
+_0807E878 
+Jump 0xffe2
+StartScript 
+_0807EB44 0x0002
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0x44b5
+.short 0x0806
+.short 0x0006
+.short 0x0000
+@ End of 4 parameters
+JumpIf 0x005e
+TextboxNoOverlapFollow 0x1320
+_0807EA94 
+_0807E878 
+Jump 0xffd4
+.short 0x0000
+StartScript 
+_0807EB44 0x0004
+_0807E9D4 
+_0807EF80 0x000a
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+TextboxNoOverlapFollow 0x1322
+_0807EA94 
+_0807E878 
+Jump 0xffe2
+CheckRoomFlag 0x000f
+JumpIfNot 0xfffa
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+TextboxNoOverlapFollowPos
+.short 0x1321
+.short 0x0007
+@ End of 2 parameters
+_0807EA94 
+SetLocalFlag 0x0010
+CallWithArg
+.short 0xda1d
+.short 0x0806
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+_0807E878 
+Call 0x0807df51
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011958.inc b/data/scripts/gUnk_08011958.inc
deleted file mode 100644
index 0683cad2..00000000
--- a/data/scripts/gUnk_08011958.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_08011958
-StartScript 
-_0807EB44 0x0006
-Jump 0x000a
-.short 0x0000
diff --git a/data/scripts/gUnk_08011964.inc b/data/scripts/gUnk_08011964.inc
deleted file mode 100644
index c2176022..00000000
--- a/data/scripts/gUnk_08011964.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_08011964
-StartScript 
-_0807EB44 0x0004
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-CheckGlobalFlag 0x0015
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x103d
-Jump 0x0006
-TextboxNoOverlapFollow 0x103f
-_0807EA94 
-Wait 0x000f
-_0807E878 
-.short 0x0803
-.short 0xffce
diff --git a/data/scripts/gUnk_080119B0.inc b/data/scripts/gUnk_080119B0.inc
deleted file mode 100644
index 76d4b5ab..00000000
--- a/data/scripts/gUnk_080119B0.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_080119B0
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x0000000c
-StopScript 
-Wait 0x003c
-Call sub_0806407C
-Jump 0xfff4
-.short 0x0000
diff --git a/data/scripts/gUnk_080119D8.inc b/data/scripts/gUnk_080119D8.inc
deleted file mode 100644
index 59e2a558..00000000
--- a/data/scripts/gUnk_080119D8.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_080119D8
-StartScript 
-_0807EB44 0x0002
-Jump 0x0016
-.short 0x0000
diff --git a/data/scripts/gUnk_080119E4.inc b/data/scripts/gUnk_080119E4.inc
deleted file mode 100644
index 5d6df4fd..00000000
--- a/data/scripts/gUnk_080119E4.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_080119E4
-StartScript 
-_0807EB44 0x0004
-Jump 0x000a
-.short 0x0000
diff --git a/data/scripts/gUnk_080119F0.inc b/data/scripts/gUnk_080119F0.inc
deleted file mode 100644
index 46614110..00000000
--- a/data/scripts/gUnk_080119F0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_080119F0
-StartScript 
-_0807EB44 0x0006
-_0807E9D4 
-_0807EF80 0x000a
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
diff --git a/data/scripts/gUnk_08011A04.inc b/data/scripts/gUnk_08011A04.inc
deleted file mode 100644
index 64d320a2..00000000
--- a/data/scripts/gUnk_08011A04.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_08011A04
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
-.short 0x0463
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0c0b
-.short 0x4429
-.short 0x0806
-.short 0x0459
-.short 0x0444
-.short 0x0803
-.short 0xffe0
-.short 0x0000
diff --git a/data/scripts/gUnk_08011A2C.inc b/data/scripts/gUnk_08011A2C.inc
deleted file mode 100644
index a1d29930..00000000
--- a/data/scripts/gUnk_08011A2C.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08011A2C
-StartScript 
-_0807EB44 0x0004
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlapFollow 0x1320
-_0807EA94 
-_0807E878 
-.short 0x0803
-.short 0xffe2
diff --git a/data/scripts/gUnk_08011A64.inc b/data/scripts/gUnk_08011A64.inc
deleted file mode 100644
index d0163977..00000000
--- a/data/scripts/gUnk_08011A64.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-SCRIPT_START gUnk_08011A64
-StartScript 
-_0807EB44 0x0002
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-CallWithArg sub_080644B4, 0x00000006
-JumpIf 0x005e
-TextboxNoOverlapFollow 0x1320
-_0807EA94 
-_0807E878 
-Jump 0xffd4
-.short 0x0000
-.short 0x0401
-.short 0x0861
-.short 0x0004
-.short 0x0453
-.short 0x0879
-.short 0x000a
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
-.short 0x0463
-.short 0x140c
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-.short 0x085a
-.short 0x1322
-.short 0x0459
-.short 0x0444
-.short 0x0803
-.short 0xffe2
diff --git a/data/scripts/gUnk_08011AE4.inc b/data/scripts/gUnk_08011AE4.inc
deleted file mode 100644
index 231bc978..00000000
--- a/data/scripts/gUnk_08011AE4.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_08011AE4
-CheckRoomFlag 0x000f
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x1321, 0x0007
-_0807EA94 
-.short 0x082a
diff --git a/data/scripts/gUnk_08011B04.inc b/data/scripts/gUnk_08011B04.inc
deleted file mode 100644
index dea2fc94..00000000
--- a/data/scripts/gUnk_08011B04.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_08011B04
-.short 0x0010
-.short 0x140c
-.short 0xda1d
-.short 0x0806
-.short 0x0003
-.short 0x0000
-.short 0x0444
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc
index a33c964a..49463dff 100644
--- a/data/scripts/gUnk_08011B20.inc
+++ b/data/scripts/gUnk_08011B20.inc
@@ -1,10 +1,13 @@
 SCRIPT_START gUnk_08011B20
 _0807E864 
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x1320, 0x000c
+Call 0x0807df29
+TextboxNoOverlapFollowPos
+.short 0x1320
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E878 
-Call sub_0807DF50
+Call 0x0807df51
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc
index c69b2845..df282424 100644
--- a/data/scripts/gUnk_08011B40.inc
+++ b/data/scripts/gUnk_08011B40.inc
@@ -16,7 +16,7 @@ TextboxNoOverlap 0x3d07
 _0807EA94 
 _0807EB44 0x0004
 ClearGlobalFlag 0x0050
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -39,9 +39,53 @@ ModRupees 0xfff6
 Wait 0x001e
 TextboxNoOverlap 0x3d06
 _0807EA94 
-CallWithArg sub_0806C2A0, 0x00000000
+CallWithArg
+.short 0xc2a1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 WaitFor_2 
 Wait 0x003c
-Call sub_0806C224
-.short 0x0803
-.short 0xffb8
+Call 0x0806c225
+Jump 0xffb8
+StartScript 
+_0807E888 
+StopScript 
+CallWithArg
+.short 0xc2a1
+.short 0x0806
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+WaitFor_2 
+Wait 0x003c
+_0807E878 
+SetRoomFlag 0x0000
+SoundReq2 0x0033
+CheckRoomFlag 0x0064
+JumpIfNot 0xfffa
+SoundReq0x80100000 
+_0807E864 
+Wait 0x003c
+CameraTargetEntity 
+Wait 0x003c
+Call 0x0806c23d
+Wait 0x003c
+CameraTargetPlayer 
+_0807E878 
+CheckLocalFlag 0x0001
+JumpIfNot 0xfffa
+_0807E888 
+WaitPlayerAction8 
+Wait 0x001e
+CallWithArg
+.short 0xc2a1
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+WaitFor_2 
+Wait 0x003c
+Call 0x0806c281
+SCRIPT_END
diff --git a/data/scripts/gUnk_08011BE4.inc b/data/scripts/gUnk_08011BE4.inc
deleted file mode 100644
index 4a474683..00000000
--- a/data/scripts/gUnk_08011BE4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPT_START gUnk_08011BE4
-StartScript 
-_0807E888 
-StopScript 
-CallWithArg sub_0806C2A0, 0x00000001
-WaitFor_2 
-Wait 0x003c
-_0807E878 
-SetRoomFlag 0x0000
-.short 0x087c
-.short 0x0033
diff --git a/data/scripts/gUnk_08011C04.inc b/data/scripts/gUnk_08011C04.inc
deleted file mode 100644
index 235fcfeb..00000000
--- a/data/scripts/gUnk_08011C04.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SCRIPT_START gUnk_08011C04
-CheckRoomFlag 0x0064
-JumpIfNot 0xfffa
-SoundReq0x80100000 
-_0807E864 
-Wait 0x003c
-CameraTargetEntity 
-Wait 0x003c
-Call Simon_CreateChest
-Wait 0x003c
-CameraTargetPlayer 
-_0807E878 
-CheckLocalFlag 0x0001
-JumpIfNot 0xfffa
-_0807E888 
-WaitPlayerAction8 
-Wait 0x001e
-CallWithArg sub_0806C2A0, 0x00000000
-WaitFor_2 
-Wait 0x003c
-Call sub_0806C280
-SCRIPT_END
diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc
index 3ef468d6..aacd2d70 100644
--- a/data/scripts/gUnk_08011C50.inc
+++ b/data/scripts/gUnk_08011C50.inc
@@ -3,7 +3,12 @@ StartScript
 _0807E864 
 StopScript 
 Wait 0x003c
-CallWithArg sub_0806C2A0, 0x00000001
+CallWithArg
+.short 0xc2a1
+.short 0x0806
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
 WaitFor_2 
 Wait 0x003c
 _0807EF80 0x0014
diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc
index 1c3bac33..9ada852c 100644
--- a/data/scripts/gUnk_08011C7C.inc
+++ b/data/scripts/gUnk_08011C7C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08011C7C
 StartScript 
-Call sub_08064828
+Call 0x08064829
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -54,3 +54,472 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 Jump 0xffdc
 .short 0x0000
+StartScript 
+Call 0x08064929
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+CheckGlobalFlag 0x0047
+JumpIf 0x002c
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0xfff8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4513
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffda
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002b
+JumpIf 0xffce
+CheckGlobalFlag 0x002d
+JumpIf 0xffc6
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3103
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffc4
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3106
+_0807EA94 
+SetGlobalFlag 0x002c
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+.short 0x0000
+StartScript 
+Call 0x08064a29
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+CheckGlobalFlag 0x0047
+JumpIf 0x002c
+StopScript 
+StopScript 
+StartScript 
+CheckEntityInteractType 
+JumpIfNot 0xfff8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4514
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffda
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002b
+JumpIf 0xffce
+CheckGlobalFlag 0x002c
+JumpIf 0xffc6
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3104
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffc4
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3107
+_0807EA94 
+SetGlobalFlag 0x002d
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+.short 0x0000
+StartScript 
+Call 0x08064829
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002f
+JumpIf 0xfdfa
+CheckGlobalFlag 0x0030
+JumpIf 0xfdf2
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckGlobalFlag 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x4524
+_0807EA94 
+Jump 0x000e
+TextboxNoOverlap 0x3111
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffb2
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3114
+_0807EA94 
+SetGlobalFlag 0x002e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+StartScript 
+Call 0x08064929
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002e
+JumpIf 0xfe1a
+CheckGlobalFlag 0x0030
+JumpIf 0xfe12
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckGlobalFlag 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x4522
+_0807EA94 
+Jump 0x000e
+TextboxNoOverlap 0x310f
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffb2
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3112
+_0807EA94 
+SetGlobalFlag 0x002f
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+StartScript 
+Call 0x08064a29
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x002e
+JumpIf 0xfe3a
+CheckGlobalFlag 0x002f
+JumpIf 0xfe32
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckGlobalFlag 0x0048
+JumpIf 0x000c
+TextboxNoOverlap 0x4523
+_0807EA94 
+Jump 0x000e
+TextboxNoOverlap 0x3110
+_0807EA94 
+_0807E3E8 
+JumpIf 0x001e
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffb2
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x3113
+_0807EA94 
+SetGlobalFlag 0x0030
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffdc
+StartScript 
+Call 0x08064829
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckLocalFlag 0x0094
+JumpIf 0x0010
+TextboxNoOverlap 0x3122
+_0807EA94 
+SetLocalFlag 0x0094
+Jump 0x0042
+_0807E48C 0x0031
+JumpIfNot 0x000c
+TextboxNoOverlap 0x3123
+_0807EA94 
+Jump 0x0030
+TextboxNoOverlap 0x3124
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0024
+_0807E48C 0x0020
+JumpIfNot 0x0018
+TextboxNoOverlap 0x3125
+_0807EA94 
+_0807F034 0x0031
+WaitPlayerAction8 
+Call 0x0807fc25
+Jump 0x0006
+TextboxNoOverlap 0x3127
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xff8e
+.short 0x0000
+StartScript 
+Call 0x08064929
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckLocalFlag 0x0095
+JumpIf 0x0010
+TextboxNoOverlap 0x3116
+_0807EA94 
+SetLocalFlag 0x0095
+Jump 0x0042
+_0807E48C 0x002f
+JumpIfNot 0x000c
+TextboxNoOverlap 0x3117
+_0807EA94 
+Jump 0x0030
+TextboxNoOverlap 0x3118
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0024
+_0807E48C 0x0020
+JumpIfNot 0x0018
+TextboxNoOverlap 0x3119
+_0807EA94 
+_0807F034 0x002f
+WaitPlayerAction8 
+Call 0x0807fc25
+Jump 0x0006
+TextboxNoOverlap 0x311b
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xff8e
+.short 0x0000
+StartScript 
+Call 0x08064a29
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+CheckLocalFlag 0x0096
+JumpIf 0x0010
+TextboxNoOverlap 0x311c
+_0807EA94 
+SetLocalFlag 0x0096
+Jump 0x0042
+_0807E48C 0x0030
+JumpIfNot 0x000c
+TextboxNoOverlap 0x311d
+_0807EA94 
+Jump 0x0030
+TextboxNoOverlap 0x311e
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0024
+_0807E48C 0x0020
+JumpIfNot 0x0018
+TextboxNoOverlap 0x311f
+_0807EA94 
+_0807F034 0x0030
+WaitPlayerAction8 
+Call 0x0807fc25
+Jump 0x0006
+TextboxNoOverlap 0x3121
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xff8e
+.short 0x0000
+StartScript 
+Call 0x08064829
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4527
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffe0
+StartScript 
+Call 0x08064929
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4525
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffe0
+StartScript 
+Call 0x08064a29
+_0807EB44 0x0004
+_0807EF80 0x0001
+_0807EF80 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x4526
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0001
+Jump 0xffe0
+StartScript 
+_0807EB44 0x0004
+Call 0x08061fd9
+_0807E9D4 
+_0807EF80 0x000a
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x001e
+JumpIfNot 0x000a
+CheckInventory1 0x0015
+JumpIf 0x0024
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807EB74 
+_0807E864 
+Call 0x08061fd9
+TextboxNoOverlapFollow 0x2302
+_0807EA94 
+_0807E878 
+SetGlobalFlag 0x001e
+Jump 0xffcc
+StopScript 
+StartScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0x000a
+CheckRoomFlag 0x0001
+JumpIf 0x0020
+CheckEntityInteractType 
+JumpIfNot 0xffe8
+StopScript 
+_0807EB74 
+_0807E864 
+Call 0x08061fd9
+TextboxNoOverlapFollow 0x2303
+_0807EA94 
+_0807E878 
+Jump 0xffd0
+StopScript 
+_0807EB74 
+_0807E864 
+Call 0x08061fd9
+_0807EF80 0x000b
+Call 0x08061fb1
+Call 0x08061f95
+LoadRoomEntityList 0x080f2758
+_0807EF80 0x0008
+Wait 0x003c
+SoundReq 0x0072
+SetLocalFlag 0x0043
+Wait 0x001e
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08011D28.inc b/data/scripts/gUnk_08011D28.inc
deleted file mode 100644
index 9d12e8ce..00000000
--- a/data/scripts/gUnk_08011D28.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-SCRIPT_START gUnk_08011D28
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-CheckGlobalFlag 0x0047
-JumpIf 0x002c
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0xfff8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4513
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffda
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002b
-JumpIf 0xffce
-CheckGlobalFlag 0x002d
-JumpIf 0xffc6
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3103
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffc4
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3106
-_0807EA94 
-SetGlobalFlag 0x002c
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-.short 0x0000
diff --git a/data/scripts/gUnk_08011DD4.inc b/data/scripts/gUnk_08011DD4.inc
deleted file mode 100644
index c8b2ce29..00000000
--- a/data/scripts/gUnk_08011DD4.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08011DD4
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-CheckGlobalFlag 0x0047
-JumpIf 0x002c
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0xfff8
-StopScript 
-_0807E864 
-_0807EB74 
-.short 0x0879
diff --git a/data/scripts/gUnk_08011E04.inc b/data/scripts/gUnk_08011E04.inc
deleted file mode 100644
index 5ce63dae..00000000
--- a/data/scripts/gUnk_08011E04.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-SCRIPT_START gUnk_08011E04
-.short 0x0000
-.short 0x085b
-.short 0x4514
-.short 0x0459
-.short 0x0444
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0001
-.short 0x0803
-.short 0xffda
-.short 0x0402
-.short 0x0401
-.short 0x0814
-.short 0x002b
-.short 0x0804
-.short 0xffce
-.short 0x0814
-.short 0x002c
-.short 0x0804
-.short 0xffc6
-.short 0x0418
-.short 0x0805
-.short 0xffe8
-.short 0x0402
-.short 0x0443
-.short 0x0463
-.short 0x0879
-.short 0x0000
-.short 0x085b
-.short 0x3104
-.short 0x0459
-.short 0x041c
-.short 0x0804
-.short 0x001e
-.short 0x0444
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0001
-.short 0x0803
-.short 0xffc4
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
-.short 0x0463
-.short 0x0879
-.short 0x0000
-.short 0x085b
-.short 0x3107
-.short 0x0459
-.short 0x082d
-.short 0x002d
-.short 0x0444
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0001
-.short 0x0803
-.short 0xffdc
-.short 0x0000
diff --git a/data/scripts/gUnk_08011E80.inc b/data/scripts/gUnk_08011E80.inc
deleted file mode 100644
index b8bd932f..00000000
--- a/data/scripts/gUnk_08011E80.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-SCRIPT_START gUnk_08011E80
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002f
-JumpIf 0xfdfa
-CheckGlobalFlag 0x0030
-JumpIf 0xfdf2
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckGlobalFlag 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x4524
-_0807EA94 
-Jump 0x000e
-TextboxNoOverlap 0x3111
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffb2
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3114
-_0807EA94 
-SetGlobalFlag 0x002e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-.short 0x0803
-.short 0xffdc
diff --git a/data/scripts/gUnk_08011F0C.inc b/data/scripts/gUnk_08011F0C.inc
deleted file mode 100644
index 9c1ebe00..00000000
--- a/data/scripts/gUnk_08011F0C.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-SCRIPT_START gUnk_08011F0C
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002e
-JumpIf 0xfe1a
-CheckGlobalFlag 0x0030
-JumpIf 0xfe12
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckGlobalFlag 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x4522
-_0807EA94 
-Jump 0x000e
-TextboxNoOverlap 0x310f
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffb2
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3112
-_0807EA94 
-SetGlobalFlag 0x002f
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-.short 0x0803
-.short 0xffdc
diff --git a/data/scripts/gUnk_08011F98.inc b/data/scripts/gUnk_08011F98.inc
deleted file mode 100644
index 0b11163d..00000000
--- a/data/scripts/gUnk_08011F98.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-SCRIPT_START gUnk_08011F98
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002e
-JumpIf 0xfe3a
-CheckGlobalFlag 0x002f
-JumpIf 0xfe32
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckGlobalFlag 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x4523
-_0807EA94 
-Jump 0x000e
-TextboxNoOverlap 0x3110
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffb2
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3113
-_0807EA94 
-SetGlobalFlag 0x0030
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-.short 0x0803
-.short 0xffdc
diff --git a/data/scripts/gUnk_08012024.inc b/data/scripts/gUnk_08012024.inc
deleted file mode 100644
index e27a1327..00000000
--- a/data/scripts/gUnk_08012024.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SCRIPT_START gUnk_08012024
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckLocalFlag 0x0094
-JumpIf 0x0010
-TextboxNoOverlap 0x3122
-_0807EA94 
-SetLocalFlag 0x0094
-Jump 0x0042
-_0807E48C 0x0031
-JumpIfNot 0x000c
-TextboxNoOverlap 0x3123
-_0807EA94 
-Jump 0x0030
-TextboxNoOverlap 0x3124
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0024
-_0807E48C 0x0020
-JumpIfNot 0x0018
-TextboxNoOverlap 0x3125
-_0807EA94 
-_0807F034 0x0031
-WaitPlayerAction8 
-.byte 0xb
diff --git a/data/scripts/gUnk_08012091.inc b/data/scripts/gUnk_08012091.inc
deleted file mode 100644
index 46015845..00000000
--- a/data/scripts/gUnk_08012091.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SCRIPT_START gUnk_08012091
-.byte 0xc
-.byte 0x25
-.byte 0xfc
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x27
-.byte 0x31
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x8e
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_080120B0.inc b/data/scripts/gUnk_080120B0.inc
deleted file mode 100644
index b3cc5cfd..00000000
--- a/data/scripts/gUnk_080120B0.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_080120B0
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckLocalFlag 0x0095
-JumpIf 0x0010
-TextboxNoOverlap 0x3116
-_0807EA94 
-SetLocalFlag 0x0095
-Jump 0x0042
-.byte 0x1f
-.byte 0x8
-.byte 0x2f
diff --git a/data/scripts/gUnk_080120ED.inc b/data/scripts/gUnk_080120ED.inc
deleted file mode 100644
index cfe95096..00000000
--- a/data/scripts/gUnk_080120ED.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_080120ED
-.short 0x0500
-.short 0x0c08
-.short 0x5b00
-.short 0x1708
-.short 0x5931
-.short 0x0304
-.short 0x3008
diff --git a/data/scripts/gUnk_080120FB.inc b/data/scripts/gUnk_080120FB.inc
deleted file mode 100644
index 0313b6b4..00000000
--- a/data/scripts/gUnk_080120FB.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-SCRIPT_START gUnk_080120FB
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x18
-.byte 0x31
-.byte 0x59
-.byte 0x4
-.byte 0x1c
-.byte 0x4
-.byte 0x5
-.byte 0x8
-.byte 0x24
-.byte 0x0
-.byte 0x1f
-.byte 0x8
-.byte 0x20
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0x18
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x19
-.byte 0x31
-.byte 0x59
-.byte 0x4
-.byte 0x82
-.byte 0x8
-.byte 0x2f
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x25
-.byte 0xfc
-.byte 0x7
-.byte 0x8
-.byte 0x3
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0x5b
-.byte 0x8
-.byte 0x1b
-.byte 0x31
-.byte 0x59
-.byte 0x4
-.byte 0x44
-.byte 0x4
-.byte 0x61
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x1
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x8e
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_0801213C.inc b/data/scripts/gUnk_0801213C.inc
deleted file mode 100644
index 3e584133..00000000
--- a/data/scripts/gUnk_0801213C.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SCRIPT_START gUnk_0801213C
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckLocalFlag 0x0096
-JumpIf 0x0010
-TextboxNoOverlap 0x311c
-_0807EA94 
-SetLocalFlag 0x0096
-Jump 0x0042
-_0807E48C 0x0030
-JumpIfNot 0x000c
-TextboxNoOverlap 0x311d
-_0807EA94 
-Jump 0x0030
-TextboxNoOverlap 0x311e
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0024
-_0807E48C 0x0020
-JumpIfNot 0x0018
-TextboxNoOverlap 0x311f
-_0807EA94 
-_0807F034 0x0030
-WaitPlayerAction8 
-Call sub_0807FC24
-Jump 0x0006
-TextboxNoOverlap 0x3121
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xff8e
-.short 0x0000
diff --git a/data/scripts/gUnk_080121C8.inc b/data/scripts/gUnk_080121C8.inc
deleted file mode 100644
index c37ef7e8..00000000
--- a/data/scripts/gUnk_080121C8.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_080121C8
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4527
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-.short 0x0803
-.short 0xffe0
diff --git a/data/scripts/gUnk_08012200.inc b/data/scripts/gUnk_08012200.inc
deleted file mode 100644
index 778d55f1..00000000
--- a/data/scripts/gUnk_08012200.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08012200
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4525
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-.short 0x0803
-.short 0xffe0
diff --git a/data/scripts/gUnk_08012238.inc b/data/scripts/gUnk_08012238.inc
deleted file mode 100644
index e8846aee..00000000
--- a/data/scripts/gUnk_08012238.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08012238
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4526
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-.short 0x0803
-.short 0xffe0
diff --git a/data/scripts/gUnk_08012270.inc b/data/scripts/gUnk_08012270.inc
deleted file mode 100644
index 831f71ad..00000000
--- a/data/scripts/gUnk_08012270.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-SCRIPT_START gUnk_08012270
-StartScript 
-_0807EB44 0x0004
-Call sub_08061FD8
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x001e
-JumpIfNot 0x000a
-CheckInventory1 0x0015
-JumpIf 0x0024
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807EB74 
-_0807E864 
-Call sub_08061FD8
-TextboxNoOverlapFollow 0x2302
-_0807EA94 
-_0807E878 
-SetGlobalFlag 0x001e
-Jump 0xffcc
-StopScript 
-StartScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0x000a
-CheckRoomFlag 0x0001
-JumpIf 0x0020
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807EB74 
-_0807E864 
-Call sub_08061FD8
-TextboxNoOverlapFollow 0x2303
-_0807EA94 
-_0807E878 
-Jump 0xffd0
-StopScript 
-_0807EB74 
-_0807E864 
-Call sub_08061FD8
-_0807EF80 0x000b
-Call sub_08061FB0
-Call sub_08061F94
-LoadRoomEntityList 0x080f2758
-_0807EF80 0x0008
-Wait 0x003c
-SoundReq 0x0072
-SetLocalFlag 0x0043
-Wait 0x001e
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc
index 0dee1c37..cc9d6451 100644
--- a/data/scripts/gUnk_0801232C.inc
+++ b/data/scripts/gUnk_0801232C.inc
@@ -16,5 +16,57 @@ SetLocalFlag 0x0042
 _0807F034 0x0057
 WaitPlayerAction8 
 _0807E878 
-.short 0x0803
-.short 0xffda
+Jump 0xffda
+StartScript 
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x0004
+JumpIfNot 0xfffa
+Call 0x0807df29
+_0807E864 
+SoundReq0x80100000 
+StartScript 
+_0807E778 0x0004
+_0807E788 0x00007fff
+DoFade5 
+_0807E858
+.short 0x0080
+@ End of 1 parameters
+StopScript 
+WaitFor_2 
+SoundReq2 0x002c
+_0807EB28 0x1401
+_0807EA94 
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x0007
+SoundReq 0x01ce
+SetEntity0x20 0xffff8000
+Wait 0x003c
+_0807E8E4_0 
+StartPlayerScript 0x08012410
+WaitForSomething2 0x00000001
+TextboxNoOverlap 0x1402
+_0807EA94 
+SoundReq0x80100000 
+SetEntity0x20 0x00010000
+Wait 0x003c
+StartScript 
+_0807E778 0x0004
+_0807E788 0xffffffff
+DoFade4 
+_0807E858
+.short 0x0080
+@ End of 1 parameters
+StopScript 
+WaitFor_2 
+SoundReq2 0xffff
+_0807EB28 0x1403
+_0807EA94 
+_0807E914 0x00000203
+Call 0x0807f421
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012360.inc b/data/scripts/gUnk_08012360.inc
deleted file mode 100644
index 34c4b8de..00000000
--- a/data/scripts/gUnk_08012360.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SCRIPT_START gUnk_08012360
-StartScript 
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x0004
-JumpIfNot 0xfffa
-Call sub_0807DF28
-_0807E864 
-SoundReq0x80100000 
-StartScript 
-_0807E778 0x0004
-_0807E788 0x00007fff
-DoFade5 
-_0807E858 0x0080
-StopScript 
-WaitFor_2 
-SoundReq2 0x002c
-_0807EB28 0x1401
-_0807EA94 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x0007
-SoundReq 0x01ce
-SetEntity0x20 0xffff8000
-Wait 0x003c
-_0807E8E4_0 
-StartPlayerScript 0x08012410
-WaitForSomething2 0x00000001
-TextboxNoOverlap 0x1402
-_0807EA94 
-SoundReq0x80100000 
-SetEntity0x20 0x00010000
-Wait 0x003c
-StartScript 
-_0807E778 0x0004
-_0807E788 0xffffffff
-DoFade4 
-_0807E858 0x0080
-StopScript 
-WaitFor_2 
-SoundReq2 0xffff
-_0807EB28 0x1403
-_0807EA94 
-_0807E914 0x00000203
-Call sub_0807F420
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08012410.inc b/data/scripts/gUnk_08012410.inc
index 39c087b1..339a5051 100644
--- a/data/scripts/gUnk_08012410.inc
+++ b/data/scripts/gUnk_08012410.inc
@@ -5,6 +5,6 @@ StopScript
 _0807EF80 0x0004
 Wait 0x003c
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc
index 2c3efbfb..ff893ab3 100644
--- a/data/scripts/gUnk_08012430.inc
+++ b/data/scripts/gUnk_08012430.inc
@@ -8,9 +8,9 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807E930 0x0008
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E930 0x0009
-Call sub_0806B2B4
+Call 0x0806b2b5
 _0807EA94 
 CheckLocalFlag 0x00b3
 JumpIf 0x0010
@@ -22,3 +22,144 @@ _0807E878
 _0807E930 0x0000
 Jump 0xffc4
 .short 0x0000
+StartScript 
+Call 0x08054565
+StopScript 
+CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
+JumpIfNot 0xfff6
+SoundReq0x80100000 
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+StartPlayerScript 0x08012ab0
+TextboxNoOverlapFollowPos
+.short 0x1101
+.short 0x0007
+@ End of 2 parameters
+_0807EA94 
+CameraTargetPlayer 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+_0807E858
+.short 0x0000
+@ End of 1 parameters
+Call 0x080791bd
+LoadRoomEntityList 0x080f4d70
+Call 0x0805ebcd
+SetEntityPositionRelative 0x01680388
+Call 0x0807f845
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+SoundReq2 0x000e
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+MoveEntityToPlayer 
+Call 0x0807f845
+CameraTargetPlayer 
+_0807E788 0xffffffff
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+Call 0x0807df51
+_0807E878 
+SoundReq2 0xffff
+CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+Call 0x0806dc7d
+SoundReq0x80100000 
+StartPlayerScript 0x08012ac8
+WaitForSomething2 0x00000001
+SetEntityPositionRelative 0x01680388
+_0807F0B4 0x0001
+CameraTargetEntity 
+Wait 0x005a
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq2 0x000e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000040
+WaitForSomething2 0x00000080
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000010
+WaitForSomething2 0x00000020
+WaitForSomething2 0x00000100
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+SoundReq2 0x0033
+Call 0x0807df51
+_0807E878 
+_0807E5F8 0x00000050
+LoadRoomEntityList 0x080f51d0
+WaitForSomething2 0x00000008
+_0807E864 
+Call 0x0807fa41
+Call 0x0807df29
+SoundReq 0x0072
+SoundReq0x80100000 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+StartPlayerScript 0x08012af0
+WaitForSomething2 0x00000001
+_0807E8E4_0 
+SoundReq2 0x000e
+Wait 0x001e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+Wait 0x003c
+SoundReq2 0xffff
+Call 0x0806dca1
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call 0x0807df51
+_0807E878 
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+SoundReq0x80100000 
+Wait 0x003c
+SoundReq2 0xffff
+Call 0x08054571
+SetGlobalFlag 0x0014
+CallWithArg
+.short 0xf6f9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012480.inc b/data/scripts/gUnk_08012480.inc
deleted file mode 100644
index bbf9f288..00000000
--- a/data/scripts/gUnk_08012480.inc
+++ /dev/null
@@ -1,132 +0,0 @@
-SCRIPT_START gUnk_08012480
-StartScript 
-Call sub_08054564
-StopScript 
-CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
-JumpIfNot 0xfff6
-SoundReq0x80100000 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript 0x08012ab0
-TextboxNoOverlapFollowPos 0x1101, 0x0007
-_0807EA94 
-CameraTargetPlayer 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-_0807E858 0x0000
-Call sub_080791BC
-LoadRoomEntityList 0x080f4d70
-Call DeleteAllEnemies
-SetEntityPositionRelative 0x01680388
-Call sub_0807F844
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-SoundReq2 0x000e
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-MoveEntityToPlayer 
-Call sub_0807F844
-CameraTargetPlayer 
-_0807E788 0xffffffff
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-Call sub_0807DF50
-_0807E878 
-SoundReq2 0xffff
-CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0806DC7C
-SoundReq0x80100000 
-StartPlayerScript 0x08012ac8
-WaitForSomething2 0x00000001
-SetEntityPositionRelative 0x01680388
-_0807F0B4 0x0001
-CameraTargetEntity 
-Wait 0x005a
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq2 0x000e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-SoundReq2 0x0033
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000050
-LoadRoomEntityList 0x080f51d0
-WaitForSomething2 0x00000008
-_0807E864 
-Call sub_0807FA40
-Call sub_0807DF28
-SoundReq 0x0072
-SoundReq0x80100000 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-StartPlayerScript 0x08012af0
-WaitForSomething2 0x00000001
-_0807E8E4_0 
-SoundReq2 0x000e
-Wait 0x001e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-Wait 0x003c
-SoundReq2 0xffff
-Call sub_0806DCA0
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-Wait 0x003c
-SoundReq2 0xffff
-Call sub_08054570
-SetGlobalFlag 0x0014
-CallWithArg sub_0807F6F8, 0x00000008
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc
new file mode 100644
index 00000000..f6b88cad
--- /dev/null
+++ b/data/scripts/gUnk_080126FC.inc
@@ -0,0 +1,293 @@
+SCRIPT_START gUnk_080126FC
+StartScript 
+SetEntityNonPlanarMovement 0x0040
+_0807EF80 0x0007
+StopScript 
+_0807E930 0x0020
+WaitForSomething2 0x00000004
+_0807E930 0x0022
+Call 0x0807f3c9
+TextboxNoOverlapFollowPos
+.short 0x1102
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0021
+Call 0x0807f3c9
+TextboxNoOverlapFollowPos
+.short 0x1103
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0011
+_0807E930 0x001c
+TextboxNoOverlapFollowPos
+.short 0x1105
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0022
+Call 0x0807f3c9
+TextboxNoOverlapFollowPos
+.short 0x1106
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x001c
+Call 0x0806d96d
+TextboxNoOverlapFollowPos
+.short 0x1107
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0021
+Call 0x0807f3c9
+TextboxNoOverlapFollowPos
+.short 0x1108
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x001c
+Call 0x0806d96d
+TextboxNoOverlapFollowPos
+.short 0x1109
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0020
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000008
+StopScript 
+StartScript 
+CheckRoomFlag 0x0000
+JumpIf 0x0028
+CheckEntityInteractType 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+Call 0x0806d945
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x1114
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0020
+_0807E878 
+Jump 0xffd0
+_0807E864 
+_0807E9DC 
+CallWithArg
+.short 0xf5b1
+.short 0x0807
+.short 0x003c
+.short 0x0000
+@ End of 4 parameters
+Call 0x080791d1
+StopScript 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x000b
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+Call 0x0806d945
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x110a
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x110b
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x110c
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x110d
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x110e
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call 0x0806d909
+_0807EC1C 0x0010
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call 0x0806d945
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos
+.short 0x1115
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+_0807EB8C 
+Call 0x0806d945
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x110f
+.short 0x000c
+@ End of 2 parameters
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call 0x0806d909
+_0807EC1C 0x0050
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call 0x0806d945
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos
+.short 0x1115
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+_0807EB8C 
+Call 0x0806d945
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x1110
+.short 0x000c
+@ End of 2 parameters
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call 0x0806d909
+_0807EC1C 0x0050
+_0807E930 0x0018
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call 0x0806d945
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos
+.short 0x1115
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+SoundReq0x80100000 
+_0807EF80 0x000b
+_0807EB8C 
+Call 0x0806d945
+_0807E930 0x0010
+TextboxNoOverlapFollowPos
+.short 0x1111
+.short 0x000c
+@ End of 2 parameters
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call 0x0806d8a1
+_0807EE30 
+JumpIfNot 0xfffc
+_0807E930 0x001f
+_0807EA94 
+StartPlayerScript 0x08012b18
+Call 0x0806d9a5
+_0807EF80 0x0008
+Wait 0x0078
+SoundReq2 0x000e
+StartScript 
+_0807E8E4_2 
+_0807EB28 0x1112
+StopScript 
+_0807EA94 
+_0807E5F8 0x00000008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012AB0.inc b/data/scripts/gUnk_08012AB0.inc
index 916f994c..3af969c2 100644
--- a/data/scripts/gUnk_08012AB0.inc
+++ b/data/scripts/gUnk_08012AB0.inc
@@ -6,115 +6,14 @@ _0807EB44 0x0006
 Wait 0x000a
 Jump 0xffee
 .short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0080
-.short 0x0402
-.short 0x0861
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
 .short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x0388
-.short 0x0180
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0879
-.short 0x0015
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0861
-.short 0x0004
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0870
-.short 0x0008
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x140c
-.short 0xfb65
-.short 0x0807
-.short 0xffe2
-.short 0xffff
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0861
-.short 0x0000
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x086e
-.short 0x0008
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x140c
-.short 0xfb65
-.short 0x0807
-.short 0xffe2
-.short 0xffff
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0861
-.short 0x0002
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x086f
-.short 0x0008
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x140c
-.short 0xfb65
-.short 0x0807
-.short 0xffe2
-.short 0xffff
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08012AF0.inc b/data/scripts/gUnk_08012AF0.inc
new file mode 100644
index 00000000..00bf8f5c
--- /dev/null
+++ b/data/scripts/gUnk_08012AF0.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08012AF0
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0388, 0x0180
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012B18.inc b/data/scripts/gUnk_08012B18.inc
new file mode 100644
index 00000000..afa03369
--- /dev/null
+++ b/data/scripts/gUnk_08012B18.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08012B18
+_0807EF80 0x0015
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc
new file mode 100644
index 00000000..22d05e05
--- /dev/null
+++ b/data/scripts/gUnk_08012B24.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08012B24
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0004
+StopScript 
+_0807EF80 0x0001
+_0807ECC4 0x0008
+_0807E5F8 0x00000002
+CallWithArg
+.short 0xfb65
+.short 0x0807
+.short 0xffe2
+.short 0xffff
+@ End of 4 parameters
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc
new file mode 100644
index 00000000..29284519
--- /dev/null
+++ b/data/scripts/gUnk_08012B50.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08012B50
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0000
+StopScript 
+_0807EF80 0x0001
+_0807EC64 0x0008
+_0807E5F8 0x00000002
+CallWithArg
+.short 0xfb65
+.short 0x0807
+.short 0xffe2
+.short 0xffff
+@ End of 4 parameters
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc
new file mode 100644
index 00000000..7fe6c915
--- /dev/null
+++ b/data/scripts/gUnk_08012B7C.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08012B7C
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+_0807EB44 0x0002
+StopScript 
+_0807EF80 0x0001
+_0807EC94 0x0008
+_0807E5F8 0x00000002
+CallWithArg
+.short 0xfb65
+.short 0x0807
+.short 0xffe2
+.short 0xffff
+@ End of 4 parameters
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012BF8.inc b/data/scripts/gUnk_08012BF8.inc
index 0b089a01..9905cc29 100644
--- a/data/scripts/gUnk_08012BF8.inc
+++ b/data/scripts/gUnk_08012BF8.inc
@@ -4,5 +4,17 @@ _0807EB44 0x0006
 _0807EF80 0x0007
 _0807E930 0x0003
 StopScript 
-.short 0x0c33
-.short 0x0010
+WaitForSomething2 0x00000010
+_0807E930 0x0007
+Wait 0x001e
+_0807E5F8 0x00000020
+_0807E930 0x0003
+WaitForSomething2 0x00000010
+_0807E930 0x0007
+Wait 0x001e
+_0807E5F8 0x00000020
+_0807E930 0x0003
+WaitForSomething2 0x00000010
+Wait 0x0001
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012C0C.inc b/data/scripts/gUnk_08012C0C.inc
deleted file mode 100644
index 534285f4..00000000
--- a/data/scripts/gUnk_08012C0C.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_08012C0C
-.short 0x0000
-.short 0x0850
-.short 0x0007
-.short 0x0831
-.short 0x001e
-.short 0x0c28
-.short 0x0020
-.short 0x0000
-.short 0x0850
-.short 0x0003
-.short 0x0c33
-.short 0x0010
-.short 0x0000
-.short 0x0850
-.short 0x0007
-.short 0x0831
-.short 0x001e
-.short 0x0c28
-.short 0x0020
-.short 0x0000
-.short 0x0850
-.short 0x0003
-.short 0x0c33
-.short 0x0010
-.short 0x0000
-.short 0x0831
-.short 0x0001
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_08012C48.inc b/data/scripts/gUnk_08012C48.inc
index 7be9b1be..2b1bcffb 100644
--- a/data/scripts/gUnk_08012C48.inc
+++ b/data/scripts/gUnk_08012C48.inc
@@ -8,27 +8,3 @@ _0807E5F8 0x00000100
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0453
-.short 0x0879
-.short 0x0008
-.short 0x0c4e
-.short 0x0000
-.short 0x0000
-.short 0x0c0b
-.short 0xda05
-.short 0x0806
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x0443
-.short 0x0449
-.short 0x085a
-.short 0x111d
-.short 0x0459
-.short 0x082d
-.short 0x0022
-.short 0x0444
-.short 0x0803
-.short 0xffe8
diff --git a/data/scripts/gUnk_08012C68.inc b/data/scripts/gUnk_08012C68.inc
new file mode 100644
index 00000000..9bc4b3a0
--- /dev/null
+++ b/data/scripts/gUnk_08012C68.inc
@@ -0,0 +1,34 @@
+SCRIPT_START gUnk_08012C68
+StartScript 
+_0807E9D4 
+_0807EF80 0x0008
+_0807E914 0x00000000
+Call 0x0806da05
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807E8E4_0 
+TextboxNoOverlapFollow 0x111d
+_0807EA94 
+SetGlobalFlag 0x0022
+_0807E878 
+Jump 0xffe8
+CheckGlobalFlag 0x0014
+JumpIfNot 0xfffa
+StopScript 
+StartScript 
+CheckPlayerInRegion 0x0398, 0x03b0, 0x2040
+JumpIfNot 0xfff2
+_0807E564 
+JumpIf 0x001e
+StopScript 
+_0807E864 
+Call 0x0807df29
+_0807EB28 0x2202
+_0807EA94 
+SetLocalFlag 0x003b
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012C98.inc b/data/scripts/gUnk_08012C98.inc
deleted file mode 100644
index 2a19764d..00000000
--- a/data/scripts/gUnk_08012C98.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08012C98
-CheckGlobalFlag 0x0014
-JumpIfNot 0xfffa
-StopScript 
-StartScript 
-CheckPlayerInRegion 0x0398, 0x03b0, 0x2040
-JumpIfNot 0xfff2
-_0807E564 
-JumpIf 0x001e
-StopScript 
-_0807E864 
-Call sub_0807DF28
-_0807EB28 0x2202
-_0807EA94 
-SetLocalFlag 0x003b
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_08012CD8.inc b/data/scripts/gUnk_08012CD8.inc
index 6f29b3b4..a25beeb9 100644
--- a/data/scripts/gUnk_08012CD8.inc
+++ b/data/scripts/gUnk_08012CD8.inc
@@ -8,12 +8,12 @@ JumpIfNot 0xffec
 ComparePlayerAction 0x0015
 JumpIf 0xffe4
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StopScript 
 _0807EB28 0x2203
 _0807EA94 
 SetLocalFlag 0x003e
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012D18.inc b/data/scripts/gUnk_08012D18.inc
index 79940cb3..9abf4d3e 100644
--- a/data/scripts/gUnk_08012D18.inc
+++ b/data/scripts/gUnk_08012D18.inc
@@ -9,13 +9,13 @@ CheckPlayerInRegion 0x0000, 0x01a8, 0x2010
 JumpIfNot 0xffe0
 StopScript 
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 _0807EB28 0x111a
 _0807EA94 
 StartPlayerScript 0x08010a38
 WaitForSomething2 0x00000001
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffb2
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08012D70.inc b/data/scripts/gUnk_08012D70.inc
index a594867f..a7c2018a 100644
--- a/data/scripts/gUnk_08012D70.inc
+++ b/data/scripts/gUnk_08012D70.inc
@@ -2,11 +2,15 @@ SCRIPT_START gUnk_08012D70
 CheckPlayerInRegion 0x0088, 0x0048, 0x3030
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 StartPlayerScript 0x08012db0
 WaitForSomething2 0x00000001
 _0807EB28 0x132d
 _0807EA94 
 SetLocalFlag 0x0014
-.byte 0xb
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012DA1.inc b/data/scripts/gUnk_08012DA1.inc
deleted file mode 100644
index d23dd945..00000000
--- a/data/scripts/gUnk_08012DA1.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08012DA1
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08012DB0.inc b/data/scripts/gUnk_08012DB0.inc
index 0a4d5b99..a5e56c45 100644
--- a/data/scripts/gUnk_08012DB0.inc
+++ b/data/scripts/gUnk_08012DB0.inc
@@ -7,5 +7,5 @@ _0807EB44 0x0000
 _0807EF80 0x0000
 Wait 0x001e
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012DD8.inc b/data/scripts/gUnk_08012DD8.inc
index ec98d5e3..4d937700 100644
--- a/data/scripts/gUnk_08012DD8.inc
+++ b/data/scripts/gUnk_08012DD8.inc
@@ -9,23 +9,3 @@ WaitForSomething2 0x00000001
 _0807E908 0x0002
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0861
-.short 0x0000
-.short 0x0867
-.short 0x0140
-.short 0x0402
-.short 0x0c73
-.short 0x00b8
-.short 0x0094
-.short 0x0831
-.short 0x0008
-.short 0x0879
-.short 0x0000
-.short 0x0831
-.short 0x0008
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08012DF8.inc b/data/scripts/gUnk_08012DF8.inc
new file mode 100644
index 00000000..1e8c8cd7
--- /dev/null
+++ b/data/scripts/gUnk_08012DF8.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08012DF8
+StartScript 
+_0807EB44 0x0000
+SetEntityNonPlanarMovement 0x0140
+StopScript 
+_0807EDD4 0x00b8, 0x0094
+Wait 0x0008
+_0807EF80 0x0000
+Wait 0x0008
+_0807E5F8 0x00000001
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc
index 237c8a8f..c37dd7b9 100644
--- a/data/scripts/gUnk_08012E88.inc
+++ b/data/scripts/gUnk_08012E88.inc
@@ -3,16 +3,87 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
-Call sub_0806B60C
+Call 0x0806b60d
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0001
-Call sub_0806B4F0
+Call 0x0806b4f1
 _0807EA94 
 _0807E878 
 _0807EF80 0x0000
 Jump 0xffe2
 .short 0x0000
+StartScript 
+_0807EB44 0x0004
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+_0807EF80 0x000a
+Call 0x0806b60d
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x000c
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806b4f1
+_0807EA94 
+Wait 0x000f
+_0807E878 
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffd2
+
+.globl gUnk_08012F0C
+gUnk_08012F0C:
+StartScript 
+CallWithArg
+.short 0xa93d
+.short 0x0806
+.short 0x5678
+.short 0x1234
+@ End of 4 parameters
+_0807EB44 0x0004
+_0807E930 0x0002
+CheckInventory1 0x0015
+JumpIf 0x0190
+CheckLocalFlag 0x0060
+JumpIf 0x00a4
+CheckGlobalFlag 0x001e
+JumpIf 0x0050
+StopScript 
+CheckLocalFlag 0x0062
+JumpIfNot 0x0008
+Call 0x0806a9b1
+CheckLocalFlag 0x0061
+JumpIf 0x001e
+Call 0x0806a96d
+JumpIfNot 0xfff8
+_0807E864 
+TextboxNoOverlap 0x4401
+_0807EA94 
+SetLocalFlag 0x0061
+_0807E878 
+_0807E908 0x0001
+Call 0x0806a96d
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x4402
+_0807EA94 
+_0807E908 0x0001
+Jump 0xffea
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012EC0.inc b/data/scripts/gUnk_08012EC0.inc
deleted file mode 100644
index fec0518e..00000000
--- a/data/scripts/gUnk_08012EC0.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08012EC0
-StartScript 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000008
-_0807EF80 0x000a
-Call sub_0806B60C
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x0000000c
-Call sub_0806B4F0
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000008
-.short 0x0803
-.short 0xffd2
diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc
deleted file mode 100644
index bca78990..00000000
--- a/data/scripts/gUnk_08012F0C.inc
+++ /dev/null
@@ -1,155 +0,0 @@
-SCRIPT_START gUnk_08012F0C
-StartScript 
-CallWithArg sub_0806A93C, 0x12345678
-_0807EB44 0x0004
-_0807E930 0x0002
-CheckInventory1 0x0015
-JumpIf 0x0190
-CheckLocalFlag 0x0060
-JumpIf 0x00a4
-CheckGlobalFlag 0x001e
-JumpIf 0x0050
-StopScript 
-CheckLocalFlag 0x0062
-JumpIfNot 0x0008
-Call sub_0806A9B0
-CheckLocalFlag 0x0061
-JumpIf 0x001e
-Call sub_0806A96C
-JumpIfNot 0xfff8
-_0807E864 
-TextboxNoOverlap 0x4401
-_0807EA94 
-SetLocalFlag 0x0061
-_0807E878 
-_0807E908 0x0001
-Call sub_0806A96C
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x4402
-_0807EA94 
-_0807E908 0x0001
-Jump 0xffea
-SCRIPT_END
-.byte 0x1
-.byte 0x4
-.byte 0x12
-.byte 0x8
-.byte 0x60
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0x44
-.byte 0x0
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x47
-.byte 0xc
-.byte 0xe4
-.byte 0x30
-.byte 0x1
-.byte 0x8
-.byte 0x2a
-.byte 0x8
-.byte 0x60
-.byte 0x0
-.byte 0x2c
-.byte 0x8
-.byte 0x61
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x33
-.byte 0xc
-.byte 0x4
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x4d
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x59
-.byte 0xa9
-.byte 0x6
-.byte 0x8
-.byte 0xc
-.byte 0x14
-.byte 0x3d
-.byte 0xf9
-.byte 0x7
-.byte 0x8
-.byte 0xf4
-.byte 0xf2
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x2a
-.byte 0x8
-.byte 0x62
-.byte 0x0
-.byte 0x3
-.byte 0x8
-.byte 0x2a
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x50
-.byte 0x8
-.byte 0xd
-.byte 0x0
-.byte 0x4d
-.byte 0x8
-.byte 0x5
-.byte 0x0
-.byte 0x2a
-.byte 0x8
-.byte 0x62
-.byte 0x0
-.byte 0xc
-.byte 0x14
-.byte 0x3d
-.byte 0xf9
-.byte 0x7
-.byte 0x8
-.byte 0xf4
-.byte 0xf2
-.byte 0x0
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x11
-.byte 0xaa
-.byte 0x6
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0xf
-.byte 0x8
-.byte 0x38
-.byte 0x0
-.byte 0x4
-.byte 0x8
-.byte 0xe
-.byte 0x0
-.byte 0x51
-.byte 0x4
-.byte 0x5b
-.byte 0x8
-.byte 0x3
-.byte 0x44
-.byte 0x59
diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc
new file mode 100644
index 00000000..3e55cd38
--- /dev/null
+++ b/data/scripts/gUnk_08012F86.inc
@@ -0,0 +1,114 @@
+SCRIPT_START gUnk_08012F86
+StartScript 
+CheckLocalFlag 0x0060
+JumpIf 0x0044
+_0807E864 
+Call 0x0807df29
+StartPlayerScript 0x080130e4
+SetLocalFlag 0x0060
+ClearLocalFlag 0x0061
+StopScript 
+WaitForSomething2 0x00000004
+_0807E908 0x0004
+Call 0x0806a959
+CallWithArg
+.short 0xf93d
+.short 0x0807
+.short 0xf2f4
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807df51
+_0807E878 
+SetLocalFlag 0x0062
+Jump 0x002a
+StartScript 
+_0807E930 0x000d
+_0807E908 0x0005
+SetLocalFlag 0x0062
+CallWithArg
+.short 0xf93d
+.short 0x0807
+.short 0xf2f4
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806aa11
+StopScript 
+CheckInventory1 0x0038
+JumpIf 0x000e
+_0807E944 
+TextboxNoOverlap 0x4403
+_0807EA94 
+Jump 0xfff6
+_0807E944 
+StartScript 
+_0807E864 
+Call 0x0807df29
+StopScript 
+SoundReq 0x00cd
+_0807F088 0x0038
+WaitPlayerAction8 
+Wait 0x001e
+_0807E8E4_0 
+Call 0x0806ab9d
+_0807E930 0x000b
+Wait 0x003c
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x4404
+_0807EA94 
+Wait 0x001e
+_0807EF80 0x0004
+Wait 0x003c
+TextboxNoOverlap 0x440e
+_0807EA94 
+Wait 0x001e
+Call 0x0806a9e9
+_0807E930 0x000f
+Wait 0x00f0
+TextboxNoOverlap 0x4405
+_0807EA94 
+_0807E5F8 0x00000200
+_0807F034 0x0015
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlap 0x4406
+_0807EA94 
+_0807E908 0x0001
+Call 0x0807df51
+_0807E878 
+Call 0x0806a96d
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x4407
+_0807EA94 
+_0807E908 0x0001
+Call 0x0806a96d
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x440d
+_0807EA94 
+_0807E908 0x0001
+Jump 0xffd6
+CheckLocalFlag 0x0062
+JumpIfNot 0x0008
+Call 0x0806a9b1
+StopScript 
+Call 0x0806a96d
+JumpIfNot 0xfff8
+_0807E864 
+Call 0x0806aa19
+_0807EA94 
+_0807E878 
+_0807E908 0x0001
+Jump 0xffe4
+StartScript 
+_0807EB44 0x0006
+SetEntityNonPlanarMovement 0x0140
+StopScript 
+_0807EDD4 0x00a8, 0x0060
+Wait 0x0008
+_0807EF80 0x0000
+Wait 0x0008
+_0807EF80 0x0004
+Wait 0x000f
+_0807E5F8 0x00000004
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013001.inc b/data/scripts/gUnk_08013001.inc
deleted file mode 100644
index 56b02222..00000000
--- a/data/scripts/gUnk_08013001.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SCRIPT_START gUnk_08013001
-.short 0x0304
diff --git a/data/scripts/gUnk_08013003.inc b/data/scripts/gUnk_08013003.inc
deleted file mode 100644
index f91e8535..00000000
--- a/data/scripts/gUnk_08013003.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_START gUnk_08013003
-.short 0xf608
-.short 0x51ff
-.short 0x0104
-.short 0x4304
diff --git a/data/scripts/gUnk_0801300B.inc b/data/scripts/gUnk_0801300B.inc
deleted file mode 100644
index 35f3e1ac..00000000
--- a/data/scripts/gUnk_0801300B.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SCRIPT_START gUnk_0801300B
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x2
-.byte 0x4
-.byte 0x7b
-.byte 0x8
-.byte 0xcd
-.byte 0x0
-.byte 0x86
-.byte 0x8
-.byte 0x38
-.byte 0x0
-.byte 0x34
-.byte 0x4
-.byte 0x31
-.byte 0x8
-.byte 0x1e
-.byte 0x0
-.byte 0x49
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x9d
-.byte 0xab
-.byte 0x6
-.byte 0x8
-.byte 0x50
-.byte 0x8
-.byte 0xb
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x79
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x5b
-.byte 0x8
diff --git a/data/scripts/gUnk_0801303C.inc b/data/scripts/gUnk_0801303C.inc
deleted file mode 100644
index db5297a6..00000000
--- a/data/scripts/gUnk_0801303C.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SCRIPT_START gUnk_0801303C
-.short 0x4404
-.short 0x0459
-.short 0x0831
-.short 0x001e
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x003c
-.short 0x085b
-.short 0x440e
-.short 0x0459
-.short 0x0831
-.short 0x001e
-.short 0x0c0b
-.short 0xa9e9
-.short 0x0806
-.short 0x0850
-.short 0x000f
-.short 0x0831
-.short 0x00f0
-.short 0x085b
-.short 0x4405
-.short 0x0459
-.short 0x0c28
-.short 0x0200
-.short 0x0000
diff --git a/data/scripts/gUnk_08013070.inc b/data/scripts/gUnk_08013070.inc
deleted file mode 100644
index 820bc664..00000000
--- a/data/scripts/gUnk_08013070.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_08013070
-_0807F034 0x0015
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlap 0x4406
-_0807EA94 
-.byte 0x4d
-.byte 0x8
-.byte 0x1
diff --git a/data/scripts/gUnk_08013081.inc b/data/scripts/gUnk_08013081.inc
deleted file mode 100644
index 01b70f57..00000000
--- a/data/scripts/gUnk_08013081.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08013081
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x6d
-.byte 0xa9
-.byte 0x6
-.byte 0x8
diff --git a/data/scripts/gUnk_08013090.inc b/data/scripts/gUnk_08013090.inc
deleted file mode 100644
index 6abaa52d..00000000
--- a/data/scripts/gUnk_08013090.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-SCRIPT_START gUnk_08013090
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x4407
-_0807EA94 
-_0807E908 0x0001
-Call sub_0806A96C
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x440d
-_0807EA94 
-_0807E908 0x0001
-Jump 0xffd6
-CheckLocalFlag 0x0062
-JumpIfNot 0x0008
-Call sub_0806A9B0
-StopScript 
-Call sub_0806A96C
-JumpIfNot 0xfff8
-_0807E864 
-Call sub_0806AA18
-_0807EA94 
-_0807E878 
-_0807E908 0x0001
-Jump 0xffe4
-StartScript 
-_0807EB44 0x0006
-SetEntityNonPlanarMovement 0x0140
-StopScript 
-_0807EDD4 0x00a8, 0x0060
-Wait 0x0008
-_0807EF80 0x0000
-Wait 0x0008
-_0807EF80 0x0004
-Wait 0x000f
-_0807E5F8 0x00000004
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc
index 67ead4ba..2ef0bc28 100644
--- a/data/scripts/gUnk_08013114.inc
+++ b/data/scripts/gUnk_08013114.inc
@@ -3,29 +3,49 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EF80 0x0012
-Call sub_0807F348
+Call 0x0807f349
 StopScript 
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000c
-Call sub_0806AEE4
+Call 0x0806aee5
 Jump 0xffee
 _0807E864 
 StopScript 
 _0807EB74 
-Call sub_0806AED8
-CallWithArg sub_0806AA50, 0x00000000
+Call 0x0806aed9
+CallWithArg
+.short 0xaa51
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807EA94 
-CallWithArg sub_0806AA50, 0x00000001
+CallWithArg
+.short 0xaa51
+.short 0x0806
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
 _0807EA94 
-CallWithArg sub_0806AA50, 0x00000002
+CallWithArg
+.short 0xaa51
+.short 0x0806
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
 _0807EA94 
 JumpIf 0x0008
 _0807E878 
 Jump 0xffb4
 _0807E914 0x00000403
-Call sub_0807F420
+Call 0x0807f421
 _0807E878 
-.short 0x0803
-.short 0xffa2
+Jump 0xffa2
+StartScript 
+CheckLocalFlag 0x0062
+JumpIfNot 0x000a
+_0807EF80 0x0006
+StopScript 
+SCRIPT_END
diff --git a/data/scripts/gUnk_08013188.inc b/data/scripts/gUnk_08013188.inc
deleted file mode 100644
index fb9ad32b..00000000
--- a/data/scripts/gUnk_08013188.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08013188
-StartScript 
-CheckLocalFlag 0x0062
-JumpIfNot 0x000a
-_0807EF80 0x0006
-StopScript 
-SCRIPT_END
-.short 0x0402
-.short 0x0401
-.short 0x0487
-.short 0x046b
-.short 0x0c0b
-.short 0xab75
-.short 0x0806
-.short 0x0803
-.short 0xfff0
diff --git a/data/scripts/gUnk_080131AC.inc b/data/scripts/gUnk_0801319A.inc
similarity index 69%
rename from data/scripts/gUnk_080131AC.inc
rename to data/scripts/gUnk_0801319A.inc
index b7608277..4d4408c9 100644
--- a/data/scripts/gUnk_080131AC.inc
+++ b/data/scripts/gUnk_0801319A.inc
@@ -1,9 +1,15 @@
-SCRIPT_START gUnk_080131AC
+SCRIPT_START gUnk_0801319A
+StopScript 
+StartScript 
+CameraTargetEntity 
+MoveEntityToPlayer 
+Call 0x0806ab75
+Jump 0xfff0
 CheckPlayerInRegion 0x0098, 0x0038, 0x2060
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 StartPlayerScript 0x080132e4
 WaitForSomething2 0x00000002
 _0807EB28 0x1601
@@ -18,13 +24,16 @@ StartPlayerScript 0x08013330
 WaitForSomething2 0x00000002
 MoveEntityToPlayer 
 SetEntityPosition 0x0000, 0xfff0
-Call sub_0807F844
+Call 0x0807f845
 CameraTargetEntity 
-Call sub_080536B8
+Call 0x080536b9
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 WaitFor_2 
-TextboxNoOverlapFollowPos 0x1602, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x1602
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000010
@@ -38,7 +47,10 @@ WaitForSomething2 0x00000040
 StartPlayerScript 0x08013378
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000042
-TextboxNoOverlapFollowPos 0x1603, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x1603
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000040
@@ -47,11 +59,16 @@ _0807E778 0x0004
 DoFade5 
 WaitFor_2 
 SoundReq0x80100000 
-_0807E858 0x0000
+_0807E858
+.short 0x0000
+@ End of 1 parameters
 Wait 0x003c
 CameraTargetPlayer 
-Call sub_0807F5C0
-TextboxNoOverlapFollowPos 0x1604, 0x0007
+Call 0x0807f5c1
+TextboxNoOverlapFollowPos
+.short 0x1604
+.short 0x0007
+@ End of 2 parameters
 _0807EA94 
 _0807E788 0xffffffff
 _0807E778 0x0004
@@ -64,7 +81,7 @@ _0807EA94
 SetLocalFlag 0x0078
 SoundReq2 0x0031
 SetGlobalFlag 0x005d
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080132E4.inc b/data/scripts/gUnk_080132E4.inc
index 02de2083..d97b2794 100644
--- a/data/scripts/gUnk_080132E4.inc
+++ b/data/scripts/gUnk_080132E4.inc
@@ -7,23 +7,5 @@ _0807EDD4 0x0098, 0x0058
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
-.short 0x0401
-.short 0x0867
-.short 0x0080
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x086e
-.short 0x0020
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0801330C.inc b/data/scripts/gUnk_0801330C.inc
new file mode 100644
index 00000000..ff5c5c16
--- /dev/null
+++ b/data/scripts/gUnk_0801330C.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0801330C
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EF80 0x0001
+_0807EC64 0x0020
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013330.inc b/data/scripts/gUnk_08013330.inc
index 91ed7499..bf8a75d3 100644
--- a/data/scripts/gUnk_08013330.inc
+++ b/data/scripts/gUnk_08013330.inc
@@ -4,5 +4,5 @@ _0807EB44 0x0000
 SetEntityPositionRelative 0x00700098
 StopScript 
 _0807E5F8 0x00000002
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_0801334C.inc b/data/scripts/gUnk_0801334C.inc
index 2782c624..dbf10439 100644
--- a/data/scripts/gUnk_0801334C.inc
+++ b/data/scripts/gUnk_0801334C.inc
@@ -8,6 +8,6 @@ _0807ECC4 0x0020
 _0807EF80 0x0000
 _0807EF80 0x000c
 _0807E5F8 0x00000002
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013378.inc b/data/scripts/gUnk_08013378.inc
index 5c3179ad..bee24285 100644
--- a/data/scripts/gUnk_08013378.inc
+++ b/data/scripts/gUnk_08013378.inc
@@ -1,16 +1,16 @@
 SCRIPT_START gUnk_08013378
-Call sub_0807F1C4
-Call sub_0807F2D4
-Call sub_0807F1E8
-Call sub_0807F2D4
+Call 0x0807f1c5
+Call 0x0807f2d5
+Call 0x0807f1e9
+Call 0x0807f2d5
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 SoundReq 0x007c
 _0807EB44 0x0004
-Call sub_0807F210
+Call 0x0807f211
 _0807EF3C 0x0200, 0x0020
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_080133C4.inc b/data/scripts/gUnk_080133C4.inc
index a753fd84..31bde000 100644
--- a/data/scripts/gUnk_080133C4.inc
+++ b/data/scripts/gUnk_080133C4.inc
@@ -3,10 +3,10 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x0007
 _0807EF80 0x000b
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
 WaitForSomething2 0x00000008
-Call sub_08061F94
+Call 0x08061f95
 Wait 0x000a
 _0807E5F8 0x00000010
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc
index 3ff652f5..8742209f 100644
--- a/data/scripts/gUnk_080133F8.inc
+++ b/data/scripts/gUnk_080133F8.inc
@@ -3,11 +3,11 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x0008
 _0807EF80 0x000b
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
 WaitForSomething2 0x00000020
 SetEntityPositionRelative 0x00480098
-Call sub_08066C94
+Call 0x08066c95
 Wait 0x00e9
 _0807EF80 0x0007
 _0807E5F8 0x00000040
@@ -15,7 +15,12 @@ WaitForSomething2 0x00000020
 Wait 0x003c
 _0807EF80 0x0014
 SoundReq 0x0120
-CallWithArg sub_08095420, 0x08013494
+CallWithArg
+.short 0x5421
+.short 0x0809
+.short 0x3494
+.short 0x0801
+@ End of 4 parameters
 Wait 0x005a
 _0807EF80 0x0016
 WaitForSomething2 0x00000080
@@ -25,46 +30,10 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000020
-Call sub_08066CA4
+Call 0x08066ca5
 _0807EF80 0x0008
 Wait 0x0078
 _0807E5F8 0x00000040
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0850
-.short 0x0000
-.short 0x0867
-.short 0x0200
-.short 0x0c0b
-.short 0x5459
-.short 0x0809
-.short 0x0c0b
-.short 0x4b81
-.short 0x0809
-.short 0x0402
-.short 0x0831
-.short 0x005a
-.short 0x0c0b
-.short 0x4b6d
-.short 0x0809
-.short 0x0c73
-.short 0x0098
-.short 0x0080
-.short 0x0401
-.short 0x0c0b
-.short 0x4b81
-.short 0x0809
-.short 0x087b
-.short 0x01cc
-.short 0x0c0b
-.short 0xf36d
-.short 0x0807
-.short 0x0c28
-.short 0x0080
-.short 0x0000
-.short 0x0402
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_08013494.inc b/data/scripts/gUnk_08013494.inc
new file mode 100644
index 00000000..e0d9db10
--- /dev/null
+++ b/data/scripts/gUnk_08013494.inc
@@ -0,0 +1,18 @@
+SCRIPT_START gUnk_08013494
+StartScript 
+_0807E930 0x0000
+SetEntityNonPlanarMovement 0x0200
+Call 0x08095459
+Call 0x08094b81
+StopScript 
+Wait 0x005a
+Call 0x08094b6d
+_0807EDD4 0x0098, 0x0080
+StartScript 
+Call 0x08094b81
+SoundReq 0x01cc
+Call 0x0807f36d
+_0807E5F8 0x00000080
+StopScript 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc
index 5838d2d5..25dfe899 100644
--- a/data/scripts/gUnk_080134DC.inc
+++ b/data/scripts/gUnk_080134DC.inc
@@ -3,47 +3,107 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-Call sub_0807F92C
-CallWithArg sub_0806DA04, 0x00000003
+Call 0x0807f92d
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StartPlayerScript 0x080136d8
 WaitForSomething2 0x00000001
-CallWithArg sub_08095A1C, 0x08013f04
+CallWithArg
+.short 0x5a1d
+.short 0x0809
+.short 0x3f04
+.short 0x0801
+@ End of 4 parameters
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-CallWithArg sub_08095D54, 0x08013e04
-CallWithArg sub_08095D54, 0x08013e28
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x3e04
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x3e28
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 WaitForSomething2 0x18000000
 StartScript 
 SoundReq 0x01cf
-CallWithArg sub_08095D8C, 0x08014054
-CallWithArg sub_08095D8C, 0x08014074
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4054
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4074
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-CallWithArg sub_08095D8C, 0x080140dc
-CallWithArg sub_08095D8C, 0x08014118
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x40dc
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4118
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 Wait 0x003c
-CallWithArg sub_0805DDEC, 0x00000000
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-CallWithArg sub_08095D8C, 0x080141dc
-CallWithArg sub_08095D8C, 0x08014210
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x41dc
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4210
+.short 0x0801
+@ End of 4 parameters
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 Wait 0x0078
 _0807E5F8 0x00000060
-CallWithArg sub_0805DE18, 0x00000000
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -51,9 +111,9 @@ Wait 0x003c
 StartPlayerScript 0x08013b70
 _0807E5F8 0x00000080
 _0807F078 0x0003, 0x0001
-Call sub_0806DC3C
-Call sub_0806DC58
-Call sub_0807F304
+Call 0x0806dc3d
+Call 0x0806dc59
+Call 0x0807f305
 Wait 0x003c
 _0807E778 0x0004
 DoFade7 
@@ -65,48 +125,16 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-TextboxNoOverlapFollowPos 0x0503, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x0503
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00040000
-CallWithArg sub_0805DDEC, 0x00000001
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
 _0807F0C8 0xffff, 0x0000
-Call sub_0807F3F8
-Wait 0x003c
-_0807F0B4 0x0007
-SetEntityPositionRelative 0x00a800e8
-CameraTargetEntity 
-Wait 0x003c
-_0807E5F8 0x00000004
-Wait 0x0078
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-StartPlayerScript 0x080136b4
-WaitForSomething2 0x00000002
-_0807EB28 0x1501
-_0807EA94 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetLocalFlag 0x007a
-Call sub_08053250
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0c73
-.short 0x00e8
-.short 0x00a8
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc
new file mode 100644
index 00000000..438bdfe6
--- /dev/null
+++ b/data/scripts/gUnk_08013650.inc
@@ -0,0 +1,28 @@
+SCRIPT_START gUnk_08013650
+Call 0x0807f3f9
+Wait 0x003c
+_0807F0B4 0x0007
+SetEntityPositionRelative 0x00a800e8
+CameraTargetEntity 
+Wait 0x003c
+_0807E5F8 0x00000004
+Wait 0x0078
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+StartPlayerScript 0x080136b4
+WaitForSomething2 0x00000002
+_0807EB28 0x1501
+_0807EA94 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetLocalFlag 0x007a
+Call 0x08053251
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080136B4.inc b/data/scripts/gUnk_080136B4.inc
new file mode 100644
index 00000000..f2db5f95
--- /dev/null
+++ b/data/scripts/gUnk_080136B4.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080136B4
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x00e8, 0x00a8
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc
index 31efec12..15e0daab 100644
--- a/data/scripts/gUnk_080136D8.inc
+++ b/data/scripts/gUnk_080136D8.inc
@@ -2,33 +2,28 @@ SCRIPT_START gUnk_080136D8
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call sub_0807F584
-.short 0x1406
+Call 0x0807f585
+_0807E078
 .short 0x0008
 .short 0x0010
 .short 0x0018
 .short 0x000c
-.short 0x140c
+@ End of 4 parameters
+CallWithArg
 .short 0xf465
 .short 0x0807
 .short 0x00d0
 .short 0x0000
-.short 0x140c
+@ End of 4 parameters
+CallWithArg
 .short 0xf4f9
 .short 0x0807
 .short 0x0124
 .short 0x0000
-.short 0x0c73
-.short 0x00e8
-.short 0x0124
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
+@ End of 4 parameters
+_0807EDD4 0x00e8, 0x0124
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc
index 46af63b4..7b8a7711 100644
--- a/data/scripts/gUnk_08013720.inc
+++ b/data/scripts/gUnk_08013720.inc
@@ -3,37 +3,146 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-Call sub_0807F92C
-CallWithArg sub_0806DA04, 0x00000003
+Call 0x0807f92d
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StartPlayerScript 0x080136d8
 WaitForSomething2 0x00000001
-CallWithArg sub_08095A1C, 0x08013f34
+CallWithArg
+.short 0x5a1d
+.short 0x0809
+.short 0x3f34
+.short 0x0801
+@ End of 4 parameters
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-CallWithArg sub_08095D54, 0x08013e4c
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x3e4c
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 WaitForSomething2 0x20000000
 StartScript 
 SoundReq 0x01cf
-CallWithArg sub_08095D8C, 0x08014054
-CallWithArg sub_08095D8C, 0x08014074
-CallWithArg sub_08095D8C, 0x08014094
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4054
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4074
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4094
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-CallWithArg sub_08095D8C, 0x080140dc
-CallWithArg sub_08095D8C, 0x08014118
-CallWithArg sub_08095D8C, 0x08014154
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x40dc
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4118
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4154
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 Wait 0x003c
-.short 0x140c
+CallWithArg
 .short 0xdded
 .short 0x0805
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+_0807E5F8 0x00000200
+WaitForSomething2 0x00002000
+SoundReq 0x01d2
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x41dc
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4210
+.short 0x0801
+@ End of 4 parameters
+_0807E5F8 0x00000400
+WaitForSomething2 0x00004000
+_0807E5F8 0x00000800
+WaitForSomething2 0x00008000
+Wait 0x0078
+_0807E5F8 0x00000060
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Wait 0x0078
+_0807E5F8 0x00000080
+WaitForSomething2 0x00000100
+Wait 0x003c
+StartPlayerScript 0x08013b70
+_0807E5F8 0x00000080
+_0807F078 0x0004, 0x0001
+Call 0x0806dc3d
+Call 0x0806dc59
+Call 0x0807f305
+Wait 0x003c
+_0807E778 0x0004
+DoFade7 
+SoundReq 0x00f6
+WaitFor_2 
+Wait 0x003c
+_0807E5F8 0x00000010
+_0807E778 0x0002
+DoFade6 
+WaitFor_2 
+SoundReq 0x0109
+TextboxNoOverlapFollowPos
+.short 0x0504
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00040000
+SetLocalFlag 0x007b
+Call 0x08053251
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080137DA.inc b/data/scripts/gUnk_080137DA.inc
deleted file mode 100644
index e5295dde..00000000
--- a/data/scripts/gUnk_080137DA.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-SCRIPT_START gUnk_080137DA
-.short 0x0000
-.short 0x0000
-.short 0x0c28
-.short 0x0200
-.short 0x0000
-.short 0x0c33
-.short 0x2000
-.short 0x0000
-.short 0x087b
-.short 0x01d2
-.short 0x140c
-.short 0x5d8d
-.short 0x0809
-.short 0x41dc
-.short 0x0801
-.short 0x140c
-.short 0x5d8d
-.short 0x0809
-.short 0x4210
-.short 0x0801
-.short 0x0c28
-.short 0x0400
-.short 0x0000
-.short 0x0c33
-.short 0x4000
-.short 0x0000
-.short 0x0c28
-.short 0x0800
-.short 0x0000
-.short 0x0c33
-.short 0x8000
-.short 0x0000
-.short 0x0831
-.short 0x0078
-.short 0x0c28
-.short 0x0060
-.short 0x0000
-.short 0x140c
-.short 0xde19
-.short 0x0805
-.short 0x0000
-.short 0x0000
-.short 0x0831
-.short 0x0078
-.short 0x0c28
-.short 0x0080
-.short 0x0000
-.short 0x0c33
-.short 0x0100
-.short 0x0000
-.short 0x0831
-.short 0x003c
-.short 0x0c47
-.short 0x3b70
-.short 0x0801
-.short 0x0c28
-.short 0x0080
-.short 0x0000
-.short 0x0c85
-.short 0x0004
-.short 0x0001
-.short 0x0c0b
-.short 0xdc3d
-.short 0x0806
-.short 0x0c0b
-.short 0xdc59
-.short 0x0806
-.short 0x0c0b
-.short 0xf305
-.short 0x0807
-.short 0x0831
-.short 0x003c
-.short 0x0838
-.short 0x0004
-.short 0x043f
-.short 0x087b
-.short 0x00f6
-.short 0x0437
-.short 0x0831
-.short 0x003c
-.short 0x0c28
-.short 0x0010
-.short 0x0000
-.short 0x0838
-.short 0x0002
-.short 0x043e
-.short 0x0437
-.short 0x087b
-.short 0x0109
-.short 0x0c5c
-.short 0x0504
-.short 0x000c
-.short 0x0459
-.short 0x0c28
-.short 0x0000
-.short 0x0004
-.short 0x082a
-.short 0x007b
-.short 0x0c0b
-.short 0x3251
-.short 0x0805
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc
index 7f7e88c1..693239c0 100644
--- a/data/scripts/gUnk_080138B4.inc
+++ b/data/scripts/gUnk_080138B4.inc
@@ -3,45 +3,115 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-Call sub_0807F92C
-CallWithArg sub_0806DA04, 0x00000003
+Call 0x0807f92d
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StartPlayerScript 0x080136d8
 WaitForSomething2 0x00000001
-CallWithArg sub_08095A1C, 0x08013f64
+CallWithArg
+.short 0x5a1d
+.short 0x0809
+.short 0x3f64
+.short 0x0801
+@ End of 4 parameters
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-CallWithArg sub_08095D54, 0x08013e70
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x3e70
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 WaitForSomething2 0x40000000
 StartScript 
 SoundReq 0x01cf
-CallWithArg sub_08095D8C, 0x08014054
-CallWithArg sub_08095D8C, 0x08014074
-CallWithArg sub_08095D8C, 0x08014094
-CallWithArg sub_08095D8C, 0x080140b8
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4054
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4074
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4094
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x40b8
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-CallWithArg sub_08095D8C, 0x080140dc
-CallWithArg sub_08095D8C, 0x08014118
-CallWithArg sub_08095D8C, 0x08014154
-CallWithArg sub_08095D8C, 0x08014198
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x40dc
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4118
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4154
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4198
+.short 0x0801
+@ End of 4 parameters
 StopScript 
 Wait 0x003c
-CallWithArg sub_0805DDEC, 0x00000000
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-CallWithArg sub_08095D8C, 0x080141dc
-CallWithArg sub_08095D8C, 0x08014210
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x41dc
+.short 0x0801
+@ End of 4 parameters
+CallWithArg
+.short 0x5d8d
+.short 0x0809
+.short 0x4210
+.short 0x0801
+@ End of 4 parameters
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 _0807E5F8 0x00000800
@@ -50,7 +120,12 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00010000
 Wait 0x0078
 _0807E5F8 0x00000060
-CallWithArg sub_0805DE18, 0x00000000
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -58,10 +133,10 @@ Wait 0x003c
 StartPlayerScript 0x08013ba8
 _0807E5F8 0x00000080
 _0807F078 0x0006, 0x0001
-Call sub_0807AEE4
-Call sub_0806DC3C
-Call sub_0806DC58
-Call sub_0807F304
+Call 0x0807aee5
+Call 0x0806dc3d
+Call 0x0806dc59
+Call 0x0807f305
 Wait 0x003c
 _0807E778 0x0004
 DoFade7 
@@ -73,46 +148,42 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-TextboxNoOverlapFollowPos 0x0505, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x0505
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00040000
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x00d800e8
 CameraTargetEntity 
-Call sub_0806DC3C
-CallWithArg sub_0807F244, 0x00010001
-CallWithArg sub_0807F29C, 0x080049fe
+Call 0x0806dc3d
+CallWithArg
+.short 0xf245
+.short 0x0807
+.short 0x0001
+.short 0x0001
+@ End of 4 parameters
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x49fe
+.short 0x0800
+@ End of 4 parameters
 Wait 0x00c8
-CallWithArg sub_0807F29C, 0x00000000
-Call sub_0806DC58
+CallWithArg
+.short 0xf29d
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x0806dc59
 CheckRoomFlag 0x0004
 JumpIfNot 0xfffa
-CallWithArg sub_0805DDEC, 0x00000001
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
 _0807F0C8 0xffff, 0x0000
-Call sub_0807F3F8
-Wait 0x003c
-_0807E5F8 0x00000008
-Wait 0x0078
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-Wait 0x003c
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x005000e8
-CameraTargetEntity 
-Wait 0x003c
-LoadRoomEntityList 0x080f55d8
-Wait 0x0078
-_0807F0B4 0x0007
-MoveEntityToPlayer 
-CameraTargetEntity 
-Wait 0x003c
-_0807EB28 0x1502
-_0807EA94 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetLocalFlag 0x007c
-Call sub_08053250
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc
new file mode 100644
index 00000000..acd46843
--- /dev/null
+++ b/data/scripts/gUnk_08013AA6.inc
@@ -0,0 +1,33 @@
+SCRIPT_START gUnk_08013AA6
+Call 0x0807f3f9
+Wait 0x003c
+_0807E5F8 0x00000008
+Wait 0x0078
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+Wait 0x003c
+_0807F0B4 0x0004
+SetEntityPositionRelative 0x005000e8
+CameraTargetEntity 
+Wait 0x003c
+LoadRoomEntityList 0x080f55d8
+Wait 0x0078
+_0807F0B4 0x0007
+MoveEntityToPlayer 
+CameraTargetEntity 
+Wait 0x003c
+_0807EB28 0x1502
+_0807EA94 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetLocalFlag 0x007c
+Call 0x08053251
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc
index 817a9beb..1c768732 100644
--- a/data/scripts/gUnk_08013B18.inc
+++ b/data/scripts/gUnk_08013B18.inc
@@ -3,7 +3,12 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-CallWithArg sub_0807F6B4, 0x000001c8
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x01c8
+.short 0x0000
+@ End of 4 parameters
 JumpIfNot 0xfff0
 CheckInventory1 0x0006
 JumpIfNot 0xffe8
@@ -11,13 +16,29 @@ CheckLocalFlag 0x0078
 JumpIf 0xffe0
 StopScript 
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 _0807EB28 0x1507
 _0807EA94 
 StartPlayerScript 0x08010a14
 WaitForSomething2 0x00000001
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffb2
 .short 0x0000
+SoundReq 0x01d3
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x08bf
+.short 0x0000
+@ End of 4 parameters
+Call 0x08096029
+Wait 0x003c
+_0807E5F8 0x00020000
+Call 0x0807f305
+Wait 0x0078
+WaitForSomething2 0x00040000
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc
deleted file mode 100644
index 8f2b17b3..00000000
--- a/data/scripts/gUnk_08013B70.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08013B70
-SoundReq 0x01d3
-CallWithArg sub_0807F238, 0x000008bf
-Call sub_08096028
-Wait 0x003c
-_0807E5F8 0x00020000
-Call sub_0807F304
-Wait 0x0078
-WaitForSomething2 0x00040000
-Call sub_080791BC
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc
index a2337d5a..1435f7bf 100644
--- a/data/scripts/gUnk_08013BA8.inc
+++ b/data/scripts/gUnk_08013BA8.inc
@@ -1,12 +1,22 @@
 SCRIPT_START gUnk_08013BA8
-CallWithArg sub_08095E7C, 0x08014248
+CallWithArg
+.short 0x5e7d
+.short 0x0809
+.short 0x4248
+.short 0x0801
+@ End of 4 parameters
 SoundReq 0x01d3
-CallWithArg sub_0807F238, 0x000008e3
-Call sub_08096028
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x08e3
+.short 0x0000
+@ End of 4 parameters
+Call 0x08096029
 Wait 0x0078
 _0807E5F8 0x00020000
-Call sub_0807F304
+Call 0x0807f305
 Wait 0x0078
 WaitForSomething2 0x00040000
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc
index 34d54f72..df2384fd 100644
--- a/data/scripts/gUnk_08013BE8.inc
+++ b/data/scripts/gUnk_08013BE8.inc
@@ -20,10 +20,20 @@ CheckLocalFlag 0x007c
 JumpIf 0x0068
 StartScript 
 _0807EF80 0x0007
-Call sub_0807F934
+Call 0x0807f935
 _0807EF80 0x000a
-CallWithArg sub_080962F8, 0x00000000
-CallWithArg sub_0807F8E8, 0x00000004
+CallWithArg
+.short 0x62f9
+.short 0x0809
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+CallWithArg
+.short 0xf8e9
+.short 0x0807
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 StopScript 
 StartScript 
diff --git a/data/scripts/gUnk_08013CA4.inc b/data/scripts/gUnk_08013CA4.inc
index 3a3343b6..a0686709 100644
--- a/data/scripts/gUnk_08013CA4.inc
+++ b/data/scripts/gUnk_08013CA4.inc
@@ -3,150 +3,22 @@ StopScript
 CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0807F3F8
+Call 0x0807f9a5
+Call 0x0807df29
+Call 0x0807f3f9
 Wait 0x003c
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x013800e8
 CameraTargetEntity 
-Call sub_0807F5C0
+Call 0x0807f5c1
 Wait 0x0078
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call sub_0807F5C0
+Call 0x0807f5c1
 _0807EB28 0x1504
 _0807EA94 
 SetLocalFlag 0x0079
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
-.short 0x0401
-.short 0x0c0b
-.short 0xf92d
-.short 0x0807
-.short 0x0879
-.short 0x0008
-.short 0x140c
-.short 0xda05
-.short 0x0806
-.short 0x0004
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x140c
-.short 0x5d55
-.short 0x0809
-.short 0x0000
-.short 0x0000
-.short 0x087b
-.short 0x01cd
-.short 0x0c28
-.short 0x0000
-.short 0x0800
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0c0b
-.short 0xf92d
-.short 0x0807
-.short 0x0879
-.short 0x0008
-.short 0x140c
-.short 0xda05
-.short 0x0806
-.short 0x0004
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x140c
-.short 0x5d55
-.short 0x0809
-.short 0x0001
-.short 0x0000
-.short 0x087b
-.short 0x01cd
-.short 0x0c28
-.short 0x0000
-.short 0x1000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0c0b
-.short 0xf92d
-.short 0x0807
-.short 0x0879
-.short 0x0008
-.short 0x140c
-.short 0xda05
-.short 0x0806
-.short 0x0004
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x140c
-.short 0x5d55
-.short 0x0809
-.short 0x0002
-.short 0x0000
-.short 0x087b
-.short 0x01cd
-.short 0x0c28
-.short 0x0000
-.short 0x2000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0c0b
-.short 0xf92d
-.short 0x0807
-.short 0x0879
-.short 0x0008
-.short 0x140c
-.short 0xda05
-.short 0x0806
-.short 0x0004
-.short 0x0000
-.short 0x0402
-.short 0x0418
-.short 0x0805
-.short 0xfffc
-.short 0x140c
-.short 0x5d55
-.short 0x0809
-.short 0x0003
-.short 0x0000
-.short 0x087b
-.short 0x01cd
-.short 0x0c28
-.short 0x0000
-.short 0x4000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc
new file mode 100644
index 00000000..ec7cf676
--- /dev/null
+++ b/data/scripts/gUnk_08013D04.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08013D04
+StartScript 
+Call 0x0807f92d
+_0807EF80 0x0008
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x01cd
+_0807E5F8 0x08000000
+Call 0x080791bd
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc
new file mode 100644
index 00000000..b913f233
--- /dev/null
+++ b/data/scripts/gUnk_08013D44.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08013D44
+StartScript 
+Call 0x0807f92d
+_0807EF80 0x0008
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x01cd
+_0807E5F8 0x10000000
+Call 0x080791bd
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc
new file mode 100644
index 00000000..9a7a338c
--- /dev/null
+++ b/data/scripts/gUnk_08013D84.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08013D84
+StartScript 
+Call 0x0807f92d
+_0807EF80 0x0008
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x0002
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x01cd
+_0807E5F8 0x20000000
+Call 0x080791bd
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc
new file mode 100644
index 00000000..d0995ac5
--- /dev/null
+++ b/data/scripts/gUnk_08013DC4.inc
@@ -0,0 +1,25 @@
+SCRIPT_START gUnk_08013DC4
+StartScript 
+Call 0x0807f92d
+_0807EF80 0x0008
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+CallWithArg
+.short 0x5d55
+.short 0x0809
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+SoundReq 0x01cd
+_0807E5F8 0x40000000
+Call 0x080791bd
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013E04.inc b/data/scripts/gUnk_08013E04.inc
index b4e3a7d2..0ef31ed0 100644
--- a/data/scripts/gUnk_08013E04.inc
+++ b/data/scripts/gUnk_08013E04.inc
@@ -9,21 +9,3 @@ _0807E930 0x0001
 _0807E5F8 0x08000000
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0879
-.short 0x0007
-.short 0x0850
-.short 0x0002
-.short 0x0402
-.short 0x0867
-.short 0x0080
-.short 0x0c73
-.short 0x0120
-.short 0x00f8
-.short 0x0850
-.short 0x0003
-.short 0x0c28
-.short 0x0000
-.short 0x1000
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08013E28.inc b/data/scripts/gUnk_08013E28.inc
new file mode 100644
index 00000000..11c89886
--- /dev/null
+++ b/data/scripts/gUnk_08013E28.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08013E28
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0002
+StopScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EDD4 0x0120, 0x00f8
+_0807E930 0x0003
+_0807E5F8 0x10000000
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013E94.inc b/data/scripts/gUnk_08013E94.inc
index a70e41b9..3045337f 100644
--- a/data/scripts/gUnk_08013E94.inc
+++ b/data/scripts/gUnk_08013E94.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013E94
 StartScript 
 _0807EF80 0x0007
-Call sub_0807F180
+Call 0x0807f181
 SetEntityPositionRelative 0x00f800b0
 _0807E930 0x0001
 StopScript 
diff --git a/data/scripts/gUnk_08013EB0.inc b/data/scripts/gUnk_08013EB0.inc
index 3a4b3b44..4ca0767f 100644
--- a/data/scripts/gUnk_08013EB0.inc
+++ b/data/scripts/gUnk_08013EB0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013EB0
 StartScript 
 _0807EF80 0x0007
-Call sub_0807F180
+Call 0x0807f181
 SetEntityPositionRelative 0x00f80120
 _0807E930 0x0003
 StopScript 
diff --git a/data/scripts/gUnk_08013ECC.inc b/data/scripts/gUnk_08013ECC.inc
index 65f7af88..96385d5d 100644
--- a/data/scripts/gUnk_08013ECC.inc
+++ b/data/scripts/gUnk_08013ECC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013ECC
 StartScript 
 _0807EF80 0x0007
-Call sub_0807F180
+Call 0x0807f181
 SetEntityPositionRelative 0x01680120
 _0807E930 0x0005
 StopScript 
diff --git a/data/scripts/gUnk_08013EE8.inc b/data/scripts/gUnk_08013EE8.inc
index 6d498b41..63b7c705 100644
--- a/data/scripts/gUnk_08013EE8.inc
+++ b/data/scripts/gUnk_08013EE8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013EE8
 StartScript 
 _0807EF80 0x0007
-Call sub_0807F180
+Call 0x0807f181
 SetEntityPositionRelative 0x016800b0
 _0807E930 0x0007
 StopScript 
diff --git a/data/scripts/gUnk_08013F04.inc b/data/scripts/gUnk_08013F04.inc
index e6b22c50..551b77fc 100644
--- a/data/scripts/gUnk_08013F04.inc
+++ b/data/scripts/gUnk_08013F04.inc
@@ -5,7 +5,7 @@ _0807E930 0x0008
 StopScript 
 WaitForSomething2 0x00000080
 _0807E930 0x000b
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08013F34.inc b/data/scripts/gUnk_08013F34.inc
index 804fb892..da8861b5 100644
--- a/data/scripts/gUnk_08013F34.inc
+++ b/data/scripts/gUnk_08013F34.inc
@@ -5,7 +5,7 @@ _0807E930 0x0009
 StopScript 
 WaitForSomething2 0x00000080
 _0807E930 0x000c
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08013F64.inc b/data/scripts/gUnk_08013F64.inc
index 64131a9a..78aa1e28 100644
--- a/data/scripts/gUnk_08013F64.inc
+++ b/data/scripts/gUnk_08013F64.inc
@@ -5,7 +5,7 @@ _0807E930 0x000a
 StopScript 
 WaitForSomething2 0x00000080
 _0807E930 0x000d
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08013F94.inc b/data/scripts/gUnk_08013F94.inc
index edfefdb8..ff253afd 100644
--- a/data/scripts/gUnk_08013F94.inc
+++ b/data/scripts/gUnk_08013F94.inc
@@ -11,14 +11,14 @@ JumpIfNot 0xfff6
 CheckPlayerFlags 0x00400000
 JumpIfNot 0xffec
 StopScript 
-Call sub_0807FA40
+Call 0x0807fa41
 _0807E888 
-Call sub_0807DF38
+Call 0x0807df39
 Wait 0x0078
 _0807EB28 0x1505
 _0807EA94 
 SetLocalFlag 0x007d
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc
index a62e8d4e..8dabc50f 100644
--- a/data/scripts/gUnk_08013FE8.inc
+++ b/data/scripts/gUnk_08013FE8.inc
@@ -10,19 +10,24 @@ CheckLocalFlag 0x007a
 JumpIfNot 0xffee
 CheckInventory1 0x0003
 JumpIfNot 0xffe6
-CallWithArg sub_0807F6B4, 0x000000d0
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x00d0
+.short 0x0000
+@ End of 4 parameters
 JumpIfNot 0xffd8
 StopScript 
-Call sub_0807F9A4
+Call 0x0807f9a5
 StartScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StopScript 
 _0807EB28 0x1508
 _0807EA94 
 StartPlayerScript 0x08010a14
 WaitForSomething2 0x00000001
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffa6
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08014054.inc b/data/scripts/gUnk_08014054.inc
index 134e969b..83a143bc 100644
--- a/data/scripts/gUnk_08014054.inc
+++ b/data/scripts/gUnk_08014054.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014054
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0000
-Call sub_0807F738
+Call 0x0807f739
 StopScript 
 WaitForSomething 0x00000040
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08014074.inc b/data/scripts/gUnk_08014074.inc
index a7b8f9ff..324f5b3e 100644
--- a/data/scripts/gUnk_08014074.inc
+++ b/data/scripts/gUnk_08014074.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014074
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0001
-Call sub_0807F738
+Call 0x0807f739
 StopScript 
 WaitForSomething 0x00000040
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08014094.inc b/data/scripts/gUnk_08014094.inc
index 7be32608..add253c9 100644
--- a/data/scripts/gUnk_08014094.inc
+++ b/data/scripts/gUnk_08014094.inc
@@ -2,27 +2,9 @@ SCRIPT_START gUnk_08014094
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0002
-Call sub_0807F738
+Call 0x0807f739
 SetEntityPosition 0x0000, 0xfff0
 StopScript 
 WaitForSomething 0x00000040
 _0807EF80 0x0006
 SCRIPT_END
-.short 0x0401
-.short 0x0879
-.short 0x0007
-.short 0x0850
-.short 0x0003
-.short 0x0c0b
-.short 0xf739
-.short 0x0807
-.short 0x0c6a
-.short 0x0000
-.short 0xfff0
-.short 0x0402
-.short 0x0c32
-.short 0x0040
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_080140B8.inc b/data/scripts/gUnk_080140B8.inc
new file mode 100644
index 00000000..f4864b53
--- /dev/null
+++ b/data/scripts/gUnk_080140B8.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080140B8
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0003
+Call 0x0807f739
+SetEntityPosition 0x0000, 0xfff0
+StopScript 
+WaitForSomething 0x00000040
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080140DC.inc b/data/scripts/gUnk_080140DC.inc
index 0bd5c4b8..e910fe33 100644
--- a/data/scripts/gUnk_080140DC.inc
+++ b/data/scripts/gUnk_080140DC.inc
@@ -5,6 +5,11 @@ _0807E930 0x0004
 StopScript 
 WaitForSomething2 0x00000200
 _0807E930 0x0008
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
+Call 0x0807f2d5
+_0807E930 0x000c
+_0807E5F8 0x00002000
+WaitForSomething 0x00000020
+_0807E930 0x0010
+Call 0x0807f2d5
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080140F8.inc b/data/scripts/gUnk_080140F8.inc
deleted file mode 100644
index 213a346a..00000000
--- a/data/scripts/gUnk_080140F8.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_080140F8
-_0807E930 0x000c
-_0807E5F8 0x00002000
-WaitForSomething 0x00000020
-_0807E930 0x0010
-Call sub_0807F2D4
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_08014118.inc b/data/scripts/gUnk_08014118.inc
index 5891b34f..af3bce73 100644
--- a/data/scripts/gUnk_08014118.inc
+++ b/data/scripts/gUnk_08014118.inc
@@ -5,11 +5,11 @@ _0807E930 0x0005
 StopScript 
 WaitForSomething2 0x00000400
 _0807E930 0x0009
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E930 0x000d
 _0807E5F8 0x00004000
 WaitForSomething 0x00000020
 _0807E930 0x0011
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014154.inc b/data/scripts/gUnk_08014154.inc
index ba68aa29..02544d3a 100644
--- a/data/scripts/gUnk_08014154.inc
+++ b/data/scripts/gUnk_08014154.inc
@@ -6,46 +6,12 @@ SetEntityPosition 0x0000, 0xfff0
 StopScript 
 WaitForSomething2 0x00000800
 _0807E930 0x000a
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E930 0x000e
 _0807E5F8 0x00008000
 WaitForSomething 0x00000020
 _0807E930 0x0012
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0879
-.short 0x0007
-.short 0x0850
-.short 0x0007
-.short 0x0c6a
-.short 0x0000
-.short 0xfff0
-.short 0x0402
-.short 0x0c33
-.short 0x1000
-.short 0x0000
-.short 0x0850
-.short 0x000b
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0850
-.short 0x000f
-.short 0x0c28
-.short 0x0000
-.short 0x0001
-.short 0x0c32
-.short 0x0020
-.short 0x0000
-.short 0x0850
-.short 0x0013
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08014198.inc b/data/scripts/gUnk_08014198.inc
new file mode 100644
index 00000000..cfe74586
--- /dev/null
+++ b/data/scripts/gUnk_08014198.inc
@@ -0,0 +1,17 @@
+SCRIPT_START gUnk_08014198
+StartScript 
+_0807EF80 0x0007
+_0807E930 0x0007
+SetEntityPosition 0x0000, 0xfff0
+StopScript 
+WaitForSomething2 0x00001000
+_0807E930 0x000b
+Call 0x0807f2d5
+_0807E930 0x000f
+_0807E5F8 0x00010000
+WaitForSomething 0x00000020
+_0807E930 0x0013
+Call 0x0807f2d5
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc
index cc06dc39..a7f170e8 100644
--- a/data/scripts/gUnk_080141DC.inc
+++ b/data/scripts/gUnk_080141DC.inc
@@ -2,12 +2,17 @@ SCRIPT_START gUnk_080141DC
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0014
-Call sub_0807F714
-CallWithArg sub_0807F994, 0x0000fffc
+Call 0x0807f715
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfffc
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc
index 60f7eb8a..1a10fe76 100644
--- a/data/scripts/gUnk_08014210.inc
+++ b/data/scripts/gUnk_08014210.inc
@@ -2,34 +2,17 @@ SCRIPT_START gUnk_08014210
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0015
-Call sub_0807F714
-Call sub_0807F714
-CallWithArg sub_0807F994, 0x0000fffc
+Call 0x0807f715
+Call 0x0807f715
+CallWithArg
+.short 0xf995
+.short 0x0807
+.short 0xfffc
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0006
 SCRIPT_END
-.short 0x0c0e
-.short 0x0000
-.short 0x0002
-.short 0x0804
-.short 0x0014
-.short 0x0831
-.short 0x0008
-.short 0x140c
-.short 0x5ead
-.short 0x0809
-.short 0x0000
-.short 0x0000
-.short 0x0803
-.short 0xffe6
-.short 0x140c
-.short 0x5ead
-.short 0x0809
-.short 0x0001
-.short 0x0000
-.short 0x0803
-.short 0xfff4
-.short 0x0000
diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_08014248.inc
similarity index 54%
rename from data/scripts/gUnk_080142B0.inc
rename to data/scripts/gUnk_08014248.inc
index 934901e7..77458d3a 100644
--- a/data/scripts/gUnk_080142B0.inc
+++ b/data/scripts/gUnk_08014248.inc
@@ -1,4 +1,50 @@
-SCRIPT_START gUnk_080142B0
+SCRIPT_START gUnk_08014248
+TestBit 0x00020000
+JumpIf 0x0014
+Wait 0x0008
+CallWithArg
+.short 0x5ead
+.short 0x0809
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Jump 0xffe6
+CallWithArg
+.short 0x5ead
+.short 0x0809
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+Jump 0xfff4
+.short 0x0000
+StartScript 
+_0807EF80 0x0008
+StopScript 
+CheckLocalFlag 0x0078
+JumpIfNot 0xfffa
+StartScript 
+Call 0x0807f935
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+TextboxNoOverlapFollowPos
+.short 0x0647
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
+
+.globl gUnk_080142B0
+gUnk_080142B0:
 StartScript 
 CheckLocalFlag 0x0054
 JumpIf 0x00ca
@@ -16,7 +62,7 @@ _0807E864
 SetLocalFlag 0x0053
 Wait 0x0014
 _0807E908 0x0004
-Call sub_080654DC
+Call 0x080654dd
 Wait 0x001e
 _0807E930 0x0001
 Wait 0x000a
@@ -47,7 +93,7 @@ _0807E864
 SetLocalFlag 0x0054
 Wait 0x005a
 _0807E908 0x0004
-Call sub_080654EC
+Call 0x080654ed
 Wait 0x001e
 _0807E930 0x0001
 Wait 0x001e
diff --git a/data/scripts/gUnk_08014274.inc b/data/scripts/gUnk_08014274.inc
deleted file mode 100644
index ccc724fd..00000000
--- a/data/scripts/gUnk_08014274.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_08014274
-StartScript 
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x0078
-JumpIfNot 0xfffa
-StartScript 
-Call sub_0807F934
-CallWithArg sub_0806DA04, 0x00000008
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-TextboxNoOverlapFollowPos 0x0647, 0x000c
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
diff --git a/data/scripts/gUnk_08014384.inc b/data/scripts/gUnk_08014384.inc
index 731675ae..8d27c3d1 100644
--- a/data/scripts/gUnk_08014384.inc
+++ b/data/scripts/gUnk_08014384.inc
@@ -5,7 +5,7 @@ _0807EA94
 _0807E3E8 
 JumpIfNot 0x001e
 Wait 0x001e
-Call sub_08065370
+Call 0x08065371
 JumpIfNot 0x0010
 Wait 0x003c
 _0807EA94 
diff --git a/data/scripts/gUnk_080143C0.inc b/data/scripts/gUnk_080143C0.inc
index ecee7e48..79b9f487 100644
--- a/data/scripts/gUnk_080143C0.inc
+++ b/data/scripts/gUnk_080143C0.inc
@@ -1,17 +1,37 @@
 SCRIPT_START gUnk_080143C0
 StopScript 
 _0807E864 
-Call sub_0807DF28
-Call sub_080654FC
+Call 0x0807df29
+Call 0x080654fd
 _0807E930 0x0001
-Call sub_080654EC
+Call 0x080654ed
 Wait 0x003c
 TextboxNoOverlap 0x2c16
 _0807EA94 
 _0807E3E8 
 JumpIf 0x0012
 _0807E914 0x00000002
-Call sub_08065528
+Call 0x08065529
 Jump 0x0046
-Call sub_080654EC
-.short 0x0831
+Call 0x080654ed
+Wait 0x001e
+TextboxNoOverlap 0x2c18
+_0807EA94 
+Wait 0x000a
+_0807E914 0x00000000
+Call 0x08065529
+_0807F034 0x0036
+WaitPlayerAction8 
+TextboxNoOverlap 0x2c19
+_0807EA94 
+_0807E914 0x00000303
+Call 0x0807f421
+Wait 0x001e
+_0807EB8C 
+TextboxNoOverlap 0x2c22
+_0807EA94 
+_0807E930 0x0004
+_0807E908 0x0001
+Call 0x0807df51
+_0807E878 
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014402.inc b/data/scripts/gUnk_08014402.inc
deleted file mode 100644
index bd738b1a..00000000
--- a/data/scripts/gUnk_08014402.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_08014402
-.short 0x001e
-.short 0x085b
-.short 0x2c18
-.short 0x0459
-.short 0x0831
-.short 0x000a
-.short 0x0c4e
-.short 0x0000
-.short 0x0000
-.short 0x0c0b
-.short 0x5529
-.short 0x0806
-.short 0x0882
-.short 0x0036
-.short 0x0434
-.short 0x085b
-.short 0x2c19
-.short 0x0459
-.short 0x0c4e
-.short 0x0303
-.short 0x0000
-.short 0x0c0b
-.short 0xf421
-.short 0x0807
-.short 0x0831
-.short 0x001e
-.short 0x0464
-.short 0x085b
-.short 0x2c22
-.short 0x0459
-.short 0x0850
-.short 0x0004
-.short 0x084d
-.short 0x0001
-.short 0x0c0b
-.short 0xdf51
-.short 0x0807
-.short 0x0444
-.short 0xffff
diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc
index 1f36e998..663eece6 100644
--- a/data/scripts/gUnk_08014450.inc
+++ b/data/scripts/gUnk_08014450.inc
@@ -23,52 +23,33 @@ HasRupees 0x000a
 JumpIf 0x000a
 TextboxNoOverlapFollow 0x4204
 Jump 0x005c
-Call sub_0806E250
+Call 0x0806e251
 JumpIfNot 0x000e
 TextboxNoOverlapFollow 0x420b
 _0807EB38 
-.short 0x0c06
+_0807E078
 .short 0x0004
 .short 0x000a
-.short 0x082c
-.short 0x0093
-.short 0x0803
-.short 0x000a
-.short 0x082a
-.short 0x0093
-.short 0x082a
-.short 0x00d3
-.short 0x087f
-.short 0xfff6
-.short 0x085a
-.short 0x420c
-.short 0x087b
-.short 0x010c
-.short 0x0831
-.short 0x0018
-.short 0x082f
-.short 0x0000
-.short 0x082a
-.short 0x0092
-.short 0x0c77
-.short 0x0000
-.short 0xffa0
-.short 0x0c0b
-.short 0xdf39
-.short 0x0807
-.short 0x0803
-.short 0x000e
-.short 0x0850
-.short 0x0009
-.short 0x0831
-.short 0x003c
-.short 0x0850
-.short 0x0002
-.short 0x0444
-.short 0x0815
-.short 0x0000
-.short 0x0805
-.short 0xff5e
-.short 0x0454
-.short 0xffff
+@ End of 2 parameters
+ClearLocalFlag 0x0093
+Jump 0x000a
+SetLocalFlag 0x0093
+SetLocalFlag 0x00d3
+ModRupees 0xfff6
+TextboxNoOverlapFollow 0x420c
+SoundReq 0x010c
+Wait 0x0018
+SetRoomFlag 0x0000
+SetLocalFlag 0x0092
+_0807EEF4 0x0000, 0xffa0
+Call 0x0807df39
+Jump 0x000e
+_0807E930 0x0009
+Wait 0x003c
+_0807E930 0x0002
+_0807E878 
+CheckRoomFlag 0x0000
+JumpIfNot 0xff5e
+_0807E9DC 
+SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0801450C.inc b/data/scripts/gUnk_0801450C.inc
index 13f1cc79..bf8d0973 100644
--- a/data/scripts/gUnk_0801450C.inc
+++ b/data/scripts/gUnk_0801450C.inc
@@ -6,12 +6,29 @@ SetEntityNonPlanarMovement 0x01c0
 _0807EF80 0x000a
 StopScript 
 _0807E864 
-Call sub_0807DF28
-Call sub_0806E20C
+Call 0x0807df29
+Call 0x0806e20d
 _0807EA94 
-Call sub_0806E23C
+Call 0x0806e23d
 ClearLocalFlag 0x0093
 ClearLocalFlag 0x0092
-Call sub_0807DF50
+Call 0x0807df51
 Jump 0xffb8
 .short 0x0000
+StartScript 
+StopScript 
+CheckPlayerInRegion 0x0078, 0x0088, 0x0810
+JumpIfNot 0xfff6
+CheckRoomFlag 0x0000
+JumpIfNot 0xffee
+_0807E864 
+_0807EB28 0x4217
+_0807EA94 
+StartPlayerScript 0x08014588
+Wait 0x0010
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+_0807E878 
+Jump 0xffca
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014548.inc b/data/scripts/gUnk_08014548.inc
deleted file mode 100644
index 7b59ad10..00000000
--- a/data/scripts/gUnk_08014548.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPT_START gUnk_08014548
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x0078, 0x0088, 0x0810
-JumpIfNot 0xfff6
-CheckRoomFlag 0x0000
-JumpIfNot 0xffee
-_0807E864 
-_0807EB28 0x4217
-_0807EA94 
-StartPlayerScript 0x08014588
-Wait 0x0010
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E878 
-Jump 0xffca
-SCRIPT_END
-.short 0x0000
-.short 0x0402
-.short 0x0c33
-.short 0x0001
-.short 0x0000
-.short 0x0867
-.short 0x00e0
-.short 0x0c73
-.short 0x0078
-.short 0x0078
-.short 0x0879
-.short 0x0000
-.short 0x0831
diff --git a/data/scripts/gUnk_08014588.inc b/data/scripts/gUnk_08014588.inc
new file mode 100644
index 00000000..23d8ddc7
--- /dev/null
+++ b/data/scripts/gUnk_08014588.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08014588
+StopScript 
+WaitForSomething2 0x00000001
+SetEntityNonPlanarMovement 0x00e0
+_0807EDD4 0x0078, 0x0078
+_0807EF80 0x0000
+Wait 0x0010
+_0807E5F8 0x00000002
+Call 0x0807921d
+SCRIPT_END
diff --git a/data/scripts/gUnk_080145A0.inc b/data/scripts/gUnk_080145A0.inc
deleted file mode 100644
index c5e52a05..00000000
--- a/data/scripts/gUnk_080145A0.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_080145A0
-.short 0x0010
-.short 0x0c28
-.short 0x0002
-.short 0x0000
-.short 0x0c0b
-.short 0x921d
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc
index 38db9194..b155d174 100644
--- a/data/scripts/gUnk_080145B0.inc
+++ b/data/scripts/gUnk_080145B0.inc
@@ -10,7 +10,10 @@ _0807E864
 ClearRoomFlag 0x0005
 Wait 0x000c
 _0807EB8C 
-TextboxNoOverlapFollowPos 0x432e, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x432e
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E878 
 Jump 0xffe0
diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc
index f6bd23b8..ea393b3a 100644
--- a/data/scripts/gUnk_080145E8.inc
+++ b/data/scripts/gUnk_080145E8.inc
@@ -7,12 +7,151 @@ StopScript
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 CheckRoomFlag 0x0004
 JumpIf 0xfffa
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
-.short 0x0803
-.short 0xffd2
+Jump 0xffd2
+StartScript 
+_0807E9D4 
+_0807EB44 0x0004
+SetEntityDirection 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIf 0x0062
+TestBit 0x00000004
+JumpIf 0x0132
+CheckRoomFlag 0x0004
+JumpIf 0x0022
+Call 0x0808861d
+JumpIfNot 0xffe0
+CheckLocalFlag 0x005e
+JumpIf 0x003e
+_0807E864 
+_0807EB8C 
+TextboxNoOverlapFollowPos
+.short 0x432b
+.short 0x000c
+@ End of 2 parameters
+Jump 0x015e
+Call 0x08088659
+JumpIfNot 0xffc0
+_0807E864 
+_0807EB28 0x431f
+_0807EA94 
+StartPlayerScript 0x080147dc
+Wait 0x0010
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+_0807E878 
+Jump 0xff9c
+_0807E864 
+_0807E930 0x0008
+Wait 0x0010
+_0807EB8C 
+Wait 0x0010
+_0807E930 0x0002
+CheckGlobalFlag 0x0059
+JumpIfNot 0x000c
+TextboxNoOverlapFollowPos
+.short 0x432f
+.short 0x000c
+@ End of 2 parameters
+Jump 0x010a
+CheckRoomFlag 0x0004
+JumpIf 0x0028
+CheckLocalFlag 0x005e
+JumpIfNot 0x002a
+CheckRoomFlag 0x0006
+JumpIf 0x0052
+CheckLocalFlag 0x005f
+JumpIf 0x003c
+Call 0x08088575
+SetRoomFlag 0x0009
+Jump 0x004a
+TextboxNoOverlapFollowPos
+.short 0x431e
+.short 0x000c
+@ End of 2 parameters
+Jump 0x00d2
+SetRoomFlag 0x0009
+SetLocalFlag 0x005c
+TextboxNoOverlapFollowPos
+.short 0x4305
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E3BC 0x0001
+JumpIfNot 0x00b0
+TextboxNoOverlapFollowPos
+.short 0x4306
+.short 0x000c
+@ End of 2 parameters
+Jump 0x001e
+SetRoomFlag 0x0009
+Call 0x08088505
+Jump 0x0010
+SetRoomFlag 0x0009
+ClearRoomFlag 0x0006
+Call 0x08088545
+_0807E3E8 
+JumpIfNot 0x0030
+_0807EA94 
+_0807E3BC 0x0001
+JumpIfNot 0x007a
+SetRoomFlag 0x0001
+Wait 0x0014
+CheckRoomFlag 0x0003
+JumpIfNot 0xfffa
+ClearRoomFlag 0x0003
+_0807EA94 
+SetRoomFlag 0x0004
+TextboxNoOverlapFollowPos
+.short 0x431e
+.short 0x000c
+@ End of 2 parameters
+Jump 0x0060
+SetRoomFlag 0x0009
+_0807EA94 
+Jump 0x0056
+CheckRoomFlag 0x0008
+JumpIf 0x0034
+CheckRoomFlag 0x0007
+JumpIf 0x001c
+Call 0x08088479
+_0807EA94 
+Call 0x080885b1
+WaitPlayerAction8 
+_0807E5F8 0x00000008
+Jump 0x002c
+_0807E930 0x0009
+Wait 0x003c
+_0807E930 0x0002
+Jump 0xffd8
+_0807E930 0x000a
+Wait 0x008c
+_0807E930 0x0002
+Jump 0xffc8
+SetRoomFlag 0x0009
+TextboxNoOverlapFollowPos
+.short 0x4307
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+Wait 0x0004
+_0807E878 
+Jump 0xfe62
+.short 0x0000
+StopScript 
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x00e0
+_0807EDD4 0x0078, 0x0068
+_0807EF80 0x0000
+Wait 0x0010
+_0807E5F8 0x00000001
+Call 0x0807921d
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014628.inc b/data/scripts/gUnk_08014628.inc
deleted file mode 100644
index 11caa14c..00000000
--- a/data/scripts/gUnk_08014628.inc
+++ /dev/null
@@ -1,131 +0,0 @@
-SCRIPT_START gUnk_08014628
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-SetEntityDirection 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIf 0x0062
-TestBit 0x00000004
-JumpIf 0x0132
-CheckRoomFlag 0x0004
-JumpIf 0x0022
-Call sub_0808861C
-JumpIfNot 0xffe0
-CheckLocalFlag 0x005e
-JumpIf 0x003e
-_0807E864 
-_0807EB8C 
-TextboxNoOverlapFollowPos 0x432b, 0x000c
-Jump 0x015e
-Call sub_08088658
-JumpIfNot 0xffc0
-_0807E864 
-_0807EB28 0x431f
-_0807EA94 
-StartPlayerScript 0x080147dc
-Wait 0x0010
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807E878 
-Jump 0xff9c
-_0807E864 
-_0807E930 0x0008
-Wait 0x0010
-_0807EB8C 
-Wait 0x0010
-_0807E930 0x0002
-CheckGlobalFlag 0x0059
-JumpIfNot 0x000c
-TextboxNoOverlapFollowPos 0x432f, 0x000c
-Jump 0x010a
-CheckRoomFlag 0x0004
-JumpIf 0x0028
-CheckLocalFlag 0x005e
-JumpIfNot 0x002a
-CheckRoomFlag 0x0006
-JumpIf 0x0052
-CheckLocalFlag 0x005f
-JumpIf 0x003c
-Call sub_08088574
-SetRoomFlag 0x0009
-Jump 0x004a
-TextboxNoOverlapFollowPos 0x431e, 0x000c
-Jump 0x00d2
-SetRoomFlag 0x0009
-SetLocalFlag 0x005c
-TextboxNoOverlapFollowPos 0x4305, 0x000c
-_0807EA94 
-_0807E3BC 0x0001
-JumpIfNot 0x00b0
-TextboxNoOverlapFollowPos 0x4306, 0x000c
-Jump 0x001e
-SetRoomFlag 0x0009
-Call sub_08088504
-Jump 0x0010
-SetRoomFlag 0x0009
-ClearRoomFlag 0x0006
-Call sub_08088544
-_0807E3E8 
-JumpIfNot 0x0030
-_0807EA94 
-_0807E3BC 0x0001
-JumpIfNot 0x007a
-SetRoomFlag 0x0001
-Wait 0x0014
-CheckRoomFlag 0x0003
-JumpIfNot 0xfffa
-ClearRoomFlag 0x0003
-_0807EA94 
-SetRoomFlag 0x0004
-TextboxNoOverlapFollowPos 0x431e, 0x000c
-Jump 0x0060
-SetRoomFlag 0x0009
-_0807EA94 
-Jump 0x0056
-CheckRoomFlag 0x0008
-JumpIf 0x0034
-CheckRoomFlag 0x0007
-JumpIf 0x001c
-Call sub_08088478
-_0807EA94 
-Call sub_080885B0
-WaitPlayerAction8 
-_0807E5F8 0x00000008
-Jump 0x002c
-_0807E930 0x0009
-Wait 0x003c
-_0807E930 0x0002
-Jump 0xffd8
-_0807E930 0x000a
-Wait 0x008c
-_0807E930 0x0002
-Jump 0xffc8
-SetRoomFlag 0x0009
-TextboxNoOverlapFollowPos 0x4307, 0x000c
-_0807EA94 
-Wait 0x0004
-_0807E878 
-Jump 0xfe62
-.short 0x0000
-.short 0x0402
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0867
-.short 0x00e0
-.short 0x0c73
-.short 0x0078
-.short 0x0068
-.short 0x0879
-.short 0x0000
-.short 0x0831
-.short 0x0010
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x921d
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc
index 85a06e5b..a67cef9c 100644
--- a/data/scripts/gUnk_08014804.inc
+++ b/data/scripts/gUnk_08014804.inc
@@ -5,11 +5,14 @@ _0807EB44 0x0000
 _0807EF80 0x000a
 StopScript 
 _0807E864 
-Call sub_0807DF38
+Call 0x0807df39
 Wait 0x0010
 CheckLocalFlag 0x0093
 JumpIf 0x0092
-TextboxNoOverlapFollowPos 0x4215, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x4215
+.short 0x000c
+@ End of 2 parameters
 _0807E878 
 TestBit 0x00000001
 JumpIf 0x002c
@@ -21,7 +24,10 @@ _0807E864
 _0807E930 0x0008
 Wait 0x0020
 _0807E930 0x0002
-TextboxNoOverlapFollowPos 0x4215, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x4215
+.short 0x000c
+@ End of 2 parameters
 _0807E878 
 Jump 0xffce
 _0807E930 0x0008
@@ -44,7 +50,10 @@ _0807E864
 _0807E930 0x0008
 Wait 0x0020
 _0807E930 0x0002
-TextboxNoOverlapFollowPos 0x4216, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x4216
+.short 0x000c
+@ End of 2 parameters
 _0807E878 
 Jump 0xffce
 _0807E930 0x0008
@@ -58,3 +67,30 @@ _0807E930 0x0002
 _0807E5F8 0x00000008
 Jump 0xffa2
 .short 0x0000
+StartScript 
+StopScript 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+ClearRoomFlag 0x0000
+Call 0x0806e141
+JumpIfNot 0x002a
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0028
+_0807E864 
+_0807E5F8 0x00000001
+WaitForSomething2 0x00000002
+Call 0x0806e1e1
+_0807EA94 
+Wait 0x0018
+_0807E878 
+Jump 0xffc4
+_0807EA94 
+Jump 0x0002
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000008
+Call 0x0806e1fd
+Wait 0x001e
+Call 0x0807df51
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080148F0.inc b/data/scripts/gUnk_080148F0.inc
deleted file mode 100644
index b2e71487..00000000
--- a/data/scripts/gUnk_080148F0.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SCRIPT_START gUnk_080148F0
-StartScript 
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-ClearRoomFlag 0x0000
-Call sub_0806E140
-JumpIfNot 0x002a
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0028
-_0807E864 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Call sub_0806E1E0
-_0807EA94 
-Wait 0x0018
-_0807E878 
-Jump 0xffc4
-_0807EA94 
-Jump 0x0002
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-Call sub_0806E1FC
-Wait 0x001e
-Call sub_0807DF50
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08014958.inc b/data/scripts/gUnk_08014958.inc
index adb2d017..db98456c 100644
--- a/data/scripts/gUnk_08014958.inc
+++ b/data/scripts/gUnk_08014958.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08014958
 StartScript 
-Call sub_0806C870
+Call 0x0806c871
 _0807EF80 0x000a
 CheckGlobalFlag 0x0058
 JumpIf 0x000c
@@ -11,9 +11,25 @@ _0807E30C
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_0806C90C
+Call 0x0806c90d
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x0803
-.short 0xffe6
+Jump 0xffe6
+StartScript 
+Call 0x0806c871
+_0807EF80 0x000a
+CheckGlobalFlag 0x0058
+JumpIfNot 0x0020
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806c90d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014994.inc b/data/scripts/gUnk_08014994.inc
deleted file mode 100644
index 17b45756..00000000
--- a/data/scripts/gUnk_08014994.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_START gUnk_08014994
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-CheckGlobalFlag 0x0058
-JumpIfNot 0x0020
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc
index 7751e519..9882bfe8 100644
--- a/data/scripts/gUnk_080149CC.inc
+++ b/data/scripts/gUnk_080149CC.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_080149CC
 StartScript 
 SetEntityNonPlanarMovement 0x0080
-Call sub_0806C870
+Call 0x0806c871
 _0807EF80 0x000a
 StopScript 
 _0807E30C 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call sub_0806C90C
+Call 0x0806c90d
 _0807EA94 
 CheckLocalFlag 0x0064
 JumpIfNot 0x002a
@@ -25,3 +25,85 @@ _0807EF80 0x000a
 _0807E878 
 Jump 0xffba
 .short 0x0000
+StartScript 
+Call 0x0806c871
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806c90d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
+StartScript 
+Call 0x0806c871
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806c90d
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffe6
+.short 0x0000
+
+    .globl gUnk_08014A80
+gUnk_08014A80:
+StartScript 
+_0807EF80 0x000a
+StopScript 
+WaitForSomething2 0x00000001
+_0807EB74 
+_0807EF80 0x0004
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+TextboxNoOverlap 0x2f0a
+_0807EA94 
+_0807E5F8 0x00000002
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2f0a
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
+StartScript 
+Call 0x0806c871
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+StartPlayerScript 0x08014b10
+WaitForSomething2 0x00000001
+_0807EB74 
+CheckLocalFlag 0x0064
+JumpIf 0x000e
+SetLocalFlag 0x0064
+TextboxNoOverlap 0x2f0b
+Jump 0x0006
+TextboxNoOverlap 0x2f0c
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffc6
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0078, 0x0040
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014A28.inc b/data/scripts/gUnk_08014A28.inc
deleted file mode 100644
index 7788423f..00000000
--- a/data/scripts/gUnk_08014A28.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_08014A28
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
diff --git a/data/scripts/gUnk_08014A54.inc b/data/scripts/gUnk_08014A54.inc
deleted file mode 100644
index c9ff8985..00000000
--- a/data/scripts/gUnk_08014A54.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_08014A54
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc
deleted file mode 100644
index 49eabcbb..00000000
--- a/data/scripts/gUnk_08014A80.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPT_START gUnk_08014A80
-StartScript 
-_0807EF80 0x000a
-StopScript 
-WaitForSomething2 0x00000001
-_0807EB74 
-_0807EF80 0x0004
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-TextboxNoOverlap 0x2f0a
-_0807EA94 
-_0807E5F8 0x00000002
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2f0a
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
diff --git a/data/scripts/gUnk_08014AC4.inc b/data/scripts/gUnk_08014AC4.inc
deleted file mode 100644
index 76c5fb81..00000000
--- a/data/scripts/gUnk_08014AC4.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-SCRIPT_START gUnk_08014AC4
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-StartPlayerScript 0x08014b10
-WaitForSomething2 0x00000001
-_0807EB74 
-CheckLocalFlag 0x0064
-JumpIf 0x000e
-SetLocalFlag 0x0064
-TextboxNoOverlap 0x2f0b
-Jump 0x0006
-TextboxNoOverlap 0x2f0c
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffc6
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0c73
-.short 0x0078
-.short 0x0040
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08014B34.inc b/data/scripts/gUnk_08014B34.inc
index 10da7252..afc0cefd 100644
--- a/data/scripts/gUnk_08014B34.inc
+++ b/data/scripts/gUnk_08014B34.inc
@@ -21,31 +21,31 @@ _0807E878
 Jump 0xffda
 StopScript 
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 _0807E5F8 0x00000001
 _0807EF80 0x0004
 WaitForSomething2 0x00000002
 _0807E930 0x0010
-Call sub_0806CCF8
+Call 0x0806ccf9
 Wait 0x0014
-Call sub_0806CD04
+Call 0x0806cd05
 Wait 0x0014
-Call sub_0806CD14
+Call 0x0806cd15
 Wait 0x0014
-Call sub_0806CD20
+Call 0x0806cd21
 Wait 0x0014
-Call sub_0806CD30
+Call 0x0806cd31
 Wait 0x0014
-Call sub_0806CD3C
+Call 0x0806cd3d
 Wait 0x0014
-Call sub_0806CD4C
+Call 0x0806cd4d
 SoundReq 0x0072
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807E930 0x0010
-Call sub_0806CD4C
+Call 0x0806cd4d
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
@@ -62,5 +62,56 @@ TextboxNoOverlap 0x2f08
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x0803
-.short 0xffc8
+Jump 0xffc8
+StartScript 
+Call 0x0806cd59
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E930 0x0006
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x0806ccd1
+JumpIfNot 0xfff8
+Call 0x0806ccb5
+JumpIfNot 0xfff8
+CheckLocalFlag 0x0066
+JumpIf 0x0016
+SetLocalFlag 0x0066
+TextboxNoOverlap 0x2f0d
+_0807EA94 
+_0807F034 0x000a
+WaitPlayerAction8 
+Jump 0x0008
+TextboxNoOverlap 0x2f09
+_0807EA94 
+Wait 0x000f
+_0807E878 
+_0807EB44 0x0004
+_0807E930 0x0006
+Jump 0xffb0
+StartScript 
+CheckGlobalFlag 0x0024
+JumpIf 0x0038
+Call 0x0806c871
+_0807EF80 0x000a
+_0807EF80 0x0000
+StopScript 
+StopScript 
+StartScript 
+CheckGlobalFlag 0x0024
+JumpIf 0x001c
+_0807E30C 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+_0807EB74 
+Call 0x0806c90d
+_0807EA94 
+_0807E878 
+Jump 0xffdc
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08014C2C.inc b/data/scripts/gUnk_08014C2C.inc
deleted file mode 100644
index 4380341b..00000000
--- a/data/scripts/gUnk_08014C2C.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SCRIPT_START gUnk_08014C2C
-StartScript 
-Call sub_0806CD58
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0006
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806CCD0
-JumpIfNot 0xfff8
-Call sub_0806CCB4
-JumpIfNot 0xfff8
-CheckLocalFlag 0x0066
-JumpIf 0x0016
-SetLocalFlag 0x0066
-TextboxNoOverlap 0x2f0d
-_0807EA94 
-_0807F034 0x000a
-WaitPlayerAction8 
-Jump 0x0008
-TextboxNoOverlap 0x2f09
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EB44 0x0004
-_0807E930 0x0006
-.short 0x0803
-.short 0xffb0
diff --git a/data/scripts/gUnk_08014C94.inc b/data/scripts/gUnk_08014C94.inc
deleted file mode 100644
index c6b8ee0e..00000000
--- a/data/scripts/gUnk_08014C94.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_START gUnk_08014C94
-StartScript 
-CheckGlobalFlag 0x0024
-JumpIf 0x0038
-Call sub_0806C870
-_0807EF80 0x000a
-_0807EF80 0x0000
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x0024
-JumpIf 0x001c
-_0807E30C 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-_0807E878 
-Jump 0xffdc
-_0807EF80 0x0006
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc
index e63a836a..5c80a274 100644
--- a/data/scripts/gUnk_08014CDC.inc
+++ b/data/scripts/gUnk_08014CDC.inc
@@ -2,16 +2,19 @@ SCRIPT_START gUnk_08014CDC
 StartScript 
 SetEntityNonPlanarMovement 0x0180
 _0807EF80 0x000a
-Call sub_08066D04
-Call sub_08066D14
+Call 0x08066d05
+Call 0x08066d15
 SetEntityPositionRelative 0x018001e8
 _0807EB44 0x0004
 _0807EF80 0x0000
 StopScript 
 WaitForSomething2 0x00000001
-Call sub_08066E08
+Call 0x08066e09
 _0807E864 
-TextboxNoOverlapFollowPos 0x1010, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x1010
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000002
 StopScript 
@@ -20,38 +23,43 @@ CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
 JumpIfNot 0xfff2
 StopScript 
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 TextboxNoOverlap 0x1012
 _0807EA94 
 _0807EC64 0x0040
 _0807EB44 0x0004
-Call sub_08066E08
+Call 0x08066e09
 SetEntityPositionRelative 0x00c801f8
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
-CallWithArg sub_0807F6B4, 0x000000e8
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x00e8
+.short 0x0000
+@ End of 4 parameters
 JumpIf 0xfff4
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 TextboxNoOverlap 0x1013
 _0807EA94 
 _0807EC64 0x0040
 _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityPositionRelative 0x002801e8
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 CheckPlayerInRegion 0x01f8, 0x0028, 0x2040
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 TextboxNoOverlap 0x1014
 _0807EA94 
 _0807EC64 0x0018
 SetLocalFlag 0x006d
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014DCC.inc b/data/scripts/gUnk_08014DCC.inc
index 48f3362c..d689618e 100644
--- a/data/scripts/gUnk_08014DCC.inc
+++ b/data/scripts/gUnk_08014DCC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_08014DCC
 StartScript 
 SetEntityPositionRelative 0x01a80238
-Call sub_0807F844
-Call sub_0807F348
+Call 0x0807f845
+Call 0x0807f349
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 StopScript 
 _0807E778 0x0010
 DoFade6 
@@ -13,7 +13,7 @@ _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc
index 9efdb9d3..9d45548d 100644
--- a/data/scripts/gUnk_08014E14.inc
+++ b/data/scripts/gUnk_08014E14.inc
@@ -3,15 +3,304 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-Call sub_08064428
+CallWithArg
+.short 0xf3d9
+.short 0x0807
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
+Call 0x08064429
 _0807EA94 
 _0807E878 
 Jump 0xffe0
 .short 0x0000
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0807df29
+_0807EB74 
+CallWithArg
+.short 0xf78d
+.short 0x0807
+.short 0x0022
+.short 0x0000
+@ End of 4 parameters
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0038
+CallWithArg
+.short 0xf7c5
+.short 0x0807
+.short 0x0022
+.short 0x0000
+@ End of 4 parameters
+JumpIfNot 0x001e
+_0807E48C 0x0020
+JumpIfNot 0x001e
+CallWithArg
+.short 0xf801
+.short 0x0807
+.short 0x0022
+.short 0x0000
+@ End of 4 parameters
+WaitPlayerAction8 
+TextboxNoOverlap 0x0a04
+Jump 0x000e
+TextboxNoOverlap 0x0a03
+Jump 0x0006
+TextboxNoOverlap 0x0a02
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+Jump 0xff9c
+.short 0x0000
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x200d
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x000a
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+_0807EF80 0x0000
+TextboxNoOverlap 0x200e
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+_0807E930 0x000a
+Jump 0xffe0
+.short 0x0000
+StartScript 
+_0807EF80 0x000a
+_0807EF80 0x0007
+_0807EB44 0x0004
+_0807E930 0x000e
+StopScript 
+Call 0x08065915
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0807df29
+_0807EB74 
+_0807EF80 0x0000
+StartScript 
+TextboxNoOverlap 0x3b0b
+CallWithArg
+.short 0xf855
+.short 0x0807
+.short 0x0064
+.short 0x0001
+@ End of 4 parameters
+StopScript 
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x0030
+HasRupees 0x0064
+JumpIfNot 0x001c
+_0807E48C 0x0020
+JumpIfNot 0x001c
+ModRupees 0xff9c
+_0807F034 0x0022
+WaitPlayerAction8 
+TextboxNoOverlap 0x3b11
+Jump 0x000e
+TextboxNoOverlap 0x3b0e
+Jump 0x0006
+TextboxNoOverlap 0x3b0f
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807EB44 0x0004
+_0807E930 0x000e
+Jump 0xff90
+StartScript 
+SetEntityPositionRelative 0x00e001f8
+Call 0x08054565
+StopScript 
+CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
+JumpIfNot 0xfff6
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+SoundReq0x80100000 
+_0807F0B4 0x0001
+CameraTargetEntity 
+StartPlayerScript 0x080152b4
+WaitForSomething2 0x00000001
+TextboxNoOverlapFollowPos
+.short 0x1301
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+Call 0x0807f3f9
+Wait 0x003c
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+SoundReq2 0x000d
+_0807EB28 0x1302
+_0807EA94 
+TextboxNoOverlapFollowPos
+.short 0x1303
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+_0807EB28 0x1304
+_0807EA94 
+TextboxNoOverlapFollowPos
+.short 0x1305
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000004
+_0807EB28 0x1306
+_0807EA94 
+SoundReq0x80100000 
+StartPlayerScript 0x080152dc
+CameraTargetEntity 
+_0807F0B4 0x0003
+SetEntityPositionRelative 0x014801f8
+WaitForSomething2 0x00000001
+Call 0x0804f6a9
+Wait 0x0004
+Call 0x0804f809
+SoundReq 0x010b
+StartPlayerScript 0x08015304
+Call 0x0804f6c9
+Wait 0x0004
+Call 0x0804f831
+SoundReq 0x010b
+Call 0x0804f6e9
+Wait 0x0004
+Call 0x0804f855
+SoundReq 0x010b
+Call 0x0804f725
+Wait 0x0004
+Call 0x0804f89d
+SoundReq 0x010b
+Call 0x0804f761
+Wait 0x0004
+Call 0x0804f8e1
+SoundReq 0x010b
+Wait 0x003c
+WaitForSomething2 0x00000001
+SoundReq 0x01b0
+Call 0x0804f79d
+Wait 0x000a
+LoadRoomEntityList 0x080f7fc0
+SoundReq2 0x002d
+Call 0x0807df51
+_0807E878 
+CheckRoomFlag 0x0000
+JumpIfNot 0xfffa
+_0807E864 
+Call 0x0807f9a5
+Call 0x0807df29
+SoundReq0x80100000 
+StartPlayerScript 0x08015338
+WaitForSomething2 0x00000001
+Wait 0x003c
+Call 0x0804f6a9
+Wait 0x0004
+Call 0x0804f929
+SoundReq 0x010b
+Call 0x0804f6c9
+Wait 0x0004
+Call 0x0804f945
+SoundReq 0x010b
+Call 0x0804f6e9
+Wait 0x0004
+Call 0x0804f961
+SoundReq 0x010b
+Call 0x0804f725
+Wait 0x0004
+Call 0x0804f995
+SoundReq 0x010b
+Call 0x0804f761
+Wait 0x0004
+Call 0x0804f9c9
+SoundReq 0x010b
+Wait 0x003c
+SoundReq 0x0072
+_0807F0B4 0x0004
+CameraTargetPlayer 
+SetLocalFlag 0x008c
+_0807EB28 0x130c
+_0807EA94 
+CameraTargetPlayer 
+_0807E778 0x0004
+_0807E80C 0x00000000
+WaitFor_2 
+Call 0x08053b3d
+StartScript 
+_0807E864 
+CallWithArg
+.short 0xf6e9
+.short 0x0807
+.short 0x0008
+.short 0x0000
+@ End of 4 parameters
+MoveEntityToPlayer 
+_0807F0B4 0x0004
+CameraTargetEntity 
+_0807E778 0x0100
+DoFade4 
+_0807E80C 0x00000000
+StopScript 
+StartPlayerScript 0x08015360
+WaitForSomething2 0x00000001
+LoadRoomEntityList 0x080f7cb0
+_0807E778 0x0004
+_0807E800 0x00000000
+WaitFor_2 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000010
+StartScript 
+_0807E8E4_2 
+_0807EB28 0x1315
+StopScript 
+_0807EA94 
+_0807F0B4 0x0004
+CameraTargetPlayer 
+Call 0x08054571
+SoundReq2 0xffff
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014E50.inc b/data/scripts/gUnk_08014E50.inc
deleted file mode 100644
index 609c7029..00000000
--- a/data/scripts/gUnk_08014E50.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SCRIPT_START gUnk_08014E50
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-CallWithArg sub_0807F78C, 0x00000022
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0038
-CallWithArg sub_0807F7C4, 0x00000022
-JumpIfNot 0x001e
-_0807E48C 0x0020
-JumpIfNot 0x001e
-CallWithArg sub_0807F800, 0x00000022
-WaitPlayerAction8 
-TextboxNoOverlap 0x0a04
-Jump 0x000e
-TextboxNoOverlap 0x0a03
-Jump 0x0006
-TextboxNoOverlap 0x0a02
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xff9c
-.short 0x0000
diff --git a/data/scripts/gUnk_08014ECC.inc b/data/scripts/gUnk_08014ECC.inc
deleted file mode 100644
index d1fddf30..00000000
--- a/data/scripts/gUnk_08014ECC.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08014ECC
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x200d
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
diff --git a/data/scripts/gUnk_08014EF8.inc b/data/scripts/gUnk_08014EF8.inc
deleted file mode 100644
index 03b74c8d..00000000
--- a/data/scripts/gUnk_08014EF8.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08014EF8
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x200e
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807E930 0x000a
-Jump 0xffe0
-.short 0x0000
diff --git a/data/scripts/gUnk_08014F30.inc b/data/scripts/gUnk_08014F30.inc
deleted file mode 100644
index 58905710..00000000
--- a/data/scripts/gUnk_08014F30.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_08014F30
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x000e
-StopScript 
-Call sub_08065914
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-_0807EF80 0x0000
-StartScript 
-TextboxNoOverlap 0x3b0b
-CallWithArg sub_0807F854, 0x00010064
-StopScript 
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0030
-HasRupees 0x0064
-JumpIfNot 0x001c
-_0807E48C 0x0020
-JumpIfNot 0x001c
-ModRupees 0xff9c
-_0807F034 0x0022
-WaitPlayerAction8 
-TextboxNoOverlap 0x3b11
-Jump 0x000e
-TextboxNoOverlap 0x3b0e
-Jump 0x0006
-TextboxNoOverlap 0x3b0f
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EB44 0x0004
-_0807E930 0x000e
-.short 0x0803
-.short 0xff90
diff --git a/data/scripts/gUnk_08014FBC.inc b/data/scripts/gUnk_08014FBC.inc
deleted file mode 100644
index 0d4aa108..00000000
--- a/data/scripts/gUnk_08014FBC.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SCRIPT_START gUnk_08014FBC
-StartScript 
-SetEntityPositionRelative 0x00e001f8
-Call sub_08054564
-StopScript 
-CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-SoundReq0x80100000 
-_0807F0B4 0x0001
-CameraTargetEntity 
-StartPlayerScript 0x080152b4
-WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos 0x1301, 0x0002
-.byte 0x59
diff --git a/data/scripts/gUnk_08015001.inc b/data/scripts/gUnk_08015001.inc
deleted file mode 100644
index 643815df..00000000
--- a/data/scripts/gUnk_08015001.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-SCRIPT_START gUnk_08015001
-.short 0x0b04
-.short 0xf90c
-.short 0x07f3
-.short 0x3108
-.short 0x3c08
-.short 0x2800
-.short 0x020c
-.short 0x0000
-.short 0x3300
-.short 0x040c
-.short 0x0000
-.short 0x2800
-.short 0x020c
-.short 0x0000
-.short 0x3300
-.short 0x040c
-.short 0x0000
-.short 0x7c00
-.short 0x0d08
-.short 0x5f00
-.short 0x0208
-.short 0x5913
-.short 0x5c04
-.short 0x030c
-.short 0x0213
-.short 0x5900
-.short 0x5f04
-.short 0x0408
-.short 0x5913
-.short 0x5c04
-.short 0x050c
-.short 0x0213
-.short 0x5900
-.short 0x2804
-.short 0x020c
-.short 0x0000
-.short 0x3300
-.short 0x040c
-.short 0x0000
-.short 0x5f00
-.short 0x0608
-.short 0x5913
-.short 0x7e04
-.short 0x4704
-.short 0xdc0c
-.short 0x0152
-.short 0x8708
-.short 0x8904
-.short 0x0308
-.short 0x6900
-.short 0xf80c
-.short 0x4801
-.short 0x3301
-.short 0x010c
-.short 0x0000
-.short 0x0b00
-.short 0xa90c
-.short 0x04f6
-.short 0x3108
-.short 0x0408
-.short 0x0b00
-.short 0x090c
-.short 0x04f8
-.short 0x7b08
-.short 0x0b08
-.short 0x4701
-.short 0x040c
diff --git a/data/scripts/gUnk_08015087.inc b/data/scripts/gUnk_08015087.inc
deleted file mode 100644
index 7579da65..00000000
--- a/data/scripts/gUnk_08015087.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-SCRIPT_START gUnk_08015087
-.short 0x0153
-.short 0x0b08
-.short 0xc90c
-.short 0x04f6
-.short 0x3108
-.short 0x0408
-.short 0x0b00
-.short 0x310c
-.short 0x04f8
-.short 0x7b08
-.short 0x0b08
-.short 0x0b01
-.short 0xe90c
-.short 0x04f6
-.short 0x3108
-.short 0x0408
-.short 0x0b00
-.short 0x550c
-.short 0x04f8
-.short 0x7b08
-.short 0x0b08
-.short 0x0b01
-.short 0x250c
-.short 0x04f7
-.short 0x3108
-.short 0x0408
-.short 0x0b00
-.short 0x9d0c
-.short 0x04f8
-.short 0x7b08
-.short 0x0b08
-.short 0x0b01
-.short 0x610c
-.short 0x04f7
-.short 0x3108
-.short 0x0408
-.short 0x0b00
-.short 0xe10c
-.short 0x04f8
-.short 0x7b08
-.short 0x0b08
-.short 0x3101
-.short 0x3c08
-.short 0x3300
-.short 0x010c
-.short 0x0000
-.short 0x7b00
-.short 0xb008
-.short 0x0b01
-.short 0x9d0c
-.short 0x04f7
-.short 0x3108
diff --git a/data/scripts/gUnk_080150EF.inc b/data/scripts/gUnk_080150EF.inc
deleted file mode 100644
index 4744ec01..00000000
--- a/data/scripts/gUnk_080150EF.inc
+++ /dev/null
@@ -1,326 +0,0 @@
-SCRIPT_START gUnk_080150EF
-.byte 0x8
-.byte 0xa
-.byte 0x0
-.byte 0xd
-.byte 0xc
-.byte 0xc0
-.byte 0x7f
-.byte 0xf
-.byte 0x8
-.byte 0x7c
-.byte 0x8
-.byte 0x2d
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x15
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x5
-.byte 0x8
-.byte 0xfa
-.byte 0xff
-.byte 0x43
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0xa5
-.byte 0xf9
-.byte 0x7
-.byte 0x8
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x7e
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0x38
-.byte 0x53
-.byte 0x1
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xa9
-.byte 0xf6
-.byte 0x4
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x29
-.byte 0xf9
-.byte 0x4
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xb
-.byte 0x1
-.byte 0xb
-.byte 0xc
-.byte 0xc9
-.byte 0xf6
-.byte 0x4
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x45
-.byte 0xf9
-.byte 0x4
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xb
-.byte 0x1
-.byte 0xb
-.byte 0xc
-.byte 0xe9
-.byte 0xf6
-.byte 0x4
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xf9
-.byte 0x4
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xb
-.byte 0x1
-.byte 0xb
-.byte 0xc
-.byte 0x25
-.byte 0xf7
-.byte 0x4
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0x95
-.byte 0xf9
-.byte 0x4
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xb
-.byte 0x1
-.byte 0xb
-.byte 0xc
-.byte 0x61
-.byte 0xf7
-.byte 0x4
-.byte 0x8
-.byte 0x31
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0xb
-.byte 0xc
-.byte 0xc9
-.byte 0xf9
-.byte 0x4
-.byte 0x8
-.byte 0x7b
-.byte 0x8
-.byte 0xb
-.byte 0x1
-.byte 0x31
-.byte 0x8
-.byte 0x3c
-.byte 0x0
-.byte 0x7b
-.byte 0x8
-.byte 0x72
-.byte 0x0
-.byte 0x89
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x88
-.byte 0x4
-.byte 0x2a
-.byte 0x8
-.byte 0x8c
-.byte 0x0
-.byte 0x5f
-.byte 0x8
-.byte 0xc
-.byte 0x13
-.byte 0x59
-.byte 0x4
-.byte 0x88
-.byte 0x4
-.byte 0x38
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x41
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x37
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x3d
-.byte 0x3b
-.byte 0x5
-.byte 0x8
-.byte 0x1
-.byte 0x4
-.byte 0x43
-.byte 0x4
-.byte 0xc
-.byte 0x14
-.byte 0xe9
-.byte 0xf6
-.byte 0x7
-.byte 0x8
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x6b
-.byte 0x4
-.byte 0x89
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x87
-.byte 0x4
-.byte 0x38
-.byte 0x8
-.byte 0x0
-.byte 0x1
-.byte 0x3c
-.byte 0x4
-.byte 0x41
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x2
-.byte 0x4
-.byte 0x47
-.byte 0xc
-.byte 0x60
-.byte 0x53
-.byte 0x1
-.byte 0x8
-.byte 0x33
-.byte 0xc
-.byte 0x1
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0xd
-.byte 0xc
-.byte 0xb0
-.byte 0x7c
-.byte 0xf
-.byte 0x8
-.byte 0x38
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x40
-.byte 0xc
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x37
-.byte 0x4
-.byte 0x28
-.byte 0xc
-.byte 0x8
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x33
-.byte 0xc
-.byte 0x10
-.byte 0x0
-.byte 0x0
-.byte 0x0
-.byte 0x1
-.byte 0x4
-.byte 0x4b
-.byte 0x4
-.byte 0x5f
-.byte 0x8
-.byte 0x15
-.byte 0x13
-.byte 0x2
-.byte 0x4
-.byte 0x59
-.byte 0x4
-.byte 0x89
-.byte 0x8
-.byte 0x4
-.byte 0x0
-.byte 0x88
-.byte 0x4
-.byte 0xb
-.byte 0xc
-.byte 0x71
-.byte 0x45
-.byte 0x5
-.byte 0x8
-.byte 0x7c
-.byte 0x8
-.byte 0xff
-.byte 0xff
-.byte 0xb
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
diff --git a/data/scripts/gUnk_08015234.inc b/data/scripts/gUnk_08015234.inc
index 55a848f6..e5ebf690 100644
--- a/data/scripts/gUnk_08015234.inc
+++ b/data/scripts/gUnk_08015234.inc
@@ -3,10 +3,10 @@ StartScript
 _0807EF80 0x0008
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call sub_0807F354
+Call 0x0807f355
 StopScript 
 WaitForSomething2 0x00000002
-Call sub_08066C94
+Call 0x08066c95
 Wait 0x00e9
 _0807EF80 0x0007
 _0807EF80 0x001e
@@ -15,7 +15,7 @@ WaitForSomething2 0x00000002
 Wait 0x0014
 _0807EB44 0x0000
 _0807EF80 0x001c
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0000
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_080152B4.inc b/data/scripts/gUnk_080152B4.inc
index 57590d03..ba07be80 100644
--- a/data/scripts/gUnk_080152B4.inc
+++ b/data/scripts/gUnk_080152B4.inc
@@ -7,95 +7,5 @@ _0807EDD4 0x01f8, 0x00b8
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
-.short 0x0401
-.short 0x0867
-.short 0x0200
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x01f8
-.short 0x0148
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0861
-.short 0x0002
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0006
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0002
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0006
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0004
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x01f8
-.short 0x0148
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0401
-.short 0x0867
-.short 0x0100
-.short 0x0c69
-.short 0x0208
-.short 0x0148
-.short 0x0402
-.short 0x0861
-.short 0x0006
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0879
-.short 0x0015
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_080152DC.inc b/data/scripts/gUnk_080152DC.inc
new file mode 100644
index 00000000..0e78d378
--- /dev/null
+++ b/data/scripts/gUnk_080152DC.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_080152DC
+StartScript 
+SetEntityNonPlanarMovement 0x0200
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x01f8, 0x0148
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015304.inc b/data/scripts/gUnk_08015304.inc
new file mode 100644
index 00000000..1094991f
--- /dev/null
+++ b/data/scripts/gUnk_08015304.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_08015304
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0002
+Wait 0x000a
+_0807EB44 0x0006
+Wait 0x000a
+_0807EB44 0x0004
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800E9F4.inc b/data/scripts/gUnk_08015338.inc
similarity index 66%
rename from data/scripts/gUnk_0800E9F4.inc
rename to data/scripts/gUnk_08015338.inc
index 029ea843..9865b028 100644
--- a/data/scripts/gUnk_0800E9F4.inc
+++ b/data/scripts/gUnk_08015338.inc
@@ -1,11 +1,11 @@
-SCRIPT_START gUnk_0800E9F4
+SCRIPT_START gUnk_08015338
 StartScript 
-_0807EB44 0x0004
 SetEntityNonPlanarMovement 0x0100
 StopScript 
 _0807EF80 0x0001
-_0807EDD4 0x0078, 0x0080
+_0807EDD4 0x01f8, 0x0148
+_0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015360.inc b/data/scripts/gUnk_08015360.inc
new file mode 100644
index 00000000..6584a442
--- /dev/null
+++ b/data/scripts/gUnk_08015360.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08015360
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+SetEntityPositionRelative 0x01480208
+StopScript 
+_0807EB44 0x0006
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015384.inc b/data/scripts/gUnk_08015384.inc
new file mode 100644
index 00000000..e57ad001
--- /dev/null
+++ b/data/scripts/gUnk_08015384.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08015384
+_0807EF80 0x0015
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc
index 435c729d..e571a989 100644
--- a/data/scripts/gUnk_08015390.inc
+++ b/data/scripts/gUnk_08015390.inc
@@ -4,18 +4,21 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 StopScript 
 _0807E930 0x001f
-Call sub_0806D944
+Call 0x0806d945
 WaitForSomething2 0x00000008
 _0807E930 0x0010
-TextboxNoOverlapFollowPos 0x1314, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x1314
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E930 0x0018
-Call sub_0806D8A0
+Call 0x0806d8a1
 _0807EE30 
 JumpIfNot 0xfffc
 _0807E930 0x001f
 StartPlayerScript 0x08015384
-Call sub_0806D9A4
+Call 0x0806d9a5
 _0807EF80 0x0008
 Wait 0x0078
 _0807E5F8 0x00000010
diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc
index 815df56e..4f4b462f 100644
--- a/data/scripts/gUnk_080153EC.inc
+++ b/data/scripts/gUnk_080153EC.inc
@@ -17,45 +17,40 @@ _0807E5F8 0x00000880
 WaitForSomething2 0x00001100
 _0807F0B4 0x0004
 SetEntityPositionRelative 0x00900078
-TextboxNoOverlapFollowPos 0x1330, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1330
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00008000
 WaitForSomething2 0x00010000
 _0807E5F8 0x00000880
 WaitForSomething2 0x00001000
 Wait 0x003c
-TextboxNoOverlapFollowPos 0x130d, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x130d
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
-TextboxNoOverlapFollowPos 0x130e, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x130e
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
-TextboxNoOverlapFollowPos 0x130f, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x130f
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
-TextboxNoOverlapFollowPos 0x1310, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x1310
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
-CallWithArg sub_0805DDEC, 0x00000001
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
 _0807F0C8 0xffff, 0x0000
-_0807E5F8 0x00000800
-WaitForSomething2 0x00001000
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-_0807E5F8 0x00048000
-WaitForSomething2 0x00090000
-TextboxNoOverlapFollowPos 0x1311, 0x0002
-_0807EA94 
-_0807E5F8 0x00008000
-WaitForSomething2 0x00010000
-_0807E5F8 0x00048000
-WaitForSomething2 0x00010000
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-TextboxNoOverlapFollowPos 0x1312, 0x000c
-_0807EA94 
-_0807E5F8 0x00000800
-WaitForSomething2 0x00001000
-SoundReq0x80100000 
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-SetRoomFlag 0x0001
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc
new file mode 100644
index 00000000..eaf0e8c8
--- /dev/null
+++ b/data/scripts/gUnk_0801548E.inc
@@ -0,0 +1,42 @@
+SCRIPT_START gUnk_0801548E
+_0807E5F8 0x00000800
+WaitForSomething2 0x00001000
+SoundReq 0x0125
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+_0807E5F8 0x00048000
+WaitForSomething2 0x00090000
+TextboxNoOverlapFollowPos
+.short 0x1311
+.short 0x0002
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00008000
+WaitForSomething2 0x00010000
+_0807E5F8 0x00048000
+WaitForSomething2 0x00010000
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0001
+.short 0x0000
+@ End of 4 parameters
+_0807F0C8 0x0000, 0x0000
+TextboxNoOverlapFollowPos
+.short 0x1312
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+_0807E5F8 0x00000800
+WaitForSomething2 0x00001000
+SoundReq0x80100000 
+_0807E778 0x0004
+DoFade5 
+WaitFor_2 
+SetRoomFlag 0x0001
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc
index 2d3718a8..a979e11d 100644
--- a/data/scripts/gUnk_0801550C.inc
+++ b/data/scripts/gUnk_0801550C.inc
@@ -3,37 +3,72 @@ StartScript
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 _0807EB44 0x0000
-Call sub_0807F338
+Call 0x0807f339
 StopScript 
-CallWithArg sub_0806AF60, 0x00000000
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 WaitForSomething2 0x00008000
-CallWithArg sub_0806AF60, 0x00000004
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
 _0807EDD4 0x0078, 0x00b8
 _0807EB44 0x0000
-CallWithArg sub_0806AF60, 0x00000000
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EF80 0x000d
 _0807EB44 0x0000
-CallWithArg sub_0806AF60, 0x00000004
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0004
+.short 0x0000
+@ End of 4 parameters
 _0807EDD4 0x0078, 0x00c8
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EB44 0x0000
-CallWithArg sub_0806AF60, 0x00000000
+CallWithArg
+.short 0xaf61
+.short 0x0806
+.short 0x0000
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x0010
 Wait 0x0028
 SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 Wait 0x000a
 SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
+CallWithArg
+.short 0xfb29
+.short 0x0807
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 Wait 0x000a
 _0807EF80 0x0010
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807E930 0x000d
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807E5F8 0x00010000
 Wait 0x003c
 _0807EF80 0x0005
@@ -42,21 +77,3 @@ CheckRoomFlag 0x0001
 JumpIfNot 0xfffa
 _0807EF80 0x0006
 SCRIPT_END
-.short 0x0c33
-.short 0x0020
-.short 0x0000
-.short 0x0850
-.short 0x0000
-.short 0x0831
-.short 0x0014
-.short 0x0c28
-.short 0x0040
-.short 0x0000
-.short 0x0815
-.short 0x0001
-.short 0x0805
-.short 0xfffa
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_080155F4.inc b/data/scripts/gUnk_080155F4.inc
new file mode 100644
index 00000000..2e04b951
--- /dev/null
+++ b/data/scripts/gUnk_080155F4.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080155F4
+WaitForSomething2 0x00000020
+_0807E930 0x0000
+Wait 0x0014
+_0807E5F8 0x00000040
+CheckRoomFlag 0x0001
+JumpIfNot 0xfffa
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc
index fa0553ff..87413bb9 100644
--- a/data/scripts/gUnk_08015618.inc
+++ b/data/scripts/gUnk_08015618.inc
@@ -2,21 +2,31 @@ SCRIPT_START gUnk_08015618
 StartScript 
 _0807EF80 0x0007
 SetEntityNonPlanarMovement 0x0040
-Call sub_08094B80
+Call 0x08094b81
 StopScript 
 WaitForSomething2 0x00000080
-CallWithArg sub_0805DDEC, 0x00000003
-Call sub_08094B0C
+CallWithArg
+.short 0xdded
+.short 0x0805
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
+Call 0x08094b0d
 _0807EDD4 0x0078, 0x0068
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF3C 0xff80, 0x0000
-CallWithArg sub_0805DE18, 0x00000003
+CallWithArg
+.short 0xde19
+.short 0x0805
+.short 0x0003
+.short 0x0000
+@ End of 4 parameters
 Wait 0x003c
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0001
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc
index 5c1d6312..34160278 100644
--- a/data/scripts/gUnk_08015684.inc
+++ b/data/scripts/gUnk_08015684.inc
@@ -4,6 +4,48 @@ _0807EF80 0x0007
 _0807EF80 0x000b
 _0807EB44 0x0000
 _0807EF80 0x0017
-Call sub_0807F180
+Call 0x0807f181
 StopScript 
-.short 0x0c33
+WaitForSomething2 0x00000800
+_0807EB44 0x0002
+_0807EF80 0x0017
+Wait 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0017
+_0807EB44 0x0004
+_0807EF80 0x001b
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+Wait 0x0078
+_0807EF80 0x0004
+Wait 0x0014
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807EF80 0x0018
+Call 0x0807f2d5
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+_0807EB44 0x0004
+_0807EF80 0x0014
+CallWithArg
+.short 0x545d
+.short 0x0809
+.short 0x5754
+.short 0x0801
+@ End of 4 parameters
+SoundReq 0x01c4
+Wait 0x0078
+_0807EF80 0x0016
+WaitForSomething2 0x00020000
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00001000
+WaitForSomething2 0x00000800
+Call 0x08066ca5
+_0807EF80 0x0008
+Wait 0x0078
+_0807E5F8 0x00001000
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_080156A0.inc b/data/scripts/gUnk_080156A0.inc
deleted file mode 100644
index 32d56bef..00000000
--- a/data/scripts/gUnk_080156A0.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-SCRIPT_START gUnk_080156A0
-.short 0x0800
-.short 0x0000
-.short 0x0861
-.short 0x0002
-.short 0x0879
-.short 0x0017
-.short 0x0831
-.short 0x000a
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0017
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x001b
-.short 0x0c28
-.short 0x1000
-.short 0x0000
-.short 0x0c33
-.short 0x0800
-.short 0x0000
-.short 0x0831
-.short 0x0078
-.short 0x0879
-.short 0x0004
-.short 0x0831
-.short 0x0014
-.short 0x0c28
-.short 0x1000
-.short 0x0000
-.short 0x0c33
-.short 0x0800
-.short 0x0000
-.short 0x0879
-.short 0x0018
-.short 0x0c0b
-.short 0xf2d5
-.short 0x0807
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x1000
-.short 0x0000
-.short 0x0c33
-.short 0x0800
-.short 0x0000
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0014
-.short 0x140c
-.short 0x545d
-.short 0x0809
-.short 0x5754
-.short 0x0801
-.short 0x087b
-.short 0x01c4
-.short 0x0831
-.short 0x0078
-.short 0x0879
-.short 0x0016
-.short 0x0c33
-.short 0x0000
-.short 0x0002
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x1000
-.short 0x0000
-.short 0x0c33
-.short 0x0800
-.short 0x0000
-.short 0x0c0b
-.short 0x6ca5
-.short 0x0806
-.short 0x0879
-.short 0x0008
-.short 0x0831
-.short 0x0078
-.short 0x0c28
-.short 0x1000
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
diff --git a/data/scripts/gUnk_08015754.inc b/data/scripts/gUnk_08015754.inc
index 8ec9bfa5..264d099f 100644
--- a/data/scripts/gUnk_08015754.inc
+++ b/data/scripts/gUnk_08015754.inc
@@ -2,14 +2,14 @@ SCRIPT_START gUnk_08015754
 StartScript 
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0200
-Call sub_08094B80
+Call 0x08094b81
 StopScript 
 Wait 0x0078
 SoundReq 0x01c5
-Call sub_08094B6C
+Call 0x08094b6d
 _0807EDD4 0x0078, 0x00b8
 SoundReq 0x01c6
-Call sub_08094B80
+Call 0x08094b81
 _0807E5F8 0x00020000
 SetEntityNonPlanarMovement 0x0080
 WaitForSomething2 0x00040000
diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc
index 18f90a4e..32553e70 100644
--- a/data/scripts/gUnk_080157AC.inc
+++ b/data/scripts/gUnk_080157AC.inc
@@ -2,18 +2,18 @@ SCRIPT_START gUnk_080157AC
 CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
+Call 0x0807f9a5
+Call 0x0807df29
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 CheckPlayerInRegion 0x0250, 0x0230, 0x3040
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0807F3F8
+Call 0x0807f9a5
+Call 0x0807df29
+Call 0x0807f3f9
 Wait 0x003c
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
@@ -21,7 +21,7 @@ StartPlayerScript 0x080158f8
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x02180248
 CameraTargetEntity 
-Call sub_0807F5C0
+Call 0x0807f5c1
 WaitForSomething2 0x00000010
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000020
@@ -31,13 +31,16 @@ StartPlayerScript 0x08015918
 WaitForSomething2 0x00000010
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-TextboxNoOverlapFollowPos 0x1066, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1066
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
-Call sub_08066F94
+Call 0x08066f95
 _0807E5F8 0x00000008
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -45,24 +48,30 @@ _0807EA94
 ComparePlayerAction 0x001c
 JumpIf 0xfff8
 _0807E864 
-Call sub_0807DF28
+Call 0x0807df29
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x02080248
 CameraTargetEntity 
 StartPlayerScript 0x08015938
 WaitForSomething2 0x00000010
-TextboxNoOverlapFollowPos 0x106a, 0x000c
+TextboxNoOverlapFollowPos
+.short 0x106a
+.short 0x000c
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000008
 Wait 0x0078
 _0807E8E4_2 
-TextboxNoOverlapFollowPos 0x1068, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1068
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 SetLocalFlag 0x008b
-Call sub_08066FB8
-Call sub_0807DF50
+Call 0x08066fb9
+Call 0x0807df51
 _0807E878 
 _0807F0B4 0x0004
 CameraTargetPlayer 
diff --git a/data/scripts/gUnk_080158F8.inc b/data/scripts/gUnk_080158F8.inc
index 82062ada..c762fb27 100644
--- a/data/scripts/gUnk_080158F8.inc
+++ b/data/scripts/gUnk_080158F8.inc
@@ -4,21 +4,5 @@ _0807EDD4 0x0218, 0x0238
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000010
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
-.short 0x0867
-.short 0x0100
-.short 0x0c73
-.short 0x0238
-.short 0x0228
-.short 0x0861
-.short 0x0002
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0010
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08015918.inc b/data/scripts/gUnk_08015918.inc
new file mode 100644
index 00000000..f59b3bf5
--- /dev/null
+++ b/data/scripts/gUnk_08015918.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_08015918
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0238, 0x0228
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000010
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015938.inc b/data/scripts/gUnk_08015938.inc
index e2045e39..41b54823 100644
--- a/data/scripts/gUnk_08015938.inc
+++ b/data/scripts/gUnk_08015938.inc
@@ -4,5 +4,5 @@ _0807EDD4 0x0248, 0x0208
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000010
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc
index f8f8c913..9f32f67d 100644
--- a/data/scripts/gUnk_08015958.inc
+++ b/data/scripts/gUnk_08015958.inc
@@ -3,11 +3,11 @@ StartScript
 SetEntityNonPlanarMovement 0x0180
 _0807EF80 0x0008
 _0807EF80 0x000b
-Call sub_08066D04
+Call 0x08066d05
 StopScript 
 WaitForSomething2 0x00000001
 StartScript 
-Call sub_08066D14
+Call 0x08066d15
 MoveEntityToPlayer 
 StopScript 
 _0807EF80 0x0007
@@ -15,7 +15,10 @@ _0807EB74
 _0807EDD4 0x01f8, 0x02f8
 _0807EB44 0x0004
 _0807EF80 0x0000
-TextboxNoOverlapFollowPos 0x1011, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1011
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 _0807EDD4 0x01f8, 0x0268
 SetEntityPositionRelative 0x02180248
@@ -27,12 +30,12 @@ _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
-Call sub_0807F3C8
+Call 0x0807f3c9
 SoundReq 0x0096
 SetEntityNonPlanarMovement 0x0200
 _0807ECC4 0x0008
 _0807E930 0x0040
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -56,7 +59,10 @@ JumpIf 0x0016
 CheckEntityInteractType 
 JumpIfNot 0xffee
 StopScript 
-TextboxNoOverlapFollowPos 0x1067, 0x0002
+TextboxNoOverlapFollowPos
+.short 0x1067
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 Jump 0xffe0
 StopScript 
@@ -64,44 +70,8 @@ _0807EF80 0x000b
 _0807EB44 0x0000
 _0807EF80 0x0000
 WaitForSomething2 0x00000001
-Call sub_08066D4C
+Call 0x08066d4d
 _0807E5F8 0x00000002
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0867
-.short 0x0100
-.short 0x0879
-.short 0x0001
-.short 0x086e
-.short 0x0010
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
-.short 0x0867
-.short 0x0100
-.short 0x0879
-.short 0x0001
-.short 0x086f
-.short 0x0010
-.short 0x0861
-.short 0x0002
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0004
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08015A7C.inc b/data/scripts/gUnk_08015A7C.inc
new file mode 100644
index 00000000..9992b499
--- /dev/null
+++ b/data/scripts/gUnk_08015A7C.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08015A7C
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x0001
+_0807EC64 0x0010
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015AA0.inc b/data/scripts/gUnk_08015AA0.inc
new file mode 100644
index 00000000..631a369a
--- /dev/null
+++ b/data/scripts/gUnk_08015AA0.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08015AA0
+SetEntityNonPlanarMovement 0x0100
+_0807EF80 0x0001
+_0807EC94 0x0010
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+Call 0x080791bd
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015AC4.inc b/data/scripts/gUnk_08015AC4.inc
index 754b2b65..ed28d651 100644
--- a/data/scripts/gUnk_08015AC4.inc
+++ b/data/scripts/gUnk_08015AC4.inc
@@ -15,7 +15,7 @@ _0807EF80 0x0000
 WaitForSomething2 0x00000008
 Wait 0x003c
 SoundReq 0x0072
-Call sub_08046078
+Call 0x08046079
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc
index b2215622..3516af39 100644
--- a/data/scripts/gUnk_08015B34.inc
+++ b/data/scripts/gUnk_08015B34.inc
@@ -3,17 +3,25 @@ StopScript
 StartScript 
 CheckLocalFlag 0x008b
 JumpIf 0x0040
-CallWithArg sub_0807F6B4, 0x00000318
+CallWithArg
+.short 0xf6b5
+.short 0x0807
+.short 0x0318
+.short 0x0000
+@ End of 4 parameters
 JumpIfNot 0xffe8
 StopScript 
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x2506, 0x0002
+Call 0x0807f9a5
+Call 0x0807df29
+TextboxNoOverlapFollowPos
+.short 0x2506
+.short 0x0002
+@ End of 2 parameters
 _0807EA94 
 StartPlayerScript 0x08015b84
 WaitForSomething2 0x00000004
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffb8
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08015B84.inc b/data/scripts/gUnk_08015B84.inc
index 7893541f..78063ce9 100644
--- a/data/scripts/gUnk_08015B84.inc
+++ b/data/scripts/gUnk_08015B84.inc
@@ -5,6 +5,6 @@ _0807EC64 0x0010
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000004
-Call sub_080791BC
+Call 0x080791bd
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015BA8.inc b/data/scripts/gUnk_08015BA8.inc
index 7ee39edb..637c2636 100644
--- a/data/scripts/gUnk_08015BA8.inc
+++ b/data/scripts/gUnk_08015BA8.inc
@@ -8,7 +8,7 @@ SetEntityNonPlanarMovement 0x0200
 StopScript 
 Wait 0x000f
 _0807E8E4_2 
-Call sub_0807F3F8
+Call 0x0807f3f9
 Wait 0x001e
 _0807EDD4 0x00b8, 0x0258
 Wait 0x001e
diff --git a/data/scripts/gUnk_08015BE8.inc b/data/scripts/gUnk_08015BE8.inc
index 17336802..cb007668 100644
--- a/data/scripts/gUnk_08015BE8.inc
+++ b/data/scripts/gUnk_08015BE8.inc
@@ -5,9 +5,9 @@ StopScript
 CheckPlayerInRegion 0x0160, 0x0020, 0x3040
 JumpIfNot 0xfff6
 _0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0807FBC4
+Call 0x0807f9a5
+Call 0x0807df29
+Call 0x0807fbc5
 StartPlayerScript 0x08015c7c
 WaitForSomething2 0x00000100
 CameraTargetPlayer 
@@ -15,10 +15,10 @@ _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
 SoundReq0x80100000 
-Call sub_08053BE8
+Call 0x08053be9
 StartScript 
 _0807E864 
-Call sub_0807FBC4
+Call 0x0807fbc5
 CameraTargetPlayer 
 _0807E778 0x0100
 DoFade4 
@@ -31,53 +31,9 @@ SoundReq2 0xffff
 _0807EB28 0x131f
 _0807EA94 
 SetLocalFlag 0x009c
-Call sub_0807FBCC
-Call sub_0807DF50
+Call 0x0807fbcd
+Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0867
-.short 0x0080
-.short 0x0402
-.short 0x0879
-.short 0x0001
-.short 0x0c73
-.short 0x0168
-.short 0x0058
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x140c
-.short 0xf239
-.short 0x0807
-.short 0x03c5
-.short 0x0000
-.short 0x0c0b
-.short 0xf305
-.short 0x0807
-.short 0x0c5c
-.short 0x1318
-.short 0x000c
-.short 0x0459
-.short 0x140c
-.short 0xf239
-.short 0x0807
-.short 0x03c9
-.short 0x0000
-.short 0x0c0b
-.short 0xf305
-.short 0x0807
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0c28
-.short 0x0100
-.short 0x0000
-.short 0x0c0b
-.short 0x91bd
-.short 0x0807
-.short 0xffff
diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc
new file mode 100644
index 00000000..1eb7c52c
--- /dev/null
+++ b/data/scripts/gUnk_08015C7C.inc
@@ -0,0 +1,32 @@
+SCRIPT_START gUnk_08015C7C
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0168, 0x0058
+_0807EB44 0x0004
+_0807EF80 0x0000
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x03c5
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f305
+TextboxNoOverlapFollowPos
+.short 0x1318
+.short 0x000c
+@ End of 2 parameters
+_0807EA94 
+CallWithArg
+.short 0xf239
+.short 0x0807
+.short 0x03c9
+.short 0x0000
+@ End of 4 parameters
+Call 0x0807f305
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807E5F8 0x00000100
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08015E58.inc b/data/scripts/gUnk_08015E58.inc
index 99d6da07..0a2f0969 100644
--- a/data/scripts/gUnk_08015E58.inc
+++ b/data/scripts/gUnk_08015E58.inc
@@ -6,24 +6,24 @@ _0807EF80 0x0000
 _0807EF80 0x001d
 StopScript 
 WaitForSomething2 0x00000010
-Call sub_08066C94
+Call 0x08066c95
 Wait 0x00e9
 _0807EF80 0x0007
 _0807EF80 0x001e
 Wait 0x0014
 _0807EB44 0x0000
 _0807EF80 0x001c
-Call sub_0807F2D4
+Call 0x0807f2d5
 _0807EF80 0x0000
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
-Call sub_08066CA4
+Call 0x08066ca5
 _0807EF80 0x0008
 Wait 0x00bc
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
 SetEntityPositionRelative 0x00680088
-Call sub_08066C94
+Call 0x08066c95
 Wait 0x00e8
 _0807EF80 0x0007
 _0807EF80 0x001e
diff --git a/data/scripts/gUnk_08015F3C.inc b/data/scripts/gUnk_08015F3C.inc
index 3e892d7d..1088fc63 100644
--- a/data/scripts/gUnk_08015F3C.inc
+++ b/data/scripts/gUnk_08015F3C.inc
@@ -16,21 +16,3 @@ WaitForSomething 0x00000400
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
-.short 0x0401
-.short 0x0861
-.short 0x0004
-.short 0x0879
-.short 0x0000
-.short 0x0402
-.short 0x0c32
-.short 0x0200
-.short 0x0000
-.short 0x0879
-.short 0x0005
-.short 0x0c32
-.short 0x0400
-.short 0x0000
-.short 0x0879
-.short 0x0006
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_08015F80.inc b/data/scripts/gUnk_08015F80.inc
new file mode 100644
index 00000000..9c648777
--- /dev/null
+++ b/data/scripts/gUnk_08015F80.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_08015F80
+StartScript 
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+WaitForSomething 0x00000200
+_0807EF80 0x0005
+WaitForSomething 0x00000400
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08015FA4.inc b/data/scripts/gUnk_08015FA4.inc
index 83e92568..249baa2e 100644
--- a/data/scripts/gUnk_08015FA4.inc
+++ b/data/scripts/gUnk_08015FA4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08015FA4
 StartScript 
 _0807EF80 0x000a
-Call sub_08066E38
+Call 0x08066e39
 StopScript 
 WaitForSomething 0x00000400
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc
index 54c0124d..e7c74049 100644
--- a/data/scripts/gUnk_08015FC0.inc
+++ b/data/scripts/gUnk_08015FC0.inc
@@ -1,10 +1,15 @@
 SCRIPT_START gUnk_08015FC0
 StartScript 
-Call sub_0806DB84
+Call 0x0806db85
 CheckKinstoneFused 0x0009
 JumpIf 0x005a
 _0807EA88 0x0009
-CallWithArg sub_0806DA04, 0x00000007
+CallWithArg
+.short 0xda05
+.short 0x0806
+.short 0x0007
+.short 0x0000
+@ End of 4 parameters
 _0807EF80 0x000a
 StopScript 
 _0807EA4C 
@@ -12,14 +17,7 @@ _0807E9F0
 _0807E864 
 CheckKinstoneFused 0x0009
 JumpIf 0x000e
-Call sub_0807DF50
+Call 0x0807df51
 _0807E878 
 Jump 0xffe8
 _0807F0C8 0xffff, 0x0000
-_0807E5F8 0x00000003
-WaitForSomething2 0x0000000c
-_0807F0C8 0x0000, 0x0000
-SoundReq 0x0072
-_0807EB28 0x0b1f
-_0807EA94 
-.byte 0xb
diff --git a/data/scripts/gUnk_08016004.inc b/data/scripts/gUnk_08016004.inc
new file mode 100644
index 00000000..5acc71d6
--- /dev/null
+++ b/data/scripts/gUnk_08016004.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08016004
+_0807E5F8 0x00000003
+WaitForSomething2 0x0000000c
+_0807F0C8 0x0000, 0x0000
+SoundReq 0x0072
+_0807EB28 0x0b1f
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807EF80 0x0006
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08016021.inc b/data/scripts/gUnk_08016021.inc
deleted file mode 100644
index b5897a7b..00000000
--- a/data/scripts/gUnk_08016021.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_08016021
-.byte 0xc
-.byte 0x51
-.byte 0xdf
-.byte 0x7
-.byte 0x8
-.byte 0x44
-.byte 0x4
-.byte 0x79
-.byte 0x8
-.byte 0x6
-.byte 0x0
-.byte 0xff
-.byte 0xff
-.byte 0x0
-.byte 0x0
diff --git a/data/scripts/gUnk_08016030.inc b/data/scripts/gUnk_08016030.inc
new file mode 100644
index 00000000..057c45e2
--- /dev/null
+++ b/data/scripts/gUnk_08016030.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_08016030
+StartScript 
+CheckKinstoneFused 0x0009
+JumpIf 0x002a
+StopScript 
+WaitForSomething2 0x00000001
+_0807EF80 0x0010
+Wait 0x003c
+SetEntityNonPlanarMovement 0x0020
+_0807ECF4 0x0080
+Wait 0x001e
+_0807EF80 0x0010
+_0807E5F8 0x00000008
+SCRIPT_END
diff --git a/data/scripts/gUnk_08016062.inc b/data/scripts/gUnk_08016062.inc
new file mode 100644
index 00000000..1dc40c78
--- /dev/null
+++ b/data/scripts/gUnk_08016062.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_08016062
+SetEntityPosition 0xfff0, 0x0000
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0801606C.inc b/data/scripts/gUnk_0801606C.inc
index 2565fec2..d194b9dc 100644
--- a/data/scripts/gUnk_0801606C.inc
+++ b/data/scripts/gUnk_0801606C.inc
@@ -12,8 +12,3 @@ Wait 0x001e
 _0807EF80 0x0010
 _0807E5F8 0x00000004
 SCRIPT_END
-.short 0x0c6a
-.short 0x0010
-.short 0x0000
-.short 0xffff
-.short 0x0000
diff --git a/data/scripts/gUnk_0801609E.inc b/data/scripts/gUnk_0801609E.inc
new file mode 100644
index 00000000..381e9ecb
--- /dev/null
+++ b/data/scripts/gUnk_0801609E.inc
@@ -0,0 +1,4 @@
+SCRIPT_START gUnk_0801609E
+SetEntityPosition 0x0010, 0x0000
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc
index fe381115..2cfb616c 100644
--- a/data/scripts/gUnk_080160A8.inc
+++ b/data/scripts/gUnk_080160A8.inc
@@ -18,5 +18,187 @@ Jump 0xffd2
 _0807E864 
 _0807EB74 
 StopScript 
-.short 0x0411
-.short 0x0805
+HasRoomItemForSale 
+JumpIfNot 0x0030
+TextboxNoOverlapFollow 0x2d07
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x003c
+BuyItem 0x0000, 0x0000
+JumpIf 0x000c
+TextboxNoOverlapFollow 0x2d0b
+_0807EA94 
+Jump 0x0028
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlapFollow 0x2d0d
+_0807EA94 
+Jump 0x001a
+CheckKinstoneFused 0x0014
+JumpIfNot 0x000c
+TextboxNoOverlapFollow 0x2d09
+_0807EA94 
+Jump 0x0008
+TextboxNoOverlapFollow 0x2d01
+_0807EA94 
+_0807E878 
+_0807EB44 0x0004
+Jump 0xff76
+StartScript 
+Call 0x080787b5
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+GetInventoryValue 0x0025
+_0807EAF0
+.short 0x2d03
+.short 0x2d02
+.short 0x2d02
+.short 0x2d02
+@ End of 4 parameters
+_0807E3E8 
+JumpIfNot 0x002a
+_0807E48C 0x0020
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x2d0c
+Jump 0x001a
+BuyItem 0x0025, 0x0000
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x2d0b
+Jump 0x0008
+WaitPlayerAction8 
+TextboxNoOverlapFollow 0x2d06
+_0807E878 
+Jump 0xffb8
+StartScript 
+Call 0x080787b5
+StopScript 
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+GetInventoryValue 0x0024
+_0807EAF0
+.short 0x2d05
+.short 0x2d04
+.short 0x2d04
+.short 0x2d04
+@ End of 4 parameters
+_0807E3E8 
+JumpIfNot 0x002e
+_0807E48C 0x0020
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x2d0c
+Jump 0x001e
+BuyItem 0x0024, 0x0000
+JumpIf 0x000a
+TextboxNoOverlapFollow 0x2d0b
+Jump 0x000c
+WaitPlayerAction8 
+_0807EA94 
+_0807EB8C 
+TextboxNoOverlap 0x2d06
+_0807E878 
+Jump 0xffb4
+StartScript 
+Call 0x0807f349
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807EF80 0x0000
+StopScript 
+Call 0x08068c29
+CheckEntityInteractType 
+JumpIfNot 0xfffc
+_0807E864 
+Call 0x0807df29
+_0807EB74 
+Call 0x08068ca1
+JumpIf 0x0122
+Call 0x08068cfd
+JumpIfNot 0x010c
+Call 0x08068db9
+_0807EA94 
+Call 0x08068dd1
+_0807EA94 
+_0807E3E8 
+JumpIfNot 0x010a
+StartPlayerScript 0x0801635c
+WaitForSomething2 0x00000001
+_0807EB74 
+Call 0x08068c8d
+JumpIf 0x000e
+Call 0x08068de9
+_0807EA94 
+Wait 0x001e
+Call 0x08068e01
+_0807EA94 
+_0807EF80 0x0001
+Call 0x0807f2d5
+Call 0x08068e91
+Call 0x08068c8d
+JumpIf 0x009a
+Call 0x08068f01
+Call 0x08068f15
+Call 0x08068bb5
+CallWithArg
+.short 0xf245
+.short 0x0807
+.short 0x0001
+.short 0x0001
+@ End of 4 parameters
+Call 0x08068b85
+Call 0x0807f2a9
+Call 0x08068bd1
+Wait 0x001e
+Call 0x08068e19
+_0807EA94 
+Call 0x08068eb5
+Call 0x0807df51
+_0807E878 
+StopScript 
+StartScript 
+Call 0x08068ec5
+JumpIf 0x001e
+CheckEntityInteractType 
+JumpIf 0x0006
+Jump 0xffea
+StopScript 
+_0807E864 
+Call 0x08068e79
+_0807EA94 
+_0807E878 
+Jump 0xffd8
+StopScript 
+_0807E888 
+Call 0x0807f595
+Call 0x0807df29
+_0807E864 
+SoundReq0x80100000 
+SoundReq 0x00cd
+Wait 0x003c
+SoundReq2 0x005e
+Call 0x08068f3d
+Call 0x08068e31
+_0807EA94 
+Call 0x08068c6d
+WaitPlayerAction8 
+_0807EA94 
+Jump 0x0016
+Call 0x08068e61
+_0807EA94 
+Jump 0x000a
+Call 0x08068e49
+_0807EA94 
+Call 0x0807df51
+_0807E878 
+_0807EB44 0x0004
+_0807EF80 0x0000
+Jump 0xfea6
+.short 0x0000
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0078, 0x0050
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_080160EA.inc b/data/scripts/gUnk_080160EA.inc
deleted file mode 100644
index 2628e3be..00000000
--- a/data/scripts/gUnk_080160EA.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SCRIPT_START gUnk_080160EA
-.short 0x0030
-.short 0x085a
-.short 0x2d07
-.short 0x0459
-.short 0x041c
-.short 0x0805
-.short 0x003c
-.short 0x0c1e
-.short 0x0000
-.short 0x0000
-.short 0x0804
-.short 0x000c
-.short 0x085a
-.short 0x2d0b
-.short 0x0459
-.short 0x0803
-.short 0x0028
-.short 0x0434
-.short 0x0464
-.short 0x085a
-.short 0x2d0d
-.short 0x0459
-.short 0x0803
-.short 0x001a
-.short 0x081d
-.short 0x0014
-.short 0x0805
-.short 0x000c
-.short 0x085a
-.short 0x2d09
-.short 0x0459
-.short 0x0803
-.short 0x0008
-.short 0x085a
-.short 0x2d01
-.short 0x0459
-.short 0x0444
-.short 0x0861
-.short 0x0004
-.short 0x0803
-.short 0xff76
diff --git a/data/scripts/gUnk_0801613C.inc b/data/scripts/gUnk_0801613C.inc
deleted file mode 100644
index c1e74466..00000000
--- a/data/scripts/gUnk_0801613C.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-SCRIPT_START gUnk_0801613C
-StartScript 
-Call sub_080787B4
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-GetInventoryValue 0x0025
-.short 0x145d
-.short 0x2d03
-.short 0x2d02
-.short 0x2d02
-.short 0x2d02
-.short 0x041c
-.short 0x0805
-.short 0x002a
-.short 0x081f
-.short 0x0020
-.short 0x0804
-.short 0x000a
-.short 0x085a
-.short 0x2d0c
-.short 0x0803
-.short 0x001a
-.short 0x0c1e
-.short 0x0025
-.short 0x0000
-.short 0x0804
-.short 0x000a
-.short 0x085a
-.short 0x2d0b
-.short 0x0803
-.short 0x0008
-.short 0x0434
-.short 0x085a
-.short 0x2d06
-.short 0x0444
-.short 0x0803
-.short 0xffb8
diff --git a/data/scripts/gUnk_08016190.inc b/data/scripts/gUnk_08016190.inc
deleted file mode 100644
index abab1801..00000000
--- a/data/scripts/gUnk_08016190.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-SCRIPT_START gUnk_08016190
-StartScript 
-Call sub_080787B4
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-GetInventoryValue 0x0024
-.short 0x145d
-.short 0x2d05
-.short 0x2d04
-.short 0x2d04
-.short 0x2d04
-.short 0x041c
-.short 0x0805
-.short 0x002e
-.short 0x081f
-.short 0x0020
-.short 0x0804
-.short 0x000a
-.short 0x085a
-.short 0x2d0c
-.short 0x0803
-.short 0x001e
-.short 0x0c1e
-.short 0x0024
-.short 0x0000
-.short 0x0804
-.short 0x000a
-.short 0x085a
-.short 0x2d0b
-.short 0x0803
-.short 0x000c
-.short 0x0434
-.short 0x0459
-.short 0x0464
-.short 0x085b
-.short 0x2d06
-.short 0x0444
-.short 0x0803
-.short 0xffb4
diff --git a/data/scripts/gUnk_080161E8.inc b/data/scripts/gUnk_080161E8.inc
deleted file mode 100644
index 665e9e1b..00000000
--- a/data/scripts/gUnk_080161E8.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-SCRIPT_START gUnk_080161E8
-StartScript 
-Call sub_0807F348
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-Call sub_08068C28
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-Call sub_08068CA0
-JumpIf 0x0122
-Call sub_08068CFC
-JumpIfNot 0x010c
-Call sub_08068DB8
-_0807EA94 
-Call sub_08068DD0
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x010a
-StartPlayerScript 0x0801635c
-WaitForSomething2 0x00000001
-_0807EB74 
-Call sub_08068C8C
-JumpIf 0x000e
-Call sub_08068DE8
-_0807EA94 
-Wait 0x001e
-Call sub_08068E00
-_0807EA94 
-_0807EF80 0x0001
-Call sub_0807F2D4
-Call sub_08068E90
-Call sub_08068C8C
-JumpIf 0x009a
-Call sub_08068F00
-Call sub_08068F14
-Call sub_08068BB4
-CallWithArg sub_0807F244, 0x00010001
-Call sub_08068B84
-Call sub_0807F2A8
-Call sub_08068BD0
-Wait 0x001e
-Call sub_08068E18
-_0807EA94 
-Call sub_08068EB4
-Call sub_0807DF50
-_0807E878 
-StopScript 
-StartScript 
-Call sub_08068EC4
-JumpIf 0x001e
-CheckEntityInteractType 
-JumpIf 0x0006
-Jump 0xffea
-StopScript 
-_0807E864 
-Call sub_08068E78
-_0807EA94 
-_0807E878 
-Jump 0xffd8
-StopScript 
-_0807E888 
-Call sub_0807F594
-Call sub_0807DF28
-_0807E864 
-SoundReq0x80100000 
-SoundReq 0x00cd
-Wait 0x003c
-SoundReq2 0x005e
-Call sub_08068F3C
-Call sub_08068E30
-_0807EA94 
-Call sub_08068C6C
-WaitPlayerAction8 
-_0807EA94 
-Jump 0x0016
-Call sub_08068E60
-_0807EA94 
-Jump 0x000a
-Call sub_08068E48
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xfea6
-.short 0x0000
diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc
new file mode 100644
index 00000000..5301fefc
--- /dev/null
+++ b/data/scripts/gUnk_0801637C.inc
@@ -0,0 +1,69 @@
+SCRIPT_START gUnk_0801637C
+.short 0xb500
+.short 0xf08c
+.short 0xfb1d
+.short 0xbd00
+StartScript 
+StopScript 
+Jump 0xfffa
+JumpIf 0xfff6
+JumpIfNot 0xfff2
+_0807E078
+.short 0xffee
+.short 0xffec
+@ End of 2 parameters
+JumpAbsolute 0x08016384
+JumpAbsoluteIf 0x08016384
+JumpAbsoluteIfNot 0x08016384
+_0807E0E0 0x08016384, 0x08016384
+Call 0x08016384
+CallWithArg
+.short 0x6384
+.short 0x0801
+.short 0x5678
+.short 0x1234
+@ End of 4 parameters
+LoadRoomEntityList 0x08016384
+TestBit 0x00000001
+CheckInventory1 0x0001
+CheckInventory2 0x0001
+HasRoomItemForSale 
+CheckLocalFlag 0x0067
+CheckLocalFlagByOffset 0x0100, 0x006b
+CheckGlobalFlag 0x0013
+CheckRoomFlag 0x0000
+CheckPlayerInRegion 0x0000, 0x0000, 0x0000
+CheckPlayerInRegion2 0x0000
+CheckEntityInteractType 
+_0807E30C 
+HasRupees 0x00c8
+_0807E3E8 
+CheckKinstoneFused 0x0001
+BuyItem 0x006c, 0x0000
+_0807E48C 0x0020
+_0807E4CC 0x00000000
+_0807E4EC 0x00000000
+_0807E514 0x00000000
+CheckPlayerFlags 0x00000080
+_0807E564 
+EntityHasHeight 
+ComparePlayerAction 0x0001
+ComparePlayerAnimationState 0x0004
+_0807E5F8 0x00000001
+_0807E610 0x00000002
+SetLocalFlag 0x0067
+SetLocalFlagByOffset 0x0100, 0x0001
+ClearLocalFlag 0x0067
+SetGlobalFlag 0x0013
+ClearGlobalFlag 0x0013
+SetRoomFlag 0x0000
+ClearRoomFlag 0x0000
+Wait 0x001e
+WaitForSomething 0x00000001
+WaitForSomething2 0x00000002
+WaitPlayerAction8 
+WaitForPlayerAction0x17 
+WaitFor_1 
+WaitFor_2 
+_0807E778 0x0004
+_0807E788 0x0000ffff
diff --git a/data/scripts/gUnk_0801637D.inc b/data/scripts/gUnk_0801637D.inc
deleted file mode 100644
index 4575f8da..00000000
--- a/data/scripts/gUnk_0801637D.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_START gUnk_0801637D
-.byte 0xb5
-.byte 0x8c
-.byte 0xf0
-.byte 0x1d
-.byte 0xfb
-.byte 0x0
-.byte 0xbd
diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc
deleted file mode 100644
index 8cfd7cdd..00000000
--- a/data/scripts/gUnk_08016384.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-SCRIPT_START gUnk_08016384
-StartScript 
-StopScript 
-Jump 0xfffa
-JumpIf 0xfff6
-JumpIfNot 0xfff2
-.short 0x0c06
-.short 0xffee
-.short 0xffec
-.short 0x0c07
-.short 0x6384
-.short 0x0801
-.short 0x0c08
-.short 0x6384
-.short 0x0801
-.short 0x0c09
-.short 0x6384
-.short 0x0801
-.short 0x140a
-.short 0x6384
-.short 0x0801
-.short 0x6384
-.short 0x0801
-.short 0x0c0b
-.short 0x6384
-.short 0x0801
-.short 0x140c
-.short 0x6384
-.short 0x0801
-.short 0x5678
-.short 0x1234
-.short 0x0c0d
-.short 0x6384
-.short 0x0801
-.short 0x0c0e
-.short 0x0001
-.short 0x0000
-.short 0x080f
-.short 0x0001
-.short 0x0810
-.short 0x0001
-.short 0x0411
-.short 0x0812
-.short 0x0067
-.short 0x0c13
-.short 0x0100
-.short 0x006b
-.short 0x0814
-.short 0x0013
-.short 0x0815
-.short 0x0000
-.short 0x1016
-.short 0x0000
-.short 0x0000
-.short 0x0000
-.short 0x0817
-.short 0x0000
-.short 0x0418
-.short 0x0419
-.short 0x081a
-.short 0x00c8
-.short 0x041c
-.short 0x081d
-.short 0x0001
diff --git a/data/scripts/gUnk_08016408.inc b/data/scripts/gUnk_08016408.inc
deleted file mode 100644
index 6136f52b..00000000
--- a/data/scripts/gUnk_08016408.inc
+++ /dev/null
@@ -1,242 +0,0 @@
-SCRIPT_START gUnk_08016408
-BuyItem 0x006c, 0x0000
-_0807E48C 0x0020
-_0807E4CC 0x00000000
-_0807E4EC 0x00000000
-.short 0x0c22
-.short 0x0000
-.short 0x0000
-.short 0x0c23
-.short 0x0080
-.short 0x0000
-.short 0x0424
-.short 0x0425
-.short 0x0826
-.short 0x0001
-.short 0x0827
-.short 0x0004
-.short 0x0c28
-.short 0x0001
-.short 0x0000
-.short 0x0c29
-.short 0x0002
-.short 0x0000
-.short 0x082a
-.short 0x0067
-.short 0x0c2b
-.short 0x0100
-.short 0x0001
-.short 0x082c
-.short 0x0067
-.short 0x082d
-.short 0x0013
-.short 0x082e
-.short 0x0013
-.short 0x082f
-.short 0x0000
-.short 0x0830
-.short 0x0000
-.short 0x0831
-.short 0x001e
-.short 0x0c32
-.short 0x0001
-.short 0x0000
-.short 0x0c33
-.short 0x0002
-.short 0x0000
-.short 0x0434
-.short 0x0435
-.short 0x0436
-.short 0x0437
-.short 0x0838
-.short 0x0004
-.short 0x0c39
-.short 0xffff
-.short 0x0000
-.short 0x043a
-.short 0x083b
-.short 0x0080
-.short 0x043c
-.short 0x043d
-.short 0x043e
-.short 0x043f
-.short 0x0c40
-.short 0x0000
-.short 0x0000
-.short 0x0c41
-.short 0x0000
-.short 0x0000
-.short 0x0442
-.short 0x0443
-.short 0x0444
-.short 0x0445
-.short 0x0c46
-.short 0x5408
-.short 0x0000
-.short 0x0c47
-.short 0x6384
-.short 0x0801
-.short 0x0848
-.short 0x03a0
-.short 0x0449
-.short 0x044a
-.short 0x044b
-.short 0x044c
-.short 0x084d
-.short 0x0004
-.short 0x0c4e
-.short 0x0000
-.short 0x0000
-.short 0x044f
-.short 0x0850
-.short 0x0000
-.short 0x0451
-.short 0x0852
-.short 0x0600
-.short 0x0453
-.short 0x0454
-.short 0x0855
-.short 0x0000
-.short 0x0858
-.short 0x0001
-.short 0x0459
-.short 0x085a
-.short 0x0601
-.short 0x085b
-.short 0x0601
-.short 0x085c
-.short 0x0601
-.short 0x105d
-.short 0x0601
-.short 0x0602
-.short 0x0603
-.short 0x045e
-.short 0x085f
-.short 0x0602
-.short 0x0460
-.short 0x0861
-.short 0x0000
-.short 0x0c62
-.short 0x0000
-.short 0x0000
-.short 0x0463
-.short 0x0464
-.short 0x0865
-.short 0x0000
-.short 0x0866
-.short 0x0000
-.short 0x0867
-.short 0x0100
-.short 0x0c68
-.short 0x8000
-.short 0x0001
-.short 0x0c69
-.short 0x0000
-.short 0x0000
-.short 0x046b
-.short 0x046c
-.short 0x086d
-.short 0x0010
-.short 0x086e
-.short 0x0020
-.short 0x086f
-.short 0x0030
-.short 0x0870
-.short 0x0040
-.short 0x0871
-.short 0x0050
-.short 0x1072
-.short 0x0000
-.short 0x0000
-.short 0x0000
-.short 0x0c73
-.short 0x0000
-.short 0x0000
-.short 0x0c74
-.short 0x0000
-.short 0x0000
-.short 0x0475
-.short 0x0476
-.short 0x0c77
-.short 0xfff0
-.short 0x0014
-.short 0x0879
-.short 0x0000
-.short 0x087a
-.short 0x0001
-.short 0x087b
-.short 0x0074
-.short 0x087c
-.short 0x001d
-.short 0x0c7d
-.short 0x0074
-.short 0x0000
-.short 0x047e
-.short 0x087f
-.short 0xff38
-.short 0x0880
-.short 0x0010
-.short 0x0881
-.short 0x0008
-.short 0x0883
-.short 0x0001
-.short 0x0882
-.short 0x0001
-.short 0x0884
-.short 0x0001
-.short 0x0c85
-.short 0x0001
-.short 0x0002
-.short 0x0886
-.short 0x0001
-.short 0x0487
-.short 0x0488
-.short 0x0889
-.short 0x0007
-.short 0x0c8a
-.short 0x003c
-.short 0x0003
-.short 0xffff
-.short 0x0000
-.short 0x0401
-.short 0x0879
-.short 0x000a
-.short 0x0861
-.short 0x0004
-.short 0x0453
-.short 0x0402
-.short 0x0852
-.short 0x0601
-.short 0x0803
-.short 0xfffa
-.short 0x0000
-.short 0x0831
-.short 0x001e
-.short 0x0817
-.short 0x2020
-.short 0x0805
-.short 0xfff6
-.short 0x0879
-.short 0x0003
-.short 0x0c0b
-.short 0x637d
-.short 0x0801
-.short 0x0803
-.short 0xffe8
-.short 0x0000
-.short 0x0831
-.short 0x001e
-.short 0x0817
-.short 0x2020
-.short 0x0c09
-.short 0x65d8
-.short 0x0801
-.short 0x0879
-.short 0x0003
-.short 0x0c0b
-.short 0x637d
-.short 0x0801
-.short 0x0c07
-.short 0x65d8
-.short 0x0801
-.short 0x0000
diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc
new file mode 100644
index 00000000..7f1d0813
--- /dev/null
+++ b/data/scripts/gUnk_08016482.inc
@@ -0,0 +1,86 @@
+SCRIPT_START gUnk_08016482
+_0807E79C 
+ScriptCommandNop2 0x0080
+DoFade4 
+DoFade5 
+DoFade6 
+DoFade7 
+_0807E800 0x00000000
+_0807E80C 0x00000000
+_0807E858
+_0807E864 
+_0807E878 
+_0807E888 
+SetPlayerAction 0x00005408
+StartPlayerScript 0x08016384
+_0807E8D4 0x03a0
+_0807E8E4_0 
+_0807E8E4_1 
+_0807E8E4_2 
+_0807E8E4_3 
+_0807E908 0x0004
+_0807E914 0x00000000
+_0807E924 
+_0807E930 0x0000
+_0807E944 
+_0807E974 0x0600
+_0807E9D4 
+_0807E9DC 
+_0807E9E4 0x0000
+_0807EA88 0x0001
+_0807EA94 
+TextboxNoOverlapFollow 0x0601
+TextboxNoOverlap 0x0601
+TextboxNoOverlapFollowPos
+.short 0x0601
+@ End of 1 parameters
+_0807EAF0
+.short 0x0601
+.short 0x0602
+.short 0x0603
+@ End of 3 parameters
+TextboxNoOverlapVar 
+_0807EB28 0x0602
+_0807EB38 
+_0807EB44 0x0000
+_0807EB4C 0x0000, 0x0000
+_0807EB74 
+_0807EB8C 
+SetEntityDirection 0x0000
+SetEntityDirectionWithAnimationState 0x0000
+SetEntityNonPlanarMovement 0x0100
+SetEntity0x20 0x00018000
+SetEntityPositionRelative 0x00000000
+MoveEntityToPlayer 
+ScriptCommandNop3 
+_0807EC1C 0x0010
+_0807EC64 0x0020
+_0807EC94 0x0030
+_0807ECC4 0x0040
+_0807ECF4 0x0050
+_0807ED24 0x0000, 0x0000, 0x0000
+_0807EDD4 0x0000, 0x0000
+_0807EE04 0x0000, 0x0000
+_0807EE30 
+_0807EEB4 
+_0807EEF4 0xfff0, 0x0014
+_0807EF80 0x0000
+_0807EF90 0x0001
+SoundReq 0x0074
+SoundReq2 0x001d
+SoundReq3 0x00000074
+SoundReq0x80100000 
+ModRupees 0xff38
+ModHealth 0x0010
+IncreaseMaxHealth 0x0008
+_0807F050 0x0001
+_0807F034 0x0001
+GetInventoryValue 0x0001
+_0807F078 0x0001, 0x0002
+_0807F088 0x0001
+CameraTargetEntity 
+CameraTargetPlayer 
+_0807F0B4 0x0007
+_0807F0C8 0x003c, 0x0003
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_080165A4.inc b/data/scripts/gUnk_080165A4.inc
new file mode 100644
index 00000000..fd0d7ded
--- /dev/null
+++ b/data/scripts/gUnk_080165A4.inc
@@ -0,0 +1,254 @@
+SCRIPT_START gUnk_080165A4
+StartScript 
+_0807EF80 0x000a
+_0807EB44 0x0004
+_0807E9D4 
+StopScript 
+_0807E974 0x0601
+Jump 0xfffa
+.short 0x0000
+Wait 0x001e
+CheckPlayerInRegion2 0x2020
+JumpIfNot 0xfff6
+_0807EF80 0x0003
+Call 0x0801637d
+Jump 0xffe8
+.short 0x0000
+Wait 0x001e
+CheckPlayerInRegion2 0x2020
+JumpAbsoluteIfNot 0x080165d8
+_0807EF80 0x0003
+Call 0x0801637d
+JumpAbsolute 0x080165d8
+.short 0x0000
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+TextboxNoOverlapFollow 0x0601
+Jump 0xfff4
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+TextboxNoOverlapFollow 0x0602
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+_0807EB28 0x0603
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
+SetEntityNonPlanarMovement 0x0100
+_0807ECF4 0x0030
+Wait 0x0008
+_0807ECC4 0x0030
+Wait 0x0008
+_0807EC94 0x0030
+Wait 0x0008
+_0807EC64 0x0030
+Wait 0x0008
+Jump 0xffde
+_0807ED24 0x0055, 0x0039, 0x00b4
+Wait 0x0008
+_0807ED24 0x0075, 0x0076, 0x003c
+Wait 0x0008
+_0807ED24 0x0105, 0x006c, 0x0078
+Wait 0x0008
+_0807ED24 0x018e, 0x007a, 0x0078
+Wait 0x0008
+_0807ED24 0x0173, 0x0023, 0x003c
+Wait 0x0008
+_0807ED24 0x00d8, 0x003f, 0x003c
+Wait 0x0008
+Jump 0xffb6
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0055, 0x0039
+Wait 0x0008
+_0807EDD4 0x0075, 0x0076
+Wait 0x0008
+_0807EDD4 0x0105, 0x006c
+Wait 0x0008
+_0807EDD4 0x018e, 0x007a
+Wait 0x0008
+_0807EDD4 0x0173, 0x0023
+Wait 0x0008
+_0807EDD4 0x00d8, 0x003f
+Wait 0x0008
+Jump 0xffc2
+SetEntityNonPlanarMovement 0x0100
+_0807EC94 0x0030
+_0807E5F8 0x00000002
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000001
+_0807E610 0x00000001
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+WaitForSomething 0x00000001
+_0807E610 0x00000001
+_0807ECF4 0x0030
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+Wait 0x001e
+_0807E5F8 0x00000006
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Wait 0x003c
+Jump 0xff6a
+SetEntityNonPlanarMovement 0x0100
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EC94 0x0030
+_0807E5F8 0x00000004
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807ECF4 0x0030
+_0807E5F8 0x00000001
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Jump 0xff5a
+SetEntityNonPlanarMovement 0x0100
+WaitForSomething 0x00000004
+_0807E610 0x00000004
+_0807EC94 0x0030
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+Wait 0x001e
+_0807E5F8 0x00000003
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Wait 0x003c
+_0807ECF4 0x0030
+_0807E5F8 0x00000002
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000004
+_0807E610 0x00000004
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Jump 0xff6a
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x000f
+_0807E878 
+Jump 0xfff4
+StartScript 
+Call 0x08064ea5
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call 0x08064f29
+_0807EA94 
+JumpIfNot 0x0008
+_0807F034 0x003d
+WaitPlayerAction8 
+_0807E878 
+SetGlobalFlag 0x005c
+Jump 0xffdc
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x0018
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x0018
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
diff --git a/data/scripts/gUnk_080165F8.inc b/data/scripts/gUnk_080165F8.inc
deleted file mode 100644
index bb0186f4..00000000
--- a/data/scripts/gUnk_080165F8.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_START gUnk_080165F8
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-TextboxNoOverlapFollow 0x0601
-.short 0x0803
-.short 0xfff4
diff --git a/data/scripts/gUnk_0801660C.inc b/data/scripts/gUnk_0801660C.inc
deleted file mode 100644
index 69212fa6..00000000
--- a/data/scripts/gUnk_0801660C.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_0801660C
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-TextboxNoOverlapFollow 0x0602
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
diff --git a/data/scripts/gUnk_08016628.inc b/data/scripts/gUnk_08016628.inc
deleted file mode 100644
index 06d5766d..00000000
--- a/data/scripts/gUnk_08016628.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08016628
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-_0807EB28 0x0603
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
diff --git a/data/scripts/gUnk_08016644.inc b/data/scripts/gUnk_08016644.inc
deleted file mode 100644
index cd23679e..00000000
--- a/data/scripts/gUnk_08016644.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_START gUnk_08016644
-SetEntityNonPlanarMovement 0x0100
-_0807ECF4 0x0030
-Wait 0x0008
-_0807ECC4 0x0030
-Wait 0x0008
-_0807EC94 0x0030
-Wait 0x0008
-_0807EC64 0x0030
-Wait 0x0008
-.short 0x0803
-.short 0xffde
diff --git a/data/scripts/gUnk_0801666C.inc b/data/scripts/gUnk_0801666C.inc
deleted file mode 100644
index f8ee617f..00000000
--- a/data/scripts/gUnk_0801666C.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SCRIPT_START gUnk_0801666C
-_0807ED24 0x0055, 0x0039, 0x00b4
-Wait 0x0008
-_0807ED24 0x0075, 0x0076, 0x003c
-Wait 0x0008
-_0807ED24 0x0105, 0x006c, 0x0078
-Wait 0x0008
-_0807ED24 0x018e, 0x007a, 0x0078
-Wait 0x0008
-_0807ED24 0x0173, 0x0023, 0x003c
-Wait 0x0008
-_0807ED24 0x00d8, 0x003f, 0x003c
-Wait 0x0008
-.short 0x0803
-.short 0xffb6
diff --git a/data/scripts/gUnk_080166B8.inc b/data/scripts/gUnk_080166B8.inc
deleted file mode 100644
index d6159306..00000000
--- a/data/scripts/gUnk_080166B8.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SCRIPT_START gUnk_080166B8
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0055, 0x0039
-Wait 0x0008
-_0807EDD4 0x0075, 0x0076
-Wait 0x0008
-_0807EDD4 0x0105, 0x006c
-Wait 0x0008
-_0807EDD4 0x018e, 0x007a
-Wait 0x0008
-_0807EDD4 0x0173, 0x0023
-Wait 0x0008
-_0807EDD4 0x00d8, 0x003f
-Wait 0x0008
-.short 0x0803
-.short 0xffc2
diff --git a/data/scripts/gUnk_080166FC.inc b/data/scripts/gUnk_080166FC.inc
deleted file mode 100644
index d3ca9789..00000000
--- a/data/scripts/gUnk_080166FC.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_080166FC
-SetEntityNonPlanarMovement 0x0100
-_0807EC94 0x0030
-_0807E5F8 0x00000002
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000001
-_0807E610 0x00000001
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-WaitForSomething 0x00000001
-_0807E610 0x00000001
-_0807ECF4 0x0030
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-Wait 0x001e
-_0807E5F8 0x00000006
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Wait 0x003c
-.short 0x0803
-.short 0xff6a
diff --git a/data/scripts/gUnk_08016798.inc b/data/scripts/gUnk_08016798.inc
deleted file mode 100644
index 0d8c3228..00000000
--- a/data/scripts/gUnk_08016798.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SCRIPT_START gUnk_08016798
-SetEntityNonPlanarMovement 0x0100
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EC94 0x0030
-_0807E5F8 0x00000004
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807ECF4 0x0030
-_0807E5F8 0x00000001
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-.short 0x0803
-.short 0xff5a
diff --git a/data/scripts/gUnk_08016844.inc b/data/scripts/gUnk_08016844.inc
deleted file mode 100644
index 90ee22ad..00000000
--- a/data/scripts/gUnk_08016844.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SCRIPT_START gUnk_08016844
-SetEntityNonPlanarMovement 0x0100
-WaitForSomething 0x00000004
-_0807E610 0x00000004
-_0807EC94 0x0030
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-Wait 0x001e
-_0807E5F8 0x00000003
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Wait 0x003c
-_0807ECF4 0x0030
-_0807E5F8 0x00000002
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000004
-_0807E610 0x00000004
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-.short 0x0803
-.short 0xff6a
diff --git a/data/scripts/gUnk_080168E0.inc b/data/scripts/gUnk_080168E0.inc
deleted file mode 100644
index 11df18ef..00000000
--- a/data/scripts/gUnk_080168E0.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_START gUnk_080168E0
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x000f
-_0807E878 
-.short 0x0803
-.short 0xfff4
diff --git a/data/scripts/gUnk_080168F4.inc b/data/scripts/gUnk_080168F4.inc
deleted file mode 100644
index 5e573261..00000000
--- a/data/scripts/gUnk_080168F4.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-SCRIPT_START gUnk_080168F4
-StartScript 
-Call sub_08064EA4
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08064F28
-_0807EA94 
-JumpIfNot 0x0008
-_0807F034 0x003d
-WaitPlayerAction8 
-_0807E878 
-SetGlobalFlag 0x005c
-Jump 0xffdc
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x0018
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
-.short 0x0401
-.short 0x0453
-.short 0x0861
-.short 0x0000
-.short 0x0879
-.short 0x000a
-.short 0x0850
-.short 0x0000
-.short 0x0402
-.short 0x0451
-.short 0x0443
-.short 0x0831
-.short 0x0018
-.short 0x085a
-.short 0x0a01
-.short 0x0459
-.short 0x0831
-.short 0x000f
-.short 0x0444
-.short 0x0803
-.short 0xffea
-.short 0x0000
diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py
index e0850f13..5d184b28 100644
--- a/tools/script_disassembler/incbin_parser.py
+++ b/tools/script_disassembler/incbin_parser.py
@@ -4,49 +4,73 @@ TMC_FOLDER='../..'
 
 import subprocess
 import sys
-from script_disassembler import disassemble_script
+from script_disassembler import disassemble_script, generate_macros
 
-def main():
+ROM_OFFSET=0x08000000
+SCRIPTS_START=0x08008B5C
+SCRIPTS_END=0x08016984
+# cat data/scripts.s  | grep @ | cut -d " " -f 3 | sed  -e 's/^/0x/' | sed -e 's/\\n/, /g' > labels.txt
+
+def read_baserom():
     # read baserom data
     with open(f'{TMC_FOLDER}/baserom.gba', 'rb') as baserom:
-        baserom_data = bytearray(baserom.read())
+        return bytearray(baserom.read())
 
-    # read scripts.s with incbins
-    with open(f'{TMC_FOLDER}/data/scripts.s', 'r') as scripts:
+def get_label(addr):
+    return hex(addr).upper().replace('0X', 'gUnk_0')
 
-        while True:
-            line = scripts.readline()
+def main():
+    baserom_data = read_baserom()
 
-            if not line:
-                # end of file
-                break
+    script_start = SCRIPTS_START-ROM_OFFSET
 
-            if ':: @' in line: # this might be a label
-                incbin_line = scripts.readline()
+    scripts = '''	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
-                if '.incbin' in incbin_line: # found a label with incbin
-                    label = line.split('::')[0]
-                    (_, start, end) = incbin_line.split(',')
-                    start = int(start, 16)
-                    end = int(end, 16)
-                    
-                    # read data from rom
-                    data = baserom_data[start:start+end]
+	.include "asm/macros/scripts.inc"
 
-                    stdout = sys.stdout
-                    with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
-                        sys.stdout = out
-                        print(f'SCRIPT_START {label}')
-                        disassemble_script(data)
-                    sys.stdout = stdout
+	.syntax unified
 
-                    # print new include label
-                    print(f'.include "data/scripts/{label}.inc"')
-                else:
-                    print(line, end='')
-                    print(incbin_line, end='')
-            else:
-                print(line, end='')
+	.text
+    
+    '''
+
+    while script_start < SCRIPTS_END-ROM_OFFSET:
+        label = get_label(script_start+ROM_OFFSET)
+        print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...")
+        # find end of the script signified by 0xffff0000
+        script_end = baserom_data.index(b'\xff\xff\x00\x00', script_start) + 4
+
+        if script_end > SCRIPTS_END-ROM_OFFSET:
+            script_end = SCRIPTS_END-ROM_OFFSET
+
+        script_start+ROM_OFFSET
+        # read data from rom
+        data = baserom_data[script_start:script_end]
+
+
+        scripts += f'	.include "data/scripts/{label}.inc"\n'
+        stdout = sys.stdout
+        with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
+            sys.stdout = out
+            print(f'SCRIPT_START {label}')
+            res = disassemble_script(data)
+            if res != 0:
+                # Script ended in the middle, need to create a new file
+                script_end = script_start + res
+        sys.stdout = stdout
+
+        script_start = script_end 
+    print('Writing scripts.s file...')
+    with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out:
+        out.write(scripts)
+    print('Generating asm macros...')
+    stdout = sys.stdout
+    with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out:
+        sys.stdout = out
+        generate_macros()
+    sys.stdout = stdout
+    print('\033[1;92mDone\033[0m\n')
 
 if __name__ == '__main__':
     main()
\ No newline at end of file
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 330d2a7d..ae8f3272 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -5,7 +5,7 @@ import struct
 # Input 'macros' to generate the macros for the script commands
 # Input the script bytes as hex to disassemble the script
 
-# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/script.inc 
+# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/scripts.inc 
 
 @dataclass
 class Context:
@@ -33,25 +33,29 @@ def get_pointer(barray):
     integers = struct.unpack('I', barray)
     return 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
 
+def get_data_pointer(barray):
+    integers = struct.unpack('I', barray)
+    return 'gUnk_' + (struct.pack('>I', integers[0]-1).hex()).upper()
+
 commands = [
-    {'fun': 'ScriptCommandNop', 'params': ''},
+    {'fun': 'ScriptCommandNop', 'params': 'v'}, # TODO one version with length 33???
     {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'},
     {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'},
     {'fun': 'ScriptCommand_Jump', 'params': 's', 'name': 'jump by offset'},
     {'fun': 'ScriptCommand_JumpIf', 'params': 's', 'name': 'jump if'},
     {'fun': 'ScriptCommand_JumpIfNot', 'params': 's', 'name': 'jump if not'},
-    {'fun': 'ScriptCommand_0807E078', 'params': 's'},
-    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'w','name': 'abs jump' },
-    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'w', 'name': 'abs jump if'},
-    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'w', 'name': 'abs jump if not'},
-    {'fun': 'ScriptCommand_0807E0E0', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E078', 'params': 'v'},
+    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'd','name': 'abs jump' },
+    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'd', 'name': 'abs jump if'},
+    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'd', 'name': 'abs jump if not'},
+    {'fun': 'ScriptCommand_0807E0E0', 'params': 'dd'},
     {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
-    {'fun': 'ScriptCommand_CallWithArg', 'params': 'pw'},
-    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'w'},
+    {'fun': 'ScriptCommand_CallWithArg', 'params': 'pv'},
+    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
     {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
-    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': 's'},
+    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''},
     {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
     {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
     {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
@@ -68,7 +72,7 @@ commands = [
     {'fun': 'ScriptCommand_0807E48C', 'params': 's'},
     {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E51', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E514', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'},
     {'fun': 'ScriptCommand_0807E564', 'params': ''},
     {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''},
@@ -100,12 +104,12 @@ commands = [
     {'fun': 'ScriptCommand_DoFade7', 'params': ''},
     {'fun': 'ScriptCommand_0807E800', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E80C', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E858', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E858', 'params': 'v'}, # TODO why are there both 0 and 1?
     {'fun': 'ScriptCommand_0807E864', 'params': ''},
     {'fun': 'ScriptCommand_0807E878', 'params': ''},
     {'fun': 'ScriptCommand_0807E888', 'params': ''},
     {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'},
-    {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'w'},
+    {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'd'},
     {'fun': 'ScriptCommand_0807E8D4', 'params': 's'},
     {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate
     {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate
@@ -126,8 +130,8 @@ commands = [
     {'fun': 'ScriptCommand_0807EA94', 'params': ''},
     {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EAF0', 'params': 'w'},
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': 'v'}, # TODO 1 or two
+    {'fun': 'ScriptCommand_0807EAF0', 'params': 'v'}, # TODO
     {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
     {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
     {'fun': 'ScriptCommand_0807EB38', 'params': ''},
@@ -219,12 +223,30 @@ parameters = {
         'expr': '	.word \w',
         'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
     },
-    'pw': {
-        'length': 4,
-        'param': 'a,b',
-        'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+10])[0]
+    'd': { # Data pointer
+        'length': 2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
     },
+    'pv': {
+        'length': -2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: ''
+    },
+    'dd': {
+        'length': 4,
+        'param': 'a, b',
+        'expr': '	.word \\a\n	.word \\b',
+        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_data_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10])
+    },
+    'v': { # variable parameter count (TODO why?)
+        'length': -1,
+        'param': '',
+        'expr': '',
+        'read': lambda ctx: ''
+    }
 }
 
 # Remove the ScriptCommand_ prefix for the asm macros
@@ -234,31 +256,50 @@ def build_script_command(name: str):
         return '_' + name
     return name
 
+def print_rest_bytes(ctx):
+     print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
+
 def ExecuteScriptCommandSet(ctx: Context):
+    # print(f'@{ctx.ptr}') print offsets to debug when manually inserting labels
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
     if cmd == 0:
-        return 0
+        # this does not need to be the end of the script
+        print('.short 0x0000')
+        ctx.ptr += 2
+        return 1
+
     if cmd == 0xffff:
         ctx.ptr += 2
         print('SCRIPT_END')
-        return 0
+        cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
+        if cmd == 0x0000:
+            # This is actually the end of the script
+            print('.short 0x0000')
+            ctx.ptr += 2
+            return 2
+        return 3 # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please
 
-    unk_06 = cmd >> 0xA
-    if unk_06 == 0:
+    commandSize = cmd >> 0xA
+    if commandSize == 0:
+        raise Exception(f'Zero commandSize')
         # TODO error
         return 0
-    operationId = cmd & 0x3FF
-    if operationId >= len(commands):
+    commandId = cmd & 0x3FF
+    if commandId >= len(commands):
+        #print_rest_bytes(ctx)
+        print(f'.short {u16_to_hex(cmd)}')
+        ctx.ptr += 2
+        #raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}')
         # TODO error
-        return 0
-    command = commands[operationId]
-    param_length = unk_06 - 1 
-    if unk_06 > 1:
-        if ctx.ptr+2*unk_06 >= len(ctx.data):
-            # TODO raise Exception(f'Not enough data to fetch {unk_06-1} params')
+        return 1
+    command = commands[commandId]
+    param_length = commandSize - 1 
+    if commandSize > 1:
+        if ctx.ptr+2*commandSize > len(ctx.data):
+            raise Exception(f'Not enough data to fetch {commandSize-1} params')
             return 0
-        meta = struct.unpack(
-            'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06])
+        #meta = struct.unpack(
+        #    'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06])
         #print('meta', meta)
 
     # Handle parameters
@@ -266,9 +307,45 @@ def ExecuteScriptCommandSet(ctx: Context):
         raise Exception('Parameters not defined for ' + command['fun'] + '   Should be of length ' + str(param_length))
     if not command['params'] in parameters:
         raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+
+    # TODO REMOVE fix pointers
+    if command['params'] == 'p':
+        command['params'] = 'w'
+    elif command['params'] == 'd':
+        command['params'] = 'w'
+    elif command['params'] == 'pv':
+        command['params'] = 'v'
+    elif command['params'] == 'dd':
+        command['params'] = 'ww'
+
     params = parameters[command['params']]
-    if unk_06-1 != params['length']:
-        # raise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
+
+
+
+
+    # TODO REMOVE
+    if commandSize == 34:
+        print('@TODO FIX THIS COMMAND!')
+        commandSize = 13
+
+
+    if params['length'] == -1: # variable parameter length
+        print(build_script_command(command['fun']))
+        if commandSize > 1:
+            print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])]))
+            print(f'@ End of {commandSize-1} parameters')
+        ctx.ptr += commandSize*2
+        return 1
+    elif params['length'] == -2: # point and var
+        print(build_script_command(command['fun']) + ' '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        if commandSize > 3:
+            print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])]))
+            print(f'% End of {commandSize-3} parameters')
+        ctx.ptr += commandSize*2
+        return 1
+
+    if commandSize-1 != params['length']:
+        raise Exception(f'Call {command["fun"]} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined')
         return 0
         #with open('log.txt', 'a') as log:
 #            log.write(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined\n')
@@ -279,29 +356,53 @@ def ExecuteScriptCommandSet(ctx: Context):
     print(build_script_command(command['fun']) + ' ' + params['read'](ctx))
 
     # Execute script
-    ctx.ptr += unk_06*2
+    ctx.ptr += commandSize*2
     return 1
 
 
+# TODO
+# JumpAbsolute 0x08016384
+# JumpAbsoluteIf 0x08016384
+# JumpAbsoluteIfNot 0x08016384
+
 def disassemble_script(input_bytes):
 
     ctx = Context(0, input_bytes)
 
+
+    foundEnd = False
     while True:
         if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id)
             break
-        if not ExecuteScriptCommandSet(ctx):
+        res = ExecuteScriptCommandSet(ctx)
+        if res == 0:
             break
+        elif res == 2:
+            foundEnd = True
+            break
+        elif res == 3:
+            # End in the middle of the script, please create a new file
+            return ctx.ptr
+
+    
 
 
     # Print rest (did not manage to get there)
     if ctx.ptr < len(ctx.data):
         if (len(ctx.data) - ctx.ptr) % 2 != 0:
-            print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
+            print_rest_bytes(ctx)
             # TODO error
+            raise Exception('DONT WANT EXTRA after '+ str(ctx.ptr) + ' / ' + str(len(ctx.data)))
             return
         print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
-    
+        raise Exception('DONT WANT EXTRA after '+ str(ctx.ptr) + ' / ' + str(len(ctx.data)))
+
+    if not foundEnd:
+        # Seems to happen, sadly
+        return 0
+        #print('\033[93mNo end found\033[0m')
+        #raise Exception('No end found')
+    return 0
 
 def generate_macros():
     print('@ All the macro functions for scripts')

From 9441dac477d46218cc2e1879df1d1c2127189761 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Fri, 5 Mar 2021 23:42:17 +0100
Subject: [PATCH 16/46] Split at externally referenced labels

---
 asm/macros/scripts.inc                        |   28 -
 data/scripts.s                                | 3594 ++---------------
 data/scripts/ezlo_angry.inc                   |  231 --
 data/scripts/gUnk_08008B5C.inc                |    8 +-
 data/scripts/gUnk_08008D8C.inc                |   16 +-
 data/scripts/gUnk_08008FC0.inc                |   12 +-
 data/scripts/gUnk_0800903C.inc                |   44 +-
 data/scripts/gUnk_08009B78.inc                |   12 +-
 data/scripts/gUnk_08009C68.inc                |    8 +-
 data/scripts/gUnk_08009F14.inc                |   12 +-
 data/scripts/gUnk_0800A0FC.inc                |   12 +-
 data/scripts/gUnk_0800A160.inc                |    8 +-
 data/scripts/gUnk_0800A1B4.inc                |    4 +-
 data/scripts/gUnk_0800A1D8.inc                |   28 +-
 data/scripts/gUnk_0800A310.inc                |    8 +-
 data/scripts/gUnk_0800A3D8.inc                |   24 +-
 data/scripts/gUnk_0800A500.inc                |    4 +-
 data/scripts/gUnk_0800A590.inc                |   12 +-
 data/scripts/gUnk_0800A638.inc                |    4 +-
 data/scripts/gUnk_0800A65C.inc                |    4 +-
 data/scripts/gUnk_0800A680.inc                |    4 +-
 data/scripts/gUnk_0800A6A4.inc                |    4 +-
 data/scripts/gUnk_0800A6D4.inc                |    4 +-
 data/scripts/gUnk_0800A704.inc                |    4 +-
 data/scripts/gUnk_0800A734.inc                |    4 +-
 data/scripts/gUnk_0800A764.inc                |    4 +-
 data/scripts/gUnk_0800A7E4.inc                |    4 +-
 data/scripts/gUnk_0800A9F4.inc                |    4 +-
 data/scripts/gUnk_0800AAD8.inc                |    4 +-
 data/scripts/gUnk_0800AB08.inc                |   20 +-
 data/scripts/gUnk_0800AB6E.inc                |   28 +-
 data/scripts/gUnk_0800ACBC.inc                |   36 +-
 data/scripts/gUnk_0800AF18.inc                |    4 +-
 data/scripts/gUnk_0800B0D0.inc                |   24 +-
 data/scripts/gUnk_0800B3A4.inc                |   38 -
 data/scripts/gUnk_0800B41C.inc                |   36 +
 data/scripts/gUnk_0800B5EC.inc                |    8 +-
 data/scripts/gUnk_0800B6C8.inc                |   24 +-
 data/scripts/gUnk_0800B7FC.inc                |    8 +-
 data/scripts/gUnk_0800B828.inc                |    8 +-
 data/scripts/gUnk_0800B9B4.inc                |    4 +-
 data/scripts/gUnk_0800BC50.inc                |    8 +-
 data/scripts/gUnk_0800BD78.inc                |   12 +-
 data/scripts/gUnk_0800BECC.inc                |    4 +-
 data/scripts/gUnk_0800C004.inc                |   12 +-
 data/scripts/gUnk_0800C160.inc                |    4 +-
 data/scripts/gUnk_0800C2A4.inc                |   12 +-
 data/scripts/gUnk_0800C350.inc                |    4 +-
 data/scripts/gUnk_0800C3CC.inc                |    8 +-
 data/scripts/gUnk_0800C410.inc                |    8 +-
 data/scripts/gUnk_0800CD7C.inc                |   20 +-
 data/scripts/gUnk_0800D1E0.inc                |    8 +-
 data/scripts/gUnk_0800D414.inc                |   20 +-
 data/scripts/gUnk_0800D76C.inc                |    8 +-
 data/scripts/gUnk_0800DA60.inc                |   12 +-
 data/scripts/gUnk_0800DB78.inc                |   12 +-
 data/scripts/gUnk_0800DC4C.inc                |    8 +-
 data/scripts/gUnk_0800DCAC.inc                |    4 +-
 data/scripts/gUnk_0800DDD0.inc                |    4 +-
 data/scripts/gUnk_0800DE50.inc                |    4 +-
 data/scripts/gUnk_0800DF24.inc                |    4 +-
 data/scripts/gUnk_0800DFB4.inc                |    4 +-
 data/scripts/gUnk_0800DFE4.inc                |   12 +-
 data/scripts/gUnk_0800E0BC.inc                |   76 +-
 data/scripts/gUnk_0800E6B0.inc                |   28 +-
 data/scripts/gUnk_0800E8A4.inc                |    4 +-
 data/scripts/gUnk_0800E8D6.inc                |    4 +-
 data/scripts/gUnk_0800EA54.inc                |   32 +-
 data/scripts/gUnk_0800EFC0.inc                |   44 +-
 data/scripts/gUnk_0800F184.inc                |   36 +-
 data/scripts/gUnk_0800F554.inc                |   20 +-
 data/scripts/gUnk_0800F724.inc                |   76 +-
 data/scripts/gUnk_0800FAE4.inc                |   12 +-
 data/scripts/gUnk_0800FD0C.inc                |    8 +-
 data/scripts/gUnk_0800FDA0.inc                |    8 +-
 data/scripts/gUnk_0800FF18.inc                |    8 +-
 data/scripts/gUnk_0800FF74.inc                |   36 +-
 data/scripts/gUnk_080100C8.inc                |   20 +-
 data/scripts/gUnk_08010264.inc                |   66 +-
 data/scripts/gUnk_08010A98.inc                |   24 +-
 data/scripts/gUnk_08010BB4.inc                |   44 +-
 data/scripts/gUnk_08010E5A.inc                |   40 +-
 data/scripts/gUnk_08010F84.inc                |   36 +-
 data/scripts/gUnk_080112C4.inc                |    4 +-
 data/scripts/gUnk_080116A8.inc                |    8 +-
 data/scripts/gUnk_0801194C.inc                |   56 +-
 data/scripts/gUnk_08011B20.inc                |    4 +-
 data/scripts/gUnk_08011B40.inc                |   12 +-
 data/scripts/gUnk_08011C50.inc                |    4 +-
 data/scripts/gUnk_0801232C.inc                |    8 +-
 data/scripts/gUnk_08012430.inc                |   12 +-
 data/scripts/gUnk_080126FC.inc                |   80 +-
 data/scripts/gUnk_08012B24.inc                |    4 +-
 data/scripts/gUnk_08012B50.inc                |    4 +-
 data/scripts/gUnk_08012B7C.inc                |    4 +-
 data/scripts/gUnk_08012E88.inc                |   51 +-
 data/scripts/gUnk_08012F0C.inc                |   37 +
 data/scripts/gUnk_08012F86.inc                |    8 +-
 data/scripts/gUnk_08013114.inc                |   12 +-
 data/scripts/gUnk_0801319A.inc                |   16 +-
 data/scripts/gUnk_080133F8.inc                |    4 +-
 data/scripts/gUnk_080134DC.inc                |   56 +-
 data/scripts/gUnk_08013650.inc                |    4 +-
 data/scripts/gUnk_080136D8.inc                |   12 +-
 data/scripts/gUnk_08013720.inc                |   56 +-
 data/scripts/gUnk_080138B4.inc                |   80 +-
 data/scripts/gUnk_08013AA6.inc                |    4 +-
 data/scripts/gUnk_08013B18.inc                |    8 +-
 data/scripts/gUnk_08013BA8.inc                |    8 +-
 data/scripts/gUnk_08013BE8.inc                |    8 +-
 data/scripts/gUnk_08013D04.inc                |    8 +-
 data/scripts/gUnk_08013D44.inc                |    8 +-
 data/scripts/gUnk_08013D84.inc                |    8 +-
 data/scripts/gUnk_08013DC4.inc                |    8 +-
 data/scripts/gUnk_08013FE8.inc                |    4 +-
 data/scripts/gUnk_080141DC.inc                |    4 +-
 data/scripts/gUnk_08014210.inc                |    4 +-
 data/scripts/gUnk_08014248.inc                |   78 +-
 data/scripts/gUnk_080142B0.inc                |   60 +
 data/scripts/gUnk_08014450.inc                |    4 +-
 data/scripts/gUnk_080145B0.inc                |    4 +-
 data/scripts/gUnk_080145E8.inc                |   28 +-
 data/scripts/gUnk_08014804.inc                |   12 +-
 data/scripts/gUnk_080149CC.inc                |   54 -
 data/scripts/gUnk_08014A80.inc                |   52 +
 data/scripts/gUnk_08014CDC.inc                |    8 +-
 data/scripts/gUnk_08014E14.inc                |   40 +-
 data/scripts/gUnk_08015390.inc                |    4 +-
 data/scripts/gUnk_080153EC.inc                |   24 +-
 data/scripts/gUnk_0801548E.inc                |   16 +-
 data/scripts/gUnk_0801550C.inc                |   28 +-
 data/scripts/gUnk_08015618.inc                |    8 +-
 data/scripts/gUnk_08015684.inc                |    4 +-
 data/scripts/gUnk_080157AC.inc                |   12 +-
 data/scripts/gUnk_08015958.inc                |    8 +-
 data/scripts/gUnk_08015B34.inc                |    8 +-
 data/scripts/gUnk_08015C7C.inc                |   12 +-
 data/scripts/gUnk_08015FC0.inc                |    4 +-
 data/scripts/gUnk_080160A8.inc                |   14 +-
 data/scripts/gUnk_0801637C.inc                |   10 +-
 data/scripts/gUnk_08016482.inc                |   10 +-
 data/scripts/npc4e_fusion.inc                 |   19 -
 tools/script_disassembler/incbin_parser.py    |   16 +-
 .../script_disassembler.py                    |   13 +-
 144 files changed, 1614 insertions(+), 4705 deletions(-)
 delete mode 100644 data/scripts/ezlo_angry.inc
 create mode 100644 data/scripts/gUnk_0800B41C.inc
 create mode 100644 data/scripts/gUnk_08012F0C.inc
 create mode 100644 data/scripts/gUnk_080142B0.inc
 create mode 100644 data/scripts/gUnk_08014A80.inc
 delete mode 100644 data/scripts/npc4e_fusion.inc

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 36781ca8..93cb0e0b 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -9,10 +9,6 @@
 	.short 0xffff
 .endm
 
-.macro ScriptCommandNop 
-	.short 0x0000
-.endm
-
 .macro StartScript 
 	.short 0x0401
 .endm
@@ -36,10 +32,6 @@
 	.short \s
 .endm
 
-.macro _0807E078 
-	.short 0x0006
-.endm
-
 .macro JumpAbsolute w
 	.short 0x0c07
 	.word \w
@@ -66,10 +58,6 @@
 	.word \w
 .endm
 
-.macro CallWithArg 
-	.short 0x000c
-.endm
-
 .macro LoadRoomEntityList w
 	.short 0x0c0d
 	.word \w
@@ -90,10 +78,6 @@
 	.short \s
 .endm
 
-.macro HasRoomItemForSale 
-	.short 0x0411
-.endm
-
 .macro CheckLocalFlag s
 	.short 0x0812
 	.short \s
@@ -325,10 +309,6 @@
 	.word \w
 .endm
 
-.macro _0807E858 
-	.short 0x0042
-.endm
-
 .macro _0807E864 
 	.short 0x0443
 .endm
@@ -440,14 +420,6 @@
 	.short \s
 .endm
 
-.macro TextboxNoOverlapFollowPos 
-	.short 0x005c
-.endm
-
-.macro _0807EAF0 
-	.short 0x005d
-.endm
-
 .macro TextboxNoOverlapVar 
 	.short 0x045e
 .endm
diff --git a/data/scripts.s b/data/scripts.s
index edb0c350..6864ebf2 100644
--- a/data/scripts.s
+++ b/data/scripts.s
@@ -1,3214 +1,394 @@
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
-	.include "asm/macros/script.inc"
+	.include "asm/macros/scripts.inc"
 
 	.syntax unified
 
 	.text
-
-gUnk_08008B5C:: @ 08008B5C
-	.incbin "baserom.gba", 0x008B5C, 0x0000034
-
-gUnk_08008B90:: @ 08008B90
-	.incbin "baserom.gba", 0x008B90, 0x0000030
-
-gUnk_08008BC0:: @ 08008BC0
-	.incbin "baserom.gba", 0x008BC0, 0x000008E
-
-gUnk_08008C4E:: @ 08008C4E
-	.incbin "baserom.gba", 0x008C4E, 0x0000016
-
-gUnk_08008C64:: @ 08008C64
-	.incbin "baserom.gba", 0x008C64, 0x0000009
-
-gUnk_08008C6D:: @ 08008C6D
-	.incbin "baserom.gba", 0x008C6D, 0x0000011
-
-gUnk_08008C7E:: @ 08008C7E
-	.incbin "baserom.gba", 0x008C7E, 0x000003B
-
-gUnk_08008CB9:: @ 08008CB9
-	.incbin "baserom.gba", 0x008CB9, 0x0000097
-
-gUnk_08008D50:: @ 08008D50
-	.incbin "baserom.gba", 0x008D50, 0x000003C
-
-gUnk_08008D8C:: @ 08008D8C
-	.incbin "baserom.gba", 0x008D8C, 0x0000034
-
-gUnk_08008DC0:: @ 08008DC0
-	.incbin "baserom.gba", 0x008DC0, 0x0000048
-
-gUnk_08008E08:: @ 08008E08
-	.incbin "baserom.gba", 0x008E08, 0x0000002
-
-gUnk_08008E0A:: @ 08008E0A
-	.incbin "baserom.gba", 0x008E0A, 0x0000102
-
-gUnk_08008F0C:: @ 08008F0C
-	.incbin "baserom.gba", 0x008F0C, 0x000000A
-
-gUnk_08008F16:: @ 08008F16
-	.incbin "baserom.gba", 0x008F16, 0x0000010
-
-gUnk_08008F26:: @ 08008F26
-	.incbin "baserom.gba", 0x008F26, 0x000006A
-
-gUnk_08008F90:: @ 08008F90
-	.incbin "baserom.gba", 0x008F90, 0x0000030
-
-gUnk_08008FC0:: @ 08008FC0
-	.incbin "baserom.gba", 0x008FC0, 0x0000011
-
-gUnk_08008FD1:: @ 08008FD1
-	.incbin "baserom.gba", 0x008FD1, 0x000002B
-
-gUnk_08008FFC:: @ 08008FFC
-	.incbin "baserom.gba", 0x008FFC, 0x000000C
-
-gUnk_08009008:: @ 08009008
-	.incbin "baserom.gba", 0x009008, 0x0000017
-
-gUnk_0800901F:: @ 0800901F
-	.incbin "baserom.gba", 0x00901F, 0x000001D
-
-gUnk_0800903C:: @ 0800903C
-	.incbin "baserom.gba", 0x00903C, 0x0000044
-
-gUnk_08009080:: @ 08009080
-	.incbin "baserom.gba", 0x009080, 0x000005B
-
-gUnk_080090DB:: @ 080090DB
-	.incbin "baserom.gba", 0x0090DB, 0x00000BD
-
-gUnk_08009198:: @ 08009198
-	.incbin "baserom.gba", 0x009198, 0x000006F
-
-gUnk_08009207:: @ 08009207
-	.incbin "baserom.gba", 0x009207, 0x000006D
-
-gUnk_08009274:: @ 08009274
-	.incbin "baserom.gba", 0x009274, 0x0000034
-
-gUnk_080092A8:: @ 080092A8
-	.incbin "baserom.gba", 0x0092A8, 0x000002C
-
-gUnk_080092D4:: @ 080092D4
-	.incbin "baserom.gba", 0x0092D4, 0x000001C
-
-gUnk_080092F0:: @ 080092F0
-	.incbin "baserom.gba", 0x0092F0, 0x0000018
-
-gUnk_08009308:: @ 08009308
-	.incbin "baserom.gba", 0x009308, 0x0000010
-
-gUnk_08009318:: @ 08009318
-	.incbin "baserom.gba", 0x009318, 0x0000008
-
-gUnk_08009320:: @ 08009320
-	.incbin "baserom.gba", 0x009320, 0x0000020
-
-gUnk_08009340:: @ 08009340
-	.incbin "baserom.gba", 0x009340, 0x0000008
-
-gUnk_08009348:: @ 08009348
-	.incbin "baserom.gba", 0x009348, 0x000004B
-
-gUnk_08009393:: @ 08009393
-	.incbin "baserom.gba", 0x009393, 0x0000044
-
-gUnk_080093D7:: @ 080093D7
-	.incbin "baserom.gba", 0x0093D7, 0x0000030
-
-gUnk_08009407:: @ 08009407
-	.incbin "baserom.gba", 0x009407, 0x000007F
-
-gUnk_08009486:: @ 08009486
-	.incbin "baserom.gba", 0x009486, 0x000001E
-
-gUnk_080094A4:: @ 080094A4
-	.incbin "baserom.gba", 0x0094A4, 0x0000028
-
-gUnk_080094CC:: @ 080094CC
-	.incbin "baserom.gba", 0x0094CC, 0x000000B
-
-gUnk_080094D7:: @ 080094D7
-	.incbin "baserom.gba", 0x0094D7, 0x0000025
-
-gUnk_080094FC:: @ 080094FC
-	.incbin "baserom.gba", 0x0094FC, 0x0000007
-
-gUnk_08009503:: @ 08009503
-	.incbin "baserom.gba", 0x009503, 0x0000005
-
-gUnk_08009508:: @ 08009508
-	.incbin "baserom.gba", 0x009508, 0x0000030
-
-gUnk_08009538:: @ 08009538
-	.incbin "baserom.gba", 0x009538, 0x000003C
-
-gUnk_08009574:: @ 08009574
-	.incbin "baserom.gba", 0x009574, 0x0000058
-
-gUnk_080095CC:: @ 080095CC
-	.incbin "baserom.gba", 0x0095CC, 0x0000060
-
-gUnk_0800962C:: @ 0800962C
-	.incbin "baserom.gba", 0x00962C, 0x000006C
-
-gUnk_08009698:: @ 08009698
-	.incbin "baserom.gba", 0x009698, 0x000006C
-
-gUnk_08009704:: @ 08009704
-	.incbin "baserom.gba", 0x009704, 0x0000002
-
-gUnk_08009706:: @ 08009706
-	.incbin "baserom.gba", 0x009706, 0x000003A
-
-gUnk_08009740:: @ 08009740
-	.incbin "baserom.gba", 0x009740, 0x0000038
-
-gUnk_08009778:: @ 08009778
-	.incbin "baserom.gba", 0x009778, 0x000000E
-
-gUnk_08009786:: @ 08009786
-	.incbin "baserom.gba", 0x009786, 0x000001B
-
-gUnk_080097A1:: @ 080097A1
-	.incbin "baserom.gba", 0x0097A1, 0x000004F
-
-gUnk_080097F0:: @ 080097F0
-	.incbin "baserom.gba", 0x0097F0, 0x0000048
-
-gUnk_08009838:: @ 08009838
-	.incbin "baserom.gba", 0x009838, 0x000009C
-
-gUnk_080098D4:: @ 080098D4
-	.incbin "baserom.gba", 0x0098D4, 0x0000044
-
-gUnk_08009918:: @ 08009918
-	.incbin "baserom.gba", 0x009918, 0x0000028
-
-gUnk_08009940:: @ 08009940
-	.incbin "baserom.gba", 0x009940, 0x0000010
-
-gUnk_08009950:: @ 08009950
-	.incbin "baserom.gba", 0x009950, 0x000008C
-
-gUnk_080099DC:: @ 080099DC
-	.incbin "baserom.gba", 0x0099DC, 0x0000028
-
-gUnk_08009A04:: @ 08009A04
-	.incbin "baserom.gba", 0x009A04, 0x0000003
-
-gUnk_08009A07:: @ 08009A07
-	.incbin "baserom.gba", 0x009A07, 0x0000025
-
-gUnk_08009A2C:: @ 08009A2C
-	.incbin "baserom.gba", 0x009A2C, 0x0000008
-
-gUnk_08009A34:: @ 08009A34
-	.incbin "baserom.gba", 0x009A34, 0x000001C
-
-gUnk_08009A50:: @ 08009A50
-	.incbin "baserom.gba", 0x009A50, 0x0000027
-
-gUnk_08009A77:: @ 08009A77
-	.incbin "baserom.gba", 0x009A77, 0x000000A
-
-gUnk_08009A81:: @ 08009A81
-	.incbin "baserom.gba", 0x009A81, 0x0000003
-
-gUnk_08009A84:: @ 08009A84
-	.incbin "baserom.gba", 0x009A84, 0x0000037
-
-gUnk_08009ABB:: @ 08009ABB
-	.incbin "baserom.gba", 0x009ABB, 0x000003D
-
-gUnk_08009AF8:: @ 08009AF8
-	.incbin "baserom.gba", 0x009AF8, 0x0000038
-
-gUnk_08009B30:: @ 08009B30
-	.incbin "baserom.gba", 0x009B30, 0x0000033
-
-gUnk_08009B63:: @ 08009B63
-	.incbin "baserom.gba", 0x009B63, 0x0000015
-
-gUnk_08009B78:: @ 08009B78
-	.incbin "baserom.gba", 0x009B78, 0x00000F0
-
-gUnk_08009C68:: @ 08009C68
-	.incbin "baserom.gba", 0x009C68, 0x0000017
-
-gUnk_08009C7F:: @ 08009C7F
-	.incbin "baserom.gba", 0x009C7F, 0x000001F
-
-gUnk_08009C9E:: @ 08009C9E
-	.incbin "baserom.gba", 0x009C9E, 0x0000062
-
-gUnk_08009D00:: @ 08009D00
-	.incbin "baserom.gba", 0x009D00, 0x000006C
-
-gUnk_08009D6C:: @ 08009D6C
-	.incbin "baserom.gba", 0x009D6C, 0x000000B
-
-gUnk_08009D77:: @ 08009D77
-	.incbin "baserom.gba", 0x009D77, 0x0000039
-
-gUnk_08009DB0:: @ 08009DB0
-	.incbin "baserom.gba", 0x009DB0, 0x000003C
-
-gUnk_08009DEC:: @ 08009DEC
-	.incbin "baserom.gba", 0x009DEC, 0x000004C
-
-gUnk_08009E38:: @ 08009E38
-	.incbin "baserom.gba", 0x009E38, 0x0000020
-
-gUnk_08009E58:: @ 08009E58
-	.incbin "baserom.gba", 0x009E58, 0x0000030
-
-gUnk_08009E88:: @ 08009E88
-	.incbin "baserom.gba", 0x009E88, 0x0000016
-
-gUnk_08009E9E:: @ 08009E9E
-	.incbin "baserom.gba", 0x009E9E, 0x000000B
-
-gUnk_08009EA9:: @ 08009EA9
-	.incbin "baserom.gba", 0x009EA9, 0x000000E
-
-gUnk_08009EB7:: @ 08009EB7
-	.incbin "baserom.gba", 0x009EB7, 0x0000015
-
-gUnk_08009ECC:: @ 08009ECC
-	.incbin "baserom.gba", 0x009ECC, 0x0000024
-
-gUnk_08009EF0:: @ 08009EF0
-	.incbin "baserom.gba", 0x009EF0, 0x0000017
-
-gUnk_08009F07:: @ 08009F07
-	.incbin "baserom.gba", 0x009F07, 0x000000D
-
-gUnk_08009F14:: @ 08009F14
-	.incbin "baserom.gba", 0x009F14, 0x0000025
-
-gUnk_08009F39:: @ 08009F39
-	.incbin "baserom.gba", 0x009F39, 0x0000039
-
-gUnk_08009F72:: @ 08009F72
-	.incbin "baserom.gba", 0x009F72, 0x00000F2
-
-gUnk_0800A064:: @ 0800A064
-	.incbin "baserom.gba", 0x00A064, 0x000001D
-
-gUnk_0800A081:: @ 0800A081
-	.incbin "baserom.gba", 0x00A081, 0x0000033
-
-gUnk_0800A0B4:: @ 0800A0B4
-	.incbin "baserom.gba", 0x00A0B4, 0x0000048
-
-gUnk_0800A0FC:: @ 0800A0FC
-	.incbin "baserom.gba", 0x00A0FC, 0x000000E
-
-gUnk_0800A10A:: @ 0800A10A
-	.incbin "baserom.gba", 0x00A10A, 0x0000005
-
-gUnk_0800A10F:: @ 0800A10F
-	.incbin "baserom.gba", 0x00A10F, 0x0000015
-
-gUnk_0800A124:: @ 0800A124
-	.incbin "baserom.gba", 0x00A124, 0x0000010
-
-gUnk_0800A134:: @ 0800A134
-	.incbin "baserom.gba", 0x00A134, 0x0000080
-
-gUnk_0800A1B4:: @ 0800A1B4
-	.incbin "baserom.gba", 0x00A1B4, 0x0000024
-
-gUnk_0800A1D8:: @ 0800A1D8
-	.incbin "baserom.gba", 0x00A1D8, 0x000004C
-
-gUnk_0800A224:: @ 0800A224
-	.incbin "baserom.gba", 0x00A224, 0x000003C
-
-gUnk_0800A260:: @ 0800A260
-	.incbin "baserom.gba", 0x00A260, 0x00000E0
-
-gUnk_0800A340:: @ 0800A340
-	.incbin "baserom.gba", 0x00A340, 0x0000063
-
-gUnk_0800A3A3:: @ 0800A3A3
-	.incbin "baserom.gba", 0x00A3A3, 0x0000006
-
-gUnk_0800A3A9:: @ 0800A3A9
-	.incbin "baserom.gba", 0x00A3A9, 0x0000001
-
-gUnk_0800A3AA:: @ 0800A3AA
-	.incbin "baserom.gba", 0x00A3AA, 0x000002E
-
-gUnk_0800A3D8:: @ 0800A3D8
-	.incbin "baserom.gba", 0x00A3D8, 0x0000128
-
-gUnk_0800A500:: @ 0800A500
-	.incbin "baserom.gba", 0x00A500, 0x0000090
-
-gUnk_0800A590:: @ 0800A590
-	.incbin "baserom.gba", 0x00A590, 0x0000016
-
-gUnk_0800A5A6:: @ 0800A5A6
-	.incbin "baserom.gba", 0x00A5A6, 0x00000B6
-
-gUnk_0800A65C:: @ 0800A65C
-	.incbin "baserom.gba", 0x00A65C, 0x0000022
-
-gUnk_0800A67E:: @ 0800A67E
-	.incbin "baserom.gba", 0x00A67E, 0x0000002
-
-gUnk_0800A680:: @ 0800A680
-	.incbin "baserom.gba", 0x00A680, 0x0000024
-
-gUnk_0800A6A4:: @ 0800A6A4
-	.incbin "baserom.gba", 0x00A6A4, 0x0000007
-
-gUnk_0800A6AB:: @ 0800A6AB
-	.incbin "baserom.gba", 0x00A6AB, 0x0000029
-
-gUnk_0800A6D4:: @ 0800A6D4
-	.incbin "baserom.gba", 0x00A6D4, 0x0000030
-
-gUnk_0800A704:: @ 0800A704
-	.incbin "baserom.gba", 0x00A704, 0x0000030
-
-gUnk_0800A734:: @ 0800A734
-	.incbin "baserom.gba", 0x00A734, 0x0000016
-
-gUnk_0800A74A:: @ 0800A74A
-	.incbin "baserom.gba", 0x00A74A, 0x000001A
-
-gUnk_0800A764:: @ 0800A764
-	.incbin "baserom.gba", 0x00A764, 0x0000080
-
-gUnk_0800A7E4:: @ 0800A7E4
-	.incbin "baserom.gba", 0x00A7E4, 0x0000004
-
-gUnk_0800A7E8:: @ 0800A7E8
-	.incbin "baserom.gba", 0x00A7E8, 0x000002E
-
-gUnk_0800A816:: @ 0800A816
-	.incbin "baserom.gba", 0x00A816, 0x000000A
-
-gUnk_0800A820:: @ 0800A820
-	.incbin "baserom.gba", 0x00A820, 0x000003C
-
-gUnk_0800A85C:: @ 0800A85C
-	.incbin "baserom.gba", 0x00A85C, 0x000003C
-
-gUnk_0800A898:: @ 0800A898
-	.incbin "baserom.gba", 0x00A898, 0x000003C
-
-gUnk_0800A8D4:: @ 0800A8D4
-	.incbin "baserom.gba", 0x00A8D4, 0x0000034
-
-gUnk_0800A908:: @ 0800A908
-	.incbin "baserom.gba", 0x00A908, 0x0000008
-
-gUnk_0800A910:: @ 0800A910
-	.incbin "baserom.gba", 0x00A910, 0x0000054
-
-gUnk_0800A964:: @ 0800A964
-	.incbin "baserom.gba", 0x00A964, 0x0000024
-
-gUnk_0800A988:: @ 0800A988
-	.incbin "baserom.gba", 0x00A988, 0x0000024
-
-gUnk_0800A9AC:: @ 0800A9AC
-	.incbin "baserom.gba", 0x00A9AC, 0x0000024
-
-gUnk_0800A9D0:: @ 0800A9D0
-	.incbin "baserom.gba", 0x00A9D0, 0x0000024
-
-gUnk_0800A9F4:: @ 0800A9F4
-	.incbin "baserom.gba", 0x00A9F4, 0x000000F
-
-gUnk_0800AA03:: @ 0800AA03
-	.incbin "baserom.gba", 0x00AA03, 0x0000045
-
-gUnk_0800AA48:: @ 0800AA48
-	.incbin "baserom.gba", 0x00AA48, 0x0000024
-
-gUnk_0800AA6C:: @ 0800AA6C
-	.incbin "baserom.gba", 0x00AA6C, 0x0000024
-
-gUnk_0800AA90:: @ 0800AA90
-	.incbin "baserom.gba", 0x00AA90, 0x0000024
-
-gUnk_0800AAB4:: @ 0800AAB4
-	.incbin "baserom.gba", 0x00AAB4, 0x0000024
-
-gUnk_0800AAD8:: @ 0800AAD8
-	.incbin "baserom.gba", 0x00AAD8, 0x0000030
-
-gUnk_0800AB08:: @ 0800AB08
-	.incbin "baserom.gba", 0x00AB08, 0x000001B
-
-gUnk_0800AB23:: @ 0800AB23
-	.incbin "baserom.gba", 0x00AB23, 0x000002C
-
-gUnk_0800AB4F:: @ 0800AB4F
-	.incbin "baserom.gba", 0x00AB4F, 0x00000A1
-
-gUnk_0800ABF0:: @ 0800ABF0
-	.incbin "baserom.gba", 0x00ABF0, 0x0000034
-
-gUnk_0800AC24:: @ 0800AC24
-	.incbin "baserom.gba", 0x00AC24, 0x0000049
-
-gUnk_0800AC6D:: @ 0800AC6D
-	.incbin "baserom.gba", 0x00AC6D, 0x0000048
-
-gUnk_0800ACB5:: @ 0800ACB5
-	.incbin "baserom.gba", 0x00ACB5, 0x0000007
-
-gUnk_0800ACBC:: @ 0800ACBC
-	.incbin "baserom.gba", 0x00ACBC, 0x0000024
-
-gUnk_0800ACE0:: @ 0800ACE0
-	.incbin "baserom.gba", 0x00ACE0, 0x0000074
-
-gUnk_0800AD54:: @ 0800AD54
-	.incbin "baserom.gba", 0x00AD54, 0x0000020
-
-gUnk_0800AD74:: @ 0800AD74
-	.incbin "baserom.gba", 0x00AD74, 0x0000033
-
-gUnk_0800ADA7:: @ 0800ADA7
-	.incbin "baserom.gba", 0x00ADA7, 0x000000D
-
-gUnk_0800ADB4:: @ 0800ADB4
-	.incbin "baserom.gba", 0x00ADB4, 0x00000F0
-
-gUnk_0800AEA4:: @ 0800AEA4
-	.incbin "baserom.gba", 0x00AEA4, 0x0000038
-
-gUnk_0800AEDC:: @ 0800AEDC
-	.incbin "baserom.gba", 0x00AEDC, 0x000003C
-
-gUnk_0800AF18:: @ 0800AF18
-	.incbin "baserom.gba", 0x00AF18, 0x000002C
-
-gUnk_0800AF44:: @ 0800AF44
-	.incbin "baserom.gba", 0x00AF44, 0x0000024
-
-gUnk_0800AF68:: @ 0800AF68
-	.incbin "baserom.gba", 0x00AF68, 0x0000016
-
-gUnk_0800AF7E:: @ 0800AF7E
-	.incbin "baserom.gba", 0x00AF7E, 0x000000E
-
-gUnk_0800AF8C:: @ 0800AF8C
-	.incbin "baserom.gba", 0x00AF8C, 0x000001B
-
-gUnk_0800AFA7:: @ 0800AFA7
-	.incbin "baserom.gba", 0x00AFA7, 0x0000009
-
-gUnk_0800AFB0:: @ 0800AFB0
-	.incbin "baserom.gba", 0x00AFB0, 0x0000038
-
-gUnk_0800AFE8:: @ 0800AFE8
-	.incbin "baserom.gba", 0x00AFE8, 0x0000024
-
-gUnk_0800B00C:: @ 0800B00C
-	.incbin "baserom.gba", 0x00B00C, 0x00000A0
-
-gUnk_0800B0AC:: @ 0800B0AC
-	.incbin "baserom.gba", 0x00B0AC, 0x0000004
-
-gUnk_0800B0B0:: @ 0800B0B0
-	.incbin "baserom.gba", 0x00B0B0, 0x0000020
-
-gUnk_0800B0D0:: @ 0800B0D0
-	.incbin "baserom.gba", 0x00B0D0, 0x00000A7
-
-gUnk_0800B177:: @ 0800B177
-	.incbin "baserom.gba", 0x00B177, 0x0000005
-
-gUnk_0800B17C:: @ 0800B17C
-	.incbin "baserom.gba", 0x00B17C, 0x0000044
-
-gUnk_0800B1C0:: @ 0800B1C0
-	.incbin "baserom.gba", 0x00B1C0, 0x0000040
-
-gUnk_0800B200:: @ 0800B200
-	.incbin "baserom.gba", 0x00B200, 0x0000054
-
-gUnk_0800B254:: @ 0800B254
-	.incbin "baserom.gba", 0x00B254, 0x0000030
-
-gUnk_0800B284:: @ 0800B284
-	.incbin "baserom.gba", 0x00B284, 0x0000030
-
-gUnk_0800B2B4:: @ 0800B2B4
-	.incbin "baserom.gba", 0x00B2B4, 0x0000054
-
-gUnk_0800B308:: @ 0800B308
-	.incbin "baserom.gba", 0x00B308, 0x000001A
-
-gUnk_0800B322:: @ 0800B322
-	.incbin "baserom.gba", 0x00B322, 0x0000007
-
-gUnk_0800B329:: @ 0800B329
-	.incbin "baserom.gba", 0x00B329, 0x000001F
-
-gUnk_0800B348:: @ 0800B348
-	.incbin "baserom.gba", 0x00B348, 0x0000014
-
-gUnk_0800B35C:: @ 0800B35C
-	.incbin "baserom.gba", 0x00B35C, 0x0000018
-
-gUnk_0800B374:: @ 0800B374
-	.incbin "baserom.gba", 0x00B374, 0x0000030
-
-gUnk_0800B3A4:: @ 0800B3A4
-	.incbin "baserom.gba", 0x00B3A4, 0x000006B
-
-gUnk_0800B40F:: @ 0800B40F
-	.incbin "baserom.gba", 0x00B40F, 0x000000D
-
-gUnk_0800B41C:: @ 0800B41C
-	.incbin "baserom.gba", 0x00B41C, 0x0000090
-
-gUnk_0800B4AC:: @ 0800B4AC
-	.incbin "baserom.gba", 0x00B4AC, 0x000005C
-
-gUnk_0800B508:: @ 0800B508
-	.incbin "baserom.gba", 0x00B508, 0x0000007
-
-gUnk_0800B50F:: @ 0800B50F
-	.incbin "baserom.gba", 0x00B50F, 0x000003D
-
-gUnk_0800B54C:: @ 0800B54C
-	.incbin "baserom.gba", 0x00B54C, 0x0000028
-
-gUnk_0800B574:: @ 0800B574
-	.incbin "baserom.gba", 0x00B574, 0x0000050
-
-gUnk_0800B5C4:: @ 0800B5C4
-	.incbin "baserom.gba", 0x00B5C4, 0x0000028
-
-gUnk_0800B5EC:: @ 0800B5EC
-	.incbin "baserom.gba", 0x00B5EC, 0x0000028
-
-gUnk_0800B614:: @ 0800B614
-	.incbin "baserom.gba", 0x00B614, 0x00000B4
-
-gUnk_0800B6C8:: @ 0800B6C8
-	.incbin "baserom.gba", 0x00B6C8, 0x0000040
-
-gUnk_0800B708:: @ 0800B708
-	.incbin "baserom.gba", 0x00B708, 0x0000017
-
-gUnk_0800B71F:: @ 0800B71F
-	.incbin "baserom.gba", 0x00B71F, 0x0000011
-
-gUnk_0800B730:: @ 0800B730
-	.incbin "baserom.gba", 0x00B730, 0x0000094
-
-gUnk_0800B7C4:: @ 0800B7C4
-	.incbin "baserom.gba", 0x00B7C4, 0x000008B
-
-gUnk_0800B84F:: @ 0800B84F
-	.incbin "baserom.gba", 0x00B84F, 0x0000012
-
-gUnk_0800B861:: @ 0800B861
-	.incbin "baserom.gba", 0x00B861, 0x0000027
-
-gUnk_0800B888:: @ 0800B888
-	.incbin "baserom.gba", 0x00B888, 0x0000018
-
-gUnk_0800B8A0:: @ 0800B8A0
-	.incbin "baserom.gba", 0x00B8A0, 0x0000018
-
-gUnk_0800B8B8:: @ 0800B8B8
-	.incbin "baserom.gba", 0x00B8B8, 0x000002C
-
-gUnk_0800B8E4:: @ 0800B8E4
-	.incbin "baserom.gba", 0x00B8E4, 0x0000022
-
-gUnk_0800B906:: @ 0800B906
-	.incbin "baserom.gba", 0x00B906, 0x0000016
-
-gUnk_0800B91C:: @ 0800B91C
-	.incbin "baserom.gba", 0x00B91C, 0x0000048
-
-gUnk_0800B964:: @ 0800B964
-	.incbin "baserom.gba", 0x00B964, 0x0000050
-
-gUnk_0800B9B4:: @ 0800B9B4
-	.incbin "baserom.gba", 0x00B9B4, 0x0000088
-
-gUnk_0800BA3C:: @ 0800BA3C
-	.incbin "baserom.gba", 0x00BA3C, 0x000003C
-
-gUnk_0800BA78:: @ 0800BA78
-	.incbin "baserom.gba", 0x00BA78, 0x0000054
-
-gUnk_0800BACC:: @ 0800BACC
-	.incbin "baserom.gba", 0x00BACC, 0x0000034
-
-gUnk_0800BB00:: @ 0800BB00
-	.incbin "baserom.gba", 0x00BB00, 0x0000008
-
-gUnk_0800BB08:: @ 0800BB08
-	.incbin "baserom.gba", 0x00BB08, 0x0000012
-
-gUnk_0800BB1A:: @ 0800BB1A
-	.incbin "baserom.gba", 0x00BB1A, 0x0000016
-
-gUnk_0800BB30:: @ 0800BB30
-	.incbin "baserom.gba", 0x00BB30, 0x0000034
-
-gUnk_0800BB64:: @ 0800BB64
-	.incbin "baserom.gba", 0x00BB64, 0x0000010
-
-gUnk_0800BB74:: @ 0800BB74
-	.incbin "baserom.gba", 0x00BB74, 0x0000030
-
-gUnk_0800BBA4:: @ 0800BBA4
-	.incbin "baserom.gba", 0x00BBA4, 0x0000037
-
-gUnk_0800BBDB:: @ 0800BBDB
-	.incbin "baserom.gba", 0x00BBDB, 0x0000001
-
-gUnk_0800BBDC:: @ 0800BBDC
-	.incbin "baserom.gba", 0x00BBDC, 0x000002C
-
-gUnk_0800BC08:: @ 0800BC08
-	.incbin "baserom.gba", 0x00BC08, 0x000001A
-
-gUnk_0800BC22:: @ 0800BC22
-	.incbin "baserom.gba", 0x00BC22, 0x000002E
-
-gUnk_0800BC50:: @ 0800BC50
-	.incbin "baserom.gba", 0x00BC50, 0x000005E
-
-gUnk_0800BCAE:: @ 0800BCAE
-	.incbin "baserom.gba", 0x00BCAE, 0x0000009
-
-gUnk_0800BCB7:: @ 0800BCB7
-	.incbin "baserom.gba", 0x00BCB7, 0x0000007
-
-gUnk_0800BCBE:: @ 0800BCBE
-	.incbin "baserom.gba", 0x00BCBE, 0x000002A
-
-gUnk_0800BCE8:: @ 0800BCE8
-	.incbin "baserom.gba", 0x00BCE8, 0x0000020
-
-gUnk_0800BD08:: @ 0800BD08
-	.incbin "baserom.gba", 0x00BD08, 0x0000068
-
-gUnk_0800BD70:: @ 0800BD70
-	.incbin "baserom.gba", 0x00BD70, 0x0000008
-
-gUnk_0800BD78:: @ 0800BD78
-	.incbin "baserom.gba", 0x00BD78, 0x0000034
-
-gUnk_0800BDAC:: @ 0800BDAC
-	.incbin "baserom.gba", 0x00BDAC, 0x0000018
-
-gUnk_0800BDC4:: @ 0800BDC4
-	.incbin "baserom.gba", 0x00BDC4, 0x0000058
-
-gUnk_0800BE1C:: @ 0800BE1C
-	.incbin "baserom.gba", 0x00BE1C, 0x0000038
-
-gUnk_0800BE54:: @ 0800BE54
-	.incbin "baserom.gba", 0x00BE54, 0x0000078
-
-gUnk_0800BECC:: @ 0800BECC
-	.incbin "baserom.gba", 0x00BECC, 0x0000048
-
-gUnk_0800BF14:: @ 0800BF14
-	.incbin "baserom.gba", 0x00BF14, 0x0000024
-
-gUnk_0800BF38:: @ 0800BF38
-	.incbin "baserom.gba", 0x00BF38, 0x0000012
-
-gUnk_0800BF4A:: @ 0800BF4A
-	.incbin "baserom.gba", 0x00BF4A, 0x0000026
-
-gUnk_0800BF70:: @ 0800BF70
-	.incbin "baserom.gba", 0x00BF70, 0x000004F
-
-gUnk_0800BFBF:: @ 0800BFBF
-	.incbin "baserom.gba", 0x00BFBF, 0x0000022
-
-gUnk_0800BFE1:: @ 0800BFE1
-	.incbin "baserom.gba", 0x00BFE1, 0x0000002
-
-gUnk_0800BFE3:: @ 0800BFE3
-	.incbin "baserom.gba", 0x00BFE3, 0x0000021
-
-gUnk_0800C004:: @ 0800C004
-	.incbin "baserom.gba", 0x00C004, 0x0000003
-
-gUnk_0800C007:: @ 0800C007
-	.incbin "baserom.gba", 0x00C007, 0x000001D
-
-gUnk_0800C024:: @ 0800C024
-	.incbin "baserom.gba", 0x00C024, 0x0000057
-
-gUnk_0800C07B:: @ 0800C07B
-	.incbin "baserom.gba", 0x00C07B, 0x0000035
-
-gUnk_0800C0B0:: @ 0800C0B0
-	.incbin "baserom.gba", 0x00C0B0, 0x0000017
-
-gUnk_0800C0C7:: @ 0800C0C7
-	.incbin "baserom.gba", 0x00C0C7, 0x000000C
-
-gUnk_0800C0D3:: @ 0800C0D3
-	.incbin "baserom.gba", 0x00C0D3, 0x0000015
-
-gUnk_0800C0E8:: @ 0800C0E8
-	.incbin "baserom.gba", 0x00C0E8, 0x000002B
-
-gUnk_0800C113:: @ 0800C113
-	.incbin "baserom.gba", 0x00C113, 0x0000034
-
-gUnk_0800C147:: @ 0800C147
-	.incbin "baserom.gba", 0x00C147, 0x0000019
-
-gUnk_0800C160:: @ 0800C160
-	.incbin "baserom.gba", 0x00C160, 0x0000078
-
-gUnk_0800C1D8:: @ 0800C1D8
-	.incbin "baserom.gba", 0x00C1D8, 0x000002C
-
-gUnk_0800C204:: @ 0800C204
-	.incbin "baserom.gba", 0x00C204, 0x0000003
-
-gUnk_0800C207:: @ 0800C207
-	.incbin "baserom.gba", 0x00C207, 0x0000001
-
-gUnk_0800C208:: @ 0800C208
-	.incbin "baserom.gba", 0x00C208, 0x0000008
-
-gUnk_0800C210:: @ 0800C210
-	.incbin "baserom.gba", 0x00C210, 0x0000053
-
-gUnk_0800C263:: @ 0800C263
-	.incbin "baserom.gba", 0x00C263, 0x0000041
-
-gUnk_0800C2A4:: @ 0800C2A4
-	.incbin "baserom.gba", 0x00C2A4, 0x0000003
-
-gUnk_0800C2A7:: @ 0800C2A7
-	.incbin "baserom.gba", 0x00C2A7, 0x0000027
-
-gUnk_0800C2CE:: @ 0800C2CE
-	.incbin "baserom.gba", 0x00C2CE, 0x0000082
-
-gUnk_0800C350:: @ 0800C350
-	.incbin "baserom.gba", 0x00C350, 0x0000046
-
-gUnk_0800C396:: @ 0800C396
-	.incbin "baserom.gba", 0x00C396, 0x0000036
-
-gUnk_0800C3CC:: @ 0800C3CC
-	.incbin "baserom.gba", 0x00C3CC, 0x000003C
-
-gUnk_0800C408:: @ 0800C408
-	.incbin "baserom.gba", 0x00C408, 0x0000008
-
-gUnk_0800C410:: @ 0800C410
-	.incbin "baserom.gba", 0x00C410, 0x000004C
-
-gUnk_0800C45C:: @ 0800C45C
-	.incbin "baserom.gba", 0x00C45C, 0x0000038
-
-gUnk_0800C494:: @ 0800C494
-	.incbin "baserom.gba", 0x00C494, 0x000003C
-
-gUnk_0800C4D0:: @ 0800C4D0
-	.incbin "baserom.gba", 0x00C4D0, 0x000000B
-
-gUnk_0800C4DB:: @ 0800C4DB
-	.incbin "baserom.gba", 0x00C4DB, 0x0000031
-
-gUnk_0800C50C:: @ 0800C50C
-	.incbin "baserom.gba", 0x00C50C, 0x0000015
-
-gUnk_0800C521:: @ 0800C521
-	.incbin "baserom.gba", 0x00C521, 0x000002F
-
-gUnk_0800C550:: @ 0800C550
-	.incbin "baserom.gba", 0x00C550, 0x0000006
-
-gUnk_0800C556:: @ 0800C556
-	.incbin "baserom.gba", 0x00C556, 0x000002E
-
-gUnk_0800C584:: @ 0800C584
-	.incbin "baserom.gba", 0x00C584, 0x0000016
-
-gUnk_0800C59A:: @ 0800C59A
-	.incbin "baserom.gba", 0x00C59A, 0x000002E
-
-gUnk_0800C5C8:: @ 0800C5C8
-	.incbin "baserom.gba", 0x00C5C8, 0x0000034
-
-gUnk_0800C5FC:: @ 0800C5FC
-	.incbin "baserom.gba", 0x00C5FC, 0x0000004
-
-gUnk_0800C600:: @ 0800C600
-	.incbin "baserom.gba", 0x00C600, 0x0000007
-
-gUnk_0800C607:: @ 0800C607
-	.incbin "baserom.gba", 0x00C607, 0x000002D
-
-gUnk_0800C634:: @ 0800C634
-	.incbin "baserom.gba", 0x00C634, 0x0000092
-
-gUnk_0800C6C6:: @ 0800C6C6
-	.incbin "baserom.gba", 0x00C6C6, 0x00000AE
-
-gUnk_0800C774:: @ 0800C774
-	.incbin "baserom.gba", 0x00C774, 0x0000005
-
-gUnk_0800C779:: @ 0800C779
-	.incbin "baserom.gba", 0x00C779, 0x000008F
-
-gUnk_0800C808:: @ 0800C808
-	.incbin "baserom.gba", 0x00C808, 0x0000059
-
-gUnk_0800C861:: @ 0800C861
-	.incbin "baserom.gba", 0x00C861, 0x000004F
-
-gUnk_0800C8B0:: @ 0800C8B0
-	.incbin "baserom.gba", 0x00C8B0, 0x000002A
-
-gUnk_0800C8DA:: @ 0800C8DA
-	.incbin "baserom.gba", 0x00C8DA, 0x0000016
-
-gUnk_0800C8F0:: @ 0800C8F0
-	.incbin "baserom.gba", 0x00C8F0, 0x000002C
-
-gUnk_0800C91C:: @ 0800C91C
-	.incbin "baserom.gba", 0x00C91C, 0x0000015
-
-gUnk_0800C931:: @ 0800C931
-	.incbin "baserom.gba", 0x00C931, 0x0000032
-
-gUnk_0800C963:: @ 0800C963
-	.incbin "baserom.gba", 0x00C963, 0x00000A5
-
-gUnk_0800CA08:: @ 0800CA08
-	.incbin "baserom.gba", 0x00CA08, 0x0000084
-
-gUnk_0800CA8C:: @ 0800CA8C
-	.incbin "baserom.gba", 0x00CA8C, 0x000001E
-
-gUnk_0800CAAA:: @ 0800CAAA
-	.incbin "baserom.gba", 0x00CAAA, 0x0000012
-
-gUnk_0800CABC:: @ 0800CABC
-	.incbin "baserom.gba", 0x00CABC, 0x000004B
-
-gUnk_0800CB07:: @ 0800CB07
-	.incbin "baserom.gba", 0x00CB07, 0x000004D
-
-gUnk_0800CB54:: @ 0800CB54
-	.incbin "baserom.gba", 0x00CB54, 0x000004F
-
-gUnk_0800CBA3:: @ 0800CBA3
-	.incbin "baserom.gba", 0x00CBA3, 0x0000031
-
-gUnk_0800CBD4:: @ 0800CBD4
-	.incbin "baserom.gba", 0x00CBD4, 0x0000034
-
-gUnk_0800CC08:: @ 0800CC08
-	.incbin "baserom.gba", 0x00CC08, 0x0000005
-
-gUnk_0800CC0D:: @ 0800CC0D
-	.incbin "baserom.gba", 0x00CC0D, 0x0000035
-
-gUnk_0800CC42:: @ 0800CC42
-	.incbin "baserom.gba", 0x00CC42, 0x000002A
-
-gUnk_0800CC6C:: @ 0800CC6C
-	.incbin "baserom.gba", 0x00CC6C, 0x0000061
-
-gUnk_0800CCCD:: @ 0800CCCD
-	.incbin "baserom.gba", 0x00CCCD, 0x0000010
-
-gUnk_0800CCDD:: @ 0800CCDD
-	.incbin "baserom.gba", 0x00CCDD, 0x0000027
-
-gUnk_0800CD04:: @ 0800CD04
-	.incbin "baserom.gba", 0x00CD04, 0x0000004
-
-gUnk_0800CD08:: @ 0800CD08
-	.incbin "baserom.gba", 0x00CD08, 0x000005F
-
-gUnk_0800CD67:: @ 0800CD67
-	.incbin "baserom.gba", 0x00CD67, 0x0000015
-
-gUnk_0800CD7C:: @ 0800CD7C
-	.incbin "baserom.gba", 0x00CD7C, 0x000008B
-
-gUnk_0800CE07:: @ 0800CE07
-	.incbin "baserom.gba", 0x00CE07, 0x00000FD
-
-gUnk_0800CF04:: @ 0800CF04
-	.incbin "baserom.gba", 0x00CF04, 0x0000012
-
-gUnk_0800CF16:: @ 0800CF16
-	.incbin "baserom.gba", 0x00CF16, 0x0000035
-
-gUnk_0800CF4B:: @ 0800CF4B
-	.incbin "baserom.gba", 0x00CF4B, 0x0000005
-
-gUnk_0800CF50:: @ 0800CF50
-	.incbin "baserom.gba", 0x00CF50, 0x000002B
-
-gUnk_0800CF7B:: @ 0800CF7B
-	.incbin "baserom.gba", 0x00CF7B, 0x000000D
-
-gUnk_0800CF88:: @ 0800CF88
-	.incbin "baserom.gba", 0x00CF88, 0x000000D
-
-gUnk_0800CF95:: @ 0800CF95
-	.incbin "baserom.gba", 0x00CF95, 0x0000014
-
-gUnk_0800CFA9:: @ 0800CFA9
-	.incbin "baserom.gba", 0x00CFA9, 0x0000003
-
-gUnk_0800CFAC:: @ 0800CFAC
-	.incbin "baserom.gba", 0x00CFAC, 0x0000065
-
-gUnk_0800D011:: @ 0800D011
-	.incbin "baserom.gba", 0x00D011, 0x000004E
-
-gUnk_0800D05F:: @ 0800D05F
-	.incbin "baserom.gba", 0x00D05F, 0x000006F
-
-gUnk_0800D0CE:: @ 0800D0CE
-	.incbin "baserom.gba", 0x00D0CE, 0x0000059
-
-gUnk_0800D127:: @ 0800D127
-	.incbin "baserom.gba", 0x00D127, 0x0000069
-
-gUnk_0800D190:: @ 0800D190
-	.incbin "baserom.gba", 0x00D190, 0x0000024
-
-gUnk_0800D1B4:: @ 0800D1B4
-	.incbin "baserom.gba", 0x00D1B4, 0x0000010
-
-gUnk_0800D1C4:: @ 0800D1C4
-	.incbin "baserom.gba", 0x00D1C4, 0x0000010
-
-gUnk_0800D1D4:: @ 0800D1D4
-	.incbin "baserom.gba", 0x00D1D4, 0x000000C
-
-gUnk_0800D1E0:: @ 0800D1E0
-	.incbin "baserom.gba", 0x00D1E0, 0x0000027
-
-gUnk_0800D207:: @ 0800D207
-	.incbin "baserom.gba", 0x00D207, 0x0000011
-
-gUnk_0800D218:: @ 0800D218
-	.incbin "baserom.gba", 0x00D218, 0x000003C
-
-gUnk_0800D254:: @ 0800D254
-	.incbin "baserom.gba", 0x00D254, 0x0000024
-
-gUnk_0800D278:: @ 0800D278
-	.incbin "baserom.gba", 0x00D278, 0x0000056
-
-gUnk_0800D2CE:: @ 0800D2CE
-	.incbin "baserom.gba", 0x00D2CE, 0x0000038
-
-gUnk_0800D306:: @ 0800D306
-	.incbin "baserom.gba", 0x00D306, 0x0000002
-
-gUnk_0800D308:: @ 0800D308
-	.incbin "baserom.gba", 0x00D308, 0x0000007
-
-gUnk_0800D30F:: @ 0800D30F
-	.incbin "baserom.gba", 0x00D30F, 0x0000041
-
-gUnk_0800D350:: @ 0800D350
-	.incbin "baserom.gba", 0x00D350, 0x000009C
-
-gUnk_0800D3EC:: @ 0800D3EC
-	.incbin "baserom.gba", 0x00D3EC, 0x0000028
-
-gUnk_0800D414:: @ 0800D414
-	.incbin "baserom.gba", 0x00D414, 0x0000038
-
-gUnk_0800D44C:: @ 0800D44C
-	.incbin "baserom.gba", 0x00D44C, 0x0000073
-
-gUnk_0800D4BF:: @ 0800D4BF
-	.incbin "baserom.gba", 0x00D4BF, 0x000001D
-
-gUnk_0800D4DC:: @ 0800D4DC
-	.incbin "baserom.gba", 0x00D4DC, 0x00000C0
-
-gUnk_0800D59C:: @ 0800D59C
-	.incbin "baserom.gba", 0x00D59C, 0x0000049
-
-gUnk_0800D5E5:: @ 0800D5E5
-	.incbin "baserom.gba", 0x00D5E5, 0x0000027
-
-gUnk_0800D60C:: @ 0800D60C
-	.incbin "baserom.gba", 0x00D60C, 0x000001F
-
-gUnk_0800D62B:: @ 0800D62B
-	.incbin "baserom.gba", 0x00D62B, 0x0000089
-
-gUnk_0800D6B4:: @ 0800D6B4
-	.incbin "baserom.gba", 0x00D6B4, 0x0000006
-
-gUnk_0800D6BA:: @ 0800D6BA
-	.incbin "baserom.gba", 0x00D6BA, 0x0000016
-
-gUnk_0800D6D0:: @ 0800D6D0
-	.incbin "baserom.gba", 0x00D6D0, 0x0000020
-
-gUnk_0800D6F0:: @ 0800D6F0
-	.incbin "baserom.gba", 0x00D6F0, 0x0000012
-
-gUnk_0800D702:: @ 0800D702
-	.incbin "baserom.gba", 0x00D702, 0x0000001
-
-gUnk_0800D703:: @ 0800D703
-	.incbin "baserom.gba", 0x00D703, 0x000000D
-
-gUnk_0800D710:: @ 0800D710
-	.incbin "baserom.gba", 0x00D710, 0x0000015
-
-gUnk_0800D725:: @ 0800D725
-	.incbin "baserom.gba", 0x00D725, 0x0000003
-
-gUnk_0800D728:: @ 0800D728
-	.incbin "baserom.gba", 0x00D728, 0x0000044
-
-gUnk_0800D76C:: @ 0800D76C
-	.incbin "baserom.gba", 0x00D76C, 0x0000063
-
-gUnk_0800D7CF:: @ 0800D7CF
-	.incbin "baserom.gba", 0x00D7CF, 0x000000D
-
-gUnk_0800D7DC:: @ 0800D7DC
-	.incbin "baserom.gba", 0x00D7DC, 0x0000098
-
-gUnk_0800D874:: @ 0800D874
-	.incbin "baserom.gba", 0x00D874, 0x0000070
-
-gUnk_0800D8E4:: @ 0800D8E4
-	.incbin "baserom.gba", 0x00D8E4, 0x0000022
-
-gUnk_0800D906:: @ 0800D906
-	.incbin "baserom.gba", 0x00D906, 0x000004E
-
-gUnk_0800D954:: @ 0800D954
-	.incbin "baserom.gba", 0x00D954, 0x0000029
-
-gUnk_0800D97D:: @ 0800D97D
-	.incbin "baserom.gba", 0x00D97D, 0x0000004
-
-gUnk_0800D981:: @ 0800D981
-	.incbin "baserom.gba", 0x00D981, 0x0000090
-
-gUnk_0800DA11:: @ 0800DA11
-	.incbin "baserom.gba", 0x00DA11, 0x0000017
-
-gUnk_0800DA28:: @ 0800DA28
-	.incbin "baserom.gba", 0x00DA28, 0x0000024
-
-gUnk_0800DA4C:: @ 0800DA4C
-	.incbin "baserom.gba", 0x00DA4C, 0x0000001
-
-gUnk_0800DA4D:: @ 0800DA4D
-	.incbin "baserom.gba", 0x00DA4D, 0x0000013
-
-gUnk_0800DA60:: @ 0800DA60
-	.incbin "baserom.gba", 0x00DA60, 0x00000AE
-
-gUnk_0800DB0E:: @ 0800DB0E
-	.incbin "baserom.gba", 0x00DB0E, 0x000000A
-
-gUnk_0800DB18:: @ 0800DB18
-	.incbin "baserom.gba", 0x00DB18, 0x0000010
-
-gUnk_0800DB28:: @ 0800DB28
-	.incbin "baserom.gba", 0x00DB28, 0x0000022
-
-gUnk_0800DB4A:: @ 0800DB4A
-	.incbin "baserom.gba", 0x00DB4A, 0x000002E
-
-gUnk_0800DB78:: @ 0800DB78
-	.incbin "baserom.gba", 0x00DB78, 0x0000010
-
-gUnk_0800DB88:: @ 0800DB88
-	.incbin "baserom.gba", 0x00DB88, 0x0000088
-
-gUnk_0800DC10:: @ 0800DC10
-	.incbin "baserom.gba", 0x00DC10, 0x0000009
-
-gUnk_0800DC19:: @ 0800DC19
-	.incbin "baserom.gba", 0x00DC19, 0x0000078
-
-gUnk_0800DC91:: @ 0800DC91
-	.incbin "baserom.gba", 0x00DC91, 0x000001B
-
-gUnk_0800DCAC:: @ 0800DCAC
-	.incbin "baserom.gba", 0x00DCAC, 0x0000030
-
-gUnk_0800DCDC:: @ 0800DCDC
-	.incbin "baserom.gba", 0x00DCDC, 0x0000028
-
-gUnk_0800DD04:: @ 0800DD04
-	.incbin "baserom.gba", 0x00DD04, 0x000000C
-
-gUnk_0800DD10:: @ 0800DD10
-	.incbin "baserom.gba", 0x00DD10, 0x0000009
-
-gUnk_0800DD19:: @ 0800DD19
-	.incbin "baserom.gba", 0x00DD19, 0x0000009
-
-gUnk_0800DD22:: @ 0800DD22
-	.incbin "baserom.gba", 0x00DD22, 0x000006B
-
-gUnk_0800DD8D:: @ 0800DD8D
-	.incbin "baserom.gba", 0x00DD8D, 0x000001D
-
-gUnk_0800DDAA:: @ 0800DDAA
-	.incbin "baserom.gba", 0x00DDAA, 0x000003E
-
-gUnk_0800DDE8:: @ 0800DDE8
-	.incbin "baserom.gba", 0x00DDE8, 0x0000014
-
-gUnk_0800DDFC:: @ 0800DDFC
-	.incbin "baserom.gba", 0x00DDFC, 0x0000004
-
-gUnk_0800DE00:: @ 0800DE00
-	.incbin "baserom.gba", 0x00DE00, 0x0000078
-
-gUnk_0800DE78:: @ 0800DE78
-	.incbin "baserom.gba", 0x00DE78, 0x0000038
-
-gUnk_0800DEB0:: @ 0800DEB0
-	.incbin "baserom.gba", 0x00DEB0, 0x0000024
-
-gUnk_0800DED4:: @ 0800DED4
-	.incbin "baserom.gba", 0x00DED4, 0x0000022
-
-gUnk_0800DEF6:: @ 0800DEF6
-	.incbin "baserom.gba", 0x00DEF6, 0x0000011
-
-gUnk_0800DF07:: @ 0800DF07
-	.incbin "baserom.gba", 0x00DF07, 0x000001D
-
-gUnk_0800DF24:: @ 0800DF24
-	.incbin "baserom.gba", 0x00DF24, 0x0000090
-
-gUnk_0800DFB4:: @ 0800DFB4
-	.incbin "baserom.gba", 0x00DFB4, 0x000001C
-
-gUnk_0800DFD0:: @ 0800DFD0
-	.incbin "baserom.gba", 0x00DFD0, 0x0000007
-
-gUnk_0800DFD7:: @ 0800DFD7
-	.incbin "baserom.gba", 0x00DFD7, 0x0000007
-
-gUnk_0800DFDE:: @ 0800DFDE
-	.incbin "baserom.gba", 0x00DFDE, 0x0000006
-
-gUnk_0800DFE4:: @ 0800DFE4
-	.incbin "baserom.gba", 0x00DFE4, 0x000006C
-
-gUnk_0800E050:: @ 0800E050
-	.incbin "baserom.gba", 0x00E050, 0x000006C
-
-gUnk_0800E0BC:: @ 0800E0BC
-	.incbin "baserom.gba", 0x00E0BC, 0x000003A
-
-gUnk_0800E0F6:: @ 0800E0F6
-	.incbin "baserom.gba", 0x00E0F6, 0x000004A
-
-gUnk_0800E140:: @ 0800E140
-	.incbin "baserom.gba", 0x00E140, 0x0000013
-
-gUnk_0800E153:: @ 0800E153
-	.incbin "baserom.gba", 0x00E153, 0x0000001
-
-gUnk_0800E154:: @ 0800E154
-	.incbin "baserom.gba", 0x00E154, 0x0000071
-
-gUnk_0800E1C5:: @ 0800E1C5
-	.incbin "baserom.gba", 0x00E1C5, 0x000003B
-
-gUnk_0800E200:: @ 0800E200
-	.incbin "baserom.gba", 0x00E200, 0x0000100
-
-gUnk_0800E300:: @ 0800E300
-	.incbin "baserom.gba", 0x00E300, 0x0000005
-
-gUnk_0800E305:: @ 0800E305
-	.incbin "baserom.gba", 0x00E305, 0x0000002
-
-gUnk_0800E307:: @ 0800E307
-	.incbin "baserom.gba", 0x00E307, 0x0000005
-
-gUnk_0800E30C:: @ 0800E30C
-	.incbin "baserom.gba", 0x00E30C, 0x000001D
-
-gUnk_0800E329:: @ 0800E329
-	.incbin "baserom.gba", 0x00E329, 0x0000027
-
-gUnk_0800E350:: @ 0800E350
-	.incbin "baserom.gba", 0x00E350, 0x000009E
-
-gUnk_0800E3EE:: @ 0800E3EE
-	.incbin "baserom.gba", 0x00E3EE, 0x000000B
-
-gUnk_0800E3F9:: @ 0800E3F9
-	.incbin "baserom.gba", 0x00E3F9, 0x0000001
-
-gUnk_0800E3FA:: @ 0800E3FA
-	.incbin "baserom.gba", 0x00E3FA, 0x0000002
-
-gUnk_0800E3FC:: @ 0800E3FC
-	.incbin "baserom.gba", 0x00E3FC, 0x0000004
-
-gUnk_0800E400:: @ 0800E400
-	.incbin "baserom.gba", 0x00E400, 0x0000008
-
-gUnk_0800E408:: @ 0800E408
-	.incbin "baserom.gba", 0x00E408, 0x0000003
-
-gUnk_0800E40B:: @ 0800E40B
-	.incbin "baserom.gba", 0x00E40B, 0x0000006
-
-gUnk_0800E411:: @ 0800E411
-	.incbin "baserom.gba", 0x00E411, 0x000001F
-
-gUnk_0800E430:: @ 0800E430
-	.incbin "baserom.gba", 0x00E430, 0x0000004
-
-gUnk_0800E434:: @ 0800E434
-	.incbin "baserom.gba", 0x00E434, 0x0000038
-
-gUnk_0800E46C:: @ 0800E46C
-	.incbin "baserom.gba", 0x00E46C, 0x000001D
-
-gUnk_0800E489:: @ 0800E489
-	.incbin "baserom.gba", 0x00E489, 0x0000010
-
-gUnk_0800E499:: @ 0800E499
-	.incbin "baserom.gba", 0x00E499, 0x000000B
-
-gUnk_0800E4A4:: @ 0800E4A4
-	.incbin "baserom.gba", 0x00E4A4, 0x000003F
-
-gUnk_0800E4E3:: @ 0800E4E3
-	.incbin "baserom.gba", 0x00E4E3, 0x0000021
-
-gUnk_0800E504:: @ 0800E504
-	.incbin "baserom.gba", 0x00E504, 0x0000008
-
-gUnk_0800E50C:: @ 0800E50C
-	.incbin "baserom.gba", 0x00E50C, 0x0000038
-
-gUnk_0800E544:: @ 0800E544
-	.incbin "baserom.gba", 0x00E544, 0x0000048
-
-gUnk_0800E58C:: @ 0800E58C
-	.incbin "baserom.gba", 0x00E58C, 0x0000038
-
-gUnk_0800E5C4:: @ 0800E5C4
-	.incbin "baserom.gba", 0x00E5C4, 0x000003C
-
-gUnk_0800E600:: @ 0800E600
-	.incbin "baserom.gba", 0x00E600, 0x000000E
-
-gUnk_0800E60E:: @ 0800E60E
-	.incbin "baserom.gba", 0x00E60E, 0x000001E
-
-gUnk_0800E62C:: @ 0800E62C
-	.incbin "baserom.gba", 0x00E62C, 0x000002C
-
-gUnk_0800E658:: @ 0800E658
-	.incbin "baserom.gba", 0x00E658, 0x000002C
-
-gUnk_0800E684:: @ 0800E684
-	.incbin "baserom.gba", 0x00E684, 0x000002C
-
-gUnk_0800E6B0:: @ 0800E6B0
-	.incbin "baserom.gba", 0x00E6B0, 0x0000038
-
-gUnk_0800E6E8:: @ 0800E6E8
-	.incbin "baserom.gba", 0x00E6E8, 0x000001F
-
-gUnk_0800E707:: @ 0800E707
-	.incbin "baserom.gba", 0x00E707, 0x0000003
-
-gUnk_0800E70A:: @ 0800E70A
-	.incbin "baserom.gba", 0x00E70A, 0x000002A
-
-gUnk_0800E734:: @ 0800E734
-	.incbin "baserom.gba", 0x00E734, 0x000002C
-
-gUnk_0800E760:: @ 0800E760
-	.incbin "baserom.gba", 0x00E760, 0x0000079
-
-gUnk_0800E7D9:: @ 0800E7D9
-	.incbin "baserom.gba", 0x00E7D9, 0x000001B
-
-gUnk_0800E7F4:: @ 0800E7F4
-	.incbin "baserom.gba", 0x00E7F4, 0x0000006
-
-gUnk_0800E7FA:: @ 0800E7FA
-	.incbin "baserom.gba", 0x00E7FA, 0x0000029
-
-gUnk_0800E823:: @ 0800E823
-	.incbin "baserom.gba", 0x00E823, 0x0000001
-
-gUnk_0800E824:: @ 0800E824
-	.incbin "baserom.gba", 0x00E824, 0x00000B7
-
-gUnk_0800E8DB:: @ 0800E8DB
-	.incbin "baserom.gba", 0x00E8DB, 0x0000045
-
-gUnk_0800E920:: @ 0800E920
-	.incbin "baserom.gba", 0x00E920, 0x0000044
-
-gUnk_0800E964:: @ 0800E964
-	.incbin "baserom.gba", 0x00E964, 0x0000072
-
-gUnk_0800E9D6:: @ 0800E9D6
-	.incbin "baserom.gba", 0x00E9D6, 0x000001E
-
-gUnk_0800E9F4:: @ 0800E9F4
-	.incbin "baserom.gba", 0x00E9F4, 0x0000028
-
-gUnk_0800EA1C:: @ 0800EA1C
-	.incbin "baserom.gba", 0x00EA1C, 0x0000038
-
-gUnk_0800EA54:: @ 0800EA54
-	.incbin "baserom.gba", 0x00EA54, 0x0000050
-
-gUnk_0800EAA4:: @ 0800EAA4
-	.incbin "baserom.gba", 0x00EAA4, 0x0000047
-
-gUnk_0800EAEB:: @ 0800EAEB
-	.incbin "baserom.gba", 0x00EAEB, 0x000000D
-
-gUnk_0800EAF8:: @ 0800EAF8
-	.incbin "baserom.gba", 0x00EAF8, 0x0000034
-
-gUnk_0800EB2C:: @ 0800EB2C
-	.incbin "baserom.gba", 0x00EB2C, 0x0000038
-
-gUnk_0800EB64:: @ 0800EB64
-	.incbin "baserom.gba", 0x00EB64, 0x000005C
-
-gUnk_0800EBC0:: @ 0800EBC0
-	.incbin "baserom.gba", 0x00EBC0, 0x000001C
-
-gUnk_0800EBDC:: @ 0800EBDC
-	.incbin "baserom.gba", 0x00EBDC, 0x0000004
-
-gUnk_0800EBE0:: @ 0800EBE0
-	.incbin "baserom.gba", 0x00EBE0, 0x0000010
-
-gUnk_0800EBF0:: @ 0800EBF0
-	.incbin "baserom.gba", 0x00EBF0, 0x0000018
-
-gUnk_0800EC08:: @ 0800EC08
-	.incbin "baserom.gba", 0x00EC08, 0x000000C
-
-gUnk_0800EC14:: @ 0800EC14
-	.incbin "baserom.gba", 0x00EC14, 0x0000040
-
-gUnk_0800EC54:: @ 0800EC54
-	.incbin "baserom.gba", 0x00EC54, 0x000000D
-
-gUnk_0800EC61:: @ 0800EC61
-	.incbin "baserom.gba", 0x00EC61, 0x000002B
-
-gUnk_0800EC8C:: @ 0800EC8C
-	.incbin "baserom.gba", 0x00EC8C, 0x0000065
-
-gUnk_0800ECF1:: @ 0800ECF1
-	.incbin "baserom.gba", 0x00ECF1, 0x0000013
-
-gUnk_0800ED04:: @ 0800ED04
-	.incbin "baserom.gba", 0x00ED04, 0x0000008
-
-gUnk_0800ED0C:: @ 0800ED0C
-	.incbin "baserom.gba", 0x00ED0C, 0x0000001
-
-gUnk_0800ED0D:: @ 0800ED0D
-	.incbin "baserom.gba", 0x00ED0D, 0x000004F
-
-gUnk_0800ED5C:: @ 0800ED5C
-	.incbin "baserom.gba", 0x00ED5C, 0x0000034
-
-gUnk_0800ED90:: @ 0800ED90
-	.incbin "baserom.gba", 0x00ED90, 0x0000049
-
-gUnk_0800EDD9:: @ 0800EDD9
-	.incbin "baserom.gba", 0x00EDD9, 0x0000007
-
-gUnk_0800EDE0:: @ 0800EDE0
-	.incbin "baserom.gba", 0x00EDE0, 0x0000029
-
-gUnk_0800EE09:: @ 0800EE09
-	.incbin "baserom.gba", 0x00EE09, 0x0000047
-
-gUnk_0800EE50:: @ 0800EE50
-	.incbin "baserom.gba", 0x00EE50, 0x000003C
-
-gUnk_0800EE8C:: @ 0800EE8C
-	.incbin "baserom.gba", 0x00EE8C, 0x0000054
-
-gUnk_0800EEE0:: @ 0800EEE0
-	.incbin "baserom.gba", 0x00EEE0, 0x000001D
-
-gUnk_0800EEFD:: @ 0800EEFD
-	.incbin "baserom.gba", 0x00EEFD, 0x000000A
-
-gUnk_0800EF07:: @ 0800EF07
-	.incbin "baserom.gba", 0x00EF07, 0x000000B
-
-gUnk_0800EF12:: @ 0800EF12
-	.incbin "baserom.gba", 0x00EF12, 0x000002E
-
-gUnk_0800EF40:: @ 0800EF40
-	.incbin "baserom.gba", 0x00EF40, 0x0000053
-
-gUnk_0800EF93:: @ 0800EF93
-	.incbin "baserom.gba", 0x00EF93, 0x000002D
-
-gUnk_0800EFC0:: @ 0800EFC0
-	.incbin "baserom.gba", 0x00EFC0, 0x0000020
-
-gUnk_0800EFE0:: @ 0800EFE0
-	.incbin "baserom.gba", 0x00EFE0, 0x0000004
-
-gUnk_0800EFE4:: @ 0800EFE4
-	.incbin "baserom.gba", 0x00EFE4, 0x00000AC
-
-gUnk_0800F090:: @ 0800F090
-	.incbin "baserom.gba", 0x00F090, 0x0000004
-
-gUnk_0800F094:: @ 0800F094
-	.incbin "baserom.gba", 0x00F094, 0x0000042
-
-gUnk_0800F0D6:: @ 0800F0D6
-	.incbin "baserom.gba", 0x00F0D6, 0x000000C
-
-gUnk_0800F0E2:: @ 0800F0E2
-	.incbin "baserom.gba", 0x00F0E2, 0x0000010
-
-gUnk_0800F0F2:: @ 0800F0F2
-	.incbin "baserom.gba", 0x00F0F2, 0x0000001
-
-gUnk_0800F0F3:: @ 0800F0F3
-	.incbin "baserom.gba", 0x00F0F3, 0x0000001
-
-gUnk_0800F0F4:: @ 0800F0F4
-	.incbin "baserom.gba", 0x00F0F4, 0x0000058
-
-gUnk_0800F14C:: @ 0800F14C
-	.incbin "baserom.gba", 0x00F14C, 0x0000038
-
-gUnk_0800F184:: @ 0800F184
-	.incbin "baserom.gba", 0x00F184, 0x000005A
-
-gUnk_0800F1DE:: @ 0800F1DE
-	.incbin "baserom.gba", 0x00F1DE, 0x0000003
-
-gUnk_0800F1E1:: @ 0800F1E1
-	.incbin "baserom.gba", 0x00F1E1, 0x0000004
-
-gUnk_0800F1E5:: @ 0800F1E5
-	.incbin "baserom.gba", 0x00F1E5, 0x0000002
-
-gUnk_0800F1E7:: @ 0800F1E7
-	.incbin "baserom.gba", 0x00F1E7, 0x0000006
-
-gUnk_0800F1ED:: @ 0800F1ED
-	.incbin "baserom.gba", 0x00F1ED, 0x000000E
-
-gUnk_0800F1FB:: @ 0800F1FB
-	.incbin "baserom.gba", 0x00F1FB, 0x0000002
-
-gUnk_0800F1FD:: @ 0800F1FD
-	.incbin "baserom.gba", 0x00F1FD, 0x0000006
-
-gUnk_0800F203:: @ 0800F203
-	.incbin "baserom.gba", 0x00F203, 0x0000004
-
-gUnk_0800F207:: @ 0800F207
-	.incbin "baserom.gba", 0x00F207, 0x0000009
-
-gUnk_0800F210:: @ 0800F210
-	.incbin "baserom.gba", 0x00F210, 0x00000DB
-
-gUnk_0800F2EB:: @ 0800F2EB
-	.incbin "baserom.gba", 0x00F2EB, 0x0000005
-
-gUnk_0800F2F0:: @ 0800F2F0
-	.incbin "baserom.gba", 0x00F2F0, 0x0000002
-
-gUnk_0800F2F2:: @ 0800F2F2
-	.incbin "baserom.gba", 0x00F2F2, 0x0000011
-
-gUnk_0800F303:: @ 0800F303
-	.incbin "baserom.gba", 0x00F303, 0x0000099
-
-gUnk_0800F39C:: @ 0800F39C
-	.incbin "baserom.gba", 0x00F39C, 0x000003F
-
-gUnk_0800F3DB:: @ 0800F3DB
-	.incbin "baserom.gba", 0x00F3DB, 0x000000A
-
-gUnk_0800F3E5:: @ 0800F3E5
-	.incbin "baserom.gba", 0x00F3E5, 0x0000001
-
-gUnk_0800F3E6:: @ 0800F3E6
-	.incbin "baserom.gba", 0x00F3E6, 0x0000002
-
-gUnk_0800F3E8:: @ 0800F3E8
-	.incbin "baserom.gba", 0x00F3E8, 0x0000003
-
-gUnk_0800F3EB:: @ 0800F3EB
-	.incbin "baserom.gba", 0x00F3EB, 0x0000002
-
-gUnk_0800F3ED:: @ 0800F3ED
-	.incbin "baserom.gba", 0x00F3ED, 0x0000008
-
-gUnk_0800F3F5:: @ 0800F3F5
-	.incbin "baserom.gba", 0x00F3F5, 0x0000004
-
-gUnk_0800F3F9:: @ 0800F3F9
-	.incbin "baserom.gba", 0x00F3F9, 0x0000007
-
-gUnk_0800F400:: @ 0800F400
-	.incbin "baserom.gba", 0x00F400, 0x0000008
-
-gUnk_0800F408:: @ 0800F408
-	.incbin "baserom.gba", 0x00F408, 0x0000001
-
-gUnk_0800F409:: @ 0800F409
-	.incbin "baserom.gba", 0x00F409, 0x0000007
-
-gUnk_0800F410:: @ 0800F410
-	.incbin "baserom.gba", 0x00F410, 0x0000016
-
-gUnk_0800F426:: @ 0800F426
-	.incbin "baserom.gba", 0x00F426, 0x000000A
-
-gUnk_0800F430:: @ 0800F430
-	.incbin "baserom.gba", 0x00F430, 0x0000094
-
-gUnk_0800F4C4:: @ 0800F4C4
-	.incbin "baserom.gba", 0x00F4C4, 0x0000026
-
-gUnk_0800F4EA:: @ 0800F4EA
-	.incbin "baserom.gba", 0x00F4EA, 0x0000001
-
-gUnk_0800F4EB:: @ 0800F4EB
-	.incbin "baserom.gba", 0x00F4EB, 0x0000004
-
-gUnk_0800F4EF:: @ 0800F4EF
-	.incbin "baserom.gba", 0x00F4EF, 0x0000001
-
-gUnk_0800F4F0:: @ 0800F4F0
-	.incbin "baserom.gba", 0x00F4F0, 0x0000001
-
-gUnk_0800F4F1:: @ 0800F4F1
-	.incbin "baserom.gba", 0x00F4F1, 0x0000002
-
-gUnk_0800F4F3:: @ 0800F4F3
-	.incbin "baserom.gba", 0x00F4F3, 0x0000004
-
-gUnk_0800F4F7:: @ 0800F4F7
-	.incbin "baserom.gba", 0x00F4F7, 0x0000002
-
-gUnk_0800F4F9:: @ 0800F4F9
-	.incbin "baserom.gba", 0x00F4F9, 0x0000008
-
-gUnk_0800F501:: @ 0800F501
-	.incbin "baserom.gba", 0x00F501, 0x000000D
-
-gUnk_0800F50E:: @ 0800F50E
-	.incbin "baserom.gba", 0x00F50E, 0x0000046
-
-gUnk_0800F554:: @ 0800F554
-	.incbin "baserom.gba", 0x00F554, 0x0000030
-
-gUnk_0800F584:: @ 0800F584
-	.incbin "baserom.gba", 0x00F584, 0x000000B
-
-gUnk_0800F58F:: @ 0800F58F
-	.incbin "baserom.gba", 0x00F58F, 0x0000021
-
-gUnk_0800F5B0:: @ 0800F5B0
-	.incbin "baserom.gba", 0x00F5B0, 0x0000039
-
-gUnk_0800F5E9:: @ 0800F5E9
-	.incbin "baserom.gba", 0x00F5E9, 0x0000003
-
-gUnk_0800F5EC:: @ 0800F5EC
-	.incbin "baserom.gba", 0x00F5EC, 0x0000001
-
-gUnk_0800F5ED:: @ 0800F5ED
-	.incbin "baserom.gba", 0x00F5ED, 0x0000001
-
-gUnk_0800F5EE:: @ 0800F5EE
-	.incbin "baserom.gba", 0x00F5EE, 0x0000001
-
-gUnk_0800F5EF:: @ 0800F5EF
-	.incbin "baserom.gba", 0x00F5EF, 0x0000001
-
-gUnk_0800F5F0:: @ 0800F5F0
-	.incbin "baserom.gba", 0x00F5F0, 0x0000002
-
-gUnk_0800F5F2:: @ 0800F5F2
-	.incbin "baserom.gba", 0x00F5F2, 0x0000002
-
-gUnk_0800F5F4:: @ 0800F5F4
-	.incbin "baserom.gba", 0x00F5F4, 0x0000008
-
-gUnk_0800F5FC:: @ 0800F5FC
-	.incbin "baserom.gba", 0x00F5FC, 0x0000003
-
-gUnk_0800F5FF:: @ 0800F5FF
-	.incbin "baserom.gba", 0x00F5FF, 0x0000007
-
-gUnk_0800F606:: @ 0800F606
-	.incbin "baserom.gba", 0x00F606, 0x0000001
-
-gUnk_0800F607:: @ 0800F607
-	.incbin "baserom.gba", 0x00F607, 0x0000001
-
-gUnk_0800F608:: @ 0800F608
-	.incbin "baserom.gba", 0x00F608, 0x0000002
-
-gUnk_0800F60A:: @ 0800F60A
-	.incbin "baserom.gba", 0x00F60A, 0x000001E
-
-gUnk_0800F628:: @ 0800F628
-	.incbin "baserom.gba", 0x00F628, 0x0000028
-
-gUnk_0800F650:: @ 0800F650
-	.incbin "baserom.gba", 0x00F650, 0x0000038
-
-gUnk_0800F688:: @ 0800F688
-	.incbin "baserom.gba", 0x00F688, 0x0000018
-
-gUnk_0800F6A0:: @ 0800F6A0
-	.incbin "baserom.gba", 0x00F6A0, 0x0000028
-
-gUnk_0800F6C8:: @ 0800F6C8
-	.incbin "baserom.gba", 0x00F6C8, 0x0000018
-
-gUnk_0800F6E0:: @ 0800F6E0
-	.incbin "baserom.gba", 0x00F6E0, 0x0000009
-
-gUnk_0800F6E9:: @ 0800F6E9
-	.incbin "baserom.gba", 0x00F6E9, 0x0000003
-
-gUnk_0800F6EC:: @ 0800F6EC
-	.incbin "baserom.gba", 0x00F6EC, 0x0000001
-
-gUnk_0800F6ED:: @ 0800F6ED
-	.incbin "baserom.gba", 0x00F6ED, 0x0000001
-
-gUnk_0800F6EE:: @ 0800F6EE
-	.incbin "baserom.gba", 0x00F6EE, 0x0000001
-
-gUnk_0800F6EF:: @ 0800F6EF
-	.incbin "baserom.gba", 0x00F6EF, 0x0000001
-
-gUnk_0800F6F0:: @ 0800F6F0
-	.incbin "baserom.gba", 0x00F6F0, 0x0000001
-
-gUnk_0800F6F1:: @ 0800F6F1
-	.incbin "baserom.gba", 0x00F6F1, 0x0000001
-
-gUnk_0800F6F2:: @ 0800F6F2
-	.incbin "baserom.gba", 0x00F6F2, 0x0000001
-
-gUnk_0800F6F3:: @ 0800F6F3
-	.incbin "baserom.gba", 0x00F6F3, 0x0000001
-
-gUnk_0800F6F4:: @ 0800F6F4
-	.incbin "baserom.gba", 0x00F6F4, 0x0000005
-
-gUnk_0800F6F9:: @ 0800F6F9
-	.incbin "baserom.gba", 0x00F6F9, 0x0000005
-
-gUnk_0800F6FE:: @ 0800F6FE
-	.incbin "baserom.gba", 0x00F6FE, 0x0000004
-
-gUnk_0800F702:: @ 0800F702
-	.incbin "baserom.gba", 0x00F702, 0x0000004
-
-gUnk_0800F706:: @ 0800F706
-	.incbin "baserom.gba", 0x00F706, 0x0000018
-
-gUnk_0800F71E:: @ 0800F71E
-	.incbin "baserom.gba", 0x00F71E, 0x0000006
-
-gUnk_0800F724:: @ 0800F724
-	.incbin "baserom.gba", 0x00F724, 0x0000010
-
-gUnk_0800F734:: @ 0800F734
-	.incbin "baserom.gba", 0x00F734, 0x0000008
-
-gUnk_0800F73C:: @ 0800F73C
-	.incbin "baserom.gba", 0x00F73C, 0x00000AA
-
-gUnk_0800F7E6:: @ 0800F7E6
-	.incbin "baserom.gba", 0x00F7E6, 0x0000005
-
-gUnk_0800F7EB:: @ 0800F7EB
-	.incbin "baserom.gba", 0x00F7EB, 0x0000003
-
-gUnk_0800F7EE:: @ 0800F7EE
-	.incbin "baserom.gba", 0x00F7EE, 0x0000001
-
-gUnk_0800F7EF:: @ 0800F7EF
-	.incbin "baserom.gba", 0x00F7EF, 0x0000001
-
-gUnk_0800F7F0:: @ 0800F7F0
-	.incbin "baserom.gba", 0x00F7F0, 0x0000004
-
-gUnk_0800F7F4:: @ 0800F7F4
-	.incbin "baserom.gba", 0x00F7F4, 0x0000001
-
-gUnk_0800F7F5:: @ 0800F7F5
-	.incbin "baserom.gba", 0x00F7F5, 0x0000002
-
-gUnk_0800F7F7:: @ 0800F7F7
-	.incbin "baserom.gba", 0x00F7F7, 0x0000005
-
-gUnk_0800F7FC:: @ 0800F7FC
-	.incbin "baserom.gba", 0x00F7FC, 0x0000001
-
-gUnk_0800F7FD:: @ 0800F7FD
-	.incbin "baserom.gba", 0x00F7FD, 0x0000002
-
-gUnk_0800F7FF:: @ 0800F7FF
-	.incbin "baserom.gba", 0x00F7FF, 0x0000001
-
-gUnk_0800F800:: @ 0800F800
-	.incbin "baserom.gba", 0x00F800, 0x0000005
-
-gUnk_0800F805:: @ 0800F805
-	.incbin "baserom.gba", 0x00F805, 0x0000003
-
-gUnk_0800F808:: @ 0800F808
-	.incbin "baserom.gba", 0x00F808, 0x00000E7
-
-gUnk_0800F8EF:: @ 0800F8EF
-	.incbin "baserom.gba", 0x00F8EF, 0x0000001
-
-gUnk_0800F8F0:: @ 0800F8F0
-	.incbin "baserom.gba", 0x00F8F0, 0x0000001
-
-gUnk_0800F8F1:: @ 0800F8F1
-	.incbin "baserom.gba", 0x00F8F1, 0x0000001
-
-gUnk_0800F8F2:: @ 0800F8F2
-	.incbin "baserom.gba", 0x00F8F2, 0x0000001
-
-gUnk_0800F8F3:: @ 0800F8F3
-	.incbin "baserom.gba", 0x00F8F3, 0x0000001
-
-gUnk_0800F8F4:: @ 0800F8F4
-	.incbin "baserom.gba", 0x00F8F4, 0x0000001
-
-gUnk_0800F8F5:: @ 0800F8F5
-	.incbin "baserom.gba", 0x00F8F5, 0x0000003
-
-gUnk_0800F8F8:: @ 0800F8F8
-	.incbin "baserom.gba", 0x00F8F8, 0x0000001
-
-gUnk_0800F8F9:: @ 0800F8F9
-	.incbin "baserom.gba", 0x00F8F9, 0x0000007
-
-gUnk_0800F900:: @ 0800F900
-	.incbin "baserom.gba", 0x00F900, 0x0000002
-
-gUnk_0800F902:: @ 0800F902
-	.incbin "baserom.gba", 0x00F902, 0x0000014
-
-gUnk_0800F916:: @ 0800F916
-	.incbin "baserom.gba", 0x00F916, 0x00000DA
-
-gUnk_0800F9F0:: @ 0800F9F0
-	.incbin "baserom.gba", 0x00F9F0, 0x0000002
-
-gUnk_0800F9F2:: @ 0800F9F2
-	.incbin "baserom.gba", 0x00F9F2, 0x0000001
-
-gUnk_0800F9F3:: @ 0800F9F3
-	.incbin "baserom.gba", 0x00F9F3, 0x0000001
-
-gUnk_0800F9F4:: @ 0800F9F4
-	.incbin "baserom.gba", 0x00F9F4, 0x0000002
-
-gUnk_0800F9F6:: @ 0800F9F6
-	.incbin "baserom.gba", 0x00F9F6, 0x0000001
-
-gUnk_0800F9F7:: @ 0800F9F7
-	.incbin "baserom.gba", 0x00F9F7, 0x0000001
-
-gUnk_0800F9F8:: @ 0800F9F8
-	.incbin "baserom.gba", 0x00F9F8, 0x000000A
-
-gUnk_0800FA02:: @ 0800FA02
-	.incbin "baserom.gba", 0x00FA02, 0x0000005
-
-gUnk_0800FA07:: @ 0800FA07
-	.incbin "baserom.gba", 0x00FA07, 0x0000001
-
-gUnk_0800FA08:: @ 0800FA08
-	.incbin "baserom.gba", 0x00FA08, 0x0000001
-
-gUnk_0800FA09:: @ 0800FA09
-	.incbin "baserom.gba", 0x00FA09, 0x0000004
-
-gUnk_0800FA0D:: @ 0800FA0D
-	.incbin "baserom.gba", 0x00FA0D, 0x000006B
-
-gUnk_0800FA78:: @ 0800FA78
-	.incbin "baserom.gba", 0x00FA78, 0x0000048
-
-gUnk_0800FAC0:: @ 0800FAC0
-	.incbin "baserom.gba", 0x00FAC0, 0x0000024
-
-gUnk_0800FAE4:: @ 0800FAE4
-	.incbin "baserom.gba", 0x00FAE4, 0x000000F
-
-gUnk_0800FAF3:: @ 0800FAF3
-	.incbin "baserom.gba", 0x00FAF3, 0x0000002
-
-gUnk_0800FAF5:: @ 0800FAF5
-	.incbin "baserom.gba", 0x00FAF5, 0x0000001
-
-gUnk_0800FAF6:: @ 0800FAF6
-	.incbin "baserom.gba", 0x00FAF6, 0x0000001
-
-gUnk_0800FAF7:: @ 0800FAF7
-	.incbin "baserom.gba", 0x00FAF7, 0x0000001
-
-gUnk_0800FAF8:: @ 0800FAF8
-	.incbin "baserom.gba", 0x00FAF8, 0x0000005
-
-gUnk_0800FAFD:: @ 0800FAFD
-	.incbin "baserom.gba", 0x00FAFD, 0x0000001
-
-gUnk_0800FAFE:: @ 0800FAFE
-	.incbin "baserom.gba", 0x00FAFE, 0x0000001
-
-gUnk_0800FAFF:: @ 0800FAFF
-	.incbin "baserom.gba", 0x00FAFF, 0x0000001
-
-gUnk_0800FB00:: @ 0800FB00
-	.incbin "baserom.gba", 0x00FB00, 0x0000001
-
-gUnk_0800FB01:: @ 0800FB01
-	.incbin "baserom.gba", 0x00FB01, 0x0000001
-
-gUnk_0800FB02:: @ 0800FB02
-	.incbin "baserom.gba", 0x00FB02, 0x0000002
-
-gUnk_0800FB04:: @ 0800FB04
-	.incbin "baserom.gba", 0x00FB04, 0x0000004
-
-gUnk_0800FB08:: @ 0800FB08
-	.incbin "baserom.gba", 0x00FB08, 0x0000002
-
-gUnk_0800FB0A:: @ 0800FB0A
-	.incbin "baserom.gba", 0x00FB0A, 0x0000027
-
-gUnk_0800FB31:: @ 0800FB31
-	.incbin "baserom.gba", 0x00FB31, 0x0000013
-
-gUnk_0800FB44:: @ 0800FB44
-	.incbin "baserom.gba", 0x00FB44, 0x0000077
-
-gUnk_0800FBBB:: @ 0800FBBB
-	.incbin "baserom.gba", 0x00FBBB, 0x0000035
-
-gUnk_0800FBF0:: @ 0800FBF0
-	.incbin "baserom.gba", 0x00FBF0, 0x0000003
-
-gUnk_0800FBF3:: @ 0800FBF3
-	.incbin "baserom.gba", 0x00FBF3, 0x0000002
-
-gUnk_0800FBF5:: @ 0800FBF5
-	.incbin "baserom.gba", 0x00FBF5, 0x0000001
-
-gUnk_0800FBF6:: @ 0800FBF6
-	.incbin "baserom.gba", 0x00FBF6, 0x0000002
-
-gUnk_0800FBF8:: @ 0800FBF8
-	.incbin "baserom.gba", 0x00FBF8, 0x0000001
-
-gUnk_0800FBF9:: @ 0800FBF9
-	.incbin "baserom.gba", 0x00FBF9, 0x0000001
-
-gUnk_0800FBFA:: @ 0800FBFA
-	.incbin "baserom.gba", 0x00FBFA, 0x0000001
-
-gUnk_0800FBFB:: @ 0800FBFB
-	.incbin "baserom.gba", 0x00FBFB, 0x0000001
-
-gUnk_0800FBFC:: @ 0800FBFC
-	.incbin "baserom.gba", 0x00FBFC, 0x0000003
-
-gUnk_0800FBFF:: @ 0800FBFF
-	.incbin "baserom.gba", 0x00FBFF, 0x0000001
-
-gUnk_0800FC00:: @ 0800FC00
-	.incbin "baserom.gba", 0x00FC00, 0x0000001
-
-gUnk_0800FC01:: @ 0800FC01
-	.incbin "baserom.gba", 0x00FC01, 0x0000004
-
-gUnk_0800FC05:: @ 0800FC05
-	.incbin "baserom.gba", 0x00FC05, 0x0000001
-
-gUnk_0800FC06:: @ 0800FC06
-	.incbin "baserom.gba", 0x00FC06, 0x0000002
-
-gUnk_0800FC08:: @ 0800FC08
-	.incbin "baserom.gba", 0x00FC08, 0x0000001
-
-gUnk_0800FC09:: @ 0800FC09
-	.incbin "baserom.gba", 0x00FC09, 0x0000005
-
-gUnk_0800FC0E:: @ 0800FC0E
-	.incbin "baserom.gba", 0x00FC0E, 0x0000016
-
-gUnk_0800FC24:: @ 0800FC24
-	.incbin "baserom.gba", 0x00FC24, 0x00000C6
-
-gUnk_0800FCEA:: @ 0800FCEA
-	.incbin "baserom.gba", 0x00FCEA, 0x0000004
-
-gUnk_0800FCEE:: @ 0800FCEE
-	.incbin "baserom.gba", 0x00FCEE, 0x0000004
-
-gUnk_0800FCF2:: @ 0800FCF2
-	.incbin "baserom.gba", 0x00FCF2, 0x0000001
-
-gUnk_0800FCF3:: @ 0800FCF3
-	.incbin "baserom.gba", 0x00FCF3, 0x0000002
-
-gUnk_0800FCF5:: @ 0800FCF5
-	.incbin "baserom.gba", 0x00FCF5, 0x0000002
-
-gUnk_0800FCF7:: @ 0800FCF7
-	.incbin "baserom.gba", 0x00FCF7, 0x0000001
-
-gUnk_0800FCF8:: @ 0800FCF8
-	.incbin "baserom.gba", 0x00FCF8, 0x0000002
-
-gUnk_0800FCFA:: @ 0800FCFA
-	.incbin "baserom.gba", 0x00FCFA, 0x0000001
-
-gUnk_0800FCFB:: @ 0800FCFB
-	.incbin "baserom.gba", 0x00FCFB, 0x0000001
-
-gUnk_0800FCFC:: @ 0800FCFC
-	.incbin "baserom.gba", 0x00FCFC, 0x0000002
-
-gUnk_0800FCFE:: @ 0800FCFE
-	.incbin "baserom.gba", 0x00FCFE, 0x0000001
-
-gUnk_0800FCFF:: @ 0800FCFF
-	.incbin "baserom.gba", 0x00FCFF, 0x0000001
-
-gUnk_0800FD00:: @ 0800FD00
-	.incbin "baserom.gba", 0x00FD00, 0x0000001
-
-gUnk_0800FD01:: @ 0800FD01
-	.incbin "baserom.gba", 0x00FD01, 0x0000003
-
-gUnk_0800FD04:: @ 0800FD04
-	.incbin "baserom.gba", 0x00FD04, 0x0000001
-
-gUnk_0800FD05:: @ 0800FD05
-	.incbin "baserom.gba", 0x00FD05, 0x0000007
-
-gUnk_0800FD0C:: @ 0800FD0C
-	.incbin "baserom.gba", 0x00FD0C, 0x000000A
-
-gUnk_0800FD16:: @ 0800FD16
-	.incbin "baserom.gba", 0x00FD16, 0x000000B
-
-gUnk_0800FD21:: @ 0800FD21
-	.incbin "baserom.gba", 0x00FD21, 0x000005F
-
-gUnk_0800FD80:: @ 0800FD80
-	.incbin "baserom.gba", 0x00FD80, 0x0000020
-
-gUnk_0800FDA0:: @ 0800FDA0
-	.incbin "baserom.gba", 0x00FDA0, 0x000002C
-
-gUnk_0800FDCC:: @ 0800FDCC
-	.incbin "baserom.gba", 0x00FDCC, 0x0000026
-
-gUnk_0800FDF2:: @ 0800FDF2
-	.incbin "baserom.gba", 0x00FDF2, 0x0000001
-
-gUnk_0800FDF3:: @ 0800FDF3
-	.incbin "baserom.gba", 0x00FDF3, 0x0000007
-
-gUnk_0800FDFA:: @ 0800FDFA
-	.incbin "baserom.gba", 0x00FDFA, 0x0000002
-
-gUnk_0800FDFC:: @ 0800FDFC
-	.incbin "baserom.gba", 0x00FDFC, 0x0000002
-
-gUnk_0800FDFE:: @ 0800FDFE
-	.incbin "baserom.gba", 0x00FDFE, 0x0000001
-
-gUnk_0800FDFF:: @ 0800FDFF
-	.incbin "baserom.gba", 0x00FDFF, 0x0000001
-
-gUnk_0800FE00:: @ 0800FE00
-	.incbin "baserom.gba", 0x00FE00, 0x0000001
-
-gUnk_0800FE01:: @ 0800FE01
-	.incbin "baserom.gba", 0x00FE01, 0x0000001
-
-gUnk_0800FE02:: @ 0800FE02
-	.incbin "baserom.gba", 0x00FE02, 0x0000002
-
-gUnk_0800FE04:: @ 0800FE04
-	.incbin "baserom.gba", 0x00FE04, 0x0000002
-
-gUnk_0800FE06:: @ 0800FE06
-	.incbin "baserom.gba", 0x00FE06, 0x0000001
-
-gUnk_0800FE07:: @ 0800FE07
-	.incbin "baserom.gba", 0x00FE07, 0x0000001
-
-gUnk_0800FE08:: @ 0800FE08
-	.incbin "baserom.gba", 0x00FE08, 0x0000001
-
-gUnk_0800FE09:: @ 0800FE09
-	.incbin "baserom.gba", 0x00FE09, 0x0000037
-
-gUnk_0800FE40:: @ 0800FE40
-	.incbin "baserom.gba", 0x00FE40, 0x0000004
-
-gUnk_0800FE44:: @ 0800FE44
-	.incbin "baserom.gba", 0x00FE44, 0x0000020
-
-gUnk_0800FE64:: @ 0800FE64
-	.incbin "baserom.gba", 0x00FE64, 0x0000024
-
-gUnk_0800FE88:: @ 0800FE88
-	.incbin "baserom.gba", 0x00FE88, 0x0000034
-
-gUnk_0800FEBC:: @ 0800FEBC
-	.incbin "baserom.gba", 0x00FEBC, 0x0000034
-
-gUnk_0800FEF0:: @ 0800FEF0
-	.incbin "baserom.gba", 0x00FEF0, 0x0000002
-
-gUnk_0800FEF2:: @ 0800FEF2
-	.incbin "baserom.gba", 0x00FEF2, 0x0000007
-
-gUnk_0800FEF9:: @ 0800FEF9
-	.incbin "baserom.gba", 0x00FEF9, 0x0000003
-
-gUnk_0800FEFC:: @ 0800FEFC
-	.incbin "baserom.gba", 0x00FEFC, 0x0000002
-
-gUnk_0800FEFE:: @ 0800FEFE
-	.incbin "baserom.gba", 0x00FEFE, 0x0000003
-
-gUnk_0800FF01:: @ 0800FF01
-	.incbin "baserom.gba", 0x00FF01, 0x0000002
-
-gUnk_0800FF03:: @ 0800FF03
-	.incbin "baserom.gba", 0x00FF03, 0x0000001
-
-gUnk_0800FF04:: @ 0800FF04
-	.incbin "baserom.gba", 0x00FF04, 0x0000001
-
-gUnk_0800FF05:: @ 0800FF05
-	.incbin "baserom.gba", 0x00FF05, 0x0000001
-
-gUnk_0800FF06:: @ 0800FF06
-	.incbin "baserom.gba", 0x00FF06, 0x0000002
-
-gUnk_0800FF08:: @ 0800FF08
-	.incbin "baserom.gba", 0x00FF08, 0x0000010
-
-gUnk_0800FF18:: @ 0800FF18
-	.incbin "baserom.gba", 0x00FF18, 0x0000012
-
-gUnk_0800FF2A:: @ 0800FF2A
-	.incbin "baserom.gba", 0x00FF2A, 0x000004A
-
-gUnk_0800FF74:: @ 0800FF74
-	.incbin "baserom.gba", 0x00FF74, 0x000003C
-
-gUnk_0800FFB0:: @ 0800FFB0
-	.incbin "baserom.gba", 0x00FFB0, 0x000000B
-
-gUnk_0800FFBB:: @ 0800FFBB
-	.incbin "baserom.gba", 0x00FFBB, 0x000001B
-
-gUnk_0800FFD6:: @ 0800FFD6
-	.incbin "baserom.gba", 0x00FFD6, 0x0000018
-
-gUnk_0800FFEE:: @ 0800FFEE
-	.incbin "baserom.gba", 0x00FFEE, 0x0000008
-
-gUnk_0800FFF6:: @ 0800FFF6
-	.incbin "baserom.gba", 0x00FFF6, 0x0000006
-
-gUnk_0800FFFC:: @ 0800FFFC
-	.incbin "baserom.gba", 0x00FFFC, 0x0000001
-
-gUnk_0800FFFD:: @ 0800FFFD
-	.incbin "baserom.gba", 0x00FFFD, 0x0000002
-
-gUnk_0800FFFF:: @ 0800FFFF
-	.incbin "baserom.gba", 0x00FFFF, 0x0000001
-
-gUnk_08010000:: @ 08010000
-	.incbin "baserom.gba", 0x010000, 0x0000001
-
-gUnk_08010001:: @ 08010001
-	.incbin "baserom.gba", 0x010001, 0x0000001
-
-gUnk_08010002:: @ 08010002
-	.incbin "baserom.gba", 0x010002, 0x0000001
-
-gUnk_08010003:: @ 08010003
-	.incbin "baserom.gba", 0x010003, 0x0000002
-
-gUnk_08010005:: @ 08010005
-	.incbin "baserom.gba", 0x010005, 0x0000002
-
-gUnk_08010007:: @ 08010007
-	.incbin "baserom.gba", 0x010007, 0x0000001
-
-gUnk_08010008:: @ 08010008
-	.incbin "baserom.gba", 0x010008, 0x0000001
-
-gUnk_08010009:: @ 08010009
-	.incbin "baserom.gba", 0x010009, 0x0000001
-
-gUnk_0801000A:: @ 0801000A
-	.incbin "baserom.gba", 0x01000A, 0x0000002
-
-gUnk_0801000C:: @ 0801000C
-	.incbin "baserom.gba", 0x01000C, 0x0000001
-
-gUnk_0801000D:: @ 0801000D
-	.incbin "baserom.gba", 0x01000D, 0x0000001
-
-gUnk_0801000E:: @ 0801000E
-	.incbin "baserom.gba", 0x01000E, 0x0000001
-
-gUnk_0801000F:: @ 0801000F
-	.incbin "baserom.gba", 0x01000F, 0x0000009
-
-gUnk_08010018:: @ 08010018
-	.incbin "baserom.gba", 0x010018, 0x0000003
-
-gUnk_0801001B:: @ 0801001B
-	.incbin "baserom.gba", 0x01001B, 0x0000002
-
-gUnk_0801001D:: @ 0801001D
-	.incbin "baserom.gba", 0x01001D, 0x0000006
-
-gUnk_08010023:: @ 08010023
-	.incbin "baserom.gba", 0x010023, 0x0000021
-
-gUnk_08010044:: @ 08010044
-	.incbin "baserom.gba", 0x010044, 0x0000054
-
-gUnk_08010098:: @ 08010098
-	.incbin "baserom.gba", 0x010098, 0x0000001
-
-gUnk_08010099:: @ 08010099
-	.incbin "baserom.gba", 0x010099, 0x0000028
-
-gUnk_080100C1:: @ 080100C1
-	.incbin "baserom.gba", 0x0100C1, 0x0000007
-
-gUnk_080100C8:: @ 080100C8
-	.incbin "baserom.gba", 0x0100C8, 0x000002D
-
-gUnk_080100F5:: @ 080100F5
-	.incbin "baserom.gba", 0x0100F5, 0x0000007
-
-gUnk_080100FC:: @ 080100FC
-	.incbin "baserom.gba", 0x0100FC, 0x0000002
-
-gUnk_080100FE:: @ 080100FE
-	.incbin "baserom.gba", 0x0100FE, 0x0000001
-
-gUnk_080100FF:: @ 080100FF
-	.incbin "baserom.gba", 0x0100FF, 0x0000001
-
-gUnk_08010100:: @ 08010100
-	.incbin "baserom.gba", 0x010100, 0x0000002
-
-gUnk_08010102:: @ 08010102
-	.incbin "baserom.gba", 0x010102, 0x0000001
-
-gUnk_08010103:: @ 08010103
-	.incbin "baserom.gba", 0x010103, 0x0000002
-
-gUnk_08010105:: @ 08010105
-	.incbin "baserom.gba", 0x010105, 0x0000001
-
-gUnk_08010106:: @ 08010106
-	.incbin "baserom.gba", 0x010106, 0x0000004
-
-gUnk_0801010A:: @ 0801010A
-	.incbin "baserom.gba", 0x01010A, 0x0000007
-
-gUnk_08010111:: @ 08010111
-	.incbin "baserom.gba", 0x010111, 0x000000F
-
-gUnk_08010120:: @ 08010120
-	.incbin "baserom.gba", 0x010120, 0x0000010
-
-gUnk_08010130:: @ 08010130
-	.incbin "baserom.gba", 0x010130, 0x0000018
-
-gUnk_08010148:: @ 08010148
-	.incbin "baserom.gba", 0x010148, 0x00000B2
-
-gUnk_080101FA:: @ 080101FA
-	.incbin "baserom.gba", 0x0101FA, 0x0000003
-
-gUnk_080101FD:: @ 080101FD
-	.incbin "baserom.gba", 0x0101FD, 0x0000002
-
-gUnk_080101FF:: @ 080101FF
-	.incbin "baserom.gba", 0x0101FF, 0x0000001
-
-gUnk_08010200:: @ 08010200
-	.incbin "baserom.gba", 0x010200, 0x0000003
-
-gUnk_08010203:: @ 08010203
-	.incbin "baserom.gba", 0x010203, 0x0000004
-
-gUnk_08010207:: @ 08010207
-	.incbin "baserom.gba", 0x010207, 0x0000001
-
-gUnk_08010208:: @ 08010208
-	.incbin "baserom.gba", 0x010208, 0x0000004
-
-gUnk_0801020C:: @ 0801020C
-	.incbin "baserom.gba", 0x01020C, 0x0000014
-
-gUnk_08010220:: @ 08010220
-	.incbin "baserom.gba", 0x010220, 0x0000016
-
-gUnk_08010236:: @ 08010236
-	.incbin "baserom.gba", 0x010236, 0x000002E
-
-gUnk_08010264:: @ 08010264
-	.incbin "baserom.gba", 0x010264, 0x0000030
-
-gUnk_08010294:: @ 08010294
-	.incbin "baserom.gba", 0x010294, 0x000004C
-
-gUnk_080102E0:: @ 080102E0
-	.incbin "baserom.gba", 0x0102E0, 0x000001B
-
-gUnk_080102FB:: @ 080102FB
-	.incbin "baserom.gba", 0x0102FB, 0x0000002
-
-gUnk_080102FD:: @ 080102FD
-	.incbin "baserom.gba", 0x0102FD, 0x0000001
-
-gUnk_080102FE:: @ 080102FE
-	.incbin "baserom.gba", 0x0102FE, 0x0000005
-
-gUnk_08010303:: @ 08010303
-	.incbin "baserom.gba", 0x010303, 0x0000001
-
-gUnk_08010304:: @ 08010304
-	.incbin "baserom.gba", 0x010304, 0x0000001
-
-gUnk_08010305:: @ 08010305
-	.incbin "baserom.gba", 0x010305, 0x0000005
-
-gUnk_0801030A:: @ 0801030A
-	.incbin "baserom.gba", 0x01030A, 0x0000002
-
-gUnk_0801030C:: @ 0801030C
-	.incbin "baserom.gba", 0x01030C, 0x0000014
-
-gUnk_08010320:: @ 08010320
-	.incbin "baserom.gba", 0x010320, 0x0000090
-
-gUnk_080103B0:: @ 080103B0
-	.incbin "baserom.gba", 0x0103B0, 0x0000020
-
-gUnk_080103D0:: @ 080103D0
-	.incbin "baserom.gba", 0x0103D0, 0x0000028
-
-gUnk_080103F8:: @ 080103F8
-	.incbin "baserom.gba", 0x0103F8, 0x0000005
-
-gUnk_080103FD:: @ 080103FD
-	.incbin "baserom.gba", 0x0103FD, 0x0000003
-
-gUnk_08010400:: @ 08010400
-	.incbin "baserom.gba", 0x010400, 0x0000006
-
-gUnk_08010406:: @ 08010406
-	.incbin "baserom.gba", 0x010406, 0x0000001
-
-gUnk_08010407:: @ 08010407
-	.incbin "baserom.gba", 0x010407, 0x0000003
-
-gUnk_0801040A:: @ 0801040A
-	.incbin "baserom.gba", 0x01040A, 0x000001E
-
-gUnk_08010428:: @ 08010428
-	.incbin "baserom.gba", 0x010428, 0x000002C
-
-gUnk_08010454:: @ 08010454
-	.incbin "baserom.gba", 0x010454, 0x000002C
-
-gUnk_08010480:: @ 08010480
-	.incbin "baserom.gba", 0x010480, 0x0000020
-
-gUnk_080104A0:: @ 080104A0
-	.incbin "baserom.gba", 0x0104A0, 0x000004C
-
-gUnk_080104EC:: @ 080104EC
-	.incbin "baserom.gba", 0x0104EC, 0x0000013
-
-gUnk_080104FF:: @ 080104FF
-	.incbin "baserom.gba", 0x0104FF, 0x0000002
-
-gUnk_08010501:: @ 08010501
-	.incbin "baserom.gba", 0x010501, 0x0000001
-
-gUnk_08010502:: @ 08010502
-	.incbin "baserom.gba", 0x010502, 0x0000001
-
-gUnk_08010503:: @ 08010503
-	.incbin "baserom.gba", 0x010503, 0x0000007
-
-gUnk_0801050A:: @ 0801050A
-	.incbin "baserom.gba", 0x01050A, 0x0000001
-
-gUnk_0801050B:: @ 0801050B
-	.incbin "baserom.gba", 0x01050B, 0x000001B
-
-gUnk_08010526:: @ 08010526
-	.incbin "baserom.gba", 0x010526, 0x0000079
-
-gUnk_0801059F:: @ 0801059F
-	.incbin "baserom.gba", 0x01059F, 0x000002A
-
-gUnk_080105C9:: @ 080105C9
-	.incbin "baserom.gba", 0x0105C9, 0x0000032
-
-gUnk_080105FB:: @ 080105FB
-	.incbin "baserom.gba", 0x0105FB, 0x0000004
-
-gUnk_080105FF:: @ 080105FF
-	.incbin "baserom.gba", 0x0105FF, 0x0000001
-
-gUnk_08010600:: @ 08010600
-	.incbin "baserom.gba", 0x010600, 0x000000A
-
-gUnk_0801060A:: @ 0801060A
-	.incbin "baserom.gba", 0x01060A, 0x0000003
-
-gUnk_0801060D:: @ 0801060D
-	.incbin "baserom.gba", 0x01060D, 0x000000A
-
-gUnk_08010617:: @ 08010617
-	.incbin "baserom.gba", 0x010617, 0x0000005
-
-gUnk_0801061C:: @ 0801061C
-	.incbin "baserom.gba", 0x01061C, 0x0000028
-
-gUnk_08010644:: @ 08010644
-	.incbin "baserom.gba", 0x010644, 0x000000C
-
-gUnk_08010650:: @ 08010650
-	.incbin "baserom.gba", 0x010650, 0x0000024
-
-gUnk_08010674:: @ 08010674
-	.incbin "baserom.gba", 0x010674, 0x0000038
-
-gUnk_080106AC:: @ 080106AC
-	.incbin "baserom.gba", 0x0106AC, 0x0000054
-
-gUnk_08010700:: @ 08010700
-	.incbin "baserom.gba", 0x010700, 0x0000001
-
-gUnk_08010701:: @ 08010701
-	.incbin "baserom.gba", 0x010701, 0x0000004
-
-gUnk_08010705:: @ 08010705
-	.incbin "baserom.gba", 0x010705, 0x0000009
-
-gUnk_0801070E:: @ 0801070E
-	.incbin "baserom.gba", 0x01070E, 0x0000026
-
-gUnk_08010734:: @ 08010734
-	.incbin "baserom.gba", 0x010734, 0x0000060
-
-gUnk_08010794:: @ 08010794
-	.incbin "baserom.gba", 0x010794, 0x000003C
-
-gUnk_080107D0:: @ 080107D0
-	.incbin "baserom.gba", 0x0107D0, 0x000003A
-
-gUnk_0801080A:: @ 0801080A
-	.incbin "baserom.gba", 0x01080A, 0x0000001
-
-gUnk_0801080B:: @ 0801080B
-	.incbin "baserom.gba", 0x01080B, 0x000000A
-
-gUnk_08010815:: @ 08010815
-	.incbin "baserom.gba", 0x010815, 0x0000006
-
-gUnk_0801081B:: @ 0801081B
-	.incbin "baserom.gba", 0x01081B, 0x00000B5
-
-gUnk_080108D0:: @ 080108D0
-	.incbin "baserom.gba", 0x0108D0, 0x000002F
-
-gUnk_080108FF:: @ 080108FF
-	.incbin "baserom.gba", 0x0108FF, 0x000000D
-
-gUnk_0801090C:: @ 0801090C
-	.incbin "baserom.gba", 0x01090C, 0x0000003
-
-gUnk_0801090F:: @ 0801090F
-	.incbin "baserom.gba", 0x01090F, 0x0000008
-
-gUnk_08010917:: @ 08010917
-	.incbin "baserom.gba", 0x010917, 0x000004D
-
-gUnk_08010964:: @ 08010964
-	.incbin "baserom.gba", 0x010964, 0x000003C
-
-gUnk_080109A0:: @ 080109A0
-	.incbin "baserom.gba", 0x0109A0, 0x0000050
-
-gUnk_080109F0:: @ 080109F0
-	.incbin "baserom.gba", 0x0109F0, 0x0000006
-
-gUnk_080109F6:: @ 080109F6
-	.incbin "baserom.gba", 0x0109F6, 0x000001E
-
-gUnk_08010A14:: @ 08010A14
-	.incbin "baserom.gba", 0x010A14, 0x000000B
-
-gUnk_08010A1F:: @ 08010A1F
-	.incbin "baserom.gba", 0x010A1F, 0x0000019
-
-gUnk_08010A38:: @ 08010A38
-	.incbin "baserom.gba", 0x010A38, 0x0000024
-
-gUnk_08010A5C:: @ 08010A5C
-	.incbin "baserom.gba", 0x010A5C, 0x000003C
-
-gUnk_08010A98:: @ 08010A98
-	.incbin "baserom.gba", 0x010A98, 0x000004C
-
-gUnk_08010AE4:: @ 08010AE4
-	.incbin "baserom.gba", 0x010AE4, 0x0000020
-
-gUnk_08010B04:: @ 08010B04
-	.incbin "baserom.gba", 0x010B04, 0x0000064
-
-gUnk_08010B68:: @ 08010B68
-	.incbin "baserom.gba", 0x010B68, 0x000004C
-
-gUnk_08010BB4:: @ 08010BB4
-	.incbin "baserom.gba", 0x010BB4, 0x0000038
-
-gUnk_08010BEC:: @ 08010BEC
-	.incbin "baserom.gba", 0x010BEC, 0x000000D
-
-gUnk_08010BF9:: @ 08010BF9
-	.incbin "baserom.gba", 0x010BF9, 0x0000005
-
-gUnk_08010BFE:: @ 08010BFE
-	.incbin "baserom.gba", 0x010BFE, 0x000001C
-
-gUnk_08010C1A:: @ 08010C1A
-	.incbin "baserom.gba", 0x010C1A, 0x00000E9
-
-gUnk_08010D03:: @ 08010D03
-	.incbin "baserom.gba", 0x010D03, 0x00000FD
-
-gUnk_08010E00:: @ 08010E00
-	.incbin "baserom.gba", 0x010E00, 0x000000D
-
-gUnk_08010E0D:: @ 08010E0D
-	.incbin "baserom.gba", 0x010E0D, 0x00000F3
-
-gUnk_08010F00:: @ 08010F00
-	.incbin "baserom.gba", 0x010F00, 0x00000FF
-
-gUnk_08010FFF:: @ 08010FFF
-	.incbin "baserom.gba", 0x010FFF, 0x0000001
-
-gUnk_08011000:: @ 08011000
-	.incbin "baserom.gba", 0x011000, 0x0000001
-
-gUnk_08011001:: @ 08011001
-	.incbin "baserom.gba", 0x011001, 0x000001E
-
-gUnk_0801101F:: @ 0801101F
-	.incbin "baserom.gba", 0x01101F, 0x0000055
-
-gUnk_08011074:: @ 08011074
-	.incbin "baserom.gba", 0x011074, 0x000000F
-
-gUnk_08011083:: @ 08011083
-	.incbin "baserom.gba", 0x011083, 0x0000059
-
-gUnk_080110DC:: @ 080110DC
-	.incbin "baserom.gba", 0x0110DC, 0x000000C
-
-gUnk_080110E8:: @ 080110E8
-	.incbin "baserom.gba", 0x0110E8, 0x0000040
-
-gUnk_08011128:: @ 08011128
-	.incbin "baserom.gba", 0x011128, 0x00000A4
-
-gUnk_080111CC:: @ 080111CC
-	.incbin "baserom.gba", 0x0111CC, 0x000003C
-
-gUnk_08011208:: @ 08011208
-	.incbin "baserom.gba", 0x011208, 0x0000015
-
-gUnk_0801121D:: @ 0801121D
-	.incbin "baserom.gba", 0x01121D, 0x00000A7
-
-gUnk_080112C4:: @ 080112C4
-	.incbin "baserom.gba", 0x0112C4, 0x000004B
-
-gUnk_0801130F:: @ 0801130F
-	.incbin "baserom.gba", 0x01130F, 0x0000019
-
-gUnk_08011328:: @ 08011328
-	.incbin "baserom.gba", 0x011328, 0x00000DB
-
-gUnk_08011403:: @ 08011403
-	.incbin "baserom.gba", 0x011403, 0x00001CD
-
-gUnk_080115D0:: @ 080115D0
-	.incbin "baserom.gba", 0x0115D0, 0x0000038
-
-gUnk_08011608:: @ 08011608
-	.incbin "baserom.gba", 0x011608, 0x0000038
-
-gUnk_08011640:: @ 08011640
-	.incbin "baserom.gba", 0x011640, 0x0000068
-
-gUnk_080116A8:: @ 080116A8
-	.incbin "baserom.gba", 0x0116A8, 0x0000161
-
-gUnk_08011809:: @ 08011809
-	.incbin "baserom.gba", 0x011809, 0x0000033
-
-gUnk_0801183C:: @ 0801183C
-	.incbin "baserom.gba", 0x01183C, 0x0000098
-
-gUnk_080118D4:: @ 080118D4
-	.incbin "baserom.gba", 0x0118D4, 0x000005C
-
-gUnk_08011930:: @ 08011930
-	.incbin "baserom.gba", 0x011930, 0x0000010
-
-gUnk_08011940:: @ 08011940
-	.incbin "baserom.gba", 0x011940, 0x000000C
-
-gUnk_0801194C:: @ 0801194C
-	.incbin "baserom.gba", 0x01194C, 0x000000C
-
-gUnk_08011958:: @ 08011958
-	.incbin "baserom.gba", 0x011958, 0x000000C
-
-gUnk_08011964:: @ 08011964
-	.incbin "baserom.gba", 0x011964, 0x000004C
-
-gUnk_080119B0:: @ 080119B0
-	.incbin "baserom.gba", 0x0119B0, 0x0000028
-
-gUnk_080119D8:: @ 080119D8
-	.incbin "baserom.gba", 0x0119D8, 0x000000C
-
-gUnk_080119E4:: @ 080119E4
-	.incbin "baserom.gba", 0x0119E4, 0x000000C
-
-gUnk_080119F0:: @ 080119F0
-	.incbin "baserom.gba", 0x0119F0, 0x0000014
-
-gUnk_08011A04:: @ 08011A04
-	.incbin "baserom.gba", 0x011A04, 0x0000028
-
-gUnk_08011A2C:: @ 08011A2C
-	.incbin "baserom.gba", 0x011A2C, 0x0000038
-
-gUnk_08011A64:: @ 08011A64
-	.incbin "baserom.gba", 0x011A64, 0x0000080
-
-gUnk_08011AE4:: @ 08011AE4
-	.incbin "baserom.gba", 0x011AE4, 0x0000020
-
-gUnk_08011B04:: @ 08011B04
-	.incbin "baserom.gba", 0x011B04, 0x000001C
-
-gUnk_08011B20:: @ 08011B20
-	.incbin "baserom.gba", 0x011B20, 0x0000020
-
-gUnk_08011B40:: @ 08011B40
-	.incbin "baserom.gba", 0x011B40, 0x00000A4
-
-gUnk_08011BE4:: @ 08011BE4
-	.incbin "baserom.gba", 0x011BE4, 0x0000020
-
-gUnk_08011C04:: @ 08011C04
-	.incbin "baserom.gba", 0x011C04, 0x000004C
-
-gUnk_08011C50:: @ 08011C50
-	.incbin "baserom.gba", 0x011C50, 0x000002C
-
-gUnk_08011C7C:: @ 08011C7C
-	.incbin "baserom.gba", 0x011C7C, 0x00000AC
-
-gUnk_08011D28:: @ 08011D28
-	.incbin "baserom.gba", 0x011D28, 0x00000AC
-
-gUnk_08011DD4:: @ 08011DD4
-	.incbin "baserom.gba", 0x011DD4, 0x0000030
-
-gUnk_08011E04:: @ 08011E04
-	.incbin "baserom.gba", 0x011E04, 0x000007C
-
-gUnk_08011E80:: @ 08011E80
-	.incbin "baserom.gba", 0x011E80, 0x000008C
-
-gUnk_08011F0C:: @ 08011F0C
-	.incbin "baserom.gba", 0x011F0C, 0x000008C
-
-gUnk_08011F98:: @ 08011F98
-	.incbin "baserom.gba", 0x011F98, 0x000008C
-
-gUnk_08012024:: @ 08012024
-	.incbin "baserom.gba", 0x012024, 0x000006D
-
-gUnk_08012091:: @ 08012091
-	.incbin "baserom.gba", 0x012091, 0x000001F
-
-gUnk_080120B0:: @ 080120B0
-	.incbin "baserom.gba", 0x0120B0, 0x000003D
-
-gUnk_080120ED:: @ 080120ED
-	.incbin "baserom.gba", 0x0120ED, 0x000000E
-
-gUnk_080120FB:: @ 080120FB
-	.incbin "baserom.gba", 0x0120FB, 0x0000041
-
-gUnk_0801213C:: @ 0801213C
-	.incbin "baserom.gba", 0x01213C, 0x000008C
-
-gUnk_080121C8:: @ 080121C8
-	.incbin "baserom.gba", 0x0121C8, 0x0000038
-
-gUnk_08012200:: @ 08012200
-	.incbin "baserom.gba", 0x012200, 0x0000038
-
-gUnk_08012238:: @ 08012238
-	.incbin "baserom.gba", 0x012238, 0x0000038
-
-gUnk_08012270:: @ 08012270
-	.incbin "baserom.gba", 0x012270, 0x00000BC
-
-gUnk_0801232C:: @ 0801232C
-	.incbin "baserom.gba", 0x01232C, 0x0000034
-
-gUnk_08012360:: @ 08012360
-	.incbin "baserom.gba", 0x012360, 0x00000B0
-
-gUnk_08012410:: @ 08012410
-	.incbin "baserom.gba", 0x012410, 0x0000020
-
-gUnk_08012430:: @ 08012430
-	.incbin "baserom.gba", 0x012430, 0x0000050
-
-gUnk_08012480:: @ 08012480
-	.incbin "baserom.gba", 0x012480, 0x000027C
-
-
-.include "data/scripts/ezlo_angry.inc"
-
-gUnk_08012AB0:: @ 08012AB0
-	.incbin "baserom.gba", 0x012AB0, 0x00000F8
-
-gUnk_08012BA8:: @ 08012BA8
-	.incbin "baserom.gba", 0x012BA8, 0x0000050
-
-gUnk_08012BF8:: @ 08012BF8
-	.incbin "baserom.gba", 0x012BF8, 0x0000014
-
-gUnk_08012C0C:: @ 08012C0C
-	.incbin "baserom.gba", 0x012C0C, 0x000003C
-
-gUnk_08012C48:: @ 08012C48
-	.incbin "baserom.gba", 0x012C48, 0x0000050
-
-gUnk_08012C98:: @ 08012C98
-	.incbin "baserom.gba", 0x012C98, 0x0000040
-
-gUnk_08012CD8:: @ 08012CD8
-	.incbin "baserom.gba", 0x012CD8, 0x0000040
-
-gUnk_08012D18:: @ 08012D18
-	.incbin "baserom.gba", 0x012D18, 0x0000058
-
-gUnk_08012D70:: @ 08012D70
-	.incbin "baserom.gba", 0x012D70, 0x0000031
-
-gUnk_08012DA1:: @ 08012DA1
-	.incbin "baserom.gba", 0x012DA1, 0x000000F
-
-gUnk_08012DB0:: @ 08012DB0
-	.incbin "baserom.gba", 0x012DB0, 0x0000028
-
-gUnk_08012DD8:: @ 08012DD8
-	.incbin "baserom.gba", 0x012DD8, 0x0000048
-
-gUnk_08012E20:: @ 08012E20
-	.incbin "baserom.gba", 0x012E20, 0x0000024
-
-gUnk_08012E44:: @ 08012E44
-	.incbin "baserom.gba", 0x012E44, 0x0000044
-
-gUnk_08012E88:: @ 08012E88
-	.incbin "baserom.gba", 0x012E88, 0x0000038
-
-gUnk_08012EC0:: @ 08012EC0
-	.incbin "baserom.gba", 0x012EC0, 0x000004C
-
-gUnk_08012F0C:: @ 08012F0C
-	.incbin "baserom.gba", 0x012F0C, 0x00000F5
-
-gUnk_08013001:: @ 08013001
-	.incbin "baserom.gba", 0x013001, 0x0000002
-
-gUnk_08013003:: @ 08013003
-	.incbin "baserom.gba", 0x013003, 0x0000008
-
-gUnk_0801300B:: @ 0801300B
-	.incbin "baserom.gba", 0x01300B, 0x0000031
-
-gUnk_0801303C:: @ 0801303C
-	.incbin "baserom.gba", 0x01303C, 0x0000034
-
-gUnk_08013070:: @ 08013070
-	.incbin "baserom.gba", 0x013070, 0x0000011
-
-gUnk_08013081:: @ 08013081
-	.incbin "baserom.gba", 0x013081, 0x000000F
-
-gUnk_08013090:: @ 08013090
-	.incbin "baserom.gba", 0x013090, 0x0000084
-
-gUnk_08013114:: @ 08013114
-	.incbin "baserom.gba", 0x013114, 0x0000074
-
-gUnk_08013188:: @ 08013188
-	.incbin "baserom.gba", 0x013188, 0x0000024
-
-gUnk_080131AC:: @ 080131AC
-	.incbin "baserom.gba", 0x0131AC, 0x0000138
-
-gUnk_080132E4:: @ 080132E4
-	.incbin "baserom.gba", 0x0132E4, 0x000004C
-
-gUnk_08013330:: @ 08013330
-	.incbin "baserom.gba", 0x013330, 0x000001C
-
-gUnk_0801334C:: @ 0801334C
-	.incbin "baserom.gba", 0x01334C, 0x000002C
-
-gUnk_08013378:: @ 08013378
-	.incbin "baserom.gba", 0x013378, 0x000004C
-
-gUnk_080133C4:: @ 080133C4
-	.incbin "baserom.gba", 0x0133C4, 0x0000034
-
-gUnk_080133F8:: @ 080133F8
-	.incbin "baserom.gba", 0x0133F8, 0x00000E4
-
-gUnk_080134DC:: @ 080134DC
-	.incbin "baserom.gba", 0x0134DC, 0x00001FC
-
-gUnk_080136D8:: @ 080136D8
-	.incbin "baserom.gba", 0x0136D8, 0x0000048
-
-gUnk_08013720:: @ 08013720
-	.incbin "baserom.gba", 0x013720, 0x00000BA
-
-gUnk_080137DA:: @ 080137DA
-	.incbin "baserom.gba", 0x0137DA, 0x00000DA
-
-gUnk_080138B4:: @ 080138B4
-	.incbin "baserom.gba", 0x0138B4, 0x0000264
-
-gUnk_08013B18:: @ 08013B18
-	.incbin "baserom.gba", 0x013B18, 0x0000058
-
-gUnk_08013B70:: @ 08013B70
-	.incbin "baserom.gba", 0x013B70, 0x0000038
-
-gUnk_08013BA8:: @ 08013BA8
-	.incbin "baserom.gba", 0x013BA8, 0x0000040
-
-gUnk_08013BE8:: @ 08013BE8
-	.incbin "baserom.gba", 0x013BE8, 0x00000BC
-
-gUnk_08013CA4:: @ 08013CA4
-	.incbin "baserom.gba", 0x013CA4, 0x0000160
-
-gUnk_08013E04:: @ 08013E04
-	.incbin "baserom.gba", 0x013E04, 0x0000048
-
-gUnk_08013E4C:: @ 08013E4C
-	.incbin "baserom.gba", 0x013E4C, 0x0000024
-
-gUnk_08013E70:: @ 08013E70
-	.incbin "baserom.gba", 0x013E70, 0x0000024
-
-gUnk_08013E94:: @ 08013E94
-	.incbin "baserom.gba", 0x013E94, 0x000001C
-
-gUnk_08013EB0:: @ 08013EB0
-	.incbin "baserom.gba", 0x013EB0, 0x000001C
-
-gUnk_08013ECC:: @ 08013ECC
-	.incbin "baserom.gba", 0x013ECC, 0x000001C
-
-gUnk_08013EE8:: @ 08013EE8
-	.incbin "baserom.gba", 0x013EE8, 0x000001C
-
-gUnk_08013F04:: @ 08013F04
-	.incbin "baserom.gba", 0x013F04, 0x0000030
-
-gUnk_08013F34:: @ 08013F34
-	.incbin "baserom.gba", 0x013F34, 0x0000030
-
-gUnk_08013F64:: @ 08013F64
-	.incbin "baserom.gba", 0x013F64, 0x0000030
-
-gUnk_08013F94:: @ 08013F94
-	.incbin "baserom.gba", 0x013F94, 0x0000054
-
-gUnk_08013FE8:: @ 08013FE8
-	.incbin "baserom.gba", 0x013FE8, 0x000006C
-
-gUnk_08014054:: @ 08014054
-	.incbin "baserom.gba", 0x014054, 0x0000020
-
-gUnk_08014074:: @ 08014074
-	.incbin "baserom.gba", 0x014074, 0x0000020
-
-gUnk_08014094:: @ 08014094
-	.incbin "baserom.gba", 0x014094, 0x0000048
-
-gUnk_080140DC:: @ 080140DC
-	.incbin "baserom.gba", 0x0140DC, 0x000001C
-
-gUnk_080140F8:: @ 080140F8
-	.incbin "baserom.gba", 0x0140F8, 0x0000020
-
-gUnk_08014118:: @ 08014118
-	.incbin "baserom.gba", 0x014118, 0x000003C
-
-gUnk_08014154:: @ 08014154
-	.incbin "baserom.gba", 0x014154, 0x0000088
-
-gUnk_080141DC:: @ 080141DC
-	.incbin "baserom.gba", 0x0141DC, 0x0000034
-
-gUnk_08014210:: @ 08014210
-	.incbin "baserom.gba", 0x014210, 0x0000064
-
-gUnk_08014274:: @ 08014274
-	.incbin "baserom.gba", 0x014274, 0x000003C
-
-gUnk_080142B0:: @ 080142B0
-	.incbin "baserom.gba", 0x0142B0, 0x00000D4
-
-gUnk_08014384:: @ 08014384
-	.incbin "baserom.gba", 0x014384, 0x000003C
-
-gUnk_080143C0:: @ 080143C0
-	.incbin "baserom.gba", 0x0143C0, 0x0000042
-
-gUnk_08014402:: @ 08014402
-	.incbin "baserom.gba", 0x014402, 0x000004E
-
-gUnk_08014450:: @ 08014450
-	.incbin "baserom.gba", 0x014450, 0x00000BC
-
-gUnk_0801450C:: @ 0801450C
-	.incbin "baserom.gba", 0x01450C, 0x000003C
-
-gUnk_08014548:: @ 08014548
-	.incbin "baserom.gba", 0x014548, 0x0000058
-
-gUnk_080145A0:: @ 080145A0
-	.incbin "baserom.gba", 0x0145A0, 0x0000010
-
-gUnk_080145B0:: @ 080145B0
-	.incbin "baserom.gba", 0x0145B0, 0x0000038
-
-gUnk_080145E8:: @ 080145E8
-	.incbin "baserom.gba", 0x0145E8, 0x0000040
-
-gUnk_08014628:: @ 08014628
-	.incbin "baserom.gba", 0x014628, 0x00001DC
-
-gUnk_08014804:: @ 08014804
-	.incbin "baserom.gba", 0x014804, 0x00000EC
-
-gUnk_080148F0:: @ 080148F0
-	.incbin "baserom.gba", 0x0148F0, 0x0000068
-
-gUnk_08014958:: @ 08014958
-	.incbin "baserom.gba", 0x014958, 0x000003C
-
-gUnk_08014994:: @ 08014994
-	.incbin "baserom.gba", 0x014994, 0x0000038
-
-gUnk_080149CC:: @ 080149CC
-	.incbin "baserom.gba", 0x0149CC, 0x000005C
-
-gUnk_08014A28:: @ 08014A28
-	.incbin "baserom.gba", 0x014A28, 0x000002C
-
-gUnk_08014A54:: @ 08014A54
-	.incbin "baserom.gba", 0x014A54, 0x000002C
-
-gUnk_08014A80:: @ 08014A80
-	.incbin "baserom.gba", 0x014A80, 0x0000044
-
-gUnk_08014AC4:: @ 08014AC4
-	.incbin "baserom.gba", 0x014AC4, 0x0000070
-
-gUnk_08014B34:: @ 08014B34
-	.incbin "baserom.gba", 0x014B34, 0x00000F8
-
-gUnk_08014C2C:: @ 08014C2C
-	.incbin "baserom.gba", 0x014C2C, 0x0000068
-
-gUnk_08014C94:: @ 08014C94
-	.incbin "baserom.gba", 0x014C94, 0x0000048
-
-gUnk_08014CDC:: @ 08014CDC
-	.incbin "baserom.gba", 0x014CDC, 0x00000F0
-
-gUnk_08014DCC:: @ 08014DCC
-	.incbin "baserom.gba", 0x014DCC, 0x0000048
-
-gUnk_08014E14:: @ 08014E14
-	.incbin "baserom.gba", 0x014E14, 0x000003C
-
-gUnk_08014E50:: @ 08014E50
-	.incbin "baserom.gba", 0x014E50, 0x000007C
-
-gUnk_08014ECC:: @ 08014ECC
-	.incbin "baserom.gba", 0x014ECC, 0x000002C
-
-gUnk_08014EF8:: @ 08014EF8
-	.incbin "baserom.gba", 0x014EF8, 0x0000038
-
-gUnk_08014F30:: @ 08014F30
-	.incbin "baserom.gba", 0x014F30, 0x000008C
-
-gUnk_08014FBC:: @ 08014FBC
-	.incbin "baserom.gba", 0x014FBC, 0x0000045
-
-gUnk_08015001:: @ 08015001
-	.incbin "baserom.gba", 0x015001, 0x0000086
-
-gUnk_08015087:: @ 08015087
-	.incbin "baserom.gba", 0x015087, 0x0000068
-
-gUnk_080150EF:: @ 080150EF
-	.incbin "baserom.gba", 0x0150EF, 0x0000145
-
-gUnk_08015234:: @ 08015234
-	.incbin "baserom.gba", 0x015234, 0x0000080
-
-gUnk_080152B4:: @ 080152B4
-	.incbin "baserom.gba", 0x0152B4, 0x00000DC
-
-gUnk_08015390:: @ 08015390
-	.incbin "baserom.gba", 0x015390, 0x000005C
-
-gUnk_080153EC:: @ 080153EC
-	.incbin "baserom.gba", 0x0153EC, 0x0000120
-
-gUnk_0801550C:: @ 0801550C
-	.incbin "baserom.gba", 0x01550C, 0x000010C
-
-gUnk_08015618:: @ 08015618
-	.incbin "baserom.gba", 0x015618, 0x000006C
-
-gUnk_08015684:: @ 08015684
-	.incbin "baserom.gba", 0x015684, 0x000001C
-
-gUnk_080156A0:: @ 080156A0
-	.incbin "baserom.gba", 0x0156A0, 0x00000B4
-
-gUnk_08015754:: @ 08015754
-	.incbin "baserom.gba", 0x015754, 0x0000058
-
-gUnk_080157AC:: @ 080157AC
-	.incbin "baserom.gba", 0x0157AC, 0x000014C
-
-gUnk_080158F8:: @ 080158F8
-	.incbin "baserom.gba", 0x0158F8, 0x0000040
-
-gUnk_08015938:: @ 08015938
-	.incbin "baserom.gba", 0x015938, 0x0000020
-
-gUnk_08015958:: @ 08015958
-	.incbin "baserom.gba", 0x015958, 0x000016C
-
-gUnk_08015AC4:: @ 08015AC4
-	.incbin "baserom.gba", 0x015AC4, 0x0000050
-
-gUnk_08015B14:: @ 08015B14
-	.incbin "baserom.gba", 0x015B14, 0x0000020
-
-gUnk_08015B34:: @ 08015B34
-	.incbin "baserom.gba", 0x015B34, 0x0000050
-
-gUnk_08015B84:: @ 08015B84
-	.incbin "baserom.gba", 0x015B84, 0x0000024
-
-gUnk_08015BA8:: @ 08015BA8
-	.incbin "baserom.gba", 0x015BA8, 0x0000040
-
-gUnk_08015BE8:: @ 08015BE8
-	.incbin "baserom.gba", 0x015BE8, 0x00000EC
-
-gUnk_08015CD4:: @ 08015CD4
-	.incbin "baserom.gba", 0x015CD4, 0x000011C
-
-gUnk_08015DF0:: @ 08015DF0
-	.incbin "baserom.gba", 0x015DF0, 0x0000068
-
-gUnk_08015E58:: @ 08015E58
-	.incbin "baserom.gba", 0x015E58, 0x00000B0
-
-gUnk_08015F08:: @ 08015F08
-	.incbin "baserom.gba", 0x015F08, 0x0000034
-
-gUnk_08015F3C:: @ 08015F3C
-	.incbin "baserom.gba", 0x015F3C, 0x0000068
-
-gUnk_08015FA4:: @ 08015FA4
-	.incbin "baserom.gba", 0x015FA4, 0x000001C
-
-gUnk_08015FC0:: @ 08015FC0
-	.incbin "baserom.gba", 0x015FC0, 0x0000061
-
-gUnk_08016021:: @ 08016021
-	.incbin "baserom.gba", 0x016021, 0x000000F
-
-.include "data/scripts/npc4e_fusion.inc"
-
-gUnk_0801606C:: @ 0801606C
-	.incbin "baserom.gba", 0x01606C, 0x000003C
-
-gUnk_080160A8:: @ 080160A8
-	.incbin "baserom.gba", 0x0160A8, 0x0000042
-
-gUnk_080160EA:: @ 080160EA
-	.incbin "baserom.gba", 0x0160EA, 0x0000052
-
-gUnk_0801613C:: @ 0801613C
-	.incbin "baserom.gba", 0x01613C, 0x0000054
-
-gUnk_08016190:: @ 08016190
-	.incbin "baserom.gba", 0x016190, 0x0000058
-
-gUnk_080161E8:: @ 080161E8
-	.incbin "baserom.gba", 0x0161E8, 0x0000174
-
-gUnk_0801635C:: @ 0801635C
-	.incbin "baserom.gba", 0x01635C, 0x0000021
-
-gUnk_0801637D:: @ 0801637D
-	.incbin "baserom.gba", 0x01637D, 0x0000007
-
-gUnk_08016384:: @ 08016384
-	.incbin "baserom.gba", 0x016384, 0x0000084
-
-gUnk_08016408:: @ 08016408
-	.incbin "baserom.gba", 0x016408, 0x00001F0
-
-gUnk_080165F8:: @ 080165F8
-	.incbin "baserom.gba", 0x0165F8, 0x0000014
-
-gUnk_0801660C:: @ 0801660C
-	.incbin "baserom.gba", 0x01660C, 0x000001C
-
-gUnk_08016628:: @ 08016628
-	.incbin "baserom.gba", 0x016628, 0x000001C
-
-gUnk_08016644:: @ 08016644
-	.incbin "baserom.gba", 0x016644, 0x0000028
-
-gUnk_0801666C:: @ 0801666C
-	.incbin "baserom.gba", 0x01666C, 0x000004C
-
-gUnk_080166B8:: @ 080166B8
-	.incbin "baserom.gba", 0x0166B8, 0x0000044
-
-gUnk_080166FC:: @ 080166FC
-	.incbin "baserom.gba", 0x0166FC, 0x000009C
-
-gUnk_08016798:: @ 08016798
-	.incbin "baserom.gba", 0x016798, 0x00000AC
-
-gUnk_08016844:: @ 08016844
-	.incbin "baserom.gba", 0x016844, 0x000009C
-
-gUnk_080168E0:: @ 080168E0
-	.incbin "baserom.gba", 0x0168E0, 0x0000014
-
-gUnk_080168F4:: @ 080168F4
-	.incbin "baserom.gba", 0x0168F4, 0x0000090
+    
+	.include "data/scripts/gUnk_08008B5C.inc"
+	.include "data/scripts/gUnk_08008D50.inc"
+	.include "data/scripts/gUnk_08008D8C.inc"
+	.include "data/scripts/gUnk_08008F74.inc"
+	.include "data/scripts/gUnk_08008FC0.inc"
+	.include "data/scripts/gUnk_08008FFC.inc"
+	.include "data/scripts/gUnk_0800903C.inc"
+	.include "data/scripts/gUnk_08009320.inc"
+	.include "data/scripts/gUnk_08009340.inc"
+	.include "data/scripts/gUnk_08009348.inc"
+	.include "data/scripts/gUnk_0800939A.inc"
+	.include "data/scripts/gUnk_08009464.inc"
+	.include "data/scripts/gUnk_080094CC.inc"
+	.include "data/scripts/gUnk_080094FC.inc"
+	.include "data/scripts/gUnk_080095F2.inc"
+	.include "data/scripts/gUnk_08009704.inc"
+	.include "data/scripts/gUnk_08009740.inc"
+	.include "data/scripts/gUnk_080097F0.inc"
+	.include "data/scripts/gUnk_08009838.inc"
+	.include "data/scripts/gUnk_0800987C.inc"
+	.include "data/scripts/gUnk_080098D4.inc"
+	.include "data/scripts/gUnk_08009918.inc"
+	.include "data/scripts/gUnk_08009950.inc"
+	.include "data/scripts/gUnk_080099DC.inc"
+	.include "data/scripts/gUnk_08009A34.inc"
+	.include "data/scripts/gUnk_08009A84.inc"
+	.include "data/scripts/gUnk_08009AF8.inc"
+	.include "data/scripts/gUnk_08009B30.inc"
+	.include "data/scripts/gUnk_08009B78.inc"
+	.include "data/scripts/gUnk_08009C68.inc"
+	.include "data/scripts/gUnk_08009CFC.inc"
+	.include "data/scripts/gUnk_08009D6C.inc"
+	.include "data/scripts/gUnk_08009DB0.inc"
+	.include "data/scripts/gUnk_08009E4E.inc"
+	.include "data/scripts/gUnk_08009E58.inc"
+	.include "data/scripts/gUnk_08009E80.inc"
+	.include "data/scripts/gUnk_08009E88.inc"
+	.include "data/scripts/gUnk_08009ECC.inc"
+	.include "data/scripts/gUnk_08009EF0.inc"
+	.include "data/scripts/gUnk_08009F14.inc"
+	.include "data/scripts/gUnk_0800A0B4.inc"
+	.include "data/scripts/gUnk_0800A0FC.inc"
+	.include "data/scripts/gUnk_0800A160.inc"
+	.include "data/scripts/gUnk_0800A1B4.inc"
+	.include "data/scripts/gUnk_0800A1D8.inc"
+	.include "data/scripts/gUnk_0800A310.inc"
+	.include "data/scripts/gUnk_0800A3D8.inc"
+	.include "data/scripts/gUnk_0800A500.inc"
+	.include "data/scripts/gUnk_0800A590.inc"
+	.include "data/scripts/gUnk_0800A638.inc"
+	.include "data/scripts/gUnk_0800A65C.inc"
+	.include "data/scripts/gUnk_0800A680.inc"
+	.include "data/scripts/gUnk_0800A6A4.inc"
+	.include "data/scripts/gUnk_0800A6D4.inc"
+	.include "data/scripts/gUnk_0800A704.inc"
+	.include "data/scripts/gUnk_0800A734.inc"
+	.include "data/scripts/gUnk_0800A764.inc"
+	.include "data/scripts/gUnk_0800A7E4.inc"
+	.include "data/scripts/gUnk_0800A964.inc"
+	.include "data/scripts/gUnk_0800A988.inc"
+	.include "data/scripts/gUnk_0800A9AC.inc"
+	.include "data/scripts/gUnk_0800A9D0.inc"
+	.include "data/scripts/gUnk_0800A9F4.inc"
+	.include "data/scripts/gUnk_0800AA48.inc"
+	.include "data/scripts/gUnk_0800AA6C.inc"
+	.include "data/scripts/gUnk_0800AA90.inc"
+	.include "data/scripts/gUnk_0800AAB4.inc"
+	.include "data/scripts/gUnk_0800AAD8.inc"
+	.include "data/scripts/gUnk_0800AB08.inc"
+	.include "data/scripts/gUnk_0800AB6E.inc"
+	.include "data/scripts/gUnk_0800ACBC.inc"
+	.include "data/scripts/gUnk_0800AEA4.inc"
+	.include "data/scripts/gUnk_0800AEDC.inc"
+	.include "data/scripts/gUnk_0800AF18.inc"
+	.include "data/scripts/gUnk_0800AF44.inc"
+	.include "data/scripts/gUnk_0800AF68.inc"
+	.include "data/scripts/gUnk_0800AF8C.inc"
+	.include "data/scripts/gUnk_0800AFB0.inc"
+	.include "data/scripts/gUnk_0800AFE8.inc"
+	.include "data/scripts/gUnk_0800B00C.inc"
+	.include "data/scripts/gUnk_0800B0AC.inc"
+	.include "data/scripts/gUnk_0800B0D0.inc"
+	.include "data/scripts/gUnk_0800B1C0.inc"
+	.include "data/scripts/gUnk_0800B200.inc"
+	.include "data/scripts/gUnk_0800B254.inc"
+	.include "data/scripts/gUnk_0800B308.inc"
+	.include "data/scripts/gUnk_0800B3A4.inc"
+	.include "data/scripts/gUnk_0800B41C.inc"
+	.include "data/scripts/gUnk_0800B4AC.inc"
+	.include "data/scripts/gUnk_0800B54C.inc"
+	.include "data/scripts/gUnk_0800B574.inc"
+	.include "data/scripts/gUnk_0800B5C4.inc"
+	.include "data/scripts/gUnk_0800B5EC.inc"
+	.include "data/scripts/gUnk_0800B6C8.inc"
+	.include "data/scripts/gUnk_0800B7FC.inc"
+	.include "data/scripts/gUnk_0800B828.inc"
+	.include "data/scripts/gUnk_0800B9B4.inc"
+	.include "data/scripts/gUnk_0800BACC.inc"
+	.include "data/scripts/gUnk_0800BB00.inc"
+	.include "data/scripts/gUnk_0800BB30.inc"
+	.include "data/scripts/gUnk_0800BB64.inc"
+	.include "data/scripts/gUnk_0800BBA4.inc"
+	.include "data/scripts/gUnk_0800BBDC.inc"
+	.include "data/scripts/gUnk_0800BC08.inc"
+	.include "data/scripts/gUnk_0800BC50.inc"
+	.include "data/scripts/gUnk_0800BCE8.inc"
+	.include "data/scripts/gUnk_0800BD78.inc"
+	.include "data/scripts/gUnk_0800BE1C.inc"
+	.include "data/scripts/gUnk_0800BECC.inc"
+	.include "data/scripts/gUnk_0800BF38.inc"
+	.include "data/scripts/gUnk_0800C004.inc"
+	.include "data/scripts/gUnk_0800C0B0.inc"
+	.include "data/scripts/gUnk_0800C160.inc"
+	.include "data/scripts/gUnk_0800C1D8.inc"
+	.include "data/scripts/gUnk_0800C2A4.inc"
+	.include "data/scripts/gUnk_0800C350.inc"
+	.include "data/scripts/gUnk_0800C370.inc"
+	.include "data/scripts/gUnk_0800C3B0.inc"
+	.include "data/scripts/gUnk_0800C3CC.inc"
+	.include "data/scripts/gUnk_0800C410.inc"
+	.include "data/scripts/gUnk_0800C45C.inc"
+	.include "data/scripts/gUnk_0800C494.inc"
+	.include "data/scripts/gUnk_0800C4D0.inc"
+	.include "data/scripts/gUnk_0800C50C.inc"
+	.include "data/scripts/gUnk_0800C550.inc"
+	.include "data/scripts/gUnk_0800C8F0.inc"
+	.include "data/scripts/gUnk_0800C91C.inc"
+	.include "data/scripts/gUnk_0800CA8C.inc"
+	.include "data/scripts/gUnk_0800CABC.inc"
+	.include "data/scripts/gUnk_0800CB54.inc"
+	.include "data/scripts/gUnk_0800CBD4.inc"
+	.include "data/scripts/gUnk_0800CC6C.inc"
+	.include "data/scripts/gUnk_0800CD04.inc"
+	.include "data/scripts/gUnk_0800CD7C.inc"
+	.include "data/scripts/gUnk_0800D1B4.inc"
+	.include "data/scripts/gUnk_0800D1E0.inc"
+	.include "data/scripts/gUnk_0800D218.inc"
+	.include "data/scripts/gUnk_0800D242.inc"
+	.include "data/scripts/gUnk_0800D24C.inc"
+	.include "data/scripts/gUnk_0800D254.inc"
+	.include "data/scripts/gUnk_0800D278.inc"
+	.include "data/scripts/gUnk_0800D414.inc"
+	.include "data/scripts/gUnk_0800D698.inc"
+	.include "data/scripts/gUnk_0800D6B4.inc"
+	.include "data/scripts/gUnk_0800D6D0.inc"
+	.include "data/scripts/gUnk_0800D6F0.inc"
+	.include "data/scripts/gUnk_0800D710.inc"
+	.include "data/scripts/gUnk_0800D76C.inc"
+	.include "data/scripts/gUnk_0800D84C.inc"
+	.include "data/scripts/gUnk_0800D874.inc"
+	.include "data/scripts/gUnk_0800D92C.inc"
+	.include "data/scripts/gUnk_0800D954.inc"
+	.include "data/scripts/gUnk_0800DA00.inc"
+	.include "data/scripts/gUnk_0800DA28.inc"
+	.include "data/scripts/gUnk_0800DA60.inc"
+	.include "data/scripts/gUnk_0800DB18.inc"
+	.include "data/scripts/gUnk_0800DB28.inc"
+	.include "data/scripts/gUnk_0800DB78.inc"
+	.include "data/scripts/gUnk_0800DC4C.inc"
+	.include "data/scripts/gUnk_0800DCAC.inc"
+	.include "data/scripts/gUnk_0800DDD0.inc"
+	.include "data/scripts/gUnk_0800DE00.inc"
+	.include "data/scripts/gUnk_0800DE2C.inc"
+	.include "data/scripts/gUnk_0800DE50.inc"
+	.include "data/scripts/gUnk_0800DE78.inc"
+	.include "data/scripts/gUnk_0800DEB0.inc"
+	.include "data/scripts/gUnk_0800DED4.inc"
+	.include "data/scripts/gUnk_0800DF24.inc"
+	.include "data/scripts/gUnk_0800DFB4.inc"
+	.include "data/scripts/gUnk_0800DFE4.inc"
+	.include "data/scripts/gUnk_0800E050.inc"
+	.include "data/scripts/gUnk_0800E094.inc"
+	.include "data/scripts/gUnk_0800E0BC.inc"
+	.include "data/scripts/gUnk_0800E504.inc"
+	.include "data/scripts/gUnk_0800E544.inc"
+	.include "data/scripts/gUnk_0800E58C.inc"
+	.include "data/scripts/gUnk_0800E5C4.inc"
+	.include "data/scripts/gUnk_0800E5D6.inc"
+	.include "data/scripts/gUnk_0800E600.inc"
+	.include "data/scripts/gUnk_0800E62C.inc"
+	.include "data/scripts/gUnk_0800E658.inc"
+	.include "data/scripts/gUnk_0800E684.inc"
+	.include "data/scripts/gUnk_0800E6B0.inc"
+	.include "data/scripts/gUnk_0800E8A4.inc"
+	.include "data/scripts/gUnk_0800E8D6.inc"
+	.include "data/scripts/gUnk_0800E908.inc"
+	.include "data/scripts/gUnk_0800EA1C.inc"
+	.include "data/scripts/gUnk_0800EA54.inc"
+	.include "data/scripts/gUnk_0800EF40.inc"
+	.include "data/scripts/gUnk_0800EF9C.inc"
+	.include "data/scripts/gUnk_0800EFC0.inc"
+	.include "data/scripts/gUnk_0800F14C.inc"
+	.include "data/scripts/gUnk_0800F184.inc"
+	.include "data/scripts/gUnk_0800F33C.inc"
+	.include "data/scripts/gUnk_0800F354.inc"
+	.include "data/scripts/gUnk_0800F36C.inc"
+	.include "data/scripts/gUnk_0800F384.inc"
+	.include "data/scripts/gUnk_0800F39C.inc"
+	.include "data/scripts/gUnk_0800F430.inc"
+	.include "data/scripts/gUnk_0800F4C4.inc"
+	.include "data/scripts/gUnk_0800F554.inc"
+	.include "data/scripts/gUnk_0800F724.inc"
+	.include "data/scripts/gUnk_0800FA54.inc"
+	.include "data/scripts/gUnk_0800FA78.inc"
+	.include "data/scripts/gUnk_0800FA9C.inc"
+	.include "data/scripts/gUnk_0800FAC0.inc"
+	.include "data/scripts/gUnk_0800FAE4.inc"
+	.include "data/scripts/gUnk_0800FB2C.inc"
+	.include "data/scripts/gUnk_0800FB44.inc"
+	.include "data/scripts/gUnk_0800FD0C.inc"
+	.include "data/scripts/gUnk_0800FDA0.inc"
+	.include "data/scripts/gUnk_0800FF18.inc"
+	.include "data/scripts/gUnk_0800FF74.inc"
+	.include "data/scripts/gUnk_080100C8.inc"
+	.include "data/scripts/gUnk_08010264.inc"
+	.include "data/scripts/gUnk_08010964.inc"
+	.include "data/scripts/gUnk_080109F0.inc"
+	.include "data/scripts/gUnk_08010A14.inc"
+	.include "data/scripts/gUnk_08010A38.inc"
+	.include "data/scripts/gUnk_08010A5C.inc"
+	.include "data/scripts/gUnk_08010A98.inc"
+	.include "data/scripts/gUnk_08010B68.inc"
+	.include "data/scripts/gUnk_08010BB4.inc"
+	.include "data/scripts/gUnk_08010E5A.inc"
+	.include "data/scripts/gUnk_08010F84.inc"
+	.include "data/scripts/gUnk_08011074.inc"
+	.include "data/scripts/gUnk_08011098.inc"
+	.include "data/scripts/gUnk_080110BC.inc"
+	.include "data/scripts/gUnk_080110E8.inc"
+	.include "data/scripts/gUnk_08011128.inc"
+	.include "data/scripts/gUnk_080111CC.inc"
+	.include "data/scripts/gUnk_080112C4.inc"
+	.include "data/scripts/gUnk_080113AA.inc"
+	.include "data/scripts/gUnk_08011442.inc"
+	.include "data/scripts/gUnk_08011508.inc"
+	.include "data/scripts/gUnk_080115D0.inc"
+	.include "data/scripts/gUnk_08011608.inc"
+	.include "data/scripts/gUnk_08011640.inc"
+	.include "data/scripts/gUnk_080116A8.inc"
+	.include "data/scripts/gUnk_0801183C.inc"
+	.include "data/scripts/gUnk_08011890.inc"
+	.include "data/scripts/gUnk_080118D4.inc"
+	.include "data/scripts/gUnk_08011930.inc"
+	.include "data/scripts/gUnk_08011940.inc"
+	.include "data/scripts/gUnk_0801194C.inc"
+	.include "data/scripts/gUnk_08011B20.inc"
+	.include "data/scripts/gUnk_08011B40.inc"
+	.include "data/scripts/gUnk_08011C50.inc"
+	.include "data/scripts/gUnk_08011C7C.inc"
+	.include "data/scripts/gUnk_0801232C.inc"
+	.include "data/scripts/gUnk_08012410.inc"
+	.include "data/scripts/gUnk_08012430.inc"
+	.include "data/scripts/gUnk_080126FC.inc"
+	.include "data/scripts/gUnk_08012AB0.inc"
+	.include "data/scripts/gUnk_08012AF0.inc"
+	.include "data/scripts/gUnk_08012B18.inc"
+	.include "data/scripts/gUnk_08012B24.inc"
+	.include "data/scripts/gUnk_08012B50.inc"
+	.include "data/scripts/gUnk_08012B7C.inc"
+	.include "data/scripts/gUnk_08012BA8.inc"
+	.include "data/scripts/gUnk_08012BF8.inc"
+	.include "data/scripts/gUnk_08012C48.inc"
+	.include "data/scripts/gUnk_08012C68.inc"
+	.include "data/scripts/gUnk_08012CD8.inc"
+	.include "data/scripts/gUnk_08012D18.inc"
+	.include "data/scripts/gUnk_08012D70.inc"
+	.include "data/scripts/gUnk_08012DB0.inc"
+	.include "data/scripts/gUnk_08012DD8.inc"
+	.include "data/scripts/gUnk_08012DF8.inc"
+	.include "data/scripts/gUnk_08012E20.inc"
+	.include "data/scripts/gUnk_08012E44.inc"
+	.include "data/scripts/gUnk_08012E88.inc"
+	.include "data/scripts/gUnk_08012F0C.inc"
+	.include "data/scripts/gUnk_08012F86.inc"
+	.include "data/scripts/gUnk_08013114.inc"
+	.include "data/scripts/gUnk_0801319A.inc"
+	.include "data/scripts/gUnk_080132E4.inc"
+	.include "data/scripts/gUnk_0801330C.inc"
+	.include "data/scripts/gUnk_08013330.inc"
+	.include "data/scripts/gUnk_0801334C.inc"
+	.include "data/scripts/gUnk_08013378.inc"
+	.include "data/scripts/gUnk_080133C4.inc"
+	.include "data/scripts/gUnk_080133F8.inc"
+	.include "data/scripts/gUnk_08013494.inc"
+	.include "data/scripts/gUnk_080134DC.inc"
+	.include "data/scripts/gUnk_08013650.inc"
+	.include "data/scripts/gUnk_080136B4.inc"
+	.include "data/scripts/gUnk_080136D8.inc"
+	.include "data/scripts/gUnk_08013720.inc"
+	.include "data/scripts/gUnk_080138B4.inc"
+	.include "data/scripts/gUnk_08013AA6.inc"
+	.include "data/scripts/gUnk_08013B18.inc"
+	.include "data/scripts/gUnk_08013BA8.inc"
+	.include "data/scripts/gUnk_08013BE8.inc"
+	.include "data/scripts/gUnk_08013CA4.inc"
+	.include "data/scripts/gUnk_08013D04.inc"
+	.include "data/scripts/gUnk_08013D44.inc"
+	.include "data/scripts/gUnk_08013D84.inc"
+	.include "data/scripts/gUnk_08013DC4.inc"
+	.include "data/scripts/gUnk_08013E04.inc"
+	.include "data/scripts/gUnk_08013E28.inc"
+	.include "data/scripts/gUnk_08013E4C.inc"
+	.include "data/scripts/gUnk_08013E70.inc"
+	.include "data/scripts/gUnk_08013E94.inc"
+	.include "data/scripts/gUnk_08013EB0.inc"
+	.include "data/scripts/gUnk_08013ECC.inc"
+	.include "data/scripts/gUnk_08013EE8.inc"
+	.include "data/scripts/gUnk_08013F04.inc"
+	.include "data/scripts/gUnk_08013F34.inc"
+	.include "data/scripts/gUnk_08013F64.inc"
+	.include "data/scripts/gUnk_08013F94.inc"
+	.include "data/scripts/gUnk_08013FE8.inc"
+	.include "data/scripts/gUnk_08014054.inc"
+	.include "data/scripts/gUnk_08014074.inc"
+	.include "data/scripts/gUnk_08014094.inc"
+	.include "data/scripts/gUnk_080140B8.inc"
+	.include "data/scripts/gUnk_080140DC.inc"
+	.include "data/scripts/gUnk_08014118.inc"
+	.include "data/scripts/gUnk_08014154.inc"
+	.include "data/scripts/gUnk_08014198.inc"
+	.include "data/scripts/gUnk_080141DC.inc"
+	.include "data/scripts/gUnk_08014210.inc"
+	.include "data/scripts/gUnk_08014248.inc"
+	.include "data/scripts/gUnk_080142B0.inc"
+	.include "data/scripts/gUnk_08014384.inc"
+	.include "data/scripts/gUnk_080143C0.inc"
+	.include "data/scripts/gUnk_08014450.inc"
+	.include "data/scripts/gUnk_0801450C.inc"
+	.include "data/scripts/gUnk_08014588.inc"
+	.include "data/scripts/gUnk_080145B0.inc"
+	.include "data/scripts/gUnk_080145E8.inc"
+	.include "data/scripts/gUnk_08014804.inc"
+	.include "data/scripts/gUnk_08014958.inc"
+	.include "data/scripts/gUnk_080149CC.inc"
+	.include "data/scripts/gUnk_08014A80.inc"
+	.include "data/scripts/gUnk_08014B34.inc"
+	.include "data/scripts/gUnk_08014CDC.inc"
+	.include "data/scripts/gUnk_08014DCC.inc"
+	.include "data/scripts/gUnk_08014E14.inc"
+	.include "data/scripts/gUnk_08015234.inc"
+	.include "data/scripts/gUnk_080152B4.inc"
+	.include "data/scripts/gUnk_080152DC.inc"
+	.include "data/scripts/gUnk_08015304.inc"
+	.include "data/scripts/gUnk_08015338.inc"
+	.include "data/scripts/gUnk_08015360.inc"
+	.include "data/scripts/gUnk_08015384.inc"
+	.include "data/scripts/gUnk_08015390.inc"
+	.include "data/scripts/gUnk_080153EC.inc"
+	.include "data/scripts/gUnk_0801548E.inc"
+	.include "data/scripts/gUnk_0801550C.inc"
+	.include "data/scripts/gUnk_080155F4.inc"
+	.include "data/scripts/gUnk_08015618.inc"
+	.include "data/scripts/gUnk_08015684.inc"
+	.include "data/scripts/gUnk_08015754.inc"
+	.include "data/scripts/gUnk_080157AC.inc"
+	.include "data/scripts/gUnk_080158F8.inc"
+	.include "data/scripts/gUnk_08015918.inc"
+	.include "data/scripts/gUnk_08015938.inc"
+	.include "data/scripts/gUnk_08015958.inc"
+	.include "data/scripts/gUnk_08015A7C.inc"
+	.include "data/scripts/gUnk_08015AA0.inc"
+	.include "data/scripts/gUnk_08015AC4.inc"
+	.include "data/scripts/gUnk_08015B14.inc"
+	.include "data/scripts/gUnk_08015B34.inc"
+	.include "data/scripts/gUnk_08015B84.inc"
+	.include "data/scripts/gUnk_08015BA8.inc"
+	.include "data/scripts/gUnk_08015BE8.inc"
+	.include "data/scripts/gUnk_08015C7C.inc"
+	.include "data/scripts/gUnk_08015CD4.inc"
+	.include "data/scripts/gUnk_08015DF0.inc"
+	.include "data/scripts/gUnk_08015E58.inc"
+	.include "data/scripts/gUnk_08015F08.inc"
+	.include "data/scripts/gUnk_08015F3C.inc"
+	.include "data/scripts/gUnk_08015F80.inc"
+	.include "data/scripts/gUnk_08015FA4.inc"
+	.include "data/scripts/gUnk_08015FC0.inc"
+	.include "data/scripts/gUnk_08016004.inc"
+	.include "data/scripts/gUnk_08016030.inc"
+	.include "data/scripts/gUnk_08016062.inc"
+	.include "data/scripts/gUnk_0801606C.inc"
+	.include "data/scripts/gUnk_0801609E.inc"
+	.include "data/scripts/gUnk_080160A8.inc"
+	.include "data/scripts/gUnk_0801637C.inc"
+	.include "data/scripts/gUnk_08016482.inc"
+	.include "data/scripts/gUnk_080165A4.inc"
diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc
deleted file mode 100644
index 01270dfa..00000000
--- a/data/scripts/ezlo_angry.inc
+++ /dev/null
@@ -1,231 +0,0 @@
-SCRIPT_START gUnk_080126FC
-StartScript
-SetEntityNonPlanarMovement 0x0040
-_0807EF80 0x0007
-StopScript
-_0807E930 0x0020
-WaitForSomething2 0x00000004
-_0807E930 0x0022
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x1102, 0x000c
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0021
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x1103,0x000c
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0011
-_0807E930 0x001c
-TextboxNoOverlapFollowPos 0x1105,0x000c
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0022
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x1106,0x000c
-_0807EA94 
-_0807E930 0x001c
-Call sub_0806D96C @ Ezlo Angry FX 
-TextboxNoOverlapFollowPos 0x1107,0x000c
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0021
-Call sub_0807F3C8 @ Ezlo Angry FX 
-TextboxNoOverlapFollowPos 0x1108,0x000c
-_0807EA94 
-_0807E930 0x001c
-Call sub_0806D96C @ Ezlo Angry FX 
-TextboxNoOverlapFollowPos 0x1109,0x000c
-_0807EA94 
-_0807E930 0x0020
-_0807EF80 0x000a
-_0807E9D4 
-_0807E5F8 0x00000008
-StopScript 
-StartScript 
-CheckRoomFlag 0x0000
-JumpIf 0x0028
-CheckEntityInteractType 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-Call sub_0806D944  @ Ezlo look at player
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x1114,0x000c
-_0807EA94 
-_0807E930 0x0020
-_0807E878 
-Jump 0xffd0
-_0807E864 
-_0807E9DC 
-CallWithArg sub_0807F5B0,0x0000003c
-Call sub_080791D0 
-StopScript 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x000b
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-Call sub_0806D944 @ Ezlo look at player
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x110a,0x000c
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x110b,0x000c
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x110c,0x000c
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x110d,0x000c
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x110e,0x000c
-_0807EA94 
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D908 
-_0807EC1C 0x0010
-_0807EF80 0x000a
-_0807E9D4 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-StopScript 
-StartScript 
-Call sub_0806D944 @ Ezlo look at player
-CheckEntityInteractType 
-JumpIf 0x000e
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0x0020
-Jump 0xffe6
-_0807E864 
-_0807E930 0x0010
-StopScript 
-TextboxNoOverlapFollowPos 0x1115,0x000c
-_0807EA94 
-_0807E930 0x0018
-_0807E878 
-Jump 0xffcc
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807EB8C 
-Call sub_0806D944 @ Ezlo look at player
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x110f,0x000c
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D908
-_0807EC1C 0x0050
-_0807EA94 
-Call sub_0807DF50 
-_0807E878 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-StopScript 
-StartScript 
-Call sub_0806D944 @ Ezlo look at player
-CheckEntityInteractType 
-JumpIf 0x000e
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0x0020
-Jump 0xffe6
-_0807E864 
-_0807E930 0x0010
-StopScript 
-TextboxNoOverlapFollowPos 0x1115,0x000c
-_0807EA94 
-_0807E930 0x0018
-_0807E878 
-Jump 0xffcc
-StopScript 
-_0807E864 
-Call sub_0807F9A4 
-Call sub_0807DF28 
-_0807EB8C 
-Call sub_0806D944  @ Ezlo look at player
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x1110,0x000c
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D908 
-_0807EC1C 0x0050
-_0807E930 0x0018
-_0807EA94 
-Call sub_0807DF50 
-_0807E878 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-StopScript 
-StartScript 
-Call sub_0806D944  @ Ezlo look at player
-CheckEntityInteractType 
-JumpIf 0x000e
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0x0020
-Jump 0xffe6
-_0807E864 
-_0807E930 0x0010
-StopScript 
-TextboxNoOverlapFollowPos 0x1115,0x000c
-_0807EA94 
-_0807E930 0x0018
-_0807E878 
-Jump 0xffcc
-StopScript 
-_0807E864 
-Call sub_0807F9A4 
-Call sub_0807DF28 
-SoundReq0x80100000 
-_0807EF80 0x000b
-_0807EB8C 
-Call sub_0806D944  @ Ezlo look at player
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x1111,0x000c
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D8A0 
-_0807EE30 
-JumpIfNot 0xfffc
-_0807E930 0x001f
-_0807EA94 
-StartPlayerScript 0x08012b18
-Call sub_0806D9A4 
-_0807EF80 0x0008
-Wait 0x0078
-SoundReq2 0x000e
-StartScript 
-_0807E8E4_2 
-_0807EB28 0x1112
-StopScript 
-_0807EA94 
-_0807E5F8 0x00000008
-_0807EF80 0x0006
-SCRIPT_END
\ No newline at end of file
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc
index 72bad7bf..d357d2c7 100644
--- a/data/scripts/gUnk_08008B5C.inc
+++ b/data/scripts/gUnk_08008B5C.inc
@@ -45,19 +45,19 @@ _0807EA94
 Call 0x0806ba35
 JumpIfNot 0x0066
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbb1d
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f2d5
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbb1d
 .short 0x0806
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806bb7d
 JumpIfNot 0x0048
 TextboxNoOverlap 0x490c
diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc
index 0cc0f291..2482561b 100644
--- a/data/scripts/gUnk_08008D8C.inc
+++ b/data/scripts/gUnk_08008D8C.inc
@@ -18,33 +18,33 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x080643d9
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffd2
 StartScript 
 SetEntityPositionRelative 0x00780088
@@ -74,10 +74,10 @@ _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1053
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc
index 48226d21..2b69830e 100644
--- a/data/scripts/gUnk_08008FC0.inc
+++ b/data/scripts/gUnk_08008FC0.inc
@@ -1,23 +1,23 @@
 SCRIPT_START gUnk_08008FC0
 _0807F078 0x0001, 0x0001
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf919
 .short 0x0807
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x0109
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x045f
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f305
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x0501
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000020
 Call 0x080791bd
diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc
index 09e886c8..e03d6144 100644
--- a/data/scripts/gUnk_0800903C.inc
+++ b/data/scripts/gUnk_0800903C.inc
@@ -28,29 +28,29 @@ WaitForSomething2 0x00000080
 _0807EB44 0x0004
 _0807ECC4 0x0008
 _0807E930 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1050
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1052
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EB44 0x0006
 _0807E930 0x0005
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1054
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
@@ -59,37 +59,37 @@ _0807EB44 0x0004
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1056
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1057
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1058
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x105c
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
@@ -110,10 +110,10 @@ StopScript
 WaitForSomething2 0x00000001
 _0807EB74 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x105b
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -125,10 +125,10 @@ WaitForSomething2 0x00000001
 _0807EF80 0x0005
 Wait 0x003c
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1051
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -138,10 +138,10 @@ Wait 0x003c
 _0807EB74 
 _0807EB8C 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1055
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -155,10 +155,10 @@ _0807EDD4 0x0098, 0x0078
 _0807EB74 
 _0807EF80 0x0000
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1059
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc
index 32e85c18..0a299c0c 100644
--- a/data/scripts/gUnk_08009B78.inc
+++ b/data/scripts/gUnk_08009B78.inc
@@ -18,10 +18,10 @@ _0807EB44 0x0006
 _0807EF80 0x0000
 Wait 0x000f
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1009
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807E8E4_1 
 _0807EA94 
 _0807EF80 0x0000
@@ -29,10 +29,10 @@ _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
 _0807EB8C 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x100b
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -51,10 +51,10 @@ _0807F034 0x0034
 WaitPlayerAction8 
 _0807E8E4_1 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x100c
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc
index 279008d7..d434771e 100644
--- a/data/scripts/gUnk_08009C68.inc
+++ b/data/scripts/gUnk_08009C68.inc
@@ -13,10 +13,10 @@ WaitForSomething2 0x00000004
 _0807EB74 
 _0807EB8C 
 _0807EF80 0x0001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x100a
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000008
@@ -25,10 +25,10 @@ _0807EB8C
 _0807EF80 0x0001
 _0807EB8C 
 _0807EB44 0x0002
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x100d
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EF80 0x0000
 _0807EDD4 0x0028, 0x0060
diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc
index 094db364..136cbddb 100644
--- a/data/scripts/gUnk_08009F14.inc
+++ b/data/scripts/gUnk_08009F14.inc
@@ -20,10 +20,10 @@ _0807EF80 0x000b
 StartPlayerScript 0x0800a088
 WaitForSomething2 0x00000002
 Call 0x0806014d
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1f01
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Wait 0x001e
 _0807F034 0x0065
@@ -41,23 +41,23 @@ StopScript
 _0807E864 
 Call 0x080602bd
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf971
 .short 0x0807
 .short 0x1f03
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x0008
 _0807E878 
 Jump 0xffd2
 Wait 0x0008
 SoundReq 0x0103
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x030d
 .short 0x0806
 .short 0x0063
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0008
 _0807E878 
 Jump 0xffb6
diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc
index 18dbea9f..c0b0e2fe 100644
--- a/data/scripts/gUnk_0800A0FC.inc
+++ b/data/scripts/gUnk_0800A0FC.inc
@@ -10,30 +10,30 @@ Call 0x0807fbfd
 SetEntityPositionRelative 0x005800b0
 Call 0x0807f845
 _0807E8E4_3 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf75d
 .short 0x0807
 .short 0x0060
 .short 0x00d0
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x4ae9
 .short 0x0809
 .short 0xa160
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x00f7
 _0807E778 0x0002
 DoFade6 
 StopScript 
 WaitFor_2 
 WaitForSomething2 0x00000004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0006
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc
index de6872cf..c1eed80f 100644
--- a/data/scripts/gUnk_0800A160.inc
+++ b/data/scripts/gUnk_0800A160.inc
@@ -5,18 +5,18 @@ _0807EF80 0x0007
 _0807EF80 0x000b
 _0807E930 0x0002
 SetEntityPositionRelative 0x008000b0
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf98d
 .short 0x0807
 .short 0x0000
 .short 0xff80
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xa1b4
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 SoundReq 0x0142
 _0807EF3C 0xff80, 0x0000
diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc
index 6600c6ee..94faff32 100644
--- a/data/scripts/gUnk_0800A1B4.inc
+++ b/data/scripts/gUnk_0800A1B4.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A1B4
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfff8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething 0x00000002
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc
index cc3d8c01..af9ee5cb 100644
--- a/data/scripts/gUnk_0800A1D8.inc
+++ b/data/scripts/gUnk_0800A1D8.inc
@@ -5,22 +5,22 @@ Call 0x0807df29
 SetEntityPositionRelative 0x00800088
 Call 0x0807f845
 _0807E8E4_3 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf75d
 .short 0x0807
 .short 0x0088
 .short 0x00a8
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
 StartPlayerScript 0x0800a310
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000080
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1659
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Wait 0x003c
 _0807E5F8 0x00000010
@@ -35,16 +35,16 @@ WaitForSomething2 0x00000040
 _0807E5F8 0x00000004
 Call 0x0807f3f9
 WaitForSomething2 0x00000080
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165a
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165b
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000040
@@ -59,16 +59,16 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000100
 _0807E5F8 0x00000006
 WaitForSomething2 0x000000c0
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165c
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SoundReq0x80100000 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165d
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000006
 WaitForSomething2 0x000000c0
@@ -78,11 +78,11 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000100
 SoundReq2 0x0008
 SoundReq 0x00f7
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0007
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc
index 817b5248..9a66158a 100644
--- a/data/scripts/gUnk_0800A310.inc
+++ b/data/scripts/gUnk_0800A310.inc
@@ -16,12 +16,12 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething2 0x00000002
 _0807E930 0x000e
@@ -42,12 +42,12 @@ _0807E930 0x000c
 Call 0x0807f2d5
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xa680
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000040
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc
index d40d23d2..baf3ae2c 100644
--- a/data/scripts/gUnk_0800A3D8.inc
+++ b/data/scripts/gUnk_0800A3D8.inc
@@ -28,12 +28,12 @@ WaitForSomething2 0x00000004
 _0807EB44 0x0004
 _0807EF80 0x0000
 SoundReq 0x0142
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xa638
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0143
@@ -44,44 +44,44 @@ Call 0x08066e69
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0142
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xa680
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0078
 SoundReq 0x0153
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfadd
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x000f
 SoundReq 0x0153
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfadd
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x000f
 SoundReq 0x0153
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfadd
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x003c
 SoundReq 0x0153
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfadd
 .short 0x0807
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x0143
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc
index dc6c9d71..9e32b976 100644
--- a/data/scripts/gUnk_0800A500.inc
+++ b/data/scripts/gUnk_0800A500.inc
@@ -9,12 +9,12 @@ StopScript
 WaitForSomething2 0x00000008
 SoundReq 0x0142
 _0807E610 0x00000800
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xa65c
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 _0807E930 0x0002
 Call 0x08094b0d
 _0807EDD4 0x0068, 0x0088
diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc
index 98c1b5c3..690fae45 100644
--- a/data/scripts/gUnk_0800A590.inc
+++ b/data/scripts/gUnk_0800A590.inc
@@ -6,30 +6,30 @@ _0807EF80 0x0008
 _0807EB44 0x0000
 Call 0x0807f715
 MoveEntityToPlayer 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf98d
 .short 0x0807
 .short 0x0000
 .short 0xfff0
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807E930 0x0023
 WaitForSomething2 0x00000010
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6e9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0007
 SoundReq 0x0142
 _0807E610 0x00000800
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xa65c
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 Wait 0x003c
 _0807EDD4 0x0088, 0x0068
 Wait 0x0078
diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc
index 534cd728..a4dfac37 100644
--- a/data/scripts/gUnk_0800A638.inc
+++ b/data/scripts/gUnk_0800A638.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A638
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfff8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething 0x00001000
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc
index c89dbee5..32196619 100644
--- a/data/scripts/gUnk_0800A65C.inc
+++ b/data/scripts/gUnk_0800A65C.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A65C
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfff8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething 0x00000800
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc
index 10446b80..2fe25d6c 100644
--- a/data/scripts/gUnk_0800A680.inc
+++ b/data/scripts/gUnk_0800A680.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A680
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfff8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething 0x00000020
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc
index f897621c..c0e906e3 100644
--- a/data/scripts/gUnk_0800A6A4.inc
+++ b/data/scripts/gUnk_0800A6A4.inc
@@ -7,11 +7,11 @@ Call 0x0807f845
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc
index f0ae3baf..55f88979 100644
--- a/data/scripts/gUnk_0800A6D4.inc
+++ b/data/scripts/gUnk_0800A6D4.inc
@@ -7,11 +7,11 @@ Call 0x0807f845
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0009
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc
index a4592ef8..82273794 100644
--- a/data/scripts/gUnk_0800A704.inc
+++ b/data/scripts/gUnk_0800A704.inc
@@ -7,11 +7,11 @@ Call 0x0807f845
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x000a
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc
index 88ff9225..533a2f6e 100644
--- a/data/scripts/gUnk_0800A734.inc
+++ b/data/scripts/gUnk_0800A734.inc
@@ -7,11 +7,11 @@ Call 0x0807f845
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x000b
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc
index 1d6be66a..ce8979e6 100644
--- a/data/scripts/gUnk_0800A764.inc
+++ b/data/scripts/gUnk_0800A764.inc
@@ -26,11 +26,11 @@ _0807E5F8 0x00000010
 Wait 0x0002
 _0807E5F8 0x00000020
 Wait 0x0078
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x000c
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc
index dad3a8c9..dc79100f 100644
--- a/data/scripts/gUnk_0800A7E4.inc
+++ b/data/scripts/gUnk_0800A7E4.inc
@@ -89,11 +89,11 @@ _0807E5F8 0x00000004
 Wait 0x000a
 _0807E5F8 0x00000008
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x000d
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc
index 4f706377..aadc8530 100644
--- a/data/scripts/gUnk_0800A9F4.inc
+++ b/data/scripts/gUnk_0800A9F4.inc
@@ -14,11 +14,11 @@ _0807E5F8 0x00000004
 Wait 0x001e
 _0807E5F8 0x00000008
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x000e
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc
index c2b67154..c58d8c55 100644
--- a/data/scripts/gUnk_0800AAD8.inc
+++ b/data/scripts/gUnk_0800AAD8.inc
@@ -7,11 +7,11 @@ Call 0x0807f845
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x000f
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc
index 5e5a5ba4..e6998808 100644
--- a/data/scripts/gUnk_0800AB08.inc
+++ b/data/scripts/gUnk_0800AB08.inc
@@ -5,38 +5,38 @@ Call 0x0807df29
 SetEntityPositionRelative 0x01480088
 Call 0x0807f845
 _0807E8E4_3 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6e9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf75d
 .short 0x0807
 .short 0x0088
 .short 0x00a8
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x00f7
 StopScript 
 Wait 0x0078
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x00780088
 Call 0x0807f5c1
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1664
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165e
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc
index c38d26b2..10079c59 100644
--- a/data/scripts/gUnk_0800AB6E.inc
+++ b/data/scripts/gUnk_0800AB6E.inc
@@ -8,34 +8,34 @@ WaitForSomething2 0x00000080
 SetEntityPosition 0x0000, 0xffe0
 Call 0x0807f5c1
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
 Wait 0x003c
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165f
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800acbc
 WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1660
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1661
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000008
 _0807E5F8 0x00000002
@@ -46,15 +46,15 @@ WaitForSomething2 0x00000010
 StartPlayerScript 0x0800ace0
 WaitForSomething2 0x00000001
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1662
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1663
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SetEntityPosition 0x0000, 0xffe0
 Call 0x0807f5c1
@@ -65,10 +65,10 @@ WaitForSomething2 0x00000004
 StartPlayerScript 0x0800ad54
 WaitForSomething2 0x00000001
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1665
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc
index 5ed4cc19..4ca8e27d 100644
--- a/data/scripts/gUnk_0800ACBC.inc
+++ b/data/scripts/gUnk_0800ACBC.inc
@@ -10,30 +10,30 @@ Call 0x080791bd
 .short 0x0000
 StartScript 
 Call 0x08094be1
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x045b
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x0109
 StopScript 
 Call 0x0807f305
 Wait 0x005a
 _0807E5F8 0x00000008
 StartScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6f9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x08e4
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Call 0x0807f305
 _0807EB44 0x0004
@@ -60,48 +60,48 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 _0807EF80 0x000b
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0004
 Wait 0x001e
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0006
 _0807EB44 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0014
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
 _0807E930 0x000c
@@ -113,12 +113,12 @@ _0807E930 0x000f
 Call 0x0807f2d5
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x60c5
 .short 0x0809
 .short 0xaf18
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 _0807E930 0x0012
 Call 0x0807f2d5
 Wait 0x001e
diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc
index 5ba38181..5cec6ff5 100644
--- a/data/scripts/gUnk_0800AF18.inc
+++ b/data/scripts/gUnk_0800AF18.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800AF18
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfff8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x0142
 StopScript 
 WaitForSomething 0x00000020
diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc
index 87034e69..36a64122 100644
--- a/data/scripts/gUnk_0800B0D0.inc
+++ b/data/scripts/gUnk_0800B0D0.inc
@@ -2,51 +2,51 @@ SCRIPT_START gUnk_0800B0D0
 StartScript 
 Call 0x0806bcd5
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbc95
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Call 0x0807f435
-_0807E078
+.short 0x1006 @ _0807E078 with 3 parameters
 .short 0xfff8
 .short 0x0004
 .short 0x0040
-@ End of 3 parameters
+@ End of parameters
 _0807E864 
 Call 0x0807df29
 Call 0x0807f2d5
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbc95
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806bce9
 _0807EA94 
 Call 0x0807df51
 _0807E878 
 Call 0x0806bcb9
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbc95
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffb6
 _0807E864 
 Call 0x0807df29
 Call 0x0807f2d5
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbc95
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f651
 _0807E9F0 
 JumpIfNot 0x0008
@@ -54,12 +54,12 @@ Call 0x0806bcc1
 Call 0x0807df51
 _0807E878 
 Call 0x0806bcb9
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbc95
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xff6e
 StartScript 
 Call 0x0807df29
diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc
index 79a61350..5a1ac270 100644
--- a/data/scripts/gUnk_0800B3A4.inc
+++ b/data/scripts/gUnk_0800B3A4.inc
@@ -22,41 +22,3 @@ Call 0x08065781
 Call 0x08065781
 Call 0x08065781
 Jump 0xffaa
-
-.globl gUnk_0800B41C
-gUnk_0800B41C:
-StartScript 
-SetEntityNonPlanarMovement 0x00c0
-_0807E908 0x0001
-_0807EF80 0x000b
-_0807E864 
-Call 0x0807fbc5
-StopScript 
-Wait 0x000a
-_0807EF80 0x0004
-_0807E5F8 0x00000008
-StartPlayerScript 0x0800b54c
-_0807EDD4 0x0140, 0x0298
-_0807EB74 
-WaitForSomething2 0x00000004
-_0807EB74 
-Wait 0x003c
-SoundReq 0x00cd
-_0807F088 0x0037
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlapFollow 0x200c
-_0807EA94 
-Wait 0x0014
-_0807EDD4 0x0158, 0x0290
-Wait 0x000a
-_0807EDD4 0x0158, 0x0288
-Wait 0x0014
-_0807E5F8 0x00000010
-_0807EDD4 0x0158, 0x0280
-Wait 0x000a
-_0807EF80 0x0008
-_0807E5F8 0x00000010
-_0807E5F8 0x00000008
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc
new file mode 100644
index 00000000..b128c6cc
--- /dev/null
+++ b/data/scripts/gUnk_0800B41C.inc
@@ -0,0 +1,36 @@
+SCRIPT_START gUnk_0800B41C
+StartScript 
+SetEntityNonPlanarMovement 0x00c0
+_0807E908 0x0001
+_0807EF80 0x000b
+_0807E864 
+Call 0x0807fbc5
+StopScript 
+Wait 0x000a
+_0807EF80 0x0004
+_0807E5F8 0x00000008
+StartPlayerScript 0x0800b54c
+_0807EDD4 0x0140, 0x0298
+_0807EB74 
+WaitForSomething2 0x00000004
+_0807EB74 
+Wait 0x003c
+SoundReq 0x00cd
+_0807F088 0x0037
+WaitPlayerAction8 
+_0807EB8C 
+TextboxNoOverlapFollow 0x200c
+_0807EA94 
+Wait 0x0014
+_0807EDD4 0x0158, 0x0290
+Wait 0x000a
+_0807EDD4 0x0158, 0x0288
+Wait 0x0014
+_0807E5F8 0x00000010
+_0807EDD4 0x0158, 0x0280
+Wait 0x000a
+_0807EF80 0x0008
+_0807E5F8 0x00000010
+_0807E5F8 0x00000008
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc
index dcf2a704..a55c7fa5 100644
--- a/data/scripts/gUnk_0800B5EC.inc
+++ b/data/scripts/gUnk_0800B5EC.inc
@@ -32,19 +32,19 @@ _0807E3E8
 JumpIfNot 0x002a
 Wait 0x000f
 TextboxNoOverlap 0x0584
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf971
 .short 0x0807
 .short 0x058b
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x001e
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x7425
 .short 0x0808
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00b4
 Jump 0x0024
 TextboxNoOverlap 0x057d
diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc
index 0f76ab54..a0d11f43 100644
--- a/data/scripts/gUnk_0800B6C8.inc
+++ b/data/scripts/gUnk_0800B6C8.inc
@@ -16,12 +16,12 @@ CheckLocalFlag 0x009f
 JumpIf 0x0098
 TextboxNoOverlap 0x057b
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf971
 .short 0x0807
 .short 0x057d
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0xff88
 _0807EA94 
 SetLocalFlag 0x009f
@@ -44,19 +44,19 @@ CheckLocalFlag 0x00a0
 JumpIf 0x0036
 TextboxNoOverlap 0x0580
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf971
 .short 0x0807
 .short 0x0582
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x0014
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x7425
 .short 0x0808
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00b4
 Jump 0xff14
 _0807EA94 
@@ -78,25 +78,25 @@ Jump 0xfee6
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x0090
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0x0024
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf465
 .short 0x0807
 .short 0x0078
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0090
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E8E4_0 
 _0807EF80 0x0000
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc
index 669aca86..0ca33ef1 100644
--- a/data/scripts/gUnk_0800B7FC.inc
+++ b/data/scripts/gUnk_0800B7FC.inc
@@ -1,16 +1,16 @@
 SCRIPT_START gUnk_0800B7FC
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0090
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf465
 .short 0x0807
 .short 0x0078
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffdc
 StartScript 
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc
index 3d432666..eaedc01b 100644
--- a/data/scripts/gUnk_0800B828.inc
+++ b/data/scripts/gUnk_0800B828.inc
@@ -50,12 +50,12 @@ _0807E9D4
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x4645
 .short 0x0806
 .short 0x464d
 .short 0x0806
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
 Call 0x080646a5
@@ -107,12 +107,12 @@ _0807EF80 0x0008
 Call 0x0806daad
 JumpIf 0x0036
 Call 0x0806dad1
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0005
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA4C 
 _0807E9F0 
diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc
index 1f5db32c..89181547 100644
--- a/data/scripts/gUnk_0800B9B4.inc
+++ b/data/scripts/gUnk_0800B9B4.inc
@@ -6,11 +6,11 @@ _0807EF80 0x000a
 Call 0x080694b1
 StopScript 
 Call 0x0807f435
-_0807E078
+.short 0x1006 @ _0807E078 with 3 parameters
 .short 0xfff8
 .short 0x0004
 .short 0x001e
-@ End of 3 parameters
+@ End of parameters
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc
index c882f9fb..9a1cf0bc 100644
--- a/data/scripts/gUnk_0800BC50.inc
+++ b/data/scripts/gUnk_0800BC50.inc
@@ -20,24 +20,24 @@ _0807EB44 0x0000
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0040
 _0807EF80 0x000d
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0378
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x003c
 _0807EF80 0x000c
 Wait 0x003c
 TextboxNoOverlap 0x0e09
 _0807EA94 
 Call 0x0807f159
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x035c
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 SoundReq 0x0188
 _0807EF80 0x0008
diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc
index 3f21250d..7457fad1 100644
--- a/data/scripts/gUnk_0800BD78.inc
+++ b/data/scripts/gUnk_0800BD78.inc
@@ -8,12 +8,12 @@ Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0270
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e0b
 _0807EA94 
@@ -26,19 +26,19 @@ _0807E5F8 0x00000004
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbf39
 .short 0x0804
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00b4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbf39
 .short 0x0804
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc
index 798e02bd..bb7dee5c 100644
--- a/data/scripts/gUnk_0800BECC.inc
+++ b/data/scripts/gUnk_0800BECC.inc
@@ -8,12 +8,12 @@ Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x01b8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e0e
 _0807EA94 
diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc
index 601bb052..98a48044 100644
--- a/data/scripts/gUnk_0800C004.inc
+++ b/data/scripts/gUnk_0800C004.inc
@@ -8,12 +8,12 @@ Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x01b8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e11
 _0807EA94 
@@ -28,19 +28,19 @@ _0807E5F8 0x0000001c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbf39
 .short 0x0804
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00b4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbf39
 .short 0x0804
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc
index 00822a1e..8c949edf 100644
--- a/data/scripts/gUnk_0800C160.inc
+++ b/data/scripts/gUnk_0800C160.inc
@@ -8,12 +8,12 @@ Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0128
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e14
 _0807EA94 
diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc
index a70e1354..d348c940 100644
--- a/data/scripts/gUnk_0800C2A4.inc
+++ b/data/scripts/gUnk_0800C2A4.inc
@@ -8,12 +8,12 @@ Call 0x0807f349
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0128
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 TextboxNoOverlap 0x0e17
 _0807EA94 
@@ -28,19 +28,19 @@ _0807E5F8 0x0000007c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbf39
 .short 0x0804
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00b4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xbf39
 .short 0x0804
 .short 0x0005
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc
index 09f24bd4..d800529d 100644
--- a/data/scripts/gUnk_0800C350.inc
+++ b/data/scripts/gUnk_0800C350.inc
@@ -1,11 +1,11 @@
 SCRIPT_START gUnk_0800C350
 StartScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xd659
 .short 0x0806
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SetEntityNonPlanarMovement 0x0200
 StopScript 
 CheckRoomFlag 0x00ff
diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc
index eed6a726..f0742594 100644
--- a/data/scripts/gUnk_0800C3CC.inc
+++ b/data/scripts/gUnk_0800C3CC.inc
@@ -4,20 +4,20 @@ Call 0x0806d661
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0048
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806d66d
 Wait 0x000f
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0068
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806d67d
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc
index 765f1946..e3cb11f4 100644
--- a/data/scripts/gUnk_0800C410.inc
+++ b/data/scripts/gUnk_0800C410.inc
@@ -4,20 +4,20 @@ Call 0x0806d661
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0048
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806d66d
 Wait 0x000f
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0068
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806d67d
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc
index 3c4413b3..b75b34d1 100644
--- a/data/scripts/gUnk_0800CD7C.inc
+++ b/data/scripts/gUnk_0800CD7C.inc
@@ -199,10 +199,10 @@ WaitForSomething2 0x00000008
 _0807EB74 
 _0807E914 0x00000000
 Call 0x0806c029
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x125c
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800d1b4
 WaitForSomething2 0x00000008
@@ -213,10 +213,10 @@ Wait 0x000f
 _0807E5F8 0x00000020
 StartPlayerScript 0x0800d1e0
 WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x125d
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 Jump 0x00e6
 CheckLocalFlag 0x007e
 JumpIfNot 0x000a
@@ -231,10 +231,10 @@ WaitForSomething2 0x00000004
 _0807EB74 
 _0807E914 0x00000000
 Call 0x0806c029
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x123d
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800d1b4
 WaitForSomething2 0x00000008
@@ -248,10 +248,10 @@ JumpIf 0xfffa
 SoundReq 0x00f8
 _0807E5F8 0x00000010
 SetLocalFlag 0x007e
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x123e
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Wait 0x000f
 _0807E930 0x0009
@@ -260,10 +260,10 @@ WaitForSomething2 0x00000004
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 Wait 0x001e
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x123f
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc
index 7a917f09..db9279e7 100644
--- a/data/scripts/gUnk_0800D1E0.inc
+++ b/data/scripts/gUnk_0800D1E0.inc
@@ -1,18 +1,18 @@
 SCRIPT_START gUnk_0800D1E0
 _0807F078 0x0002, 0x0001
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf919
 .short 0x0807
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x0109
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x01e2
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f305
 TextboxNoOverlap 0x0502
 _0807EA94 
diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc
index 9bf015eb..4d240ac4 100644
--- a/data/scripts/gUnk_0800D414.inc
+++ b/data/scripts/gUnk_0800D414.inc
@@ -46,13 +46,13 @@ _0807EF80 0x0000
 StopScript 
 Call 0x08062699
 Call 0x080626ad
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf0ed
 .short 0x0807
 .short 0x0009
 .short 0x0000
-@ End of 4 parameters
-_0807E078
+@ End of parameters
+.short 0x2806 @ _0807E078 with 9 parameters
 .short 0x0012
 .short 0x001a
 .short 0x0022
@@ -62,7 +62,7 @@ _0807E078
 .short 0x0042
 .short 0x004a
 .short 0x0052
-@ End of 9 parameters
+@ End of parameters
 _0807EE04 0x0038, 0x0068
 Jump 0x004e
 _0807EE04 0x0078, 0x0068
@@ -104,18 +104,18 @@ _0807EF80 0x0000
 StopScript 
 Call 0x08062699
 Call 0x080626ad
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf0ed
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
-_0807E078
+@ End of parameters
+.short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0008
 .short 0x0010
 .short 0x0018
 .short 0x0020
-@ End of 4 parameters
+@ End of parameters
 _0807EE04 0x0038, 0x0098
 Jump 0x001c
 _0807EE04 0x0058, 0x0098
@@ -138,12 +138,12 @@ _0807EF80 0x0008
 Call 0x0806daad
 JumpIf 0x008c
 Call 0x0806dad1
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA4C 
 _0807E9F0 
diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc
index 6203909c..e0742a70 100644
--- a/data/scripts/gUnk_0800D76C.inc
+++ b/data/scripts/gUnk_0800D76C.inc
@@ -10,12 +10,12 @@ WaitForSomething2 0x00000008
 _0807EF80 0x0004
 Wait 0x003c
 SoundReq 0x0123
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf465
 .short 0x0807
 .short 0x01e0
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x01e0, 0x01d8
 _0807EB44 0x0002
 _0807EF80 0x0000
@@ -44,12 +44,12 @@ _0807EF80 0x000e
 Call 0x0806ca5d
 SetEntity0x20 0x00040000
 SoundReq 0x00f5
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8d1
 .short 0x0807
 .short 0xe000
 .short 0xffff
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f8bd
 JumpIf 0xffee
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc
index 4796cf09..27438ec7 100644
--- a/data/scripts/gUnk_0800DA60.inc
+++ b/data/scripts/gUnk_0800DA60.inc
@@ -15,25 +15,25 @@ CameraTargetEntity
 Call 0x0807f5c1
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x162d
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000001
 Wait 0x001e
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x162e
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E8E4_0 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf75d
 .short 0x0807
 .short 0x0138
 .short 0x0078
-@ End of 4 parameters
+@ End of parameters
 _0807F0B4 0x0004
 CameraTargetPlayer 
 Call 0x0807f5c1
diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc
index e3ef98fb..16d39429 100644
--- a/data/scripts/gUnk_0800DB78.inc
+++ b/data/scripts/gUnk_0800DB78.inc
@@ -1,12 +1,12 @@
 SCRIPT_START gUnk_0800DB78
 StartScript 
 StopScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x00a0
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0xfff4
 _0807E864 
 Call 0x0807f9a5
@@ -37,10 +37,10 @@ WaitForSomething2 0x00000002
 _0807E5F8 0x00000001
 StartPlayerScript 0x0800de00
 WaitForSomething2 0x00000006
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1643
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EB28 0x1645
 _0807EA94 
@@ -48,10 +48,10 @@ Call 0x0807f3f9
 _0807E5F8 0x00000001
 SoundReq0x80100000 
 Call 0x08094f99
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc
index 0bcebd35..7af83bdf 100644
--- a/data/scripts/gUnk_0800DC4C.inc
+++ b/data/scripts/gUnk_0800DC4C.inc
@@ -11,20 +11,20 @@ CameraTargetPlayer
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
 SetLocalFlag 0x0079
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc
index 64b1df99..efac71a8 100644
--- a/data/scripts/gUnk_0800DCAC.inc
+++ b/data/scripts/gUnk_0800DCAC.inc
@@ -4,12 +4,12 @@ _0807EF80 0x000a
 Call 0x08066e39
 StopScript 
 WaitForSomething2 0x00000001
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8e9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000002
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc
index a87382da..927ff8b7 100644
--- a/data/scripts/gUnk_0800DDD0.inc
+++ b/data/scripts/gUnk_0800DDD0.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800DDD0
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x00a0
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0078, 0x00a0
 _0807EB44 0x0000
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc
index 3d9860e0..9ba2ce82 100644
--- a/data/scripts/gUnk_0800DE50.inc
+++ b/data/scripts/gUnk_0800DE50.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800DE50
 StopScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x03c5
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f305
 _0807E5F8 0x00000004
 Call 0x080791bd
diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc
index 86f06c8d..1a3b4d98 100644
--- a/data/scripts/gUnk_0800DF24.inc
+++ b/data/scripts/gUnk_0800DF24.inc
@@ -19,10 +19,10 @@ Call 0x0807f5c1
 Call 0x08066c95
 Wait 0x00e9
 _0807EF80 0x0007
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x162f
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SoundReq2 0x002f
 _0807EF80 0x0019
diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc
index c1f2c298..547f691a 100644
--- a/data/scripts/gUnk_0800DFB4.inc
+++ b/data/scripts/gUnk_0800DFB4.inc
@@ -6,12 +6,12 @@ SoundReq0x80100000
 _0807E864 
 Call 0x0807df29
 SoundReq 0x00f6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc
index 0c9cbd6c..0aa011b3 100644
--- a/data/scripts/gUnk_0800DFE4.inc
+++ b/data/scripts/gUnk_0800DFE4.inc
@@ -4,10 +4,10 @@ Call 0x0807df29
 _0807E864 
 StopScript 
 SoundReq0x80100000 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1632
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SetRoomFlag 0x0003
 CheckRoomFlag 0x0000
@@ -20,19 +20,19 @@ JumpIfNot 0xfffa
 _0807E864 
 Call 0x0807df29
 SetLocalFlag 0x007b
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1639
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Wait 0x0096
 SoundReq 0x00f6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0005
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc
index aada138e..30634329 100644
--- a/data/scripts/gUnk_0800E0BC.inc
+++ b/data/scripts/gUnk_0800E0BC.inc
@@ -5,12 +5,12 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0093
 JumpIf 0x0062
 _0807E930 0x0008
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8e9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -53,12 +53,12 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0094
 JumpIf 0x006c
 _0807E930 0x0010
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8e9
 .short 0x0807
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckRoomFlag 0x0001
 JumpIfNot 0xfffa
@@ -78,22 +78,22 @@ Wait 0x001e
 _0807EF80 0x0000
 _0807EB8C 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x000a
 TextboxNoOverlap 0x2401
 _0807EA94 
 SetLocalFlag 0x0094
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E9D4 
 _0807E878 
 StopScript 
@@ -101,12 +101,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlap 0x2401
 _0807EA94 
 _0807E878 
@@ -120,23 +120,23 @@ JumpIfNot 0x001e
 _0807E9D4 
 SetEntityPositionRelative 0x01680070
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Jump 0x00fe
 CheckLocalFlag 0x0095
 JumpIf 0x0062
 _0807E930 0x0010
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8e9
 .short 0x0807
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckRoomFlag 0x0002
 JumpIfNot 0xfffa
@@ -156,20 +156,20 @@ Wait 0x001e
 _0807EF80 0x0000
 _0807EB8C 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SetLocalFlag 0x0095
 _0807EF80 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E9D4 
 _0807E878 
 StopScript 
@@ -187,38 +187,38 @@ _0807E9DC
 SetLocalFlag 0x0073
 StopScript 
 _0807EB44 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0088, 0x0168
 _0807EB44 0x0006
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0070, 0x0168
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E9D4 
 Jump 0x001e
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 TextboxNoOverlap 0x2404
 _0807EA94 
@@ -228,12 +228,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlap 0x2403
 _0807EA94 
 _0807E878 
@@ -247,12 +247,12 @@ JumpIf 0x0088
 CheckLocalFlag 0x0096
 JumpIf 0x0056
 _0807E930 0x000c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8e9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -315,12 +315,12 @@ _0807E878
 Jump 0xffe8
 StartScript 
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x000a
 _0807E9D4 
 StopScript 
@@ -328,24 +328,24 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlap 0x2405
 _0807EA94 
 _0807E878 
 Jump 0xffe2
 StartScript 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x000a
 _0807E9D4 
 StopScript 
@@ -353,12 +353,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlap 0x2407
 _0807EA94 
 _0807E878 
diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc
index 033b40e7..de8e1873 100644
--- a/data/scripts/gUnk_0800E6B0.inc
+++ b/data/scripts/gUnk_0800E6B0.inc
@@ -48,12 +48,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806afe9
 _0807EA94 
 _0807E878 
@@ -86,12 +86,12 @@ _0807E878
 Jump 0xffd0
 _0807EF80 0x000f
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806af71
 _0807EE04 0x0188, 0x0058
 StopScript 
@@ -129,41 +129,41 @@ _0807E864
 _0807EB44 0x0004
 StartScript 
 TextboxNoOverlapFollow 0x4501
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x0032
 .short 0x0001
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x00c8
 .short 0x0002
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x0190
 .short 0x0003
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA94 
 _0807EB38 
-_0807E078
+.short 0x1406 @ _0807E078 with 4 parameters
 .short 0x00a6
 .short 0x006a
 .short 0x0036
 .short 0x0002
-@ End of 4 parameters
+@ End of parameters
 StartScript 
 TextboxNoOverlapFollow 0x4505
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x0190
 .short 0x0001
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA94 
 HasRupees 0x0190
diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc
index b9d52ee1..84790e70 100644
--- a/data/scripts/gUnk_0800E8A4.inc
+++ b/data/scripts/gUnk_0800E8A4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START gUnk_0800E8A4
 StartScript 
 TextboxNoOverlapFollow 0x4504
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x00c8
 .short 0x0001
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA94 
 HasRupees 0x00c8
diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc
index 0a1f03a1..07bd962f 100644
--- a/data/scripts/gUnk_0800E8D6.inc
+++ b/data/scripts/gUnk_0800E8D6.inc
@@ -1,12 +1,12 @@
 SCRIPT_START gUnk_0800E8D6
 StartScript 
 TextboxNoOverlapFollow 0x4503
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x0032
 .short 0x0001
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA94 
 HasRupees 0x0032
diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc
index f3bbc0c5..8ad06ddd 100644
--- a/data/scripts/gUnk_0800EA54.inc
+++ b/data/scripts/gUnk_0800EA54.inc
@@ -9,12 +9,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f2d5
 _0807E930 0x0009
 Call 0x0806ce81
@@ -36,12 +36,12 @@ JumpIfNot 0xfffc
 StartScript 
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xc029
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Call 0x0806c00d
 JumpIfNot 0xfff8
@@ -166,12 +166,12 @@ Jump 0xffe4
 .short 0x0000
 StartScript 
 _0807E9D4 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x1fb9
 .short 0x0806
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SetEntityNonPlanarMovement 0x0040
 _0807EF80 0x000a
 _0807EB44 0x0004
@@ -203,23 +203,23 @@ Call 0x080639d1
 _0807EF80 0x000a
 StopScript 
 StartScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x3851
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x3851
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08063945
 _0807EA94 
 JumpIfNot 0x0008
@@ -227,12 +227,12 @@ _0807F050 0x0070
 WaitPlayerAction8 
 _0807E878 
 Call 0x08063875
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x3851
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffc6
 StartScript 
 Call 0x08064cc1
@@ -286,12 +286,12 @@ Jump 0xff88
 StopScript 
 WaitForSomething2 0x00000002
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitForSomething2 0x00000004
 Call 0x0806aed9
 WaitForSomething2 0x00000008
@@ -337,12 +337,12 @@ Jump 0xff88
 StopScript 
 WaitForSomething2 0x00000010
 _0807EB44 0x0006
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitForSomething2 0x00000020
 Call 0x0806aed9
 WaitForSomething2 0x00000040
diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc
index e9c5bd82..b476d6be 100644
--- a/data/scripts/gUnk_0800EFC0.inc
+++ b/data/scripts/gUnk_0800EFC0.inc
@@ -8,69 +8,69 @@ JumpIf 0x00b0
 StopScript 
 Jump 0x0026
 _0807EB44 0x0006
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0088, 0x0040
 _0807EF80 0x000a
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 _0807EB44 0x0006
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 _0807EB44 0x0006
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0068, 0x0040
 _0807EF80 0x000a
 CheckLocalFlag 0x007b
@@ -94,27 +94,27 @@ StartPlayerScript 0x0800f14c
 WaitForSomething2 0x00000001
 _0807E5F8 0x0000001e
 WaitForSomething2 0x00000040
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1201
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 WaitForSomething2 0x000003c0
 _0807E8E4_0 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1202
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807F034 0x0067
 WaitPlayerAction8 
 _0807E8E4_0 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000040
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1203
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 Call 0x0807df51
diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc
index 48f4ed28..d114d67c 100644
--- a/data/scripts/gUnk_0800F184.inc
+++ b/data/scripts/gUnk_0800F184.inc
@@ -22,12 +22,12 @@ _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
 StopScript 
 StartScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf681
 .short 0x0807
 .short 0x01c0
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x0034
 StopScript 
 _0807E864 
@@ -36,21 +36,21 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1206
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800f33c
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xffbe
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf681
 .short 0x0807
 .short 0x0230
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0x0034
 StopScript 
 _0807E864 
@@ -59,21 +59,21 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1206
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800f354
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xff7e
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x0310
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x0034
 StopScript 
 _0807E864 
@@ -82,21 +82,21 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1206
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800f36c
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xff3e
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x0340
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0x0034
 StopScript 
 _0807E864 
@@ -105,10 +105,10 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1206
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800f384
 WaitForSomething2 0x00000400
@@ -124,10 +124,10 @@ StopScript
 _0807E864 
 _0807EB74 
 _0807E930 0x0008
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1208
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E878 
 Jump 0xfed4
diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc
index bf854ed0..20dda5af 100644
--- a/data/scripts/gUnk_0800F554.inc
+++ b/data/scripts/gUnk_0800F554.inc
@@ -33,23 +33,23 @@ StartScript
 _0807EB44 0x0006
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08064429
 _0807EA94 
 _0807E878 
@@ -66,12 +66,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlap 0x2511
 _0807EA94 
 Wait 0x000f
@@ -120,12 +120,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 CheckLocalFlag 0x00cd
 JumpIf 0x000a
 TextboxNoOverlap 0x2512
@@ -134,12 +134,12 @@ TextboxNoOverlap 0x251f
 _0807EA94 
 Wait 0x000f
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffc4
 .short 0x0000
 StartScript 
diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc
index 1ded33f7..cb0748e3 100644
--- a/data/scripts/gUnk_0800F724.inc
+++ b/data/scripts/gUnk_0800F724.inc
@@ -26,10 +26,10 @@ SetEntityPositionRelative 0x036800c8
 Call 0x0807f5c1
 WaitForSomething2 0x00000001
 WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2501
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -45,10 +45,10 @@ StartPlayerScript 0x0800fa78
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2503
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -61,10 +61,10 @@ StartPlayerScript 0x0800fa9c
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2504
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -77,10 +77,10 @@ StartPlayerScript 0x0800fac0
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2505
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -95,10 +95,10 @@ Wait 0x001e
 _0807E8E4_0 
 Call 0x0807f3f9
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1021
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800fae4
 SetEntityPositionRelative 0x025800f0
@@ -107,71 +107,71 @@ CameraTargetEntity
 Wait 0x001e
 Call 0x08063c2d
 WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1022
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E8E4_0 
 Call 0x08063c15
 Call 0x08094cdd
 Wait 0x001e
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1023
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x08063c15
 Call 0x08094dd9
 Wait 0x001e
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1024
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x08063c15
 Call 0x08094d35
 Wait 0x001e
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1025
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x08063c5d
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1026
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 _0807E8E4_1 
 Call 0x08063c2d
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1027
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x08063c75
 Wait 0x003c
 Call 0x08063c15
 _0807E8E4_0 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1028
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E8E4_1 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1029
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E8E4_0 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x102a
 .short 0x000e
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x08063c15
 Call 0x08094d71
@@ -186,43 +186,43 @@ Wait 0x001e
 _0807E8E4_1 
 Call 0x0807f3f9
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x102b
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807F034 0x000d
 WaitPlayerAction8 
 Call 0x0806dc3d
 Call 0x080791bd
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf245
 .short 0x0807
 .short 0x000d
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E914 0x000000ff
 Call 0x0807f5b1
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x49d6
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00b7
 _0807E914 0x00000000
 Call 0x0807f5b1
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x102c
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806dc59
 _0807F0B4 0x0004
 CameraTargetPlayer 
diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc
index adc95fc2..8075ddaa 100644
--- a/data/scripts/gUnk_0800FAE4.inc
+++ b/data/scripts/gUnk_0800FAE4.inc
@@ -3,24 +3,24 @@ StartScript
 SetEntityNonPlanarMovement 0x0100
 StopScript 
 Call 0x0807f585
-_0807E078
+.short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0012
 .short 0x001a
 .short 0x000e
 .short 0x0002
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x027c
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf465
 .short 0x0807
 .short 0x00e8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x00e8, 0x0270
 _0807EB44 0x0000
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc
index fbf7f336..1522960f 100644
--- a/data/scripts/gUnk_0800FD0C.inc
+++ b/data/scripts/gUnk_0800FD0C.inc
@@ -8,10 +8,10 @@ CheckLocalFlag 0x00cd
 JumpIf 0x0030
 _0807E864 
 Call 0x0807f9a5
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2506
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800fd80
 WaitForSomething2 0x00000008
@@ -21,10 +21,10 @@ CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
 JumpIfNot 0xfff6
 _0807E864 
 Call 0x0807f9a5
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x106c
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x0800fd80
 WaitForSomething2 0x00000008
diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc
index 74256346..67e2c4fe 100644
--- a/data/scripts/gUnk_0800FDA0.inc
+++ b/data/scripts/gUnk_0800FDA0.inc
@@ -83,12 +83,12 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 StopScript 
 StartScript 
@@ -99,12 +99,12 @@ JumpIfNot 0xffee
 StopScript 
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08064429
 _0807EA94 
 Wait 0x000f
diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc
index bf31cb48..e152daba 100644
--- a/data/scripts/gUnk_0800FF18.inc
+++ b/data/scripts/gUnk_0800FF18.inc
@@ -4,12 +4,12 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 StopScript 
 StartScript 
@@ -20,12 +20,12 @@ JumpIfNot 0xffee
 StopScript 
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08064429
 _0807EA94 
 Wait 0x000f
diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc
index e990d07e..d1f5a7a9 100644
--- a/data/scripts/gUnk_0800FF74.inc
+++ b/data/scripts/gUnk_0800FF74.inc
@@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800FF74
 StartScript 
 _0807EB44 0x0002
 _0807E9D4 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x080644a5
 ClearLocalFlag 0x00c7
 StopScript 
@@ -31,12 +31,12 @@ StopScript
 SetLocalFlag 0x00c7
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 CheckInventory1 0x0048
 JumpIf 0x000c
 TextboxNoOverlap 0x3401
@@ -55,39 +55,39 @@ _0807E888
 Call 0x0807f595
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x00cd
 TextboxNoOverlap 0x340a
 _0807EA94 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x000c
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SetEntityNonPlanarMovement 0x0100
 _0807EDD4 0x0018, 0x0108
 _0807EB44 0x0002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SetLocalFlag 0x00ce
 Call 0x080644a5
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf5b1
 .short 0x0807
 .short 0x000a
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E878 
 Jump 0xff1e
 .short 0x0000
@@ -95,34 +95,34 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x72b1
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x72b1
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlapFollow 0x0a01
 _0807EA94 
 Wait 0x000f
 _0807E878 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x72b1
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffd0
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc
index 186fda84..26079488 100644
--- a/data/scripts/gUnk_080100C8.inc
+++ b/data/scripts/gUnk_080100C8.inc
@@ -48,22 +48,22 @@ _0807E864
 _0807EB74 
 CheckRoomFlag 0x0001
 JumpIf 0x0034
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x3001
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x002e
 Call 0x080a1609
 _0807EA94 
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x1551
 .short 0x080a
 .short 0x01ac
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0xffca
 SoundReq2 0x0015
 SetRoomFlag 0x0001
@@ -79,21 +79,21 @@ StopScript
 Call 0x080a1271
 _0807E864 
 Call 0x0807df29
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x3004
 .short 0x0007
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SoundReq0x80100000 
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf75d
 .short 0x0807
 .short 0x0378
 .short 0x0340
-@ End of 4 parameters
+@ End of parameters
 Call 0x080791bd
 Call 0x0807fb75
 _0807E8E4_1 
@@ -119,12 +119,12 @@ _0807EA94
 Call 0x080a14a9
 Call 0x0807df51
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf5b1
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 ClearRoomFlag 0x0001
 Call 0x080a169d
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc
index 60243475..cb9e58ba 100644
--- a/data/scripts/gUnk_08010264.inc
+++ b/data/scripts/gUnk_08010264.inc
@@ -58,13 +58,13 @@ StopScript
 StopScript 
 Call 0x08062699
 Call 0x080626ad
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf0ed
 .short 0x0807
 .short 0x0009
 .short 0x0000
-@ End of 4 parameters
-_0807E078
+@ End of parameters
+.short 0x2806 @ _0807E078 with 9 parameters
 .short 0x0012
 .short 0x001a
 .short 0x0022
@@ -74,7 +74,7 @@ _0807E078
 .short 0x0042
 .short 0x004a
 .short 0x0052
-@ End of 9 parameters
+@ End of parameters
 _0807EE04 0x0358, 0x0078
 Jump 0x004e
 _0807EE04 0x0390, 0x0078
@@ -112,12 +112,12 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
 Call 0x0806407d
@@ -127,12 +127,12 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -164,22 +164,22 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x080636d9
 _0807EA94 
 Wait 0x000f
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffd2
 StartScript 
 _0807EB44 0x0004
@@ -192,22 +192,22 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08063c91
 _0807EA94 
 Wait 0x000f
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffd2
 StartScript 
 _0807EB44 0x0004
@@ -220,19 +220,19 @@ JumpIfNot 0xfffc
 _0807E864 
 Call 0x0807df29
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 CheckRoomFlag 0x000e
 JumpIf 0x000c
 SetRoomFlag 0x000e
 TextboxNoOverlap 0x2b10
 _0807EA94 
 Call 0x080634e5
-_0807E078
+.short 0x2006 @ _0807E078 with 7 parameters
 .short 0x000e
 .short 0x0020
 .short 0x0036
@@ -240,7 +240,7 @@ _0807E078
 .short 0x000e
 .short 0x0024
 .short 0x002e
-@ End of 7 parameters
+@ End of parameters
 TextboxNoOverlap 0x2b0d
 Jump 0x0096
 CheckGlobalFlag 0x003d
@@ -253,21 +253,21 @@ CheckGlobalFlag 0x003b
 JumpIfNot 0x0072
 Jump 0x0002
 Call 0x080634ed
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf78d
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x005a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf7c5
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0x0030
 _0807E48C 0x0020
 JumpIfNot 0x0030
@@ -275,12 +275,12 @@ Call 0x08063505
 JumpIf 0x002e
 TextboxNoOverlap 0x2b07
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf801
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitPlayerAction8 
 _0807EA94 
 TextboxNoOverlap 0x2b0c
@@ -350,12 +350,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-HasRoomItemForSale 
+.short 0x0411 @ HasRoomItemForSale with 0 parameters
 Call 0x0807f77d
-_0807EAF0
+.short 0x0c5d @ _0807EAF0 with 2 parameters
 .short 0x3c08
 .short 0x3c09
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
@@ -373,17 +373,17 @@ _0807E864
 _0807EB74 
 Call 0x0807f2d5
 _0807EF80 0x0000
-HasRoomItemForSale 
+.short 0x0411 @ HasRoomItemForSale with 0 parameters
 JumpIf 0x000a
 TextboxNoOverlap 0x3c07
 Jump 0x0048
 Call 0x08062eb9
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf78d
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x0030
@@ -469,7 +469,7 @@ StopScript
 StartScript 
 CheckPlayerInRegion2 0x3030
 JumpIfNot 0xffe4
-HasRoomItemForSale 
+.short 0x0411 @ HasRoomItemForSale with 0 parameters
 JumpIf 0x004c
 CheckEntityInteractType 
 JumpIfNot 0xffea
diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc
index 57150ba0..d23275f4 100644
--- a/data/scripts/gUnk_08010A98.inc
+++ b/data/scripts/gUnk_08010A98.inc
@@ -1,12 +1,12 @@
 SCRIPT_START gUnk_08010A98
 StartScript 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x72b1
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x000a
 Call 0x08067315
 StopScript 
@@ -14,22 +14,22 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x72b1
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08067305
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x72b1
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffd2
 StartScript 
 CheckInventory1 0x0067
@@ -37,10 +37,10 @@ JumpIfNot 0x0076
 _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0180
-CallWithArg
+.short 0x0c0c @ CallWithArg with 2 parameters
 .short 0xf349
 .short 0x0807
-@ End of 2 parameters
+@ End of parameters
 Call 0x0806075d
 StopScript 
 _0807EA94 
@@ -53,12 +53,12 @@ StopScript
 StartScript 
 _0807E564 
 JumpIf 0x0010
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x08e5
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x000c
 _0807EE30 
 JumpIfNot 0xffe4
@@ -67,12 +67,12 @@ StopScript
 _0807EF80 0x0000
 StopScript 
 StartScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x08e5
 .short 0x0806
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0xfff0
 StopScript 
 Jump 0xffbc
diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc
index ab37e3fa..9ecb46e8 100644
--- a/data/scripts/gUnk_08010BB4.inc
+++ b/data/scripts/gUnk_08010BB4.inc
@@ -22,24 +22,24 @@ Call 0x0807df29
 StartPlayerScript 0x08011074
 WaitForSomething2 0x00000400
 _0807F078 0x0034, 0x0002
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1036
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1037
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1038
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SoundReq0x80100000 
 _0807E778 0x0004
@@ -76,10 +76,10 @@ WaitForSomething2 0x00055000
 _0807E8E4_1 
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1039
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SoundReq2 0x0001
 _0807E8E4_2 
@@ -92,10 +92,10 @@ WaitForSomething2 0x00000080
 Wait 0x012c
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x103a
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SetEntityPositionRelative 0x01c001f8
 _0807F0B4 0x0004
@@ -113,10 +113,10 @@ SoundReq0x80100000
 SoundReq 0x009b
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1043
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SoundReq2 0x000d
 _0807E5F8 0x00000100
@@ -127,20 +127,20 @@ SoundReq 0x01c7
 SoundReq 0x00e5
 _0807E5F8 0x00000100
 _0807E5F8 0x00002800
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitForSomething2 0x00000200
 WaitForSomething2 0x00005000
 _0807E5F8 0x00028000
 WaitForSomething2 0x00050000
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1044
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SetEntityPositionRelative 0x009801f8
 SoundReq0x80100000 
@@ -150,29 +150,29 @@ _0807E5F8 0x00028000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
 WaitForSomething2 0x00050000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x00e5
 _0807E5F8 0x00028000
 WaitForSomething2 0x00050000
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x08000000
 _0807E5F8 0x00800000
 WaitForSomething2 0x01000000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc
index 0154c425..013366c0 100644
--- a/data/scripts/gUnk_08010E5A.inc
+++ b/data/scripts/gUnk_08010E5A.inc
@@ -1,28 +1,28 @@
 SCRIPT_START gUnk_08010E5A
 Wait 0x001e
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x003c
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0004
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 SoundReq 0x012c
 _0807E5F8 0x00800000
@@ -39,27 +39,27 @@ WaitForSomething2 0x00000020
 _0807E778 0x0002
 DoFade6 
 WaitFor_2 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
 Call 0x0806dc3d
 Call 0x080791bd
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf245
 .short 0x0807
 .short 0x000d
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x49f6
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x006801f8
 _0807E5F8 0x00000004
@@ -70,32 +70,32 @@ WaitForSomething2 0x00000080
 SoundReq 0x01c3
 _0807E5F8 0x20000000
 Wait 0x0078
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806dc59
 _0807E5F8 0x40000000
 _0807E5F8 0x00000010
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000020
 WaitForSomething2 0x00000200
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1045
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1046
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc
index 84c28023..56905c01 100644
--- a/data/scripts/gUnk_08010F84.inc
+++ b/data/scripts/gUnk_08010F84.inc
@@ -4,74 +4,74 @@ _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
 StartPlayerScript 0x080110bc
 WaitForSomething2 0x00000400
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1047
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x0806dc3d
 Call 0x080791bd
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf245
 .short 0x0807
 .short 0x000d
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x49f6
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 Wait 0x001e
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806dc59
 Wait 0x003c
 _0807E5F8 0x08000000
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x000f
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
 SoundReq0x80100000 
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x104a
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1049
 .short 0x0000
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SetEntityPositionRelative 0x009801f8
 Wait 0x0078
diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc
index 69153313..8fa630b7 100644
--- a/data/scripts/gUnk_080112C4.inc
+++ b/data/scripts/gUnk_080112C4.inc
@@ -15,12 +15,12 @@ Wait 0x003c
 _0807ECC4 0x0010
 _0807E930 0x0002
 Call 0x08064051
-_0807E078
+.short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0008
 .short 0x009e
 .short 0x0134
 .short 0x01f8
-@ End of 4 parameters
+@ End of parameters
 _0807E610 0x00000800
 _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc
index 88896410..e1a13f87 100644
--- a/data/scripts/gUnk_080116A8.inc
+++ b/data/scripts/gUnk_080116A8.inc
@@ -33,12 +33,12 @@ WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x0014
 SoundReq 0x0120
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5421
 .short 0x0809
 .short 0x1890
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00f0
 _0807EF80 0x0016
 SoundReq 0x01cb
@@ -55,12 +55,12 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EF80 0x0014
 SoundReq 0x01c4
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x545d
 .short 0x0809
 .short 0x18d4
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 Wait 0x003c
diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc
index eaf6c38a..5783e0aa 100644
--- a/data/scripts/gUnk_0801194C.inc
+++ b/data/scripts/gUnk_0801194C.inc
@@ -11,23 +11,23 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 CheckGlobalFlag 0x0015
 JumpIf 0x000a
 TextboxNoOverlapFollow 0x103d
@@ -41,12 +41,12 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x000c
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
 Call 0x0806407d
@@ -64,23 +64,23 @@ StartScript
 _0807EB44 0x0006
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08064429
 _0807EA94 
 _0807E878 
@@ -90,23 +90,23 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlapFollow 0x1320
 _0807EA94 
 _0807E878 
@@ -115,29 +115,29 @@ StartScript
 _0807EB44 0x0002
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x44b5
 .short 0x0806
 .short 0x0006
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0x005e
 TextboxNoOverlapFollow 0x1320
 _0807EA94 
@@ -148,23 +148,23 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 TextboxNoOverlapFollow 0x1322
 _0807EA94 
 _0807E878 
@@ -174,18 +174,18 @@ JumpIfNot 0xfffa
 _0807E864 
 Call 0x0807f9a5
 Call 0x0807df29
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1321
 .short 0x0007
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 SetLocalFlag 0x0010
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda1d
 .short 0x0806
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E878 
 Call 0x0807df51
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc
index 49463dff..7de59bd6 100644
--- a/data/scripts/gUnk_08011B20.inc
+++ b/data/scripts/gUnk_08011B20.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_08011B20
 _0807E864 
 Call 0x0807df29
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1320
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E878 
 Call 0x0807df51
diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc
index df282424..911947db 100644
--- a/data/scripts/gUnk_08011B40.inc
+++ b/data/scripts/gUnk_08011B40.inc
@@ -39,12 +39,12 @@ ModRupees 0xfff6
 Wait 0x001e
 TextboxNoOverlap 0x3d06
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xc2a1
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitFor_2 
 Wait 0x003c
 Call 0x0806c225
@@ -52,12 +52,12 @@ Jump 0xffb8
 StartScript 
 _0807E888 
 StopScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xc2a1
 .short 0x0806
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitFor_2 
 Wait 0x003c
 _0807E878 
@@ -79,12 +79,12 @@ JumpIfNot 0xfffa
 _0807E888 
 WaitPlayerAction8 
 Wait 0x001e
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xc2a1
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitFor_2 
 Wait 0x003c
 Call 0x0806c281
diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc
index aacd2d70..d576008a 100644
--- a/data/scripts/gUnk_08011C50.inc
+++ b/data/scripts/gUnk_08011C50.inc
@@ -3,12 +3,12 @@ StartScript
 _0807E864 
 StopScript 
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xc2a1
 .short 0x0806
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitFor_2 
 Wait 0x003c
 _0807EF80 0x0014
diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc
index cc9d6451..dbaf7cc8 100644
--- a/data/scripts/gUnk_0801232C.inc
+++ b/data/scripts/gUnk_0801232C.inc
@@ -29,9 +29,9 @@ StartScript
 _0807E778 0x0004
 _0807E788 0x00007fff
 DoFade5 
-_0807E858
+.short 0x0842 @ _0807E858 with 1 parameters
 .short 0x0080
-@ End of 1 parameters
+@ End of parameters
 StopScript 
 WaitFor_2 
 SoundReq2 0x002c
@@ -55,9 +55,9 @@ StartScript
 _0807E778 0x0004
 _0807E788 0xffffffff
 DoFade4 
-_0807E858
+.short 0x0842 @ _0807E858 with 1 parameters
 .short 0x0080
-@ End of 1 parameters
+@ End of parameters
 StopScript 
 WaitFor_2 
 SoundReq2 0xffff
diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc
index ff893ab3..a6b89ccb 100644
--- a/data/scripts/gUnk_08012430.inc
+++ b/data/scripts/gUnk_08012430.inc
@@ -32,18 +32,18 @@ _0807E864
 Call 0x0807f9a5
 Call 0x0807df29
 StartPlayerScript 0x08012ab0
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1101
 .short 0x0007
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 CameraTargetPlayer 
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-_0807E858
+.short 0x0842 @ _0807E858 with 1 parameters
 .short 0x0000
-@ End of 1 parameters
+@ End of parameters
 Call 0x080791bd
 LoadRoomEntityList 0x080f4d70
 Call 0x0805ebcd
@@ -153,12 +153,12 @@ Wait 0x003c
 SoundReq2 0xffff
 Call 0x08054571
 SetGlobalFlag 0x0014
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6f9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807df51
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc
index f6b88cad..18426285 100644
--- a/data/scripts/gUnk_080126FC.inc
+++ b/data/scripts/gUnk_080126FC.inc
@@ -7,20 +7,20 @@ _0807E930 0x0020
 WaitForSomething2 0x00000004
 _0807E930 0x0022
 Call 0x0807f3c9
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1102
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
 Call 0x0807f3c9
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1103
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
@@ -31,44 +31,44 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807EF80 0x0011
 _0807E930 0x001c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1105
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0022
 Call 0x0807f3c9
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1106
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x001c
 Call 0x0806d96d
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1107
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
 Call 0x0807f3c9
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1108
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x001c
 Call 0x0806d96d
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1109
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0020
 _0807EF80 0x000a
@@ -84,22 +84,22 @@ StopScript
 _0807E864 
 Call 0x0806d945
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1114
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0020
 _0807E878 
 Jump 0xffd0
 _0807E864 
 _0807E9DC 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf5b1
 .short 0x0807
 .short 0x003c
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x080791d1
 StopScript 
 _0807E5F8 0x00000008
@@ -109,19 +109,19 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 Call 0x0806d945
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110a
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110b
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
@@ -129,28 +129,28 @@ WaitForSomething2 0x00000004
 _0807EF80 0x0004
 Wait 0x003c
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110c
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110d
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110e
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
@@ -171,10 +171,10 @@ Jump 0xffe6
 _0807E864 
 _0807E930 0x0010
 StopScript 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1115
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0018
 _0807E878 
@@ -186,10 +186,10 @@ Call 0x0807df29
 _0807EB8C 
 Call 0x0806d945
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110f
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
 Call 0x0806d909
@@ -210,10 +210,10 @@ Jump 0xffe6
 _0807E864 
 _0807E930 0x0010
 StopScript 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1115
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0018
 _0807E878 
@@ -225,10 +225,10 @@ Call 0x0807df29
 _0807EB8C 
 Call 0x0806d945
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1110
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
 Call 0x0806d909
@@ -250,10 +250,10 @@ Jump 0xffe6
 _0807E864 
 _0807E930 0x0010
 StopScript 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1115
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0018
 _0807E878 
@@ -267,10 +267,10 @@ _0807EF80 0x000b
 _0807EB8C 
 Call 0x0806d945
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1111
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
 Call 0x0806d8a1
diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc
index 22d05e05..e8ce1754 100644
--- a/data/scripts/gUnk_08012B24.inc
+++ b/data/scripts/gUnk_08012B24.inc
@@ -6,11 +6,11 @@ StopScript
 _0807EF80 0x0001
 _0807ECC4 0x0008
 _0807E5F8 0x00000002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb65
 .short 0x0807
 .short 0xffe2
 .short 0xffff
-@ End of 4 parameters
+@ End of parameters
 Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc
index 29284519..66c706b1 100644
--- a/data/scripts/gUnk_08012B50.inc
+++ b/data/scripts/gUnk_08012B50.inc
@@ -6,11 +6,11 @@ StopScript
 _0807EF80 0x0001
 _0807EC64 0x0008
 _0807E5F8 0x00000002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb65
 .short 0x0807
 .short 0xffe2
 .short 0xffff
-@ End of 4 parameters
+@ End of parameters
 Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc
index 7fe6c915..0ba5da08 100644
--- a/data/scripts/gUnk_08012B7C.inc
+++ b/data/scripts/gUnk_08012B7C.inc
@@ -6,11 +6,11 @@ StopScript
 _0807EF80 0x0001
 _0807EC94 0x0008
 _0807E5F8 0x00000002
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb65
 .short 0x0807
 .short 0xffe2
 .short 0xffff
-@ End of 4 parameters
+@ End of parameters
 Call 0x080791bd
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc
index c37dd7b9..85156a81 100644
--- a/data/scripts/gUnk_08012E88.inc
+++ b/data/scripts/gUnk_08012E88.inc
@@ -18,12 +18,12 @@ Jump 0xffe2
 .short 0x0000
 StartScript 
 _0807EB44 0x0004
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x000a
 Call 0x0806b60d
 StopScript 
@@ -31,59 +31,20 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x000c
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806b4f1
 _0807EA94 
 Wait 0x000f
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffd2
-
-.globl gUnk_08012F0C
-gUnk_08012F0C:
-StartScript 
-CallWithArg
-.short 0xa93d
-.short 0x0806
-.short 0x5678
-.short 0x1234
-@ End of 4 parameters
-_0807EB44 0x0004
-_0807E930 0x0002
-CheckInventory1 0x0015
-JumpIf 0x0190
-CheckLocalFlag 0x0060
-JumpIf 0x00a4
-CheckGlobalFlag 0x001e
-JumpIf 0x0050
-StopScript 
-CheckLocalFlag 0x0062
-JumpIfNot 0x0008
-Call 0x0806a9b1
-CheckLocalFlag 0x0061
-JumpIf 0x001e
-Call 0x0806a96d
-JumpIfNot 0xfff8
-_0807E864 
-TextboxNoOverlap 0x4401
-_0807EA94 
-SetLocalFlag 0x0061
-_0807E878 
-_0807E908 0x0001
-Call 0x0806a96d
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x4402
-_0807EA94 
-_0807E908 0x0001
-Jump 0xffea
-SCRIPT_END
diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc
new file mode 100644
index 00000000..32616911
--- /dev/null
+++ b/data/scripts/gUnk_08012F0C.inc
@@ -0,0 +1,37 @@
+SCRIPT_START gUnk_08012F0C
+StartScript 
+.short 0x140c @ CallWithArg with 4 parameters
+.short 0xa93d
+.short 0x0806
+.short 0x5678
+.short 0x1234
+@ End of parameters
+_0807EB44 0x0004
+_0807E930 0x0002
+CheckInventory1 0x0015
+JumpIf 0x0190
+CheckLocalFlag 0x0060
+JumpIf 0x00a4
+CheckGlobalFlag 0x001e
+JumpIf 0x0050
+StopScript 
+CheckLocalFlag 0x0062
+JumpIfNot 0x0008
+Call 0x0806a9b1
+CheckLocalFlag 0x0061
+JumpIf 0x001e
+Call 0x0806a96d
+JumpIfNot 0xfff8
+_0807E864 
+TextboxNoOverlap 0x4401
+_0807EA94 
+SetLocalFlag 0x0061
+_0807E878 
+_0807E908 0x0001
+Call 0x0806a96d
+JumpIfNot 0xfff8
+TextboxNoOverlap 0x4402
+_0807EA94 
+_0807E908 0x0001
+Jump 0xffea
+SCRIPT_END
diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc
index 3e55cd38..69c0228a 100644
--- a/data/scripts/gUnk_08012F86.inc
+++ b/data/scripts/gUnk_08012F86.inc
@@ -11,12 +11,12 @@ StopScript
 WaitForSomething2 0x00000004
 _0807E908 0x0004
 Call 0x0806a959
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf93d
 .short 0x0807
 .short 0xf2f4
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807df51
 _0807E878 
 SetLocalFlag 0x0062
@@ -25,12 +25,12 @@ StartScript
 _0807E930 0x000d
 _0807E908 0x0005
 SetLocalFlag 0x0062
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf93d
 .short 0x0807
 .short 0xf2f4
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806aa11
 StopScript 
 CheckInventory1 0x0038
diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc
index 2ef0bc28..a32bf669 100644
--- a/data/scripts/gUnk_08013114.inc
+++ b/data/scripts/gUnk_08013114.inc
@@ -15,26 +15,26 @@ _0807E864
 StopScript 
 _0807EB74 
 Call 0x0806aed9
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaa51
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaa51
 .short 0x0806
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaa51
 .short 0x0806
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EA94 
 JumpIf 0x0008
 _0807E878 
diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc
index 4d4408c9..428dcd96 100644
--- a/data/scripts/gUnk_0801319A.inc
+++ b/data/scripts/gUnk_0801319A.inc
@@ -30,10 +30,10 @@ Call 0x080536b9
 _0807E864 
 Call 0x0807df29
 WaitFor_2 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1602
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000010
@@ -47,10 +47,10 @@ WaitForSomething2 0x00000040
 StartPlayerScript 0x08013378
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000042
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1603
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000040
@@ -59,16 +59,16 @@ _0807E778 0x0004
 DoFade5 
 WaitFor_2 
 SoundReq0x80100000 
-_0807E858
+.short 0x0842 @ _0807E858 with 1 parameters
 .short 0x0000
-@ End of 1 parameters
+@ End of parameters
 Wait 0x003c
 CameraTargetPlayer 
 Call 0x0807f5c1
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1604
 .short 0x0007
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E788 0xffffffff
 _0807E778 0x0004
diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc
index 8742209f..67514e31 100644
--- a/data/scripts/gUnk_080133F8.inc
+++ b/data/scripts/gUnk_080133F8.inc
@@ -15,12 +15,12 @@ WaitForSomething2 0x00000020
 Wait 0x003c
 _0807EF80 0x0014
 SoundReq 0x0120
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5421
 .short 0x0809
 .short 0x3494
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 Wait 0x005a
 _0807EF80 0x0016
 WaitForSomething2 0x00000080
diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc
index 25dfe899..f3eddbda 100644
--- a/data/scripts/gUnk_080134DC.inc
+++ b/data/scripts/gUnk_080134DC.inc
@@ -4,12 +4,12 @@ _0807EF80 0x0008
 StopScript 
 StartScript 
 Call 0x0807f92d
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -17,93 +17,93 @@ _0807E864
 Call 0x0807df29
 StartPlayerScript 0x080136d8
 WaitForSomething2 0x00000001
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5a1d
 .short 0x0809
 .short 0x3f04
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x3e04
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x3e28
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething2 0x18000000
 StartScript 
 SoundReq 0x01cf
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4054
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4074
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x40dc
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4118
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x41dc
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4210
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 Wait 0x0078
 _0807E5F8 0x00000060
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -125,16 +125,16 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x0503
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00040000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc
index 438bdfe6..15406890 100644
--- a/data/scripts/gUnk_08013650.inc
+++ b/data/scripts/gUnk_08013650.inc
@@ -7,12 +7,12 @@ CameraTargetEntity
 Wait 0x003c
 _0807E5F8 0x00000004
 Wait 0x0078
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
 StartPlayerScript 0x080136b4
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc
index 15e0daab..f63d1a5c 100644
--- a/data/scripts/gUnk_080136D8.inc
+++ b/data/scripts/gUnk_080136D8.inc
@@ -3,24 +3,24 @@ StartScript
 SetEntityNonPlanarMovement 0x0100
 StopScript 
 Call 0x0807f585
-_0807E078
+.short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0008
 .short 0x0010
 .short 0x0018
 .short 0x000c
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf465
 .short 0x0807
 .short 0x00d0
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf4f9
 .short 0x0807
 .short 0x0124
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x00e8, 0x0124
 _0807EB44 0x0004
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc
index 7b8a7711..be03a571 100644
--- a/data/scripts/gUnk_08013720.inc
+++ b/data/scripts/gUnk_08013720.inc
@@ -4,12 +4,12 @@ _0807EF80 0x0008
 StopScript 
 StartScript 
 Call 0x0807f92d
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -17,101 +17,101 @@ _0807E864
 Call 0x0807df29
 StartPlayerScript 0x080136d8
 WaitForSomething2 0x00000001
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5a1d
 .short 0x0809
 .short 0x3f34
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x3e4c
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething2 0x20000000
 StartScript 
 SoundReq 0x01cf
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4054
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4074
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4094
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x40dc
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4118
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4154
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x41dc
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4210
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 _0807E5F8 0x00000800
 WaitForSomething2 0x00008000
 Wait 0x0078
 _0807E5F8 0x00000060
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -133,10 +133,10 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x0504
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00040000
 SetLocalFlag 0x007b
diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc
index 693239c0..bada7949 100644
--- a/data/scripts/gUnk_080138B4.inc
+++ b/data/scripts/gUnk_080138B4.inc
@@ -4,12 +4,12 @@ _0807EF80 0x0008
 StopScript 
 StartScript 
 Call 0x0807f92d
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -17,101 +17,101 @@ _0807E864
 Call 0x0807df29
 StartPlayerScript 0x080136d8
 WaitForSomething2 0x00000001
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5a1d
 .short 0x0809
 .short 0x3f64
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x3e70
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething2 0x40000000
 StartScript 
 SoundReq 0x01cf
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4054
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4074
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4094
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x40b8
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x40dc
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4118
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4154
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4198
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 Wait 0x003c
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x41dc
 .short 0x0801
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d8d
 .short 0x0809
 .short 0x4210
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 _0807E5F8 0x00000800
@@ -120,12 +120,12 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00010000
 Wait 0x0078
 _0807E5F8 0x00000060
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -148,42 +148,42 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x0505
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00040000
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x00d800e8
 CameraTargetEntity 
 Call 0x0806dc3d
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf245
 .short 0x0807
 .short 0x0001
 .short 0x0001
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x49fe
 .short 0x0800
-@ End of 4 parameters
+@ End of parameters
 Wait 0x00c8
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf29d
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0806dc59
 CheckRoomFlag 0x0004
 JumpIfNot 0xfffa
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc
index acd46843..89fae614 100644
--- a/data/scripts/gUnk_08013AA6.inc
+++ b/data/scripts/gUnk_08013AA6.inc
@@ -3,12 +3,12 @@ Call 0x0807f3f9
 Wait 0x003c
 _0807E5F8 0x00000008
 Wait 0x0078
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
 Wait 0x003c
 _0807F0B4 0x0004
diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc
index 1c768732..bafcadf3 100644
--- a/data/scripts/gUnk_08013B18.inc
+++ b/data/scripts/gUnk_08013B18.inc
@@ -3,12 +3,12 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x01c8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0xfff0
 CheckInventory1 0x0006
 JumpIfNot 0xffe8
@@ -27,12 +27,12 @@ _0807E878
 Jump 0xffb2
 .short 0x0000
 SoundReq 0x01d3
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x08bf
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08096029
 Wait 0x003c
 _0807E5F8 0x00020000
diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc
index 1435f7bf..65d13d26 100644
--- a/data/scripts/gUnk_08013BA8.inc
+++ b/data/scripts/gUnk_08013BA8.inc
@@ -1,17 +1,17 @@
 SCRIPT_START gUnk_08013BA8
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5e7d
 .short 0x0809
 .short 0x4248
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01d3
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x08e3
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08096029
 Wait 0x0078
 _0807E5F8 0x00020000
diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc
index df2384fd..6982628d 100644
--- a/data/scripts/gUnk_08013BE8.inc
+++ b/data/scripts/gUnk_08013BE8.inc
@@ -22,18 +22,18 @@ StartScript
 _0807EF80 0x0007
 Call 0x0807f935
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x62f9
 .short 0x0809
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
-CallWithArg
+@ End of parameters
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf8e9
 .short 0x0807
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 StopScript 
 StartScript 
diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc
index ec7cf676..23514d46 100644
--- a/data/scripts/gUnk_08013D04.inc
+++ b/data/scripts/gUnk_08013D04.inc
@@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013D04
 StartScript 
 Call 0x0807f92d
 _0807EF80 0x0008
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x08000000
 Call 0x080791bd
diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc
index b913f233..d6611b57 100644
--- a/data/scripts/gUnk_08013D44.inc
+++ b/data/scripts/gUnk_08013D44.inc
@@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013D44
 StartScript 
 Call 0x0807f92d
 _0807EF80 0x0008
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x10000000
 Call 0x080791bd
diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc
index 9a7a338c..b29efd5d 100644
--- a/data/scripts/gUnk_08013D84.inc
+++ b/data/scripts/gUnk_08013D84.inc
@@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013D84
 StartScript 
 Call 0x0807f92d
 _0807EF80 0x0008
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x0002
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x20000000
 Call 0x080791bd
diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc
index d0995ac5..2597652e 100644
--- a/data/scripts/gUnk_08013DC4.inc
+++ b/data/scripts/gUnk_08013DC4.inc
@@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013DC4
 StartScript 
 Call 0x0807f92d
 _0807EF80 0x0008
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5d55
 .short 0x0809
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x40000000
 Call 0x080791bd
diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc
index 8dabc50f..be7ca6b1 100644
--- a/data/scripts/gUnk_08013FE8.inc
+++ b/data/scripts/gUnk_08013FE8.inc
@@ -10,12 +10,12 @@ CheckLocalFlag 0x007a
 JumpIfNot 0xffee
 CheckInventory1 0x0003
 JumpIfNot 0xffe6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x00d0
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0xffd8
 StopScript 
 Call 0x0807f9a5
diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc
index a7f170e8..a4a1d7a5 100644
--- a/data/scripts/gUnk_080141DC.inc
+++ b/data/scripts/gUnk_080141DC.inc
@@ -3,12 +3,12 @@ StartScript
 _0807EF80 0x0007
 _0807E930 0x0014
 Call 0x0807f715
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfffc
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc
index 1a10fe76..5a8afc07 100644
--- a/data/scripts/gUnk_08014210.inc
+++ b/data/scripts/gUnk_08014210.inc
@@ -4,12 +4,12 @@ _0807EF80 0x0007
 _0807E930 0x0015
 Call 0x0807f715
 Call 0x0807f715
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf995
 .short 0x0807
 .short 0xfffc
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/gUnk_08014248.inc
index 77458d3a..ed295289 100644
--- a/data/scripts/gUnk_08014248.inc
+++ b/data/scripts/gUnk_08014248.inc
@@ -2,19 +2,19 @@ SCRIPT_START gUnk_08014248
 TestBit 0x00020000
 JumpIf 0x0014
 Wait 0x0008
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5ead
 .short 0x0809
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xffe6
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x5ead
 .short 0x0809
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Jump 0xfff4
 .short 0x0000
 StartScript 
@@ -24,83 +24,21 @@ CheckLocalFlag 0x0078
 JumpIfNot 0xfffa
 StartScript 
 Call 0x0807f935
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x0647
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E878 
 Jump 0xffec
 .short 0x0000
-
-.globl gUnk_080142B0
-gUnk_080142B0:
-StartScript 
-CheckLocalFlag 0x0054
-JumpIf 0x00ca
-CheckLocalFlag 0x0053
-JumpIf 0x0070
-StopScript 
-StopScript 
-StartScript 
-_0807E564 
-JumpIfNot 0xfff8
-CheckPlayerInRegion 0x0098, 0x0058, 0x1818
-JumpIfNot 0xffec
-StopScript 
-_0807E864 
-SetLocalFlag 0x0053
-Wait 0x0014
-_0807E908 0x0004
-Call 0x080654dd
-Wait 0x001e
-_0807E930 0x0001
-Wait 0x000a
-_0807E930 0x0003
-Wait 0x000a
-_0807E930 0x0001
-Wait 0x000a
-_0807E930 0x0003
-Wait 0x000a
-_0807E930 0x0002
-Wait 0x001e
-TextboxNoOverlap 0x2c12
-_0807EA94 
-Wait 0x0014
-_0807E930 0x0004
-_0807E878 
-_0807E908 0x0001
-StopScript 
-StartScript 
-_0807E564 
-JumpIf 0xfff8
-EntityHasHeight 
-JumpIf 0xfff2
-CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
-JumpIfNot 0xffe6
-StopScript 
-_0807E864 
-SetLocalFlag 0x0054
-Wait 0x005a
-_0807E908 0x0004
-Call 0x080654ed
-Wait 0x001e
-_0807E930 0x0001
-Wait 0x001e
-TextboxNoOverlap 0x2c13
-_0807EA94 
-Wait 0x0014
-_0807E930 0x0004
-_0807E908 0x0001
-_0807E878 
-SCRIPT_END
diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_080142B0.inc
new file mode 100644
index 00000000..80923c10
--- /dev/null
+++ b/data/scripts/gUnk_080142B0.inc
@@ -0,0 +1,60 @@
+SCRIPT_START gUnk_080142B0
+StartScript 
+CheckLocalFlag 0x0054
+JumpIf 0x00ca
+CheckLocalFlag 0x0053
+JumpIf 0x0070
+StopScript 
+StopScript 
+StartScript 
+_0807E564 
+JumpIfNot 0xfff8
+CheckPlayerInRegion 0x0098, 0x0058, 0x1818
+JumpIfNot 0xffec
+StopScript 
+_0807E864 
+SetLocalFlag 0x0053
+Wait 0x0014
+_0807E908 0x0004
+Call 0x080654dd
+Wait 0x001e
+_0807E930 0x0001
+Wait 0x000a
+_0807E930 0x0003
+Wait 0x000a
+_0807E930 0x0001
+Wait 0x000a
+_0807E930 0x0003
+Wait 0x000a
+_0807E930 0x0002
+Wait 0x001e
+TextboxNoOverlap 0x2c12
+_0807EA94 
+Wait 0x0014
+_0807E930 0x0004
+_0807E878 
+_0807E908 0x0001
+StopScript 
+StartScript 
+_0807E564 
+JumpIf 0xfff8
+EntityHasHeight 
+JumpIf 0xfff2
+CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
+JumpIfNot 0xffe6
+StopScript 
+_0807E864 
+SetLocalFlag 0x0054
+Wait 0x005a
+_0807E908 0x0004
+Call 0x080654ed
+Wait 0x001e
+_0807E930 0x0001
+Wait 0x001e
+TextboxNoOverlap 0x2c13
+_0807EA94 
+Wait 0x0014
+_0807E930 0x0004
+_0807E908 0x0001
+_0807E878 
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc
index 663eece6..5cba5540 100644
--- a/data/scripts/gUnk_08014450.inc
+++ b/data/scripts/gUnk_08014450.inc
@@ -27,10 +27,10 @@ Call 0x0806e251
 JumpIfNot 0x000e
 TextboxNoOverlapFollow 0x420b
 _0807EB38 
-_0807E078
+.short 0x0c06 @ _0807E078 with 2 parameters
 .short 0x0004
 .short 0x000a
-@ End of 2 parameters
+@ End of parameters
 ClearLocalFlag 0x0093
 Jump 0x000a
 SetLocalFlag 0x0093
diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc
index b155d174..7dfd951f 100644
--- a/data/scripts/gUnk_080145B0.inc
+++ b/data/scripts/gUnk_080145B0.inc
@@ -10,10 +10,10 @@ _0807E864
 ClearRoomFlag 0x0005
 Wait 0x000c
 _0807EB8C 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x432e
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E878 
 Jump 0xffe0
diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc
index ea393b3a..2ff86973 100644
--- a/data/scripts/gUnk_080145E8.inc
+++ b/data/scripts/gUnk_080145E8.inc
@@ -33,10 +33,10 @@ CheckLocalFlag 0x005e
 JumpIf 0x003e
 _0807E864 
 _0807EB8C 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x432b
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 Jump 0x015e
 Call 0x08088659
 JumpIfNot 0xffc0
@@ -57,10 +57,10 @@ Wait 0x0010
 _0807E930 0x0002
 CheckGlobalFlag 0x0059
 JumpIfNot 0x000c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x432f
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 Jump 0x010a
 CheckRoomFlag 0x0004
 JumpIf 0x0028
@@ -73,24 +73,24 @@ JumpIf 0x003c
 Call 0x08088575
 SetRoomFlag 0x0009
 Jump 0x004a
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x431e
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 Jump 0x00d2
 SetRoomFlag 0x0009
 SetLocalFlag 0x005c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x4305
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E3BC 0x0001
 JumpIfNot 0x00b0
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x4306
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 Jump 0x001e
 SetRoomFlag 0x0009
 Call 0x08088505
@@ -110,10 +110,10 @@ JumpIfNot 0xfffa
 ClearRoomFlag 0x0003
 _0807EA94 
 SetRoomFlag 0x0004
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x431e
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 Jump 0x0060
 SetRoomFlag 0x0009
 _0807EA94 
@@ -137,10 +137,10 @@ Wait 0x008c
 _0807E930 0x0002
 Jump 0xffc8
 SetRoomFlag 0x0009
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x4307
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Wait 0x0004
 _0807E878 
diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc
index a67cef9c..0f51cb04 100644
--- a/data/scripts/gUnk_08014804.inc
+++ b/data/scripts/gUnk_08014804.inc
@@ -9,10 +9,10 @@ Call 0x0807df39
 Wait 0x0010
 CheckLocalFlag 0x0093
 JumpIf 0x0092
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x4215
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807E878 
 TestBit 0x00000001
 JumpIf 0x002c
@@ -24,10 +24,10 @@ _0807E864
 _0807E930 0x0008
 Wait 0x0020
 _0807E930 0x0002
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x4215
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807E878 
 Jump 0xffce
 _0807E930 0x0008
@@ -50,10 +50,10 @@ _0807E864
 _0807E930 0x0008
 Wait 0x0020
 _0807E930 0x0002
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x4216
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807E878 
 Jump 0xffce
 _0807E930 0x0008
diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc
index 9882bfe8..1f1d577a 100644
--- a/data/scripts/gUnk_080149CC.inc
+++ b/data/scripts/gUnk_080149CC.inc
@@ -53,57 +53,3 @@ Wait 0x000f
 _0807E878 
 Jump 0xffe6
 .short 0x0000
-
-    .globl gUnk_08014A80
-gUnk_08014A80:
-StartScript 
-_0807EF80 0x000a
-StopScript 
-WaitForSomething2 0x00000001
-_0807EB74 
-_0807EF80 0x0004
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-TextboxNoOverlap 0x2f0a
-_0807EA94 
-_0807E5F8 0x00000002
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2f0a
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
-StartScript 
-Call 0x0806c871
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-StartPlayerScript 0x08014b10
-WaitForSomething2 0x00000001
-_0807EB74 
-CheckLocalFlag 0x0064
-JumpIf 0x000e
-SetLocalFlag 0x0064
-TextboxNoOverlap 0x2f0b
-Jump 0x0006
-TextboxNoOverlap 0x2f0c
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffc6
-.short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0078, 0x0040
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc
new file mode 100644
index 00000000..0c7347cd
--- /dev/null
+++ b/data/scripts/gUnk_08014A80.inc
@@ -0,0 +1,52 @@
+SCRIPT_START gUnk_08014A80
+StartScript 
+_0807EF80 0x000a
+StopScript 
+WaitForSomething2 0x00000001
+_0807EB74 
+_0807EF80 0x0004
+_0807E5F8 0x00000002
+WaitForSomething2 0x00000001
+TextboxNoOverlap 0x2f0a
+_0807EA94 
+_0807E5F8 0x00000002
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+TextboxNoOverlap 0x2f0a
+_0807EA94 
+_0807E878 
+Jump 0xffec
+.short 0x0000
+StartScript 
+Call 0x0806c871
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+StartPlayerScript 0x08014b10
+WaitForSomething2 0x00000001
+_0807EB74 
+CheckLocalFlag 0x0064
+JumpIf 0x000e
+SetLocalFlag 0x0064
+TextboxNoOverlap 0x2f0b
+Jump 0x0006
+TextboxNoOverlap 0x2f0c
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffc6
+.short 0x0000
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0078, 0x0040
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call 0x080791bd
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc
index 5c80a274..2ad6adef 100644
--- a/data/scripts/gUnk_08014CDC.inc
+++ b/data/scripts/gUnk_08014CDC.inc
@@ -11,10 +11,10 @@ StopScript
 WaitForSomething2 0x00000001
 Call 0x08066e09
 _0807E864 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1010
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 StopScript 
@@ -33,12 +33,12 @@ Call 0x08066e09
 SetEntityPositionRelative 0x00c801f8
 Call 0x0807df51
 _0807E878 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x00e8
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIf 0xfff4
 _0807E864 
 Call 0x0807df29
diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc
index 9d45548d..31bf0b96 100644
--- a/data/scripts/gUnk_08014E14.inc
+++ b/data/scripts/gUnk_08014E14.inc
@@ -3,23 +3,23 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf3d9
 .short 0x0807
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08064429
 _0807EA94 
 _0807E878 
@@ -36,30 +36,30 @@ JumpIfNot 0xfffc
 _0807E864 
 Call 0x0807df29
 _0807EB74 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf78d
 .short 0x0807
 .short 0x0022
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x0038
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf7c5
 .short 0x0807
 .short 0x0022
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0x001e
 _0807E48C 0x0020
 JumpIfNot 0x001e
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf801
 .short 0x0807
 .short 0x0022
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitPlayerAction8 
 TextboxNoOverlap 0x0a04
 Jump 0x000e
@@ -119,12 +119,12 @@ _0807EB74
 _0807EF80 0x0000
 StartScript 
 TextboxNoOverlap 0x3b0b
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf855
 .short 0x0807
 .short 0x0064
 .short 0x0001
-@ End of 4 parameters
+@ End of parameters
 StopScript 
 _0807EA94 
 _0807E3E8 
@@ -161,10 +161,10 @@ _0807F0B4 0x0001
 CameraTargetEntity 
 StartPlayerScript 0x080152b4
 WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1301
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Call 0x0807f3f9
 Wait 0x003c
@@ -175,17 +175,17 @@ WaitForSomething2 0x00000004
 SoundReq2 0x000d
 _0807EB28 0x1302
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1303
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EB28 0x1304
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1305
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -270,12 +270,12 @@ WaitFor_2
 Call 0x08053b3d
 StartScript 
 _0807E864 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6e9
 .short 0x0807
 .short 0x0008
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 MoveEntityToPlayer 
 _0807F0B4 0x0004
 CameraTargetEntity 
diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc
index e571a989..ba244411 100644
--- a/data/scripts/gUnk_08015390.inc
+++ b/data/scripts/gUnk_08015390.inc
@@ -7,10 +7,10 @@ _0807E930 0x001f
 Call 0x0806d945
 WaitForSomething2 0x00000008
 _0807E930 0x0010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1314
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E930 0x0018
 Call 0x0806d8a1
diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc
index 4f4b462f..96de3275 100644
--- a/data/scripts/gUnk_080153EC.inc
+++ b/data/scripts/gUnk_080153EC.inc
@@ -17,40 +17,40 @@ _0807E5F8 0x00000880
 WaitForSomething2 0x00001100
 _0807F0B4 0x0004
 SetEntityPositionRelative 0x00900078
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1330
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00008000
 WaitForSomething2 0x00010000
 _0807E5F8 0x00000880
 WaitForSomething2 0x00001000
 Wait 0x003c
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x130d
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x130e
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x130f
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1310
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc
index eaf0e8c8..4a450ef5 100644
--- a/data/scripts/gUnk_0801548E.inc
+++ b/data/scripts/gUnk_0801548E.inc
@@ -2,34 +2,34 @@ SCRIPT_START gUnk_0801548E
 _0807E5F8 0x00000800
 WaitForSomething2 0x00001000
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00048000
 WaitForSomething2 0x00090000
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1311
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00008000
 WaitForSomething2 0x00010000
 _0807E5F8 0x00048000
 WaitForSomething2 0x00010000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0001
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807F0C8 0x0000, 0x0000
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1312
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000800
 WaitForSomething2 0x00001000
diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc
index a979e11d..33234b3a 100644
--- a/data/scripts/gUnk_0801550C.inc
+++ b/data/scripts/gUnk_0801550C.inc
@@ -5,64 +5,64 @@ _0807EF80 0x0007
 _0807EB44 0x0000
 Call 0x0807f339
 StopScript 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 WaitForSomething2 0x00008000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0078, 0x00b8
 _0807EB44 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EF80 0x000d
 _0807EB44 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0004
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EDD4 0x0078, 0x00c8
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EB44 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xaf61
 .short 0x0806
 .short 0x0000
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x0010
 Wait 0x0028
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x000a
 SoundReq 0x0125
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xfb29
 .short 0x0807
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x000a
 _0807EF80 0x0010
 _0807E5F8 0x00010000
diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc
index 87413bb9..7e6aa67d 100644
--- a/data/scripts/gUnk_08015618.inc
+++ b/data/scripts/gUnk_08015618.inc
@@ -5,23 +5,23 @@ SetEntityNonPlanarMovement 0x0040
 Call 0x08094b81
 StopScript 
 WaitForSomething2 0x00000080
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xdded
 .short 0x0805
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x08094b0d
 _0807EDD4 0x0078, 0x0068
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF3C 0xff80, 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xde19
 .short 0x0805
 .short 0x0003
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Wait 0x003c
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc
index 34160278..fb4991b6 100644
--- a/data/scripts/gUnk_08015684.inc
+++ b/data/scripts/gUnk_08015684.inc
@@ -29,12 +29,12 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
 _0807EB44 0x0004
 _0807EF80 0x0014
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x545d
 .short 0x0809
 .short 0x5754
 .short 0x0801
-@ End of 4 parameters
+@ End of parameters
 SoundReq 0x01c4
 Wait 0x0078
 _0807EF80 0x0016
diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc
index 32553e70..bcc7ce8d 100644
--- a/data/scripts/gUnk_080157AC.inc
+++ b/data/scripts/gUnk_080157AC.inc
@@ -31,10 +31,10 @@ StartPlayerScript 0x08015918
 WaitForSomething2 0x00000010
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1066
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
@@ -54,18 +54,18 @@ SetEntityPositionRelative 0x02080248
 CameraTargetEntity 
 StartPlayerScript 0x08015938
 WaitForSomething2 0x00000010
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x106a
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000008
 Wait 0x0078
 _0807E8E4_2 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1068
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc
index 9f32f67d..9e00d5cd 100644
--- a/data/scripts/gUnk_08015958.inc
+++ b/data/scripts/gUnk_08015958.inc
@@ -15,10 +15,10 @@ _0807EB74
 _0807EDD4 0x01f8, 0x02f8
 _0807EB44 0x0004
 _0807EF80 0x0000
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1011
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 _0807EDD4 0x01f8, 0x0268
 SetEntityPositionRelative 0x02180248
@@ -59,10 +59,10 @@ JumpIf 0x0016
 CheckEntityInteractType 
 JumpIfNot 0xffee
 StopScript 
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1067
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 Jump 0xffe0
 StopScript 
diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc
index 3516af39..a9cd4e7b 100644
--- a/data/scripts/gUnk_08015B34.inc
+++ b/data/scripts/gUnk_08015B34.inc
@@ -3,21 +3,21 @@ StopScript
 StartScript 
 CheckLocalFlag 0x008b
 JumpIf 0x0040
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf6b5
 .short 0x0807
 .short 0x0318
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 JumpIfNot 0xffe8
 StopScript 
 _0807E864 
 Call 0x0807f9a5
 Call 0x0807df29
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2506
 .short 0x0002
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
 StartPlayerScript 0x08015b84
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc
index 1eb7c52c..e7ccc037 100644
--- a/data/scripts/gUnk_08015C7C.inc
+++ b/data/scripts/gUnk_08015C7C.inc
@@ -6,24 +6,24 @@ _0807EF80 0x0001
 _0807EDD4 0x0168, 0x0058
 _0807EB44 0x0004
 _0807EF80 0x0000
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x03c5
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f305
-TextboxNoOverlapFollowPos
+.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1318
 .short 0x000c
-@ End of 2 parameters
+@ End of parameters
 _0807EA94 
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf239
 .short 0x0807
 .short 0x03c9
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 Call 0x0807f305
 _0807EB44 0x0004
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc
index e7c74049..51545509 100644
--- a/data/scripts/gUnk_08015FC0.inc
+++ b/data/scripts/gUnk_08015FC0.inc
@@ -4,12 +4,12 @@ Call 0x0806db85
 CheckKinstoneFused 0x0009
 JumpIf 0x005a
 _0807EA88 0x0009
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xda05
 .short 0x0806
 .short 0x0007
 .short 0x0000
-@ End of 4 parameters
+@ End of parameters
 _0807EF80 0x000a
 StopScript 
 _0807EA4C 
diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc
index 2cfb616c..3133be5d 100644
--- a/data/scripts/gUnk_080160A8.inc
+++ b/data/scripts/gUnk_080160A8.inc
@@ -18,7 +18,7 @@ Jump 0xffd2
 _0807E864 
 _0807EB74 
 StopScript 
-HasRoomItemForSale 
+.short 0x0411 @ HasRoomItemForSale with 0 parameters
 JumpIfNot 0x0030
 TextboxNoOverlapFollow 0x2d07
 _0807EA94 
@@ -51,12 +51,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 GetInventoryValue 0x0025
-_0807EAF0
+.short 0x145d @ _0807EAF0 with 4 parameters
 .short 0x2d03
 .short 0x2d02
 .short 0x2d02
 .short 0x2d02
-@ End of 4 parameters
+@ End of parameters
 _0807E3E8 
 JumpIfNot 0x002a
 _0807E48C 0x0020
@@ -78,12 +78,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 GetInventoryValue 0x0024
-_0807EAF0
+.short 0x145d @ _0807EAF0 with 4 parameters
 .short 0x2d05
 .short 0x2d04
 .short 0x2d04
 .short 0x2d04
-@ End of 4 parameters
+@ End of parameters
 _0807E3E8 
 JumpIfNot 0x002e
 _0807E48C 0x0020
@@ -140,12 +140,12 @@ JumpIf 0x009a
 Call 0x08068f01
 Call 0x08068f15
 Call 0x08068bb5
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0xf245
 .short 0x0807
 .short 0x0001
 .short 0x0001
-@ End of 4 parameters
+@ End of parameters
 Call 0x08068b85
 Call 0x0807f2a9
 Call 0x08068bd1
diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc
index 5301fefc..7de920f0 100644
--- a/data/scripts/gUnk_0801637C.inc
+++ b/data/scripts/gUnk_0801637C.inc
@@ -8,26 +8,26 @@ StopScript
 Jump 0xfffa
 JumpIf 0xfff6
 JumpIfNot 0xfff2
-_0807E078
+.short 0x0c06 @ _0807E078 with 2 parameters
 .short 0xffee
 .short 0xffec
-@ End of 2 parameters
+@ End of parameters
 JumpAbsolute 0x08016384
 JumpAbsoluteIf 0x08016384
 JumpAbsoluteIfNot 0x08016384
 _0807E0E0 0x08016384, 0x08016384
 Call 0x08016384
-CallWithArg
+.short 0x140c @ CallWithArg with 4 parameters
 .short 0x6384
 .short 0x0801
 .short 0x5678
 .short 0x1234
-@ End of 4 parameters
+@ End of parameters
 LoadRoomEntityList 0x08016384
 TestBit 0x00000001
 CheckInventory1 0x0001
 CheckInventory2 0x0001
-HasRoomItemForSale 
+.short 0x0411 @ HasRoomItemForSale with 0 parameters
 CheckLocalFlag 0x0067
 CheckLocalFlagByOffset 0x0100, 0x006b
 CheckGlobalFlag 0x0013
diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc
index 7f1d0813..64bdb067 100644
--- a/data/scripts/gUnk_08016482.inc
+++ b/data/scripts/gUnk_08016482.inc
@@ -7,7 +7,7 @@ DoFade6
 DoFade7 
 _0807E800 0x00000000
 _0807E80C 0x00000000
-_0807E858
+.short 0x0442 @ _0807E858 with 0 parameters
 _0807E864 
 _0807E878 
 _0807E888 
@@ -31,14 +31,14 @@ _0807EA88 0x0001
 _0807EA94 
 TextboxNoOverlapFollow 0x0601
 TextboxNoOverlap 0x0601
-TextboxNoOverlapFollowPos
+.short 0x085c @ TextboxNoOverlapFollowPos with 1 parameters
 .short 0x0601
-@ End of 1 parameters
-_0807EAF0
+@ End of parameters
+.short 0x105d @ _0807EAF0 with 3 parameters
 .short 0x0601
 .short 0x0602
 .short 0x0603
-@ End of 3 parameters
+@ End of parameters
 TextboxNoOverlapVar 
 _0807EB28 0x0602
 _0807EB38 
diff --git a/data/scripts/npc4e_fusion.inc b/data/scripts/npc4e_fusion.inc
deleted file mode 100644
index 6a21fd23..00000000
--- a/data/scripts/npc4e_fusion.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SCRIPT_START gUnk_08016030
-StartScript 
-CheckKinstoneFused 0x0009
-JumpIf 0x002a
-StopScript 
-WaitForSomething2 0x00000001
-_0807EF80 0x0010
-Wait 0x003c
-SetEntityNonPlanarMovement 0x0020
-_0807ECF4 0x0080
-Wait 0x001e
-_0807EF80 0x0010
-_0807E5F8 0x0000008
-.short 0xffff
-.short 0x0c6a
-.short 0xfff0
-.short 0x0000
-.short 0xffff
-.short 0x0000
\ No newline at end of file
diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py
index 5d184b28..3d4076a5 100644
--- a/tools/script_disassembler/incbin_parser.py
+++ b/tools/script_disassembler/incbin_parser.py
@@ -9,7 +9,10 @@ from script_disassembler import disassemble_script, generate_macros
 ROM_OFFSET=0x08000000
 SCRIPTS_START=0x08008B5C
 SCRIPTS_END=0x08016984
-# cat data/scripts.s  | grep @ | cut -d " " -f 3 | sed  -e 's/^/0x/' | sed -e 's/\\n/, /g' > labels.txt
+
+# Create labels for these additional script instructions
+# Currently done by splitting the script at that point
+LABEL_BREAKS=[ 0x0800B41C, 0x08012F0C, 0x080142B0, 0x08014A80]
 
 def read_baserom():
     # read baserom data
@@ -33,9 +36,13 @@ def main():
 
 	.text
     
-    '''
+'''
 
     while script_start < SCRIPTS_END-ROM_OFFSET:
+        if len(LABEL_BREAKS) > 0 and script_start+ROM_OFFSET >=LABEL_BREAKS[0]:
+            print(f'{hex(script_start+ROM_OFFSET)} > {LABEL_BREAKS[0]}')
+            LABEL_BREAKS.pop(0)
+
         label = get_label(script_start+ROM_OFFSET)
         print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...")
         # find end of the script signified by 0xffff0000
@@ -44,7 +51,10 @@ def main():
         if script_end > SCRIPTS_END-ROM_OFFSET:
             script_end = SCRIPTS_END-ROM_OFFSET
 
-        script_start+ROM_OFFSET
+        if len(LABEL_BREAKS) > 0 and script_end+ROM_OFFSET > LABEL_BREAKS[0]:
+            print(f'break at {hex(LABEL_BREAKS[0])} instead of {hex(script_end)}')
+            script_end = LABEL_BREAKS[0]-ROM_OFFSET
+
         # read data from rom
         data = baserom_data[script_start:script_end]
 
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index ae8f3272..44ca0a74 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -55,7 +55,7 @@ commands = [
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
     {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
-    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''},
+    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': 'v'},
     {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
     {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
     {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
@@ -330,14 +330,16 @@ def ExecuteScriptCommandSet(ctx: Context):
 
 
     if params['length'] == -1: # variable parameter length
-        print(build_script_command(command['fun']))
+        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with {commandSize-1} parameters')
         if commandSize > 1:
             print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])]))
-            print(f'@ End of {commandSize-1} parameters')
+            print(f'@ End of parameters')
         ctx.ptr += commandSize*2
         return 1
     elif params['length'] == -2: # point and var
-        print(build_script_command(command['fun']) + ' '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with parameters:')
+
+        print('.word'+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
         if commandSize > 3:
             print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])]))
             print(f'% End of {commandSize-3} parameters')
@@ -428,6 +430,9 @@ def generate_macros():
         params = parameters[command['params']]
         id = ((params['length']+1) << 0xA) + num
 
+        if params['length'] < 0:
+            continue
+
         print(f'.macro {build_script_command(command["fun"])} {params["param"]}')
         print(f'	.short {u16_to_hex(id)}')
         if params['expr'] != '':

From b65f5e1bd0910580d9748b7ba7badf3a21189565 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 00:24:24 +0100
Subject: [PATCH 17/46] Reference pointers directly

---
 asm/macros/scripts.inc                        |   2 +-
 data/scripts.s                                |  17 ++
 data/scripts/gUnk_08008B5C.inc                |  44 ++--
 data/scripts/gUnk_08008D8C.inc                |  39 ++-
 data/scripts/gUnk_08008F74.inc                |   2 +-
 data/scripts/gUnk_08008FC0.inc                |  14 +-
 data/scripts/gUnk_0800903C.inc                |  14 +-
 data/scripts/gUnk_08009320.inc                |   2 +-
 data/scripts/gUnk_08009348.inc                |   8 +-
 data/scripts/gUnk_0800939A.inc                |  14 +-
 data/scripts/gUnk_08009464.inc                |   6 +-
 data/scripts/gUnk_080094CC.inc                |   4 +-
 data/scripts/gUnk_080094FC.inc                |  22 +-
 data/scripts/gUnk_080095F2.inc                |  20 +-
 data/scripts/gUnk_08009704.inc                |   2 +-
 data/scripts/gUnk_08009740.inc                |  14 +-
 data/scripts/gUnk_080097F0.inc                |   6 +-
 data/scripts/gUnk_08009838.inc                |   8 +-
 data/scripts/gUnk_0800987C.inc                |   8 +-
 data/scripts/gUnk_080098D4.inc                |   6 +-
 data/scripts/gUnk_08009918.inc                |   6 +-
 data/scripts/gUnk_08009950.inc                |   4 +-
 data/scripts/gUnk_080099DC.inc                |   2 +-
 data/scripts/gUnk_08009A34.inc                |   6 +-
 data/scripts/gUnk_08009AF8.inc                |   2 +-
 data/scripts/gUnk_08009B30.inc                |  10 +-
 data/scripts/gUnk_08009B78.inc                |   8 +-
 data/scripts/gUnk_08009C68.inc                |   8 +-
 data/scripts/gUnk_08009D6C.inc                |   4 +-
 data/scripts/gUnk_08009DB0.inc                |  16 +-
 data/scripts/gUnk_08009E58.inc                |   2 +-
 data/scripts/gUnk_08009E88.inc                |  10 +-
 data/scripts/gUnk_08009F14.inc                |  45 ++--
 data/scripts/gUnk_0800A088.inc                |  12 +
 data/scripts/gUnk_0800A0B4.inc                |   4 +-
 data/scripts/gUnk_0800A0FC.inc                |  21 +-
 data/scripts/gUnk_0800A160.inc                |  10 +-
 data/scripts/gUnk_0800A1B4.inc                |   5 +-
 data/scripts/gUnk_0800A1D8.inc                |  18 +-
 data/scripts/gUnk_0800A310.inc                |  20 +-
 data/scripts/gUnk_0800A3D8.inc                |  34 +--
 data/scripts/gUnk_0800A500.inc                |  15 +-
 data/scripts/gUnk_0800A590.inc                |  17 +-
 data/scripts/gUnk_0800A638.inc                |   5 +-
 data/scripts/gUnk_0800A65C.inc                |   5 +-
 data/scripts/gUnk_0800A680.inc                |   5 +-
 data/scripts/gUnk_0800A6A4.inc                |   9 +-
 data/scripts/gUnk_0800A6D4.inc                |   9 +-
 data/scripts/gUnk_0800A704.inc                |   9 +-
 data/scripts/gUnk_0800A734.inc                |   9 +-
 data/scripts/gUnk_0800A764.inc                |   9 +-
 data/scripts/gUnk_0800A7E4.inc                |   9 +-
 data/scripts/gUnk_0800A964.inc                |   2 +-
 data/scripts/gUnk_0800A988.inc                |   2 +-
 data/scripts/gUnk_0800A9AC.inc                |   2 +-
 data/scripts/gUnk_0800A9D0.inc                |   2 +-
 data/scripts/gUnk_0800A9F4.inc                |   9 +-
 data/scripts/gUnk_0800AA48.inc                |   2 +-
 data/scripts/gUnk_0800AA6C.inc                |   2 +-
 data/scripts/gUnk_0800AA90.inc                |   2 +-
 data/scripts/gUnk_0800AAB4.inc                |   2 +-
 data/scripts/gUnk_0800AAD8.inc                |   9 +-
 data/scripts/gUnk_0800AB08.inc                |  21 +-
 data/scripts/gUnk_0800AB6E.inc                |  27 +-
 data/scripts/gUnk_0800ACBC.inc                | 135 +---------
 data/scripts/gUnk_0800ACE0.inc                |  37 +++
 data/scripts/gUnk_0800AD54.inc                |  89 +++++++
 data/scripts/gUnk_0800AEDC.inc                |   2 +-
 data/scripts/gUnk_0800AF18.inc                |   5 +-
 data/scripts/gUnk_0800AF44.inc                |   4 +-
 data/scripts/gUnk_0800AF68.inc                |   4 +-
 data/scripts/gUnk_0800AF8C.inc                |   4 +-
 data/scripts/gUnk_0800AFB0.inc                |   6 +-
 data/scripts/gUnk_0800AFE8.inc                |   4 +-
 data/scripts/gUnk_0800B00C.inc                |  14 +-
 data/scripts/gUnk_0800B0AC.inc                |   6 +-
 data/scripts/gUnk_0800B0D0.inc                |  57 ++---
 data/scripts/gUnk_0800B1C0.inc                |   2 +-
 data/scripts/gUnk_0800B200.inc                |   4 +-
 data/scripts/gUnk_0800B254.inc                |  10 +-
 data/scripts/gUnk_0800B308.inc                |  14 +-
 data/scripts/gUnk_0800B3A4.inc                |  26 +-
 data/scripts/gUnk_0800B41C.inc                |   4 +-
 data/scripts/gUnk_0800B4AC.inc                |   4 +-
 data/scripts/gUnk_0800B574.inc                |   2 +-
 data/scripts/gUnk_0800B5C4.inc                |   2 +-
 data/scripts/gUnk_0800B5EC.inc                |  20 +-
 data/scripts/gUnk_0800B6C8.inc                |  55 +---
 data/scripts/gUnk_0800B7C4.inc                |  24 ++
 data/scripts/gUnk_0800B7FC.inc                |  10 +-
 data/scripts/gUnk_0800B828.inc                |  34 ++-
 data/scripts/gUnk_0800B9B4.inc                |  34 +--
 data/scripts/gUnk_0800BACC.inc                |   4 +-
 data/scripts/gUnk_0800BB00.inc                |   2 +-
 data/scripts/gUnk_0800BB30.inc                |   4 +-
 data/scripts/gUnk_0800BB64.inc                |   4 +-
 data/scripts/gUnk_0800BBA4.inc                |   4 +-
 data/scripts/gUnk_0800BBDC.inc                |   2 +-
 data/scripts/gUnk_0800BC08.inc                |   4 +-
 data/scripts/gUnk_0800BC50.inc                |  18 +-
 data/scripts/gUnk_0800BCE8.inc                |   2 +-
 data/scripts/gUnk_0800BD78.inc                |  19 +-
 data/scripts/gUnk_0800BE1C.inc                |   8 +-
 data/scripts/gUnk_0800BECC.inc                |   9 +-
 data/scripts/gUnk_0800BF38.inc                |  10 +-
 data/scripts/gUnk_0800C004.inc                |  19 +-
 data/scripts/gUnk_0800C0B0.inc                |   8 +-
 data/scripts/gUnk_0800C160.inc                |   9 +-
 data/scripts/gUnk_0800C1D8.inc                |  10 +-
 data/scripts/gUnk_0800C2A4.inc                |  19 +-
 data/scripts/gUnk_0800C350.inc                |   5 +-
 data/scripts/gUnk_0800C3B0.inc                |   2 +-
 data/scripts/gUnk_0800C3CC.inc                |  16 +-
 data/scripts/gUnk_0800C410.inc                |  16 +-
 data/scripts/gUnk_0800C45C.inc                |   2 +-
 data/scripts/gUnk_0800C550.inc                |  70 +++--
 data/scripts/gUnk_0800C8C8.inc                |  11 +
 data/scripts/gUnk_0800C8F0.inc                |   2 +-
 data/scripts/gUnk_0800C91C.inc                |  10 +-
 data/scripts/gUnk_0800CA8C.inc                |   2 +-
 data/scripts/gUnk_0800CABC.inc                |   2 +-
 data/scripts/gUnk_0800CB54.inc                |   2 +-
 data/scripts/gUnk_0800CBD4.inc                |   2 +-
 data/scripts/gUnk_0800CC6C.inc                |   2 +-
 data/scripts/gUnk_0800CD04.inc                |   2 +-
 data/scripts/gUnk_0800CD7C.inc                |  71 +++---
 data/scripts/gUnk_0800D190.inc                |  10 +
 data/scripts/gUnk_0800D1B4.inc                |   2 +-
 data/scripts/gUnk_0800D1E0.inc                |  14 +-
 data/scripts/gUnk_0800D278.inc                |  33 +--
 data/scripts/gUnk_0800D3EC.inc                |  12 +
 data/scripts/gUnk_0800D414.inc                |  69 +++--
 data/scripts/gUnk_0800D698.inc                |   4 +-
 data/scripts/gUnk_0800D6B4.inc                |   4 +-
 data/scripts/gUnk_0800D710.inc                |   8 +-
 data/scripts/gUnk_0800D76C.inc                |  18 +-
 data/scripts/gUnk_0800D84C.inc                |   4 +-
 data/scripts/gUnk_0800D874.inc                |  16 +-
 data/scripts/gUnk_0800D92C.inc                |   2 +-
 data/scripts/gUnk_0800D954.inc                |  12 +-
 data/scripts/gUnk_0800DA00.inc                |   2 +-
 data/scripts/gUnk_0800DA60.inc                |  21 +-
 data/scripts/gUnk_0800DB18.inc                |   2 +-
 data/scripts/gUnk_0800DB28.inc                |   2 +-
 data/scripts/gUnk_0800DB78.inc                |  36 ++-
 data/scripts/gUnk_0800DC4C.inc                |  16 +-
 data/scripts/gUnk_0800DCAC.inc                |  13 +-
 data/scripts/gUnk_0800DDD0.inc                |   7 +-
 data/scripts/gUnk_0800DE00.inc                |   2 +-
 data/scripts/gUnk_0800DE2C.inc                |   2 +-
 data/scripts/gUnk_0800DE50.inc                |   9 +-
 data/scripts/gUnk_0800DE78.inc                |   8 +-
 data/scripts/gUnk_0800DEB0.inc                |   2 +-
 data/scripts/gUnk_0800DED4.inc                |   6 +-
 data/scripts/gUnk_0800DF24.inc                |  16 +-
 data/scripts/gUnk_0800DFB4.inc                |   9 +-
 data/scripts/gUnk_0800DFE4.inc                |  13 +-
 data/scripts/gUnk_0800E050.inc                |   6 +-
 data/scripts/gUnk_0800E094.inc                |   2 +-
 data/scripts/gUnk_0800E0BC.inc                | 103 +++-----
 data/scripts/gUnk_0800E504.inc                |   2 +-
 data/scripts/gUnk_0800E544.inc                |   4 +-
 data/scripts/gUnk_0800E58C.inc                |   2 +-
 data/scripts/gUnk_0800E5D6.inc                |   2 +-
 data/scripts/gUnk_0800E600.inc                |   6 +-
 data/scripts/gUnk_0800E62C.inc                |   6 +-
 data/scripts/gUnk_0800E658.inc                |   6 +-
 data/scripts/gUnk_0800E684.inc                |   6 +-
 data/scripts/gUnk_0800E6B0.inc                |  58 ++---
 data/scripts/gUnk_0800E8A4.inc                |   7 +-
 data/scripts/gUnk_0800E8D6.inc                |   7 +-
 data/scripts/gUnk_0800E908.inc                |  24 +-
 data/scripts/gUnk_0800E9F4.inc                |  11 +
 data/scripts/gUnk_0800EA1C.inc                |   2 +-
 data/scripts/gUnk_0800EA54.inc                | 146 +++++------
 data/scripts/gUnk_0800EF40.inc                |   6 +-
 data/scripts/gUnk_0800EF9C.inc                |   2 +-
 data/scripts/gUnk_0800EFC0.inc                |  54 ++--
 data/scripts/gUnk_0800F14C.inc                |   2 +-
 data/scripts/gUnk_0800F184.inc                |  40 ++-
 data/scripts/gUnk_0800F33C.inc                |   2 +-
 data/scripts/gUnk_0800F354.inc                |   2 +-
 data/scripts/gUnk_0800F36C.inc                |   2 +-
 data/scripts/gUnk_0800F384.inc                |   2 +-
 data/scripts/gUnk_0800F39C.inc                |   2 +-
 data/scripts/gUnk_0800F430.inc                |   2 +-
 data/scripts/gUnk_0800F4C4.inc                |   2 +-
 data/scripts/gUnk_0800F554.inc                |  49 ++--
 data/scripts/gUnk_0800F724.inc                | 101 ++++----
 data/scripts/gUnk_0800FA54.inc                |   2 +-
 data/scripts/gUnk_0800FA78.inc                |   2 +-
 data/scripts/gUnk_0800FA9C.inc                |   2 +-
 data/scripts/gUnk_0800FAC0.inc                |   2 +-
 data/scripts/gUnk_0800FAE4.inc                |  14 +-
 data/scripts/gUnk_0800FB2C.inc                |   2 +-
 data/scripts/gUnk_0800FB44.inc                |   6 +-
 data/scripts/gUnk_0800FD0C.inc                |  16 +-
 data/scripts/gUnk_0800FD80.inc                |   9 +
 data/scripts/gUnk_0800FDA0.inc                |  32 ++-
 data/scripts/gUnk_0800FF18.inc                |  14 +-
 data/scripts/gUnk_0800FF74.inc                |  57 ++---
 data/scripts/gUnk_080100C8.inc                |  65 +++--
 data/scripts/gUnk_08010264.inc                | 174 ++++++-------
 data/scripts/gUnk_08010964.inc                |  16 +-
 data/scripts/gUnk_080109F0.inc                |   2 +-
 data/scripts/gUnk_08010A14.inc                |   2 +-
 data/scripts/gUnk_08010A38.inc                |   2 +-
 data/scripts/gUnk_08010A5C.inc                |   8 +-
 data/scripts/gUnk_08010A98.inc                |  43 ++--
 data/scripts/gUnk_08010B68.inc                |   4 +-
 data/scripts/gUnk_08010BB4.inc                |  48 ++--
 data/scripts/gUnk_08010E5A.inc                |  46 ++--
 data/scripts/gUnk_08010F84.inc                |  40 ++-
 data/scripts/gUnk_08011074.inc                |   2 +-
 data/scripts/gUnk_08011098.inc                |   2 +-
 data/scripts/gUnk_080110BC.inc                |   2 +-
 data/scripts/gUnk_080110E8.inc                |   8 +-
 data/scripts/gUnk_08011128.inc                |   2 +-
 data/scripts/gUnk_080111CC.inc                |  14 +-
 data/scripts/gUnk_080112C4.inc                |   8 +-
 data/scripts/gUnk_080113AA.inc                |   2 +-
 data/scripts/gUnk_08011442.inc                |   2 +-
 data/scripts/gUnk_08011508.inc                |   2 +-
 data/scripts/gUnk_08011640.inc                |   4 +-
 data/scripts/gUnk_080116A8.inc                |  22 +-
 data/scripts/gUnk_0801183C.inc                |   4 +-
 data/scripts/gUnk_08011890.inc                |   8 +-
 data/scripts/gUnk_080118D4.inc                |  10 +-
 data/scripts/gUnk_08011930.inc                |   2 +-
 data/scripts/gUnk_0801194C.inc                |  75 +++---
 data/scripts/gUnk_08011B20.inc                |   4 +-
 data/scripts/gUnk_08011B40.inc                |  23 +-
 data/scripts/gUnk_08011C50.inc                |   5 +-
 data/scripts/gUnk_08011C7C.inc                |  42 +--
 data/scripts/gUnk_0801232C.inc                |   8 +-
 data/scripts/gUnk_08012410.inc                |   2 +-
 data/scripts/gUnk_08012430.inc                |  51 ++--
 data/scripts/gUnk_080126FC.inc                |  63 +++--
 data/scripts/gUnk_08012AB0.inc                |  11 -
 data/scripts/gUnk_08012AC8.inc                |  12 +
 data/scripts/gUnk_08012AF0.inc                |   2 +-
 data/scripts/gUnk_08012B18.inc                |   2 +-
 data/scripts/gUnk_08012B24.inc                |   7 +-
 data/scripts/gUnk_08012B50.inc                |   7 +-
 data/scripts/gUnk_08012B7C.inc                |   7 +-
 data/scripts/gUnk_08012C68.inc                |   6 +-
 data/scripts/gUnk_08012CD8.inc                |   4 +-
 data/scripts/gUnk_08012D18.inc                |   8 +-
 data/scripts/gUnk_08012D70.inc                |   8 +-
 data/scripts/gUnk_08012DB0.inc                |   2 +-
 data/scripts/gUnk_08012DD8.inc                |   2 +-
 data/scripts/gUnk_08012E20.inc                |   2 +-
 data/scripts/gUnk_08012E88.inc                |  23 +-
 data/scripts/gUnk_08012F0C.inc                |  11 +-
 data/scripts/gUnk_08012F86.inc                |  51 ++--
 data/scripts/gUnk_080130E4.inc                |  14 +
 data/scripts/gUnk_08013114.inc                |  23 +-
 data/scripts/gUnk_0801319A.inc                |  26 +-
 data/scripts/gUnk_080132E4.inc                |   2 +-
 data/scripts/gUnk_0801330C.inc                |   2 +-
 data/scripts/gUnk_08013330.inc                |   2 +-
 data/scripts/gUnk_0801334C.inc                |   2 +-
 data/scripts/gUnk_08013378.inc                |  12 +-
 data/scripts/gUnk_080133C4.inc                |   4 +-
 data/scripts/gUnk_080133F8.inc                |  11 +-
 data/scripts/gUnk_08013494.inc                |  10 +-
 data/scripts/gUnk_080134DC.inc                |  79 +++---
 data/scripts/gUnk_08013650.inc                |  13 +-
 data/scripts/gUnk_080136B4.inc                |   2 +-
 data/scripts/gUnk_080136D8.inc                |  14 +-
 data/scripts/gUnk_08013720.inc                |  83 +++---
 data/scripts/gUnk_080138B4.inc                | 115 ++++-----
 data/scripts/gUnk_08013AA6.inc                |  11 +-
 data/scripts/gUnk_08013B18.inc                |  29 +--
 data/scripts/gUnk_08013B70.inc                |  16 ++
 data/scripts/gUnk_08013BA8.inc                |  16 +-
 data/scripts/gUnk_08013BE8.inc                |  12 +-
 data/scripts/gUnk_08013CA4.inc                |  12 +-
 data/scripts/gUnk_08013D04.inc                |  14 +-
 data/scripts/gUnk_08013D44.inc                |  14 +-
 data/scripts/gUnk_08013D84.inc                |  14 +-
 data/scripts/gUnk_08013DC4.inc                |  14 +-
 data/scripts/gUnk_08013E94.inc                |   2 +-
 data/scripts/gUnk_08013EB0.inc                |   2 +-
 data/scripts/gUnk_08013ECC.inc                |   2 +-
 data/scripts/gUnk_08013EE8.inc                |   2 +-
 data/scripts/gUnk_08013F04.inc                |   2 +-
 data/scripts/gUnk_08013F34.inc                |   2 +-
 data/scripts/gUnk_08013F64.inc                |   2 +-
 data/scripts/gUnk_08013F94.inc                |   6 +-
 data/scripts/gUnk_08013FE8.inc                |  13 +-
 data/scripts/gUnk_08014054.inc                |   2 +-
 data/scripts/gUnk_08014074.inc                |   2 +-
 data/scripts/gUnk_08014094.inc                |   2 +-
 data/scripts/gUnk_080140B8.inc                |   2 +-
 data/scripts/gUnk_080140DC.inc                |   4 +-
 data/scripts/gUnk_08014118.inc                |   4 +-
 data/scripts/gUnk_08014154.inc                |   4 +-
 data/scripts/gUnk_08014198.inc                |   4 +-
 data/scripts/gUnk_080141DC.inc                |   9 +-
 data/scripts/gUnk_08014210.inc                |  11 +-
 data/scripts/gUnk_08014248.inc                |  17 +-
 data/scripts/gUnk_080142B0.inc                |   4 +-
 data/scripts/gUnk_08014384.inc                |   2 +-
 data/scripts/gUnk_080143C0.inc                |  16 +-
 data/scripts/gUnk_08014450.inc                |   4 +-
 data/scripts/gUnk_0801450C.inc                |  10 +-
 data/scripts/gUnk_08014588.inc                |   2 +-
 data/scripts/gUnk_080145E8.inc                |  29 +--
 data/scripts/gUnk_080147DC.inc                |  10 +
 data/scripts/gUnk_08014804.inc                |  10 +-
 data/scripts/gUnk_08014958.inc                |   8 +-
 data/scripts/gUnk_080149CC.inc                |  12 +-
 data/scripts/gUnk_08014A80.inc                |  13 +-
 data/scripts/gUnk_08014B10.inc                |  10 +
 data/scripts/gUnk_08014B34.inc                |  30 +--
 data/scripts/gUnk_08014CDC.inc                |  29 +--
 data/scripts/gUnk_08014DCC.inc                |   8 +-
 data/scripts/gUnk_08014E14.inc                | 119 ++++-----
 data/scripts/gUnk_08015234.inc                |   6 +-
 data/scripts/gUnk_080152B4.inc                |   2 +-
 data/scripts/gUnk_080152DC.inc                |   2 +-
 data/scripts/gUnk_08015304.inc                |   2 +-
 data/scripts/gUnk_08015338.inc                |   2 +-
 data/scripts/gUnk_08015360.inc                |   2 +-
 data/scripts/gUnk_08015384.inc                |   2 +-
 data/scripts/gUnk_08015390.inc                |   8 +-
 data/scripts/gUnk_080153EC.inc                |   5 +-
 data/scripts/gUnk_0801548E.inc                |  10 +-
 data/scripts/gUnk_0801550C.inc                |  39 ++-
 data/scripts/gUnk_08015618.inc                |  16 +-
 data/scripts/gUnk_08015684.inc                |  11 +-
 data/scripts/gUnk_08015754.inc                |   6 +-
 data/scripts/gUnk_080157AC.inc                |  30 +--
 data/scripts/gUnk_080158F8.inc                |   2 +-
 data/scripts/gUnk_08015918.inc                |   2 +-
 data/scripts/gUnk_08015938.inc                |   2 +-
 data/scripts/gUnk_08015958.inc                |  10 +-
 data/scripts/gUnk_08015A7C.inc                |   2 +-
 data/scripts/gUnk_08015AA0.inc                |   2 +-
 data/scripts/gUnk_08015AC4.inc                |   2 +-
 data/scripts/gUnk_08015B34.inc                |  13 +-
 data/scripts/gUnk_08015B84.inc                |   2 +-
 data/scripts/gUnk_08015BA8.inc                |   2 +-
 data/scripts/gUnk_08015BE8.inc                |  16 +-
 data/scripts/gUnk_08015C7C.inc                |  16 +-
 data/scripts/gUnk_08015E58.inc                |   8 +-
 data/scripts/gUnk_08015FA4.inc                |   2 +-
 data/scripts/gUnk_08015FC0.inc                |   9 +-
 data/scripts/gUnk_08016004.inc                |   2 +-
 data/scripts/gUnk_080160A8.inc                |  82 +++---
 data/scripts/gUnk_0801635C.inc                |   8 +
 data/scripts/gUnk_0801637C.inc                |  68 +----
 data/scripts/gUnk_08016384.inc                |  64 +++++
 data/scripts/gUnk_08016482.inc                |   2 +-
 data/scripts/gUnk_080165A4.inc                | 240 +-----------------
 data/scripts/gUnk_080165D8.inc                | 239 +++++++++++++++++
 tools/script_disassembler/incbin_parser.py    |  33 ++-
 .../script_disassembler.py                    |  53 ++--
 359 files changed, 2774 insertions(+), 3074 deletions(-)
 create mode 100644 data/scripts/gUnk_0800A088.inc
 create mode 100644 data/scripts/gUnk_0800ACE0.inc
 create mode 100644 data/scripts/gUnk_0800AD54.inc
 create mode 100644 data/scripts/gUnk_0800B7C4.inc
 create mode 100644 data/scripts/gUnk_0800C8C8.inc
 create mode 100644 data/scripts/gUnk_0800D190.inc
 create mode 100644 data/scripts/gUnk_0800D3EC.inc
 create mode 100644 data/scripts/gUnk_0800E9F4.inc
 create mode 100644 data/scripts/gUnk_0800FD80.inc
 create mode 100644 data/scripts/gUnk_08012AC8.inc
 create mode 100644 data/scripts/gUnk_080130E4.inc
 create mode 100644 data/scripts/gUnk_08013B70.inc
 create mode 100644 data/scripts/gUnk_080147DC.inc
 create mode 100644 data/scripts/gUnk_08014B10.inc
 create mode 100644 data/scripts/gUnk_0801635C.inc
 create mode 100644 data/scripts/gUnk_08016384.inc
 create mode 100644 data/scripts/gUnk_080165D8.inc

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 93cb0e0b..bb359218 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -47,7 +47,7 @@
 	.word \w
 .endm
 
-.macro _0807E0E0 a,b
+.macro _0807E0E0 a, b
 	.short 0x140a
 	.word \a
 	.word \b
diff --git a/data/scripts.s b/data/scripts.s
index 6864ebf2..1382c174 100644
--- a/data/scripts.s
+++ b/data/scripts.s
@@ -47,6 +47,7 @@
 	.include "data/scripts/gUnk_08009ECC.inc"
 	.include "data/scripts/gUnk_08009EF0.inc"
 	.include "data/scripts/gUnk_08009F14.inc"
+	.include "data/scripts/gUnk_0800A088.inc"
 	.include "data/scripts/gUnk_0800A0B4.inc"
 	.include "data/scripts/gUnk_0800A0FC.inc"
 	.include "data/scripts/gUnk_0800A160.inc"
@@ -78,6 +79,8 @@
 	.include "data/scripts/gUnk_0800AB08.inc"
 	.include "data/scripts/gUnk_0800AB6E.inc"
 	.include "data/scripts/gUnk_0800ACBC.inc"
+	.include "data/scripts/gUnk_0800ACE0.inc"
+	.include "data/scripts/gUnk_0800AD54.inc"
 	.include "data/scripts/gUnk_0800AEA4.inc"
 	.include "data/scripts/gUnk_0800AEDC.inc"
 	.include "data/scripts/gUnk_0800AF18.inc"
@@ -101,6 +104,7 @@
 	.include "data/scripts/gUnk_0800B5C4.inc"
 	.include "data/scripts/gUnk_0800B5EC.inc"
 	.include "data/scripts/gUnk_0800B6C8.inc"
+	.include "data/scripts/gUnk_0800B7C4.inc"
 	.include "data/scripts/gUnk_0800B7FC.inc"
 	.include "data/scripts/gUnk_0800B828.inc"
 	.include "data/scripts/gUnk_0800B9B4.inc"
@@ -132,6 +136,7 @@
 	.include "data/scripts/gUnk_0800C4D0.inc"
 	.include "data/scripts/gUnk_0800C50C.inc"
 	.include "data/scripts/gUnk_0800C550.inc"
+	.include "data/scripts/gUnk_0800C8C8.inc"
 	.include "data/scripts/gUnk_0800C8F0.inc"
 	.include "data/scripts/gUnk_0800C91C.inc"
 	.include "data/scripts/gUnk_0800CA8C.inc"
@@ -141,6 +146,7 @@
 	.include "data/scripts/gUnk_0800CC6C.inc"
 	.include "data/scripts/gUnk_0800CD04.inc"
 	.include "data/scripts/gUnk_0800CD7C.inc"
+	.include "data/scripts/gUnk_0800D190.inc"
 	.include "data/scripts/gUnk_0800D1B4.inc"
 	.include "data/scripts/gUnk_0800D1E0.inc"
 	.include "data/scripts/gUnk_0800D218.inc"
@@ -148,6 +154,7 @@
 	.include "data/scripts/gUnk_0800D24C.inc"
 	.include "data/scripts/gUnk_0800D254.inc"
 	.include "data/scripts/gUnk_0800D278.inc"
+	.include "data/scripts/gUnk_0800D3EC.inc"
 	.include "data/scripts/gUnk_0800D414.inc"
 	.include "data/scripts/gUnk_0800D698.inc"
 	.include "data/scripts/gUnk_0800D6B4.inc"
@@ -193,6 +200,7 @@
 	.include "data/scripts/gUnk_0800E8A4.inc"
 	.include "data/scripts/gUnk_0800E8D6.inc"
 	.include "data/scripts/gUnk_0800E908.inc"
+	.include "data/scripts/gUnk_0800E9F4.inc"
 	.include "data/scripts/gUnk_0800EA1C.inc"
 	.include "data/scripts/gUnk_0800EA54.inc"
 	.include "data/scripts/gUnk_0800EF40.inc"
@@ -217,6 +225,7 @@
 	.include "data/scripts/gUnk_0800FB2C.inc"
 	.include "data/scripts/gUnk_0800FB44.inc"
 	.include "data/scripts/gUnk_0800FD0C.inc"
+	.include "data/scripts/gUnk_0800FD80.inc"
 	.include "data/scripts/gUnk_0800FDA0.inc"
 	.include "data/scripts/gUnk_0800FF18.inc"
 	.include "data/scripts/gUnk_0800FF74.inc"
@@ -261,6 +270,7 @@
 	.include "data/scripts/gUnk_08012430.inc"
 	.include "data/scripts/gUnk_080126FC.inc"
 	.include "data/scripts/gUnk_08012AB0.inc"
+	.include "data/scripts/gUnk_08012AC8.inc"
 	.include "data/scripts/gUnk_08012AF0.inc"
 	.include "data/scripts/gUnk_08012B18.inc"
 	.include "data/scripts/gUnk_08012B24.inc"
@@ -281,6 +291,7 @@
 	.include "data/scripts/gUnk_08012E88.inc"
 	.include "data/scripts/gUnk_08012F0C.inc"
 	.include "data/scripts/gUnk_08012F86.inc"
+	.include "data/scripts/gUnk_080130E4.inc"
 	.include "data/scripts/gUnk_08013114.inc"
 	.include "data/scripts/gUnk_0801319A.inc"
 	.include "data/scripts/gUnk_080132E4.inc"
@@ -299,6 +310,7 @@
 	.include "data/scripts/gUnk_080138B4.inc"
 	.include "data/scripts/gUnk_08013AA6.inc"
 	.include "data/scripts/gUnk_08013B18.inc"
+	.include "data/scripts/gUnk_08013B70.inc"
 	.include "data/scripts/gUnk_08013BA8.inc"
 	.include "data/scripts/gUnk_08013BE8.inc"
 	.include "data/scripts/gUnk_08013CA4.inc"
@@ -338,10 +350,12 @@
 	.include "data/scripts/gUnk_08014588.inc"
 	.include "data/scripts/gUnk_080145B0.inc"
 	.include "data/scripts/gUnk_080145E8.inc"
+	.include "data/scripts/gUnk_080147DC.inc"
 	.include "data/scripts/gUnk_08014804.inc"
 	.include "data/scripts/gUnk_08014958.inc"
 	.include "data/scripts/gUnk_080149CC.inc"
 	.include "data/scripts/gUnk_08014A80.inc"
+	.include "data/scripts/gUnk_08014B10.inc"
 	.include "data/scripts/gUnk_08014B34.inc"
 	.include "data/scripts/gUnk_08014CDC.inc"
 	.include "data/scripts/gUnk_08014DCC.inc"
@@ -389,6 +403,9 @@
 	.include "data/scripts/gUnk_0801606C.inc"
 	.include "data/scripts/gUnk_0801609E.inc"
 	.include "data/scripts/gUnk_080160A8.inc"
+	.include "data/scripts/gUnk_0801635C.inc"
 	.include "data/scripts/gUnk_0801637C.inc"
+	.include "data/scripts/gUnk_08016384.inc"
 	.include "data/scripts/gUnk_08016482.inc"
 	.include "data/scripts/gUnk_080165A4.inc"
+	.include "data/scripts/gUnk_080165D8.inc"
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc
index d357d2c7..256d6033 100644
--- a/data/scripts/gUnk_08008B5C.inc
+++ b/data/scripts/gUnk_08008B5C.inc
@@ -8,8 +8,8 @@ StopScript
 _0807E944 
 _0807E864 
 _0807E930 0x0004
-Call 0x0807f2d5
-Call 0x0806bbb1
+Call sub_0807F2D4
+Call sub_0806BBB0
 _0807EA94 
 _0807E930 0x0008
 _0807E878 
@@ -24,7 +24,7 @@ StopScript
 _0807E944 
 _0807E864 
 _0807E930 0x0004
-Call 0x0807f2d5
+Call sub_0807F2D4
 TextboxNoOverlapFollow 0x4912
 _0807EA94 
 _0807E930 0x0008
@@ -40,25 +40,23 @@ _0807E944
 _0807E864 
 SetGlobalFlag 0x0061
 _0807E930 0x0004
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EA94 
-Call 0x0806ba35
+Call sub_0806BA34
 JumpIfNot 0x0066
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbb1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BB1C
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x0807f2d5
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbb1d
-.short 0x0806
+Call sub_0807F2D4
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BB1C
 .short 0x0001
 .short 0x0000
 @ End of parameters
-Call 0x0806bb7d
+Call sub_0806BB7C
 JumpIfNot 0x0048
 TextboxNoOverlap 0x490c
 _0807EA94 
@@ -68,11 +66,11 @@ WaitForSomething 0x00000004
 Wait 0x000f
 SoundReq 0x0072
 _0807E930 0x0004
-Call 0x0807f2d5
+Call sub_0807F2D4
 TextboxNoOverlap 0x4913
 _0807EA94 
 _0807E930 0x0008
-Call 0x0807f2d5
+Call sub_0807F2D4
 Jump 0x000a
 _0807E930 0x0008
 Wait 0x000f
@@ -91,15 +89,15 @@ WaitForSomething 0x00000002
 TextboxNoOverlap 0x490d
 _0807EA94 
 _0807EF80 0x0007
-Call 0x08064d09
+Call sub_08064D08
 _0807EDD4 0x0068, 0x0078
-Call 0x08064d11
+Call sub_08064D10
 Wait 0x000f
 _0807EB44 0x0002
 Wait 0x000f
-Call 0x08064d09
+Call sub_08064D08
 _0807EDD4 0x0098, 0x0078
-Call 0x08064d11
+Call sub_08064D10
 Wait 0x000f
 _0807EB44 0x0004
 SoundReq 0x007f
@@ -118,15 +116,15 @@ SoundReq 0x007f
 Wait 0x000f
 _0807EB44 0x0006
 Wait 0x001e
-Call 0x08064d09
+Call sub_08064D08
 _0807EDD4 0x0068, 0x0078
-Call 0x08064d11
+Call sub_08064D10
 Wait 0x000f
 _0807EB44 0x0000
 Wait 0x000f
-Call 0x08064d09
+Call sub_08064D08
 _0807EDD4 0x0068, 0x0018
-Call 0x08064d11
+Call sub_08064D10
 SoundReq 0x0121
 _0807E5F8 0x00000001
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc
index 2482561b..cd4ffd46 100644
--- a/data/scripts/gUnk_08008D8C.inc
+++ b/data/scripts/gUnk_08008D8C.inc
@@ -1,15 +1,15 @@
 SCRIPT_START gUnk_08008D8C
 StartScript 
-Call 0x08061fd9
-Call 0x08061e71
+Call sub_08061FD8
+Call sub_08061E70
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 Jump 0xffe4
@@ -18,9 +18,8 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -29,19 +28,17 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x080643d9
+Call sub_080643D8
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -52,13 +49,13 @@ StopScript
 CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807F0B4 0x0001
 CameraTargetEntity 
 WaitForPlayerAction0x17 
 Wait 0x003c
-StartPlayerScript 0x08008f74
+StartPlayerScript gUnk_08008F74
 WaitForSomething2 0x00000020
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
@@ -95,7 +92,7 @@ _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 _0807F034 0x0035
 WaitPlayerAction8 
-StartPlayerScript 0x08008fc0
+StartPlayerScript gUnk_08008FC0
 WaitForSomething2 0x00000020
 _0807E8E4_0 
 _0807E5F8 0x00000080
@@ -110,15 +107,15 @@ WaitForSomething2 0x00000002
 _0807F034 0x0047
 WaitPlayerAction8 
 _0807E914 0x00000003
-Call 0x0807f421
+Call sub_0807F420
 _0807E8E4_0 
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
 _0807F0B4 0x0004
 CameraTargetPlayer 
 SetGlobalFlag 0x0015
-Call 0x0806dcc1
-Call 0x0807df51
+Call sub_0806DCC0
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08008F74.inc b/data/scripts/gUnk_08008F74.inc
index 6f668430..7fe1aeee 100644
--- a/data/scripts/gUnk_08008F74.inc
+++ b/data/scripts/gUnk_08008F74.inc
@@ -14,6 +14,6 @@ _0807EB44 0x0000
 _0807EF80 0x0000
 Wait 0x000f
 _0807E5F8 0x00000020
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc
index 2b69830e..37470012 100644
--- a/data/scripts/gUnk_08008FC0.inc
+++ b/data/scripts/gUnk_08008FC0.inc
@@ -1,25 +1,23 @@
 SCRIPT_START gUnk_08008FC0
 _0807F078 0x0001, 0x0001
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf919
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F918
 .short 0x0001
 .short 0x0000
 @ End of parameters
 SoundReq 0x0109
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
 .short 0x045f
 .short 0x0000
 @ End of parameters
-Call 0x0807f305
+Call sub_0807F304
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x0501
 .short 0x000e
 @ End of parameters
 _0807EA94 
 _0807E5F8 0x00000020
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc
index e03d6144..f737d7bd 100644
--- a/data/scripts/gUnk_0800903C.inc
+++ b/data/scripts/gUnk_0800903C.inc
@@ -17,7 +17,7 @@ _0807EF80 0x000a
 Jump 0x0202
 .short 0x0000
 StartScript 
-Call 0x0807f349
+Call sub_0807F348
 SetEntityNonPlanarMovement 0x0100
 _0807EB44 0x0004
 _0807EF80 0x0000
@@ -97,13 +97,13 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806673d
+Call sub_0806673C
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffe6
 StartScript 
-Call 0x0807f349
+Call sub_0807F348
 _0807EB44 0x0006
 _0807EF80 0x0000
 StopScript 
@@ -170,14 +170,14 @@ Jump 0x0042
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x080668f1
+Call sub_080668F0
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08066905
+Call sub_08066904
 _0807EA94 
 Wait 0x000f
 _0807E878 
@@ -201,14 +201,14 @@ Jump 0xffe8
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x0806672d
+Call sub_0806672C
 _0807EF80 0x000a
 StopScript 
 Jump 0xfe90
 .short 0x0000
 StartScript 
 _0807EF80 0x000a
-Call 0x08066e39
+Call sub_08066E38
 _0807E9D4 
 StopScript 
 CheckEntityInteractType 
diff --git a/data/scripts/gUnk_08009320.inc b/data/scripts/gUnk_08009320.inc
index 090040a3..381ac07b 100644
--- a/data/scripts/gUnk_08009320.inc
+++ b/data/scripts/gUnk_08009320.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009320
 StartScript 
-Call 0x0806d651
+Call sub_0806D650
 SetEntityNonPlanarMovement 0x0010
 StopScript 
 _0807EEF4 0xfff8, 0x0000
diff --git a/data/scripts/gUnk_08009348.inc b/data/scripts/gUnk_08009348.inc
index 9ef9c57c..cf893fae 100644
--- a/data/scripts/gUnk_08009348.inc
+++ b/data/scripts/gUnk_08009348.inc
@@ -5,8 +5,8 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
-Call 0x0806d639
+Call sub_0807DF28
+Call sub_0806D638
 _0807F0B4 0x0001
 CameraTargetEntity 
 CheckGlobalFlag 0x0055
@@ -14,12 +14,12 @@ JumpIf 0x002c
 TextboxNoOverlap 0x1d01
 _0807EA94 
 _0807EA94 
-Call 0x0806d641
+Call sub_0806D640
 _0807F0B4 0x0001
 CameraTargetPlayer 
 Wait 0x002d
 _0807F0B4 0x0004
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 Jump 0xffb8
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/gUnk_0800939A.inc
index 2ba22ab9..ac7a4ad8 100644
--- a/data/scripts/gUnk_0800939A.inc
+++ b/data/scripts/gUnk_0800939A.inc
@@ -10,10 +10,10 @@ _0807EA94
 Jump 0xffbc
 CheckInventory1 0x000e
 JumpIfNot 0x0018
-Call 0x0806d789
+Call sub_0806D788
 TextboxNoOverlap 0x1d03
 _0807EA94 
-Call 0x0806d70d
+Call sub_0806D70C
 Jump 0xff9e
 _0807E914 0x00001d05
 CheckLocalFlag 0x00ad
@@ -28,24 +28,24 @@ TextboxNoOverlap 0x1d08
 _0807EA94 
 LoadRoomEntityList 0x080f9c38
 Wait 0x0078
-Call 0x0806d6d1
+Call sub_0806D6D0
 Wait 0x00b4
-Call 0x0806d70d
+Call sub_0806D70C
 Wait 0x0078
 SetLocalFlag 0x00ae
 SetLocalFlag 0x00ad
-Call 0x0806d5d5
+Call sub_0806D5D4
 _0807EB8C 
 TextboxNoOverlap 0x1d09
 _0807EA94 
 Wait 0x000a
 Jump 0xff3a
-Call 0x0806d601
+Call sub_0806D600
 JumpIf 0x000c
 TextboxNoOverlap 0x1d0a
 _0807EA94 
 JumpIfNot 0xff26
 TextboxNoOverlap 0x1d0b
 _0807EA94 
-Call 0x0806d74d
+Call sub_0806D74C
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/gUnk_08009464.inc
index b3819468..bf533b64 100644
--- a/data/scripts/gUnk_08009464.inc
+++ b/data/scripts/gUnk_08009464.inc
@@ -3,10 +3,10 @@ Wait 0x003c
 _0807F0C8 0x0000, 0x0000
 LoadRoomEntityList 0x080f9c58
 Wait 0x003c
-Call 0x0806d70d
+Call sub_0806D70C
 Wait 0x003c
 ClearLocalFlag 0x00ae
-Call 0x0806d621
+Call sub_0806D620
 Wait 0x003c
 WaitPlayerAction8 
 _0807EB8C 
@@ -16,7 +16,7 @@ Wait 0x000a
 Jump 0xfed6
 .short 0x0000
 StartScript 
-Call 0x0806d7c5
+Call sub_0806D7C4
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 Wait 0x003c
diff --git a/data/scripts/gUnk_080094CC.inc b/data/scripts/gUnk_080094CC.inc
index c5645f6e..9cd6240f 100644
--- a/data/scripts/gUnk_080094CC.inc
+++ b/data/scripts/gUnk_080094CC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START gUnk_080094CC
 StartScript 
-Call 0x0806d805
+Call sub_0806D804
 SetEntityNonPlanarMovement 0x0180
 StopScript 
 Wait 0x003c
 SetEntity0x20 0x00018000
-Call 0x0806d859
+Call sub_0806D858
 _0807EE30 
 JumpIfNot 0xfffc
 Wait 0x001e
diff --git a/data/scripts/gUnk_080094FC.inc b/data/scripts/gUnk_080094FC.inc
index 74183f6a..75784bd1 100644
--- a/data/scripts/gUnk_080094FC.inc
+++ b/data/scripts/gUnk_080094FC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_080094FC
 StartScript 
-Call 0x08067101
+Call sub_08067100
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807EF80 0x0000
@@ -10,7 +10,7 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EF80 0x0001
 _0807EB74 
-Call 0x080670b5
+Call sub_080670B4
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
@@ -18,7 +18,7 @@ _0807EF80 0x0000
 Jump 0xffde
 .short 0x0000
 StartScript 
-Call 0x08067101
+Call sub_08067100
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807EF80 0x0000
@@ -28,7 +28,7 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EF80 0x0001
 _0807EB74 
-Call 0x080670e5
+Call sub_080670E4
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
@@ -36,33 +36,33 @@ _0807EF80 0x0000
 Jump 0xffde
 .short 0x0000
 StartScript 
-Call 0x08067315
+Call sub_08067314
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E914 0x00000000
-Call 0x080672b1
+Call sub_080672B0
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807E914 0x00000004
-Call 0x080672b1
-Call 0x080672c9
+Call sub_080672B0
+Call sub_080672C8
 _0807EA94 
 Wait 0x000f
 _0807E878 
 _0807EB44 0x0004
 _0807E914 0x00000000
-Call 0x080672b1
+Call sub_080672B0
 Jump 0xffca
 .short 0x0000
 StartScript 
-Call 0x0806be3d
+Call sub_0806BE3C
 _0807EF80 0x000a
 _0807EF80 0x0007
 StopScript 
-Call 0x0806bf45
+Call sub_0806BF44
 JumpIf 0x000c
 _0807EF80 0x000b
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/gUnk_080095F2.inc
index 8caf6bad..c7fb01e5 100644
--- a/data/scripts/gUnk_080095F2.inc
+++ b/data/scripts/gUnk_080095F2.inc
@@ -4,7 +4,7 @@ JumpIfNot 0xffe8
 _0807E864 
 _0807EB74 
 _0807EF80 0x0001
-Call 0x0806be85
+Call sub_0806BE84
 _0807EA94 
 JumpIfNot 0x0018
 SoundReq 0x0109
@@ -25,10 +25,10 @@ StartScript
 CheckGlobalFlag 0x0020
 JumpIfNot 0xfff6
 StopScript 
-Call 0x0806bf45
+Call sub_0806BF44
 JumpIf 0xfff8
 StopScript 
-Call 0x0806be3d
+Call sub_0806BE3C
 _0807EF80 0x000a
 _0807EF80 0x0007
 CheckEntityInteractType 
@@ -36,13 +36,13 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0001
-Call 0x0806bec9
+Call sub_0806BEC8
 _0807EA94 
 JumpIfNot 0x0016
 SoundReq 0x0111
 SoundReq 0x0072
 _0807F078 0x003c, 0x0002
-Call 0x0806befd
+Call sub_0806BEFC
 _0807E878 
 _0807EF80 0x0000
 Jump 0xffca
@@ -55,9 +55,9 @@ StopScript
 CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x08009704
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_08009704
 WaitForSomething2 0x00000001
 SoundReq 0x0111
 _0807EF80 0x0008
@@ -67,7 +67,7 @@ SoundReq 0x0111
 _0807EF80 0x0007
 CheckGlobalFlag 0x0020
 JumpIfNot 0xfffa
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
-Call 0x0808692d
+Call sub_0808692C
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009704.inc b/data/scripts/gUnk_08009704.inc
index 715fd5d9..f2dbe820 100644
--- a/data/scripts/gUnk_08009704.inc
+++ b/data/scripts/gUnk_08009704.inc
@@ -11,5 +11,5 @@ _0807E5F8 0x00000001
 _0807EF80 0x000d
 SetEntityNonPlanarMovement 0x0100
 _0807ECC4 0x0010
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009740.inc b/data/scripts/gUnk_08009740.inc
index 7f7aed61..5f523eef 100644
--- a/data/scripts/gUnk_08009740.inc
+++ b/data/scripts/gUnk_08009740.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009740
 StartScript 
-Call 0x08065d01
+Call sub_08065D00
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
@@ -11,23 +11,23 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
-Call 0x08065f65
+Call sub_08065F64
 _0807EA94 
 _0807E878 
 Jump 0xffe6
 .short 0x0000
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 SoundReq 0x01f3
-Call 0x0807f40d
+Call sub_0807F40C
 _0807E8E4_1 
 Wait 0x000a
 _0807E8E4_3 
 Wait 0x0032
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-StartPlayerScript 0x0800987c
+StartPlayerScript gUnk_0800987C
 WaitForSomething2 0x00000040
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000010
@@ -39,7 +39,7 @@ _0807E8E4_3
 Wait 0x001e
 _0807EB28 0x2809
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080097F0.inc b/data/scripts/gUnk_080097F0.inc
index bff642f6..a6bab11d 100644
--- a/data/scripts/gUnk_080097F0.inc
+++ b/data/scripts/gUnk_080097F0.inc
@@ -3,18 +3,18 @@ StartScript
 _0807E930 0x0003
 _0807EF80 0x0007
 SetEntityNonPlanarMovement 0x0300
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 SoundReq 0x0123
-Call 0x0807f1a1
+Call sub_0807F1A0
 StopScript 
 StartScript 
 _0807EE30 
 JumpIfNot 0xfff8
 StopScript 
 _0807E5F8 0x00000004
-Call 0x0807fbd5
+Call sub_0807FBD4
 SoundReq 0x01f3
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009838.inc b/data/scripts/gUnk_08009838.inc
index 0d88acaf..3c5ae921 100644
--- a/data/scripts/gUnk_08009838.inc
+++ b/data/scripts/gUnk_08009838.inc
@@ -3,13 +3,13 @@ StartScript
 _0807E930 0x0003
 _0807EF80 0x0007
 SetEntityNonPlanarMovement 0x0300
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000008
-Call 0x0809e0a1
-Call 0x0809e0d5
+Call sub_0809E0A0
+Call sub_0809E0D4
 SoundReq 0x01f3
-Call 0x0807fbd5
+Call sub_0807FBD4
 SoundReq 0x01f3
 _0807E5F8 0x00000010
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800987C.inc b/data/scripts/gUnk_0800987C.inc
index dac50ce8..85662f4e 100644
--- a/data/scripts/gUnk_0800987C.inc
+++ b/data/scripts/gUnk_0800987C.inc
@@ -2,19 +2,19 @@ SCRIPT_START gUnk_0800987C
 SoundReq 0x007a
 _0807EB44 0x0004
 SoundReq 0x0086
-Call 0x0807f36d
+Call sub_0807F36C
 SetEntityNonPlanarMovement 0x0400
 _0807ECF4 0x0004
-Call 0x0807f1e9
+Call sub_0807F1E8
 Wait 0x001e
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000020
 SoundReq 0x007c
 _0807EB44 0x0004
-Call 0x0807f211
+Call sub_0807F210
 _0807EF3C 0x0200, 0x0020
 _0807EF80 0x0000
 _0807E5F8 0x00000040
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_080098D4.inc b/data/scripts/gUnk_080098D4.inc
index 49891782..ef2ea423 100644
--- a/data/scripts/gUnk_080098D4.inc
+++ b/data/scripts/gUnk_080098D4.inc
@@ -9,11 +9,11 @@ CheckLocalFlag 0x005d
 JumpIf 0x0022
 SetLocalFlag 0x005d
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807EB28 0x280a
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009918.inc b/data/scripts/gUnk_08009918.inc
index ad958eb6..e029d341 100644
--- a/data/scripts/gUnk_08009918.inc
+++ b/data/scripts/gUnk_08009918.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009918
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 _0807E5F8 0x00000000
 StopScript 
@@ -9,7 +9,7 @@ Wait 0x0078
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000001
 SetGlobalFlag 0x001c
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
-Call 0x0807921d
+Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009950.inc b/data/scripts/gUnk_08009950.inc
index d7c33754..c4f64c1e 100644
--- a/data/scripts/gUnk_08009950.inc
+++ b/data/scripts/gUnk_08009950.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009950
 StartScript 
-Call 0x0807f349
+Call sub_0807F348
 SetEntityNonPlanarMovement 0x0040
 _0807EB44 0x0004
 _0807E930 0x000c
@@ -33,5 +33,5 @@ Wait 0x001e
 _0807E778 0x0002
 DoFade5 
 WaitFor_2 
-Call 0x08053635
+Call sub_08053634
 SCRIPT_END
diff --git a/data/scripts/gUnk_080099DC.inc b/data/scripts/gUnk_080099DC.inc
index 5b644539..d8d125c3 100644
--- a/data/scripts/gUnk_080099DC.inc
+++ b/data/scripts/gUnk_080099DC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_080099DC
 StartScript 
-Call 0x0807f349
+Call sub_0807F348
 SetEntityNonPlanarMovement 0x00c0
 _0807EB44 0x0002
 _0807EF80 0x0008
diff --git a/data/scripts/gUnk_08009A34.inc b/data/scripts/gUnk_08009A34.inc
index 1b075e04..a75ff516 100644
--- a/data/scripts/gUnk_08009A34.inc
+++ b/data/scripts/gUnk_08009A34.inc
@@ -1,8 +1,8 @@
 SCRIPT_START gUnk_08009A34
 Wait 0x003c
-Call 0x08066259
+Call sub_08066258
 Wait 0x001e
-Call 0x08066259
+Call sub_08066258
 Wait 0x005a
 Jump 0xffea
 SetEntityPositionRelative 0x01780240
@@ -15,6 +15,6 @@ DoFade4
 WaitFor_2 
 Wait 0x0078
 _0807E5F8 0x00000004
-Call 0x08053649
+Call sub_08053648
 _0807EDD4 0x0240, 0x0228
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009AF8.inc b/data/scripts/gUnk_08009AF8.inc
index d2cdd178..ebcae1d4 100644
--- a/data/scripts/gUnk_08009AF8.inc
+++ b/data/scripts/gUnk_08009AF8.inc
@@ -11,6 +11,6 @@ Wait 0x005a
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-Call 0x0805367d
+Call sub_0805367C
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08009B30.inc b/data/scripts/gUnk_08009B30.inc
index e24ce455..4edd60e8 100644
--- a/data/scripts/gUnk_08009B30.inc
+++ b/data/scripts/gUnk_08009B30.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009B30
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 SetLocalFlag 0x0046
 StopScript 
@@ -9,12 +9,12 @@ Wait 0x001e
 TextboxNoOverlapFollow 0x1005
 _0807EA94 
 Wait 0x003c
-Call 0x0807529d
+Call sub_0807529C
 Wait 0x003c
 _0807EF80 0x0014
 Wait 0x001e
-Call 0x08053251
+Call sub_08053250
 _0807E878 
-Call 0x0807df51
-Call 0x080791d1
+Call sub_0807DF50
+Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc
index 0a299c0c..ed556529 100644
--- a/data/scripts/gUnk_08009B78.inc
+++ b/data/scripts/gUnk_08009B78.inc
@@ -3,15 +3,15 @@ StartScript
 _0807EB44 0x0006
 SetEntityNonPlanarMovement 0x0080
 _0807E9D4 
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckGlobalFlag 0x0013
 JumpIf 0x00ba
 _0807E888 
 Wait 0x000a
 _0807E864 
-StartPlayerScript 0x08009cfc
-Call 0x0807df29
+StartPlayerScript gUnk_08009CFC
+Call sub_0807DF28
 WaitForSomething2 0x00000008
 _0807EDD4 0x0080, 0x005c
 _0807EB44 0x0006
@@ -46,7 +46,7 @@ _0807EF80 0x000c
 _0807EF80 0x0000
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000008
-Call 0x08053251
+Call sub_08053250
 _0807F034 0x0034
 WaitPlayerAction8 
 _0807E8E4_1 
diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc
index d434771e..21105efe 100644
--- a/data/scripts/gUnk_08009C68.inc
+++ b/data/scripts/gUnk_08009C68.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08009C68
 StartScript 
 _0807EB44 0x0002
 SetEntityNonPlanarMovement 0x0100
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000004
 _0807EF80 0x0004
@@ -33,12 +33,12 @@ _0807EA94
 _0807EF80 0x0000
 _0807EDD4 0x0028, 0x0060
 _0807EDD4 0x0000, 0x0060
-Call 0x080536a9
+Call sub_080536A8
 Wait 0x001e
 StartScript 
 SetGlobalFlag 0x0013
-Call 0x0807df51
-Call 0x080791d1
+Call sub_0807DF50
+Call sub_080791D0
 _0807E878 
 StopScript 
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009D6C.inc b/data/scripts/gUnk_08009D6C.inc
index 9ef086b9..df0e7120 100644
--- a/data/scripts/gUnk_08009D6C.inc
+++ b/data/scripts/gUnk_08009D6C.inc
@@ -6,13 +6,13 @@ StopScript
 _0807EDD4 0x0078, 0x0060
 _0807EDD4 0x0078, 0x007c
 Wait 0x001e
-Call 0x0805368d
+Call sub_0805368C
 Wait 0x0008
 _0807EDD4 0x0078, 0x0098
 _0807EF80 0x0008
 _0807E778 0x0010
 DoFade5 
 WaitFor_2 
-Call 0x08053635
+Call sub_08053634
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009DB0.inc b/data/scripts/gUnk_08009DB0.inc
index 939e5d75..cf4d21a6 100644
--- a/data/scripts/gUnk_08009DB0.inc
+++ b/data/scripts/gUnk_08009DB0.inc
@@ -1,15 +1,15 @@
 SCRIPT_START gUnk_08009DB0
 StartScript 
-Call 0x0807f349
-Call 0x08066289
-Call 0x08066275
+Call sub_0807F348
+Call sub_08066288
+Call sub_08066274
 _0807EF80 0x000a
 _0807E930 0x000c
 _0807E908 0x0003
 StopScript 
 _0807E944 
 _0807E908 0x0002
-Call 0x0806622d
+Call sub_0806622C
 _0807EA94 
 _0807E908 0x0003
 _0807E930 0x000c
@@ -19,16 +19,16 @@ StopScript
 CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 Wait 0x0008
 _0807EB28 0x3207
 _0807E3E8 
 JumpIfNot 0x003e
-Call 0x0807df29
+Call sub_0807DF28
 _0807E778 0x0002
 DoFade5 
 WaitFor_2 
-Call 0x0804e865
+Call sub_0804E864
 Wait 0x001e
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
@@ -36,6 +36,6 @@ _0807EB28 0x3209
 Wait 0x000f
 _0807EA94 
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009E58.inc b/data/scripts/gUnk_08009E58.inc
index 630c3001..40af0a02 100644
--- a/data/scripts/gUnk_08009E58.inc
+++ b/data/scripts/gUnk_08009E58.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009E58
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 StopScript 
 WaitForSomething2 0x00000002
 _0807E778 0x0002
diff --git a/data/scripts/gUnk_08009E88.inc b/data/scripts/gUnk_08009E88.inc
index 4e439873..f7d12c39 100644
--- a/data/scripts/gUnk_08009E88.inc
+++ b/data/scripts/gUnk_08009E88.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08009E88
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 SetLocalFlag 0x009f
 StopScript 
@@ -8,12 +8,12 @@ Wait 0x003c
 _0807E778 0x0004
 DoFade4 
 WaitFor_2 
-Call 0x0807f0d9
+Call sub_0807F0D8
 JumpIfNot 0xfff8
 _0807EF80 0x0014
 Wait 0x000a
-Call 0x08053251
+Call sub_08053250
 _0807E878 
-Call 0x0807df51
-Call 0x080791d1
+Call sub_0807DF50
+Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc
index 136cbddb..4e9dd50f 100644
--- a/data/scripts/gUnk_08009F14.inc
+++ b/data/scripts/gUnk_08009F14.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08009F14
 StartScript 
 _0807EB44 0x0004
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 CheckKinstoneFused 0x001c
 JumpIf 0x00a8
@@ -10,16 +10,16 @@ JumpIf 0x0052
 StopScript 
 StopScript 
 StartScript 
-Call 0x08060159
+Call sub_08060158
 CheckEntityInteractType 
 JumpIfNot 0xfff2
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EF80 0x000b
-StartPlayerScript 0x0800a088
+StartPlayerScript gUnk_0800A088
 WaitForSomething2 0x00000002
-Call 0x0806014d
+Call sub_0806014C
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1f01
 .short 0x0000
@@ -29,21 +29,20 @@ Wait 0x001e
 _0807F034 0x0065
 WaitPlayerAction8 
 _0807EF80 0x000a
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 StopScript 
 StopScript 
 StartScript 
-Call 0x08060159
+Call sub_08060158
 CheckEntityInteractType 
 JumpIfNot 0xfff2
 StopScript 
 _0807E864 
-Call 0x080602bd
+Call sub_080602BC
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf971
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F970
 .short 0x1f03
 .short 0x0000
 @ End of parameters
@@ -52,9 +51,8 @@ _0807E878
 Jump 0xffd2
 Wait 0x0008
 SoundReq 0x0103
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x030d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806030C
 .short 0x0063
 .short 0x0000
 @ End of parameters
@@ -66,7 +64,7 @@ CheckLocalFlag 0x00b0
 JumpIf 0x004a
 StopScript 
 StartScript 
-Call 0x08060159
+Call sub_08060158
 CheckEntityInteractType 
 JumpIfNot 0xfff2
 StopScript 
@@ -79,7 +77,7 @@ _0807E878
 Jump 0xffdc
 Wait 0x0008
 _0807F034 0x0008
-Call 0x08060319
+Call sub_08060318
 WaitPlayerAction8 
 Wait 0x0008
 _0807EB8C 
@@ -89,7 +87,7 @@ SetLocalFlag 0x00b0
 _0807E878 
 StopScript 
 StartScript 
-Call 0x08060159
+Call sub_08060158
 CheckEntityInteractType 
 JumpIfNot 0xfff2
 StopScript 
@@ -110,7 +108,7 @@ _0807E878
 Jump 0xffc2
 Wait 0x0008
 _0807F034 0x0007
-Call 0x08060319
+Call sub_08060318
 WaitPlayerAction8 
 Wait 0x0008
 _0807EB8C 
@@ -119,14 +117,3 @@ _0807EA94
 _0807E878 
 Jump 0xffa0
 .short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807ECC4 0x0010
-_0807EDD4 0x0078, 0x0060
-_0807EB44 0x0000
-Wait 0x000f
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800A088.inc b/data/scripts/gUnk_0800A088.inc
new file mode 100644
index 00000000..e62b573e
--- /dev/null
+++ b/data/scripts/gUnk_0800A088.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800A088
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807ECC4 0x0010
+_0807EDD4 0x0078, 0x0060
+_0807EB44 0x0000
+Wait 0x000f
+_0807EF80 0x0000
+_0807E5F8 0x00000002
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800A0B4.inc b/data/scripts/gUnk_0800A0B4.inc
index f32de8ae..92f45a45 100644
--- a/data/scripts/gUnk_0800A0B4.inc
+++ b/data/scripts/gUnk_0800A0B4.inc
@@ -2,11 +2,11 @@ SCRIPT_START gUnk_0800A0B4
 StartScript 
 SetEntityNonPlanarMovement 0x0140
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 StopScript 
 Wait 0x0078
 SoundReq2 0x0018
-Call 0x080a0465
+Call sub_080A0464
 _0807EE30 
 JumpIfNot 0xfffc
 _0807E8E4_0 
diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc
index c0b0e2fe..a2d56bd5 100644
--- a/data/scripts/gUnk_0800A0FC.inc
+++ b/data/scripts/gUnk_0800A0FC.inc
@@ -4,21 +4,19 @@ CheckGlobalFlag 0x0051
 JumpIfNot 0xfffa
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SoundReq0x80100000 
-Call 0x0807fbfd
+Call sub_0807FBFC
 SetEntityPositionRelative 0x005800b0
-Call 0x0807f845
+Call sub_0807F844
 _0807E8E4_3 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf75d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F75C
 .short 0x0060
 .short 0x00d0
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x4ae9
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08094AE8
 .short 0xa160
 .short 0x0800
 @ End of parameters
@@ -28,9 +26,8 @@ DoFade6
 StopScript 
 WaitFor_2 
 WaitForSomething2 0x00000004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0006
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc
index c1eed80f..19b41f0c 100644
--- a/data/scripts/gUnk_0800A160.inc
+++ b/data/scripts/gUnk_0800A160.inc
@@ -5,15 +5,13 @@ _0807EF80 0x0007
 _0807EF80 0x000b
 _0807E930 0x0002
 SetEntityPositionRelative 0x008000b0
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf98d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F98C
 .short 0x0000
 .short 0xff80
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
 .short 0xa1b4
 .short 0x0800
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc
index 94faff32..27ffbaf3 100644
--- a/data/scripts/gUnk_0800A1B4.inc
+++ b/data/scripts/gUnk_0800A1B4.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A1B4
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfff8
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc
index af9ee5cb..0b42df91 100644
--- a/data/scripts/gUnk_0800A1D8.inc
+++ b/data/scripts/gUnk_0800A1D8.inc
@@ -1,19 +1,18 @@
 SCRIPT_START gUnk_0800A1D8
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x00800088
-Call 0x0807f845
+Call sub_0807F844
 _0807E8E4_3 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf75d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F75C
 .short 0x0088
 .short 0x00a8
 @ End of parameters
 StopScript 
 Wait 0x003c
-StartPlayerScript 0x0800a310
+StartPlayerScript gUnk_0800A310
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000080
@@ -33,7 +32,7 @@ WaitForSomething2 0x00000200
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000040
 _0807E5F8 0x00000004
-Call 0x0807f3f9
+Call sub_0807F3F8
 WaitForSomething2 0x00000080
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x165a
@@ -78,9 +77,8 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000100
 SoundReq2 0x0008
 SoundReq 0x00f7
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0007
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc
index 9a66158a..7e9b2c7b 100644
--- a/data/scripts/gUnk_0800A310.inc
+++ b/data/scripts/gUnk_0800A310.inc
@@ -9,16 +9,15 @@ Wait 0x000a
 _0807EB44 0x0006
 Wait 0x000a
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 .short 0x0000
 StartScript 
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -26,25 +25,24 @@ StopScript
 WaitForSomething2 0x00000002
 _0807E930 0x000e
 _0807EF80 0x0007
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0004
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
 _0807E930 0x000c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
 _0807E930 0x000f
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
 _0807E930 0x000c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
 .short 0xa680
 .short 0x0800
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc
index baf3ae2c..e072c052 100644
--- a/data/scripts/gUnk_0800A3D8.inc
+++ b/data/scripts/gUnk_0800A3D8.inc
@@ -9,7 +9,7 @@ StopScript
 WaitForSomething2 0x00000004
 StartScript 
 _0807EF80 0x0004
-Call 0x0807f3f9
+Call sub_0807F3F8
 StopScript 
 Wait 0x003c
 _0807EC94 0x0010
@@ -28,9 +28,8 @@ WaitForSomething2 0x00000004
 _0807EB44 0x0004
 _0807EF80 0x0000
 SoundReq 0x0142
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
 .short 0xa638
 .short 0x0800
 @ End of parameters
@@ -40,45 +39,40 @@ SoundReq 0x0143
 _0807E5F8 0x00001000
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
-Call 0x08066e69
+Call sub_08066E68
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0142
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
 .short 0xa680
 .short 0x0800
 @ End of parameters
 Wait 0x0078
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfadd
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FADC
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x000f
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfadd
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FADC
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x000f
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfadd
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FADC
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x003c
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfadd
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FADC
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc
index 9e32b976..9686116d 100644
--- a/data/scripts/gUnk_0800A500.inc
+++ b/data/scripts/gUnk_0800A500.inc
@@ -4,31 +4,30 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 _0807EF80 0x000b
 _0807E930 0x0005
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000008
 SoundReq 0x0142
 _0807E610 0x00000800
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
 .short 0xa65c
 .short 0x0800
 @ End of parameters
 _0807E930 0x0002
-Call 0x08094b0d
+Call sub_08094B0C
 _0807EDD4 0x0068, 0x0088
-Call 0x08094b81
+Call sub_08094B80
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000008
-Call 0x08094b3d
+Call sub_08094B3C
 _0807E930 0x0004
 _0807E5F8 0x00000800
 SoundReq 0x0143
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000008
 _0807EF80 0x0008
-Call 0x080961b1
+Call sub_080961B0
 SoundReq 0x00fa
 Wait 0x003c
 _0807E5F8 0x00000100
diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc
index 690fae45..5d776d2c 100644
--- a/data/scripts/gUnk_0800A590.inc
+++ b/data/scripts/gUnk_0800A590.inc
@@ -4,29 +4,26 @@ SetEntityNonPlanarMovement 0x0080
 SetEntity0x20 0x00000000
 _0807EF80 0x0008
 _0807EB44 0x0000
-Call 0x0807f715
+Call sub_0807F714
 MoveEntityToPlayer 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf98d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F98C
 .short 0x0000
 .short 0xfff0
 @ End of parameters
 StopScript 
 _0807E930 0x0023
 WaitForSomething2 0x00000010
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6E8
 .short 0x0008
 .short 0x0000
 @ End of parameters
 _0807EF80 0x0007
 SoundReq 0x0142
 _0807E610 0x00000800
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
 .short 0xa65c
 .short 0x0800
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc
index a4dfac37..294caac8 100644
--- a/data/scripts/gUnk_0800A638.inc
+++ b/data/scripts/gUnk_0800A638.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A638
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfff8
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc
index 32196619..02a16290 100644
--- a/data/scripts/gUnk_0800A65C.inc
+++ b/data/scripts/gUnk_0800A65C.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A65C
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfff8
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc
index 2fe25d6c..7a713f81 100644
--- a/data/scripts/gUnk_0800A680.inc
+++ b/data/scripts/gUnk_0800A680.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A680
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfff8
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc
index c0e906e3..d8145bbb 100644
--- a/data/scripts/gUnk_0800A6A4.inc
+++ b/data/scripts/gUnk_0800A6A4.inc
@@ -1,15 +1,14 @@
 SCRIPT_START gUnk_0800A6A4
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x00680088
-Call 0x0807f845
+Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0008
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc
index 55f88979..0af66470 100644
--- a/data/scripts/gUnk_0800A6D4.inc
+++ b/data/scripts/gUnk_0800A6D4.inc
@@ -1,15 +1,14 @@
 SCRIPT_START gUnk_0800A6D4
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x00700088
-Call 0x0807f845
+Call sub_0807F844
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0009
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc
index 82273794..dbc2a17f 100644
--- a/data/scripts/gUnk_0800A704.inc
+++ b/data/scripts/gUnk_0800A704.inc
@@ -1,15 +1,14 @@
 SCRIPT_START gUnk_0800A704
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x01c80198
-Call 0x0807f845
+Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x000a
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc
index 533a2f6e..2dc687dc 100644
--- a/data/scripts/gUnk_0800A734.inc
+++ b/data/scripts/gUnk_0800A734.inc
@@ -1,15 +1,14 @@
 SCRIPT_START gUnk_0800A734
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x01c800d8
-Call 0x0807f845
+Call sub_0807F844
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x000b
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc
index ce8979e6..78017245 100644
--- a/data/scripts/gUnk_0800A764.inc
+++ b/data/scripts/gUnk_0800A764.inc
@@ -1,9 +1,9 @@
 SCRIPT_START gUnk_0800A764
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x01b800f8
-Call 0x0807f845
+Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
@@ -26,9 +26,8 @@ _0807E5F8 0x00000010
 Wait 0x0002
 _0807E5F8 0x00000020
 Wait 0x0078
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x000c
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc
index dc79100f..0cae1367 100644
--- a/data/scripts/gUnk_0800A7E4.inc
+++ b/data/scripts/gUnk_0800A7E4.inc
@@ -76,9 +76,9 @@ Wait 0x000f
 Jump 0xffee
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x01780378
-Call 0x0807f845
+Call sub_0807F844
 StopScript 
 Wait 0x003c
 _0807E5F8 0x00000001
@@ -89,9 +89,8 @@ _0807E5F8 0x00000004
 Wait 0x000a
 _0807E5F8 0x00000008
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x000d
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800A964.inc b/data/scripts/gUnk_0800A964.inc
index 75cd370b..558fb639 100644
--- a/data/scripts/gUnk_0800A964.inc
+++ b/data/scripts/gUnk_0800A964.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0001
 StopScript 
 WaitForSomething2 0x00000001
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A988.inc b/data/scripts/gUnk_0800A988.inc
index 7deff2ff..9773d029 100644
--- a/data/scripts/gUnk_0800A988.inc
+++ b/data/scripts/gUnk_0800A988.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0002
 StopScript 
 WaitForSomething2 0x00000002
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A9AC.inc b/data/scripts/gUnk_0800A9AC.inc
index aef80139..75aafcd7 100644
--- a/data/scripts/gUnk_0800A9AC.inc
+++ b/data/scripts/gUnk_0800A9AC.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000004
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A9D0.inc b/data/scripts/gUnk_0800A9D0.inc
index cae4d653..d70c742c 100644
--- a/data/scripts/gUnk_0800A9D0.inc
+++ b/data/scripts/gUnk_0800A9D0.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0003
 StopScript 
 WaitForSomething2 0x00000008
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc
index aadc8530..bfd53ef2 100644
--- a/data/scripts/gUnk_0800A9F4.inc
+++ b/data/scripts/gUnk_0800A9F4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START gUnk_0800A9F4
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x00580128
-Call 0x0807f845
+Call sub_0807F844
 StopScript 
 Wait 0x003c
 _0807E5F8 0x00000001
@@ -14,9 +14,8 @@ _0807E5F8 0x00000004
 Wait 0x001e
 _0807E5F8 0x00000008
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x000e
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800AA48.inc b/data/scripts/gUnk_0800AA48.inc
index 75b9c451..c4e7fb14 100644
--- a/data/scripts/gUnk_0800AA48.inc
+++ b/data/scripts/gUnk_0800AA48.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000001
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AA6C.inc b/data/scripts/gUnk_0800AA6C.inc
index 3e64b994..d9166bb5 100644
--- a/data/scripts/gUnk_0800AA6C.inc
+++ b/data/scripts/gUnk_0800AA6C.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000002
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AA90.inc b/data/scripts/gUnk_0800AA90.inc
index afce2365..3f08f7c6 100644
--- a/data/scripts/gUnk_0800AA90.inc
+++ b/data/scripts/gUnk_0800AA90.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000004
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AAB4.inc b/data/scripts/gUnk_0800AAB4.inc
index b2169922..5af49a63 100644
--- a/data/scripts/gUnk_0800AAB4.inc
+++ b/data/scripts/gUnk_0800AAB4.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0007
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000008
-Call 0x080a29bd
+Call CreateDust
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc
index c58d8c55..980237ff 100644
--- a/data/scripts/gUnk_0800AAD8.inc
+++ b/data/scripts/gUnk_0800AAD8.inc
@@ -1,15 +1,14 @@
 SCRIPT_START gUnk_0800AAD8
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x01480088
-Call 0x0807f845
+Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x000f
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc
index e6998808..93104427 100644
--- a/data/scripts/gUnk_0800AB08.inc
+++ b/data/scripts/gUnk_0800AB08.inc
@@ -1,19 +1,17 @@
 SCRIPT_START gUnk_0800AB08
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x01480088
-Call 0x0807f845
+Call sub_0807F844
 _0807E8E4_3 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6E8
 .short 0x0008
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf75d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F75C
 .short 0x0088
 .short 0x00a8
 @ End of parameters
@@ -22,7 +20,7 @@ StopScript
 Wait 0x0078
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x00780088
-Call 0x0807f5c1
+Call sub_0807F5C0
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1664
 .short 0x0000
@@ -33,9 +31,8 @@ _0807EA94
 .short 0x000e
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc
index 10079c59..06350a3c 100644
--- a/data/scripts/gUnk_0800AB6E.inc
+++ b/data/scripts/gUnk_0800AB6E.inc
@@ -1,16 +1,15 @@
 SCRIPT_START gUnk_0800AB6E
-Call 0x0808d2cd
+Call sub_0808D2CC
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 _0807E8E4_0 
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000080
 SetEntityPosition 0x0000, 0xffe0
-Call 0x0807f5c1
+Call sub_0807F5C0
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -23,7 +22,7 @@ WaitForSomething2 0x00000004
 .short 0x000e
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800acbc
+StartPlayerScript gUnk_0800ACBC
 WaitForSomething2 0x00000001
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1660
@@ -41,9 +40,9 @@ _0807E5F8 0x00000008
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 SetEntityPosition 0x0000, 0x0020
-Call 0x0807f5c1
+Call sub_0807F5C0
 WaitForSomething2 0x00000010
-StartPlayerScript 0x0800ace0
+StartPlayerScript gUnk_0800ACE0
 WaitForSomething2 0x00000001
 Wait 0x003c
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -57,12 +56,12 @@ _0807EA94
 @ End of parameters
 _0807EA94 
 SetEntityPosition 0x0000, 0xffe0
-Call 0x0807f5c1
+Call sub_0807F5C0
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-StartPlayerScript 0x0800ad54
+StartPlayerScript gUnk_0800AD54
 WaitForSomething2 0x00000001
 Wait 0x003c
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -73,20 +72,20 @@ _0807EA94
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 Wait 0x0078
-Call 0x0808d281
+Call sub_0808D280
 Wait 0x0078
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
-Call 0x0807fb95
+Call sub_0807FB94
 MoveEntityToPlayer 
-Call 0x0807f845
+Call sub_0807F844
 _0807F0B4 0x0004
 CameraTargetPlayer 
 _0807E5F8 0x80000000
 DoFade4 
 WaitFor_2 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc
index 4ca8e27d..07f8d2d2 100644
--- a/data/scripts/gUnk_0800ACBC.inc
+++ b/data/scripts/gUnk_0800ACBC.inc
@@ -6,138 +6,5 @@ _0807EDD4 0x0088, 0x0080
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 .short 0x0000
-StartScript 
-Call 0x08094be1
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
-.short 0x045b
-.short 0x0000
-@ End of parameters
-SoundReq 0x0109
-StopScript 
-Call 0x0807f305
-Wait 0x005a
-_0807E5F8 0x00000008
-StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6f9
-.short 0x0807
-.short 0x0008
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
-.short 0x08e4
-.short 0x0000
-@ End of parameters
-StopScript 
-Call 0x0807f305
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x003c
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x0004
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-.short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EC64 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-@ End of parameters
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0004
-Wait 0x001e
-_0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-@ End of parameters
-Wait 0x0006
-_0807EB44 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-@ End of parameters
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-@ End of parameters
-Wait 0x0014
-_0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
-.short 0x0000
-.short 0x0000
-@ End of parameters
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807E930 0x000c
-Call 0x0807f2d5
-Call 0x08094b95
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807E930 0x000f
-Call 0x0807f2d5
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x60c5
-.short 0x0809
-.short 0xaf18
-.short 0x0800
-@ End of parameters
-_0807E930 0x0012
-Call 0x0807f2d5
-Wait 0x001e
-_0807E5F8 0x00000020
-SoundReq0x80100000 
-Call 0x080a29bd
-Call 0x0806305d
-Call 0x080630a5
-_0807EF3C 0x0000, 0x0020
-Wait 0x001e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xfff0
-Wait 0x003c
-_0807EEF4 0x0000, 0xfff0
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EDD4 0x0088, 0x0040
-_0807E5F8 0x00000004
-_0807EF80 0x0006
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc
new file mode 100644
index 00000000..aa4cf249
--- /dev/null
+++ b/data/scripts/gUnk_0800ACE0.inc
@@ -0,0 +1,37 @@
+SCRIPT_START gUnk_0800ACE0
+StartScript 
+Call sub_08094BE0
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
+.short 0x045b
+.short 0x0000
+@ End of parameters
+SoundReq 0x0109
+StopScript 
+Call sub_0807F304
+Wait 0x005a
+_0807E5F8 0x00000008
+StartScript 
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6F8
+.short 0x0008
+.short 0x0000
+@ End of parameters
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
+.short 0x08e4
+.short 0x0000
+@ End of parameters
+StopScript 
+Call sub_0807F304
+_0807EB44 0x0004
+_0807EF80 0x0000
+Wait 0x003c
+_0807EB44 0x0002
+_0807EF80 0x0000
+Wait 0x0004
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+.short 0x0000
diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800AD54.inc
new file mode 100644
index 00000000..8d2c716f
--- /dev/null
+++ b/data/scripts/gUnk_0800AD54.inc
@@ -0,0 +1,89 @@
+SCRIPT_START gUnk_0800AD54
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EC64 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+_0807EF80 0x0007
+_0807EF80 0x000b
+_0807EB44 0x0004
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
+.short 0x0000
+.short 0x0000
+@ End of parameters
+StopScript 
+WaitForSomething2 0x00000002
+_0807EF80 0x0004
+Wait 0x001e
+_0807EB44 0x0002
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
+.short 0x0000
+.short 0x0000
+@ End of parameters
+Wait 0x0006
+_0807EB44 0x0000
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
+.short 0x0000
+.short 0x0000
+@ End of parameters
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EB44 0x0002
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
+.short 0x0000
+.short 0x0000
+@ End of parameters
+Wait 0x0014
+_0807EB44 0x0004
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
+.short 0x0000
+.short 0x0000
+@ End of parameters
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807E930 0x000c
+Call sub_0807F2D4
+Call sub_08094B94
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807E930 0x000f
+Call sub_0807F2D4
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080960C4
+.short 0xaf18
+.short 0x0800
+@ End of parameters
+_0807E930 0x0012
+Call sub_0807F2D4
+Wait 0x001e
+_0807E5F8 0x00000020
+SoundReq0x80100000 
+Call CreateDust
+Call sub_0806305C
+Call sub_080630A4
+_0807EF3C 0x0000, 0x0020
+Wait 0x001e
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x0080
+_0807EEF4 0x0000, 0xfff0
+Wait 0x003c
+_0807EEF4 0x0000, 0xfff0
+_0807E5F8 0x00000004
+WaitForSomething2 0x00000002
+_0807EDD4 0x0088, 0x0040
+_0807E5F8 0x00000004
+_0807EF80 0x0006
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800AEDC.inc b/data/scripts/gUnk_0800AEDC.inc
index 16a64ac9..d8650582 100644
--- a/data/scripts/gUnk_0800AEDC.inc
+++ b/data/scripts/gUnk_0800AEDC.inc
@@ -6,7 +6,7 @@ _0807EF80 0x000b
 _0807E930 0x0000
 StopScript 
 WaitForSomething2 0x00000008
-Call 0x08094b81
+Call sub_08094B80
 _0807EF3C 0x0000, 0x0001
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000008
diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc
index 5cec6ff5..26076509 100644
--- a/data/scripts/gUnk_0800AF18.inc
+++ b/data/scripts/gUnk_0800AF18.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800AF18
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfff8
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800AF44.inc b/data/scripts/gUnk_0800AF44.inc
index da215c73..ebfa32bc 100644
--- a/data/scripts/gUnk_0800AF44.inc
+++ b/data/scripts/gUnk_0800AF44.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800AF44
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB28 0x1c01
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AF68.inc b/data/scripts/gUnk_0800AF68.inc
index 4209d0f2..6739a6fa 100644
--- a/data/scripts/gUnk_0800AF68.inc
+++ b/data/scripts/gUnk_0800AF68.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800AF68
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB28 0x1c02
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AF8C.inc b/data/scripts/gUnk_0800AF8C.inc
index b1d27fee..9704c881 100644
--- a/data/scripts/gUnk_0800AF8C.inc
+++ b/data/scripts/gUnk_0800AF8C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800AF8C
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB28 0x1c03
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0003
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AFB0.inc b/data/scripts/gUnk_0800AFB0.inc
index 6b836bfc..123fb79d 100644
--- a/data/scripts/gUnk_0800AFB0.inc
+++ b/data/scripts/gUnk_0800AFB0.inc
@@ -2,15 +2,15 @@ SCRIPT_START gUnk_0800AFB0
 _0807E864 
 StopScript 
 StartScript 
-Call 0x0807fbb5
+Call sub_0807FBB4
 ComparePlayerAction 0x0001
 JumpIfNot 0xfff0
 StopScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB28 0x1c04
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0004
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AFE8.inc b/data/scripts/gUnk_0800AFE8.inc
index ec04570c..c150d8e0 100644
--- a/data/scripts/gUnk_0800AFE8.inc
+++ b/data/scripts/gUnk_0800AFE8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800AFE8
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB28 0x1c05
 _0807EA94 
 SetLocalFlagByOffset 0x0100, 0x0005
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B00C.inc b/data/scripts/gUnk_0800B00C.inc
index a752472c..8bc5453a 100644
--- a/data/scripts/gUnk_0800B00C.inc
+++ b/data/scripts/gUnk_0800B00C.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_0800B00C
 StartScript 
-Call 0x0807f935
-Call 0x080a2125
+Call sub_0807F934
+Call sub_080A2124
 _0807EF80 0x000a
 _0807EF80 0x0007
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckGlobalFlag 0x0052
 JumpIf 0x004a
 CheckGlobalFlag 0x0053
@@ -16,7 +16,7 @@ JumpIf 0x0024
 TextboxNoOverlap 0x3f32
 _0807EA94 
 _0807EF80 0x0008
-Call 0x080a2139
+Call Windcrest_Unlock
 Wait 0x003c
 _0807EB28 0x0b5c
 _0807EA94 
@@ -25,7 +25,7 @@ Jump 0x003a
 TextboxNoOverlap 0x3f32
 _0807EA94 
 _0807EF80 0x0008
-Call 0x080a2139
+Call Windcrest_Unlock
 Wait 0x003c
 _0807EB28 0x0b5d
 _0807EA94 
@@ -33,11 +33,11 @@ Jump 0x001c
 TextboxNoOverlap 0x3f32
 _0807EA94 
 _0807EF80 0x0008
-Call 0x080a2139
+Call Windcrest_Unlock
 Wait 0x003c
 _0807EB28 0x0b5e
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B0AC.inc b/data/scripts/gUnk_0800B0AC.inc
index 6048d180..e1547c6c 100644
--- a/data/scripts/gUnk_0800B0AC.inc
+++ b/data/scripts/gUnk_0800B0AC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START gUnk_0800B0AC
 StopScript 
 _0807E864 
-Call 0x0807fa41
-Call 0x0807df29
+Call sub_0807FA40
+Call sub_0807DF28
 _0807EB28 0x0b5f
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc
index 36a64122..420cbfab 100644
--- a/data/scripts/gUnk_0800B0D0.inc
+++ b/data/scripts/gUnk_0800B0D0.inc
@@ -1,73 +1,68 @@
 SCRIPT_START gUnk_0800B0D0
 StartScript 
-Call 0x0806bcd5
+Call sub_0806BCD4
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbc95
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BC94
 .short 0x0000
 .short 0x0000
 @ End of parameters
 StopScript 
-Call 0x0807f435
+Call sub_0807F434
 .short 0x1006 @ _0807E078 with 3 parameters
 .short 0xfff8
 .short 0x0004
 .short 0x0040
 @ End of parameters
 _0807E864 
-Call 0x0807df29
-Call 0x0807f2d5
+Call sub_0807DF28
+Call sub_0807F2D4
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbc95
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BC94
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x0806bce9
+Call sub_0806BCE8
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
-Call 0x0806bcb9
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbc95
-.short 0x0806
+Call sub_0806BCB8
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BC94
 .short 0x0000
 .short 0x0000
 @ End of parameters
 Jump 0xffb6
 _0807E864 
-Call 0x0807df29
-Call 0x0807f2d5
+Call sub_0807DF28
+Call sub_0807F2D4
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbc95
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BC94
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x0807f651
+Call sub_0807F650
 _0807E9F0 
 JumpIfNot 0x0008
-Call 0x0806bcc1
-Call 0x0807df51
+Call sub_0806BCC0
+Call sub_0807DF50
 _0807E878 
-Call 0x0806bcb9
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbc95
-.short 0x0806
+Call sub_0806BCB8
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806BC94
 .short 0x0000
 .short 0x0000
 @ End of parameters
 Jump 0xff6e
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 SetLocalFlag 0x0039
 _0807E864 
 StopScript 
 WaitForPlayerAction0x17 
-StartPlayerScript 0x0800b1c0
+StartPlayerScript gUnk_0800B1C0
 Wait 0x0018
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
@@ -76,6 +71,6 @@ Wait 0x0010
 SoundReq2 0x002d
 _0807EB28 0x2701
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc
index 7a1a152e..e5ef8a57 100644
--- a/data/scripts/gUnk_0800B1C0.inc
+++ b/data/scripts/gUnk_0800B1C0.inc
@@ -12,5 +12,5 @@ Wait 0x002c
 LoadRoomEntityList 0x080da260
 Wait 0x001e
 _0807E5F8 0x00000001
-Call 0x0807921d
+Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B200.inc b/data/scripts/gUnk_0800B200.inc
index 66d9a626..8d16d2c1 100644
--- a/data/scripts/gUnk_0800B200.inc
+++ b/data/scripts/gUnk_0800B200.inc
@@ -6,13 +6,13 @@ JumpIf 0x0044
 SetEntityNonPlanarMovement 0x00c0
 StopScript 
 WaitForSomething2 0x00000001
-Call 0x0807df29
+Call sub_0807DF28
 MoveEntityToPlayer 
 CameraTargetEntity 
 _0807EDD4 0x0068, 0x0380
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
-Call 0x0807df51
+Call sub_0807DF50
 Wait 0x000c
 CameraTargetPlayer 
 Wait 0x0008
diff --git a/data/scripts/gUnk_0800B254.inc b/data/scripts/gUnk_0800B254.inc
index f6f8fe08..1289c7c0 100644
--- a/data/scripts/gUnk_0800B254.inc
+++ b/data/scripts/gUnk_0800B254.inc
@@ -10,7 +10,7 @@ _0807E9F0
 _0807E864 
 CheckKinstoneFused 0x0006
 JumpIf 0x006e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffe8
 .short 0x0000
@@ -25,7 +25,7 @@ _0807E9F0
 _0807E864 
 CheckKinstoneFused 0x0007
 JumpIf 0x003e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffe8
 .short 0x0000
@@ -40,14 +40,14 @@ _0807E9F0
 _0807E864 
 CheckKinstoneFused 0x0008
 JumpIf 0x000e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffe8
 _0807EF80 0x0013
 _0807EB44 0x0004
 _0807E9DC 
-Call 0x080676e1
-Call 0x08067535
+Call sub_080676E0
+Call sub_08067534
 _0807EF80 0x0012
 _0807E5F8 0x00000001
 StopScript 
diff --git a/data/scripts/gUnk_0800B308.inc b/data/scripts/gUnk_0800B308.inc
index 382aa451..f458ccdd 100644
--- a/data/scripts/gUnk_0800B308.inc
+++ b/data/scripts/gUnk_0800B308.inc
@@ -7,21 +7,21 @@ SetEntityNonPlanarMovement 0x0040
 SetEntityDirection 0x0010
 CheckKinstoneFused 0x0006
 JumpIfNot 0x0008
-Call 0x080676d9
+Call sub_080676D8
 CheckKinstoneFused 0x0007
 JumpIfNot 0x0008
-Call 0x080676d9
+Call sub_080676D8
 CheckKinstoneFused 0x0008
 JumpIfNot 0x0008
-Call 0x080676d9
+Call sub_080676D8
 StopScript 
-Call 0x0806757d
+Call sub_0806757C
 StopScript 
 WaitForSomething2 0x00000002
 SoundReq 0x00fd
-Call 0x080676d9
-Call 0x0806757d
-Call 0x080675d5
+Call sub_080676D8
+Call sub_0806757C
+Call sub_080675D4
 Wait 0x0014
 StartScript 
 _0807E5F8 0x00000001
diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc
index 5a1ac270..41d353f6 100644
--- a/data/scripts/gUnk_0800B3A4.inc
+++ b/data/scripts/gUnk_0800B3A4.inc
@@ -1,24 +1,24 @@
 SCRIPT_START gUnk_0800B3A4
 StartScript 
 _0807EF80 0x000a
-Call 0x0807f159
+Call sub_0807F158
 SetEntityNonPlanarMovement 0x0120
 _0807EB44 0x0004
 _0807E908 0x0002
 _0807E914 0x0000200a
 StopScript 
 _0807EDD4 0x0158, 0x0290
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
 _0807EDD4 0x0128, 0x0290
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
-Call 0x08065781
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
+Call sub_08065780
 Jump 0xffaa
diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc
index b128c6cc..19baa293 100644
--- a/data/scripts/gUnk_0800B41C.inc
+++ b/data/scripts/gUnk_0800B41C.inc
@@ -4,12 +4,12 @@ SetEntityNonPlanarMovement 0x00c0
 _0807E908 0x0001
 _0807EF80 0x000b
 _0807E864 
-Call 0x0807fbc5
+Call sub_0807FBC4
 StopScript 
 Wait 0x000a
 _0807EF80 0x0004
 _0807E5F8 0x00000008
-StartPlayerScript 0x0800b54c
+StartPlayerScript gUnk_0800B54C
 _0807EDD4 0x0140, 0x0298
 _0807EB74 
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800B4AC.inc b/data/scripts/gUnk_0800B4AC.inc
index 8fac7d8b..cf57eb4f 100644
--- a/data/scripts/gUnk_0800B4AC.inc
+++ b/data/scripts/gUnk_0800B4AC.inc
@@ -36,8 +36,8 @@ _0807EF80 0x0008
 Wait 0x001e
 _0807E5F8 0x00000010
 SetGlobalFlag 0x001d
-Call 0x0807921d
+Call sub_0807921C
 _0807E878 
-Call 0x0807fbcd
+Call sub_0807FBCC
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B574.inc b/data/scripts/gUnk_0800B574.inc
index c07603ba..c63c2a13 100644
--- a/data/scripts/gUnk_0800B574.inc
+++ b/data/scripts/gUnk_0800B574.inc
@@ -16,5 +16,5 @@ SoundReq 0x0111
 WaitForSomething2 0x00000010
 _0807EF80 0x0007
 SoundReq 0x0111
-Call 0x0808692d
+Call sub_0808692C
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B5C4.inc b/data/scripts/gUnk_0800B5C4.inc
index 18eb145d..e834cb3c 100644
--- a/data/scripts/gUnk_0800B5C4.inc
+++ b/data/scripts/gUnk_0800B5C4.inc
@@ -7,6 +7,6 @@ Wait 0x001e
 SoundReq 0x00d1
 _0807EDD4 0x008a, 0x005a
 Wait 0x000a
-Call 0x08069ee9
+Call sub_08069EE8
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc
index a55c7fa5..bab1c892 100644
--- a/data/scripts/gUnk_0800B5EC.inc
+++ b/data/scripts/gUnk_0800B5EC.inc
@@ -17,10 +17,10 @@ StartScript
 StopScript 
 CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
 JumpIfNot 0xfff6
-Call 0x08079185
+Call sub_08079184
 _0807E864 
-Call 0x0807f9a5
-StartPlayerScript 0x0800b7c4
+Call sub_0807F9A4
+StartPlayerScript gUnk_0800B7C4
 WaitForSomething2 0x00000004
 SetRoomFlag 0x0000
 WaitForSomething2 0x00000004
@@ -32,16 +32,14 @@ _0807E3E8
 JumpIfNot 0x002a
 Wait 0x000f
 TextboxNoOverlap 0x0584
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf971
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F970
 .short 0x058b
 .short 0x0000
 @ End of parameters
 JumpIf 0x001e
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x7425
-.short 0x0808
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08087424
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -61,11 +59,11 @@ _0807EA94
 _0807E778 0x0004
 DoFade7 
 WaitFor_2 
-Call 0x080873fd
+Call sub_080873FC
 DoFade6 
 WaitFor_2 
 CameraTargetPlayer 
 Wait 0x001e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc
index a0d11f43..ea78f758 100644
--- a/data/scripts/gUnk_0800B6C8.inc
+++ b/data/scripts/gUnk_0800B6C8.inc
@@ -5,10 +5,10 @@ HasRupees 0x0001
 JumpIfNot 0xfffa
 CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
 JumpIfNot 0xfff6
-Call 0x08079185
+Call sub_08079184
 _0807E864 
-Call 0x0807f9a5
-StartPlayerScript 0x0800b7c4
+Call sub_0807F9A4
+StartPlayerScript gUnk_0800B7C4
 WaitForSomething2 0x00000004
 SetRoomFlag 0x0000
 WaitForSomething2 0x00000004
@@ -16,9 +16,8 @@ CheckLocalFlag 0x009f
 JumpIf 0x0098
 TextboxNoOverlap 0x057b
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf971
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F970
 .short 0x057d
 .short 0x0000
 @ End of parameters
@@ -30,13 +29,13 @@ Jump 0xff6c
 .short 0x0000
 StartScript 
 StopScript 
-Call 0x0808747d
+Call sub_0808747C
 JumpIfNot 0xfff8
-Call 0x08079185
+Call sub_08079184
 _0807E864 
 Wait 0x000a
-Call 0x0807f9a5
-StartPlayerScript 0x0800b7c4
+Call sub_0807F9A4
+StartPlayerScript gUnk_0800B7C4
 WaitForSomething2 0x00000004
 SetRoomFlag 0x0000
 WaitForSomething2 0x00000004
@@ -44,16 +43,14 @@ CheckLocalFlag 0x00a0
 JumpIf 0x0036
 TextboxNoOverlap 0x0580
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf971
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F970
 .short 0x0582
 .short 0x0000
 @ End of parameters
 JumpIf 0x0014
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x7425
-.short 0x0808
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08087424
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -75,29 +72,3 @@ TextboxNoOverlap 0x057f
 _0807EA94 
 Jump 0xfee6
 .short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
-.short 0x0090
-.short 0x0000
-@ End of parameters
-JumpIfNot 0x0024
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf465
-.short 0x0807
-.short 0x0078
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
-.short 0x0090
-.short 0x0000
-@ End of parameters
-_0807E8E4_0 
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc
new file mode 100644
index 00000000..c269e3ac
--- /dev/null
+++ b/data/scripts/gUnk_0800B7C4.inc
@@ -0,0 +1,24 @@
+SCRIPT_START gUnk_0800B7C4
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
+.short 0x0090
+.short 0x0000
+@ End of parameters
+JumpIfNot 0x0024
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F464
+.short 0x0078
+.short 0x0000
+@ End of parameters
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
+.short 0x0090
+.short 0x0000
+@ End of parameters
+_0807E8E4_0 
+_0807EF80 0x0000
+_0807E5F8 0x00000004
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc
index 0ca33ef1..d69ca1c8 100644
--- a/data/scripts/gUnk_0800B7FC.inc
+++ b/data/scripts/gUnk_0800B7FC.inc
@@ -1,13 +1,11 @@
 SCRIPT_START gUnk_0800B7FC
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0090
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf465
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F464
 .short 0x0078
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc
index eaedc01b..b0ef791a 100644
--- a/data/scripts/gUnk_0800B828.inc
+++ b/data/scripts/gUnk_0800B828.inc
@@ -19,7 +19,7 @@ _0807EF80 0x0000
 _0807EF80 0x000a
 StopScript 
 Wait 0x003c
-Call 0x080646a5
+Call sub_080646A4
 Jump 0xfff4
 StartScript 
 _0807E9D4 
@@ -28,7 +28,7 @@ _0807E930 0x0000
 _0807EF80 0x000a
 StopScript 
 Wait 0x003c
-Call 0x0806407d
+Call sub_0806407C
 Jump 0xfff4
 StartScript 
 _0807E9D4 
@@ -50,29 +50,28 @@ _0807E9D4
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x4645
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08064644
 .short 0x464d
 .short 0x0806
 @ End of parameters
 StopScript 
 Wait 0x003c
-Call 0x080646a5
+Call sub_080646A4
 Jump 0xfff4
 .short 0x0000
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0004
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 Jump 0xffe4
@@ -104,12 +103,11 @@ Jump 0xffec
 StartScript 
 _0807EF80 0x000b
 _0807EF80 0x0008
-Call 0x0806daad
+Call sub_0806DAAC
 JumpIf 0x0036
-Call 0x0806dad1
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+Call sub_0806DAD0
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0005
 .short 0x0000
 @ End of parameters
@@ -117,11 +115,11 @@ StopScript
 _0807EA4C 
 _0807E9F0 
 JumpIf 0x000e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffee
-Call 0x0806f189
-Call 0x0807df51
+Call sub_0806F188
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc
index 89181547..7bfd46d4 100644
--- a/data/scripts/gUnk_0800B9B4.inc
+++ b/data/scripts/gUnk_0800B9B4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START gUnk_0800B9B4
 StartScript 
 _0807E9D4 
-Call 0x080694ed
+Call sub_080694EC
 _0807EF80 0x000a
-Call 0x080694b1
+Call sub_080694B0
 StopScript 
-Call 0x0807f435
+Call sub_0807F434
 .short 0x1006 @ _0807E078 with 3 parameters
 .short 0xfff8
 .short 0x0004
@@ -14,53 +14,53 @@ Call 0x0807f435
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
-Call 0x080694d9
+Call sub_080694D8
 _0807EA94 
-Call 0x080694ed
+Call sub_080694EC
 _0807E878 
 Jump 0xffd8
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
-Call 0x0807f651
+Call sub_0807F650
 _0807E9F0 
 _0807E864 
-Call 0x0806948d
+Call sub_0806948C
 JumpIf 0x0016
 _0807EA94 
-Call 0x080694ed
-Call 0x0807df51
+Call sub_080694EC
+Call sub_0807DF50
 _0807E878 
 Jump 0xffa8
 _0807EA94 
 _0807E9DC 
 _0807E9D4 
-Call 0x080694ed
-Call 0x0807df51
+Call sub_080694EC
+Call sub_0807DF50
 _0807E878 
 Jump 0xff90
 StartScript 
-Call 0x0807f935
+Call sub_0807F934
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 TextboxNoOverlapFollow 0x3301
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x000e
 SoundReq0x80100000 
-Call 0x0806e965
+Call sub_0806E964
 SoundReq2 0xffff
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffd0
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0040
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -75,5 +75,5 @@ Wait 0x001e
 TextboxNoOverlap 0x0e00
 _0807EA94 
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BACC.inc b/data/scripts/gUnk_0800BACC.inc
index 5142d095..6272a549 100644
--- a/data/scripts/gUnk_0800BACC.inc
+++ b/data/scripts/gUnk_0800BACC.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BACC
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -11,5 +11,5 @@ Wait 0x003c
 TextboxNoOverlap 0x0e01
 _0807EA94 
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB00.inc b/data/scripts/gUnk_0800BB00.inc
index b273117b..46718d40 100644
--- a/data/scripts/gUnk_0800BB00.inc
+++ b/data/scripts/gUnk_0800BB00.inc
@@ -10,6 +10,6 @@ _0807EA94
 Wait 0x003c
 _0807EF80 0x000f
 Wait 0x00b4
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800BB30.inc b/data/scripts/gUnk_0800BB30.inc
index e10efaf7..75b33cd3 100644
--- a/data/scripts/gUnk_0800BB30.inc
+++ b/data/scripts/gUnk_0800BB30.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BB30
 StartScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -11,5 +11,5 @@ Wait 0x003c
 TextboxNoOverlap 0x0e05
 _0807EA94 
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BB64.inc b/data/scripts/gUnk_0800BB64.inc
index 4ce57307..68c8f716 100644
--- a/data/scripts/gUnk_0800BB64.inc
+++ b/data/scripts/gUnk_0800BB64.inc
@@ -3,7 +3,7 @@ StartScript
 _0807EB44 0x0006
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0040
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -13,5 +13,5 @@ TextboxNoOverlap 0x0e06
 _0807EA94 
 Wait 0x000f
 _0807EDD4 0x0380, 0x00f8
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BBA4.inc b/data/scripts/gUnk_0800BBA4.inc
index e76223a7..b8dbcbc1 100644
--- a/data/scripts/gUnk_0800BBA4.inc
+++ b/data/scripts/gUnk_0800BBA4.inc
@@ -3,7 +3,7 @@ StartScript
 _0807EF80 0x0007
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -12,5 +12,5 @@ Wait 0x003c
 TextboxNoOverlap 0x0e04
 _0807EA94 
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BBDC.inc b/data/scripts/gUnk_0800BBDC.inc
index df713c93..1ddfba44 100644
--- a/data/scripts/gUnk_0800BBDC.inc
+++ b/data/scripts/gUnk_0800BBDC.inc
@@ -9,6 +9,6 @@ Wait 0x003c
 TextboxNoOverlap 0x0e03
 _0807EA94 
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800BC08.inc b/data/scripts/gUnk_0800BC08.inc
index eae03d7c..dd0f2045 100644
--- a/data/scripts/gUnk_0800BC08.inc
+++ b/data/scripts/gUnk_0800BC08.inc
@@ -15,7 +15,7 @@ _0807EB44 0x0000
 _0807E930 0x0004
 StopScript 
 Wait 0x003c
-Call 0x08065ccd
+Call sub_08065CCC
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc
index 9a1cf0bc..8933436d 100644
--- a/data/scripts/gUnk_0800BC50.inc
+++ b/data/scripts/gUnk_0800BC50.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BC50
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x08054eb9
+Call sub_08054EB8
 StopScript 
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
@@ -15,14 +15,13 @@ _0807EA94
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
-Call 0x08054efd
+Call sub_08054EFC
 _0807EB44 0x0000
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0040
 _0807EF80 0x000d
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0378
 .short 0x0000
 @ End of parameters
@@ -31,10 +30,9 @@ _0807EF80 0x000c
 Wait 0x003c
 TextboxNoOverlap 0x0e09
 _0807EA94 
-Call 0x0807f159
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+Call sub_0807F158
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x035c
 .short 0x0000
 @ End of parameters
@@ -42,6 +40,6 @@ Wait 0x001e
 SoundReq 0x0188
 _0807EF80 0x0008
 Wait 0x0078
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800BCE8.inc b/data/scripts/gUnk_0800BCE8.inc
index ae6fa3dc..a195d56b 100644
--- a/data/scripts/gUnk_0800BCE8.inc
+++ b/data/scripts/gUnk_0800BCE8.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BCE8
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc
index 7457fad1..3ebe8a0b 100644
--- a/data/scripts/gUnk_0800BD78.inc
+++ b/data/scripts/gUnk_0800BD78.inc
@@ -4,13 +4,12 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0270
 .short 0x0000
 @ End of parameters
@@ -26,16 +25,14 @@ _0807E5F8 0x00000004
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbf39
-.short 0x0804
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0804BF38
 .short 0x0000
 .short 0x0000
 @ End of parameters
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbf39
-.short 0x0804
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0804BF38
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -46,5 +43,5 @@ _0807EB44 0x0006
 _0807E5F8 0x00000004
 SetEntityNonPlanarMovement 0x0080
 _0807EEF4 0x0000, 0xffe0
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BE1C.inc b/data/scripts/gUnk_0800BE1C.inc
index b69f18e9..155950cb 100644
--- a/data/scripts/gUnk_0800BE1C.inc
+++ b/data/scripts/gUnk_0800BE1C.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BE1C
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -18,7 +18,7 @@ Jump 0x0038
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -33,14 +33,14 @@ _0807EB44 0x0004
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807E930 0x0000
 _0807EF80 0x0004
 Wait 0x003c
 TextboxNoOverlap 0x0e0f
 _0807EA94 
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc
index bb7dee5c..f7307d09 100644
--- a/data/scripts/gUnk_0800BECC.inc
+++ b/data/scripts/gUnk_0800BECC.inc
@@ -4,13 +4,12 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x01b8
 .short 0x0000
 @ End of parameters
@@ -26,5 +25,5 @@ _0807E5F8 0x0000000c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800BF38.inc b/data/scripts/gUnk_0800BF38.inc
index 1d1fb1b8..dcb3c012 100644
--- a/data/scripts/gUnk_0800BF38.inc
+++ b/data/scripts/gUnk_0800BF38.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BF38
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -18,7 +18,7 @@ Jump 0x0038
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -33,21 +33,21 @@ _0807EB44 0x0004
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807E930 0x0000
 _0807EF80 0x0004
 Wait 0x003c
 TextboxNoOverlap 0x0e12
 _0807EA94 
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x0168
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
-Call 0x08054f65
+Call sub_08054F64
 SetEntityNonPlanarMovement 0x0080
 _0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc
index 98a48044..bc5147ef 100644
--- a/data/scripts/gUnk_0800C004.inc
+++ b/data/scripts/gUnk_0800C004.inc
@@ -4,13 +4,12 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x01b8
 .short 0x0000
 @ End of parameters
@@ -28,16 +27,14 @@ _0807E5F8 0x0000001c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbf39
-.short 0x0804
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0804BF38
 .short 0x0001
 .short 0x0000
 @ End of parameters
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbf39
-.short 0x0804
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0804BF38
 .short 0x0004
 .short 0x0000
 @ End of parameters
@@ -47,5 +44,5 @@ Wait 0x003c
 _0807E5F8 0x0000001c
 SetEntityNonPlanarMovement 0x0080
 _0807EEF4 0x0000, 0xffe0
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C0B0.inc b/data/scripts/gUnk_0800C0B0.inc
index c76513b8..166e24ee 100644
--- a/data/scripts/gUnk_0800C0B0.inc
+++ b/data/scripts/gUnk_0800C0B0.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C0B0
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -18,7 +18,7 @@ Jump 0x0038
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -33,14 +33,14 @@ _0807EB44 0x0004
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807E930 0x0000
 _0807EF80 0x0004
 Wait 0x003c
 TextboxNoOverlap 0x0e15
 _0807EA94 
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc
index 8c949edf..e11522d2 100644
--- a/data/scripts/gUnk_0800C160.inc
+++ b/data/scripts/gUnk_0800C160.inc
@@ -4,13 +4,12 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0128
 .short 0x0000
 @ End of parameters
@@ -28,5 +27,5 @@ _0807E5F8 0x0000003c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00f0
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C1D8.inc b/data/scripts/gUnk_0800C1D8.inc
index 42c3c426..3cfce57e 100644
--- a/data/scripts/gUnk_0800C1D8.inc
+++ b/data/scripts/gUnk_0800C1D8.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C1D8
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -18,7 +18,7 @@ Jump 0x0038
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitFor_2 
 Wait 0x00f0
@@ -33,21 +33,21 @@ _0807EB44 0x0004
 CheckRoomFlag 0x00ff
 JumpIfNot 0xfffa
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807E930 0x0000
 _0807EF80 0x0004
 Wait 0x003c
 TextboxNoOverlap 0x0e18
 _0807EA94 
 _0807E5F8 0x00000002
-Call 0x08054f65
+Call sub_08054F64
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x0168
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
-Call 0x08054f65
+Call sub_08054F64
 SetEntityNonPlanarMovement 0x0080
 _0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc
index d348c940..00f48da9 100644
--- a/data/scripts/gUnk_0800C2A4.inc
+++ b/data/scripts/gUnk_0800C2A4.inc
@@ -4,13 +4,12 @@ _0807EB44 0x0000
 _0807E930 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0128
 .short 0x0000
 @ End of parameters
@@ -28,16 +27,14 @@ _0807E5F8 0x0000007c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbf39
-.short 0x0804
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0804BF38
 .short 0x0002
 .short 0x0000
 @ End of parameters
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xbf39
-.short 0x0804
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0804BF38
 .short 0x0005
 .short 0x0000
 @ End of parameters
@@ -47,5 +44,5 @@ Wait 0x003c
 _0807E5F8 0x0000007c
 SetEntityNonPlanarMovement 0x0080
 _0807EEF4 0x0000, 0xffe0
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc
index d800529d..fc04abde 100644
--- a/data/scripts/gUnk_0800C350.inc
+++ b/data/scripts/gUnk_0800C350.inc
@@ -1,8 +1,7 @@
 SCRIPT_START gUnk_0800C350
 StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xd659
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806D658
 .short 0x0003
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800C3B0.inc b/data/scripts/gUnk_0800C3B0.inc
index 1f3baa88..cbcad8ca 100644
--- a/data/scripts/gUnk_0800C3B0.inc
+++ b/data/scripts/gUnk_0800C3B0.inc
@@ -3,5 +3,5 @@ SetEntityNonPlanarMovement 0x0080
 _0807EEF4 0x0000, 0xff30
 _0807F0C8 0x0000, 0x0000
 Wait 0x00b4
-Call 0x08054969
+Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc
index f0742594..d14faf5a 100644
--- a/data/scripts/gUnk_0800C3CC.inc
+++ b/data/scripts/gUnk_0800C3CC.inc
@@ -1,24 +1,22 @@
 SCRIPT_START gUnk_0800C3CC
 StartScript 
-Call 0x0806d661
+Call sub_0806D660
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0048
 .short 0x0000
 @ End of parameters
-Call 0x0806d66d
+Call sub_0806D66C
 Wait 0x000f
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0068
 .short 0x0000
 @ End of parameters
-Call 0x0806d67d
+Call sub_0806D67C
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc
index e3cb11f4..b6169174 100644
--- a/data/scripts/gUnk_0800C410.inc
+++ b/data/scripts/gUnk_0800C410.inc
@@ -1,24 +1,22 @@
 SCRIPT_START gUnk_0800C410
 StartScript 
-Call 0x0806d661
+Call sub_0806D660
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0048
 .short 0x0000
 @ End of parameters
-Call 0x0806d66d
+Call sub_0806D66C
 Wait 0x000f
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0068
 .short 0x0000
 @ End of parameters
-Call 0x0806d67d
+Call sub_0806D67C
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
 _0807E5F8 0x00000001
diff --git a/data/scripts/gUnk_0800C45C.inc b/data/scripts/gUnk_0800C45C.inc
index c8521d8a..64c371f7 100644
--- a/data/scripts/gUnk_0800C45C.inc
+++ b/data/scripts/gUnk_0800C45C.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C45C
 StartScript 
 SetEntityNonPlanarMovement 0x0180
 _0807E930 0x0004
-Call 0x080a0b29
+Call sub_080A0B28
 StopScript 
 Wait 0x000a
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800C550.inc b/data/scripts/gUnk_0800C550.inc
index ccbc8d09..0c7ed41f 100644
--- a/data/scripts/gUnk_0800C550.inc
+++ b/data/scripts/gUnk_0800C550.inc
@@ -1,69 +1,69 @@
 SCRIPT_START gUnk_0800C550
 StartScript 
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x08060159
+Call sub_08060158
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x08060209
+Call sub_08060208
 _0807EA94 
 _0807E878 
 Jump 0xffdc
 StartScript 
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x08060159
+Call sub_08060158
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
 CheckInventory1 0x0067
 JumpIfNot 0x000c
-Call 0x08060209
+Call sub_08060208
 Jump 0x0006
 TextboxNoOverlap 0x4710
 _0807EA94 
 _0807E878 
 Jump 0xffcc
 StartScript 
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x08060159
+Call sub_08060158
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x08060271
+Call sub_08060270
 _0807EA94 
 _0807E878 
 Jump 0xffdc
 StartScript 
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x08060159
+Call sub_08060158
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x0806021d
+Call sub_0806021C
 _0807EA94 
 Wait 0x000f
 _0807E878 
@@ -78,13 +78,13 @@ SetEntityPosition 0x0010, 0x0000
 StopScript 
 _0807E944 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckLocalFlag 0x0082
 JumpIf 0x0022
 CheckPlayerInRegion 0x00e8, 0x0028, 0x1810
 JumpIfNot 0x0006
 _0807EF80 0x000b
-StartPlayerScript 0x0800c8c8
+StartPlayerScript gUnk_0800C8C8
 WaitForSomething2 0x00000001
 _0807EF80 0x000a
 CheckInventory1 0x0040
@@ -97,7 +97,7 @@ _0807EA94
 _0807EF80 0x0015
 Wait 0x000a
 SetLocalFlag 0x0080
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff9e
 CheckLocalFlag 0x0081
@@ -107,7 +107,7 @@ TextboxNoOverlapFollow 0x1f1b
 _0807EA94 
 _0807EF80 0x0015
 Wait 0x000a
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff78
 CheckLocalFlag 0x0082
@@ -129,7 +129,7 @@ TextboxNoOverlapFollow 0x1f18
 _0807EA94 
 _0807EF80 0x0015
 Wait 0x000a
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff24
 CheckLocalFlag 0x0083
@@ -139,7 +139,7 @@ TextboxNoOverlapFollow 0x1f19
 _0807EA94 
 _0807EF80 0x0015
 Wait 0x000a
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xfefe
 _0807EF80 0x0002
@@ -147,7 +147,7 @@ TextboxNoOverlapFollow 0x1f1a
 _0807EA94 
 _0807EF80 0x0015
 Wait 0x000a
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xfee0
 StartScript 
@@ -156,8 +156,8 @@ _0807EB44 0x0004
 StopScript 
 _0807E944 
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x0800c8f0
+Call sub_0807DF28
+StartPlayerScript gUnk_0800C8F0
 WaitForSomething2 0x00000001
 CheckInventory1 0x0040
 JumpIf 0x0088
@@ -167,7 +167,7 @@ _0807E930 0x0008
 TextboxNoOverlapFollow 0x2122
 _0807EA94 
 _0807EF80 0x0000
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffc2
 _0807E930 0x0008
@@ -181,20 +181,20 @@ _0807EB8C
 TextboxNoOverlapFollow 0x1132
 _0807EA94 
 _0807E914 0x00000103
-Call 0x0807f421
+Call sub_0807F420
 TextboxNoOverlapFollow 0x1133
 _0807EA94 
 Wait 0x000a
 _0807EF80 0x0000
 SetLocalFlag 0x0081
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff78
 TextboxNoOverlapFollow 0x1133
 _0807EA94 
 Wait 0x000a
 _0807E930 0x0000
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff5e
 _0807E930 0x0008
@@ -219,35 +219,25 @@ _0807EA94
 Wait 0x000a
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E944 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB74 
 _0807E914 0x00000008
-Call 0x0807f3d9
+Call sub_0807F3D8
 TextboxNoOverlapFollow 0x1136
 _0807EA94 
 Wait 0x000a
 _0807EF80 0x0000
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffd0
 TextboxNoOverlapFollow 0x1136
 _0807EA94 
 Wait 0x000a
 _0807EF80 0x0000
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xfeba
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x00e8, 0x0068
-_0807EB44 0x0000
-Wait 0x000f
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800C8C8.inc b/data/scripts/gUnk_0800C8C8.inc
new file mode 100644
index 00000000..5b5a47c8
--- /dev/null
+++ b/data/scripts/gUnk_0800C8C8.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800C8C8
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x00e8, 0x0068
+_0807EB44 0x0000
+Wait 0x000f
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800C8F0.inc b/data/scripts/gUnk_0800C8F0.inc
index 2627062e..fb281a40 100644
--- a/data/scripts/gUnk_0800C8F0.inc
+++ b/data/scripts/gUnk_0800C8F0.inc
@@ -8,5 +8,5 @@ _0807EB44 0x0000
 Wait 0x000f
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800C91C.inc b/data/scripts/gUnk_0800C91C.inc
index d4379853..ad9c1ae8 100644
--- a/data/scripts/gUnk_0800C91C.inc
+++ b/data/scripts/gUnk_0800C91C.inc
@@ -6,9 +6,9 @@ StopScript
 CheckPlayerInRegion 0x0208, 0x0360, 0x2040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x0800ca8c
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_0800CA8C
 WaitForSomething2 0x00000002
 Wait 0x003c
 _0807EB28 0x1125
@@ -39,7 +39,7 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000400
 _0807E8E4_0 
 TextboxNoOverlapFollow 0x1126
-Call 0x0807f40d
+Call sub_0807F40C
 _0807EA94 
 _0807E5F8 0x00000200
 _0807E5F8 0x00000800
@@ -75,7 +75,7 @@ _0807E8E4_0
 _0807EB28 0x1129
 _0807EA94 
 SetLocalFlag 0x008d
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800CA8C.inc b/data/scripts/gUnk_0800CA8C.inc
index 70295047..6f440b32 100644
--- a/data/scripts/gUnk_0800CA8C.inc
+++ b/data/scripts/gUnk_0800CA8C.inc
@@ -8,6 +8,6 @@ SetEntityNonPlanarMovement 0x0080
 _0807EDD4 0x0208, 0x0340
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800CABC.inc b/data/scripts/gUnk_0800CABC.inc
index 168b926f..9892c304 100644
--- a/data/scripts/gUnk_0800CABC.inc
+++ b/data/scripts/gUnk_0800CABC.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00000200
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800CB54.inc b/data/scripts/gUnk_0800CB54.inc
index 284146b8..4efa72af 100644
--- a/data/scripts/gUnk_0800CB54.inc
+++ b/data/scripts/gUnk_0800CB54.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00000800
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800CBD4.inc b/data/scripts/gUnk_0800CBD4.inc
index d1f62aa0..2acff563 100644
--- a/data/scripts/gUnk_0800CBD4.inc
+++ b/data/scripts/gUnk_0800CBD4.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00002000
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800CC6C.inc b/data/scripts/gUnk_0800CC6C.inc
index 23266276..ebead315 100644
--- a/data/scripts/gUnk_0800CC6C.inc
+++ b/data/scripts/gUnk_0800CC6C.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0008
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00008000
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800CD04.inc b/data/scripts/gUnk_0800CD04.inc
index a911d324..638c3e93 100644
--- a/data/scripts/gUnk_0800CD04.inc
+++ b/data/scripts/gUnk_0800CD04.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0000
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000f
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00020000
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc
index b75b34d1..7cf413c8 100644
--- a/data/scripts/gUnk_0800CD7C.inc
+++ b/data/scripts/gUnk_0800CD7C.inc
@@ -2,18 +2,18 @@ SCRIPT_START gUnk_0800CD7C
 StartScript 
 CheckInventory1 0x005b
 JumpIfNot 0xf87a
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 StopScript 
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000c
-Call 0x08060159
+Call sub_08060158
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckLocalFlag 0x009d
 JumpIf 0x000e
 SetLocalFlag 0x009d
@@ -52,7 +52,7 @@ _0807F088 0x0022
 WaitPlayerAction8 
 _0807EB8C 
 SetGlobalFlag 0x0054
-Call 0x08060341
+Call sub_08060340
 TextboxNoOverlap 0x213f
 Jump 0x00be
 CheckGlobalFlag 0x003c
@@ -78,7 +78,7 @@ _0807F088 0x0027
 WaitPlayerAction8 
 _0807EB8C 
 SetGlobalFlag 0x0054
-Call 0x08060341
+Call sub_08060340
 TextboxNoOverlap 0x2143
 Jump 0x005e
 CheckGlobalFlag 0x003d
@@ -104,55 +104,55 @@ _0807F088 0x0024
 WaitPlayerAction8 
 _0807EB8C 
 SetGlobalFlag 0x0054
-Call 0x08060341
+Call sub_08060340
 TextboxNoOverlap 0x2147
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000c
-Call 0x08060159
+Call sub_08060158
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 TextboxNoOverlap 0x2140
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffd2
 TextboxNoOverlap 0x214a
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xfe46
 .short 0x0000
 StartScript 
-Call 0x08068105
+Call sub_08068104
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x0806811d
+Call sub_0806811C
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x08068191
+Call sub_08068190
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffd8
 StartScript 
-Call 0x08068105
+Call sub_08068104
 _0807EF80 0x000a
 StopScript 
 _0807E944 
 _0807E864 
-Call 0x08068191
+Call sub_08068190
 _0807EA94 
 Wait 0x000f
 _0807E878 
@@ -179,39 +179,39 @@ JumpIfNot 0x0008
 _0807E5F8 0x00000010
 StopScript 
 StartScript 
-Call 0x08068911
+Call sub_08068910
 CheckEntityInteractType 
 JumpIfNot 0xfff2
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckInventory1 0x0002
 JumpIfNot 0x0018
 _0807EB74 
 _0807E914 0x00000000
-Call 0x0806c029
+Call sub_0806C028
 TextboxNoOverlap 0x1219
 Jump 0x014c
 CheckInventory1 0x0041
 JumpIfNot 0x0060
-StartPlayerScript 0x0800d190
+StartPlayerScript gUnk_0800D190
 WaitForSomething2 0x00000008
 _0807EB74 
 _0807E914 0x00000000
-Call 0x0806c029
+Call sub_0806C028
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x125c
 .short 0x0002
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800d1b4
+StartPlayerScript gUnk_0800D1B4
 WaitForSomething2 0x00000008
 _0807EB44 0x0002
 _0807E914 0x00000000
-Call 0x0806c029
+Call sub_0806C028
 Wait 0x000f
 _0807E5F8 0x00000020
-StartPlayerScript 0x0800d1e0
+StartPlayerScript gUnk_0800D1E0
 WaitForSomething2 0x00000008
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x125d
@@ -222,7 +222,7 @@ CheckLocalFlag 0x007e
 JumpIfNot 0x000a
 TextboxNoOverlapFollow 0x123e
 Jump 0x00d6
-StartPlayerScript 0x0800d190
+StartPlayerScript gUnk_0800D190
 WaitForSomething2 0x00000008
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000004
@@ -230,19 +230,19 @@ _0807E5F8 0x00000001
 WaitForSomething2 0x00000004
 _0807EB74 
 _0807E914 0x00000000
-Call 0x0806c029
+Call sub_0806C028
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x123d
 .short 0x0002
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800d1b4
+StartPlayerScript gUnk_0800D1B4
 WaitForSomething2 0x00000008
 _0807EB44 0x0002
 _0807E914 0x00000000
-Call 0x0806c029
+Call sub_0806C028
 SoundReq 0x00cd
-Call 0x08068965
+Call sub_08068964
 ComparePlayerAction 0x0008
 JumpIf 0xfffa
 SoundReq 0x00f8
@@ -271,20 +271,11 @@ _0807E5F8 0x00000001
 WaitForSomething2 0x00000004
 _0807E930 0x0008
 Wait 0x003c
-Call 0x08095165
+Call sub_08095164
 _0807EB28 0x1240
 _0807EA94 
 Wait 0x000f
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 Jump 0xfe6e
 .short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0170, 0x0140
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800D190.inc b/data/scripts/gUnk_0800D190.inc
new file mode 100644
index 00000000..e03152f1
--- /dev/null
+++ b/data/scripts/gUnk_0800D190.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_0800D190
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0170, 0x0140
+_0807EB44 0x0002
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800D1B4.inc b/data/scripts/gUnk_0800D1B4.inc
index 1f1d73e9..e0331c55 100644
--- a/data/scripts/gUnk_0800D1B4.inc
+++ b/data/scripts/gUnk_0800D1B4.inc
@@ -7,6 +7,6 @@ _0807EDD4 0x01a8, 0x0120
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000008
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc
index db9279e7..31122968 100644
--- a/data/scripts/gUnk_0800D1E0.inc
+++ b/data/scripts/gUnk_0800D1E0.inc
@@ -1,21 +1,19 @@
 SCRIPT_START gUnk_0800D1E0
 _0807F078 0x0002, 0x0001
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf919
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F918
 .short 0x0002
 .short 0x0000
 @ End of parameters
 SoundReq 0x0109
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
 .short 0x01e2
 .short 0x0000
 @ End of parameters
-Call 0x0807f305
+Call sub_0807F304
 TextboxNoOverlap 0x0502
 _0807EA94 
 _0807E5F8 0x00000008
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800D278.inc b/data/scripts/gUnk_0800D278.inc
index 82667aba..dfc733c1 100644
--- a/data/scripts/gUnk_0800D278.inc
+++ b/data/scripts/gUnk_0800D278.inc
@@ -12,12 +12,12 @@ TestBit 0x00000001
 JumpIf 0x002a
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x0806811d
+Call sub_0806811C
 StopScript 
 Jump 0xffd4
 StopScript 
 _0807E864 
-Call 0x08068191
+Call sub_08068190
 _0807EA94 
 Wait 0x000f
 _0807E878 
@@ -33,45 +33,45 @@ _0807E930 0x000b
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x08068191
+Call sub_08068190
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffe8
 StartScript 
-Call 0x08068885
+Call sub_08068884
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0000
 StopScript 
 StopScript 
 StartScript 
-Call 0x08068911
+Call sub_08068910
 CheckEntityInteractType 
 JumpIfNot 0xfff2
 StopScript 
 _0807E864 
 _0807EB74 
 _0807E914 0x00000000
-Call 0x0806c029
+Call sub_0806C028
 TextboxNoOverlapFollow 0x1219
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffd0
 StartScript 
-Call 0x08068105
+Call sub_08068104
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x0806811d
+Call sub_0806811C
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x08068191
+Call sub_08068190
 _0807EA94 
 Wait 0x000f
 CheckLocalFlag 0x007f
@@ -82,7 +82,7 @@ _0807EF80 0x000b
 SetEntityNonPlanarMovement 0x0100
 CheckPlayerInRegion 0x0090, 0x0130, 0x0810
 JumpIfNot 0x000e
-StartPlayerScript 0x0800d3ec
+StartPlayerScript gUnk_0800D3EC
 WaitForSomething2 0x00000001
 _0807EB44 0x0002
 _0807E930 0x0005
@@ -90,7 +90,7 @@ _0807EDD4 0x00a0, 0x0130
 _0807EB44 0x0006
 _0807E930 0x0003
 _0807E914 0x00000004
-Call 0x080681d9
+Call sub_080681D8
 SoundReq 0x00cd
 Wait 0x001e
 _0807EF80 0x000a
@@ -98,14 +98,3 @@ SetLocalFlag 0x007f
 _0807E878 
 Jump 0xff76
 .short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x000d
-_0807ECC4 0x0020
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800D3EC.inc b/data/scripts/gUnk_0800D3EC.inc
new file mode 100644
index 00000000..d2d514cb
--- /dev/null
+++ b/data/scripts/gUnk_0800D3EC.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_0800D3EC
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x000d
+_0807ECC4 0x0020
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc
index 4d240ac4..d531a974 100644
--- a/data/scripts/gUnk_0800D414.inc
+++ b/data/scripts/gUnk_0800D414.inc
@@ -1,54 +1,53 @@
 SCRIPT_START gUnk_0800D414
 StartScript 
 SetEntityNonPlanarMovement 0x0100
-Call 0x08068105
+Call sub_08068104
 _0807EF80 0x000a
 StopScript 
 _0807EB44 0x0002
 _0807E914 0x00000000
-Call 0x0806af61
+Call sub_0806AF60
 Wait 0x0014
 _0807EB44 0x0004
 _0807E914 0x00000000
-Call 0x0806af61
+Call sub_0806AF60
 Wait 0x0014
 _0807EB44 0x0006
 _0807E914 0x00000000
-Call 0x0806af61
+Call sub_0806AF60
 Wait 0x0014
 _0807EB44 0x0006
 _0807E914 0x00000004
-Call 0x0806af61
+Call sub_0806AF60
 _0807EDD4 0x00a8, 0x01e8
 _0807EB44 0x0006
 _0807E914 0x00000000
-Call 0x0806af61
+Call sub_0806AF60
 Wait 0x0014
 _0807EB44 0x0004
 _0807E914 0x00000000
-Call 0x0806af61
+Call sub_0806AF60
 Wait 0x0014
 _0807EB44 0x0002
 _0807E914 0x00000000
-Call 0x0806af61
+Call sub_0806AF60
 Wait 0x0014
 _0807EB44 0x0002
 _0807E914 0x00000004
-Call 0x0806af61
+Call sub_0806AF60
 _0807EDD4 0x0228, 0x01e8
 Jump 0xff5a
 .short 0x0000
 StartScript 
 _0807EF80 0x000a
-Call 0x08062a49
+Call sub_08062A48
 _0807EB44 0x0004
 _0807EF80 0x0000
 StopScript 
-Call 0x08062699
-Call 0x080626ad
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf0ed
-.short 0x0807
+Call sub_08062698
+Call sub_080626AC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F0EC
 .short 0x0009
 .short 0x0000
 @ End of parameters
@@ -82,7 +81,7 @@ Jump 0x0008
 _0807EE04 0x00b8, 0x00b8
 StopScript 
 StartScript 
-Call 0x080626c1
+Call sub_080626C0
 JumpIf 0xff72
 CheckEntityInteractType 
 JumpIf 0x000c
@@ -92,21 +91,20 @@ Jump 0xff62
 StopScript 
 _0807E864 
 _0807EB74 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xff4a
 StartScript 
 _0807EF80 0x000a
-Call 0x08062a49
+Call sub_08062A48
 _0807EF80 0x0000
 StopScript 
-Call 0x08062699
-Call 0x080626ad
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf0ed
-.short 0x0807
+Call sub_08062698
+Call sub_080626AC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F0EC
 .short 0x0004
 .short 0x0000
 @ End of parameters
@@ -125,7 +123,7 @@ Jump 0x0008
 _0807EE04 0x0058, 0x00c8
 StopScript 
 StartScript 
-Call 0x080626c1
+Call sub_080626C0
 JumpIf 0xffae
 _0807EE30 
 JumpIfNot 0xffee
@@ -135,35 +133,34 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x000b
 _0807EF80 0x0008
-Call 0x0806daad
+Call sub_0806DAAC
 JumpIf 0x008c
-Call 0x0806dad1
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+Call sub_0806DAD0
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0002
 .short 0x0000
 @ End of parameters
 StopScript 
 _0807EA4C 
 _0807E9F0 
-Call 0x0806daad
+Call sub_0806DAAC
 JumpIf 0x000e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffe8
 _0807E864 
-Call 0x0807df29
-Call 0x0807fbc5
-Call 0x0807fba1
+Call sub_0807DF28
+Call sub_0807FBC4
+Call sub_0807FBA0
 SetEntityNonPlanarMovement 0x0700
 _0807F0B4 0x0007
 CameraTargetEntity 
 _0807EDD4 0x01e8, 0x01b8
 Wait 0x003c
-Call 0x0806dae9
+Call sub_0806DAE8
 Wait 0x0078
-Call 0x0806db45
+Call sub_0806DB44
 JumpIfNot 0x000e
 LoadRoomEntityList 0x080dd730
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800D698.inc b/data/scripts/gUnk_0800D698.inc
index 6413a8a2..69426176 100644
--- a/data/scripts/gUnk_0800D698.inc
+++ b/data/scripts/gUnk_0800D698.inc
@@ -2,8 +2,8 @@ SCRIPT_START gUnk_0800D698
 _0807EEB4 
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807fbcd
+Call sub_0807FBCC
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800D6B4.inc b/data/scripts/gUnk_0800D6B4.inc
index c1e96dca..179fbbd5 100644
--- a/data/scripts/gUnk_0800D6B4.inc
+++ b/data/scripts/gUnk_0800D6B4.inc
@@ -2,8 +2,8 @@ SCRIPT_START gUnk_0800D6B4
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x0011
-Call 0x0807f159
-Call 0x0807f739
+Call sub_0807F158
+Call sub_0807F738
 StopScript 
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800D710.inc b/data/scripts/gUnk_0800D710.inc
index 1fc7aacd..815cf2fb 100644
--- a/data/scripts/gUnk_0800D710.inc
+++ b/data/scripts/gUnk_0800D710.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_0800D710
 StartScript 
-Call 0x0807f361
+Call sub_0807F360
 SetEntityNonPlanarMovement 0x0700
 _0807F0B4 0x0007
 CameraTargetEntity 
-Call 0x0807fbc5
+Call sub_0807FBC4
 StopScript 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000010
@@ -15,9 +15,9 @@ WaitForSomething2 0x00000004
 _0807EEB4 
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807fbcd
+Call sub_0807FBCC
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc
index e0742a70..95c12242 100644
--- a/data/scripts/gUnk_0800D76C.inc
+++ b/data/scripts/gUnk_0800D76C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800D76C
 StartScript 
-Call 0x0807f361
+Call sub_0807F360
 _0807EF80 0x000b
 SetEntityNonPlanarMovement 0x0200
 _0807EB44 0x0004
@@ -10,9 +10,8 @@ WaitForSomething2 0x00000008
 _0807EF80 0x0004
 Wait 0x003c
 SoundReq 0x0123
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf465
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F464
 .short 0x01e0
 .short 0x0000
 @ End of parameters
@@ -29,7 +28,7 @@ _0807EF80 0x0001
 WaitForSomething2 0x00000008
 Jump 0x0032
 StartScript 
-Call 0x0807f361
+Call sub_0807F360
 _0807EF80 0x000b
 SetEntityPositionRelative 0x01d80268
 SetEntityNonPlanarMovement 0x0100
@@ -41,16 +40,15 @@ WaitForSomething2 0x00000002
 SetEntityNonPlanarMovement 0x0100
 _0807EEF4 0x0000, 0xffe0
 _0807EF80 0x000e
-Call 0x0806ca5d
+Call sub_0806CA5C
 SetEntity0x20 0x00040000
 SoundReq 0x00f5
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8d1
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8D0
 .short 0xe000
 .short 0xffff
 @ End of parameters
-Call 0x0807f8bd
+Call sub_0807F8BC
 JumpIf 0xffee
 _0807E5F8 0x00000004
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800D84C.inc b/data/scripts/gUnk_0800D84C.inc
index 8329c8c8..8788dae9 100644
--- a/data/scripts/gUnk_0800D84C.inc
+++ b/data/scripts/gUnk_0800D84C.inc
@@ -4,9 +4,9 @@ StopScript
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 Wait 0x003c
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc
index 34038a2a..0daba44b 100644
--- a/data/scripts/gUnk_0800D874.inc
+++ b/data/scripts/gUnk_0800D874.inc
@@ -1,17 +1,17 @@
 SCRIPT_START gUnk_0800D874
 StartScript 
-Call 0x0807f935
+Call sub_0807F934
 _0807EF80 0x0008
 _0807E914 0x00000001
-Call 0x0806da05
+Call sub_0806DA04
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckLocalFlag 0x0045
 JumpIf 0x000e
-StartPlayerScript 0x0800d92c
+StartPlayerScript gUnk_0800D92C
 WaitForSomething2 0x00000001
 _0807E8E4_0 
 TextboxNoOverlap 0x1324
@@ -23,7 +23,7 @@ JumpIf 0x0010
 LoadRoomEntityList 0x080e3830
 CheckLocalFlag 0x0045
 JumpIfNot 0xfffa
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffae
 .short 0x0000
@@ -34,16 +34,16 @@ JumpIf 0x0034
 StopScript 
 CheckInventory1 0x0017
 JumpIfNot 0xfffa
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 WaitPlayerAction8 
 _0807EB28 0x1325
 _0807EA94 
 SoundReq 0x0113
 _0807E914 0x00000000
-Call 0x0806da1d
+Call sub_0806DA1C
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800D92C.inc b/data/scripts/gUnk_0800D92C.inc
index ceb77657..2cab83b5 100644
--- a/data/scripts/gUnk_0800D92C.inc
+++ b/data/scripts/gUnk_0800D92C.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x00a0, 0x0078
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800D954.inc b/data/scripts/gUnk_0800D954.inc
index e62ca105..1b9aedd3 100644
--- a/data/scripts/gUnk_0800D954.inc
+++ b/data/scripts/gUnk_0800D954.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_0800D954
 StartScript 
 _0807EF80 0x0008
-Call 0x0807f181
+Call sub_0807F180
 StopScript 
 CheckPlayerInRegion 0x0118, 0x0038, 0x3050
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x0800da00
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_0800DA00
 WaitForSomething2 0x00000001
 Wait 0x003c
 _0807EB44 0x0004
@@ -33,8 +33,8 @@ Wait 0x003c
 SetLocalFlag 0x0032
 SoundReq 0x0113
 _0807E914 0x00000001
-Call 0x0806da1d
-Call 0x0807df51
+Call sub_0806DA1C
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DA00.inc b/data/scripts/gUnk_0800DA00.inc
index d30696df..28b606d6 100644
--- a/data/scripts/gUnk_0800DA00.inc
+++ b/data/scripts/gUnk_0800DA00.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x0118, 0x0060
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc
index 27438ec7..48644d2a 100644
--- a/data/scripts/gUnk_0800DA60.inc
+++ b/data/scripts/gUnk_0800DA60.inc
@@ -4,15 +4,15 @@ StopScript
 CheckPlayerInRegion 0x0078, 0x0148, 0x4040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807E8E4_0 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 _0807F0B4 0x0004
 SetEntityPositionRelative 0x00800078
 CameraTargetEntity 
-Call 0x0807f5c1
+Call sub_0807F5C0
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -28,28 +28,27 @@ Wait 0x001e
 @ End of parameters
 _0807EA94 
 _0807E8E4_0 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf75d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F75C
 .short 0x0138
 .short 0x0078
 @ End of parameters
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807f5c1
+Call sub_0807F5C0
 SetRoomFlag 0x0000
-Call 0x0807f40d
+Call sub_0807F40C
 Wait 0x001e
 _0807E8E4_1 
 Wait 0x000a
 _0807E8E4_3 
 Wait 0x000a
 _0807E8E4_2 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 SetRoomFlag 0x0001
 SetLocalFlag 0x0077
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DB18.inc b/data/scripts/gUnk_0800DB18.inc
index ed197a40..9017228d 100644
--- a/data/scripts/gUnk_0800DB18.inc
+++ b/data/scripts/gUnk_0800DB18.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800DB18
 StartScript 
 _0807EF80 0x000a
-Call 0x08066e39
+Call sub_08066E38
 StopScript 
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DB28.inc b/data/scripts/gUnk_0800DB28.inc
index 8dbae5d4..03568bd2 100644
--- a/data/scripts/gUnk_0800DB28.inc
+++ b/data/scripts/gUnk_0800DB28.inc
@@ -10,7 +10,7 @@ _0807EF80 0x0004
 Wait 0x003c
 _0807EB44 0x0004
 _0807EF80 0x001c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0000
 Wait 0x003c
 _0807E5F8 0x00000002
diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc
index 16d39429..92bd0e55 100644
--- a/data/scripts/gUnk_0800DB78.inc
+++ b/data/scripts/gUnk_0800DB78.inc
@@ -1,41 +1,40 @@
 SCRIPT_START gUnk_0800DB78
 StartScript 
 StopScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x00a0
 .short 0x0000
 @ End of parameters
 JumpIf 0xfff4
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x00780078
 CameraTargetEntity 
-Call 0x0807f5c1
+Call sub_0807F5C0
 _0807EB28 0x1648
 _0807EA94 
-Call 0x0804d7ed
+Call sub_0804D7EC
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-Call 0x0804d811
-Call 0x0807f3f9
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0804D810
+Call sub_0807F3F8
 Wait 0x003c
-StartPlayerScript 0x0800ddd0
+StartPlayerScript gUnk_0800DDD0
 WaitForSomething2 0x00000004
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 _0807E5F8 0x00000001
-StartPlayerScript 0x0800de00
+StartPlayerScript gUnk_0800DE00
 WaitForSomething2 0x00000006
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1643
@@ -44,13 +43,12 @@ WaitForSomething2 0x00000006
 _0807EA94 
 _0807EB28 0x1645
 _0807EA94 
-Call 0x0807f3f9
+Call sub_0807F3F8
 _0807E5F8 0x00000001
 SoundReq0x80100000 
-Call 0x08094f99
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+Call sub_08094F98
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc
index 7af83bdf..ab340180 100644
--- a/data/scripts/gUnk_0800DC4C.inc
+++ b/data/scripts/gUnk_0800DC4C.inc
@@ -1,31 +1,29 @@
 SCRIPT_START gUnk_0800DC4C
 Wait 0x003c
 SoundReq2 0x0031
-StartPlayerScript 0x0800de50
+StartPlayerScript gUnk_0800DE50
 WaitForSomething2 0x00000006
 _0807EB28 0x1646
 _0807EA94 
 _0807E5F8 0x00000001
-StartPlayerScript 0x0800de2c
+StartPlayerScript gUnk_0800DE2C
 CameraTargetPlayer 
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0001
 .short 0x0000
 @ End of parameters
 _0807F0C8 0x0000, 0x0000
 SetLocalFlag 0x0079
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0002
 .short 0x0000
 @ End of parameters
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc
index efac71a8..9acf6f22 100644
--- a/data/scripts/gUnk_0800DCAC.inc
+++ b/data/scripts/gUnk_0800DCAC.inc
@@ -1,12 +1,11 @@
 SCRIPT_START gUnk_0800DCAC
 StartScript 
 _0807EF80 0x000a
-Call 0x08066e39
+Call sub_08066E38
 StopScript 
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8E8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -19,9 +18,9 @@ _0807EF80 0x0010
 SetEntityPositionRelative 0x00680078
 WaitForSomething2 0x00000001
 SoundReq0x80100000 
-Call 0x08066e51
+Call sub_08066E50
 SoundReq 0x01c9
-Call 0x0807f2d5
+Call sub_0807F2D4
 SoundReq 0x01ca
 Wait 0x003c
 _0807EF80 0x0004
@@ -46,7 +45,7 @@ _0807EEF4 0x0000, 0x0008
 _0807EB44 0x0004
 _0807EF80 0x0000
 Wait 0x001e
-Call 0x08066e81
+Call sub_08066E80
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000002
diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc
index 927ff8b7..873bbe81 100644
--- a/data/scripts/gUnk_0800DDD0.inc
+++ b/data/scripts/gUnk_0800DDD0.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800DDD0
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x00a0
 .short 0x0000
 @ End of parameters
@@ -12,6 +11,6 @@ _0807EDD4 0x0078, 0x00a0
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800DE00.inc b/data/scripts/gUnk_0800DE00.inc
index 0db24874..024a0887 100644
--- a/data/scripts/gUnk_0800DE00.inc
+++ b/data/scripts/gUnk_0800DE00.inc
@@ -8,6 +8,6 @@ _0807EF80 0x0000
 _0807ECC4 0x0010
 _0807EF80 0x000c
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800DE2C.inc b/data/scripts/gUnk_0800DE2C.inc
index 4fd1716d..5e360b27 100644
--- a/data/scripts/gUnk_0800DE2C.inc
+++ b/data/scripts/gUnk_0800DE2C.inc
@@ -6,5 +6,5 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EEF4 0x0000, 0x0080
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc
index 9ba2ce82..522b2fab 100644
--- a/data/scripts/gUnk_0800DE50.inc
+++ b/data/scripts/gUnk_0800DE50.inc
@@ -2,13 +2,12 @@ SCRIPT_START gUnk_0800DE50
 StopScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
 .short 0x03c5
 .short 0x0000
 @ End of parameters
-Call 0x0807f305
+Call sub_0807F304
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DE78.inc b/data/scripts/gUnk_0800DE78.inc
index cc5a1b73..25d1219d 100644
--- a/data/scripts/gUnk_0800DE78.inc
+++ b/data/scripts/gUnk_0800DE78.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_0800DE78
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x0800deb0
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_0800DEB0
 WaitForSomething2 0x00000001
 WaitForSomething2 0x00000002
 _0807EB28 0x1647
 _0807EA94 
 SetLocalFlag 0x007a
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DEB0.inc b/data/scripts/gUnk_0800DEB0.inc
index 6d86314c..9f9cb7d8 100644
--- a/data/scripts/gUnk_0800DEB0.inc
+++ b/data/scripts/gUnk_0800DEB0.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x0198, 0x01c8
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DED4.inc b/data/scripts/gUnk_0800DED4.inc
index 3e1a8115..09e1a3d8 100644
--- a/data/scripts/gUnk_0800DED4.inc
+++ b/data/scripts/gUnk_0800DED4.inc
@@ -4,10 +4,10 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0100
 _0807EF80 0x000b
-Call 0x08066d05
+Call sub_08066D04
 StopScript 
 StartScript 
-Call 0x08066d15
+Call sub_08066D14
 SetEntityPositionRelative 0x01480198
 _0807EF80 0x0007
 StopScript 
@@ -15,7 +15,7 @@ _0807EDD4 0x0198, 0x01a8
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call 0x08066d4d
+Call sub_08066D4C
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc
index 1a3b4d98..5edcc2dd 100644
--- a/data/scripts/gUnk_0800DF24.inc
+++ b/data/scripts/gUnk_0800DF24.inc
@@ -5,18 +5,18 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 SoundReq0x80100000 
 _0807E8E4_2 
 Wait 0x005a
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 _0807E8E4_0 
 _0807F0B4 0x0001
 CameraTargetEntity 
-Call 0x0807f5c1
-Call 0x08066c95
+Call sub_0807F5C0
+Call sub_08066C94
 Wait 0x00e9
 _0807EF80 0x0007
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -27,15 +27,15 @@ _0807EA94
 SoundReq2 0x002f
 _0807EF80 0x0019
 SoundReq 0x0198
-Call 0x0807f2d5
+Call sub_0807F2D4
 SetRoomFlag 0x0000
 _0807EF80 0x0008
 Wait 0x0080
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807f5c1
+Call sub_0807F5C0
 SetLocalFlag 0x0078
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc
index 547f691a..26809abf 100644
--- a/data/scripts/gUnk_0800DFB4.inc
+++ b/data/scripts/gUnk_0800DFB4.inc
@@ -4,15 +4,14 @@ CheckRoomFlag 0x0001
 JumpIfNot 0xfffa
 SoundReq0x80100000 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc
index 0aa011b3..4c7c69b0 100644
--- a/data/scripts/gUnk_0800DFE4.inc
+++ b/data/scripts/gUnk_0800DFE4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800DFE4
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 StopScript 
 SoundReq0x80100000 
@@ -13,12 +13,12 @@ SetRoomFlag 0x0003
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 SoundReq2 0x0030
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 CheckRoomFlag 0x0002
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetLocalFlag 0x007b
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1639
@@ -27,13 +27,12 @@ SetLocalFlag 0x007b
 _0807EA94 
 Wait 0x0096
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0005
 .short 0x0000
 @ End of parameters
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E050.inc b/data/scripts/gUnk_0800E050.inc
index 2bfb0644..848c9da0 100644
--- a/data/scripts/gUnk_0800E050.inc
+++ b/data/scripts/gUnk_0800E050.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800E050
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 StopScript 
 SoundReq0x80100000 
@@ -11,9 +11,9 @@ _0807EA94
 SetRoomFlag 0x0000
 Wait 0x001e
 _0807E5F8 0x00000001
-StartPlayerScript 0x0800e094
+StartPlayerScript gUnk_0800E094
 WaitForSomething2 0x00000002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E094.inc b/data/scripts/gUnk_0800E094.inc
index c91b7180..91828c3e 100644
--- a/data/scripts/gUnk_0800E094.inc
+++ b/data/scripts/gUnk_0800E094.inc
@@ -6,6 +6,6 @@ WaitForSomething2 0x00000001
 _0807EF80 0x0001
 _0807EDD4 0x00a8, 0x002c
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc
index 30634329..b50cfa04 100644
--- a/data/scripts/gUnk_0800E0BC.inc
+++ b/data/scripts/gUnk_0800E0BC.inc
@@ -5,9 +5,8 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0093
 JumpIf 0x0062
 _0807E930 0x0008
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8E8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -34,7 +33,7 @@ Wait 0x000a
 TextboxNoOverlap 0x2402
 _0807EA94 
 SetLocalFlag 0x0093
-Call 0x080668f1
+Call sub_080668F0
 _0807E878 
 StopScript 
 CheckEntityInteractType 
@@ -53,9 +52,8 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0094
 JumpIf 0x006c
 _0807E930 0x0010
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8E8
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -78,9 +76,8 @@ Wait 0x001e
 _0807EF80 0x0000
 _0807EB8C 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -88,9 +85,8 @@ Wait 0x000a
 TextboxNoOverlap 0x2401
 _0807EA94 
 SetLocalFlag 0x0094
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -101,9 +97,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -120,9 +115,8 @@ JumpIfNot 0x001e
 _0807E9D4 
 SetEntityPositionRelative 0x01680070
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -131,9 +125,8 @@ Jump 0x00fe
 CheckLocalFlag 0x0095
 JumpIf 0x0062
 _0807E930 0x0010
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8E8
 .short 0x0002
 .short 0x0000
 @ End of parameters
@@ -156,17 +149,15 @@ Wait 0x001e
 _0807EF80 0x0000
 _0807EB8C 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
 SetLocalFlag 0x0095
 _0807EF80 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -187,25 +178,22 @@ _0807E9DC
 SetLocalFlag 0x0073
 StopScript 
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
 _0807EDD4 0x0088, 0x0168
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
 _0807EDD4 0x0070, 0x0168
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -213,9 +201,8 @@ _0807E9D4
 Jump 0x001e
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -228,9 +215,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -247,9 +233,8 @@ JumpIf 0x0088
 CheckLocalFlag 0x0096
 JumpIf 0x0056
 _0807E930 0x000c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8E8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -302,7 +287,7 @@ Jump 0xffe8
 StartScript 
 _0807EB44 0x0002
 _0807EF80 0x000a
-Call 0x080668f1
+Call sub_080668F0
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -315,9 +300,8 @@ _0807E878
 Jump 0xffe8
 StartScript 
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -328,9 +312,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -340,9 +323,8 @@ _0807E878
 Jump 0xffe2
 StartScript 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -353,9 +335,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -364,7 +345,7 @@ _0807EA94
 _0807E878 
 Jump 0xffe2
 StartScript 
-Call 0x0807f355
+Call sub_0807F354
 StopScript 
 CheckLocalFlag 0x007c
 JumpIf 0x0046
@@ -373,7 +354,7 @@ JumpIfNot 0xfff6
 StartScript 
 _0807E864 
 StopScript 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 TextboxNoOverlapFollow 0x160c
 _0807EA94 
diff --git a/data/scripts/gUnk_0800E504.inc b/data/scripts/gUnk_0800E504.inc
index 6b3ce23d..9dac7cfa 100644
--- a/data/scripts/gUnk_0800E504.inc
+++ b/data/scripts/gUnk_0800E504.inc
@@ -7,7 +7,7 @@ CheckPlayerInRegion 0x00a8, 0x0178, 0x1080
 JumpIfNot 0xfff6
 _0807E864 
 Wait 0x001e
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 SoundReq 0x0105
 Wait 0x001e
diff --git a/data/scripts/gUnk_0800E544.inc b/data/scripts/gUnk_0800E544.inc
index 8b5cb87f..3b997d96 100644
--- a/data/scripts/gUnk_0800E544.inc
+++ b/data/scripts/gUnk_0800E544.inc
@@ -7,12 +7,12 @@ CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880
 JumpIfNot 0xfff6
 _0807E864 
 Wait 0x001e
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 SoundReq 0x0105
 Wait 0x001e
 _0807EB28 0x1622
-Call 0x08053495
+Call sub_08053494
 SetLocalFlag 0x007e
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800E58C.inc b/data/scripts/gUnk_0800E58C.inc
index 09c173f9..db10f91a 100644
--- a/data/scripts/gUnk_0800E58C.inc
+++ b/data/scripts/gUnk_0800E58C.inc
@@ -12,6 +12,6 @@ Wait 0x001e
 TextboxNoOverlap 0x1625
 _0807EA94 
 Wait 0x003c
-Call 0x08053c85
+Call sub_08053C84
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800E5D6.inc b/data/scripts/gUnk_0800E5D6.inc
index 45eed0b2..27ed4a61 100644
--- a/data/scripts/gUnk_0800E5D6.inc
+++ b/data/scripts/gUnk_0800E5D6.inc
@@ -5,7 +5,7 @@ JumpIfNot 0xfffa
 _0807E864 
 Wait 0x003c
 _0807E914 0x00000905
-Call 0x0807f421
+Call sub_0807F420
 SetRoomFlag 0x0001
 Wait 0x001e
 _0807E878 
diff --git a/data/scripts/gUnk_0800E600.inc b/data/scripts/gUnk_0800E600.inc
index e0cf612c..fa047d0e 100644
--- a/data/scripts/gUnk_0800E600.inc
+++ b/data/scripts/gUnk_0800E600.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0000
 _0807E864 
-Call 0x0807f355
+Call sub_0807F354
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_0 
 _0807EF80 0x0001
-Call 0x080752ad
+Call sub_080752AC
 _0807E878 
-Call 0x080791d1
+Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E62C.inc b/data/scripts/gUnk_0800E62C.inc
index 7c2303ff..b2267bf5 100644
--- a/data/scripts/gUnk_0800E62C.inc
+++ b/data/scripts/gUnk_0800E62C.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0008
 _0807E864 
-Call 0x0807f355
+Call sub_0807F354
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_1 
 _0807EF80 0x0001
-Call 0x080752ad
+Call sub_080752AC
 _0807E878 
-Call 0x080791d1
+Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E658.inc b/data/scripts/gUnk_0800E658.inc
index 7d530b7a..f51cd3cf 100644
--- a/data/scripts/gUnk_0800E658.inc
+++ b/data/scripts/gUnk_0800E658.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0010
 _0807E864 
-Call 0x0807f355
+Call sub_0807F354
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_2 
 _0807EF80 0x0001
-Call 0x080752ad
+Call sub_080752AC
 _0807E878 
-Call 0x080791d1
+Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E684.inc b/data/scripts/gUnk_0800E684.inc
index 98aa719d..d59676bc 100644
--- a/data/scripts/gUnk_0800E684.inc
+++ b/data/scripts/gUnk_0800E684.inc
@@ -3,12 +3,12 @@ StartScript
 SetEntityNonPlanarMovement 0x0140
 SetEntityDirection 0x0018
 _0807E864 
-Call 0x0807f355
+Call sub_0807F354
 StopScript 
 WaitForPlayerAction0x17 
 _0807E8E4_3 
 _0807EF80 0x0001
-Call 0x080752ad
+Call sub_080752AC
 _0807E878 
-Call 0x080791d1
+Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc
index de8e1873..9029d166 100644
--- a/data/scripts/gUnk_0800E6B0.inc
+++ b/data/scripts/gUnk_0800E6B0.inc
@@ -1,33 +1,33 @@
 SCRIPT_START gUnk_0800E6B0
 StartScript 
-Call 0x08060091
+Call sub_08060090
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x08060159
+Call sub_08060158
 StopScript 
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x0806025d
+Call sub_0806025C
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffd8
 StartScript 
-Call 0x0806adfd
+Call sub_0806ADFC
 _0807EF80 0x000a
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000c
-Call 0x0806aee5
+Call sub_0806AEE4
 Jump 0xffee
 StopScript 
 _0807E864 
-Call 0x0806afe9
+Call sub_0806AFE8
 JumpIf 0x000e
 _0807EA94 
 Wait 0x000f
@@ -48,13 +48,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x0806afe9
+Call sub_0806AFE8
 _0807EA94 
 _0807E878 
 Jump 0xffe0
@@ -74,29 +73,28 @@ CheckGlobalFlag 0x002a
 JumpIf 0x002a
 CheckEntityInteractType 
 JumpIf 0x000e
-Call 0x0806aee5
+Call sub_0806AEE4
 StopScript 
 Jump 0xffe6
 StopScript 
 _0807E864 
-Call 0x0806afe9
+Call sub_0806AFE8
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffd0
 _0807EF80 0x000f
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x0806af71
+Call sub_0806AF70
 _0807EE04 0x0188, 0x0058
 StopScript 
 StartScript 
-Call 0x0806af79
+Call sub_0806AF78
 _0807EE30 
 JumpIfNot 0xfff2
 EntityHasHeight 
@@ -104,7 +102,7 @@ JumpIf 0xffec
 StopScript 
 Jump 0xff02
 StartScript 
-Call 0x0806c675
+Call sub_0806C674
 _0807EF80 0x000a
 _0807EB44 0x0004
 StopScript 
@@ -112,7 +110,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c70d
+Call sub_0806C70C
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
@@ -129,21 +127,18 @@ _0807E864
 _0807EB44 0x0004
 StartScript 
 TextboxNoOverlapFollow 0x4501
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x0032
 .short 0x0001
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x00c8
 .short 0x0002
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x0190
 .short 0x0003
 @ End of parameters
@@ -158,9 +153,8 @@ _0807EB38
 @ End of parameters
 StartScript 
 TextboxNoOverlapFollow 0x4505
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x0190
 .short 0x0001
 @ End of parameters
@@ -172,5 +166,5 @@ ModRupees 0xfe70
 SetLocalFlag 0x0091
 TextboxNoOverlapFollow 0x4508
 _0807EA94 
-Call 0x0806c579
+Call sub_0806C578
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc
index 84790e70..0e3e62d8 100644
--- a/data/scripts/gUnk_0800E8A4.inc
+++ b/data/scripts/gUnk_0800E8A4.inc
@@ -1,9 +1,8 @@
 SCRIPT_START gUnk_0800E8A4
 StartScript 
 TextboxNoOverlapFollow 0x4504
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x00c8
 .short 0x0001
 @ End of parameters
@@ -15,5 +14,5 @@ ModRupees 0xff38
 SetLocalFlag 0x0091
 TextboxNoOverlapFollow 0x4508
 _0807EA94 
-Call 0x0806c589
+Call sub_0806C588
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc
index 07bd962f..40eb094e 100644
--- a/data/scripts/gUnk_0800E8D6.inc
+++ b/data/scripts/gUnk_0800E8D6.inc
@@ -1,9 +1,8 @@
 SCRIPT_START gUnk_0800E8D6
 StartScript 
 TextboxNoOverlapFollow 0x4503
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x0032
 .short 0x0001
 @ End of parameters
@@ -15,5 +14,5 @@ ModRupees 0xffce
 SetLocalFlag 0x0091
 TextboxNoOverlapFollow 0x4508
 _0807EA94 
-Call 0x0806c599
+Call FUN_0806c598
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800E908.inc b/data/scripts/gUnk_0800E908.inc
index a716fb55..026b595b 100644
--- a/data/scripts/gUnk_0800E908.inc
+++ b/data/scripts/gUnk_0800E908.inc
@@ -7,7 +7,7 @@ _0807E878
 _0807EB44 0x0000
 Jump 0xff14
 StartScript 
-Call 0x0806c4f9
+Call sub_0806C4F8
 _0807EF80 0x000a
 _0807EB44 0x0000
 StopScript 
@@ -16,9 +16,9 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EB44 0x0004
 _0807E930 0x0004
-Call 0x0806c4a9
+Call sub_0806C4A8
 JumpIfNot 0xfff8
-Call 0x0806c4dd
+Call sub_0806C4DC
 _0807EA94 
 _0807E878 
 _0807EB44 0x0000
@@ -34,13 +34,13 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807E930 0x0008
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x0009
-Call 0x0806b261
+Call sub_0806B260
 JumpIfNot 0x0052
 _0807EA94 
 _0807EF80 0x000b
-StartPlayerScript 0x0800e9f4
+StartPlayerScript gUnk_0800E9F4
 WaitForSomething2 0x00000001
 _0807EF80 0x000a
 TextboxNoOverlapFollow 0x4a24
@@ -50,7 +50,7 @@ Wait 0x0014
 TextboxNoOverlapFollow 0x4a25
 _0807EA94 
 _0807E930 0x0000
-StartPlayerScript 0x0800ea1c
+StartPlayerScript gUnk_0800EA1C
 WaitForSomething2 0x00000001
 SetLocalFlag 0x0074
 SoundReq 0x0072
@@ -63,13 +63,3 @@ Wait 0x000f
 _0807E878 
 _0807E930 0x0000
 Jump 0xff82
-StartScript 
-_0807EB44 0x0004
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0078, 0x0080
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_0800E9F4.inc b/data/scripts/gUnk_0800E9F4.inc
new file mode 100644
index 00000000..029ea843
--- /dev/null
+++ b/data/scripts/gUnk_0800E9F4.inc
@@ -0,0 +1,11 @@
+SCRIPT_START gUnk_0800E9F4
+StartScript 
+_0807EB44 0x0004
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EF80 0x0001
+_0807EDD4 0x0078, 0x0080
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0800EA1C.inc b/data/scripts/gUnk_0800EA1C.inc
index f940e9b6..49a32db0 100644
--- a/data/scripts/gUnk_0800EA1C.inc
+++ b/data/scripts/gUnk_0800EA1C.inc
@@ -10,6 +10,6 @@ _0807EF80 0x0000
 _0807EF80 0x0005
 Wait 0x003c
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc
index 8ad06ddd..0a6bc3a1 100644
--- a/data/scripts/gUnk_0800EA54.inc
+++ b/data/scripts/gUnk_0800EA54.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800EA54
 StartScript 
-Call 0x0806ce5d
+Call sub_0806CE5C
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0008
@@ -9,24 +9,23 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x0009
-Call 0x0806ce81
+Call sub_0806CE80
 _0807EA94 
 _0807E878 
 _0807E930 0x000a
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x0008
 Jump 0xffc8
 StartScript 
 _0807E9D4 
-Call 0x0806c09d
+Call sub_0806C09C
 _0807EF80 0x000a
 _0807E930 0x0000
 _0807EB44 0x0004
@@ -36,24 +35,23 @@ JumpIfNot 0xfffc
 StartScript 
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xc029
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806C028
 .short 0x0004
 .short 0x0000
 @ End of parameters
 StopScript 
-Call 0x0806c00d
+Call sub_0806C00C
 JumpIfNot 0xfff8
 _0807E930 0x0008
-Call 0x0806c039
+Call sub_0806C038
 _0807EA94 
 Wait 0x000f
 _0807E878 
 _0807E930 0x0000
 Jump 0xffc6
 StartScript 
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0000
@@ -62,113 +60,112 @@ _0807E30C
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffe6
 .short 0x0000
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0004
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 Jump 0xffe4
 .short 0x0000
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0006
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 _0807EB44 0x0006
-Call 0x08061fd9
+Call sub_08061FD8
 Jump 0xffda
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0002
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 Jump 0x0036
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0004
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 Jump 0x001a
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0006
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 Jump 0xffe4
 .short 0x0000
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0002
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 _0807EB44 0x0002
-Call 0x08061fd9
+Call sub_08061FD8
 Jump 0xffda
 StartScript 
-Call 0x08061e71
+Call sub_08061E70
 _0807EF80 0x000a
 _0807EB44 0x0004
-Call 0x08061fd9
+Call sub_08061FD8
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fd9
-Call 0x08062049
+Call sub_08061FD8
+Call sub_08062048
 _0807EA94 
 _0807E878 
 Jump 0xffe4
 .short 0x0000
 StartScript 
 _0807E9D4 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x1fb9
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08061FB8
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -199,13 +196,12 @@ _0807E930 0x0003
 Wait 0x001e
 Jump 0xffaa
 StartScript 
-Call 0x080639d1
+Call sub_080639D0
 _0807EF80 0x000a
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x3851
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08063850
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -214,28 +210,26 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x3851
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08063850
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x08063945
+Call sub_08063944
 _0807EA94 
 JumpIfNot 0x0008
 _0807F050 0x0070
 WaitPlayerAction8 
 _0807E878 
-Call 0x08063875
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x3851
-.short 0x0806
+Call sub_08063874
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08063850
 .short 0x0000
 .short 0x0000
 @ End of parameters
 Jump 0xffc6
 StartScript 
-Call 0x08064cc1
+Call sub_08064CC0
 _0807EF80 0x000a
 _0807EF80 0x0007
 _0807EB44 0x0002
@@ -244,7 +238,7 @@ StopScript
 _0807E944 
 _0807E864 
 _0807EB74 
-Call 0x08064cd9
+Call sub_08064CD8
 _0807EA94 
 Wait 0x000f
 _0807E878 
@@ -259,11 +253,11 @@ CheckEntityInteractType
 JumpIf 0x0016
 TestBit 0x00000001
 JumpIf 0x0068
-Call 0x0806aee5
+Call sub_0806AEE4
 Jump 0xffe4
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckLocalFlag 0x00ae
 JumpIf 0x0078
 Wait 0x000a
@@ -277,28 +271,27 @@ _0807E5F8 0x00000020
 TextboxNoOverlapFollow 0x4c09
 _0807EA94 
 _0807E914 0x00000503
-Call 0x0807f421
+Call sub_0807F420
 _0807E5F8 0x00000040
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 SetLocalFlag 0x00ae
 Jump 0xff88
 StopScript 
 WaitForSomething2 0x00000002
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 WaitForSomething2 0x00000004
-Call 0x0806aed9
+Call sub_0806AED8
 WaitForSomething2 0x00000008
 Jump 0xff5c
 TextboxNoOverlapFollow 0x4c16
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff4a
 StartScript 
@@ -310,11 +303,11 @@ CheckEntityInteractType
 JumpIf 0x0016
 TestBit 0x00000001
 JumpIf 0x0068
-Call 0x0806aee5
+Call sub_0806AEE4
 Jump 0xffe4
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckLocalFlag 0x00ae
 JumpIf 0x0078
 Wait 0x000a
@@ -328,28 +321,27 @@ _0807E5F8 0x00000004
 TextboxNoOverlapFollow 0x4c09
 _0807EA94 
 _0807E914 0x00000503
-Call 0x0807f421
+Call sub_0807F420
 _0807E5F8 0x00000008
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 SetLocalFlag 0x00ae
 Jump 0xff88
 StopScript 
 WaitForSomething2 0x00000010
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 WaitForSomething2 0x00000020
-Call 0x0806aed9
+Call sub_0806AED8
 WaitForSomething2 0x00000040
 Jump 0xff5c
 TextboxNoOverlapFollow 0x4c15
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff4a
 TextboxNoOverlapFollow 0x4c07
@@ -362,5 +354,5 @@ _0807E5F8 0x00000024
 TextboxNoOverlapFollow 0x4c09
 _0807EA94 
 _0807E5F8 0x00000048
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800EF40.inc b/data/scripts/gUnk_0800EF40.inc
index 7054cbda..6cc675ef 100644
--- a/data/scripts/gUnk_0800EF40.inc
+++ b/data/scripts/gUnk_0800EF40.inc
@@ -4,14 +4,14 @@ _0807EF80 0x0007
 CheckGlobalFlag 0x001f
 JumpIf 0x0046
 StopScript 
-Call 0x080869a5
+Call sub_080869A4
 JumpIfNot 0xfff8
 _0807E864 
 CheckLocalFlagByOffset 0x0200, 0x006d
 JumpIf 0x001e
 TextboxNoOverlapFollow 0x4d01
 _0807EA94 
-StartPlayerScript 0x0800ef9c
+StartPlayerScript gUnk_0800EF9C
 WaitForSomething2 0x00000001
 Wait 0x000f
 _0807E878 
@@ -21,6 +21,6 @@ TextboxNoOverlapFollow 0x4d02
 _0807EA94 
 Wait 0x000f
 _0807E878 
-Call 0x0808692d
+Call sub_0808692C
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800EF9C.inc b/data/scripts/gUnk_0800EF9C.inc
index aa4dbcd5..4dbc08f6 100644
--- a/data/scripts/gUnk_0800EF9C.inc
+++ b/data/scripts/gUnk_0800EF9C.inc
@@ -6,6 +6,6 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 _0807ECC4 0x0008
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc
index b476d6be..70a1432d 100644
--- a/data/scripts/gUnk_0800EFC0.inc
+++ b/data/scripts/gUnk_0800EFC0.inc
@@ -8,66 +8,58 @@ JumpIf 0x00b0
 StopScript 
 Jump 0x0026
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0004
 .short 0x0000
 @ End of parameters
 _0807EDD4 0x0088, 0x0040
 _0807EF80 0x000a
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0008
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0004
 .short 0x0000
 @ End of parameters
@@ -77,7 +69,7 @@ CheckLocalFlag 0x007b
 JumpIf 0x0006
 Jump 0xff5a
 StopScript 
-Call 0x0806aee5
+Call sub_0806AEE4
 Jump 0xfff6
 .short 0x0000
 StartScript 
@@ -87,10 +79,10 @@ StopScript
 CheckPlayerInRegion 0x01f8, 0x0338, 0x1030
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 LoadRoomEntityList 0x080ee8ac
-StartPlayerScript 0x0800f14c
+StartPlayerScript gUnk_0800F14C
 WaitForSomething2 0x00000001
 _0807E5F8 0x0000001e
 WaitForSomething2 0x00000040
@@ -117,18 +109,18 @@ WaitForSomething2 0x00000040
 @ End of parameters
 _0807EA94 
 _0807E5F8 0x00000002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 WaitForSomething2 0x00000040
 CheckKinstoneFused 0x0032
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E5F8 0x0000001e
 Wait 0x003c
 _0807E8E4_1 
 WaitForSomething2 0x000003c0
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800F14C.inc b/data/scripts/gUnk_0800F14C.inc
index 622ee0eb..d0f0517e 100644
--- a/data/scripts/gUnk_0800F14C.inc
+++ b/data/scripts/gUnk_0800F14C.inc
@@ -11,5 +11,5 @@ _0807EDD4 0x01f8, 0x0338
 _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc
index d114d67c..43da522f 100644
--- a/data/scripts/gUnk_0800F184.inc
+++ b/data/scripts/gUnk_0800F184.inc
@@ -4,7 +4,7 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0008
 _0807EF80 0x000a
 StopScript 
-Call 0x0807f349
+Call sub_0807F348
 _0807EB44 0x0002
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
@@ -16,22 +16,21 @@ _0807E930 0x0008
 _0807E8E4_0 
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
-Call 0x0806e441
+Call sub_0806E440
 Wait 0x0078
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf681
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F680
 .short 0x01c0
 .short 0x0000
 @ End of parameters
 JumpIf 0x0034
 StopScript 
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 _0807EB74 
 _0807E930 0x0008
 _0807EF80 0x0004
@@ -41,20 +40,19 @@ Wait 0x003c
 .short 0x000c
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800f33c
+StartPlayerScript gUnk_0800F33C
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xffbe
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf681
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F680
 .short 0x0230
 .short 0x0000
 @ End of parameters
 JumpIfNot 0x0034
 StopScript 
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 _0807EB74 
 _0807E930 0x0008
 _0807EF80 0x0004
@@ -64,20 +62,19 @@ Wait 0x003c
 .short 0x000c
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800f354
+StartPlayerScript gUnk_0800F354
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xff7e
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x0310
 .short 0x0000
 @ End of parameters
 JumpIf 0x0034
 StopScript 
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 _0807EB74 
 _0807E930 0x0008
 _0807EF80 0x0004
@@ -87,20 +84,19 @@ Wait 0x003c
 .short 0x000c
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800f36c
+StartPlayerScript gUnk_0800F36C
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xff3e
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x0340
 .short 0x0000
 @ End of parameters
 JumpIfNot 0x0034
 StopScript 
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 _0807EB74 
 _0807E930 0x0008
 _0807EF80 0x0004
@@ -110,7 +106,7 @@ Wait 0x003c
 .short 0x000c
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800f384
+StartPlayerScript gUnk_0800F384
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xfefe
diff --git a/data/scripts/gUnk_0800F33C.inc b/data/scripts/gUnk_0800F33C.inc
index d6632d61..620fc09f 100644
--- a/data/scripts/gUnk_0800F33C.inc
+++ b/data/scripts/gUnk_0800F33C.inc
@@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F33C
 SetEntityNonPlanarMovement 0x0100
 _0807EC94 0x0008
 _0807E5F8 0x00000400
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800F354.inc b/data/scripts/gUnk_0800F354.inc
index f84638a3..c4513f21 100644
--- a/data/scripts/gUnk_0800F354.inc
+++ b/data/scripts/gUnk_0800F354.inc
@@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F354
 SetEntityNonPlanarMovement 0x0100
 _0807ECF4 0x0008
 _0807E5F8 0x00000400
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800F36C.inc b/data/scripts/gUnk_0800F36C.inc
index ce91e138..0b05d5ae 100644
--- a/data/scripts/gUnk_0800F36C.inc
+++ b/data/scripts/gUnk_0800F36C.inc
@@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F36C
 SetEntityNonPlanarMovement 0x0100
 _0807ECC4 0x0008
 _0807E5F8 0x00000400
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800F384.inc b/data/scripts/gUnk_0800F384.inc
index 68bf6162..a71b75bf 100644
--- a/data/scripts/gUnk_0800F384.inc
+++ b/data/scripts/gUnk_0800F384.inc
@@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F384
 SetEntityNonPlanarMovement 0x0100
 _0807EC64 0x0008
 _0807E5F8 0x00000400
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800F39C.inc b/data/scripts/gUnk_0800F39C.inc
index 34f2ec83..ad33e0ef 100644
--- a/data/scripts/gUnk_0800F39C.inc
+++ b/data/scripts/gUnk_0800F39C.inc
@@ -7,7 +7,7 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 StopScript 
-Call 0x0807f349
+Call sub_0807F348
 WaitForSomething2 0x00000004
 _0807EF80 0x0007
 _0807EDD4 0x01f8, 0x0318
diff --git a/data/scripts/gUnk_0800F430.inc b/data/scripts/gUnk_0800F430.inc
index 1570ff8a..94e2ad26 100644
--- a/data/scripts/gUnk_0800F430.inc
+++ b/data/scripts/gUnk_0800F430.inc
@@ -7,7 +7,7 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 StopScript 
-Call 0x0807f349
+Call sub_0807F348
 WaitForSomething2 0x00000008
 _0807EF80 0x0007
 _0807EDD4 0x01d8, 0x0328
diff --git a/data/scripts/gUnk_0800F4C4.inc b/data/scripts/gUnk_0800F4C4.inc
index e9cdb3da..d9cf6d3f 100644
--- a/data/scripts/gUnk_0800F4C4.inc
+++ b/data/scripts/gUnk_0800F4C4.inc
@@ -7,7 +7,7 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 StopScript 
-Call 0x0807f349
+Call sub_0807F348
 WaitForSomething2 0x00000010
 _0807EF80 0x0007
 _0807EDD4 0x01c8, 0x0328
diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc
index 20dda5af..8498a957 100644
--- a/data/scripts/gUnk_0800F554.inc
+++ b/data/scripts/gUnk_0800F554.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_0800F554
 StartScript 
-Call 0x08061fe5
+Call sub_08061FE4
 _0807E9D4 
 _0807EF80 0x000a
 StopScript 
@@ -8,8 +8,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fe5
-Call 0x08061ff5
+Call sub_08061FE4
+Call sub_08061FF4
 _0807EA94 
 _0807E878 
 Jump 0xffe4
@@ -23,7 +23,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 _0807E878 
 _0807EF80 0x0001
@@ -33,9 +33,8 @@ StartScript
 _0807EB44 0x0006
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -44,13 +43,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
-Call 0x08064429
+Call sub_08064428
 _0807EA94 
 _0807E878 
 Jump 0xffe0
@@ -60,15 +58,14 @@ _0807EB44 0x0004
 _0807E930 0x0000
 _0807E9D4 
 _0807EF80 0x000a
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -86,7 +83,7 @@ _0807E30C
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 _0807E878 
 Jump 0xffea
@@ -102,7 +99,7 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0001
-Call 0x0806b4f1
+Call sub_0806B4F0
 _0807EA94 
 Wait 0x000f
 _0807E878 
@@ -114,15 +111,14 @@ _0807EB44 0x0004
 _0807E930 0x0000
 _0807E9D4 
 _0807EF80 0x000a
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
@@ -134,9 +130,8 @@ TextboxNoOverlap 0x251f
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -146,7 +141,7 @@ StartScript
 _0807EF80 0x0001
 _0807E9D4 
 _0807EF80 0x000a
-Call 0x08062789
+Call sub_08062788
 StopScript 
 CheckLocalFlag 0x00cd
 JumpIf 0x001e
@@ -154,11 +149,11 @@ CheckEntityInteractType
 JumpIfNot 0xfff4
 _0807E864 
 _0807EB74 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 _0807E878 
 _0807EF80 0x0001
 Jump 0xffde
-Call 0x080627e9
+Call sub_080627E8
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc
index cb0748e3..20e3c8ad 100644
--- a/data/scripts/gUnk_0800F724.inc
+++ b/data/scripts/gUnk_0800F724.inc
@@ -9,21 +9,21 @@ Jump 0xfe4a
 CheckLocalFlag 0x00cd
 JumpIf 0x030a
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 SetEntityPositionRelative 0x014800c8
-Call 0x0807f845
+Call sub_0807F844
 _0807E778 0x0002
 DoFade6 
 WaitFor_2 
-StartPlayerScript 0x0800fa54
+StartPlayerScript gUnk_0800FA54
 _0807E5F8 0x00000002
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x021800c8
-Call 0x0807f5c1
+Call sub_0807F5C0
 Wait 0x0064
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x036800c8
-Call 0x0807f5c1
+Call sub_0807F5C0
 WaitForSomething2 0x00000001
 WaitForSomething2 0x00000004
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -35,13 +35,13 @@ _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000004
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x0800fa78
+Call sub_0807DF28
+StartPlayerScript gUnk_0800FA78
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -52,12 +52,12 @@ WaitForSomething2 0x00000004
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 WaitForSomething2 0x00000004
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x0800fa9c
+Call sub_0807DF28
+StartPlayerScript gUnk_0800FA9C
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -68,12 +68,12 @@ WaitForSomething2 0x00000004
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 WaitForSomething2 0x00000004
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x0800fac0
+Call sub_0807DF28
+StartPlayerScript gUnk_0800FAC0
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -84,28 +84,28 @@ WaitForSomething2 0x00000004
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 WaitForSomething2 0x00000004
 _0807E864 
-Call 0x0807df29
-Call 0x08063c5d
+Call sub_0807DF28
+Call sub_08063C5C
 SoundReq 0x00e2
 Wait 0x001e
 _0807E8E4_0 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1021
 .short 0x000e
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800fae4
+StartPlayerScript gUnk_0800FAE4
 SetEntityPositionRelative 0x025800f0
 _0807F0B4 0x0001
 CameraTargetEntity 
 Wait 0x001e
-Call 0x08063c2d
+Call sub_08063C2C
 WaitForSomething2 0x00000001
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1022
@@ -113,31 +113,31 @@ WaitForSomething2 0x00000001
 @ End of parameters
 _0807EA94 
 _0807E8E4_0 
-Call 0x08063c15
-Call 0x08094cdd
+Call sub_08063C14
+Call sub_08094CDC
 Wait 0x001e
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1023
 .short 0x000e
 @ End of parameters
 _0807EA94 
-Call 0x08063c15
-Call 0x08094dd9
+Call sub_08063C14
+Call sub_08094DD8
 Wait 0x001e
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1024
 .short 0x000e
 @ End of parameters
 _0807EA94 
-Call 0x08063c15
-Call 0x08094d35
+Call sub_08063C14
+Call sub_08094D34
 Wait 0x001e
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1025
 .short 0x000e
 @ End of parameters
 _0807EA94 
-Call 0x08063c5d
+Call sub_08063C5C
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1026
 .short 0x000e
@@ -146,15 +146,15 @@ _0807EA94
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 _0807E8E4_1 
-Call 0x08063c2d
+Call sub_08063C2C
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1027
 .short 0x0000
 @ End of parameters
 _0807EA94 
-Call 0x08063c75
+Call sub_08063C74
 Wait 0x003c
-Call 0x08063c15
+Call sub_08063C14
 _0807E8E4_0 
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1028
@@ -173,18 +173,18 @@ _0807E8E4_0
 .short 0x000e
 @ End of parameters
 _0807EA94 
-Call 0x08063c15
-Call 0x08094d71
+Call sub_08063C14
+Call sub_08094D70
 SoundReq 0x0103
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-Call 0x08063c15
-Call 0x08094d11
+Call sub_08063C14
+Call sub_08094D10
 Wait 0x001e
-Call 0x08094e0d
+Call sub_08094E0C
 Wait 0x001e
 _0807E8E4_1 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x102b
@@ -193,44 +193,41 @@ Wait 0x003c
 _0807EA94 
 _0807F034 0x000d
 WaitPlayerAction8 
-Call 0x0806dc3d
-Call 0x080791bd
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf245
-.short 0x0807
+Call sub_0806DC3C
+Call sub_080791BC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F244
 .short 0x000d
 .short 0x0000
 @ End of parameters
 _0807E914 0x000000ff
-Call 0x0807f5b1
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+Call sub_0807F5B0
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x49d6
 .short 0x0800
 @ End of parameters
 Wait 0x00b7
 _0807E914 0x00000000
-Call 0x0807f5b1
+Call sub_0807F5B0
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x102c
 .short 0x0000
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x0806dc59
+Call sub_0806DC58
 _0807F0B4 0x0004
 CameraTargetPlayer 
 Wait 0x000a
 _0807E5F8 0x00000002
-Call 0x08063c45
+Call sub_08063C44
 SetLocalFlag 0x00cd
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FA54.inc b/data/scripts/gUnk_0800FA54.inc
index 0b51b2e4..bf484da1 100644
--- a/data/scripts/gUnk_0800FA54.inc
+++ b/data/scripts/gUnk_0800FA54.inc
@@ -6,5 +6,5 @@ SetEntityPositionRelative 0x039800d8
 _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FA78.inc b/data/scripts/gUnk_0800FA78.inc
index fe2366d3..fa328ab6 100644
--- a/data/scripts/gUnk_0800FA78.inc
+++ b/data/scripts/gUnk_0800FA78.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x00a0, 0x0278
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FA9C.inc b/data/scripts/gUnk_0800FA9C.inc
index 303070de..a2e8fc7b 100644
--- a/data/scripts/gUnk_0800FA9C.inc
+++ b/data/scripts/gUnk_0800FA9C.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x0078, 0x01c0
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FAC0.inc b/data/scripts/gUnk_0800FAC0.inc
index 26a1c150..202b3a20 100644
--- a/data/scripts/gUnk_0800FAC0.inc
+++ b/data/scripts/gUnk_0800FAC0.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x0108, 0x01c8
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc
index 8075ddaa..ccbf8ef7 100644
--- a/data/scripts/gUnk_0800FAE4.inc
+++ b/data/scripts/gUnk_0800FAE4.inc
@@ -2,22 +2,20 @@ SCRIPT_START gUnk_0800FAE4
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call 0x0807f585
+Call sub_0807F584
 .short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0012
 .short 0x001a
 .short 0x000e
 .short 0x0002
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x027c
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf465
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F464
 .short 0x00e8
 .short 0x0000
 @ End of parameters
@@ -25,5 +23,5 @@ _0807EDD4 0x00e8, 0x0270
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FB2C.inc b/data/scripts/gUnk_0800FB2C.inc
index 8a6d1083..28fbe705 100644
--- a/data/scripts/gUnk_0800FB2C.inc
+++ b/data/scripts/gUnk_0800FB2C.inc
@@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800FB2C
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800FB44.inc b/data/scripts/gUnk_0800FB44.inc
index 0dba8ca8..a3733e33 100644
--- a/data/scripts/gUnk_0800FB44.inc
+++ b/data/scripts/gUnk_0800FB44.inc
@@ -3,10 +3,10 @@ StartScript
 _0807EF80 0x0008
 _0807EF80 0x000b
 SetEntityNonPlanarMovement 0x0080
-Call 0x08066d05
+Call sub_08066D04
 StopScript 
 WaitForSomething2 0x00000002
-Call 0x08066d15
+Call sub_08066D14
 JumpIf 0x0004
 MoveEntityToPlayer 
 _0807EF80 0x0007
@@ -95,6 +95,6 @@ _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
-Call 0x08066d4d
+Call sub_08066D4C
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc
index 1522960f..7e869814 100644
--- a/data/scripts/gUnk_0800FD0C.inc
+++ b/data/scripts/gUnk_0800FD0C.inc
@@ -7,35 +7,27 @@ JumpIfNot 0xfff6
 CheckLocalFlag 0x00cd
 JumpIf 0x0030
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2506
 .short 0x0000
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800fd80
+StartPlayerScript gUnk_0800FD80
 WaitForSomething2 0x00000008
 _0807E878 
 Jump 0xffcc
 CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
+Call sub_0807F9A4
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x106c
 .short 0x0000
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x0800fd80
+StartPlayerScript gUnk_0800FD80
 WaitForSomething2 0x00000008
 _0807E878 
 Jump 0xffd4
 .short 0x0000
-SetEntityNonPlanarMovement 0x0080
-_0807EC64 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call 0x080791bd
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_0800FD80.inc b/data/scripts/gUnk_0800FD80.inc
new file mode 100644
index 00000000..b01200e6
--- /dev/null
+++ b/data/scripts/gUnk_0800FD80.inc
@@ -0,0 +1,9 @@
+SCRIPT_START gUnk_0800FD80
+SetEntityNonPlanarMovement 0x0080
+_0807EC64 0x0020
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000008
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc
index 67e2c4fe..e8d9db8e 100644
--- a/data/scripts/gUnk_0800FDA0.inc
+++ b/data/scripts/gUnk_0800FDA0.inc
@@ -9,7 +9,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08069889
+Call sub_08069888
 _0807EA94 
 _0807E878 
 Jump 0xffea
@@ -21,11 +21,11 @@ _0807EF80 0x000a
 _0807E9D4 
 SetEntityNonPlanarMovement 0x0040
 StopScript 
-Call 0x08069a61
-Call 0x0806991d
+Call sub_08069A60
+Call sub_0806991C
 StopScript 
 StartScript 
-Call 0x08069acd
+Call sub_08069ACC
 JumpIf 0x000c
 _0807EE30 
 JumpIfNot 0xffee
@@ -43,7 +43,7 @@ Wait 0x001e
 _0807EB44 0x0006
 _0807EF80 0x0000
 Wait 0x003c
-Call 0x08069a3d
+Call sub_08069A3C
 Jump 0xffa8
 .short 0x0000
 StartScript 
@@ -53,11 +53,11 @@ _0807EF80 0x000a
 _0807E9D4 
 SetEntityNonPlanarMovement 0x0040
 StopScript 
-Call 0x08069aa9
-Call 0x080699ad
+Call sub_08069AA8
+Call sub_080699AC
 StopScript 
 StartScript 
-Call 0x08069acd
+Call sub_08069ACC
 JumpIf 0x000c
 _0807EE30 
 JumpIfNot 0xffee
@@ -75,7 +75,7 @@ Wait 0x001e
 _0807EB44 0x0006
 _0807EF80 0x0000
 Wait 0x003c
-Call 0x08069a85
+Call sub_08069A84
 Jump 0xffa8
 .short 0x0000
 StartScript 
@@ -83,9 +83,8 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -93,19 +92,18 @@ StopScript
 StopScript 
 StartScript 
 _0807EF80 0x000b
-Call 0x080642b9
+Call sub_080642B8
 CheckEntityInteractType 
 JumpIfNot 0xffee
 StopScript 
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
-Call 0x08064429
+Call sub_08064428
 _0807EA94 
 Wait 0x000f
 _0807E878 
diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc
index e152daba..f84775de 100644
--- a/data/scripts/gUnk_0800FF18.inc
+++ b/data/scripts/gUnk_0800FF18.inc
@@ -4,9 +4,8 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -14,19 +13,18 @@ StopScript
 StopScript 
 StartScript 
 _0807EF80 0x000b
-Call 0x08064199
+Call sub_08064198
 CheckEntityInteractType 
 JumpIfNot 0xffee
 StopScript 
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
-Call 0x08064429
+Call sub_08064428
 _0807EA94 
 Wait 0x000f
 _0807E878 
diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc
index d1f5a7a9..e258b17d 100644
--- a/data/scripts/gUnk_0800FF74.inc
+++ b/data/scripts/gUnk_0800FF74.inc
@@ -2,13 +2,12 @@ SCRIPT_START gUnk_0800FF74
 StartScript 
 _0807EB44 0x0002
 _0807E9D4 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
-Call 0x080644a5
+Call sub_080644A4
 ClearLocalFlag 0x00c7
 StopScript 
 StopScript 
@@ -17,13 +16,13 @@ _0807EF80 0x000a
 CheckLocalFlag 0x00ce
 JumpIf 0x002c
 _0807EF80 0x000b
-Call 0x08064199
+Call sub_08064198
 CheckLocalFlag 0x00c7
 JumpIfNot 0x001a
-Call 0x08064489
+Call sub_08064488
 CheckPlayerInRegion2 0x4040
 JumpIfNot 0x000c
-Call 0x08064471
+Call sub_08064470
 JumpIf 0x004a
 CheckEntityInteractType 
 JumpIfNot 0xffc2
@@ -31,9 +30,8 @@ StopScript
 SetLocalFlag 0x00c7
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -52,12 +50,11 @@ _0807EA94
 Jump 0x004e
 StopScript 
 _0807E888 
-Call 0x0807f595
+Call sub_0807F594
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -65,26 +62,23 @@ SoundReq 0x00cd
 TextboxNoOverlap 0x340a
 _0807EA94 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x000c
 .short 0x0000
 @ End of parameters
 SetEntityNonPlanarMovement 0x0100
 _0807EDD4 0x0018, 0x0108
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
 SetLocalFlag 0x00ce
-Call 0x080644a5
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf5b1
-.short 0x0807
+Call sub_080644A4
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F5B0
 .short 0x000a
 .short 0x0000
 @ End of parameters
@@ -95,9 +89,8 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x72b1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080672B0
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -106,9 +99,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x72b1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080672B0
 .short 0x0004
 .short 0x0000
 @ End of parameters
@@ -117,9 +109,8 @@ _0807EA94
 Wait 0x000f
 _0807E878 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x72b1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080672B0
 .short 0x0000
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc
index 26079488..340ed779 100644
--- a/data/scripts/gUnk_080100C8.inc
+++ b/data/scripts/gUnk_080100C8.inc
@@ -1,26 +1,26 @@
 SCRIPT_START gUnk_080100C8
 StartScript 
-Call 0x08061fe5
-Call 0x08061e71
+Call sub_08061FE4
+Call sub_08061E70
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08061fe5
-Call 0x08062049
+Call sub_08061FE4
+Call sub_08062048
 _0807EA94 
 _0807E878 
 Jump 0xffe4
 .short 0x0000
 StartScript 
-Call 0x08061fe5
-Call 0x08061e71
+Call sub_08061FE4
+Call sub_08061E70
 _0807EF80 0x000a
 StopScript 
 Wait 0x003c
-Call 0x08061e91
+Call sub_08061E90
 Jump 0xfff4
 .short 0x0000
 StartScript 
@@ -39,7 +39,7 @@ _0807E878
 Jump 0xffec
 StartScript 
 _0807EF80 0x0001
-Call 0x0806c355
+Call sub_0806C354
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
@@ -55,12 +55,11 @@ JumpIf 0x0034
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x002e
-Call 0x080a1609
+Call sub_080A1608
 _0807EA94 
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x1551
-.short 0x080a
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080A1550
 .short 0x01ac
 .short 0x0801
 @ End of parameters
@@ -68,17 +67,17 @@ JumpIfNot 0xffca
 SoundReq2 0x0015
 SetRoomFlag 0x0001
 Jump 0xffbe
-Call 0x080a1609
+Call sub_080A1608
 _0807EA94 
 _0807E878 
 Jump 0xffb0
 StartScript 
 _0807EF80 0x0008
-Call 0x080a1649
+Call sub_080A1648
 StopScript 
-Call 0x080a1271
+Call sub_080A1270
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x3004
 .short 0x0007
@@ -88,45 +87,43 @@ SoundReq0x80100000
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf75d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F75C
 .short 0x0378
 .short 0x0340
 @ End of parameters
-Call 0x080791bd
-Call 0x0807fb75
+Call sub_080791BC
+Call sub_0807FB74
 _0807E8E4_1 
-Call 0x0807f169
-Call 0x080a1389
-Call 0x0806ec39
+Call sub_0807F168
+Call sub_080A1388
+Call sub_0806EC38
 StartScript 
 MoveEntityToPlayer 
-Call 0x0807f845
+Call sub_0807F844
 CameraTargetPlayer 
 StopScript 
 _0807E778 0x0004
 DoFade4 
 WaitFor_2 
 SoundReq2 0xffff
-Call 0x080a13b5
+Call sub_080A13B4
 _0807EA94 
 JumpIfNot 0x0018
-Call 0x080a13e9
+Call sub_080A13E8
 WaitPlayerAction8 
-Call 0x080a1461
+Call sub_080A1460
 _0807EA94 
-Call 0x080a14a9
-Call 0x0807df51
+Call sub_080A14A8
+Call sub_0807DF50
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf5b1
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F5B0
 .short 0x0000
 .short 0x0000
 @ End of parameters
 ClearRoomFlag 0x0001
-Call 0x080a169d
+Call sub_080A169C
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc
index cb9e58ba..dfdd0f66 100644
--- a/data/scripts/gUnk_08010264.inc
+++ b/data/scripts/gUnk_08010264.inc
@@ -10,14 +10,14 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08065f65
+Call sub_08065F64
 _0807EA94 
 _0807E878 
 Jump 0xffea
 .short 0x0000
 StartScript 
 _0807EF80 0x0000
-Call 0x08062a49
+Call sub_08062A48
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
@@ -26,28 +26,28 @@ CheckRoomFlag 0x0009
 JumpIfNot 0x001a
 _0807E864 
 _0807EB74 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 _0807E878 
-Call 0x08062501
+Call sub_08062500
 Jump 0xffdc
 _0807E864 
 _0807EB74 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 _0807E878 
 Jump 0xffca
 .short 0x0000
 StartScript 
 _0807EF80 0x0000
-Call 0x08062a49
+Call sub_08062A48
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 _0807E878 
 Jump 0xffea
@@ -56,11 +56,10 @@ StartScript
 _0807EF80 0x0000
 StopScript 
 StopScript 
-Call 0x08062699
-Call 0x080626ad
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf0ed
-.short 0x0807
+Call sub_08062698
+Call sub_080626AC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F0EC
 .short 0x0009
 .short 0x0000
 @ End of parameters
@@ -94,7 +93,7 @@ Jump 0x0008
 _0807EE04 0x03c8, 0x00b8
 StopScript 
 StartScript 
-Call 0x080626c1
+Call sub_080626C0
 JumpIf 0xff72
 _0807EE30 
 JumpIfNot 0xffee
@@ -102,34 +101,32 @@ Jump 0xff68
 .short 0x0000
 StartScript 
 _0807EF80 0x0000
-Call 0x08062a49
+Call sub_08062A48
 _0807EF80 0x000a
 StopScript 
 Wait 0x001e
-Call 0x08062949
+Call sub_08062948
 Jump 0xfff4
 StartScript 
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
 StopScript 
 Wait 0x003c
-Call 0x0806407d
+Call sub_0806407C
 Jump 0xfff4
 .short 0x0000
 StartScript 
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -138,7 +135,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x08064429
+Call sub_08064428
 _0807EA94 
 _0807E878 
 Jump 0xffea
@@ -148,35 +145,33 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
 _0807E914 0x08064689
-Call 0x08064645
+Call sub_08064644
 StopScript 
 Wait 0x003c
-Call 0x080646a5
+Call sub_080646A4
 Jump 0xfff4
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0000
-Call 0x080636f5
+Call sub_080636F4
 _0807EF80 0x000a
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x080636d9
+Call sub_080636D8
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -184,27 +179,25 @@ Jump 0xffd2
 StartScript 
 _0807EB44 0x0004
 _0807E930 0x0000
-Call 0x08063cad
+Call sub_08063CAC
 _0807EF80 0x000a
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x08063c91
+Call sub_08063C90
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -213,16 +206,15 @@ StartScript
 _0807EB44 0x0004
 _0807E930 0x0000
 _0807EF80 0x000a
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -231,7 +223,7 @@ JumpIf 0x000c
 SetRoomFlag 0x000e
 TextboxNoOverlap 0x2b10
 _0807EA94 
-Call 0x080634e5
+Call sub_080634E4
 .short 0x2006 @ _0807E078 with 7 parameters
 .short 0x000e
 .short 0x0020
@@ -252,32 +244,29 @@ Jump 0x000e
 CheckGlobalFlag 0x003b
 JumpIfNot 0x0072
 Jump 0x0002
-Call 0x080634ed
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf78d
-.short 0x0807
+Call sub_080634EC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F78C
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x005a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf7c5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F7C4
 .short 0x0000
 .short 0x0000
 @ End of parameters
 JumpIfNot 0x0030
 _0807E48C 0x0020
 JumpIfNot 0x0030
-Call 0x08063505
+Call sub_08063504
 JumpIf 0x002e
 TextboxNoOverlap 0x2b07
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf801
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F800
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -293,7 +282,7 @@ TextboxNoOverlap 0x2b0b
 Jump 0x0006
 TextboxNoOverlap 0x2b0e
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff16
 .short 0x0000
@@ -314,13 +303,13 @@ _0807EB44 0x0004
 Jump 0xffe8
 StartScript 
 _0807E930 0x0008
-Call 0x08062a49
+Call sub_08062A48
 _0807EF80 0x000a
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0806265d
+Call sub_0806265C
 _0807EA94 
 _0807E878 
 Jump 0xffec
@@ -351,7 +340,7 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 .short 0x0411 @ HasRoomItemForSale with 0 parameters
-Call 0x0807f77d
+Call sub_0807F77C
 .short 0x0c5d @ _0807EAF0 with 2 parameters
 .short 0x3c08
 .short 0x3c09
@@ -371,16 +360,15 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0000
 .short 0x0411 @ HasRoomItemForSale with 0 parameters
 JumpIf 0x000a
 TextboxNoOverlap 0x3c07
 Jump 0x0048
-Call 0x08062eb9
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf78d
-.short 0x0807
+Call sub_08062EB8
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F78C
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -394,7 +382,7 @@ TextboxNoOverlap 0x3c04
 Jump 0x001c
 WaitPlayerAction8 
 ModHealth 0x0008
-Call 0x08062edd
+Call sub_08062EDC
 JumpIf 0x000a
 TextboxNoOverlap 0x3c06
 Jump 0x0004
@@ -415,7 +403,7 @@ JumpIfNot 0xfffc
 _0807E864 
 _0807E930 0x0004
 StartScript 
-Call 0x08062d19
+Call sub_08062D18
 JumpIfNot 0x002a
 StopScript 
 _0807EA94 
@@ -426,7 +414,7 @@ JumpIf 0x000a
 TextboxNoOverlap 0x4008
 Jump 0x0010
 ModRupees 0xff38
-Call 0x08062e15
+Call sub_08062E14
 TextboxNoOverlap 0x4007
 StopScript 
 _0807EA94 
@@ -443,9 +431,9 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0001
-Call 0x08062cbd
+Call sub_08062CBC
 _0807EA94 
 _0807E878 
 _0807EF80 0x0000
@@ -457,14 +445,14 @@ _0807EF80 0x0000
 _0807EF80 0x000a
 _0807EF80 0x0007
 _0807E9D4 
-Call 0x0807f349
-Call 0x08069685
+Call sub_0807F348
+Call sub_08069684
 StopScript 
 StopScript 
 StartScript 
 CheckPlayerInRegion2 0x3030
 JumpIfNot 0xfff6
-Call 0x080696b1
+Call sub_080696B0
 StopScript 
 StartScript 
 CheckPlayerInRegion2 0x3030
@@ -475,7 +463,7 @@ CheckEntityInteractType
 JumpIfNot 0xffea
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB74 
 CheckGlobalFlag 0x0042
 JumpIfNot 0x002a
@@ -493,13 +481,13 @@ TextboxNoOverlap 0x2c1a
 Jump 0x005c
 StopScript 
 _0807E864 
-Call 0x0807df39
+Call sub_0807DF38
 _0807EB74 
-Call 0x08069661
+Call sub_08069660
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x003a
-Call 0x08069719
+Call sub_08069718
 JumpIfNot 0x0030
 WaitPlayerAction8 
 _0807EA94 
@@ -515,9 +503,9 @@ Jump 0x000a
 SetLocalFlag 0x00fa
 TextboxNoOverlap 0x2c20
 _0807EA94 
-Call 0x0807f83d
+Call sub_0807F83C
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EB44 0x0004
 _0807EF80 0x0000
@@ -525,15 +513,15 @@ Jump 0xff36
 CheckPlayerInRegion2 0x0808
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x080109f0
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_080109F0
 WaitForSomething2 0x00000001
 CheckRoomFlag 0x0001
 JumpIf 0x0008
 _0807EB28 0x0b63
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffc6
 StartScript 
@@ -541,20 +529,20 @@ _0807EF80 0x0007
 CheckKinstoneFused 0x001b
 JumpIf 0xe67a
 StopScript 
-Call 0x080869a5
+Call sub_080869A4
 JumpIfNot 0xfff8
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 CheckRoomFlag 0x0001
 JumpIf 0x0008
 _0807EB28 0x0b62
 _0807EA94 
-StartPlayerScript 0x080109f0
+StartPlayerScript gUnk_080109F0
 WaitForSomething2 0x00000001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffc4
-Call 0x0808692d
+Call sub_0808692C
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010964.inc b/data/scripts/gUnk_08010964.inc
index 2f63d2b3..68c6f138 100644
--- a/data/scripts/gUnk_08010964.inc
+++ b/data/scripts/gUnk_08010964.inc
@@ -2,15 +2,15 @@ SCRIPT_START gUnk_08010964
 CheckPlayerInRegion2 0x0808
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x08010a38
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_08010A38
 WaitForSomething2 0x00000001
 CheckRoomFlag 0x0001
 JumpIf 0x0008
 _0807EB28 0x0b63
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffc6
 StartScript 
@@ -21,15 +21,15 @@ CheckPlayerInRegion2 0x0808
 JumpIfNot 0xffee
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x08010a38
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_08010A38
 WaitForSomething2 0x00000001
 CheckRoomFlag 0x0001
 JumpIf 0x0008
 _0807EB28 0x0b64
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffb8
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080109F0.inc b/data/scripts/gUnk_080109F0.inc
index 05097e85..335eaf5a 100644
--- a/data/scripts/gUnk_080109F0.inc
+++ b/data/scripts/gUnk_080109F0.inc
@@ -6,6 +6,6 @@ _0807ECC4 0x0010
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010A14.inc b/data/scripts/gUnk_08010A14.inc
index 2a01dc4f..196aa06f 100644
--- a/data/scripts/gUnk_08010A14.inc
+++ b/data/scripts/gUnk_08010A14.inc
@@ -6,6 +6,6 @@ _0807EC64 0x0010
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010A38.inc b/data/scripts/gUnk_08010A38.inc
index 77c712ad..9687579a 100644
--- a/data/scripts/gUnk_08010A38.inc
+++ b/data/scripts/gUnk_08010A38.inc
@@ -6,6 +6,6 @@ _0807EC94 0x0010
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010A5C.inc b/data/scripts/gUnk_08010A5C.inc
index e454f7a6..298feea6 100644
--- a/data/scripts/gUnk_08010A5C.inc
+++ b/data/scripts/gUnk_08010A5C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08010A5C
 StartScript 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 ModHealth 0x00a0
 StopScript 
@@ -8,11 +8,11 @@ Wait 0x003c
 _0807E778 0x0004
 DoFade4 
 WaitFor_2 
-Call 0x0807f0d9
+Call sub_0807F0D8
 JumpIfNot 0xfff8
 _0807EF80 0x0014
 _0807E878 
-Call 0x0807df51
-Call 0x080791d1
+Call sub_0807DF50
+Call sub_080791D0
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc
index d23275f4..60379c95 100644
--- a/data/scripts/gUnk_08010A98.inc
+++ b/data/scripts/gUnk_08010A98.inc
@@ -1,32 +1,29 @@
 SCRIPT_START gUnk_08010A98
 StartScript 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x72b1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080672B0
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807EF80 0x000a
-Call 0x08067315
+Call sub_08067314
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x72b1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080672B0
 .short 0x0004
 .short 0x0000
 @ End of parameters
-Call 0x08067305
+Call sub_08067304
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x72b1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080672B0
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -37,25 +34,22 @@ JumpIfNot 0x0076
 _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0180
-.short 0x0c0c @ CallWithArg with 2 parameters
-.short 0xf349
-.short 0x0807
-@ End of parameters
-Call 0x0806075d
+.short 0x0c0c @ CallWithArg with 0 parameters
+.word sub_0807F348
+Call sub_0806075C
 StopScript 
 _0807EA94 
-Call 0x080606c1
+Call sub_080606C0
 StopScript 
-Call 0x0806076d
+Call sub_0806076C
 _0807EF80 0x0007
-Call 0x08060701
+Call sub_08060700
 StopScript 
 StartScript 
 _0807E564 
 JumpIf 0x0010
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x08e5
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080608E4
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -67,9 +61,8 @@ StopScript
 _0807EF80 0x0000
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x08e5
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080608E4
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08010B68.inc b/data/scripts/gUnk_08010B68.inc
index cdeb2447..36afe5e4 100644
--- a/data/scripts/gUnk_08010B68.inc
+++ b/data/scripts/gUnk_08010B68.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08010B68
 StartScript 
 _0807E564 
 JumpIfNot 0x003e
-Call 0x0807f925
+Call sub_0807F924
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x0007
@@ -17,7 +17,7 @@ JumpIfNot 0xfff2
 StopScript 
 _0807E864 
 _0807EB74 
-Call 0x0806e2dd
+Call sub_0806E2DC
 _0807EA94 
 _0807E878 
 Jump 0xffde
diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc
index 9ecb46e8..7ed5fa31 100644
--- a/data/scripts/gUnk_08010BB4.inc
+++ b/data/scripts/gUnk_08010BB4.inc
@@ -3,23 +3,23 @@ StartScript
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0008
-Call 0x0806e441
+Call sub_0806E440
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
-Call 0x0806e419
+Call sub_0806E418
 _0807EA94 
 _0807E878 
 _0807E930 0x0008
 Jump 0xffe2
 .short 0x0000
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x08011074
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_08011074
 WaitForSomething2 0x00000400
 _0807F078 0x0034, 0x0002
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -45,18 +45,18 @@ SoundReq0x80100000
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
-Call 0x08064181
-Call 0x08064181
-Call 0x08064181
-Call 0x08064181
-Call 0x08064181
-Call 0x08064181
-Call 0x08064181
-Call 0x08064181
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
+Call sub_08064180
 LoadRoomEntityList 0x080f06e0
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-StartPlayerScript 0x08011098
+StartPlayerScript gUnk_08011098
 WaitForSomething2 0x00000400
 SetEntityPositionRelative 0x005001f8
 _0807F0B4 0x0007
@@ -127,9 +127,8 @@ SoundReq 0x01c7
 SoundReq 0x00e5
 _0807E5F8 0x00000100
 _0807E5F8 0x00002800
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -150,9 +149,8 @@ _0807E5F8 0x00028000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
 WaitForSomething2 0x00050000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -160,18 +158,16 @@ SoundReq 0x00e5
 _0807E5F8 0x00028000
 WaitForSomething2 0x00050000
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
 _0807E5F8 0x08000000
 _0807E5F8 0x00800000
 WaitForSomething2 0x01000000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0002
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc
index 013366c0..d38d26d0 100644
--- a/data/scripts/gUnk_08010E5A.inc
+++ b/data/scripts/gUnk_08010E5A.inc
@@ -1,25 +1,22 @@
 SCRIPT_START gUnk_08010E5A
 Wait 0x001e
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x003c
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x0004
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -39,24 +36,21 @@ WaitForSomething2 0x00000020
 _0807E778 0x0002
 DoFade6 
 WaitFor_2 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0002
 .short 0x0000
 @ End of parameters
 _0807F0C8 0x0000, 0x0000
-Call 0x0806dc3d
-Call 0x080791bd
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf245
-.short 0x0807
+Call sub_0806DC3C
+Call sub_080791BC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F244
 .short 0x000d
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x49f6
 .short 0x0800
 @ End of parameters
@@ -70,13 +64,12 @@ WaitForSomething2 0x00000080
 SoundReq 0x01c3
 _0807E5F8 0x20000000
 Wait 0x0078
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x0806dc59
+Call sub_0806DC58
 _0807E5F8 0x40000000
 _0807E5F8 0x00000010
 _0807E5F8 0x00000100
@@ -92,9 +85,8 @@ _0807EA94
 .short 0x0000
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0002
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc
index 56905c01..a9b0d8c3 100644
--- a/data/scripts/gUnk_08010F84.inc
+++ b/data/scripts/gUnk_08010F84.inc
@@ -2,57 +2,51 @@ SCRIPT_START gUnk_08010F84
 Wait 0x003c
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-StartPlayerScript 0x080110bc
+StartPlayerScript gUnk_080110BC
 WaitForSomething2 0x00000400
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1047
 .short 0x0000
 @ End of parameters
 _0807EA94 
-Call 0x0806dc3d
-Call 0x080791bd
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf245
-.short 0x0807
+Call sub_0806DC3C
+Call sub_080791BC
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F244
 .short 0x000d
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x49f6
 .short 0x0800
 @ End of parameters
 Wait 0x001e
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x0806dc59
+Call sub_0806DC58
 Wait 0x003c
 _0807E5F8 0x08000000
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x000f
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0002
 .short 0x0000
 @ End of parameters
@@ -77,7 +71,7 @@ SetEntityPositionRelative 0x009801f8
 Wait 0x0078
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-Call 0x0804bcdd
+Call sub_0804BCDC
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08011074.inc b/data/scripts/gUnk_08011074.inc
index 38da146f..e190a719 100644
--- a/data/scripts/gUnk_08011074.inc
+++ b/data/scripts/gUnk_08011074.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x01e8, 0x0050
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000400
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08011098.inc b/data/scripts/gUnk_08011098.inc
index a86bbcb8..48db15b4 100644
--- a/data/scripts/gUnk_08011098.inc
+++ b/data/scripts/gUnk_08011098.inc
@@ -5,5 +5,5 @@ _0807EF80 0x0000
 _0807E5F8 0x00000400
 _0807E610 0x00000002
 StopScript 
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_080110BC.inc b/data/scripts/gUnk_080110BC.inc
index 5ff9e2a6..e37f55c2 100644
--- a/data/scripts/gUnk_080110BC.inc
+++ b/data/scripts/gUnk_080110BC.inc
@@ -8,5 +8,5 @@ _0807EDD4 0x01d8, 0x0068
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000400
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_080110E8.inc b/data/scripts/gUnk_080110E8.inc
index 340d4165..888fb7cd 100644
--- a/data/scripts/gUnk_080110E8.inc
+++ b/data/scripts/gUnk_080110E8.inc
@@ -3,14 +3,14 @@ SoundReq 0x007a
 _0807EB44 0x0004
 _0807EF80 0x000d
 SoundReq 0x0086
-Call 0x0807f36d
+Call sub_0807F36C
 SetEntityNonPlanarMovement 0x0400
 _0807ECF4 0x0008
 StartScript 
-Call 0x0807f1e9
+Call sub_0807F1E8
 _0807EF80 0x0011
 StopScript 
-Call 0x0807f2d5
+Call sub_0807F2D4
 WaitForSomething 0x80000000
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc
index 9f6aef32..9ff7e44a 100644
--- a/data/scripts/gUnk_08011128.inc
+++ b/data/scripts/gUnk_08011128.inc
@@ -27,7 +27,7 @@ WaitForSomething2 0x00000004
 _0807EF80 0x0010
 Wait 0x001e
 _0807EF80 0x0010
-Call 0x0807f3c9
+Call sub_0807F3C8
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x001c
 _0807EC1C 0x003c
diff --git a/data/scripts/gUnk_080111CC.inc b/data/scripts/gUnk_080111CC.inc
index 7f1b7db9..003e82a1 100644
--- a/data/scripts/gUnk_080111CC.inc
+++ b/data/scripts/gUnk_080111CC.inc
@@ -2,14 +2,14 @@ SCRIPT_START gUnk_080111CC
 StartScript 
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
-Call 0x08066d05
+Call sub_08066D04
 StopScript 
-Call 0x0807f339
+Call sub_0807F338
 WaitForSomething2 0x00000010
-Call 0x08066d15
+Call sub_08066D14
 JumpIf 0x0004
 MoveEntityToPlayer 
-Call 0x0807f8bd
+Call sub_0807F8BC
 JumpIf 0x0008
 SetEntityPositionRelative 0x00b801f8
 _0807EF80 0x0007
@@ -31,7 +31,7 @@ _0807EDD4 0x01e8, 0x0040
 _0807EF80 0x0000
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
-Call 0x08095811
+Call sub_08095810
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
 _0807EF80 0x0001
@@ -42,10 +42,10 @@ WaitForSomething2 0x00000010
 SoundReq 0x01c9
 _0807EF80 0x0010
 Wait 0x0014
-Call 0x08066e21
+Call sub_08066E20
 Wait 0x0014
 _0807EF80 0x0010
-Call 0x0807f2d5
+Call sub_0807F2D4
 SoundReq 0x01ca
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc
index 8fa630b7..cba7271c 100644
--- a/data/scripts/gUnk_080112C4.inc
+++ b/data/scripts/gUnk_080112C4.inc
@@ -2,8 +2,8 @@ SCRIPT_START gUnk_080112C4
 StartScript 
 _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0100
-Call 0x08095245
-Call 0x0807f339
+Call sub_08095244
+Call sub_0807F338
 StopScript 
 WaitForSomething 0x0002a800
 _0807EF80 0x0007
@@ -14,7 +14,7 @@ _0807ECC4 0x0010
 Wait 0x003c
 _0807ECC4 0x0010
 _0807E930 0x0002
-Call 0x08064051
+Call sub_08064050
 .short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0008
 .short 0x009e
@@ -46,7 +46,7 @@ WaitForSomething2 0x00000800
 _0807EF80 0x0010
 Wait 0x000a
 _0807EF80 0x0010
-Call 0x0807f3c9
+Call sub_0807F3C8
 _0807E930 0x0014
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x001e
diff --git a/data/scripts/gUnk_080113AA.inc b/data/scripts/gUnk_080113AA.inc
index 7eee5c8d..cfa9e768 100644
--- a/data/scripts/gUnk_080113AA.inc
+++ b/data/scripts/gUnk_080113AA.inc
@@ -24,7 +24,7 @@ WaitForSomething2 0x00002000
 _0807EF80 0x0010
 Wait 0x000a
 _0807EF80 0x0010
-Call 0x0807f3c9
+Call sub_0807F3C8
 _0807E930 0x0014
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x0002
diff --git a/data/scripts/gUnk_08011442.inc b/data/scripts/gUnk_08011442.inc
index ce71ee93..1518a698 100644
--- a/data/scripts/gUnk_08011442.inc
+++ b/data/scripts/gUnk_08011442.inc
@@ -33,7 +33,7 @@ _0807E930 0x0013
 _0807EF80 0x0010
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
-Call 0x0807f3c9
+Call sub_0807F3C8
 _0807E930 0x0014
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x001e
diff --git a/data/scripts/gUnk_08011508.inc b/data/scripts/gUnk_08011508.inc
index 5eda78db..0a58e4b7 100644
--- a/data/scripts/gUnk_08011508.inc
+++ b/data/scripts/gUnk_08011508.inc
@@ -33,7 +33,7 @@ _0807E930 0x0013
 _0807EF80 0x0010
 _0807E5F8 0x00040000
 WaitForSomething2 0x00020000
-Call 0x0807f3c9
+Call sub_0807F3C8
 _0807E930 0x0014
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x0002
diff --git a/data/scripts/gUnk_08011640.inc b/data/scripts/gUnk_08011640.inc
index c80b52e3..a78e490d 100644
--- a/data/scripts/gUnk_08011640.inc
+++ b/data/scripts/gUnk_08011640.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0008
 _0807EB44 0x0004
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call 0x0807f339
+Call sub_0807F338
 WaitForSomething2 0x00000040
 _0807EF80 0x0007
 _0807EF80 0x0001
@@ -16,7 +16,7 @@ WaitForSomething2 0x00000040
 _0807EF80 0x0010
 Wait 0x001e
 _0807EF80 0x0010
-Call 0x0807f3c9
+Call sub_0807F3C8
 SetEntityNonPlanarMovement 0x0400
 SetEntityDirection 0x0008
 _0807EC1C 0x003c
diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc
index e1a13f87..91e4eaa3 100644
--- a/data/scripts/gUnk_080116A8.inc
+++ b/data/scripts/gUnk_080116A8.inc
@@ -3,7 +3,7 @@ StartScript
 _0807EB44 0x0000
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call 0x0807f339
+Call sub_0807F338
 WaitForSomething2 0x00000100
 _0807EF80 0x0001
 _0807EDD4 0x01f8, 0x00d0
@@ -12,30 +12,29 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0004
 _0807EF80 0x001c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x001c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x001a
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x0014
 SoundReq 0x0120
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5421
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095420
 .short 0x1890
 .short 0x0801
 @ End of parameters
@@ -55,9 +54,8 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EF80 0x0014
 SoundReq 0x01c4
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x545d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0809545C
 .short 0x18d4
 .short 0x0801
 @ End of parameters
@@ -80,13 +78,13 @@ _0807EF80 0x0004
 Wait 0x005a
 _0807EB44 0x0004
 _0807EF80 0x001c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EB44 0x0004
 _0807EF80 0x0000
 Wait 0x001e
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
-Call 0x08066ca5
+Call sub_08066CA4
 _0807EF80 0x0008
 Wait 0x0078
 _0807E5F8 0x00000200
diff --git a/data/scripts/gUnk_0801183C.inc b/data/scripts/gUnk_0801183C.inc
index 2eb2de7b..7de5a2a9 100644
--- a/data/scripts/gUnk_0801183C.inc
+++ b/data/scripts/gUnk_0801183C.inc
@@ -1,12 +1,12 @@
 SCRIPT_START gUnk_0801183C
 StartScript 
-Call 0x08095331
+Call sub_08095330
 StopScript 
 WaitForSomething2 0x00800000
 _0807EF3C 0x0000, 0x0020
 _0807E5F8 0x01000000
 WaitForSomething2 0x00800000
-Call 0x08095365
+Call sub_08095364
 SoundReq 0x0122
 Wait 0x003c
 _0807E5F8 0x01000000
diff --git a/data/scripts/gUnk_08011890.inc b/data/scripts/gUnk_08011890.inc
index 116e1599..6f5e8b98 100644
--- a/data/scripts/gUnk_08011890.inc
+++ b/data/scripts/gUnk_08011890.inc
@@ -2,13 +2,13 @@ SCRIPT_START gUnk_08011890
 StartScript 
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0200
-Call 0x08095459
-Call 0x08094b81
+Call nullsub_527
+Call sub_08094B80
 StopScript 
 Wait 0x00f0
-Call 0x08094b6d
+Call sub_08094B6C
 _0807EDD4 0x01f8, 0x0088
-Call 0x08094b81
+Call sub_08094B80
 SoundReq 0x01cc
 _0807E5F8 0x10000000
 WaitForSomething2 0x08000000
diff --git a/data/scripts/gUnk_080118D4.inc b/data/scripts/gUnk_080118D4.inc
index ccd69ee2..b5ea3bbc 100644
--- a/data/scripts/gUnk_080118D4.inc
+++ b/data/scripts/gUnk_080118D4.inc
@@ -2,15 +2,15 @@ SCRIPT_START gUnk_080118D4
 StartScript 
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0200
-Call 0x08095459
-Call 0x08094b81
+Call nullsub_527
+Call sub_08094B80
 StopScript 
 WaitForSomething2 0x08000000
-Call 0x08094b6d
+Call sub_08094B6C
 _0807EDD4 0x01d8, 0x0078
-StartPlayerScript 0x080110e8
+StartPlayerScript gUnk_080110E8
 _0807EDD4 0x01d8, 0x0058
-Call 0x08094b81
+Call sub_08094B80
 SoundReq 0x009a
 SoundReq 0x01c6
 _0807E5F8 0x10000000
diff --git a/data/scripts/gUnk_08011930.inc b/data/scripts/gUnk_08011930.inc
index 909e9250..586cc75a 100644
--- a/data/scripts/gUnk_08011930.inc
+++ b/data/scripts/gUnk_08011930.inc
@@ -1,5 +1,5 @@
 SCRIPT_START gUnk_08011930
 WaitForSomething 0x20000000
-Call 0x0809567d
+Call sub_0809567C
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc
index 5783e0aa..725a60b7 100644
--- a/data/scripts/gUnk_0801194C.inc
+++ b/data/scripts/gUnk_0801194C.inc
@@ -11,9 +11,8 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -22,9 +21,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -41,15 +39,14 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x000c
 .short 0x0000
 @ End of parameters
 StopScript 
 Wait 0x003c
-Call 0x0806407d
+Call sub_0806407C
 Jump 0xfff4
 .short 0x0000
 StartScript 
@@ -64,9 +61,8 @@ StartScript
 _0807EB44 0x0006
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -75,13 +71,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x08064429
+Call sub_08064428
 _0807EA94 
 _0807E878 
 Jump 0xffe0
@@ -90,9 +85,8 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -101,9 +95,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -115,9 +108,8 @@ StartScript
 _0807EB44 0x0002
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -126,15 +118,13 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x44b5
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080644B4
 .short 0x0006
 .short 0x0000
 @ End of parameters
@@ -148,9 +138,8 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -159,9 +148,8 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -172,22 +160,21 @@ Jump 0xffe2
 CheckRoomFlag 0x000f
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1321
 .short 0x0007
 @ End of parameters
 _0807EA94 
 SetLocalFlag 0x0010
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda1d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA1C
 .short 0x0003
 .short 0x0000
 @ End of parameters
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc
index 7de59bd6..35081eb2 100644
--- a/data/scripts/gUnk_08011B20.inc
+++ b/data/scripts/gUnk_08011B20.inc
@@ -1,13 +1,13 @@
 SCRIPT_START gUnk_08011B20
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1320
 .short 0x000c
 @ End of parameters
 _0807EA94 
 _0807E878 
-Call 0x0807df51
+Call sub_0807DF50
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc
index 911947db..6ad1ab68 100644
--- a/data/scripts/gUnk_08011B40.inc
+++ b/data/scripts/gUnk_08011B40.inc
@@ -16,7 +16,7 @@ TextboxNoOverlap 0x3d07
 _0807EA94 
 _0807EB44 0x0004
 ClearGlobalFlag 0x0050
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -39,22 +39,20 @@ ModRupees 0xfff6
 Wait 0x001e
 TextboxNoOverlap 0x3d06
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xc2a1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806C2A0
 .short 0x0000
 .short 0x0000
 @ End of parameters
 WaitFor_2 
 Wait 0x003c
-Call 0x0806c225
+Call sub_0806C224
 Jump 0xffb8
 StartScript 
 _0807E888 
 StopScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xc2a1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806C2A0
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -70,7 +68,7 @@ _0807E864
 Wait 0x003c
 CameraTargetEntity 
 Wait 0x003c
-Call 0x0806c23d
+Call Simon_CreateChest
 Wait 0x003c
 CameraTargetPlayer 
 _0807E878 
@@ -79,13 +77,12 @@ JumpIfNot 0xfffa
 _0807E888 
 WaitPlayerAction8 
 Wait 0x001e
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xc2a1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806C2A0
 .short 0x0000
 .short 0x0000
 @ End of parameters
 WaitFor_2 
 Wait 0x003c
-Call 0x0806c281
+Call sub_0806C280
 SCRIPT_END
diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc
index d576008a..7edf3874 100644
--- a/data/scripts/gUnk_08011C50.inc
+++ b/data/scripts/gUnk_08011C50.inc
@@ -3,9 +3,8 @@ StartScript
 _0807E864 
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xc2a1
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806C2A0
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc
index 9ada852c..d1d98f08 100644
--- a/data/scripts/gUnk_08011C7C.inc
+++ b/data/scripts/gUnk_08011C7C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08011C7C
 StartScript 
-Call 0x08064829
+Call sub_08064828
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -55,7 +55,7 @@ _0807EF80 0x0001
 Jump 0xffdc
 .short 0x0000
 StartScript 
-Call 0x08064929
+Call sub_08064928
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -110,7 +110,7 @@ _0807EF80 0x0001
 Jump 0xffdc
 .short 0x0000
 StartScript 
-Call 0x08064a29
+Call sub_08064A28
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -165,7 +165,7 @@ _0807EF80 0x0001
 Jump 0xffdc
 .short 0x0000
 StartScript 
-Call 0x08064829
+Call sub_08064828
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -208,7 +208,7 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 Jump 0xffdc
 StartScript 
-Call 0x08064929
+Call sub_08064928
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -251,7 +251,7 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 Jump 0xffdc
 StartScript 
-Call 0x08064a29
+Call sub_08064A28
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -294,7 +294,7 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 Jump 0xffdc
 StartScript 
-Call 0x08064829
+Call sub_08064828
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -325,7 +325,7 @@ TextboxNoOverlap 0x3125
 _0807EA94 
 _0807F034 0x0031
 WaitPlayerAction8 
-Call 0x0807fc25
+Call sub_0807FC24
 Jump 0x0006
 TextboxNoOverlap 0x3127
 _0807EA94 
@@ -335,7 +335,7 @@ _0807EF80 0x0001
 Jump 0xff8e
 .short 0x0000
 StartScript 
-Call 0x08064929
+Call sub_08064928
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -366,7 +366,7 @@ TextboxNoOverlap 0x3119
 _0807EA94 
 _0807F034 0x002f
 WaitPlayerAction8 
-Call 0x0807fc25
+Call sub_0807FC24
 Jump 0x0006
 TextboxNoOverlap 0x311b
 _0807EA94 
@@ -376,7 +376,7 @@ _0807EF80 0x0001
 Jump 0xff8e
 .short 0x0000
 StartScript 
-Call 0x08064a29
+Call sub_08064A28
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -407,7 +407,7 @@ TextboxNoOverlap 0x311f
 _0807EA94 
 _0807F034 0x0030
 WaitPlayerAction8 
-Call 0x0807fc25
+Call sub_0807FC24
 Jump 0x0006
 TextboxNoOverlap 0x3121
 _0807EA94 
@@ -417,7 +417,7 @@ _0807EF80 0x0001
 Jump 0xff8e
 .short 0x0000
 StartScript 
-Call 0x08064829
+Call sub_08064828
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -434,7 +434,7 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 Jump 0xffe0
 StartScript 
-Call 0x08064929
+Call sub_08064928
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -451,7 +451,7 @@ _0807EB44 0x0004
 _0807EF80 0x0001
 Jump 0xffe0
 StartScript 
-Call 0x08064a29
+Call sub_08064A28
 _0807EB44 0x0004
 _0807EF80 0x0001
 _0807EF80 0x000a
@@ -469,7 +469,7 @@ _0807EF80 0x0001
 Jump 0xffe0
 StartScript 
 _0807EB44 0x0004
-Call 0x08061fd9
+Call sub_08061FD8
 _0807E9D4 
 _0807EF80 0x000a
 StopScript 
@@ -484,7 +484,7 @@ JumpIfNot 0xffe8
 StopScript 
 _0807EB74 
 _0807E864 
-Call 0x08061fd9
+Call sub_08061FD8
 TextboxNoOverlapFollow 0x2302
 _0807EA94 
 _0807E878 
@@ -501,7 +501,7 @@ JumpIfNot 0xffe8
 StopScript 
 _0807EB74 
 _0807E864 
-Call 0x08061fd9
+Call sub_08061FD8
 TextboxNoOverlapFollow 0x2303
 _0807EA94 
 _0807E878 
@@ -509,10 +509,10 @@ Jump 0xffd0
 StopScript 
 _0807EB74 
 _0807E864 
-Call 0x08061fd9
+Call sub_08061FD8
 _0807EF80 0x000b
-Call 0x08061fb1
-Call 0x08061f95
+Call sub_08061FB0
+Call sub_08061F94
 LoadRoomEntityList 0x080f2758
 _0807EF80 0x0008
 Wait 0x003c
diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc
index dbaf7cc8..2a3be8da 100644
--- a/data/scripts/gUnk_0801232C.inc
+++ b/data/scripts/gUnk_0801232C.inc
@@ -22,7 +22,7 @@ _0807EF80 0x0008
 StopScript 
 CheckLocalFlag 0x0004
 JumpIfNot 0xfffa
-Call 0x0807df29
+Call sub_0807DF28
 _0807E864 
 SoundReq0x80100000 
 StartScript 
@@ -44,7 +44,7 @@ SoundReq 0x01ce
 SetEntity0x20 0xffff8000
 Wait 0x003c
 _0807E8E4_0 
-StartPlayerScript 0x08012410
+StartPlayerScript gUnk_08012410
 WaitForSomething2 0x00000001
 TextboxNoOverlap 0x1402
 _0807EA94 
@@ -64,8 +64,8 @@ SoundReq2 0xffff
 _0807EB28 0x1403
 _0807EA94 
 _0807E914 0x00000203
-Call 0x0807f421
-Call 0x0807df51
+Call sub_0807F420
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012410.inc b/data/scripts/gUnk_08012410.inc
index 339a5051..39c087b1 100644
--- a/data/scripts/gUnk_08012410.inc
+++ b/data/scripts/gUnk_08012410.inc
@@ -5,6 +5,6 @@ StopScript
 _0807EF80 0x0004
 Wait 0x003c
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc
index a6b89ccb..ed93e9bb 100644
--- a/data/scripts/gUnk_08012430.inc
+++ b/data/scripts/gUnk_08012430.inc
@@ -8,9 +8,9 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807E930 0x0008
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x0009
-Call 0x0806b2b5
+Call sub_0806B2B4
 _0807EA94 
 CheckLocalFlag 0x00b3
 JumpIf 0x0010
@@ -23,15 +23,15 @@ _0807E930 0x0000
 Jump 0xffc4
 .short 0x0000
 StartScript 
-Call 0x08054565
+Call sub_08054564
 StopScript 
 CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
 JumpIfNot 0xfff6
 SoundReq0x80100000 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x08012ab0
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_08012AB0
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1101
 .short 0x0007
@@ -44,11 +44,11 @@ WaitFor_2
 .short 0x0842 @ _0807E858 with 1 parameters
 .short 0x0000
 @ End of parameters
-Call 0x080791bd
+Call sub_080791BC
 LoadRoomEntityList 0x080f4d70
-Call 0x0805ebcd
+Call DeleteAllEnemies
 SetEntityPositionRelative 0x01680388
-Call 0x0807f845
+Call sub_0807F844
 _0807E778 0x0004
 _0807E800 0x00000000
 WaitFor_2 
@@ -68,23 +68,23 @@ _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
 MoveEntityToPlayer 
-Call 0x0807f845
+Call sub_0807F844
 CameraTargetPlayer 
 _0807E788 0xffffffff
 _0807E778 0x0004
 _0807E800 0x00000000
 WaitFor_2 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 SoundReq2 0xffff
 CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-Call 0x0806dc7d
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0806DC7C
 SoundReq0x80100000 
-StartPlayerScript 0x08012ac8
+StartPlayerScript gUnk_08012AC8
 WaitForSomething2 0x00000001
 SetEntityPositionRelative 0x01680388
 _0807F0B4 0x0001
@@ -107,19 +107,19 @@ _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
 SoundReq0x80100000 
 SoundReq2 0x0033
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E5F8 0x00000050
 LoadRoomEntityList 0x080f51d0
 WaitForSomething2 0x00000008
 _0807E864 
-Call 0x0807fa41
-Call 0x0807df29
+Call sub_0807FA40
+Call sub_0807DF28
 SoundReq 0x0072
 SoundReq0x80100000 
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-StartPlayerScript 0x08012af0
+StartPlayerScript gUnk_08012AF0
 WaitForSomething2 0x00000001
 _0807E8E4_0 
 SoundReq2 0x000e
@@ -137,10 +137,10 @@ WaitForSomething2 0x00000008
 SoundReq0x80100000 
 Wait 0x003c
 SoundReq2 0xffff
-Call 0x0806dca1
+Call sub_0806DCA0
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
@@ -151,15 +151,14 @@ WaitForSomething2 0x00000008
 SoundReq0x80100000 
 Wait 0x003c
 SoundReq2 0xffff
-Call 0x08054571
+Call sub_08054570
 SetGlobalFlag 0x0014
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6F8
 .short 0x0008
 .short 0x0000
 @ End of parameters
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc
index 18426285..c78d88d0 100644
--- a/data/scripts/gUnk_080126FC.inc
+++ b/data/scripts/gUnk_080126FC.inc
@@ -6,7 +6,7 @@ StopScript
 _0807E930 0x0020
 WaitForSomething2 0x00000004
 _0807E930 0x0022
-Call 0x0807f3c9
+Call sub_0807F3C8
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1102
 .short 0x000c
@@ -16,7 +16,7 @@ _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
-Call 0x0807f3c9
+Call sub_0807F3C8
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1103
 .short 0x000c
@@ -40,14 +40,14 @@ _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0022
-Call 0x0807f3c9
+Call sub_0807F3C8
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1106
 .short 0x000c
 @ End of parameters
 _0807EA94 
 _0807E930 0x001c
-Call 0x0806d96d
+Call sub_0806D96C
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1107
 .short 0x000c
@@ -57,14 +57,14 @@ _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
-Call 0x0807f3c9
+Call sub_0807F3C8
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1108
 .short 0x000c
 @ End of parameters
 _0807EA94 
 _0807E930 0x001c
-Call 0x0806d96d
+Call sub_0806D96C
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1109
 .short 0x000c
@@ -82,7 +82,7 @@ CheckEntityInteractType
 JumpIfNot 0xfff0
 StopScript 
 _0807E864 
-Call 0x0806d945
+Call sub_0806D944
 _0807E930 0x0010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1114
@@ -94,20 +94,19 @@ _0807E878
 Jump 0xffd0
 _0807E864 
 _0807E9DC 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf5b1
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F5B0
 .short 0x003c
 .short 0x0000
 @ End of parameters
-Call 0x080791d1
+Call sub_080791D0
 StopScript 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807EF80 0x000b
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
-Call 0x0806d945
+Call sub_0806D944
 _0807E930 0x0010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110a
@@ -154,7 +153,7 @@ _0807E930 0x0010
 _0807EA94 
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
-Call 0x0806d909
+Call sub_0806D908
 _0807EC1C 0x0010
 _0807EF80 0x000a
 _0807E9D4 
@@ -162,7 +161,7 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 StopScript 
 StartScript 
-Call 0x0806d945
+Call sub_0806D944
 CheckEntityInteractType 
 JumpIf 0x000e
 CheckPlayerInRegion2 0x3030
@@ -181,10 +180,10 @@ _0807E878
 Jump 0xffcc
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807EB8C 
-Call 0x0806d945
+Call sub_0806D944
 _0807E930 0x0010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x110f
@@ -192,16 +191,16 @@ _0807E930 0x0010
 @ End of parameters
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
-Call 0x0806d909
+Call sub_0806D908
 _0807EC1C 0x0050
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 StopScript 
 StartScript 
-Call 0x0806d945
+Call sub_0806D944
 CheckEntityInteractType 
 JumpIf 0x000e
 CheckPlayerInRegion2 0x3030
@@ -220,10 +219,10 @@ _0807E878
 Jump 0xffcc
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807EB8C 
-Call 0x0806d945
+Call sub_0806D944
 _0807E930 0x0010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1110
@@ -231,17 +230,17 @@ _0807E930 0x0010
 @ End of parameters
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
-Call 0x0806d909
+Call sub_0806D908
 _0807EC1C 0x0050
 _0807E930 0x0018
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 StopScript 
 StartScript 
-Call 0x0806d945
+Call sub_0806D944
 CheckEntityInteractType 
 JumpIf 0x000e
 CheckPlayerInRegion2 0x3030
@@ -260,12 +259,12 @@ _0807E878
 Jump 0xffcc
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 SoundReq0x80100000 
 _0807EF80 0x000b
 _0807EB8C 
-Call 0x0806d945
+Call sub_0806D944
 _0807E930 0x0010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1111
@@ -273,13 +272,13 @@ _0807E930 0x0010
 @ End of parameters
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
-Call 0x0806d8a1
+Call sub_0806D8A0
 _0807EE30 
 JumpIfNot 0xfffc
 _0807E930 0x001f
 _0807EA94 
-StartPlayerScript 0x08012b18
-Call 0x0806d9a5
+StartPlayerScript gUnk_08012B18
+Call sub_0806D9A4
 _0807EF80 0x0008
 Wait 0x0078
 SoundReq2 0x000e
diff --git a/data/scripts/gUnk_08012AB0.inc b/data/scripts/gUnk_08012AB0.inc
index 3af969c2..e8df3a1e 100644
--- a/data/scripts/gUnk_08012AB0.inc
+++ b/data/scripts/gUnk_08012AB0.inc
@@ -6,14 +6,3 @@ _0807EB44 0x0006
 Wait 0x000a
 Jump 0xffee
 .short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08012AC8.inc b/data/scripts/gUnk_08012AC8.inc
new file mode 100644
index 00000000..013e0433
--- /dev/null
+++ b/data/scripts/gUnk_08012AC8.inc
@@ -0,0 +1,12 @@
+SCRIPT_START gUnk_08012AC8
+StartScript 
+SetEntityNonPlanarMovement 0x0080
+StopScript 
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08012AF0.inc b/data/scripts/gUnk_08012AF0.inc
index 00bf8f5c..c3cf3c94 100644
--- a/data/scripts/gUnk_08012AF0.inc
+++ b/data/scripts/gUnk_08012AF0.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x0388, 0x0180
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B18.inc b/data/scripts/gUnk_08012B18.inc
index afa03369..22d140c9 100644
--- a/data/scripts/gUnk_08012B18.inc
+++ b/data/scripts/gUnk_08012B18.inc
@@ -1,4 +1,4 @@
 SCRIPT_START gUnk_08012B18
 _0807EF80 0x0015
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc
index e8ce1754..8e8f794d 100644
--- a/data/scripts/gUnk_08012B24.inc
+++ b/data/scripts/gUnk_08012B24.inc
@@ -6,11 +6,10 @@ StopScript
 _0807EF80 0x0001
 _0807ECC4 0x0008
 _0807E5F8 0x00000002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb65
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB64
 .short 0xffe2
 .short 0xffff
 @ End of parameters
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc
index 66c706b1..ff9ca34e 100644
--- a/data/scripts/gUnk_08012B50.inc
+++ b/data/scripts/gUnk_08012B50.inc
@@ -6,11 +6,10 @@ StopScript
 _0807EF80 0x0001
 _0807EC64 0x0008
 _0807E5F8 0x00000002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb65
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB64
 .short 0xffe2
 .short 0xffff
 @ End of parameters
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc
index 0ba5da08..9083222f 100644
--- a/data/scripts/gUnk_08012B7C.inc
+++ b/data/scripts/gUnk_08012B7C.inc
@@ -6,11 +6,10 @@ StopScript
 _0807EF80 0x0001
 _0807EC94 0x0008
 _0807E5F8 0x00000002
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb65
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB64
 .short 0xffe2
 .short 0xffff
 @ End of parameters
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012C68.inc b/data/scripts/gUnk_08012C68.inc
index 9bc4b3a0..359e1040 100644
--- a/data/scripts/gUnk_08012C68.inc
+++ b/data/scripts/gUnk_08012C68.inc
@@ -3,7 +3,7 @@ StartScript
 _0807E9D4 
 _0807EF80 0x0008
 _0807E914 0x00000000
-Call 0x0806da05
+Call sub_0806DA04
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -24,11 +24,11 @@ _0807E564
 JumpIf 0x001e
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB28 0x2202
 _0807EA94 
 SetLocalFlag 0x003b
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012CD8.inc b/data/scripts/gUnk_08012CD8.inc
index a25beeb9..6f29b3b4 100644
--- a/data/scripts/gUnk_08012CD8.inc
+++ b/data/scripts/gUnk_08012CD8.inc
@@ -8,12 +8,12 @@ JumpIfNot 0xffec
 ComparePlayerAction 0x0015
 JumpIf 0xffe4
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 StopScript 
 _0807EB28 0x2203
 _0807EA94 
 SetLocalFlag 0x003e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012D18.inc b/data/scripts/gUnk_08012D18.inc
index 9abf4d3e..26bf871e 100644
--- a/data/scripts/gUnk_08012D18.inc
+++ b/data/scripts/gUnk_08012D18.inc
@@ -9,13 +9,13 @@ CheckPlayerInRegion 0x0000, 0x01a8, 0x2010
 JumpIfNot 0xffe0
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807EB28 0x111a
 _0807EA94 
-StartPlayerScript 0x08010a38
+StartPlayerScript gUnk_08010A38
 WaitForSomething2 0x00000001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffb2
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08012D70.inc b/data/scripts/gUnk_08012D70.inc
index a7c2018a..0de8891d 100644
--- a/data/scripts/gUnk_08012D70.inc
+++ b/data/scripts/gUnk_08012D70.inc
@@ -2,14 +2,14 @@ SCRIPT_START gUnk_08012D70
 CheckPlayerInRegion 0x0088, 0x0048, 0x3030
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x08012db0
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_08012DB0
 WaitForSomething2 0x00000001
 _0807EB28 0x132d
 _0807EA94 
 SetLocalFlag 0x0014
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012DB0.inc b/data/scripts/gUnk_08012DB0.inc
index a5e56c45..0a4d5b99 100644
--- a/data/scripts/gUnk_08012DB0.inc
+++ b/data/scripts/gUnk_08012DB0.inc
@@ -7,5 +7,5 @@ _0807EB44 0x0000
 _0807EF80 0x0000
 Wait 0x001e
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012DD8.inc b/data/scripts/gUnk_08012DD8.inc
index 4d937700..d4f24f4c 100644
--- a/data/scripts/gUnk_08012DD8.inc
+++ b/data/scripts/gUnk_08012DD8.inc
@@ -4,7 +4,7 @@ StopScript
 _0807E888 
 Wait 0x0018
 _0807E864 
-StartPlayerScript 0x08012df8
+StartPlayerScript gUnk_08012DF8
 WaitForSomething2 0x00000001
 _0807E908 0x0002
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012E20.inc b/data/scripts/gUnk_08012E20.inc
index 983f694c..4842fb51 100644
--- a/data/scripts/gUnk_08012E20.inc
+++ b/data/scripts/gUnk_08012E20.inc
@@ -4,7 +4,7 @@ _0807E864
 StopScript 
 Wait 0x0078
 _0807E908 0x0004
-StartPlayerScript 0x08012e44
+StartPlayerScript gUnk_08012E44
 WaitForSomething2 0x00000002
 Wait 0x000c
 _0807E908 0x0005
diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc
index 85156a81..09b786f6 100644
--- a/data/scripts/gUnk_08012E88.inc
+++ b/data/scripts/gUnk_08012E88.inc
@@ -3,14 +3,14 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
-Call 0x0806b60d
+Call sub_0806B60C
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
 _0807EF80 0x0001
-Call 0x0806b4f1
+Call sub_0806B4F0
 _0807EA94 
 _0807E878 
 _0807EF80 0x0000
@@ -18,32 +18,29 @@ Jump 0xffe2
 .short 0x0000
 StartScript 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
 _0807EF80 0x000a
-Call 0x0806b60d
+Call sub_0806B60C
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x000c
 .short 0x0000
 @ End of parameters
-Call 0x0806b4f1
+Call sub_0806B4F0
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0008
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc
index 32616911..3ec14ff9 100644
--- a/data/scripts/gUnk_08012F0C.inc
+++ b/data/scripts/gUnk_08012F0C.inc
@@ -1,8 +1,7 @@
 SCRIPT_START gUnk_08012F0C
 StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xa93d
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806A93C
 .short 0x5678
 .short 0x1234
 @ End of parameters
@@ -17,10 +16,10 @@ JumpIf 0x0050
 StopScript 
 CheckLocalFlag 0x0062
 JumpIfNot 0x0008
-Call 0x0806a9b1
+Call sub_0806A9B0
 CheckLocalFlag 0x0061
 JumpIf 0x001e
-Call 0x0806a96d
+Call sub_0806A96C
 JumpIfNot 0xfff8
 _0807E864 
 TextboxNoOverlap 0x4401
@@ -28,7 +27,7 @@ _0807EA94
 SetLocalFlag 0x0061
 _0807E878 
 _0807E908 0x0001
-Call 0x0806a96d
+Call sub_0806A96C
 JumpIfNot 0xfff8
 TextboxNoOverlap 0x4402
 _0807EA94 
diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc
index 69c0228a..d546118e 100644
--- a/data/scripts/gUnk_08012F86.inc
+++ b/data/scripts/gUnk_08012F86.inc
@@ -3,21 +3,20 @@ StartScript
 CheckLocalFlag 0x0060
 JumpIf 0x0044
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x080130e4
+Call sub_0807DF28
+StartPlayerScript gUnk_080130E4
 SetLocalFlag 0x0060
 ClearLocalFlag 0x0061
 StopScript 
 WaitForSomething2 0x00000004
 _0807E908 0x0004
-Call 0x0806a959
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf93d
-.short 0x0807
+Call sub_0806A958
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F93C
 .short 0xf2f4
 .short 0x0000
 @ End of parameters
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 SetLocalFlag 0x0062
 Jump 0x002a
@@ -25,13 +24,12 @@ StartScript
 _0807E930 0x000d
 _0807E908 0x0005
 SetLocalFlag 0x0062
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf93d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F93C
 .short 0xf2f4
 .short 0x0000
 @ End of parameters
-Call 0x0806aa11
+Call sub_0806AA10
 StopScript 
 CheckInventory1 0x0038
 JumpIf 0x000e
@@ -42,14 +40,14 @@ Jump 0xfff6
 _0807E944 
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 StopScript 
 SoundReq 0x00cd
 _0807F088 0x0038
 WaitPlayerAction8 
 Wait 0x001e
 _0807E8E4_0 
-Call 0x0806ab9d
+Call sub_0806AB9C
 _0807E930 0x000b
 Wait 0x003c
 _0807EF80 0x0004
@@ -62,7 +60,7 @@ Wait 0x003c
 TextboxNoOverlap 0x440e
 _0807EA94 
 Wait 0x001e
-Call 0x0806a9e9
+Call sub_0806A9E8
 _0807E930 0x000f
 Wait 0x00f0
 TextboxNoOverlap 0x4405
@@ -74,14 +72,14 @@ _0807EB8C
 TextboxNoOverlap 0x4406
 _0807EA94 
 _0807E908 0x0001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
-Call 0x0806a96d
+Call sub_0806A96C
 JumpIfNot 0xfff8
 TextboxNoOverlap 0x4407
 _0807EA94 
 _0807E908 0x0001
-Call 0x0806a96d
+Call sub_0806A96C
 JumpIfNot 0xfff8
 TextboxNoOverlap 0x440d
 _0807EA94 
@@ -89,26 +87,13 @@ _0807E908 0x0001
 Jump 0xffd6
 CheckLocalFlag 0x0062
 JumpIfNot 0x0008
-Call 0x0806a9b1
+Call sub_0806A9B0
 StopScript 
-Call 0x0806a96d
+Call sub_0806A96C
 JumpIfNot 0xfff8
 _0807E864 
-Call 0x0806aa19
+Call sub_0806AA18
 _0807EA94 
 _0807E878 
 _0807E908 0x0001
 Jump 0xffe4
-StartScript 
-_0807EB44 0x0006
-SetEntityNonPlanarMovement 0x0140
-StopScript 
-_0807EDD4 0x00a8, 0x0060
-Wait 0x0008
-_0807EF80 0x0000
-Wait 0x0008
-_0807EF80 0x0004
-Wait 0x000f
-_0807E5F8 0x00000004
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_080130E4.inc b/data/scripts/gUnk_080130E4.inc
new file mode 100644
index 00000000..9335c187
--- /dev/null
+++ b/data/scripts/gUnk_080130E4.inc
@@ -0,0 +1,14 @@
+SCRIPT_START gUnk_080130E4
+StartScript 
+_0807EB44 0x0006
+SetEntityNonPlanarMovement 0x0140
+StopScript 
+_0807EDD4 0x00a8, 0x0060
+Wait 0x0008
+_0807EF80 0x0000
+Wait 0x0008
+_0807EF80 0x0004
+Wait 0x000f
+_0807E5F8 0x00000004
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc
index a32bf669..0dba30ec 100644
--- a/data/scripts/gUnk_08013114.inc
+++ b/data/scripts/gUnk_08013114.inc
@@ -3,35 +3,32 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EF80 0x0012
-Call 0x0807f349
+Call sub_0807F348
 StopScript 
 StopScript 
 StartScript 
 CheckEntityInteractType 
 JumpIf 0x000c
-Call 0x0806aee5
+Call sub_0806AEE4
 Jump 0xffee
 _0807E864 
 StopScript 
 _0807EB74 
-Call 0x0806aed9
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaa51
-.short 0x0806
+Call sub_0806AED8
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AA50
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaa51
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AA50
 .short 0x0001
 .short 0x0000
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaa51
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AA50
 .short 0x0002
 .short 0x0000
 @ End of parameters
@@ -40,7 +37,7 @@ JumpIf 0x0008
 _0807E878 
 Jump 0xffb4
 _0807E914 0x00000403
-Call 0x0807f421
+Call sub_0807F420
 _0807E878 
 Jump 0xffa2
 StartScript 
diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc
index 428dcd96..1e129504 100644
--- a/data/scripts/gUnk_0801319A.inc
+++ b/data/scripts/gUnk_0801319A.inc
@@ -3,32 +3,32 @@ StopScript
 StartScript 
 CameraTargetEntity 
 MoveEntityToPlayer 
-Call 0x0806ab75
+Call sub_0806AB74
 Jump 0xfff0
 CheckPlayerInRegion 0x0098, 0x0038, 0x2060
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-StartPlayerScript 0x080132e4
+Call sub_0807F9A4
+Call sub_0807DF28
+StartPlayerScript gUnk_080132E4
 WaitForSomething2 0x00000002
 _0807EB28 0x1601
 _0807EA94 
-StartPlayerScript 0x0801330c
+StartPlayerScript gUnk_0801330C
 WaitForSomething2 0x00000002
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
 LoadRoomEntityList 0x080f5680
-StartPlayerScript 0x08013330
+StartPlayerScript gUnk_08013330
 WaitForSomething2 0x00000002
 MoveEntityToPlayer 
 SetEntityPosition 0x0000, 0xfff0
-Call 0x0807f845
+Call sub_0807F844
 CameraTargetEntity 
-Call 0x080536b9
+Call sub_080536B8
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 WaitFor_2 
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1602
@@ -40,11 +40,11 @@ WaitForSomething2 0x00000010
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000040
 SoundReq2 0x000d
-StartPlayerScript 0x0801334c
+StartPlayerScript gUnk_0801334C
 WaitForSomething2 0x00000002
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000040
-StartPlayerScript 0x08013378
+StartPlayerScript gUnk_08013378
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000042
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -64,7 +64,7 @@ SoundReq0x80100000
 @ End of parameters
 Wait 0x003c
 CameraTargetPlayer 
-Call 0x0807f5c1
+Call sub_0807F5C0
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1604
 .short 0x0007
@@ -81,7 +81,7 @@ _0807EA94
 SetLocalFlag 0x0078
 SoundReq2 0x0031
 SetGlobalFlag 0x005d
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080132E4.inc b/data/scripts/gUnk_080132E4.inc
index d97b2794..199fb75e 100644
--- a/data/scripts/gUnk_080132E4.inc
+++ b/data/scripts/gUnk_080132E4.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x0098, 0x0058
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0801330C.inc b/data/scripts/gUnk_0801330C.inc
index ff5c5c16..fc20a94b 100644
--- a/data/scripts/gUnk_0801330C.inc
+++ b/data/scripts/gUnk_0801330C.inc
@@ -6,6 +6,6 @@ _0807EF80 0x0001
 _0807EC64 0x0020
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013330.inc b/data/scripts/gUnk_08013330.inc
index bf8a75d3..91ed7499 100644
--- a/data/scripts/gUnk_08013330.inc
+++ b/data/scripts/gUnk_08013330.inc
@@ -4,5 +4,5 @@ _0807EB44 0x0000
 SetEntityPositionRelative 0x00700098
 StopScript 
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_0801334C.inc b/data/scripts/gUnk_0801334C.inc
index dbf10439..2782c624 100644
--- a/data/scripts/gUnk_0801334C.inc
+++ b/data/scripts/gUnk_0801334C.inc
@@ -8,6 +8,6 @@ _0807ECC4 0x0020
 _0807EF80 0x0000
 _0807EF80 0x000c
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013378.inc b/data/scripts/gUnk_08013378.inc
index bee24285..5c3179ad 100644
--- a/data/scripts/gUnk_08013378.inc
+++ b/data/scripts/gUnk_08013378.inc
@@ -1,16 +1,16 @@
 SCRIPT_START gUnk_08013378
-Call 0x0807f1c5
-Call 0x0807f2d5
-Call 0x0807f1e9
-Call 0x0807f2d5
+Call sub_0807F1C4
+Call sub_0807F2D4
+Call sub_0807F1E8
+Call sub_0807F2D4
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 SoundReq 0x007c
 _0807EB44 0x0004
-Call 0x0807f211
+Call sub_0807F210
 _0807EF3C 0x0200, 0x0020
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_080133C4.inc b/data/scripts/gUnk_080133C4.inc
index 31bde000..a753fd84 100644
--- a/data/scripts/gUnk_080133C4.inc
+++ b/data/scripts/gUnk_080133C4.inc
@@ -3,10 +3,10 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x0007
 _0807EF80 0x000b
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00000008
-Call 0x08061f95
+Call sub_08061F94
 Wait 0x000a
 _0807E5F8 0x00000010
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc
index 67514e31..5aef14e5 100644
--- a/data/scripts/gUnk_080133F8.inc
+++ b/data/scripts/gUnk_080133F8.inc
@@ -3,11 +3,11 @@ StartScript
 _0807EB44 0x0004
 _0807EF80 0x0008
 _0807EF80 0x000b
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
 WaitForSomething2 0x00000020
 SetEntityPositionRelative 0x00480098
-Call 0x08066c95
+Call sub_08066C94
 Wait 0x00e9
 _0807EF80 0x0007
 _0807E5F8 0x00000040
@@ -15,9 +15,8 @@ WaitForSomething2 0x00000020
 Wait 0x003c
 _0807EF80 0x0014
 SoundReq 0x0120
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5421
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095420
 .short 0x3494
 .short 0x0801
 @ End of parameters
@@ -30,7 +29,7 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000020
-Call 0x08066ca5
+Call sub_08066CA4
 _0807EF80 0x0008
 Wait 0x0078
 _0807E5F8 0x00000040
diff --git a/data/scripts/gUnk_08013494.inc b/data/scripts/gUnk_08013494.inc
index e0d9db10..c0ce7fd8 100644
--- a/data/scripts/gUnk_08013494.inc
+++ b/data/scripts/gUnk_08013494.inc
@@ -2,16 +2,16 @@ SCRIPT_START gUnk_08013494
 StartScript 
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0200
-Call 0x08095459
-Call 0x08094b81
+Call nullsub_527
+Call sub_08094B80
 StopScript 
 Wait 0x005a
-Call 0x08094b6d
+Call sub_08094B6C
 _0807EDD4 0x0098, 0x0080
 StartScript 
-Call 0x08094b81
+Call sub_08094B80
 SoundReq 0x01cc
-Call 0x0807f36d
+Call sub_0807F36C
 _0807E5F8 0x00000080
 StopScript 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc
index f3eddbda..96dd691d 100644
--- a/data/scripts/gUnk_080134DC.inc
+++ b/data/scripts/gUnk_080134DC.inc
@@ -3,10 +3,9 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-Call 0x0807f92d
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+Call sub_0807F92C
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -14,12 +13,11 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x080136d8
+Call sub_0807DF28
+StartPlayerScript gUnk_080136D8
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5a1d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095A1C
 .short 0x3f04
 .short 0x0801
 @ End of parameters
@@ -27,15 +25,13 @@ SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x3e04
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x3e28
 .short 0x0801
 @ End of parameters
@@ -43,15 +39,13 @@ StopScript
 WaitForSomething2 0x18000000
 StartScript 
 SoundReq 0x01cf
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4054
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4074
 .short 0x0801
 @ End of parameters
@@ -59,38 +53,33 @@ StopScript
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x40dc
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4118
 .short 0x0801
 @ End of parameters
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x41dc
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4210
 .short 0x0801
 @ End of parameters
@@ -98,9 +87,8 @@ _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 Wait 0x0078
 _0807E5F8 0x00000060
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -108,12 +96,12 @@ Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
 Wait 0x003c
-StartPlayerScript 0x08013b70
+StartPlayerScript gUnk_08013B70
 _0807E5F8 0x00000080
 _0807F078 0x0003, 0x0001
-Call 0x0806dc3d
-Call 0x0806dc59
-Call 0x0807f305
+Call sub_0806DC3C
+Call sub_0806DC58
+Call sub_0807F304
 Wait 0x003c
 _0807E778 0x0004
 DoFade7 
@@ -131,9 +119,8 @@ SoundReq 0x0109
 @ End of parameters
 _0807EA94 
 _0807E5F8 0x00040000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc
index 15406890..df963b06 100644
--- a/data/scripts/gUnk_08013650.inc
+++ b/data/scripts/gUnk_08013650.inc
@@ -1,5 +1,5 @@
 SCRIPT_START gUnk_08013650
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 _0807F0B4 0x0007
 SetEntityPositionRelative 0x00a800e8
@@ -7,22 +7,21 @@ CameraTargetEntity
 Wait 0x003c
 _0807E5F8 0x00000004
 Wait 0x0078
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0001
 .short 0x0000
 @ End of parameters
 _0807F0C8 0x0000, 0x0000
-StartPlayerScript 0x080136b4
+StartPlayerScript gUnk_080136B4
 WaitForSomething2 0x00000002
 _0807EB28 0x1501
 _0807EA94 
 _0807F0B4 0x0004
 CameraTargetPlayer 
 SetLocalFlag 0x007a
-Call 0x08053251
-Call 0x0807df51
+Call sub_08053250
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080136B4.inc b/data/scripts/gUnk_080136B4.inc
index f2db5f95..fc0471cc 100644
--- a/data/scripts/gUnk_080136B4.inc
+++ b/data/scripts/gUnk_080136B4.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x00e8, 0x00a8
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000002
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc
index f63d1a5c..bee3975f 100644
--- a/data/scripts/gUnk_080136D8.inc
+++ b/data/scripts/gUnk_080136D8.inc
@@ -2,22 +2,20 @@ SCRIPT_START gUnk_080136D8
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-Call 0x0807f585
+Call sub_0807F584
 .short 0x1406 @ _0807E078 with 4 parameters
 .short 0x0008
 .short 0x0010
 .short 0x0018
 .short 0x000c
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf465
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F464
 .short 0x00d0
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf4f9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F4F8
 .short 0x0124
 .short 0x0000
 @ End of parameters
@@ -25,5 +23,5 @@ _0807EDD4 0x00e8, 0x0124
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc
index be03a571..735a3f1e 100644
--- a/data/scripts/gUnk_08013720.inc
+++ b/data/scripts/gUnk_08013720.inc
@@ -3,10 +3,9 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-Call 0x0807f92d
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+Call sub_0807F92C
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -14,12 +13,11 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x080136d8
+Call sub_0807DF28
+StartPlayerScript gUnk_080136D8
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5a1d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095A1C
 .short 0x3f34
 .short 0x0801
 @ End of parameters
@@ -27,9 +25,8 @@ SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x3e4c
 .short 0x0801
 @ End of parameters
@@ -37,21 +34,18 @@ StopScript
 WaitForSomething2 0x20000000
 StartScript 
 SoundReq 0x01cf
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4054
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4074
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4094
 .short 0x0801
 @ End of parameters
@@ -59,44 +53,38 @@ StopScript
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x40dc
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4118
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4154
 .short 0x0801
 @ End of parameters
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x41dc
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4210
 .short 0x0801
 @ End of parameters
@@ -106,9 +94,8 @@ _0807E5F8 0x00000800
 WaitForSomething2 0x00008000
 Wait 0x0078
 _0807E5F8 0x00000060
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -116,12 +103,12 @@ Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
 Wait 0x003c
-StartPlayerScript 0x08013b70
+StartPlayerScript gUnk_08013B70
 _0807E5F8 0x00000080
 _0807F078 0x0004, 0x0001
-Call 0x0806dc3d
-Call 0x0806dc59
-Call 0x0807f305
+Call sub_0806DC3C
+Call sub_0806DC58
+Call sub_0807F304
 Wait 0x003c
 _0807E778 0x0004
 DoFade7 
@@ -140,8 +127,8 @@ SoundReq 0x0109
 _0807EA94 
 _0807E5F8 0x00040000
 SetLocalFlag 0x007b
-Call 0x08053251
-Call 0x0807df51
+Call sub_08053250
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc
index bada7949..89f2d143 100644
--- a/data/scripts/gUnk_080138B4.inc
+++ b/data/scripts/gUnk_080138B4.inc
@@ -3,10 +3,9 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-Call 0x0807f92d
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+Call sub_0807F92C
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -14,12 +13,11 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
-StartPlayerScript 0x080136d8
+Call sub_0807DF28
+StartPlayerScript gUnk_080136D8
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5a1d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095A1C
 .short 0x3f64
 .short 0x0801
 @ End of parameters
@@ -27,9 +25,8 @@ SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x3e70
 .short 0x0801
 @ End of parameters
@@ -37,27 +34,23 @@ StopScript
 WaitForSomething2 0x40000000
 StartScript 
 SoundReq 0x01cf
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4054
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4074
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4094
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x40b8
 .short 0x0801
 @ End of parameters
@@ -65,50 +58,43 @@ StopScript
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x40dc
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4118
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4154
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4198
 .short 0x0801
 @ End of parameters
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x41dc
 .short 0x0801
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d8d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D8C
 .short 0x4210
 .short 0x0801
 @ End of parameters
@@ -120,9 +106,8 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00010000
 Wait 0x0078
 _0807E5F8 0x00000060
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -130,13 +115,13 @@ Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
 Wait 0x003c
-StartPlayerScript 0x08013ba8
+StartPlayerScript gUnk_08013BA8
 _0807E5F8 0x00000080
 _0807F078 0x0006, 0x0001
-Call 0x0807aee5
-Call 0x0806dc3d
-Call 0x0806dc59
-Call 0x0807f305
+Call sub_0807AEE4
+Call sub_0806DC3C
+Call sub_0806DC58
+Call sub_0807F304
 Wait 0x003c
 _0807E778 0x0004
 DoFade7 
@@ -157,32 +142,28 @@ _0807E5F8 0x00040000
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x00d800e8
 CameraTargetEntity 
-Call 0x0806dc3d
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf245
-.short 0x0807
+Call sub_0806DC3C
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F244
 .short 0x0001
 .short 0x0001
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x49fe
 .short 0x0800
 @ End of parameters
 Wait 0x00c8
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf29d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F29C
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x0806dc59
+Call sub_0806DC58
 CheckRoomFlag 0x0004
 JumpIfNot 0xfffa
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc
index 89fae614..650f465a 100644
--- a/data/scripts/gUnk_08013AA6.inc
+++ b/data/scripts/gUnk_08013AA6.inc
@@ -1,11 +1,10 @@
 SCRIPT_START gUnk_08013AA6
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 _0807E5F8 0x00000008
 Wait 0x0078
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -26,8 +25,8 @@ _0807EA94
 _0807F0B4 0x0004
 CameraTargetPlayer 
 SetLocalFlag 0x007c
-Call 0x08053251
-Call 0x0807df51
+Call sub_08053250
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc
index bafcadf3..944ceeee 100644
--- a/data/scripts/gUnk_08013B18.inc
+++ b/data/scripts/gUnk_08013B18.inc
@@ -3,9 +3,8 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x01c8
 .short 0x0000
 @ End of parameters
@@ -16,29 +15,13 @@ CheckLocalFlag 0x0078
 JumpIf 0xffe0
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807EB28 0x1507
 _0807EA94 
-StartPlayerScript 0x08010a14
+StartPlayerScript gUnk_08010A14
 WaitForSomething2 0x00000001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffb2
 .short 0x0000
-SoundReq 0x01d3
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
-.short 0x08bf
-.short 0x0000
-@ End of parameters
-Call 0x08096029
-Wait 0x003c
-_0807E5F8 0x00020000
-Call 0x0807f305
-Wait 0x0078
-WaitForSomething2 0x00040000
-Call 0x080791bd
-SCRIPT_END
-.short 0x0000
diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc
new file mode 100644
index 00000000..dd55bd47
--- /dev/null
+++ b/data/scripts/gUnk_08013B70.inc
@@ -0,0 +1,16 @@
+SCRIPT_START gUnk_08013B70
+SoundReq 0x01d3
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
+.short 0x08bf
+.short 0x0000
+@ End of parameters
+Call sub_08096028
+Wait 0x003c
+_0807E5F8 0x00020000
+Call sub_0807F304
+Wait 0x0078
+WaitForSomething2 0x00040000
+Call sub_080791BC
+SCRIPT_END
+.short 0x0000
diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc
index 65d13d26..b47e2a60 100644
--- a/data/scripts/gUnk_08013BA8.inc
+++ b/data/scripts/gUnk_08013BA8.inc
@@ -1,22 +1,20 @@
 SCRIPT_START gUnk_08013BA8
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5e7d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095E7C
 .short 0x4248
 .short 0x0801
 @ End of parameters
 SoundReq 0x01d3
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
 .short 0x08e3
 .short 0x0000
 @ End of parameters
-Call 0x08096029
+Call sub_08096028
 Wait 0x0078
 _0807E5F8 0x00020000
-Call 0x0807f305
+Call sub_0807F304
 Wait 0x0078
 WaitForSomething2 0x00040000
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc
index 6982628d..9cf01e62 100644
--- a/data/scripts/gUnk_08013BE8.inc
+++ b/data/scripts/gUnk_08013BE8.inc
@@ -20,17 +20,15 @@ CheckLocalFlag 0x007c
 JumpIf 0x0068
 StartScript 
 _0807EF80 0x0007
-Call 0x0807f935
+Call sub_0807F934
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x62f9
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_080962F8
 .short 0x0000
 .short 0x0000
 @ End of parameters
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf8e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F8E8
 .short 0x0004
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_08013CA4.inc b/data/scripts/gUnk_08013CA4.inc
index a0686709..2a507c25 100644
--- a/data/scripts/gUnk_08013CA4.inc
+++ b/data/scripts/gUnk_08013CA4.inc
@@ -3,22 +3,22 @@ StopScript
 CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-Call 0x0807f3f9
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0807F3F8
 Wait 0x003c
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x013800e8
 CameraTargetEntity 
-Call 0x0807f5c1
+Call sub_0807F5C0
 Wait 0x0078
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807f5c1
+Call sub_0807F5C0
 _0807EB28 0x1504
 _0807EA94 
 SetLocalFlag 0x0079
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc
index 23514d46..13d55e1d 100644
--- a/data/scripts/gUnk_08013D04.inc
+++ b/data/scripts/gUnk_08013D04.inc
@@ -1,25 +1,23 @@
 SCRIPT_START gUnk_08013D04
 StartScript 
-Call 0x0807f92d
+Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0004
 .short 0x0000
 @ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x0000
 .short 0x0000
 @ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x08000000
-Call 0x080791bd
+Call sub_080791BC
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc
index d6611b57..d8f002c5 100644
--- a/data/scripts/gUnk_08013D44.inc
+++ b/data/scripts/gUnk_08013D44.inc
@@ -1,25 +1,23 @@
 SCRIPT_START gUnk_08013D44
 StartScript 
-Call 0x0807f92d
+Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0004
 .short 0x0000
 @ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x0001
 .short 0x0000
 @ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x10000000
-Call 0x080791bd
+Call sub_080791BC
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc
index b29efd5d..73d9938d 100644
--- a/data/scripts/gUnk_08013D84.inc
+++ b/data/scripts/gUnk_08013D84.inc
@@ -1,25 +1,23 @@
 SCRIPT_START gUnk_08013D84
 StartScript 
-Call 0x0807f92d
+Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0004
 .short 0x0000
 @ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x0002
 .short 0x0000
 @ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x20000000
-Call 0x080791bd
+Call sub_080791BC
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc
index 2597652e..3385a818 100644
--- a/data/scripts/gUnk_08013DC4.inc
+++ b/data/scripts/gUnk_08013DC4.inc
@@ -1,25 +1,23 @@
 SCRIPT_START gUnk_08013DC4
 StartScript 
-Call 0x0807f92d
+Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0004
 .short 0x0000
 @ End of parameters
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5d55
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095D54
 .short 0x0003
 .short 0x0000
 @ End of parameters
 SoundReq 0x01cd
 _0807E5F8 0x40000000
-Call 0x080791bd
+Call sub_080791BC
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08013E94.inc b/data/scripts/gUnk_08013E94.inc
index 3045337f..a70e41b9 100644
--- a/data/scripts/gUnk_08013E94.inc
+++ b/data/scripts/gUnk_08013E94.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013E94
 StartScript 
 _0807EF80 0x0007
-Call 0x0807f181
+Call sub_0807F180
 SetEntityPositionRelative 0x00f800b0
 _0807E930 0x0001
 StopScript 
diff --git a/data/scripts/gUnk_08013EB0.inc b/data/scripts/gUnk_08013EB0.inc
index 4ca0767f..3a4b3b44 100644
--- a/data/scripts/gUnk_08013EB0.inc
+++ b/data/scripts/gUnk_08013EB0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013EB0
 StartScript 
 _0807EF80 0x0007
-Call 0x0807f181
+Call sub_0807F180
 SetEntityPositionRelative 0x00f80120
 _0807E930 0x0003
 StopScript 
diff --git a/data/scripts/gUnk_08013ECC.inc b/data/scripts/gUnk_08013ECC.inc
index 96385d5d..65f7af88 100644
--- a/data/scripts/gUnk_08013ECC.inc
+++ b/data/scripts/gUnk_08013ECC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013ECC
 StartScript 
 _0807EF80 0x0007
-Call 0x0807f181
+Call sub_0807F180
 SetEntityPositionRelative 0x01680120
 _0807E930 0x0005
 StopScript 
diff --git a/data/scripts/gUnk_08013EE8.inc b/data/scripts/gUnk_08013EE8.inc
index 63b7c705..6d498b41 100644
--- a/data/scripts/gUnk_08013EE8.inc
+++ b/data/scripts/gUnk_08013EE8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08013EE8
 StartScript 
 _0807EF80 0x0007
-Call 0x0807f181
+Call sub_0807F180
 SetEntityPositionRelative 0x016800b0
 _0807E930 0x0007
 StopScript 
diff --git a/data/scripts/gUnk_08013F04.inc b/data/scripts/gUnk_08013F04.inc
index 551b77fc..e6b22c50 100644
--- a/data/scripts/gUnk_08013F04.inc
+++ b/data/scripts/gUnk_08013F04.inc
@@ -5,7 +5,7 @@ _0807E930 0x0008
 StopScript 
 WaitForSomething2 0x00000080
 _0807E930 0x000b
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08013F34.inc b/data/scripts/gUnk_08013F34.inc
index da8861b5..804fb892 100644
--- a/data/scripts/gUnk_08013F34.inc
+++ b/data/scripts/gUnk_08013F34.inc
@@ -5,7 +5,7 @@ _0807E930 0x0009
 StopScript 
 WaitForSomething2 0x00000080
 _0807E930 0x000c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08013F64.inc b/data/scripts/gUnk_08013F64.inc
index 78aa1e28..64131a9a 100644
--- a/data/scripts/gUnk_08013F64.inc
+++ b/data/scripts/gUnk_08013F64.inc
@@ -5,7 +5,7 @@ _0807E930 0x000a
 StopScript 
 WaitForSomething2 0x00000080
 _0807E930 0x000d
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08013F94.inc b/data/scripts/gUnk_08013F94.inc
index ff253afd..edfefdb8 100644
--- a/data/scripts/gUnk_08013F94.inc
+++ b/data/scripts/gUnk_08013F94.inc
@@ -11,14 +11,14 @@ JumpIfNot 0xfff6
 CheckPlayerFlags 0x00400000
 JumpIfNot 0xffec
 StopScript 
-Call 0x0807fa41
+Call sub_0807FA40
 _0807E888 
-Call 0x0807df39
+Call sub_0807DF38
 Wait 0x0078
 _0807EB28 0x1505
 _0807EA94 
 SetLocalFlag 0x007d
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc
index be7ca6b1..86297bb7 100644
--- a/data/scripts/gUnk_08013FE8.inc
+++ b/data/scripts/gUnk_08013FE8.inc
@@ -10,24 +10,23 @@ CheckLocalFlag 0x007a
 JumpIfNot 0xffee
 CheckInventory1 0x0003
 JumpIfNot 0xffe6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x00d0
 .short 0x0000
 @ End of parameters
 JumpIfNot 0xffd8
 StopScript 
-Call 0x0807f9a5
+Call sub_0807F9A4
 StartScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 StopScript 
 _0807EB28 0x1508
 _0807EA94 
-StartPlayerScript 0x08010a14
+StartPlayerScript gUnk_08010A14
 WaitForSomething2 0x00000001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffa6
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08014054.inc b/data/scripts/gUnk_08014054.inc
index 83a143bc..134e969b 100644
--- a/data/scripts/gUnk_08014054.inc
+++ b/data/scripts/gUnk_08014054.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014054
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0000
-Call 0x0807f739
+Call sub_0807F738
 StopScript 
 WaitForSomething 0x00000040
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08014074.inc b/data/scripts/gUnk_08014074.inc
index 324f5b3e..a7b8f9ff 100644
--- a/data/scripts/gUnk_08014074.inc
+++ b/data/scripts/gUnk_08014074.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014074
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0001
-Call 0x0807f739
+Call sub_0807F738
 StopScript 
 WaitForSomething 0x00000040
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08014094.inc b/data/scripts/gUnk_08014094.inc
index add253c9..8f7f7fe5 100644
--- a/data/scripts/gUnk_08014094.inc
+++ b/data/scripts/gUnk_08014094.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014094
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0002
-Call 0x0807f739
+Call sub_0807F738
 SetEntityPosition 0x0000, 0xfff0
 StopScript 
 WaitForSomething 0x00000040
diff --git a/data/scripts/gUnk_080140B8.inc b/data/scripts/gUnk_080140B8.inc
index f4864b53..da2487e1 100644
--- a/data/scripts/gUnk_080140B8.inc
+++ b/data/scripts/gUnk_080140B8.inc
@@ -2,7 +2,7 @@ SCRIPT_START gUnk_080140B8
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0003
-Call 0x0807f739
+Call sub_0807F738
 SetEntityPosition 0x0000, 0xfff0
 StopScript 
 WaitForSomething 0x00000040
diff --git a/data/scripts/gUnk_080140DC.inc b/data/scripts/gUnk_080140DC.inc
index e910fe33..f258679f 100644
--- a/data/scripts/gUnk_080140DC.inc
+++ b/data/scripts/gUnk_080140DC.inc
@@ -5,11 +5,11 @@ _0807E930 0x0004
 StopScript 
 WaitForSomething2 0x00000200
 _0807E930 0x0008
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x000c
 _0807E5F8 0x00002000
 WaitForSomething 0x00000020
 _0807E930 0x0010
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014118.inc b/data/scripts/gUnk_08014118.inc
index af3bce73..5891b34f 100644
--- a/data/scripts/gUnk_08014118.inc
+++ b/data/scripts/gUnk_08014118.inc
@@ -5,11 +5,11 @@ _0807E930 0x0005
 StopScript 
 WaitForSomething2 0x00000400
 _0807E930 0x0009
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x000d
 _0807E5F8 0x00004000
 WaitForSomething 0x00000020
 _0807E930 0x0011
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014154.inc b/data/scripts/gUnk_08014154.inc
index 02544d3a..5844b2da 100644
--- a/data/scripts/gUnk_08014154.inc
+++ b/data/scripts/gUnk_08014154.inc
@@ -6,12 +6,12 @@ SetEntityPosition 0x0000, 0xfff0
 StopScript 
 WaitForSomething2 0x00000800
 _0807E930 0x000a
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x000e
 _0807E5F8 0x00008000
 WaitForSomething 0x00000020
 _0807E930 0x0012
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08014198.inc b/data/scripts/gUnk_08014198.inc
index cfe74586..599a6ecc 100644
--- a/data/scripts/gUnk_08014198.inc
+++ b/data/scripts/gUnk_08014198.inc
@@ -6,12 +6,12 @@ SetEntityPosition 0x0000, 0xfff0
 StopScript 
 WaitForSomething2 0x00001000
 _0807E930 0x000b
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E930 0x000f
 _0807E5F8 0x00010000
 WaitForSomething 0x00000020
 _0807E930 0x0013
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc
index a4a1d7a5..6474c661 100644
--- a/data/scripts/gUnk_080141DC.inc
+++ b/data/scripts/gUnk_080141DC.inc
@@ -2,17 +2,16 @@ SCRIPT_START gUnk_080141DC
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0014
-Call 0x0807f715
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+Call sub_0807F714
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfffc
 .short 0x0000
 @ End of parameters
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc
index 5a8afc07..a8253a5c 100644
--- a/data/scripts/gUnk_08014210.inc
+++ b/data/scripts/gUnk_08014210.inc
@@ -2,17 +2,16 @@ SCRIPT_START gUnk_08014210
 StartScript 
 _0807EF80 0x0007
 _0807E930 0x0015
-Call 0x0807f715
-Call 0x0807f715
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf995
-.short 0x0807
+Call sub_0807F714
+Call sub_0807F714
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F994
 .short 0xfffc
 .short 0x0000
 @ End of parameters
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/gUnk_08014248.inc
index ed295289..dcbddfda 100644
--- a/data/scripts/gUnk_08014248.inc
+++ b/data/scripts/gUnk_08014248.inc
@@ -2,16 +2,14 @@ SCRIPT_START gUnk_08014248
 TestBit 0x00020000
 JumpIf 0x0014
 Wait 0x0008
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5ead
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095EAC
 .short 0x0000
 .short 0x0000
 @ End of parameters
 Jump 0xffe6
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x5ead
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_08095EAC
 .short 0x0001
 .short 0x0000
 @ End of parameters
@@ -23,10 +21,9 @@ StopScript
 CheckLocalFlag 0x0078
 JumpIfNot 0xfffa
 StartScript 
-Call 0x0807f935
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+Call sub_0807F934
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0008
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_080142B0.inc
index 80923c10..934901e7 100644
--- a/data/scripts/gUnk_080142B0.inc
+++ b/data/scripts/gUnk_080142B0.inc
@@ -16,7 +16,7 @@ _0807E864
 SetLocalFlag 0x0053
 Wait 0x0014
 _0807E908 0x0004
-Call 0x080654dd
+Call sub_080654DC
 Wait 0x001e
 _0807E930 0x0001
 Wait 0x000a
@@ -47,7 +47,7 @@ _0807E864
 SetLocalFlag 0x0054
 Wait 0x005a
 _0807E908 0x0004
-Call 0x080654ed
+Call sub_080654EC
 Wait 0x001e
 _0807E930 0x0001
 Wait 0x001e
diff --git a/data/scripts/gUnk_08014384.inc b/data/scripts/gUnk_08014384.inc
index 8d27c3d1..731675ae 100644
--- a/data/scripts/gUnk_08014384.inc
+++ b/data/scripts/gUnk_08014384.inc
@@ -5,7 +5,7 @@ _0807EA94
 _0807E3E8 
 JumpIfNot 0x001e
 Wait 0x001e
-Call 0x08065371
+Call sub_08065370
 JumpIfNot 0x0010
 Wait 0x003c
 _0807EA94 
diff --git a/data/scripts/gUnk_080143C0.inc b/data/scripts/gUnk_080143C0.inc
index 79b9f487..aa3ae6c0 100644
--- a/data/scripts/gUnk_080143C0.inc
+++ b/data/scripts/gUnk_080143C0.inc
@@ -1,37 +1,37 @@
 SCRIPT_START gUnk_080143C0
 StopScript 
 _0807E864 
-Call 0x0807df29
-Call 0x080654fd
+Call sub_0807DF28
+Call sub_080654FC
 _0807E930 0x0001
-Call 0x080654ed
+Call sub_080654EC
 Wait 0x003c
 TextboxNoOverlap 0x2c16
 _0807EA94 
 _0807E3E8 
 JumpIf 0x0012
 _0807E914 0x00000002
-Call 0x08065529
+Call sub_08065528
 Jump 0x0046
-Call 0x080654ed
+Call sub_080654EC
 Wait 0x001e
 TextboxNoOverlap 0x2c18
 _0807EA94 
 Wait 0x000a
 _0807E914 0x00000000
-Call 0x08065529
+Call sub_08065528
 _0807F034 0x0036
 WaitPlayerAction8 
 TextboxNoOverlap 0x2c19
 _0807EA94 
 _0807E914 0x00000303
-Call 0x0807f421
+Call sub_0807F420
 Wait 0x001e
 _0807EB8C 
 TextboxNoOverlap 0x2c22
 _0807EA94 
 _0807E930 0x0004
 _0807E908 0x0001
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc
index 5cba5540..026708be 100644
--- a/data/scripts/gUnk_08014450.inc
+++ b/data/scripts/gUnk_08014450.inc
@@ -23,7 +23,7 @@ HasRupees 0x000a
 JumpIf 0x000a
 TextboxNoOverlapFollow 0x4204
 Jump 0x005c
-Call 0x0806e251
+Call sub_0806E250
 JumpIfNot 0x000e
 TextboxNoOverlapFollow 0x420b
 _0807EB38 
@@ -42,7 +42,7 @@ Wait 0x0018
 SetRoomFlag 0x0000
 SetLocalFlag 0x0092
 _0807EEF4 0x0000, 0xffa0
-Call 0x0807df39
+Call sub_0807DF38
 Jump 0x000e
 _0807E930 0x0009
 Wait 0x003c
diff --git a/data/scripts/gUnk_0801450C.inc b/data/scripts/gUnk_0801450C.inc
index bf8d0973..4e8ca601 100644
--- a/data/scripts/gUnk_0801450C.inc
+++ b/data/scripts/gUnk_0801450C.inc
@@ -6,13 +6,13 @@ SetEntityNonPlanarMovement 0x01c0
 _0807EF80 0x000a
 StopScript 
 _0807E864 
-Call 0x0807df29
-Call 0x0806e20d
+Call sub_0807DF28
+Call sub_0806E20C
 _0807EA94 
-Call 0x0806e23d
+Call sub_0806E23C
 ClearLocalFlag 0x0093
 ClearLocalFlag 0x0092
-Call 0x0807df51
+Call sub_0807DF50
 Jump 0xffb8
 .short 0x0000
 StartScript 
@@ -24,7 +24,7 @@ JumpIfNot 0xffee
 _0807E864 
 _0807EB28 0x4217
 _0807EA94 
-StartPlayerScript 0x08014588
+StartPlayerScript gUnk_08014588
 Wait 0x0010
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_08014588.inc b/data/scripts/gUnk_08014588.inc
index 23d8ddc7..a1b00da4 100644
--- a/data/scripts/gUnk_08014588.inc
+++ b/data/scripts/gUnk_08014588.inc
@@ -6,5 +6,5 @@ _0807EDD4 0x0078, 0x0078
 _0807EF80 0x0000
 Wait 0x0010
 _0807E5F8 0x00000002
-Call 0x0807921d
+Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc
index 2ff86973..295e90ef 100644
--- a/data/scripts/gUnk_080145E8.inc
+++ b/data/scripts/gUnk_080145E8.inc
@@ -7,12 +7,12 @@ StopScript
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 CheckRoomFlag 0x0004
 JumpIf 0xfffa
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffd2
 StartScript 
@@ -27,7 +27,7 @@ TestBit 0x00000004
 JumpIf 0x0132
 CheckRoomFlag 0x0004
 JumpIf 0x0022
-Call 0x0808861d
+Call sub_0808861C
 JumpIfNot 0xffe0
 CheckLocalFlag 0x005e
 JumpIf 0x003e
@@ -38,12 +38,12 @@ _0807EB8C
 .short 0x000c
 @ End of parameters
 Jump 0x015e
-Call 0x08088659
+Call sub_08088658
 JumpIfNot 0xffc0
 _0807E864 
 _0807EB28 0x431f
 _0807EA94 
-StartPlayerScript 0x080147dc
+StartPlayerScript gUnk_080147DC
 Wait 0x0010
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
@@ -70,7 +70,7 @@ CheckRoomFlag 0x0006
 JumpIf 0x0052
 CheckLocalFlag 0x005f
 JumpIf 0x003c
-Call 0x08088575
+Call sub_08088574
 SetRoomFlag 0x0009
 Jump 0x004a
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -93,11 +93,11 @@ JumpIfNot 0x00b0
 @ End of parameters
 Jump 0x001e
 SetRoomFlag 0x0009
-Call 0x08088505
+Call sub_08088504
 Jump 0x0010
 SetRoomFlag 0x0009
 ClearRoomFlag 0x0006
-Call 0x08088545
+Call sub_08088544
 _0807E3E8 
 JumpIfNot 0x0030
 _0807EA94 
@@ -122,9 +122,9 @@ CheckRoomFlag 0x0008
 JumpIf 0x0034
 CheckRoomFlag 0x0007
 JumpIf 0x001c
-Call 0x08088479
+Call sub_08088478
 _0807EA94 
-Call 0x080885b1
+Call sub_080885B0
 WaitPlayerAction8 
 _0807E5F8 0x00000008
 Jump 0x002c
@@ -146,12 +146,3 @@ Wait 0x0004
 _0807E878 
 Jump 0xfe62
 .short 0x0000
-StopScript 
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x00e0
-_0807EDD4 0x0078, 0x0068
-_0807EF80 0x0000
-Wait 0x0010
-_0807E5F8 0x00000001
-Call 0x0807921d
-SCRIPT_END
diff --git a/data/scripts/gUnk_080147DC.inc b/data/scripts/gUnk_080147DC.inc
new file mode 100644
index 00000000..0db5a666
--- /dev/null
+++ b/data/scripts/gUnk_080147DC.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_080147DC
+StopScript 
+WaitForSomething2 0x00000002
+SetEntityNonPlanarMovement 0x00e0
+_0807EDD4 0x0078, 0x0068
+_0807EF80 0x0000
+Wait 0x0010
+_0807E5F8 0x00000001
+Call sub_0807921C
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc
index 0f51cb04..599d21f1 100644
--- a/data/scripts/gUnk_08014804.inc
+++ b/data/scripts/gUnk_08014804.inc
@@ -5,7 +5,7 @@ _0807EB44 0x0000
 _0807EF80 0x000a
 StopScript 
 _0807E864 
-Call 0x0807df39
+Call sub_0807DF38
 Wait 0x0010
 CheckLocalFlag 0x0093
 JumpIf 0x0092
@@ -72,7 +72,7 @@ StopScript
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 ClearRoomFlag 0x0000
-Call 0x0806e141
+Call sub_0806E140
 JumpIfNot 0x002a
 _0807EA94 
 _0807E3E8 
@@ -80,7 +80,7 @@ JumpIfNot 0x0028
 _0807E864 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call 0x0806e1e1
+Call sub_0806E1E0
 _0807EA94 
 Wait 0x0018
 _0807E878 
@@ -89,8 +89,8 @@ _0807EA94
 Jump 0x0002
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-Call 0x0806e1fd
+Call sub_0806E1FC
 Wait 0x001e
-Call 0x0807df51
+Call sub_0807DF50
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08014958.inc b/data/scripts/gUnk_08014958.inc
index db98456c..cee8f3f6 100644
--- a/data/scripts/gUnk_08014958.inc
+++ b/data/scripts/gUnk_08014958.inc
@@ -1,6 +1,6 @@
 SCRIPT_START gUnk_08014958
 StartScript 
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 CheckGlobalFlag 0x0058
 JumpIf 0x000c
@@ -11,13 +11,13 @@ _0807E30C
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffe6
 StartScript 
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 CheckGlobalFlag 0x0058
 JumpIfNot 0x0020
@@ -26,7 +26,7 @@ _0807E30C
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 Wait 0x000f
 _0807E878 
diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc
index 1f1d577a..79537164 100644
--- a/data/scripts/gUnk_080149CC.inc
+++ b/data/scripts/gUnk_080149CC.inc
@@ -1,14 +1,14 @@
 SCRIPT_START gUnk_080149CC
 StartScript 
 SetEntityNonPlanarMovement 0x0080
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 StopScript 
 _0807E30C 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 CheckLocalFlag 0x0064
 JumpIfNot 0x002a
@@ -26,28 +26,28 @@ _0807E878
 Jump 0xffba
 .short 0x0000
 StartScript 
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 StopScript 
 _0807E30C 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 Wait 0x000f
 _0807E878 
 Jump 0xffe6
 .short 0x0000
 StartScript 
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 StopScript 
 _0807E30C 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 Wait 0x000f
 _0807E878 
diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc
index 0c7347cd..5c8538cb 100644
--- a/data/scripts/gUnk_08014A80.inc
+++ b/data/scripts/gUnk_08014A80.inc
@@ -20,14 +20,14 @@ _0807E878
 Jump 0xffec
 .short 0x0000
 StartScript 
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 StopScript 
 _0807E30C 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-StartPlayerScript 0x08014b10
+StartPlayerScript gUnk_08014B10
 WaitForSomething2 0x00000001
 _0807EB74 
 CheckLocalFlag 0x0064
@@ -41,12 +41,3 @@ Wait 0x000f
 _0807E878 
 Jump 0xffc6
 .short 0x0000
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0078, 0x0040
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_08014B10.inc b/data/scripts/gUnk_08014B10.inc
new file mode 100644
index 00000000..2f777e41
--- /dev/null
+++ b/data/scripts/gUnk_08014B10.inc
@@ -0,0 +1,10 @@
+SCRIPT_START gUnk_08014B10
+StartScript 
+SetEntityNonPlanarMovement 0x0100
+StopScript 
+_0807EDD4 0x0078, 0x0040
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_08014B34.inc b/data/scripts/gUnk_08014B34.inc
index afc0cefd..386c67e3 100644
--- a/data/scripts/gUnk_08014B34.inc
+++ b/data/scripts/gUnk_08014B34.inc
@@ -21,31 +21,31 @@ _0807E878
 Jump 0xffda
 StopScript 
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807E5F8 0x00000001
 _0807EF80 0x0004
 WaitForSomething2 0x00000002
 _0807E930 0x0010
-Call 0x0806ccf9
+Call sub_0806CCF8
 Wait 0x0014
-Call 0x0806cd05
+Call sub_0806CD04
 Wait 0x0014
-Call 0x0806cd15
+Call sub_0806CD14
 Wait 0x0014
-Call 0x0806cd21
+Call sub_0806CD20
 Wait 0x0014
-Call 0x0806cd31
+Call sub_0806CD30
 Wait 0x0014
-Call 0x0806cd3d
+Call sub_0806CD3C
 Wait 0x0014
-Call 0x0806cd4d
+Call sub_0806CD4C
 SoundReq 0x0072
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807E930 0x0010
-Call 0x0806cd4d
+Call sub_0806CD4C
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
@@ -64,7 +64,7 @@ Wait 0x000f
 _0807E878 
 Jump 0xffc8
 StartScript 
-Call 0x0806cd59
+Call sub_0806CD58
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807E930 0x0006
@@ -73,9 +73,9 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-Call 0x0806ccd1
+Call sub_0806CCD0
 JumpIfNot 0xfff8
-Call 0x0806ccb5
+Call sub_0806CCB4
 JumpIfNot 0xfff8
 CheckLocalFlag 0x0066
 JumpIf 0x0016
@@ -95,7 +95,7 @@ Jump 0xffb0
 StartScript 
 CheckGlobalFlag 0x0024
 JumpIf 0x0038
-Call 0x0806c871
+Call sub_0806C870
 _0807EF80 0x000a
 _0807EF80 0x0000
 StopScript 
@@ -108,7 +108,7 @@ JumpIfNot 0xfff0
 StopScript 
 _0807E864 
 _0807EB74 
-Call 0x0806c90d
+Call sub_0806C90C
 _0807EA94 
 _0807E878 
 Jump 0xffdc
diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc
index 2ad6adef..93bb4a62 100644
--- a/data/scripts/gUnk_08014CDC.inc
+++ b/data/scripts/gUnk_08014CDC.inc
@@ -2,14 +2,14 @@ SCRIPT_START gUnk_08014CDC
 StartScript 
 SetEntityNonPlanarMovement 0x0180
 _0807EF80 0x000a
-Call 0x08066d05
-Call 0x08066d15
+Call sub_08066D04
+Call sub_08066D14
 SetEntityPositionRelative 0x018001e8
 _0807EB44 0x0004
 _0807EF80 0x0000
 StopScript 
 WaitForSomething2 0x00000001
-Call 0x08066e09
+Call sub_08066E08
 _0807E864 
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1010
@@ -23,43 +23,42 @@ CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
 JumpIfNot 0xfff2
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 TextboxNoOverlap 0x1012
 _0807EA94 
 _0807EC64 0x0040
 _0807EB44 0x0004
-Call 0x08066e09
+Call sub_08066E08
 SetEntityPositionRelative 0x00c801f8
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x00e8
 .short 0x0000
 @ End of parameters
 JumpIf 0xfff4
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 TextboxNoOverlap 0x1013
 _0807EA94 
 _0807EC64 0x0040
 _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityPositionRelative 0x002801e8
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 CheckPlayerInRegion 0x01f8, 0x0028, 0x2040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 TextboxNoOverlap 0x1014
 _0807EA94 
 _0807EC64 0x0018
 SetLocalFlag 0x006d
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014DCC.inc b/data/scripts/gUnk_08014DCC.inc
index d689618e..48f3362c 100644
--- a/data/scripts/gUnk_08014DCC.inc
+++ b/data/scripts/gUnk_08014DCC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START gUnk_08014DCC
 StartScript 
 SetEntityPositionRelative 0x01a80238
-Call 0x0807f845
-Call 0x0807f349
+Call sub_0807F844
+Call sub_0807F348
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 StopScript 
 _0807E778 0x0010
 DoFade6 
@@ -13,7 +13,7 @@ _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc
index 31bf0b96..20aa9ea3 100644
--- a/data/scripts/gUnk_08014E14.inc
+++ b/data/scripts/gUnk_08014E14.inc
@@ -3,9 +3,8 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -14,13 +13,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf3d9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F3D8
 .short 0x0000
 .short 0x0000
 @ End of parameters
-Call 0x08064429
+Call sub_08064428
 _0807EA94 
 _0807E878 
 Jump 0xffe0
@@ -34,29 +32,26 @@ StopScript
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB74 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf78d
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F78C
 .short 0x0022
 .short 0x0000
 @ End of parameters
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x0038
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf7c5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F7C4
 .short 0x0022
 .short 0x0000
 @ End of parameters
 JumpIfNot 0x001e
 _0807E48C 0x0020
 JumpIfNot 0x001e
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf801
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F800
 .short 0x0022
 .short 0x0000
 @ End of parameters
@@ -67,7 +62,7 @@ TextboxNoOverlap 0x0a03
 Jump 0x0006
 TextboxNoOverlap 0x0a02
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xff9c
 .short 0x0000
@@ -110,18 +105,17 @@ _0807EF80 0x0007
 _0807EB44 0x0004
 _0807E930 0x000e
 StopScript 
-Call 0x08065915
+Call sub_08065914
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB74 
 _0807EF80 0x0000
 StartScript 
 TextboxNoOverlap 0x3b0b
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf855
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F854
 .short 0x0064
 .short 0x0001
 @ End of parameters
@@ -142,31 +136,31 @@ TextboxNoOverlap 0x3b0e
 Jump 0x0006
 TextboxNoOverlap 0x3b0f
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EB44 0x0004
 _0807E930 0x000e
 Jump 0xff90
 StartScript 
 SetEntityPositionRelative 0x00e001f8
-Call 0x08054565
+Call sub_08054564
 StopScript 
 CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 SoundReq0x80100000 
 _0807F0B4 0x0001
 CameraTargetEntity 
-StartPlayerScript 0x080152b4
+StartPlayerScript gUnk_080152B4
 WaitForSomething2 0x00000001
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1301
 .short 0x0002
 @ End of parameters
 _0807EA94 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x003c
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -192,69 +186,69 @@ WaitForSomething2 0x00000004
 _0807EB28 0x1306
 _0807EA94 
 SoundReq0x80100000 
-StartPlayerScript 0x080152dc
+StartPlayerScript gUnk_080152DC
 CameraTargetEntity 
 _0807F0B4 0x0003
 SetEntityPositionRelative 0x014801f8
 WaitForSomething2 0x00000001
-Call 0x0804f6a9
+Call sub_0804F6A8
 Wait 0x0004
-Call 0x0804f809
+Call sub_0804F808
 SoundReq 0x010b
-StartPlayerScript 0x08015304
-Call 0x0804f6c9
+StartPlayerScript gUnk_08015304
+Call sub_0804F6C8
 Wait 0x0004
-Call 0x0804f831
+Call sub_0804F830
 SoundReq 0x010b
-Call 0x0804f6e9
+Call sub_0804F6E8
 Wait 0x0004
-Call 0x0804f855
+Call sub_0804F854
 SoundReq 0x010b
-Call 0x0804f725
+Call sub_0804F724
 Wait 0x0004
-Call 0x0804f89d
+Call sub_0804F89C
 SoundReq 0x010b
-Call 0x0804f761
+Call sub_0804F760
 Wait 0x0004
-Call 0x0804f8e1
+Call sub_0804F8E0
 SoundReq 0x010b
 Wait 0x003c
 WaitForSomething2 0x00000001
 SoundReq 0x01b0
-Call 0x0804f79d
+Call sub_0804F79C
 Wait 0x000a
 LoadRoomEntityList 0x080f7fc0
 SoundReq2 0x002d
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 SoundReq0x80100000 
-StartPlayerScript 0x08015338
+StartPlayerScript gUnk_08015338
 WaitForSomething2 0x00000001
 Wait 0x003c
-Call 0x0804f6a9
+Call sub_0804F6A8
 Wait 0x0004
-Call 0x0804f929
+Call sub_0804F928
 SoundReq 0x010b
-Call 0x0804f6c9
+Call sub_0804F6C8
 Wait 0x0004
-Call 0x0804f945
+Call sub_0804F944
 SoundReq 0x010b
-Call 0x0804f6e9
+Call sub_0804F6E8
 Wait 0x0004
-Call 0x0804f961
+Call sub_0804F960
 SoundReq 0x010b
-Call 0x0804f725
+Call sub_0804F724
 Wait 0x0004
-Call 0x0804f995
+Call sub_0804F994
 SoundReq 0x010b
-Call 0x0804f761
+Call sub_0804F760
 Wait 0x0004
-Call 0x0804f9c9
+Call sub_0804F9C8
 SoundReq 0x010b
 Wait 0x003c
 SoundReq 0x0072
@@ -267,12 +261,11 @@ CameraTargetPlayer
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-Call 0x08053b3d
+Call sub_08053B3C
 StartScript 
 _0807E864 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6e9
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6E8
 .short 0x0008
 .short 0x0000
 @ End of parameters
@@ -283,7 +276,7 @@ _0807E778 0x0100
 DoFade4 
 _0807E80C 0x00000000
 StopScript 
-StartPlayerScript 0x08015360
+StartPlayerScript gUnk_08015360
 WaitForSomething2 0x00000001
 LoadRoomEntityList 0x080f7cb0
 _0807E778 0x0004
@@ -298,9 +291,9 @@ StopScript
 _0807EA94 
 _0807F0B4 0x0004
 CameraTargetPlayer 
-Call 0x08054571
+Call sub_08054570
 SoundReq2 0xffff
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015234.inc b/data/scripts/gUnk_08015234.inc
index e5ebf690..55a848f6 100644
--- a/data/scripts/gUnk_08015234.inc
+++ b/data/scripts/gUnk_08015234.inc
@@ -3,10 +3,10 @@ StartScript
 _0807EF80 0x0008
 _0807EB44 0x0004
 _0807EF80 0x0000
-Call 0x0807f355
+Call sub_0807F354
 StopScript 
 WaitForSomething2 0x00000002
-Call 0x08066c95
+Call sub_08066C94
 Wait 0x00e9
 _0807EF80 0x0007
 _0807EF80 0x001e
@@ -15,7 +15,7 @@ WaitForSomething2 0x00000002
 Wait 0x0014
 _0807EB44 0x0000
 _0807EF80 0x001c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0000
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_080152B4.inc b/data/scripts/gUnk_080152B4.inc
index ba07be80..034313cd 100644
--- a/data/scripts/gUnk_080152B4.inc
+++ b/data/scripts/gUnk_080152B4.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x01f8, 0x00b8
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_080152DC.inc b/data/scripts/gUnk_080152DC.inc
index 0e78d378..7875ca7a 100644
--- a/data/scripts/gUnk_080152DC.inc
+++ b/data/scripts/gUnk_080152DC.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x01f8, 0x0148
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015304.inc b/data/scripts/gUnk_08015304.inc
index 1094991f..c0125a09 100644
--- a/data/scripts/gUnk_08015304.inc
+++ b/data/scripts/gUnk_08015304.inc
@@ -9,6 +9,6 @@ _0807EB44 0x0006
 Wait 0x000a
 _0807EB44 0x0004
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015338.inc b/data/scripts/gUnk_08015338.inc
index 9865b028..2f546efa 100644
--- a/data/scripts/gUnk_08015338.inc
+++ b/data/scripts/gUnk_08015338.inc
@@ -7,5 +7,5 @@ _0807EDD4 0x01f8, 0x0148
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015360.inc b/data/scripts/gUnk_08015360.inc
index 6584a442..e686adc4 100644
--- a/data/scripts/gUnk_08015360.inc
+++ b/data/scripts/gUnk_08015360.inc
@@ -6,5 +6,5 @@ StopScript
 _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000001
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015384.inc b/data/scripts/gUnk_08015384.inc
index e57ad001..e33a0bbc 100644
--- a/data/scripts/gUnk_08015384.inc
+++ b/data/scripts/gUnk_08015384.inc
@@ -1,4 +1,4 @@
 SCRIPT_START gUnk_08015384
 _0807EF80 0x0015
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc
index ba244411..b54d6af8 100644
--- a/data/scripts/gUnk_08015390.inc
+++ b/data/scripts/gUnk_08015390.inc
@@ -4,7 +4,7 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 StopScript 
 _0807E930 0x001f
-Call 0x0806d945
+Call sub_0806D944
 WaitForSomething2 0x00000008
 _0807E930 0x0010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
@@ -13,12 +13,12 @@ _0807E930 0x0010
 @ End of parameters
 _0807EA94 
 _0807E930 0x0018
-Call 0x0806d8a1
+Call sub_0806D8A0
 _0807EE30 
 JumpIfNot 0xfffc
 _0807E930 0x001f
-StartPlayerScript 0x08015384
-Call 0x0806d9a5
+StartPlayerScript gUnk_08015384
+Call sub_0806D9A4
 _0807EF80 0x0008
 Wait 0x0078
 _0807E5F8 0x00000010
diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc
index 96de3275..8b455b9f 100644
--- a/data/scripts/gUnk_080153EC.inc
+++ b/data/scripts/gUnk_080153EC.inc
@@ -47,9 +47,8 @@ _0807EA94
 .short 0x000c
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc
index 4a450ef5..cad8956d 100644
--- a/data/scripts/gUnk_0801548E.inc
+++ b/data/scripts/gUnk_0801548E.inc
@@ -2,9 +2,8 @@ SCRIPT_START gUnk_0801548E
 _0807E5F8 0x00000800
 WaitForSomething2 0x00001000
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -19,9 +18,8 @@ _0807E5F8 0x00008000
 WaitForSomething2 0x00010000
 _0807E5F8 0x00048000
 WaitForSomething2 0x00010000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0001
 .short 0x0000
 @ End of parameters
diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc
index 33234b3a..035ab2e5 100644
--- a/data/scripts/gUnk_0801550C.inc
+++ b/data/scripts/gUnk_0801550C.inc
@@ -3,26 +3,23 @@ StartScript
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 _0807EB44 0x0000
-Call 0x0807f339
+Call sub_0807F338
 StopScript 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0000
 .short 0x0000
 @ End of parameters
 WaitForSomething2 0x00008000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0004
 .short 0x0000
 @ End of parameters
 _0807EDD4 0x0078, 0x00b8
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0000
 .short 0x0000
 @ End of parameters
@@ -30,9 +27,8 @@ _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EF80 0x000d
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0004
 .short 0x0000
 @ End of parameters
@@ -40,26 +36,23 @@ _0807EDD4 0x0078, 0x00c8
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xaf61
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806AF60
 .short 0x0000
 .short 0x0000
 @ End of parameters
 _0807EF80 0x0010
 Wait 0x0028
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
 Wait 0x000a
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xfb29
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807FB28
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -68,7 +61,7 @@ _0807EF80 0x0010
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807E930 0x000d
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807E5F8 0x00010000
 Wait 0x003c
 _0807EF80 0x0005
diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc
index 7e6aa67d..873a6fb5 100644
--- a/data/scripts/gUnk_08015618.inc
+++ b/data/scripts/gUnk_08015618.inc
@@ -2,23 +2,21 @@ SCRIPT_START gUnk_08015618
 StartScript 
 _0807EF80 0x0007
 SetEntityNonPlanarMovement 0x0040
-Call 0x08094b81
+Call sub_08094B80
 StopScript 
 WaitForSomething2 0x00000080
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xdded
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DDEC
 .short 0x0003
 .short 0x0000
 @ End of parameters
-Call 0x08094b0d
+Call sub_08094B0C
 _0807EDD4 0x0078, 0x0068
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF3C 0xff80, 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xde19
-.short 0x0805
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0805DE18
 .short 0x0003
 .short 0x0000
 @ End of parameters
@@ -26,7 +24,7 @@ Wait 0x003c
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0001
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc
index fb4991b6..e2ce398e 100644
--- a/data/scripts/gUnk_08015684.inc
+++ b/data/scripts/gUnk_08015684.inc
@@ -4,7 +4,7 @@ _0807EF80 0x0007
 _0807EF80 0x000b
 _0807EB44 0x0000
 _0807EF80 0x0017
-Call 0x0807f181
+Call sub_0807F180
 StopScript 
 WaitForSomething2 0x00000800
 _0807EB44 0x0002
@@ -22,16 +22,15 @@ Wait 0x0014
 _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
 _0807EF80 0x0018
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
 _0807EB44 0x0004
 _0807EF80 0x0014
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x545d
-.short 0x0809
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0809545C
 .short 0x5754
 .short 0x0801
 @ End of parameters
@@ -43,7 +42,7 @@ _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
-Call 0x08066ca5
+Call sub_08066CA4
 _0807EF80 0x0008
 Wait 0x0078
 _0807E5F8 0x00001000
diff --git a/data/scripts/gUnk_08015754.inc b/data/scripts/gUnk_08015754.inc
index 264d099f..8ec9bfa5 100644
--- a/data/scripts/gUnk_08015754.inc
+++ b/data/scripts/gUnk_08015754.inc
@@ -2,14 +2,14 @@ SCRIPT_START gUnk_08015754
 StartScript 
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0200
-Call 0x08094b81
+Call sub_08094B80
 StopScript 
 Wait 0x0078
 SoundReq 0x01c5
-Call 0x08094b6d
+Call sub_08094B6C
 _0807EDD4 0x0078, 0x00b8
 SoundReq 0x01c6
-Call 0x08094b81
+Call sub_08094B80
 _0807E5F8 0x00020000
 SetEntityNonPlanarMovement 0x0080
 WaitForSomething2 0x00040000
diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc
index bcc7ce8d..e0b5bc89 100644
--- a/data/scripts/gUnk_080157AC.inc
+++ b/data/scripts/gUnk_080157AC.inc
@@ -2,32 +2,32 @@ SCRIPT_START gUnk_080157AC
 CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 CheckPlayerInRegion 0x0250, 0x0230, 0x3040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-Call 0x0807f3f9
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0807F3F8
 Wait 0x003c
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-StartPlayerScript 0x080158f8
+StartPlayerScript gUnk_080158F8
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x02180248
 CameraTargetEntity 
-Call 0x0807f5c1
+Call sub_0807F5C0
 WaitForSomething2 0x00000010
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000020
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-StartPlayerScript 0x08015918
+StartPlayerScript gUnk_08015918
 WaitForSomething2 0x00000010
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
@@ -38,9 +38,9 @@ WaitForSomething2 0x00000002
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
-Call 0x08066f95
+Call sub_08066F94
 _0807E5F8 0x00000008
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -48,11 +48,11 @@ _0807EA94
 ComparePlayerAction 0x001c
 JumpIf 0xfff8
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x02080248
 CameraTargetEntity 
-StartPlayerScript 0x08015938
+StartPlayerScript gUnk_08015938
 WaitForSomething2 0x00000010
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x106a
@@ -70,8 +70,8 @@ _0807EA94
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
 SetLocalFlag 0x008b
-Call 0x08066fb9
-Call 0x0807df51
+Call sub_08066FB8
+Call sub_0807DF50
 _0807E878 
 _0807F0B4 0x0004
 CameraTargetPlayer 
diff --git a/data/scripts/gUnk_080158F8.inc b/data/scripts/gUnk_080158F8.inc
index c762fb27..8c1025b2 100644
--- a/data/scripts/gUnk_080158F8.inc
+++ b/data/scripts/gUnk_080158F8.inc
@@ -4,5 +4,5 @@ _0807EDD4 0x0218, 0x0238
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000010
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015918.inc b/data/scripts/gUnk_08015918.inc
index f59b3bf5..010c2646 100644
--- a/data/scripts/gUnk_08015918.inc
+++ b/data/scripts/gUnk_08015918.inc
@@ -4,5 +4,5 @@ _0807EDD4 0x0238, 0x0228
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000010
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015938.inc b/data/scripts/gUnk_08015938.inc
index 41b54823..e2045e39 100644
--- a/data/scripts/gUnk_08015938.inc
+++ b/data/scripts/gUnk_08015938.inc
@@ -4,5 +4,5 @@ _0807EDD4 0x0248, 0x0208
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000010
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc
index 9e00d5cd..3e1dd800 100644
--- a/data/scripts/gUnk_08015958.inc
+++ b/data/scripts/gUnk_08015958.inc
@@ -3,11 +3,11 @@ StartScript
 SetEntityNonPlanarMovement 0x0180
 _0807EF80 0x0008
 _0807EF80 0x000b
-Call 0x08066d05
+Call sub_08066D04
 StopScript 
 WaitForSomething2 0x00000001
 StartScript 
-Call 0x08066d15
+Call sub_08066D14
 MoveEntityToPlayer 
 StopScript 
 _0807EF80 0x0007
@@ -30,12 +30,12 @@ _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000001
-Call 0x0807f3c9
+Call sub_0807F3C8
 SoundReq 0x0096
 SetEntityNonPlanarMovement 0x0200
 _0807ECC4 0x0008
 _0807E930 0x0040
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EB44 0x0006
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -70,7 +70,7 @@ _0807EF80 0x000b
 _0807EB44 0x0000
 _0807EF80 0x0000
 WaitForSomething2 0x00000001
-Call 0x08066d4d
+Call sub_08066D4C
 _0807E5F8 0x00000002
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015A7C.inc b/data/scripts/gUnk_08015A7C.inc
index 9992b499..6345c5f5 100644
--- a/data/scripts/gUnk_08015A7C.inc
+++ b/data/scripts/gUnk_08015A7C.inc
@@ -5,6 +5,6 @@ _0807EC64 0x0010
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015AA0.inc b/data/scripts/gUnk_08015AA0.inc
index 631a369a..72a3a9ee 100644
--- a/data/scripts/gUnk_08015AA0.inc
+++ b/data/scripts/gUnk_08015AA0.inc
@@ -5,6 +5,6 @@ _0807EC94 0x0010
 _0807EB44 0x0002
 _0807EF80 0x0000
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015AC4.inc b/data/scripts/gUnk_08015AC4.inc
index ed28d651..754b2b65 100644
--- a/data/scripts/gUnk_08015AC4.inc
+++ b/data/scripts/gUnk_08015AC4.inc
@@ -15,7 +15,7 @@ _0807EF80 0x0000
 WaitForSomething2 0x00000008
 Wait 0x003c
 SoundReq 0x0072
-Call 0x08046079
+Call sub_08046078
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc
index a9cd4e7b..2f23520e 100644
--- a/data/scripts/gUnk_08015B34.inc
+++ b/data/scripts/gUnk_08015B34.inc
@@ -3,25 +3,24 @@ StopScript
 StartScript 
 CheckLocalFlag 0x008b
 JumpIf 0x0040
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf6b5
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F6B4
 .short 0x0318
 .short 0x0000
 @ End of parameters
 JumpIfNot 0xffe8
 StopScript 
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
+Call sub_0807F9A4
+Call sub_0807DF28
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x2506
 .short 0x0002
 @ End of parameters
 _0807EA94 
-StartPlayerScript 0x08015b84
+StartPlayerScript gUnk_08015B84
 WaitForSomething2 0x00000004
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffb8
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08015B84.inc b/data/scripts/gUnk_08015B84.inc
index 78063ce9..7893541f 100644
--- a/data/scripts/gUnk_08015B84.inc
+++ b/data/scripts/gUnk_08015B84.inc
@@ -5,6 +5,6 @@ _0807EC64 0x0010
 _0807EB44 0x0000
 _0807EF80 0x0000
 _0807E5F8 0x00000004
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_08015BA8.inc b/data/scripts/gUnk_08015BA8.inc
index 637c2636..7ee39edb 100644
--- a/data/scripts/gUnk_08015BA8.inc
+++ b/data/scripts/gUnk_08015BA8.inc
@@ -8,7 +8,7 @@ SetEntityNonPlanarMovement 0x0200
 StopScript 
 Wait 0x000f
 _0807E8E4_2 
-Call 0x0807f3f9
+Call sub_0807F3F8
 Wait 0x001e
 _0807EDD4 0x00b8, 0x0258
 Wait 0x001e
diff --git a/data/scripts/gUnk_08015BE8.inc b/data/scripts/gUnk_08015BE8.inc
index cb007668..b513bb6f 100644
--- a/data/scripts/gUnk_08015BE8.inc
+++ b/data/scripts/gUnk_08015BE8.inc
@@ -5,20 +5,20 @@ StopScript
 CheckPlayerInRegion 0x0160, 0x0020, 0x3040
 JumpIfNot 0xfff6
 _0807E864 
-Call 0x0807f9a5
-Call 0x0807df29
-Call 0x0807fbc5
-StartPlayerScript 0x08015c7c
+Call sub_0807F9A4
+Call sub_0807DF28
+Call sub_0807FBC4
+StartPlayerScript gUnk_08015C7C
 WaitForSomething2 0x00000100
 CameraTargetPlayer 
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
 SoundReq0x80100000 
-Call 0x08053be9
+Call sub_08053BE8
 StartScript 
 _0807E864 
-Call 0x0807fbc5
+Call sub_0807FBC4
 CameraTargetPlayer 
 _0807E778 0x0100
 DoFade4 
@@ -31,8 +31,8 @@ SoundReq2 0xffff
 _0807EB28 0x131f
 _0807EA94 
 SetLocalFlag 0x009c
-Call 0x0807fbcd
-Call 0x0807df51
+Call sub_0807FBCC
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc
index e7ccc037..e7faab73 100644
--- a/data/scripts/gUnk_08015C7C.inc
+++ b/data/scripts/gUnk_08015C7C.inc
@@ -6,27 +6,25 @@ _0807EF80 0x0001
 _0807EDD4 0x0168, 0x0058
 _0807EB44 0x0004
 _0807EF80 0x0000
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
 .short 0x03c5
 .short 0x0000
 @ End of parameters
-Call 0x0807f305
+Call sub_0807F304
 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
 .short 0x1318
 .short 0x000c
 @ End of parameters
 _0807EA94 
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf239
-.short 0x0807
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F238
 .short 0x03c9
 .short 0x0000
 @ End of parameters
-Call 0x0807f305
+Call sub_0807F304
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807E5F8 0x00000100
-Call 0x080791bd
+Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08015E58.inc b/data/scripts/gUnk_08015E58.inc
index 0a2f0969..99d6da07 100644
--- a/data/scripts/gUnk_08015E58.inc
+++ b/data/scripts/gUnk_08015E58.inc
@@ -6,24 +6,24 @@ _0807EF80 0x0000
 _0807EF80 0x001d
 StopScript 
 WaitForSomething2 0x00000010
-Call 0x08066c95
+Call sub_08066C94
 Wait 0x00e9
 _0807EF80 0x0007
 _0807EF80 0x001e
 Wait 0x0014
 _0807EB44 0x0000
 _0807EF80 0x001c
-Call 0x0807f2d5
+Call sub_0807F2D4
 _0807EF80 0x0000
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
-Call 0x08066ca5
+Call sub_08066CA4
 _0807EF80 0x0008
 Wait 0x00bc
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000010
 SetEntityPositionRelative 0x00680088
-Call 0x08066c95
+Call sub_08066C94
 Wait 0x00e8
 _0807EF80 0x0007
 _0807EF80 0x001e
diff --git a/data/scripts/gUnk_08015FA4.inc b/data/scripts/gUnk_08015FA4.inc
index 249baa2e..83e92568 100644
--- a/data/scripts/gUnk_08015FA4.inc
+++ b/data/scripts/gUnk_08015FA4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08015FA4
 StartScript 
 _0807EF80 0x000a
-Call 0x08066e39
+Call sub_08066E38
 StopScript 
 WaitForSomething 0x00000400
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc
index 51545509..533149ba 100644
--- a/data/scripts/gUnk_08015FC0.inc
+++ b/data/scripts/gUnk_08015FC0.inc
@@ -1,12 +1,11 @@
 SCRIPT_START gUnk_08015FC0
 StartScript 
-Call 0x0806db85
+Call sub_0806DB84
 CheckKinstoneFused 0x0009
 JumpIf 0x005a
 _0807EA88 0x0009
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xda05
-.short 0x0806
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0806DA04
 .short 0x0007
 .short 0x0000
 @ End of parameters
@@ -17,7 +16,7 @@ _0807E9F0
 _0807E864 
 CheckKinstoneFused 0x0009
 JumpIf 0x000e
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 Jump 0xffe8
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08016004.inc b/data/scripts/gUnk_08016004.inc
index 5acc71d6..0136d07a 100644
--- a/data/scripts/gUnk_08016004.inc
+++ b/data/scripts/gUnk_08016004.inc
@@ -5,7 +5,7 @@ _0807F0C8 0x0000, 0x0000
 SoundReq 0x0072
 _0807EB28 0x0b1f
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc
index 3133be5d..2a83a1ac 100644
--- a/data/scripts/gUnk_080160A8.inc
+++ b/data/scripts/gUnk_080160A8.inc
@@ -45,7 +45,7 @@ _0807E878
 _0807EB44 0x0004
 Jump 0xff76
 StartScript 
-Call 0x080787b5
+Call sub_080787B4
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -72,7 +72,7 @@ TextboxNoOverlapFollow 0x2d06
 _0807E878 
 Jump 0xffb8
 StartScript 
-Call 0x080787b5
+Call sub_080787B4
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -101,104 +101,96 @@ TextboxNoOverlap 0x2d06
 _0807E878 
 Jump 0xffb4
 StartScript 
-Call 0x0807f349
+Call sub_0807F348
 _0807EF80 0x000a
 _0807EB44 0x0004
 _0807EF80 0x0000
 StopScript 
-Call 0x08068c29
+Call sub_08068C28
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-Call 0x0807df29
+Call sub_0807DF28
 _0807EB74 
-Call 0x08068ca1
+Call sub_08068CA0
 JumpIf 0x0122
-Call 0x08068cfd
+Call sub_08068CFC
 JumpIfNot 0x010c
-Call 0x08068db9
+Call sub_08068DB8
 _0807EA94 
-Call 0x08068dd1
+Call sub_08068DD0
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x010a
-StartPlayerScript 0x0801635c
+StartPlayerScript gUnk_0801635C
 WaitForSomething2 0x00000001
 _0807EB74 
-Call 0x08068c8d
+Call sub_08068C8C
 JumpIf 0x000e
-Call 0x08068de9
+Call sub_08068DE8
 _0807EA94 
 Wait 0x001e
-Call 0x08068e01
+Call sub_08068E00
 _0807EA94 
 _0807EF80 0x0001
-Call 0x0807f2d5
-Call 0x08068e91
-Call 0x08068c8d
+Call sub_0807F2D4
+Call sub_08068E90
+Call sub_08068C8C
 JumpIf 0x009a
-Call 0x08068f01
-Call 0x08068f15
-Call 0x08068bb5
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0xf245
-.short 0x0807
+Call sub_08068F00
+Call sub_08068F14
+Call sub_08068BB4
+.short 0x140c @ CallWithArg with 2 parameters
+.word sub_0807F244
 .short 0x0001
 .short 0x0001
 @ End of parameters
-Call 0x08068b85
-Call 0x0807f2a9
-Call 0x08068bd1
+Call sub_08068B84
+Call sub_0807F2A8
+Call sub_08068BD0
 Wait 0x001e
-Call 0x08068e19
+Call sub_08068E18
 _0807EA94 
-Call 0x08068eb5
-Call 0x0807df51
+Call sub_08068EB4
+Call sub_0807DF50
 _0807E878 
 StopScript 
 StartScript 
-Call 0x08068ec5
+Call sub_08068EC4
 JumpIf 0x001e
 CheckEntityInteractType 
 JumpIf 0x0006
 Jump 0xffea
 StopScript 
 _0807E864 
-Call 0x08068e79
+Call sub_08068E78
 _0807EA94 
 _0807E878 
 Jump 0xffd8
 StopScript 
 _0807E888 
-Call 0x0807f595
-Call 0x0807df29
+Call sub_0807F594
+Call sub_0807DF28
 _0807E864 
 SoundReq0x80100000 
 SoundReq 0x00cd
 Wait 0x003c
 SoundReq2 0x005e
-Call 0x08068f3d
-Call 0x08068e31
+Call sub_08068F3C
+Call sub_08068E30
 _0807EA94 
-Call 0x08068c6d
+Call sub_08068C6C
 WaitPlayerAction8 
 _0807EA94 
 Jump 0x0016
-Call 0x08068e61
+Call sub_08068E60
 _0807EA94 
 Jump 0x000a
-Call 0x08068e49
+Call sub_08068E48
 _0807EA94 
-Call 0x0807df51
+Call sub_0807DF50
 _0807E878 
 _0807EB44 0x0004
 _0807EF80 0x0000
 Jump 0xfea6
 .short 0x0000
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0078, 0x0050
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call 0x080791bd
-SCRIPT_END
diff --git a/data/scripts/gUnk_0801635C.inc b/data/scripts/gUnk_0801635C.inc
new file mode 100644
index 00000000..1698dde2
--- /dev/null
+++ b/data/scripts/gUnk_0801635C.inc
@@ -0,0 +1,8 @@
+SCRIPT_START gUnk_0801635C
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0078, 0x0050
+_0807EB44 0x0000
+_0807EF80 0x0000
+_0807E5F8 0x00000001
+Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc
index 7de920f0..7802a910 100644
--- a/data/scripts/gUnk_0801637C.inc
+++ b/data/scripts/gUnk_0801637C.inc
@@ -1,69 +1,9 @@
 SCRIPT_START gUnk_0801637C
+@ this seems to be assembly for
+@ push       { lr }
+@ bl         CreateDust
+@ pop        { pc }
 .short 0xb500
 .short 0xf08c
 .short 0xfb1d
 .short 0xbd00
-StartScript 
-StopScript 
-Jump 0xfffa
-JumpIf 0xfff6
-JumpIfNot 0xfff2
-.short 0x0c06 @ _0807E078 with 2 parameters
-.short 0xffee
-.short 0xffec
-@ End of parameters
-JumpAbsolute 0x08016384
-JumpAbsoluteIf 0x08016384
-JumpAbsoluteIfNot 0x08016384
-_0807E0E0 0x08016384, 0x08016384
-Call 0x08016384
-.short 0x140c @ CallWithArg with 4 parameters
-.short 0x6384
-.short 0x0801
-.short 0x5678
-.short 0x1234
-@ End of parameters
-LoadRoomEntityList 0x08016384
-TestBit 0x00000001
-CheckInventory1 0x0001
-CheckInventory2 0x0001
-.short 0x0411 @ HasRoomItemForSale with 0 parameters
-CheckLocalFlag 0x0067
-CheckLocalFlagByOffset 0x0100, 0x006b
-CheckGlobalFlag 0x0013
-CheckRoomFlag 0x0000
-CheckPlayerInRegion 0x0000, 0x0000, 0x0000
-CheckPlayerInRegion2 0x0000
-CheckEntityInteractType 
-_0807E30C 
-HasRupees 0x00c8
-_0807E3E8 
-CheckKinstoneFused 0x0001
-BuyItem 0x006c, 0x0000
-_0807E48C 0x0020
-_0807E4CC 0x00000000
-_0807E4EC 0x00000000
-_0807E514 0x00000000
-CheckPlayerFlags 0x00000080
-_0807E564 
-EntityHasHeight 
-ComparePlayerAction 0x0001
-ComparePlayerAnimationState 0x0004
-_0807E5F8 0x00000001
-_0807E610 0x00000002
-SetLocalFlag 0x0067
-SetLocalFlagByOffset 0x0100, 0x0001
-ClearLocalFlag 0x0067
-SetGlobalFlag 0x0013
-ClearGlobalFlag 0x0013
-SetRoomFlag 0x0000
-ClearRoomFlag 0x0000
-Wait 0x001e
-WaitForSomething 0x00000001
-WaitForSomething2 0x00000002
-WaitPlayerAction8 
-WaitForPlayerAction0x17 
-WaitFor_1 
-WaitFor_2 
-_0807E778 0x0004
-_0807E788 0x0000ffff
diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc
new file mode 100644
index 00000000..eeb26942
--- /dev/null
+++ b/data/scripts/gUnk_08016384.inc
@@ -0,0 +1,64 @@
+SCRIPT_START gUnk_08016384
+StartScript 
+StopScript 
+Jump 0xfffa
+JumpIf 0xfff6
+JumpIfNot 0xfff2
+.short 0x0c06 @ _0807E078 with 2 parameters
+.short 0xffee
+.short 0xffec
+@ End of parameters
+JumpAbsolute gUnk_08016384
+JumpAbsoluteIf gUnk_08016384
+JumpAbsoluteIfNot gUnk_08016384
+_0807E0E0 gUnk_08016384, gUnk_08016384
+Call 0x08016384
+.short 0x140c @ CallWithArg with 2 parameters
+.word 0x08016384
+.short 0x5678
+.short 0x1234
+@ End of parameters
+LoadRoomEntityList 0x08016384
+TestBit 0x00000001
+CheckInventory1 0x0001
+CheckInventory2 0x0001
+.short 0x0411 @ HasRoomItemForSale with 0 parameters
+CheckLocalFlag 0x0067
+CheckLocalFlagByOffset 0x0100, 0x006b
+CheckGlobalFlag 0x0013
+CheckRoomFlag 0x0000
+CheckPlayerInRegion 0x0000, 0x0000, 0x0000
+CheckPlayerInRegion2 0x0000
+CheckEntityInteractType 
+_0807E30C 
+HasRupees 0x00c8
+_0807E3E8 
+CheckKinstoneFused 0x0001
+BuyItem 0x006c, 0x0000
+_0807E48C 0x0020
+_0807E4CC 0x00000000
+_0807E4EC 0x00000000
+_0807E514 0x00000000
+CheckPlayerFlags 0x00000080
+_0807E564 
+EntityHasHeight 
+ComparePlayerAction 0x0001
+ComparePlayerAnimationState 0x0004
+_0807E5F8 0x00000001
+_0807E610 0x00000002
+SetLocalFlag 0x0067
+SetLocalFlagByOffset 0x0100, 0x0001
+ClearLocalFlag 0x0067
+SetGlobalFlag 0x0013
+ClearGlobalFlag 0x0013
+SetRoomFlag 0x0000
+ClearRoomFlag 0x0000
+Wait 0x001e
+WaitForSomething 0x00000001
+WaitForSomething2 0x00000002
+WaitPlayerAction8 
+WaitForPlayerAction0x17 
+WaitFor_1 
+WaitFor_2 
+_0807E778 0x0004
+_0807E788 0x0000ffff
diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc
index 64bdb067..355c4d59 100644
--- a/data/scripts/gUnk_08016482.inc
+++ b/data/scripts/gUnk_08016482.inc
@@ -12,7 +12,7 @@ _0807E864
 _0807E878 
 _0807E888 
 SetPlayerAction 0x00005408
-StartPlayerScript 0x08016384
+StartPlayerScript gUnk_08016384
 _0807E8D4 0x03a0
 _0807E8E4_0 
 _0807E8E4_1 
diff --git a/data/scripts/gUnk_080165A4.inc b/data/scripts/gUnk_080165A4.inc
index fd0d7ded..ed0ad838 100644
--- a/data/scripts/gUnk_080165A4.inc
+++ b/data/scripts/gUnk_080165A4.inc
@@ -11,244 +11,6 @@ Wait 0x001e
 CheckPlayerInRegion2 0x2020
 JumpIfNot 0xfff6
 _0807EF80 0x0003
-Call 0x0801637d
+Call 0x0801637D
 Jump 0xffe8
 .short 0x0000
-Wait 0x001e
-CheckPlayerInRegion2 0x2020
-JumpAbsoluteIfNot 0x080165d8
-_0807EF80 0x0003
-Call 0x0801637d
-JumpAbsolute 0x080165d8
-.short 0x0000
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-TextboxNoOverlapFollow 0x0601
-Jump 0xfff4
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-TextboxNoOverlapFollow 0x0602
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-_0807EB28 0x0603
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
-SetEntityNonPlanarMovement 0x0100
-_0807ECF4 0x0030
-Wait 0x0008
-_0807ECC4 0x0030
-Wait 0x0008
-_0807EC94 0x0030
-Wait 0x0008
-_0807EC64 0x0030
-Wait 0x0008
-Jump 0xffde
-_0807ED24 0x0055, 0x0039, 0x00b4
-Wait 0x0008
-_0807ED24 0x0075, 0x0076, 0x003c
-Wait 0x0008
-_0807ED24 0x0105, 0x006c, 0x0078
-Wait 0x0008
-_0807ED24 0x018e, 0x007a, 0x0078
-Wait 0x0008
-_0807ED24 0x0173, 0x0023, 0x003c
-Wait 0x0008
-_0807ED24 0x00d8, 0x003f, 0x003c
-Wait 0x0008
-Jump 0xffb6
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0055, 0x0039
-Wait 0x0008
-_0807EDD4 0x0075, 0x0076
-Wait 0x0008
-_0807EDD4 0x0105, 0x006c
-Wait 0x0008
-_0807EDD4 0x018e, 0x007a
-Wait 0x0008
-_0807EDD4 0x0173, 0x0023
-Wait 0x0008
-_0807EDD4 0x00d8, 0x003f
-Wait 0x0008
-Jump 0xffc2
-SetEntityNonPlanarMovement 0x0100
-_0807EC94 0x0030
-_0807E5F8 0x00000002
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000001
-_0807E610 0x00000001
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-WaitForSomething 0x00000001
-_0807E610 0x00000001
-_0807ECF4 0x0030
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-Wait 0x001e
-_0807E5F8 0x00000006
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Wait 0x003c
-Jump 0xff6a
-SetEntityNonPlanarMovement 0x0100
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EC94 0x0030
-_0807E5F8 0x00000004
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807ECF4 0x0030
-_0807E5F8 0x00000001
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Jump 0xff5a
-SetEntityNonPlanarMovement 0x0100
-WaitForSomething 0x00000004
-_0807E610 0x00000004
-_0807EC94 0x0030
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-Wait 0x001e
-_0807E5F8 0x00000003
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Wait 0x003c
-_0807ECF4 0x0030
-_0807E5F8 0x00000002
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000004
-_0807E610 0x00000004
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Jump 0xff6a
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x000f
-_0807E878 
-Jump 0xfff4
-StartScript 
-Call 0x08064ea5
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call 0x08064f29
-_0807EA94 
-JumpIfNot 0x0008
-_0807F034 0x003d
-WaitPlayerAction8 
-_0807E878 
-SetGlobalFlag 0x005c
-Jump 0xffdc
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x0018
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x0018
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
diff --git a/data/scripts/gUnk_080165D8.inc b/data/scripts/gUnk_080165D8.inc
new file mode 100644
index 00000000..3834a417
--- /dev/null
+++ b/data/scripts/gUnk_080165D8.inc
@@ -0,0 +1,239 @@
+SCRIPT_START gUnk_080165D8
+Wait 0x001e
+CheckPlayerInRegion2 0x2020
+JumpAbsoluteIfNot gUnk_080165D8
+_0807EF80 0x0003
+Call 0x0801637D
+JumpAbsolute gUnk_080165D8
+.short 0x0000
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+TextboxNoOverlapFollow 0x0601
+Jump 0xfff4
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+TextboxNoOverlapFollow 0x0602
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+_0807EB28 0x0603
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffee
+.short 0x0000
+SetEntityNonPlanarMovement 0x0100
+_0807ECF4 0x0030
+Wait 0x0008
+_0807ECC4 0x0030
+Wait 0x0008
+_0807EC94 0x0030
+Wait 0x0008
+_0807EC64 0x0030
+Wait 0x0008
+Jump 0xffde
+_0807ED24 0x0055, 0x0039, 0x00b4
+Wait 0x0008
+_0807ED24 0x0075, 0x0076, 0x003c
+Wait 0x0008
+_0807ED24 0x0105, 0x006c, 0x0078
+Wait 0x0008
+_0807ED24 0x018e, 0x007a, 0x0078
+Wait 0x0008
+_0807ED24 0x0173, 0x0023, 0x003c
+Wait 0x0008
+_0807ED24 0x00d8, 0x003f, 0x003c
+Wait 0x0008
+Jump 0xffb6
+SetEntityNonPlanarMovement 0x0100
+_0807EDD4 0x0055, 0x0039
+Wait 0x0008
+_0807EDD4 0x0075, 0x0076
+Wait 0x0008
+_0807EDD4 0x0105, 0x006c
+Wait 0x0008
+_0807EDD4 0x018e, 0x007a
+Wait 0x0008
+_0807EDD4 0x0173, 0x0023
+Wait 0x0008
+_0807EDD4 0x00d8, 0x003f
+Wait 0x0008
+Jump 0xffc2
+SetEntityNonPlanarMovement 0x0100
+_0807EC94 0x0030
+_0807E5F8 0x00000002
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000001
+_0807E610 0x00000001
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+WaitForSomething 0x00000001
+_0807E610 0x00000001
+_0807ECF4 0x0030
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+Wait 0x001e
+_0807E5F8 0x00000006
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Wait 0x003c
+Jump 0xff6a
+SetEntityNonPlanarMovement 0x0100
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EC94 0x0030
+_0807E5F8 0x00000004
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807ECF4 0x0030
+_0807E5F8 0x00000001
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000002
+_0807E610 0x00000002
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Jump 0xff5a
+SetEntityNonPlanarMovement 0x0100
+WaitForSomething 0x00000004
+_0807E610 0x00000004
+_0807EC94 0x0030
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+Wait 0x001e
+_0807E5F8 0x00000003
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Wait 0x003c
+_0807ECF4 0x0030
+_0807E5F8 0x00000002
+Wait 0x000f
+_0807EF80 0x0000
+_0807EB44 0x0004
+WaitForSomething 0x00000004
+_0807E610 0x00000004
+_0807EF80 0x0003
+Wait 0x0002
+_0807EB44 0x0006
+Wait 0x0002
+_0807EB44 0x0000
+Wait 0x0002
+_0807EB44 0x0002
+Wait 0x0002
+_0807EB44 0x0004
+Jump 0xff6a
+StartScript 
+_0807E9D4 
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x000f
+_0807E878 
+Jump 0xfff4
+StartScript 
+Call sub_08064EA4
+_0807EB44 0x0004
+_0807EF80 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E30C 
+JumpIfNot 0xfffc
+_0807E864 
+_0807EB74 
+Call sub_08064F28
+_0807EA94 
+JumpIfNot 0x0008
+_0807F034 0x003d
+WaitPlayerAction8 
+_0807E878 
+SetGlobalFlag 0x005c
+Jump 0xffdc
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x0018
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
+StartScript 
+_0807E9D4 
+_0807EB44 0x0000
+_0807EF80 0x000a
+_0807E930 0x0000
+StopScript 
+_0807E944 
+_0807E864 
+Wait 0x0018
+TextboxNoOverlapFollow 0x0a01
+_0807EA94 
+Wait 0x000f
+_0807E878 
+Jump 0xffea
+.short 0x0000
diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py
index 3d4076a5..d8cbbf45 100644
--- a/tools/script_disassembler/incbin_parser.py
+++ b/tools/script_disassembler/incbin_parser.py
@@ -12,7 +12,10 @@ SCRIPTS_END=0x08016984
 
 # Create labels for these additional script instructions
 # Currently done by splitting the script at that point
-LABEL_BREAKS=[ 0x0800B41C, 0x08012F0C, 0x080142B0, 0x08014A80]
+LABEL_BREAKS=[0x0800A088, 0x0800ACE0, 0x0800AD54, 0x0800B41C, 0x0800B7C4, 0x0800C8C8, 0x0800D190, 0x800D3EC, 0x0800E9F4, 0x0800FD80, 0x08012AC8, 0x08012F0C, 0x080130E4, 0x08013B70, 0x080142B0, 0x080147DC, 0x08014A80, 0x08014B10,0x0801635C,  0x08016384, 0x080165D8]
+
+# Generate a version of the script that is annotated with the byte offset to the beginning of the script
+GENERATE_REF=False
 
 def read_baserom():
     # read baserom data
@@ -61,25 +64,31 @@ def main():
 
         scripts += f'	.include "data/scripts/{label}.inc"\n'
         stdout = sys.stdout
-        with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
+
+        with open(f'{TMC_FOLDER}/data/scripts/{label}.ref' if GENERATE_REF else f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
             sys.stdout = out
             print(f'SCRIPT_START {label}')
-            res = disassemble_script(data)
+            if GENERATE_REF:
+                res = disassemble_script(data, True)
+            else:
+                res = disassemble_script(data)
             if res != 0:
                 # Script ended in the middle, need to create a new file
                 script_end = script_start + res
         sys.stdout = stdout
 
         script_start = script_end 
-    print('Writing scripts.s file...')
-    with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out:
-        out.write(scripts)
-    print('Generating asm macros...')
-    stdout = sys.stdout
-    with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out:
-        sys.stdout = out
-        generate_macros()
-    sys.stdout = stdout
+
+    if not GENERATE_REF:
+        print('Writing scripts.s file...')
+        with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out:
+            out.write(scripts)
+        print('Generating asm macros...')
+        stdout = sys.stdout
+        with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out:
+            sys.stdout = out
+            generate_macros()
+        sys.stdout = stdout
     print('\033[1;92mDone\033[0m\n')
 
 if __name__ == '__main__':
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 44ca0a74..11f9edf4 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -28,14 +28,29 @@ def barray_to_u32_hex(barray):
     integers = struct.unpack('I'*count, barray)
     return [u32_to_hex(x) for x in integers]
 
+
+# Functions that have already been renamed
+POINTER_MAP = {
+    'sub_08095458': 'nullsub_527',
+    'sub_0805EBCC': 'DeleteAllEnemies',
+    'sub_0806C23C': 'Simon_CreateChest',
+    'sub_0801637C': '0x0801637D', # TODO disassembly assembly code between scripts
+    'sub_08016383': '0x08016384', # TODO points to the end of the previous function?
+    'sub_0806C598': 'FUN_0806c598',
+    'sub_080A2138': 'Windcrest_Unlock',
+    'sub_080A29BC': 'CreateDust'
+}
 # tries to directly reference the function this is pointing to
 def get_pointer(barray):
     integers = struct.unpack('I', barray)
-    return 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
+    pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
+    if pointer in POINTER_MAP:
+        return POINTER_MAP[pointer]
+    return pointer
 
 def get_data_pointer(barray):
     integers = struct.unpack('I', barray)
-    return 'gUnk_' + (struct.pack('>I', integers[0]-1).hex()).upper()
+    return 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper()
 
 commands = [
     {'fun': 'ScriptCommandNop', 'params': 'v'}, # TODO one version with length 33???
@@ -51,7 +66,7 @@ commands = [
     {'fun': 'ScriptCommand_0807E0E0', 'params': 'dd'},
     {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
     {'fun': 'ScriptCommand_CallWithArg', 'params': 'pv'},
-    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
+    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'w'}, # TODO return to d and create labels for them
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
     {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
@@ -259,8 +274,9 @@ def build_script_command(name: str):
 def print_rest_bytes(ctx):
      print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
 
-def ExecuteScriptCommandSet(ctx: Context):
-    # print(f'@{ctx.ptr}') print offsets to debug when manually inserting labels
+def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
+    if add_annotations:
+        print(f'@{ctx.ptr}') # print offsets to debug when manually inserting labels
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
     if cmd == 0:
         # this does not need to be the end of the script
@@ -308,27 +324,10 @@ def ExecuteScriptCommandSet(ctx: Context):
     if not command['params'] in parameters:
         raise Exception('Parameter configuration ' + command['params'] + ' not defined')
 
-    # TODO REMOVE fix pointers
-    if command['params'] == 'p':
-        command['params'] = 'w'
-    elif command['params'] == 'd':
-        command['params'] = 'w'
-    elif command['params'] == 'pv':
-        command['params'] = 'v'
-    elif command['params'] == 'dd':
-        command['params'] = 'ww'
 
     params = parameters[command['params']]
 
 
-
-
-    # TODO REMOVE
-    if commandSize == 34:
-        print('@TODO FIX THIS COMMAND!')
-        commandSize = 13
-
-
     if params['length'] == -1: # variable parameter length
         print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with {commandSize-1} parameters')
         if commandSize > 1:
@@ -337,12 +336,12 @@ def ExecuteScriptCommandSet(ctx: Context):
         ctx.ptr += commandSize*2
         return 1
     elif params['length'] == -2: # point and var
-        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with parameters:')
+        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with {commandSize-3} parameters')
 
-        print('.word'+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        print('.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
         if commandSize > 3:
             print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])]))
-            print(f'% End of {commandSize-3} parameters')
+            print(f'@ End of parameters')
         ctx.ptr += commandSize*2
         return 1
 
@@ -367,7 +366,7 @@ def ExecuteScriptCommandSet(ctx: Context):
 # JumpAbsoluteIf 0x08016384
 # JumpAbsoluteIfNot 0x08016384
 
-def disassemble_script(input_bytes):
+def disassemble_script(input_bytes, add_annotations=False):
 
     ctx = Context(0, input_bytes)
 
@@ -376,7 +375,7 @@ def disassemble_script(input_bytes):
     while True:
         if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id)
             break
-        res = ExecuteScriptCommandSet(ctx)
+        res = ExecuteScriptCommandSet(ctx, add_annotations)
         if res == 0:
             break
         elif res == 2:

From 7730ea20976178708762b7c882d0bae303c550ca Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 01:59:56 +0100
Subject: [PATCH 18/46] Add labels for room entity lists referenced in scripts

---
 data/data_080D5360.s                          | 55 +++++++++++++++----
 data/scripts/gUnk_08008B5C.inc                |  2 +-
 data/scripts/gUnk_0800939A.inc                |  2 +-
 data/scripts/gUnk_08009464.inc                |  2 +-
 data/scripts/gUnk_080095F2.inc                |  2 +-
 data/scripts/gUnk_0800B1C0.inc                |  2 +-
 data/scripts/gUnk_0800D414.inc                |  2 +-
 data/scripts/gUnk_0800D874.inc                |  2 +-
 data/scripts/gUnk_0800EFC0.inc                |  2 +-
 data/scripts/gUnk_08010BB4.inc                |  2 +-
 data/scripts/gUnk_08010E5A.inc                |  2 +-
 data/scripts/gUnk_08011128.inc                |  2 +-
 data/scripts/gUnk_08011C7C.inc                |  2 +-
 data/scripts/gUnk_08012430.inc                |  4 +-
 data/scripts/gUnk_0801319A.inc                |  2 +-
 data/scripts/gUnk_08013AA6.inc                |  2 +-
 data/scripts/gUnk_08014E14.inc                |  4 +-
 data/scripts/gUnk_08015CD4.inc                |  2 +-
 data/scripts/gUnk_08016384.inc                |  2 +-
 .../script_disassembler.py                    |  2 +-
 20 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/data/data_080D5360.s b/data/data_080D5360.s
index 95021411..eca8e4f9 100644
--- a/data/data_080D5360.s
+++ b/data/data_080D5360.s
@@ -386,7 +386,10 @@ gUnk_080D6714:: @ 080D6714
 	.incbin "baserom.gba", 0x0D6714, 0x0000020
 
 gUnk_080D6734:: @ 080D6734
-	.incbin "baserom.gba", 0x0D6734, 0x0000080
+	.incbin "baserom.gba", 0x0D6734, 0x0000050
+
+gUnk_080D6784:: @ 080D6784
+	.incbin "baserom.gba", 0x0D6784, 0x0000030
 
 gUnk_080D67B4:: @ 080D67B4
 	.incbin "baserom.gba", 0x0D67B4, 0x00000F0
@@ -1445,7 +1448,10 @@ gUnk_080DA210:: @ 080DA210
 	.incbin "baserom.gba", 0x0DA210, 0x0000020
 
 gUnk_080DA230:: @ 080DA230
-	.incbin "baserom.gba", 0x0DA230, 0x0000070
+	.incbin "baserom.gba", 0x0DA230, 0x0000030
+
+gUnk_080DA260:: @ 080DA260
+	.incbin "baserom.gba", 0x0DA260, 0x0000040
 
 gUnk_080DA2A0:: @ 080DA2A0
 	.incbin "baserom.gba", 0x0DA2A0, 0x0000010
@@ -2630,7 +2636,10 @@ gUnk_080DD6CC:: @ 080DD6CC
 	.incbin "baserom.gba", 0x0DD6CC, 0x0000040
 
 gUnk_080DD70C:: @ 080DD70C
-	.incbin "baserom.gba", 0x0DD70C, 0x0000044
+	.incbin "baserom.gba", 0x0DD70C, 0x0000024
+
+gUnk_080DD730:: @ 080DD730
+	.incbin "baserom.gba", 0x0DD730, 0x0000020
 
 gUnk_080DD750:: @ 080DD750
 	.incbin "baserom.gba", 0x0DD750, 0x0000040
@@ -4448,7 +4457,10 @@ gUnk_080E3790:: @ 080E3790
 	.incbin "baserom.gba", 0x0E3790, 0x0000020
 
 gUnk_080E37B0:: @ 080E37B0
-	.incbin "baserom.gba", 0x0E37B0, 0x00000A0
+	.incbin "baserom.gba", 0x0E37B0, 0x0000080
+
+gUnk_080E3830:: @ 080E3830
+	.incbin "baserom.gba", 0x0E3830, 0x0000020
 
 gUnk_080E3850:: @ 080E3850
 	.incbin "baserom.gba", 0x0E3850, 0x0000020
@@ -7019,7 +7031,10 @@ gUnk_080EE80C:: @ 080EE80C
 	.incbin "baserom.gba", 0x0EE80C, 0x0000080
 
 gUnk_080EE88C:: @ 080EE88C
-	.incbin "baserom.gba", 0x0EE88C, 0x0000070
+	.incbin "baserom.gba", 0x0EE88C, 0x0000020
+
+gUnk_080EE8AC:: @ 080EE8AC
+	.incbin "baserom.gba", 0x0EE8AC, 0x0000050
 
 gUnk_080EE8FC:: @ 080EE8FC
 	.incbin "baserom.gba", 0x0EE8FC, 0x0000020
@@ -7592,13 +7607,19 @@ gUnk_080F0630:: @ 080F0630
 	.incbin "baserom.gba", 0x0F0630, 0x0000020
 
 gUnk_080F0650:: @ 080F0650
-	.incbin "baserom.gba", 0x0F0650, 0x0000090
+	.incbin "baserom.gba", 0x0F0650, 0x0000060
+
+gUnk_080F06B0:: @ 080F06B0
+	.incbin "baserom.gba", 0x0F06B0, 0x0000030
 
 gUnk_080F06E0:: @ 080F06E0
 	.incbin "baserom.gba", 0x0F06E0, 0x0000025
 
 gUnk_080F0705:: @ 080F0705
-	.incbin "baserom.gba", 0x0F0705, 0x00000FB
+	.incbin "baserom.gba", 0x0F0705, 0x000006B
+
+gUnk_080F0770:: @ 080F0770
+	.incbin "baserom.gba", 0x0F0770, 0x0000090
 
 gUnk_080F0800:: @ 080F0800
 	.incbin "baserom.gba", 0x0F0800, 0x0000006
@@ -8982,7 +9003,10 @@ gEntityList0_MinishWoods_0:: @ 080F4D00
 	entity_list_end
 
 gUnk_080F4D50:: @ 080F4D50
-	.incbin "baserom.gba", 0x0F4D50, 0x0000060
+	.incbin "baserom.gba", 0x0F4D50, 0x0000020
+
+gUnk_080F4D70:: @080F4D70
+	.incbin "baserom.gba", 0x0F4D70, 0x0000040
 
 gUnk_080F4DB0:: @ 080F4DB0
 	.incbin "baserom.gba", 0x0F4DB0, 0x0000020
@@ -9066,7 +9090,10 @@ gUnk_080F5194:: @ 080F5194
 	.incbin "baserom.gba", 0x0F5194, 0x000001E
 
 gUnk_080F51B2:: @ 080F51B2
-	.incbin "baserom.gba", 0x0F51B2, 0x000003E
+	.incbin "baserom.gba", 0x0F51B2, 0x000001E
+
+gUnk_080F51D0:: @ 080F51D0
+	.incbin "baserom.gba", 0x0F51D0, 0x0000020
 
 gUnk_080F51F0:: @ 080F51F0
 	.incbin "baserom.gba", 0x0F51F0, 0x0000030
@@ -9178,7 +9205,10 @@ gUnk_080F5630:: @ 080F5630
 	.incbin "baserom.gba", 0x0F5630, 0x0000030
 
 gUnk_080F5660:: @ 080F5660
-	.incbin "baserom.gba", 0x0F5660, 0x0000050
+	.incbin "baserom.gba", 0x0F5660, 0x0000020
+
+gUnk_080F5680:: @ 080F5680
+	.incbin "baserom.gba", 0x0F5680, 0x0000030
 
 gUnk_080F56B0:: @ 080F56B0
 	.incbin "baserom.gba", 0x0F56B0, 0x0000050
@@ -9835,7 +9865,10 @@ gUnk_080F7C00:: @ 080F7C00
 	.incbin "baserom.gba", 0x0F7C00, 0x0000080
 
 gUnk_080F7C80:: @ 080F7C80
-	.incbin "baserom.gba", 0x0F7C80, 0x0000050
+	.incbin "baserom.gba", 0x0F7C80, 0x0000030
+
+gUnk_080F7CB0:: @ 080F7CB0
+	.incbin "baserom.gba", 0x0F7CB0, 0x0000020
 
 gUnk_080F7CD0:: @ 080F7CD0
 	.incbin "baserom.gba", 0x0F7CD0, 0x0000020
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc
index 256d6033..e03faf0b 100644
--- a/data/scripts/gUnk_08008B5C.inc
+++ b/data/scripts/gUnk_08008B5C.inc
@@ -60,7 +60,7 @@ Call sub_0806BB7C
 JumpIfNot 0x0048
 TextboxNoOverlap 0x490c
 _0807EA94 
-LoadRoomEntityList 0x080d6784
+LoadRoomEntityList gUnk_080D6784
 WaitForSomething 0x00000001
 WaitForSomething 0x00000004
 Wait 0x000f
diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/gUnk_0800939A.inc
index ac7a4ad8..42562c04 100644
--- a/data/scripts/gUnk_0800939A.inc
+++ b/data/scripts/gUnk_0800939A.inc
@@ -26,7 +26,7 @@ JumpIfNot 0xff80
 Wait 0x001e
 TextboxNoOverlap 0x1d08
 _0807EA94 
-LoadRoomEntityList 0x080f9c38
+LoadRoomEntityList gUnk_080F9C38
 Wait 0x0078
 Call sub_0806D6D0
 Wait 0x00b4
diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/gUnk_08009464.inc
index bf533b64..bf0ba878 100644
--- a/data/scripts/gUnk_08009464.inc
+++ b/data/scripts/gUnk_08009464.inc
@@ -1,7 +1,7 @@
 SCRIPT_START gUnk_08009464
 Wait 0x003c
 _0807F0C8 0x0000, 0x0000
-LoadRoomEntityList 0x080f9c58
+LoadRoomEntityList gUnk_080F9C58
 Wait 0x003c
 Call sub_0806D70C
 Wait 0x003c
diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/gUnk_080095F2.inc
index c7fb01e5..2e76a019 100644
--- a/data/scripts/gUnk_080095F2.inc
+++ b/data/scripts/gUnk_080095F2.inc
@@ -61,7 +61,7 @@ StartPlayerScript gUnk_08009704
 WaitForSomething2 0x00000001
 SoundReq 0x0111
 _0807EF80 0x0008
-LoadRoomEntityList 0x080d9048
+LoadRoomEntityList gUnk_080D9048
 Wait 0x000f
 SoundReq 0x0111
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc
index e5ef8a57..3e39444b 100644
--- a/data/scripts/gUnk_0800B1C0.inc
+++ b/data/scripts/gUnk_0800B1C0.inc
@@ -9,7 +9,7 @@ ClearLocalFlag 0x0039
 _0807EF80 0x0000
 _0807EF80 0x0004
 Wait 0x002c
-LoadRoomEntityList 0x080da260
+LoadRoomEntityList gUnk_080DA260
 Wait 0x001e
 _0807E5F8 0x00000001
 Call sub_0807921C
diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc
index d531a974..51a6d2cd 100644
--- a/data/scripts/gUnk_0800D414.inc
+++ b/data/scripts/gUnk_0800D414.inc
@@ -162,6 +162,6 @@ Call sub_0806DAE8
 Wait 0x0078
 Call sub_0806DB44
 JumpIfNot 0x000e
-LoadRoomEntityList 0x080dd730
+LoadRoomEntityList gUnk_080DD730
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc
index 0daba44b..c9361960 100644
--- a/data/scripts/gUnk_0800D874.inc
+++ b/data/scripts/gUnk_0800D874.inc
@@ -20,7 +20,7 @@ CheckInventory1 0x0017
 JumpIf 0x0018
 CheckLocalFlag 0x0045
 JumpIf 0x0010
-LoadRoomEntityList 0x080e3830
+LoadRoomEntityList gUnk_080E3830
 CheckLocalFlag 0x0045
 JumpIfNot 0xfffa
 Call sub_0807DF50
diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc
index 70a1432d..91729462 100644
--- a/data/scripts/gUnk_0800EFC0.inc
+++ b/data/scripts/gUnk_0800EFC0.inc
@@ -81,7 +81,7 @@ JumpIfNot 0xfff6
 _0807E864 
 Call sub_0807F9A4
 Call sub_0807DF28
-LoadRoomEntityList 0x080ee8ac
+LoadRoomEntityList gUnk_080EE8AC
 StartPlayerScript gUnk_0800F14C
 WaitForSomething2 0x00000001
 _0807E5F8 0x0000001e
diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc
index 7ed5fa31..9132cb25 100644
--- a/data/scripts/gUnk_08010BB4.inc
+++ b/data/scripts/gUnk_08010BB4.inc
@@ -53,7 +53,7 @@ Call sub_08064180
 Call sub_08064180
 Call sub_08064180
 Call sub_08064180
-LoadRoomEntityList 0x080f06e0
+LoadRoomEntityList gUnk_080F06E0
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
 StartPlayerScript gUnk_08011098
diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc
index d38d26d0..091372b0 100644
--- a/data/scripts/gUnk_08010E5A.inc
+++ b/data/scripts/gUnk_08010E5A.inc
@@ -30,7 +30,7 @@ WaitFor_2
 Wait 0x003c
 SoundReq 0x00ab
 SoundReq 0x01c2
-LoadRoomEntityList 0x080f0770
+LoadRoomEntityList gUnk_080F0770
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
 _0807E778 0x0002
diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc
index 9ff7e44a..6dd62f48 100644
--- a/data/scripts/gUnk_08011128.inc
+++ b/data/scripts/gUnk_08011128.inc
@@ -5,7 +5,7 @@ _0807EF80 0x0000
 StopScript 
 CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
 JumpIfNot 0xfff6
-LoadRoomEntityList 0x080f06b0
+LoadRoomEntityList gUnk_080F06B0
 _0807EF80 0x000b
 WaitForSomething2 0x00000004
 SetEntityPositionRelative 0x005801b8
diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc
index d1d98f08..2ea6c740 100644
--- a/data/scripts/gUnk_08011C7C.inc
+++ b/data/scripts/gUnk_08011C7C.inc
@@ -513,7 +513,7 @@ Call sub_08061FD8
 _0807EF80 0x000b
 Call sub_08061FB0
 Call sub_08061F94
-LoadRoomEntityList 0x080f2758
+LoadRoomEntityList gUnk_080F2758
 _0807EF80 0x0008
 Wait 0x003c
 SoundReq 0x0072
diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc
index ed93e9bb..5b134e84 100644
--- a/data/scripts/gUnk_08012430.inc
+++ b/data/scripts/gUnk_08012430.inc
@@ -45,7 +45,7 @@ WaitFor_2
 .short 0x0000
 @ End of parameters
 Call sub_080791BC
-LoadRoomEntityList 0x080f4d70
+LoadRoomEntityList gUnk_080F4D70
 Call DeleteAllEnemies
 SetEntityPositionRelative 0x01680388
 Call sub_0807F844
@@ -110,7 +110,7 @@ SoundReq2 0x0033
 Call sub_0807DF50
 _0807E878 
 _0807E5F8 0x00000050
-LoadRoomEntityList 0x080f51d0
+LoadRoomEntityList gUnk_080F51D0
 WaitForSomething2 0x00000008
 _0807E864 
 Call sub_0807FA40
diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc
index 1e129504..6112595c 100644
--- a/data/scripts/gUnk_0801319A.inc
+++ b/data/scripts/gUnk_0801319A.inc
@@ -19,7 +19,7 @@ WaitForSomething2 0x00000002
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
-LoadRoomEntityList 0x080f5680
+LoadRoomEntityList gUnk_080F5680
 StartPlayerScript gUnk_08013330
 WaitForSomething2 0x00000002
 MoveEntityToPlayer 
diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc
index 650f465a..d41b1fa9 100644
--- a/data/scripts/gUnk_08013AA6.inc
+++ b/data/scripts/gUnk_08013AA6.inc
@@ -14,7 +14,7 @@ _0807F0B4 0x0004
 SetEntityPositionRelative 0x005000e8
 CameraTargetEntity 
 Wait 0x003c
-LoadRoomEntityList 0x080f55d8
+LoadRoomEntityList gUnk_080F55D8
 Wait 0x0078
 _0807F0B4 0x0007
 MoveEntityToPlayer 
diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc
index 20aa9ea3..42e337d5 100644
--- a/data/scripts/gUnk_08014E14.inc
+++ b/data/scripts/gUnk_08014E14.inc
@@ -217,7 +217,7 @@ WaitForSomething2 0x00000001
 SoundReq 0x01b0
 Call sub_0804F79C
 Wait 0x000a
-LoadRoomEntityList 0x080f7fc0
+LoadRoomEntityList gUnk_080F7FC0
 SoundReq2 0x002d
 Call sub_0807DF50
 _0807E878 
@@ -278,7 +278,7 @@ _0807E80C 0x00000000
 StopScript 
 StartPlayerScript gUnk_08015360
 WaitForSomething2 0x00000001
-LoadRoomEntityList 0x080f7cb0
+LoadRoomEntityList gUnk_080F7CB0
 _0807E778 0x0004
 _0807E800 0x00000000
 WaitFor_2 
diff --git a/data/scripts/gUnk_08015CD4.inc b/data/scripts/gUnk_08015CD4.inc
index 05f61e2a..093fb138 100644
--- a/data/scripts/gUnk_08015CD4.inc
+++ b/data/scripts/gUnk_08015CD4.inc
@@ -41,7 +41,7 @@ _0807E778 0x0004
 DoFade5 
 WaitFor_2 
 _0807E5F8 0x00000010
-LoadRoomEntityList 0x080fce30
+LoadRoomEntityList gUnk_080FCE30
 SoundReq0x80100000 
 Wait 0x0078
 _0807E778 0x0004
diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc
index eeb26942..542c57f6 100644
--- a/data/scripts/gUnk_08016384.inc
+++ b/data/scripts/gUnk_08016384.inc
@@ -18,7 +18,7 @@ Call 0x08016384
 .short 0x5678
 .short 0x1234
 @ End of parameters
-LoadRoomEntityList 0x08016384
+LoadRoomEntityList gUnk_08016384
 TestBit 0x00000001
 CheckInventory1 0x0001
 CheckInventory2 0x0001
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 11f9edf4..acd729c7 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -66,7 +66,7 @@ commands = [
     {'fun': 'ScriptCommand_0807E0E0', 'params': 'dd'},
     {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
     {'fun': 'ScriptCommand_CallWithArg', 'params': 'pv'},
-    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'w'}, # TODO return to d and create labels for them
+    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
     {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},

From 09087886c67b7722935dfd17e5df39adfdff496e Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 13:38:10 +0100
Subject: [PATCH 19/46] Generate variants of macros for functions with variable
 parameter count

---
 asm/macros/scripts.inc                        | 100 +++++++++++++++
 data/scripts/gUnk_08008B5C.inc                |  12 +-
 data/scripts/gUnk_08008D8C.inc                |  23 +---
 data/scripts/gUnk_08008FC0.inc                |  17 +--
 data/scripts/gUnk_0800903C.inc                |  55 ++------
 data/scripts/gUnk_08009B78.inc                |  15 +--
 data/scripts/gUnk_08009C68.inc                |  10 +-
 data/scripts/gUnk_08009F14.inc                |  17 +--
 data/scripts/gUnk_0800A0FC.inc                |  18 +--
 data/scripts/gUnk_0800A160.inc                |  12 +-
 data/scripts/gUnk_0800A1B4.inc                |   6 +-
 data/scripts/gUnk_0800A1D8.inc                |  37 ++----
 data/scripts/gUnk_0800A310.inc                |  12 +-
 data/scripts/gUnk_0800A3D8.inc                |  36 +-----
 data/scripts/gUnk_0800A500.inc                |   6 +-
 data/scripts/gUnk_0800A590.inc                |  18 +--
 data/scripts/gUnk_0800A638.inc                |   6 +-
 data/scripts/gUnk_0800A65C.inc                |   6 +-
 data/scripts/gUnk_0800A680.inc                |   6 +-
 data/scripts/gUnk_0800A6A4.inc                |   6 +-
 data/scripts/gUnk_0800A6D4.inc                |   6 +-
 data/scripts/gUnk_0800A704.inc                |   6 +-
 data/scripts/gUnk_0800A734.inc                |   6 +-
 data/scripts/gUnk_0800A764.inc                |   6 +-
 data/scripts/gUnk_0800A7E4.inc                |   6 +-
 data/scripts/gUnk_0800A9F4.inc                |   6 +-
 data/scripts/gUnk_0800AAD8.inc                |   6 +-
 data/scripts/gUnk_0800AB08.inc                |  28 +----
 data/scripts/gUnk_0800AB6E.inc                |  36 ++----
 data/scripts/gUnk_0800ACE0.inc                |  18 +--
 data/scripts/gUnk_0800AD54.inc                |  36 +-----
 data/scripts/gUnk_0800AF18.inc                |   6 +-
 data/scripts/gUnk_0800B0D0.inc                |  36 +-----
 data/scripts/gUnk_0800B5EC.inc                |  12 +-
 data/scripts/gUnk_0800B6C8.inc                |  18 +--
 data/scripts/gUnk_0800B7C4.inc                |  18 +--
 data/scripts/gUnk_0800B7FC.inc                |  12 +-
 data/scripts/gUnk_0800B828.inc                |  12 +-
 data/scripts/gUnk_0800B9B4.inc                |   6 +-
 data/scripts/gUnk_0800BC50.inc                |  12 +-
 data/scripts/gUnk_0800BD78.inc                |  18 +--
 data/scripts/gUnk_0800BECC.inc                |   6 +-
 data/scripts/gUnk_0800C004.inc                |  18 +--
 data/scripts/gUnk_0800C160.inc                |   6 +-
 data/scripts/gUnk_0800C2A4.inc                |  18 +--
 data/scripts/gUnk_0800C350.inc                |   6 +-
 data/scripts/gUnk_0800C3CC.inc                |  12 +-
 data/scripts/gUnk_0800C410.inc                |  12 +-
 data/scripts/gUnk_0800CD7C.inc                |  25 +---
 data/scripts/gUnk_0800D1E0.inc                |  12 +-
 data/scripts/gUnk_0800D414.inc                |  37 +-----
 data/scripts/gUnk_0800D76C.inc                |  12 +-
 data/scripts/gUnk_0800DA60.inc                |  16 +--
 data/scripts/gUnk_0800DB78.inc                |  17 +--
 data/scripts/gUnk_0800DC4C.inc                |  12 +-
 data/scripts/gUnk_0800DCAC.inc                |   6 +-
 data/scripts/gUnk_0800DDD0.inc                |   6 +-
 data/scripts/gUnk_0800DE50.inc                |   6 +-
 data/scripts/gUnk_0800DF24.inc                |   5 +-
 data/scripts/gUnk_0800DFB4.inc                |   6 +-
 data/scripts/gUnk_0800DFE4.inc                |  16 +--
 data/scripts/gUnk_0800E0BC.inc                | 114 +++--------------
 data/scripts/gUnk_0800E6B0.inc                |  43 ++-----
 data/scripts/gUnk_0800E8A4.inc                |   6 +-
 data/scripts/gUnk_0800E8D6.inc                |   6 +-
 data/scripts/gUnk_0800EA54.inc                |  48 ++-----
 data/scripts/gUnk_0800EFC0.inc                |  63 ++--------
 data/scripts/gUnk_0800F184.inc                |  49 ++------
 data/scripts/gUnk_0800F554.inc                |  30 +----
 data/scripts/gUnk_0800F724.inc                |  98 +++------------
 data/scripts/gUnk_0800FAE4.inc                |  19 +--
 data/scripts/gUnk_0800FD0C.inc                |  10 +-
 data/scripts/gUnk_0800FDA0.inc                |  12 +-
 data/scripts/gUnk_0800FF18.inc                |  12 +-
 data/scripts/gUnk_0800FF74.inc                |  54 ++------
 data/scripts/gUnk_080100C8.inc                |  28 +----
 data/scripts/gUnk_08010264.inc                | 105 +++-------------
 data/scripts/gUnk_08010A98.inc                |  33 +----
 data/scripts/gUnk_08010BB4.inc                |  59 ++-------
 data/scripts/gUnk_08010E5A.inc                |  58 ++-------
 data/scripts/gUnk_08010F84.inc                |  51 ++------
 data/scripts/gUnk_080112C4.inc                |   7 +-
 data/scripts/gUnk_080116A8.inc                |  12 +-
 data/scripts/gUnk_0801194C.inc                |  83 +++---------
 data/scripts/gUnk_08011B20.inc                |   5 +-
 data/scripts/gUnk_08011B40.inc                |  18 +--
 data/scripts/gUnk_08011C50.inc                |   6 +-
 data/scripts/gUnk_0801232C.inc                |   8 +-
 data/scripts/gUnk_08012430.inc                |  15 +--
 data/scripts/gUnk_080126FC.inc                | 101 +++------------
 data/scripts/gUnk_08012B24.inc                |   6 +-
 data/scripts/gUnk_08012B50.inc                |   6 +-
 data/scripts/gUnk_08012B7C.inc                |   6 +-
 data/scripts/gUnk_08012E88.inc                |  18 +--
 data/scripts/gUnk_08012F0C.inc                |   6 +-
 data/scripts/gUnk_08012F86.inc                |  12 +-
 data/scripts/gUnk_08013114.inc                |  18 +--
 data/scripts/gUnk_0801319A.inc                |  19 +--
 data/scripts/gUnk_080133F8.inc                |   6 +-
 data/scripts/gUnk_080134DC.inc                |  83 +++---------
 data/scripts/gUnk_08013650.inc                |   6 +-
 data/scripts/gUnk_080136D8.inc                |  19 +--
 data/scripts/gUnk_08013720.inc                |  83 +++---------
 data/scripts/gUnk_080138B4.inc                | 119 +++---------------
 data/scripts/gUnk_08013AA6.inc                |   6 +-
 data/scripts/gUnk_08013B18.inc                |   6 +-
 data/scripts/gUnk_08013B70.inc                |   6 +-
 data/scripts/gUnk_08013BA8.inc                |  12 +-
 data/scripts/gUnk_08013BE8.inc                |  12 +-
 data/scripts/gUnk_08013D04.inc                |  12 +-
 data/scripts/gUnk_08013D44.inc                |  12 +-
 data/scripts/gUnk_08013D84.inc                |  12 +-
 data/scripts/gUnk_08013DC4.inc                |  12 +-
 data/scripts/gUnk_08013FE8.inc                |   6 +-
 data/scripts/gUnk_080141DC.inc                |   6 +-
 data/scripts/gUnk_08014210.inc                |   6 +-
 data/scripts/gUnk_08014248.inc                |  23 +---
 data/scripts/gUnk_08014450.inc                |   5 +-
 data/scripts/gUnk_080145B0.inc                |   5 +-
 data/scripts/gUnk_080145E8.inc                |  35 ++----
 data/scripts/gUnk_08014804.inc                |  15 +--
 data/scripts/gUnk_08014CDC.inc                |  11 +-
 data/scripts/gUnk_08014E14.inc                |  57 ++-------
 data/scripts/gUnk_08015390.inc                |   5 +-
 data/scripts/gUnk_080153EC.inc                |  31 +----
 data/scripts/gUnk_0801548E.inc                |  22 +---
 data/scripts/gUnk_0801550C.inc                |  42 ++-----
 data/scripts/gUnk_08015618.inc                |  12 +-
 data/scripts/gUnk_08015684.inc                |   6 +-
 data/scripts/gUnk_080157AC.inc                |  15 +--
 data/scripts/gUnk_08015958.inc                |  10 +-
 data/scripts/gUnk_08015B34.inc                |  11 +-
 data/scripts/gUnk_08015C7C.inc                |  17 +--
 data/scripts/gUnk_08015FC0.inc                |   6 +-
 data/scripts/gUnk_080160A8.inc                |  22 +---
 data/scripts/gUnk_0801637C.inc                |   4 -
 data/scripts/gUnk_08016384.inc                |  13 +-
 data/scripts/gUnk_08016482.inc                |  12 +-
 .../script_disassembler.py                    | 115 ++++++++++++-----
 139 files changed, 697 insertions(+), 2447 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index bb359218..5be0e732 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -32,6 +32,51 @@
 	.short \s
 .endm
 
+.macro _0807E078 a,b
+	.short 0x0c06
+	.short \a
+	.short \b
+.endm
+
+.macro _0807E078_sss a,b,c
+	.short 0x1006
+	.short \a
+	.short \b
+	.short \c
+.endm
+
+.macro _0807E078_ssss a,b,c,d
+	.short 0x1406
+	.short \a
+	.short \b
+	.short \c
+	.short \d
+.endm
+
+.macro _0807E078_sssssss a,b,c,d,e,f,g
+	.short 0x2006
+	.short \a
+	.short \b
+	.short \c
+	.short \d
+	.short \e
+	.short \f
+	.short \g
+.endm
+
+.macro _0807E078_sssssssss a,b,c,d,e,f,g,h,i
+	.short 0x2806
+	.short \a
+	.short \b
+	.short \c
+	.short \d
+	.short \e
+	.short \f
+	.short \g
+	.short \h
+	.short \i
+.endm
+
 .macro JumpAbsolute w
 	.short 0x0c07
 	.word \w
@@ -58,6 +103,17 @@
 	.word \w
 .endm
 
+.macro CallWithArg a,b
+	.short 0x140c
+	.word \a
+	.word \b
+.endm
+
+.macro CallWithArg_p w
+	.short 0x0c0c
+	.word \w
+.endm
+
 .macro LoadRoomEntityList w
 	.short 0x0c0d
 	.word \w
@@ -78,6 +134,10 @@
 	.short \s
 .endm
 
+.macro HasRoomItemForSale 
+	.short 0x0411
+.endm
+
 .macro CheckLocalFlag s
 	.short 0x0812
 	.short \s
@@ -309,6 +369,15 @@
 	.word \w
 .endm
 
+.macro _0807E858 s
+	.short 0x0842
+	.short \s
+.endm
+
+.macro _0807E858_ 
+	.short 0x0442
+.endm
+
 .macro _0807E864 
 	.short 0x0443
 .endm
@@ -420,6 +489,37 @@
 	.short \s
 .endm
 
+.macro TextboxNoOverlapFollowPos w
+	.short 0x0c5c
+	.word \w
+.endm
+
+.macro TextboxNoOverlapFollowPos_s s
+	.short 0x085c
+	.short \s
+.endm
+
+.macro _0807EAF0 a,b
+	.short 0x0c5d
+	.short \a
+	.short \b
+.endm
+
+.macro _0807EAF0_sss a,b,c
+	.short 0x105d
+	.short \a
+	.short \b
+	.short \c
+.endm
+
+.macro _0807EAF0_ssss a,b,c,d
+	.short 0x145d
+	.short \a
+	.short \b
+	.short \c
+	.short \d
+.endm
+
 .macro TextboxNoOverlapVar 
 	.short 0x045e
 .endm
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc
index e03faf0b..7ababbc6 100644
--- a/data/scripts/gUnk_08008B5C.inc
+++ b/data/scripts/gUnk_08008B5C.inc
@@ -45,17 +45,9 @@ _0807EA94
 Call sub_0806BA34
 JumpIfNot 0x0066
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BB1C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BB1C, 0x00000000
 Call sub_0807F2D4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BB1C
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BB1C, 0x00000001
 Call sub_0806BB7C
 JumpIfNot 0x0048
 TextboxNoOverlap 0x490c
diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc
index cd4ffd46..105f3c07 100644
--- a/data/scripts/gUnk_08008D8C.inc
+++ b/data/scripts/gUnk_08008D8C.inc
@@ -18,30 +18,18 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Call sub_080643D8
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Jump 0xffd2
 StartScript 
 SetEntityPositionRelative 0x00780088
@@ -71,10 +59,7 @@ _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1053
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1053
 _0807EA94 
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc
index 37470012..4fe5a130 100644
--- a/data/scripts/gUnk_08008FC0.inc
+++ b/data/scripts/gUnk_08008FC0.inc
@@ -1,21 +1,10 @@
 SCRIPT_START gUnk_08008FC0
 _0807F078 0x0001, 0x0001
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F918
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F918, 0x00000001
 SoundReq 0x0109
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x045f
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x0000045f
 Call sub_0807F304
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x0501
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e0501
 _0807EA94 
 _0807E5F8 0x00000020
 Call sub_080791BC
diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc
index f737d7bd..a1a124ed 100644
--- a/data/scripts/gUnk_0800903C.inc
+++ b/data/scripts/gUnk_0800903C.inc
@@ -28,29 +28,20 @@ WaitForSomething2 0x00000080
 _0807EB44 0x0004
 _0807ECC4 0x0008
 _0807E930 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1050
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1050
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1052
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1052
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EB44 0x0006
 _0807E930 0x0005
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1054
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1054
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
@@ -59,37 +50,25 @@ _0807EB44 0x0004
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1056
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1056
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1057
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1057
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1058
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1058
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807E930 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x105c
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e105c
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000100
@@ -110,10 +89,7 @@ StopScript
 WaitForSomething2 0x00000001
 _0807EB74 
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x105b
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000105b
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -125,10 +101,7 @@ WaitForSomething2 0x00000001
 _0807EF80 0x0005
 Wait 0x003c
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1051
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001051
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -138,10 +111,7 @@ Wait 0x003c
 _0807EB74 
 _0807EB8C 
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1055
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001055
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -155,10 +125,7 @@ _0807EDD4 0x0098, 0x0078
 _0807EB74 
 _0807EF80 0x0000
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1059
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001059
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc
index ed556529..7ba8eafb 100644
--- a/data/scripts/gUnk_08009B78.inc
+++ b/data/scripts/gUnk_08009B78.inc
@@ -18,10 +18,7 @@ _0807EB44 0x0006
 _0807EF80 0x0000
 Wait 0x000f
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1009
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001009
 _0807E8E4_1 
 _0807EA94 
 _0807EF80 0x0000
@@ -29,10 +26,7 @@ _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
 _0807EB8C 
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x100b
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000100b
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000002
@@ -51,10 +45,7 @@ _0807F034 0x0034
 WaitPlayerAction8 
 _0807E8E4_1 
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x100c
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000100c
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc
index 21105efe..6d6a4d03 100644
--- a/data/scripts/gUnk_08009C68.inc
+++ b/data/scripts/gUnk_08009C68.inc
@@ -13,10 +13,7 @@ WaitForSomething2 0x00000004
 _0807EB74 
 _0807EB8C 
 _0807EF80 0x0001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x100a
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000100a
 _0807EA94 
 _0807EF80 0x0000
 _0807E5F8 0x00000008
@@ -25,10 +22,7 @@ _0807EB8C
 _0807EF80 0x0001
 _0807EB8C 
 _0807EB44 0x0002
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x100d
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000100d
 _0807EA94 
 _0807EF80 0x0000
 _0807EDD4 0x0028, 0x0060
diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc
index 4e9dd50f..8294c40a 100644
--- a/data/scripts/gUnk_08009F14.inc
+++ b/data/scripts/gUnk_08009F14.inc
@@ -20,10 +20,7 @@ _0807EF80 0x000b
 StartPlayerScript gUnk_0800A088
 WaitForSomething2 0x00000002
 Call sub_0806014C
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1f01
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001f01
 _0807EA94 
 Wait 0x001e
 _0807F034 0x0065
@@ -41,21 +38,13 @@ StopScript
 _0807E864 
 Call sub_080602BC
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F970
-.short 0x1f03
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F970, 0x00001f03
 JumpIf 0x0008
 _0807E878 
 Jump 0xffd2
 Wait 0x0008
 SoundReq 0x0103
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806030C
-.short 0x0063
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806030C, 0x00000063
 Wait 0x0008
 _0807E878 
 Jump 0xffb6
diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc
index a2d56bd5..26f1620d 100644
--- a/data/scripts/gUnk_0800A0FC.inc
+++ b/data/scripts/gUnk_0800A0FC.inc
@@ -10,27 +10,15 @@ Call sub_0807FBFC
 SetEntityPositionRelative 0x005800b0
 Call sub_0807F844
 _0807E8E4_3 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F75C
-.short 0x0060
-.short 0x00d0
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08094AE8
-.short 0xa160
-.short 0x0800
-@ End of parameters
+CallWithArg sub_0807F75C, 0x00d00060
+CallWithArg sub_08094AE8, 0x0800a160
 SoundReq 0x00f7
 _0807E778 0x0002
 DoFade6 
 StopScript 
 WaitFor_2 
 WaitForSomething2 0x00000004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0006
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000006
 _0807EF80 0x0006
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc
index 19b41f0c..8fb680cc 100644
--- a/data/scripts/gUnk_0800A160.inc
+++ b/data/scripts/gUnk_0800A160.inc
@@ -5,16 +5,8 @@ _0807EF80 0x0007
 _0807EF80 0x000b
 _0807E930 0x0002
 SetEntityPositionRelative 0x008000b0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F98C
-.short 0x0000
-.short 0xff80
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xa1b4
-.short 0x0800
-@ End of parameters
+CallWithArg sub_0807F98C, 0xff800000
+CallWithArg sub_080960C4, 0x0800a1b4
 StopScript 
 SoundReq 0x0142
 _0807EF3C 0xff80, 0x0000
diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc
index 27ffbaf3..6c66905f 100644
--- a/data/scripts/gUnk_0800A1B4.inc
+++ b/data/scripts/gUnk_0800A1B4.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A1B4
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfff8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fff8
 StopScript 
 WaitForSomething 0x00000002
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc
index 0b42df91..59fefcec 100644
--- a/data/scripts/gUnk_0800A1D8.inc
+++ b/data/scripts/gUnk_0800A1D8.inc
@@ -5,21 +5,14 @@ Call sub_0807DF28
 SetEntityPositionRelative 0x00800088
 Call sub_0807F844
 _0807E8E4_3 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F75C
-.short 0x0088
-.short 0x00a8
-@ End of parameters
+CallWithArg sub_0807F75C, 0x00a80088
 StopScript 
 Wait 0x003c
 StartPlayerScript gUnk_0800A310
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000080
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1659
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001659
 _0807EA94 
 Wait 0x003c
 _0807E5F8 0x00000010
@@ -34,16 +27,10 @@ WaitForSomething2 0x00000040
 _0807E5F8 0x00000004
 Call sub_0807F3F8
 WaitForSomething2 0x00000080
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x165a
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e165a
 _0807EA94 
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x165b
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e165b
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000040
@@ -58,16 +45,10 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000100
 _0807E5F8 0x00000006
 WaitForSomething2 0x000000c0
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x165c
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e165c
 _0807EA94 
 SoundReq0x80100000 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x165d
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e165d
 _0807EA94 
 _0807E5F8 0x00000006
 WaitForSomething2 0x000000c0
@@ -77,10 +58,6 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000100
 SoundReq2 0x0008
 SoundReq 0x00f7
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0007
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000007
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc
index 7e9b2c7b..a5c7dbc1 100644
--- a/data/scripts/gUnk_0800A310.inc
+++ b/data/scripts/gUnk_0800A310.inc
@@ -16,11 +16,7 @@ _0807EF80 0x0008
 SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x000b
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 WaitForSomething2 0x00000002
 _0807E930 0x000e
@@ -41,11 +37,7 @@ _0807E930 0x000c
 Call sub_0807F2D4
 _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xa680
-.short 0x0800
-@ End of parameters
+CallWithArg sub_080960C4, 0x0800a680
 _0807E5F8 0x00000040
 SCRIPT_END
 .short 0x0000
diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc
index e072c052..ac087eda 100644
--- a/data/scripts/gUnk_0800A3D8.inc
+++ b/data/scripts/gUnk_0800A3D8.inc
@@ -28,11 +28,7 @@ WaitForSomething2 0x00000004
 _0807EB44 0x0004
 _0807EF80 0x0000
 SoundReq 0x0142
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xa638
-.short 0x0800
-@ End of parameters
+CallWithArg sub_080960C4, 0x0800a638
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0143
@@ -43,39 +39,19 @@ Call sub_08066E68
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
 SoundReq 0x0142
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xa680
-.short 0x0800
-@ End of parameters
+CallWithArg sub_080960C4, 0x0800a680
 Wait 0x0078
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FADC
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FADC, 0x00000003
 Wait 0x000f
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FADC
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FADC, 0x00000003
 Wait 0x000f
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FADC
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FADC, 0x00000003
 Wait 0x003c
 SoundReq 0x0153
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FADC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FADC, 0x00000001
 SoundReq 0x0143
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc
index 9686116d..0379d003 100644
--- a/data/scripts/gUnk_0800A500.inc
+++ b/data/scripts/gUnk_0800A500.inc
@@ -9,11 +9,7 @@ StopScript
 WaitForSomething2 0x00000008
 SoundReq 0x0142
 _0807E610 0x00000800
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xa65c
-.short 0x0800
-@ End of parameters
+CallWithArg sub_080960C4, 0x0800a65c
 _0807E930 0x0002
 Call sub_08094B0C
 _0807EDD4 0x0068, 0x0088
diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc
index 5d776d2c..f301574d 100644
--- a/data/scripts/gUnk_0800A590.inc
+++ b/data/scripts/gUnk_0800A590.inc
@@ -6,27 +6,15 @@ _0807EF80 0x0008
 _0807EB44 0x0000
 Call sub_0807F714
 MoveEntityToPlayer 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F98C
-.short 0x0000
-.short 0xfff0
-@ End of parameters
+CallWithArg sub_0807F98C, 0xfff00000
 StopScript 
 _0807E930 0x0023
 WaitForSomething2 0x00000010
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6E8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6E8, 0x00000008
 _0807EF80 0x0007
 SoundReq 0x0142
 _0807E610 0x00000800
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xa65c
-.short 0x0800
-@ End of parameters
+CallWithArg sub_080960C4, 0x0800a65c
 Wait 0x003c
 _0807EDD4 0x0088, 0x0068
 Wait 0x0078
diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc
index 294caac8..66fb4804 100644
--- a/data/scripts/gUnk_0800A638.inc
+++ b/data/scripts/gUnk_0800A638.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A638
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfff8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fff8
 StopScript 
 WaitForSomething 0x00001000
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc
index 02a16290..3dca04c0 100644
--- a/data/scripts/gUnk_0800A65C.inc
+++ b/data/scripts/gUnk_0800A65C.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A65C
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfff8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fff8
 StopScript 
 WaitForSomething 0x00000800
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc
index 7a713f81..b065e201 100644
--- a/data/scripts/gUnk_0800A680.inc
+++ b/data/scripts/gUnk_0800A680.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A680
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfff8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fff8
 StopScript 
 WaitForSomething 0x00000020
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc
index d8145bbb..f661c904 100644
--- a/data/scripts/gUnk_0800A6A4.inc
+++ b/data/scripts/gUnk_0800A6A4.inc
@@ -7,10 +7,6 @@ Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000008
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc
index 0af66470..5e8f1277 100644
--- a/data/scripts/gUnk_0800A6D4.inc
+++ b/data/scripts/gUnk_0800A6D4.inc
@@ -7,10 +7,6 @@ Call sub_0807F844
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0009
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000009
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc
index dbc2a17f..7fe91929 100644
--- a/data/scripts/gUnk_0800A704.inc
+++ b/data/scripts/gUnk_0800A704.inc
@@ -7,10 +7,6 @@ Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x000a
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x0000000a
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc
index 2dc687dc..c54c8c81 100644
--- a/data/scripts/gUnk_0800A734.inc
+++ b/data/scripts/gUnk_0800A734.inc
@@ -7,10 +7,6 @@ Call sub_0807F844
 SoundReq 0x00f7
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x000b
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x0000000b
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc
index 78017245..8a63af09 100644
--- a/data/scripts/gUnk_0800A764.inc
+++ b/data/scripts/gUnk_0800A764.inc
@@ -26,10 +26,6 @@ _0807E5F8 0x00000010
 Wait 0x0002
 _0807E5F8 0x00000020
 Wait 0x0078
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x000c
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x0000000c
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc
index 0cae1367..d9419cb4 100644
--- a/data/scripts/gUnk_0800A7E4.inc
+++ b/data/scripts/gUnk_0800A7E4.inc
@@ -89,10 +89,6 @@ _0807E5F8 0x00000004
 Wait 0x000a
 _0807E5F8 0x00000008
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x000d
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x0000000d
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc
index bfd53ef2..c400bba7 100644
--- a/data/scripts/gUnk_0800A9F4.inc
+++ b/data/scripts/gUnk_0800A9F4.inc
@@ -14,10 +14,6 @@ _0807E5F8 0x00000004
 Wait 0x001e
 _0807E5F8 0x00000008
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x000e
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x0000000e
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc
index 980237ff..38f1dd36 100644
--- a/data/scripts/gUnk_0800AAD8.inc
+++ b/data/scripts/gUnk_0800AAD8.inc
@@ -7,10 +7,6 @@ Call sub_0807F844
 StopScript 
 Wait 0x003c
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x000f
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x0000000f
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc
index 93104427..22ec174f 100644
--- a/data/scripts/gUnk_0800AB08.inc
+++ b/data/scripts/gUnk_0800AB08.inc
@@ -5,35 +5,17 @@ Call sub_0807DF28
 SetEntityPositionRelative 0x01480088
 Call sub_0807F844
 _0807E8E4_3 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6E8
-.short 0x0008
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F75C
-.short 0x0088
-.short 0x00a8
-@ End of parameters
+CallWithArg sub_0807F6E8, 0x00000008
+CallWithArg sub_0807F75C, 0x00a80088
 SoundReq 0x00f7
 StopScript 
 Wait 0x0078
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x00780088
 Call sub_0807F5C0
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1664
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001664
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x165e
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e165e
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000001
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc
index 06350a3c..3374e09b 100644
--- a/data/scripts/gUnk_0800AB6E.inc
+++ b/data/scripts/gUnk_0800AB6E.inc
@@ -8,33 +8,20 @@ WaitForSomething2 0x00000080
 SetEntityPosition 0x0000, 0xffe0
 Call sub_0807F5C0
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000001
 _0807F0C8 0x0000, 0x0000
 Wait 0x003c
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x165f
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e165f
 _0807EA94 
 StartPlayerScript gUnk_0800ACBC
 WaitForSomething2 0x00000001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1660
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1660
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1661
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1661
 _0807EA94 
 _0807E5F8 0x00000008
 _0807E5F8 0x00000002
@@ -45,15 +32,9 @@ WaitForSomething2 0x00000010
 StartPlayerScript gUnk_0800ACE0
 WaitForSomething2 0x00000001
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1662
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1662
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1663
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1663
 _0807EA94 
 SetEntityPosition 0x0000, 0xffe0
 Call sub_0807F5C0
@@ -64,10 +45,7 @@ WaitForSomething2 0x00000004
 StartPlayerScript gUnk_0800AD54
 WaitForSomething2 0x00000001
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1665
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1665
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc
index aa4cf249..2035165c 100644
--- a/data/scripts/gUnk_0800ACE0.inc
+++ b/data/scripts/gUnk_0800ACE0.inc
@@ -1,27 +1,15 @@
 SCRIPT_START gUnk_0800ACE0
 StartScript 
 Call sub_08094BE0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x045b
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x0000045b
 SoundReq 0x0109
 StopScript 
 Call sub_0807F304
 Wait 0x005a
 _0807E5F8 0x00000008
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6F8
-.short 0x0008
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x08e4
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6F8, 0x00000008
+CallWithArg sub_0807F238, 0x000008e4
 StopScript 
 Call sub_0807F304
 _0807EB44 0x0004
diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800AD54.inc
index 8d2c716f..129ae24b 100644
--- a/data/scripts/gUnk_0800AD54.inc
+++ b/data/scripts/gUnk_0800AD54.inc
@@ -12,43 +12,23 @@ SetEntityNonPlanarMovement 0x0080
 _0807EF80 0x0007
 _0807EF80 0x000b
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0004
 Wait 0x001e
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Wait 0x0006
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Wait 0x0014
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
 _0807E930 0x000c
@@ -60,11 +40,7 @@ _0807E930 0x000f
 Call sub_0807F2D4
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080960C4
-.short 0xaf18
-.short 0x0800
-@ End of parameters
+CallWithArg sub_080960C4, 0x0800af18
 _0807E930 0x0012
 Call sub_0807F2D4
 Wait 0x001e
diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc
index 26076509..a786d6d5 100644
--- a/data/scripts/gUnk_0800AF18.inc
+++ b/data/scripts/gUnk_0800AF18.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800AF18
 StartScript 
 _0807EF80 0x0007
 _0807EF80 0x000b
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfff8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fff8
 SoundReq 0x0142
 StopScript 
 WaitForSomething 0x00000020
diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc
index 420cbfab..ec5f10f9 100644
--- a/data/scripts/gUnk_0800B0D0.inc
+++ b/data/scripts/gUnk_0800B0D0.inc
@@ -2,47 +2,27 @@ SCRIPT_START gUnk_0800B0D0
 StartScript 
 Call sub_0806BCD4
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BC94
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BC94, 0x00000000
 StopScript 
 Call sub_0807F434
-.short 0x1006 @ _0807E078 with 3 parameters
-.short 0xfff8
-.short 0x0004
-.short 0x0040
-@ End of parameters
+_0807E078_sss 0xfff8, 0x0004, 0x0040
 _0807E864 
 Call sub_0807DF28
 Call sub_0807F2D4
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BC94
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BC94, 0x00000004
 Call sub_0806BCE8
 _0807EA94 
 Call sub_0807DF50
 _0807E878 
 Call sub_0806BCB8
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BC94
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BC94, 0x00000000
 Jump 0xffb6
 _0807E864 
 Call sub_0807DF28
 Call sub_0807F2D4
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BC94
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BC94, 0x00000004
 Call sub_0807F650
 _0807E9F0 
 JumpIfNot 0x0008
@@ -50,11 +30,7 @@ Call sub_0806BCC0
 Call sub_0807DF50
 _0807E878 
 Call sub_0806BCB8
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806BC94
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806BC94, 0x00000000
 Jump 0xff6e
 StartScript 
 Call sub_0807DF28
diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc
index bab1c892..9c5c030b 100644
--- a/data/scripts/gUnk_0800B5EC.inc
+++ b/data/scripts/gUnk_0800B5EC.inc
@@ -32,17 +32,9 @@ _0807E3E8
 JumpIfNot 0x002a
 Wait 0x000f
 TextboxNoOverlap 0x0584
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F970
-.short 0x058b
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F970, 0x0000058b
 JumpIf 0x001e
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08087424
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08087424, 0x00000000
 Wait 0x00b4
 Jump 0x0024
 TextboxNoOverlap 0x057d
diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc
index ea78f758..e097eff5 100644
--- a/data/scripts/gUnk_0800B6C8.inc
+++ b/data/scripts/gUnk_0800B6C8.inc
@@ -16,11 +16,7 @@ CheckLocalFlag 0x009f
 JumpIf 0x0098
 TextboxNoOverlap 0x057b
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F970
-.short 0x057d
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F970, 0x0000057d
 JumpIf 0xff88
 _0807EA94 
 SetLocalFlag 0x009f
@@ -43,17 +39,9 @@ CheckLocalFlag 0x00a0
 JumpIf 0x0036
 TextboxNoOverlap 0x0580
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F970
-.short 0x0582
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F970, 0x00000582
 JumpIf 0x0014
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08087424
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08087424, 0x00000001
 Wait 0x00b4
 Jump 0xff14
 _0807EA94 
diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc
index c269e3ac..265c2296 100644
--- a/data/scripts/gUnk_0800B7C4.inc
+++ b/data/scripts/gUnk_0800B7C4.inc
@@ -2,22 +2,10 @@ SCRIPT_START gUnk_0800B7C4
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x0090
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x00000090
 JumpIfNot 0x0024
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F464
-.short 0x0078
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0090
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F464, 0x00000078
+CallWithArg sub_0807F4F8, 0x00000090
 _0807E8E4_0 
 _0807EF80 0x0000
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc
index d69ca1c8..ead30119 100644
--- a/data/scripts/gUnk_0800B7FC.inc
+++ b/data/scripts/gUnk_0800B7FC.inc
@@ -1,14 +1,6 @@
 SCRIPT_START gUnk_0800B7FC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0090
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F464
-.short 0x0078
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000090
+CallWithArg sub_0807F464, 0x00000078
 Jump 0xffdc
 StartScript 
 _0807EF80 0x0007
diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc
index b0ef791a..3ef1e795 100644
--- a/data/scripts/gUnk_0800B828.inc
+++ b/data/scripts/gUnk_0800B828.inc
@@ -50,11 +50,7 @@ _0807E9D4
 _0807EB44 0x0004
 _0807EF80 0x0000
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08064644
-.short 0x464d
-.short 0x0806
-@ End of parameters
+CallWithArg sub_08064644, 0x0806464d
 StopScript 
 Wait 0x003c
 Call sub_080646A4
@@ -106,11 +102,7 @@ _0807EF80 0x0008
 Call sub_0806DAAC
 JumpIf 0x0036
 Call sub_0806DAD0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0005
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000005
 StopScript 
 _0807EA4C 
 _0807E9F0 
diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc
index 7bfd46d4..524e72eb 100644
--- a/data/scripts/gUnk_0800B9B4.inc
+++ b/data/scripts/gUnk_0800B9B4.inc
@@ -6,11 +6,7 @@ _0807EF80 0x000a
 Call sub_080694B0
 StopScript 
 Call sub_0807F434
-.short 0x1006 @ _0807E078 with 3 parameters
-.short 0xfff8
-.short 0x0004
-.short 0x001e
-@ End of parameters
+_0807E078_sss 0xfff8, 0x0004, 0x001e
 _0807E864 
 _0807EB74 
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc
index 8933436d..cc87ed6a 100644
--- a/data/scripts/gUnk_0800BC50.inc
+++ b/data/scripts/gUnk_0800BC50.inc
@@ -20,22 +20,14 @@ _0807EB44 0x0000
 _0807E930 0x0000
 SetEntityNonPlanarMovement 0x0040
 _0807EF80 0x000d
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0378
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000378
 Wait 0x003c
 _0807EF80 0x000c
 Wait 0x003c
 TextboxNoOverlap 0x0e09
 _0807EA94 
 Call sub_0807F158
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x035c
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x0000035c
 Wait 0x001e
 SoundReq 0x0188
 _0807EF80 0x0008
diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc
index 3ebe8a0b..f9512a8b 100644
--- a/data/scripts/gUnk_0800BD78.inc
+++ b/data/scripts/gUnk_0800BD78.inc
@@ -8,11 +8,7 @@ Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0270
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000270
 Wait 0x001e
 TextboxNoOverlap 0x0e0b
 _0807EA94 
@@ -25,17 +21,9 @@ _0807E5F8 0x00000004
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0804BF38
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0804BF38, 0x00000000
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0804BF38
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0804BF38, 0x00000003
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc
index f7307d09..5653d2f6 100644
--- a/data/scripts/gUnk_0800BECC.inc
+++ b/data/scripts/gUnk_0800BECC.inc
@@ -8,11 +8,7 @@ Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x01b8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x000001b8
 Wait 0x001e
 TextboxNoOverlap 0x0e0e
 _0807EA94 
diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc
index bc5147ef..01cad189 100644
--- a/data/scripts/gUnk_0800C004.inc
+++ b/data/scripts/gUnk_0800C004.inc
@@ -8,11 +8,7 @@ Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x01b8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x000001b8
 Wait 0x001e
 TextboxNoOverlap 0x0e11
 _0807EA94 
@@ -27,17 +23,9 @@ _0807E5F8 0x0000001c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0804BF38
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0804BF38, 0x00000001
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0804BF38
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0804BF38, 0x00000004
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc
index e11522d2..640e28e1 100644
--- a/data/scripts/gUnk_0800C160.inc
+++ b/data/scripts/gUnk_0800C160.inc
@@ -8,11 +8,7 @@ Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0128
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000128
 Wait 0x001e
 TextboxNoOverlap 0x0e14
 _0807EA94 
diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc
index 00f48da9..633ecb99 100644
--- a/data/scripts/gUnk_0800C2A4.inc
+++ b/data/scripts/gUnk_0800C2A4.inc
@@ -8,11 +8,7 @@ Call sub_0807F348
 StopScript 
 WaitForSomething2 0x00000002
 _0807EF80 0x0007
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0128
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000128
 Wait 0x001e
 TextboxNoOverlap 0x0e17
 _0807EA94 
@@ -27,17 +23,9 @@ _0807E5F8 0x0000007c
 _0807EF80 0x000f
 _0807E930 0x0008
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0804BF38
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0804BF38, 0x00000002
 Wait 0x00b4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0804BF38
-.short 0x0005
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0804BF38, 0x00000005
 _0807EB44 0x0004
 _0807E930 0x0000
 Wait 0x003c
diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc
index fc04abde..ca845fcd 100644
--- a/data/scripts/gUnk_0800C350.inc
+++ b/data/scripts/gUnk_0800C350.inc
@@ -1,10 +1,6 @@
 SCRIPT_START gUnk_0800C350
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806D658
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806D658, 0x00000003
 SetEntityNonPlanarMovement 0x0200
 StopScript 
 CheckRoomFlag 0x00ff
diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc
index d14faf5a..8a08c0f2 100644
--- a/data/scripts/gUnk_0800C3CC.inc
+++ b/data/scripts/gUnk_0800C3CC.inc
@@ -4,18 +4,10 @@ Call sub_0806D660
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0048
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000048
 Call sub_0806D66C
 Wait 0x000f
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0068
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000068
 Call sub_0806D67C
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc
index b6169174..f3ddc136 100644
--- a/data/scripts/gUnk_0800C410.inc
+++ b/data/scripts/gUnk_0800C410.inc
@@ -4,18 +4,10 @@ Call sub_0806D660
 SetEntityNonPlanarMovement 0x0080
 StopScript 
 WaitForSomething2 0x00000004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0048
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000048
 Call sub_0806D66C
 Wait 0x000f
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0068
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x00000068
 Call sub_0806D67C
 _0807F0C8 0x001e, 0x0000
 SoundReq 0x010b
diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc
index 7cf413c8..dab50fde 100644
--- a/data/scripts/gUnk_0800CD7C.inc
+++ b/data/scripts/gUnk_0800CD7C.inc
@@ -199,10 +199,7 @@ WaitForSomething2 0x00000008
 _0807EB74 
 _0807E914 0x00000000
 Call sub_0806C028
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x125c
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002125c
 _0807EA94 
 StartPlayerScript gUnk_0800D1B4
 WaitForSomething2 0x00000008
@@ -213,10 +210,7 @@ Wait 0x000f
 _0807E5F8 0x00000020
 StartPlayerScript gUnk_0800D1E0
 WaitForSomething2 0x00000008
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x125d
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002125d
 Jump 0x00e6
 CheckLocalFlag 0x007e
 JumpIfNot 0x000a
@@ -231,10 +225,7 @@ WaitForSomething2 0x00000004
 _0807EB74 
 _0807E914 0x00000000
 Call sub_0806C028
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x123d
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002123d
 _0807EA94 
 StartPlayerScript gUnk_0800D1B4
 WaitForSomething2 0x00000008
@@ -248,10 +239,7 @@ JumpIf 0xfffa
 SoundReq 0x00f8
 _0807E5F8 0x00000010
 SetLocalFlag 0x007e
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x123e
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002123e
 _0807EA94 
 Wait 0x000f
 _0807E930 0x0009
@@ -260,10 +248,7 @@ WaitForSomething2 0x00000004
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 Wait 0x001e
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x123f
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002123f
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc
index 31122968..e254626a 100644
--- a/data/scripts/gUnk_0800D1E0.inc
+++ b/data/scripts/gUnk_0800D1E0.inc
@@ -1,16 +1,8 @@
 SCRIPT_START gUnk_0800D1E0
 _0807F078 0x0002, 0x0001
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F918
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F918, 0x00000002
 SoundReq 0x0109
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x01e2
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x000001e2
 Call sub_0807F304
 TextboxNoOverlap 0x0502
 _0807EA94 
diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc
index 51a6d2cd..d6588c40 100644
--- a/data/scripts/gUnk_0800D414.inc
+++ b/data/scripts/gUnk_0800D414.inc
@@ -46,22 +46,8 @@ _0807EF80 0x0000
 StopScript 
 Call sub_08062698
 Call sub_080626AC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F0EC
-.short 0x0009
-.short 0x0000
-@ End of parameters
-.short 0x2806 @ _0807E078 with 9 parameters
-.short 0x0012
-.short 0x001a
-.short 0x0022
-.short 0x002a
-.short 0x0032
-.short 0x003a
-.short 0x0042
-.short 0x004a
-.short 0x0052
-@ End of parameters
+CallWithArg sub_0807F0EC, 0x00000009
+_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052
 _0807EE04 0x0038, 0x0068
 Jump 0x004e
 _0807EE04 0x0078, 0x0068
@@ -103,17 +89,8 @@ _0807EF80 0x0000
 StopScript 
 Call sub_08062698
 Call sub_080626AC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F0EC
-.short 0x0004
-.short 0x0000
-@ End of parameters
-.short 0x1406 @ _0807E078 with 4 parameters
-.short 0x0008
-.short 0x0010
-.short 0x0018
-.short 0x0020
-@ End of parameters
+CallWithArg sub_0807F0EC, 0x00000004
+_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x0020
 _0807EE04 0x0038, 0x0098
 Jump 0x001c
 _0807EE04 0x0058, 0x0098
@@ -136,11 +113,7 @@ _0807EF80 0x0008
 Call sub_0806DAAC
 JumpIf 0x008c
 Call sub_0806DAD0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000002
 StopScript 
 _0807EA4C 
 _0807E9F0 
diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc
index 95c12242..23fb2160 100644
--- a/data/scripts/gUnk_0800D76C.inc
+++ b/data/scripts/gUnk_0800D76C.inc
@@ -10,11 +10,7 @@ WaitForSomething2 0x00000008
 _0807EF80 0x0004
 Wait 0x003c
 SoundReq 0x0123
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F464
-.short 0x01e0
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F464, 0x000001e0
 _0807EDD4 0x01e0, 0x01d8
 _0807EB44 0x0002
 _0807EF80 0x0000
@@ -43,11 +39,7 @@ _0807EF80 0x000e
 Call sub_0806CA5C
 SetEntity0x20 0x00040000
 SoundReq 0x00f5
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8D0
-.short 0xe000
-.short 0xffff
-@ End of parameters
+CallWithArg sub_0807F8D0, 0xffffe000
 Call sub_0807F8BC
 JumpIf 0xffee
 _0807E5F8 0x00000004
diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc
index 48644d2a..9f531b1d 100644
--- a/data/scripts/gUnk_0800DA60.inc
+++ b/data/scripts/gUnk_0800DA60.inc
@@ -15,24 +15,14 @@ CameraTargetEntity
 Call sub_0807F5C0
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x162d
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002162d
 _0807EA94 
 _0807E5F8 0x00000001
 Wait 0x001e
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x162e
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002162e
 _0807EA94 
 _0807E8E4_0 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F75C
-.short 0x0138
-.short 0x0078
-@ End of parameters
+CallWithArg sub_0807F75C, 0x00780138
 _0807F0B4 0x0004
 CameraTargetPlayer 
 Call sub_0807F5C0
diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc
index 92bd0e55..58bdf86f 100644
--- a/data/scripts/gUnk_0800DB78.inc
+++ b/data/scripts/gUnk_0800DB78.inc
@@ -1,11 +1,7 @@
 SCRIPT_START gUnk_0800DB78
 StartScript 
 StopScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x00a0
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x000000a0
 JumpIf 0xfff4
 _0807E864 
 Call sub_0807F9A4
@@ -36,10 +32,7 @@ WaitForSomething2 0x00000002
 _0807E5F8 0x00000001
 StartPlayerScript gUnk_0800DE00
 WaitForSomething2 0x00000006
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1643
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021643
 _0807EA94 
 _0807EB28 0x1645
 _0807EA94 
@@ -47,9 +40,5 @@ Call sub_0807F3F8
 _0807E5F8 0x00000001
 SoundReq0x80100000 
 Call sub_08094F98
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000001
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc
index ab340180..4b03e8d4 100644
--- a/data/scripts/gUnk_0800DC4C.inc
+++ b/data/scripts/gUnk_0800DC4C.inc
@@ -11,18 +11,10 @@ CameraTargetPlayer
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000001
 _0807F0C8 0x0000, 0x0000
 SetLocalFlag 0x0079
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000002
 Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc
index 9acf6f22..9d75a955 100644
--- a/data/scripts/gUnk_0800DCAC.inc
+++ b/data/scripts/gUnk_0800DCAC.inc
@@ -4,11 +4,7 @@ _0807EF80 0x000a
 Call sub_08066E38
 StopScript 
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8E8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F8E8, 0x00000000
 _0807E5F8 0x00000002
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc
index 873bbe81..77bff632 100644
--- a/data/scripts/gUnk_0800DDD0.inc
+++ b/data/scripts/gUnk_0800DDD0.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800DDD0
 StartScript 
 SetEntityNonPlanarMovement 0x0100
 StopScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x00a0
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F4F8, 0x000000a0
 _0807EDD4 0x0078, 0x00a0
 _0807EB44 0x0000
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc
index 522b2fab..e53145c8 100644
--- a/data/scripts/gUnk_0800DE50.inc
+++ b/data/scripts/gUnk_0800DE50.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800DE50
 StopScript 
 _0807EB44 0x0004
 _0807EF80 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x03c5
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x000003c5
 Call sub_0807F304
 _0807E5F8 0x00000004
 Call sub_080791BC
diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc
index 5edcc2dd..133bb63f 100644
--- a/data/scripts/gUnk_0800DF24.inc
+++ b/data/scripts/gUnk_0800DF24.inc
@@ -19,10 +19,7 @@ Call sub_0807F5C0
 Call sub_08066C94
 Wait 0x00e9
 _0807EF80 0x0007
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x162f
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002162f
 _0807EA94 
 SoundReq2 0x002f
 _0807EF80 0x0019
diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc
index 26809abf..df19f791 100644
--- a/data/scripts/gUnk_0800DFB4.inc
+++ b/data/scripts/gUnk_0800DFB4.inc
@@ -6,11 +6,7 @@ SoundReq0x80100000
 _0807E864 
 Call sub_0807DF28
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000004
 Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc
index 4c7c69b0..d0363b58 100644
--- a/data/scripts/gUnk_0800DFE4.inc
+++ b/data/scripts/gUnk_0800DFE4.inc
@@ -4,10 +4,7 @@ Call sub_0807DF28
 _0807E864 
 StopScript 
 SoundReq0x80100000 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1632
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021632
 _0807EA94 
 SetRoomFlag 0x0003
 CheckRoomFlag 0x0000
@@ -20,18 +17,11 @@ JumpIfNot 0xfffa
 _0807E864 
 Call sub_0807DF28
 SetLocalFlag 0x007b
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1639
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1639
 _0807EA94 
 Wait 0x0096
 SoundReq 0x00f6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0005
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000005
 Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc
index b50cfa04..b28961b6 100644
--- a/data/scripts/gUnk_0800E0BC.inc
+++ b/data/scripts/gUnk_0800E0BC.inc
@@ -5,11 +5,7 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0093
 JumpIf 0x0062
 _0807E930 0x0008
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8E8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F8E8, 0x00000000
 StopScript 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -52,11 +48,7 @@ _0807EF80 0x000a
 CheckLocalFlag 0x0094
 JumpIf 0x006c
 _0807E930 0x0010
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8E8
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F8E8, 0x00000001
 StopScript 
 CheckRoomFlag 0x0001
 JumpIfNot 0xfffa
@@ -76,20 +68,12 @@ Wait 0x001e
 _0807EF80 0x0000
 _0807EB8C 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Wait 0x000a
 TextboxNoOverlap 0x2401
 _0807EA94 
 SetLocalFlag 0x0094
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807E9D4 
 _0807E878 
 StopScript 
@@ -97,11 +81,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 TextboxNoOverlap 0x2401
 _0807EA94 
 _0807E878 
@@ -115,21 +95,13 @@ JumpIfNot 0x001e
 _0807E9D4 
 SetEntityPositionRelative 0x01680070
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 Jump 0x00fe
 CheckLocalFlag 0x0095
 JumpIf 0x0062
 _0807E930 0x0010
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8E8
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F8E8, 0x00000002
 StopScript 
 CheckRoomFlag 0x0002
 JumpIfNot 0xfffa
@@ -149,18 +121,10 @@ Wait 0x001e
 _0807EF80 0x0000
 _0807EB8C 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 SetLocalFlag 0x0095
 _0807EF80 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807E9D4 
 _0807E878 
 StopScript 
@@ -178,34 +142,18 @@ _0807E9DC
 SetLocalFlag 0x0073
 StopScript 
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 _0807EDD4 0x0088, 0x0168
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 _0807EDD4 0x0070, 0x0168
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807E9D4 
 Jump 0x001e
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 TextboxNoOverlap 0x2404
 _0807EA94 
@@ -215,11 +163,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 TextboxNoOverlap 0x2403
 _0807EA94 
 _0807E878 
@@ -233,11 +177,7 @@ JumpIf 0x0088
 CheckLocalFlag 0x0096
 JumpIf 0x0056
 _0807E930 0x000c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8E8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F8E8, 0x00000000
 StopScript 
 CheckRoomFlag 0x0000
 JumpIfNot 0xfffa
@@ -300,11 +240,7 @@ _0807E878
 Jump 0xffe8
 StartScript 
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807EF80 0x000a
 _0807E9D4 
 StopScript 
@@ -312,22 +248,14 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 TextboxNoOverlap 0x2405
 _0807EA94 
 _0807E878 
 Jump 0xffe2
 StartScript 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 _0807EF80 0x000a
 _0807E9D4 
 StopScript 
@@ -335,11 +263,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 TextboxNoOverlap 0x2407
 _0807EA94 
 _0807E878 
diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc
index 9029d166..c8156250 100644
--- a/data/scripts/gUnk_0800E6B0.inc
+++ b/data/scripts/gUnk_0800E6B0.inc
@@ -48,11 +48,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000000
 Call sub_0806AFE8
 _0807EA94 
 _0807E878 
@@ -85,11 +81,7 @@ _0807E878
 Jump 0xffd0
 _0807EF80 0x000f
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000004
 Call sub_0806AF70
 _0807EE04 0x0188, 0x0058
 StopScript 
@@ -127,37 +119,16 @@ _0807E864
 _0807EB44 0x0004
 StartScript 
 TextboxNoOverlapFollow 0x4501
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x0032
-.short 0x0001
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x00c8
-.short 0x0002
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x0190
-.short 0x0003
-@ End of parameters
+CallWithArg sub_0807F854, 0x00010032
+CallWithArg sub_0807F854, 0x000200c8
+CallWithArg sub_0807F854, 0x00030190
 StopScript 
 _0807EA94 
 _0807EB38 
-.short 0x1406 @ _0807E078 with 4 parameters
-.short 0x00a6
-.short 0x006a
-.short 0x0036
-.short 0x0002
-@ End of parameters
+_0807E078_ssss 0x00a6, 0x006a, 0x0036, 0x0002
 StartScript 
 TextboxNoOverlapFollow 0x4505
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x0190
-.short 0x0001
-@ End of parameters
+CallWithArg sub_0807F854, 0x00010190
 StopScript 
 _0807EA94 
 HasRupees 0x0190
diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc
index 0e3e62d8..d78226ec 100644
--- a/data/scripts/gUnk_0800E8A4.inc
+++ b/data/scripts/gUnk_0800E8A4.inc
@@ -1,11 +1,7 @@
 SCRIPT_START gUnk_0800E8A4
 StartScript 
 TextboxNoOverlapFollow 0x4504
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x00c8
-.short 0x0001
-@ End of parameters
+CallWithArg sub_0807F854, 0x000100c8
 StopScript 
 _0807EA94 
 HasRupees 0x00c8
diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc
index 40eb094e..1861c260 100644
--- a/data/scripts/gUnk_0800E8D6.inc
+++ b/data/scripts/gUnk_0800E8D6.inc
@@ -1,11 +1,7 @@
 SCRIPT_START gUnk_0800E8D6
 StartScript 
 TextboxNoOverlapFollow 0x4503
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x0032
-.short 0x0001
-@ End of parameters
+CallWithArg sub_0807F854, 0x00010032
 StopScript 
 _0807EA94 
 HasRupees 0x0032
diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc
index 0a6bc3a1..4abce151 100644
--- a/data/scripts/gUnk_0800EA54.inc
+++ b/data/scripts/gUnk_0800EA54.inc
@@ -9,11 +9,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 Call sub_0807F2D4
 _0807E930 0x0009
 Call sub_0806CE80
@@ -35,11 +31,7 @@ JumpIfNot 0xfffc
 StartScript 
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806C028
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806C028, 0x00000004
 StopScript 
 Call sub_0806C00C
 JumpIfNot 0xfff8
@@ -164,11 +156,7 @@ Jump 0xffe4
 .short 0x0000
 StartScript 
 _0807E9D4 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08061FB8
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08061FB8, 0x00000001
 SetEntityNonPlanarMovement 0x0040
 _0807EF80 0x000a
 _0807EB44 0x0004
@@ -200,21 +188,13 @@ Call sub_080639D0
 _0807EF80 0x000a
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08063850
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08063850, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08063850
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08063850, 0x00000000
 Call sub_08063944
 _0807EA94 
 JumpIfNot 0x0008
@@ -222,11 +202,7 @@ _0807F050 0x0070
 WaitPlayerAction8 
 _0807E878 
 Call sub_08063874
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08063850
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08063850, 0x00000000
 Jump 0xffc6
 StartScript 
 Call sub_08064CC0
@@ -280,11 +256,7 @@ Jump 0xff88
 StopScript 
 WaitForSomething2 0x00000002
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 WaitForSomething2 0x00000004
 Call sub_0806AED8
 WaitForSomething2 0x00000008
@@ -330,11 +302,7 @@ Jump 0xff88
 StopScript 
 WaitForSomething2 0x00000010
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 WaitForSomething2 0x00000020
 Call sub_0806AED8
 WaitForSomething2 0x00000040
diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc
index 91729462..4dbd2466 100644
--- a/data/scripts/gUnk_0800EFC0.inc
+++ b/data/scripts/gUnk_0800EFC0.inc
@@ -8,61 +8,29 @@ JumpIf 0x00b0
 StopScript 
 Jump 0x0026
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 Wait 0x0004
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 Wait 0x0004
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 Wait 0x0004
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000004
 _0807EDD4 0x0088, 0x0040
 _0807EF80 0x000a
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 Wait 0x0004
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 Wait 0x0004
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000008
 Wait 0x0004
 _0807EB44 0x0006
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000004
 _0807EDD4 0x0068, 0x0040
 _0807EF80 0x000a
 CheckLocalFlag 0x007b
@@ -86,27 +54,18 @@ StartPlayerScript gUnk_0800F14C
 WaitForSomething2 0x00000001
 _0807E5F8 0x0000001e
 WaitForSomething2 0x00000040
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1201
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1201
 _0807EA94 
 WaitForSomething2 0x000003c0
 _0807E8E4_0 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1202
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1202
 _0807EA94 
 _0807F034 0x0067
 WaitPlayerAction8 
 _0807E8E4_0 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000040
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1203
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1203
 _0807EA94 
 _0807E5F8 0x00000002
 Call sub_0807DF50
diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc
index 43da522f..f60a8a51 100644
--- a/data/scripts/gUnk_0800F184.inc
+++ b/data/scripts/gUnk_0800F184.inc
@@ -22,11 +22,7 @@ _0807E5F8 0x00000040
 WaitForSomething2 0x00000002
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F680
-.short 0x01c0
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F680, 0x000001c0
 JumpIf 0x0034
 StopScript 
 _0807E864 
@@ -35,20 +31,13 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1206
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1206
 _0807EA94 
 StartPlayerScript gUnk_0800F33C
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xffbe
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F680
-.short 0x0230
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F680, 0x00000230
 JumpIfNot 0x0034
 StopScript 
 _0807E864 
@@ -57,20 +46,13 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1206
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1206
 _0807EA94 
 StartPlayerScript gUnk_0800F354
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xff7e
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x0310
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x00000310
 JumpIf 0x0034
 StopScript 
 _0807E864 
@@ -79,20 +61,13 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1206
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1206
 _0807EA94 
 StartPlayerScript gUnk_0800F36C
 WaitForSomething2 0x00000400
 _0807E878 
 Jump 0xff3e
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x0340
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x00000340
 JumpIfNot 0x0034
 StopScript 
 _0807E864 
@@ -101,10 +76,7 @@ _0807EB74
 _0807E930 0x0008
 _0807EF80 0x0004
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1206
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1206
 _0807EA94 
 StartPlayerScript gUnk_0800F384
 WaitForSomething2 0x00000400
@@ -120,10 +92,7 @@ StopScript
 _0807E864 
 _0807EB74 
 _0807E930 0x0008
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1208
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1208
 _0807EA94 
 _0807E878 
 Jump 0xfed4
diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc
index 8498a957..d256298a 100644
--- a/data/scripts/gUnk_0800F554.inc
+++ b/data/scripts/gUnk_0800F554.inc
@@ -33,21 +33,13 @@ StartScript
 _0807EB44 0x0006
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 Call sub_08064428
 _0807EA94 
 _0807E878 
@@ -64,11 +56,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 TextboxNoOverlap 0x2511
 _0807EA94 
 Wait 0x000f
@@ -117,11 +105,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 CheckLocalFlag 0x00cd
 JumpIf 0x000a
 TextboxNoOverlap 0x2512
@@ -130,11 +114,7 @@ TextboxNoOverlap 0x251f
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Jump 0xffc4
 .short 0x0000
 StartScript 
diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc
index 20e3c8ad..311f46f9 100644
--- a/data/scripts/gUnk_0800F724.inc
+++ b/data/scripts/gUnk_0800F724.inc
@@ -26,10 +26,7 @@ SetEntityPositionRelative 0x036800c8
 Call sub_0807F5C0
 WaitForSomething2 0x00000001
 WaitForSomething2 0x00000004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x2501
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00002501
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -45,10 +42,7 @@ StartPlayerScript gUnk_0800FA78
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x2503
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e2503
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -61,10 +55,7 @@ StartPlayerScript gUnk_0800FA9C
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x2504
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e2504
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -77,10 +68,7 @@ StartPlayerScript gUnk_0800FAC0
 WaitForSomething2 0x00000001
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x2505
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e2505
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -95,10 +83,7 @@ Wait 0x001e
 _0807E8E4_0 
 Call sub_0807F3F8
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1021
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1021
 _0807EA94 
 StartPlayerScript gUnk_0800FAE4
 SetEntityPositionRelative 0x025800f0
@@ -107,71 +92,44 @@ CameraTargetEntity
 Wait 0x001e
 Call sub_08063C2C
 WaitForSomething2 0x00000001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1022
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1022
 _0807EA94 
 _0807E8E4_0 
 Call sub_08063C14
 Call sub_08094CDC
 Wait 0x001e
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1023
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1023
 _0807EA94 
 Call sub_08063C14
 Call sub_08094DD8
 Wait 0x001e
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1024
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1024
 _0807EA94 
 Call sub_08063C14
 Call sub_08094D34
 Wait 0x001e
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1025
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1025
 _0807EA94 
 Call sub_08063C5C
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1026
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1026
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
 _0807E8E4_1 
 Call sub_08063C2C
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1027
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001027
 _0807EA94 
 Call sub_08063C74
 Wait 0x003c
 Call sub_08063C14
 _0807E8E4_0 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1028
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e1028
 _0807EA94 
 _0807E8E4_1 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1029
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001029
 _0807EA94 
 _0807E8E4_0 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x102a
-.short 0x000e
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000e102a
 _0807EA94 
 Call sub_08063C14
 Call sub_08094D70
@@ -186,40 +144,22 @@ Wait 0x001e
 _0807E8E4_1 
 Call sub_0807F3F8
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x102b
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000102b
 _0807EA94 
 _0807F034 0x000d
 WaitPlayerAction8 
 Call sub_0806DC3C
 Call sub_080791BC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F244
-.short 0x000d
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F244, 0x0000000d
 _0807E914 0x000000ff
 Call sub_0807F5B0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x49d6
-.short 0x0800
-@ End of parameters
+CallWithArg sub_0807F29C, 0x080049d6
 Wait 0x00b7
 _0807E914 0x00000000
 Call sub_0807F5B0
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x102c
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000102c
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F29C, 0x00000000
 Call sub_0806DC58
 _0807F0B4 0x0004
 CameraTargetPlayer 
diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc
index ccbf8ef7..d0d38459 100644
--- a/data/scripts/gUnk_0800FAE4.inc
+++ b/data/scripts/gUnk_0800FAE4.inc
@@ -3,22 +3,9 @@ StartScript
 SetEntityNonPlanarMovement 0x0100
 StopScript 
 Call sub_0807F584
-.short 0x1406 @ _0807E078 with 4 parameters
-.short 0x0012
-.short 0x001a
-.short 0x000e
-.short 0x0002
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x027c
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F464
-.short 0x00e8
-.short 0x0000
-@ End of parameters
+_0807E078_ssss 0x0012, 0x001a, 0x000e, 0x0002
+CallWithArg sub_0807F4F8, 0x0000027c
+CallWithArg sub_0807F464, 0x000000e8
 _0807EDD4 0x00e8, 0x0270
 _0807EB44 0x0000
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc
index 7e869814..76ba4b49 100644
--- a/data/scripts/gUnk_0800FD0C.inc
+++ b/data/scripts/gUnk_0800FD0C.inc
@@ -8,10 +8,7 @@ CheckLocalFlag 0x00cd
 JumpIf 0x0030
 _0807E864 
 Call sub_0807F9A4
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x2506
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00002506
 _0807EA94 
 StartPlayerScript gUnk_0800FD80
 WaitForSomething2 0x00000008
@@ -21,10 +18,7 @@ CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
 JumpIfNot 0xfff6
 _0807E864 
 Call sub_0807F9A4
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x106c
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000106c
 _0807EA94 
 StartPlayerScript gUnk_0800FD80
 WaitForSomething2 0x00000008
diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc
index e8d9db8e..e4a5332f 100644
--- a/data/scripts/gUnk_0800FDA0.inc
+++ b/data/scripts/gUnk_0800FDA0.inc
@@ -83,11 +83,7 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 StopScript 
 StopScript 
 StartScript 
@@ -98,11 +94,7 @@ JumpIfNot 0xffee
 StopScript 
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 Call sub_08064428
 _0807EA94 
 Wait 0x000f
diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc
index f84775de..f7700c6c 100644
--- a/data/scripts/gUnk_0800FF18.inc
+++ b/data/scripts/gUnk_0800FF18.inc
@@ -4,11 +4,7 @@ CheckInventory1 0x0012
 JumpIf 0x004a
 _0807EB44 0x0006
 _0807E9D4 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 StopScript 
 StopScript 
 StartScript 
@@ -19,11 +15,7 @@ JumpIfNot 0xffee
 StopScript 
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 Call sub_08064428
 _0807EA94 
 Wait 0x000f
diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc
index e258b17d..e1cff739 100644
--- a/data/scripts/gUnk_0800FF74.inc
+++ b/data/scripts/gUnk_0800FF74.inc
@@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800FF74
 StartScript 
 _0807EB44 0x0002
 _0807E9D4 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 Call sub_080644A4
 ClearLocalFlag 0x00c7
 StopScript 
@@ -30,11 +26,7 @@ StopScript
 SetLocalFlag 0x00c7
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 CheckInventory1 0x0048
 JumpIf 0x000c
 TextboxNoOverlap 0x3401
@@ -53,35 +45,19 @@ _0807E888
 Call sub_0807F594
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 SoundReq 0x00cd
 TextboxNoOverlap 0x340a
 _0807EA94 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x000c
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x0000000c
 SetEntityNonPlanarMovement 0x0100
 _0807EDD4 0x0018, 0x0108
 _0807EB44 0x0002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 SetLocalFlag 0x00ce
 Call sub_080644A4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F5B0
-.short 0x000a
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F5B0, 0x0000000a
 _0807E878 
 Jump 0xff1e
 .short 0x0000
@@ -89,31 +65,19 @@ StartScript
 _0807E9D4 
 _0807EF80 0x000a
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080672B0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080672B0, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080672B0
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080672B0, 0x00000004
 TextboxNoOverlapFollow 0x0a01
 _0807EA94 
 Wait 0x000f
 _0807E878 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080672B0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080672B0, 0x00000000
 Jump 0xffd0
 _0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc
index 340ed779..ac5aba5f 100644
--- a/data/scripts/gUnk_080100C8.inc
+++ b/data/scripts/gUnk_080100C8.inc
@@ -48,21 +48,14 @@ _0807E864
 _0807EB74 
 CheckRoomFlag 0x0001
 JumpIf 0x0034
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x3001
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00003001
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x002e
 Call sub_080A1608
 _0807EA94 
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080A1550
-.short 0x01ac
-.short 0x0801
-@ End of parameters
+CallWithArg sub_080A1550, 0x080101ac
 JumpIfNot 0xffca
 SoundReq2 0x0015
 SetRoomFlag 0x0001
@@ -78,20 +71,13 @@ StopScript
 Call sub_080A1270
 _0807E864 
 Call sub_0807DF28
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x3004
-.short 0x0007
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00073004
 _0807EA94 
 SoundReq0x80100000 
 _0807E778 0x0004
 DoFade5 
 WaitFor_2 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F75C
-.short 0x0378
-.short 0x0340
-@ End of parameters
+CallWithArg sub_0807F75C, 0x03400378
 Call sub_080791BC
 Call sub_0807FB74
 _0807E8E4_1 
@@ -117,11 +103,7 @@ _0807EA94
 Call sub_080A14A8
 Call sub_0807DF50
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F5B0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F5B0, 0x00000000
 ClearRoomFlag 0x0001
 Call sub_080A169C
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc
index dfdd0f66..fdcfa114 100644
--- a/data/scripts/gUnk_08010264.inc
+++ b/data/scripts/gUnk_08010264.inc
@@ -58,22 +58,8 @@ StopScript
 StopScript 
 Call sub_08062698
 Call sub_080626AC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F0EC
-.short 0x0009
-.short 0x0000
-@ End of parameters
-.short 0x2806 @ _0807E078 with 9 parameters
-.short 0x0012
-.short 0x001a
-.short 0x0022
-.short 0x002a
-.short 0x0032
-.short 0x003a
-.short 0x0042
-.short 0x004a
-.short 0x0052
-@ End of parameters
+CallWithArg sub_0807F0EC, 0x00000009
+_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052
 _0807EE04 0x0358, 0x0078
 Jump 0x004e
 _0807EE04 0x0390, 0x0078
@@ -111,11 +97,7 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 StopScript 
 Wait 0x003c
 Call sub_0806407C
@@ -125,11 +107,7 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -161,20 +139,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 Call sub_080636D8
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Jump 0xffd2
 StartScript 
 _0807EB44 0x0004
@@ -187,20 +157,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000004
 Call sub_08063C90
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Jump 0xffd2
 StartScript 
 _0807EB44 0x0004
@@ -213,26 +175,14 @@ JumpIfNot 0xfffc
 _0807E864 
 Call sub_0807DF28
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 CheckRoomFlag 0x000e
 JumpIf 0x000c
 SetRoomFlag 0x000e
 TextboxNoOverlap 0x2b10
 _0807EA94 
 Call sub_080634E4
-.short 0x2006 @ _0807E078 with 7 parameters
-.short 0x000e
-.short 0x0020
-.short 0x0036
-.short 0x0034
-.short 0x000e
-.short 0x0024
-.short 0x002e
-@ End of parameters
+_0807E078_sssssss 0x000e, 0x0020, 0x0036, 0x0034, 0x000e, 0x0024, 0x002e
 TextboxNoOverlap 0x2b0d
 Jump 0x0096
 CheckGlobalFlag 0x003d
@@ -245,19 +195,11 @@ CheckGlobalFlag 0x003b
 JumpIfNot 0x0072
 Jump 0x0002
 Call sub_080634EC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F78C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F78C, 0x00000000
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x005a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F7C4
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F7C4, 0x00000000
 JumpIfNot 0x0030
 _0807E48C 0x0020
 JumpIfNot 0x0030
@@ -265,11 +207,7 @@ Call sub_08063504
 JumpIf 0x002e
 TextboxNoOverlap 0x2b07
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F800
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F800, 0x00000000
 WaitPlayerAction8 
 _0807EA94 
 TextboxNoOverlap 0x2b0c
@@ -339,12 +277,9 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x0411 @ HasRoomItemForSale with 0 parameters
+HasRoomItemForSale 
 Call sub_0807F77C
-.short 0x0c5d @ _0807EAF0 with 2 parameters
-.short 0x3c08
-.short 0x3c09
-@ End of parameters
+_0807EAF0 0x3c08, 0x3c09
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
@@ -362,16 +297,12 @@ _0807E864
 _0807EB74 
 Call sub_0807F2D4
 _0807EF80 0x0000
-.short 0x0411 @ HasRoomItemForSale with 0 parameters
+HasRoomItemForSale 
 JumpIf 0x000a
 TextboxNoOverlap 0x3c07
 Jump 0x0048
 Call sub_08062EB8
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F78C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F78C, 0x00000000
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x0030
@@ -457,7 +388,7 @@ StopScript
 StartScript 
 CheckPlayerInRegion2 0x3030
 JumpIfNot 0xffe4
-.short 0x0411 @ HasRoomItemForSale with 0 parameters
+HasRoomItemForSale 
 JumpIf 0x004c
 CheckEntityInteractType 
 JumpIfNot 0xffea
diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc
index 60379c95..00775f4e 100644
--- a/data/scripts/gUnk_08010A98.inc
+++ b/data/scripts/gUnk_08010A98.inc
@@ -1,11 +1,7 @@
 SCRIPT_START gUnk_08010A98
 StartScript 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080672B0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080672B0, 0x00000000
 _0807EF80 0x000a
 Call sub_08067314
 StopScript 
@@ -13,20 +9,12 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080672B0
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080672B0, 0x00000004
 Call sub_08067304
 _0807EA94 
 _0807E878 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080672B0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080672B0, 0x00000000
 Jump 0xffd2
 StartScript 
 CheckInventory1 0x0067
@@ -34,8 +22,7 @@ JumpIfNot 0x0076
 _0807EB44 0x0004
 _0807EF80 0x0000
 SetEntityNonPlanarMovement 0x0180
-.short 0x0c0c @ CallWithArg with 0 parameters
-.word sub_0807F348
+CallWithArg_p sub_0807F348
 Call sub_0806075C
 StopScript 
 _0807EA94 
@@ -48,11 +35,7 @@ StopScript
 StartScript 
 _0807E564 
 JumpIf 0x0010
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080608E4
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080608E4, 0x00000000
 JumpIf 0x000c
 _0807EE30 
 JumpIfNot 0xffe4
@@ -61,11 +44,7 @@ StopScript
 _0807EF80 0x0000
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080608E4
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080608E4, 0x00000001
 JumpIf 0xfff0
 StopScript 
 Jump 0xffbc
diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc
index 9132cb25..c0fb63d9 100644
--- a/data/scripts/gUnk_08010BB4.inc
+++ b/data/scripts/gUnk_08010BB4.inc
@@ -22,24 +22,15 @@ Call sub_0807DF28
 StartPlayerScript gUnk_08011074
 WaitForSomething2 0x00000400
 _0807F078 0x0034, 0x0002
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1036
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1036
 _0807EA94 
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1037
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021037
 _0807EA94 
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1038
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1038
 _0807EA94 
 SoundReq0x80100000 
 _0807E778 0x0004
@@ -76,10 +67,7 @@ WaitForSomething2 0x00055000
 _0807E8E4_1 
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1039
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1039
 _0807EA94 
 SoundReq2 0x0001
 _0807E8E4_2 
@@ -92,10 +80,7 @@ WaitForSomething2 0x00000080
 Wait 0x012c
 _0807E5F8 0x00000004
 WaitForSomething2 0x00000008
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x103a
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c103a
 _0807EA94 
 SetEntityPositionRelative 0x01c001f8
 _0807F0B4 0x0004
@@ -113,10 +98,7 @@ SoundReq0x80100000
 SoundReq 0x009b
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1043
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001043
 _0807EA94 
 SoundReq2 0x000d
 _0807E5F8 0x00000100
@@ -127,19 +109,12 @@ SoundReq 0x01c7
 SoundReq 0x00e5
 _0807E5F8 0x00000100
 _0807E5F8 0x00002800
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 WaitForSomething2 0x00000200
 WaitForSomething2 0x00005000
 _0807E5F8 0x00028000
 WaitForSomething2 0x00050000
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1044
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001044
 _0807EA94 
 SetEntityPositionRelative 0x009801f8
 SoundReq0x80100000 
@@ -149,26 +124,14 @@ _0807E5F8 0x00028000
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
 WaitForSomething2 0x00050000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 SoundReq 0x00e5
 _0807E5F8 0x00028000
 WaitForSomething2 0x00050000
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 _0807E5F8 0x08000000
 _0807E5F8 0x00800000
 WaitForSomething2 0x01000000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000002
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc
index 091372b0..49c34af6 100644
--- a/data/scripts/gUnk_08010E5A.inc
+++ b/data/scripts/gUnk_08010E5A.inc
@@ -1,25 +1,13 @@
 SCRIPT_START gUnk_08010E5A
 Wait 0x001e
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 Wait 0x003c
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 Wait 0x0004
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 Wait 0x001e
 SoundReq 0x012c
 _0807E5F8 0x00800000
@@ -36,24 +24,12 @@ WaitForSomething2 0x00000020
 _0807E778 0x0002
 DoFade6 
 WaitFor_2 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000002
 _0807F0C8 0x0000, 0x0000
 Call sub_0806DC3C
 Call sub_080791BC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F244
-.short 0x000d
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x49f6
-.short 0x0800
-@ End of parameters
+CallWithArg sub_0807F244, 0x0000000d
+CallWithArg sub_0807F29C, 0x080049f6
 _0807F0B4 0x0001
 SetEntityPositionRelative 0x006801f8
 _0807E5F8 0x00000004
@@ -64,30 +40,16 @@ WaitForSomething2 0x00000080
 SoundReq 0x01c3
 _0807E5F8 0x20000000
 Wait 0x0078
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F29C, 0x00000000
 Call sub_0806DC58
 _0807E5F8 0x40000000
 _0807E5F8 0x00000010
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000020
 WaitForSomething2 0x00000200
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1045
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1045
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1046
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001046
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000002
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc
index a9b0d8c3..83aaab92 100644
--- a/data/scripts/gUnk_08010F84.inc
+++ b/data/scripts/gUnk_08010F84.inc
@@ -4,68 +4,35 @@ _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
 StartPlayerScript gUnk_080110BC
 WaitForSomething2 0x00000400
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1047
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001047
 _0807EA94 
 Call sub_0806DC3C
 Call sub_080791BC
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F244
-.short 0x000d
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x49f6
-.short 0x0800
-@ End of parameters
+CallWithArg sub_0807F244, 0x0000000d
+CallWithArg sub_0807F29C, 0x080049f6
 Wait 0x001e
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F29C, 0x00000000
 Call sub_0806DC58
 Wait 0x003c
 _0807E5F8 0x08000000
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 Wait 0x000f
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
+CallWithArg sub_0805DE18, 0x00000002
 _0807F0C8 0x0000, 0x0000
 _0807E5F8 0x00000010
 WaitForSomething2 0x00000020
 SoundReq0x80100000 
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x104a
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0000104a
 _0807EA94 
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000200
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1049
-.short 0x0000
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00001049
 _0807EA94 
 SetEntityPositionRelative 0x009801f8
 Wait 0x0078
diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc
index cba7271c..6f7084ff 100644
--- a/data/scripts/gUnk_080112C4.inc
+++ b/data/scripts/gUnk_080112C4.inc
@@ -15,12 +15,7 @@ Wait 0x003c
 _0807ECC4 0x0010
 _0807E930 0x0002
 Call sub_08064050
-.short 0x1406 @ _0807E078 with 4 parameters
-.short 0x0008
-.short 0x009e
-.short 0x0134
-.short 0x01f8
-@ End of parameters
+_0807E078_ssss 0x0008, 0x009e, 0x0134, 0x01f8
 _0807E610 0x00000800
 _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc
index 91e4eaa3..0b7419aa 100644
--- a/data/scripts/gUnk_080116A8.inc
+++ b/data/scripts/gUnk_080116A8.inc
@@ -33,11 +33,7 @@ WaitForSomething2 0x00000100
 _0807EB44 0x0000
 _0807EF80 0x0014
 SoundReq 0x0120
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095420
-.short 0x1890
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095420, 0x08011890
 Wait 0x00f0
 _0807EF80 0x0016
 SoundReq 0x01cb
@@ -54,11 +50,7 @@ _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 _0807EF80 0x0014
 SoundReq 0x01c4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0809545C
-.short 0x18d4
-.short 0x0801
-@ End of parameters
+CallWithArg sub_0809545C, 0x080118d4
 _0807E5F8 0x00000200
 WaitForSomething2 0x00000100
 Wait 0x003c
diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc
index 725a60b7..40a6ed1f 100644
--- a/data/scripts/gUnk_0801194C.inc
+++ b/data/scripts/gUnk_0801194C.inc
@@ -11,21 +11,13 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 CheckGlobalFlag 0x0015
 JumpIf 0x000a
 TextboxNoOverlapFollow 0x103d
@@ -39,11 +31,7 @@ StartScript
 _0807E9D4 
 _0807EB44 0x0004
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x000c
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x0000000c
 StopScript 
 Wait 0x003c
 Call sub_0806407C
@@ -61,21 +49,13 @@ StartScript
 _0807EB44 0x0006
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Call sub_08064428
 _0807EA94 
 _0807E878 
@@ -85,21 +65,13 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 TextboxNoOverlapFollow 0x1320
 _0807EA94 
 _0807E878 
@@ -108,26 +80,14 @@ StartScript
 _0807EB44 0x0002
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080644B4
-.short 0x0006
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
+CallWithArg sub_080644B4, 0x00000006
 JumpIf 0x005e
 TextboxNoOverlapFollow 0x1320
 _0807EA94 
@@ -138,21 +98,13 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 TextboxNoOverlapFollow 0x1322
 _0807EA94 
 _0807E878 
@@ -162,17 +114,10 @@ JumpIfNot 0xfffa
 _0807E864 
 Call sub_0807F9A4
 Call sub_0807DF28
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1321
-.short 0x0007
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00071321
 _0807EA94 
 SetLocalFlag 0x0010
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA1C
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA1C, 0x00000003
 _0807E878 
 Call sub_0807DF50
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc
index 35081eb2..b202d00e 100644
--- a/data/scripts/gUnk_08011B20.inc
+++ b/data/scripts/gUnk_08011B20.inc
@@ -1,10 +1,7 @@
 SCRIPT_START gUnk_08011B20
 _0807E864 
 Call sub_0807DF28
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1320
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1320
 _0807EA94 
 _0807E878 
 Call sub_0807DF50
diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc
index 6ad1ab68..c3171095 100644
--- a/data/scripts/gUnk_08011B40.inc
+++ b/data/scripts/gUnk_08011B40.inc
@@ -39,11 +39,7 @@ ModRupees 0xfff6
 Wait 0x001e
 TextboxNoOverlap 0x3d06
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806C2A0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806C2A0, 0x00000000
 WaitFor_2 
 Wait 0x003c
 Call sub_0806C224
@@ -51,11 +47,7 @@ Jump 0xffb8
 StartScript 
 _0807E888 
 StopScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806C2A0
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806C2A0, 0x00000001
 WaitFor_2 
 Wait 0x003c
 _0807E878 
@@ -77,11 +69,7 @@ JumpIfNot 0xfffa
 _0807E888 
 WaitPlayerAction8 
 Wait 0x001e
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806C2A0
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806C2A0, 0x00000000
 WaitFor_2 
 Wait 0x003c
 Call sub_0806C280
diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc
index 7edf3874..3ef468d6 100644
--- a/data/scripts/gUnk_08011C50.inc
+++ b/data/scripts/gUnk_08011C50.inc
@@ -3,11 +3,7 @@ StartScript
 _0807E864 
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806C2A0
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806C2A0, 0x00000001
 WaitFor_2 
 Wait 0x003c
 _0807EF80 0x0014
diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc
index 2a3be8da..98468103 100644
--- a/data/scripts/gUnk_0801232C.inc
+++ b/data/scripts/gUnk_0801232C.inc
@@ -29,9 +29,7 @@ StartScript
 _0807E778 0x0004
 _0807E788 0x00007fff
 DoFade5 
-.short 0x0842 @ _0807E858 with 1 parameters
-.short 0x0080
-@ End of parameters
+_0807E858 0x0080
 StopScript 
 WaitFor_2 
 SoundReq2 0x002c
@@ -55,9 +53,7 @@ StartScript
 _0807E778 0x0004
 _0807E788 0xffffffff
 DoFade4 
-.short 0x0842 @ _0807E858 with 1 parameters
-.short 0x0080
-@ End of parameters
+_0807E858 0x0080
 StopScript 
 WaitFor_2 
 SoundReq2 0xffff
diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc
index 5b134e84..ddb03a27 100644
--- a/data/scripts/gUnk_08012430.inc
+++ b/data/scripts/gUnk_08012430.inc
@@ -32,18 +32,13 @@ _0807E864
 Call sub_0807F9A4
 Call sub_0807DF28
 StartPlayerScript gUnk_08012AB0
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1101
-.short 0x0007
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00071101
 _0807EA94 
 CameraTargetPlayer 
 _0807E778 0x0004
 _0807E80C 0x00000000
 WaitFor_2 
-.short 0x0842 @ _0807E858 with 1 parameters
-.short 0x0000
-@ End of parameters
+_0807E858 0x0000
 Call sub_080791BC
 LoadRoomEntityList gUnk_080F4D70
 Call DeleteAllEnemies
@@ -153,11 +148,7 @@ Wait 0x003c
 SoundReq2 0xffff
 Call sub_08054570
 SetGlobalFlag 0x0014
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6F8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6F8, 0x00000008
 Call sub_0807DF50
 _0807E878 
 _0807EF80 0x0006
diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc
index c78d88d0..0cd25565 100644
--- a/data/scripts/gUnk_080126FC.inc
+++ b/data/scripts/gUnk_080126FC.inc
@@ -7,20 +7,14 @@ _0807E930 0x0020
 WaitForSomething2 0x00000004
 _0807E930 0x0022
 Call sub_0807F3C8
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1102
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1102
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
 Call sub_0807F3C8
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1103
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1103
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
@@ -31,44 +25,29 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807EF80 0x0011
 _0807E930 0x001c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1105
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1105
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0022
 Call sub_0807F3C8
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1106
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1106
 _0807EA94 
 _0807E930 0x001c
 Call sub_0806D96C
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1107
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1107
 _0807EA94 
 _0807E930 0x0020
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0021
 Call sub_0807F3C8
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1108
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1108
 _0807EA94 
 _0807E930 0x001c
 Call sub_0806D96C
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1109
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1109
 _0807EA94 
 _0807E930 0x0020
 _0807EF80 0x000a
@@ -84,21 +63,14 @@ StopScript
 _0807E864 
 Call sub_0806D944
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1114
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1114
 _0807EA94 
 _0807E930 0x0020
 _0807E878 
 Jump 0xffd0
 _0807E864 
 _0807E9DC 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F5B0
-.short 0x003c
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F5B0, 0x0000003c
 Call sub_080791D0
 StopScript 
 _0807E5F8 0x00000008
@@ -108,19 +80,13 @@ _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 Call sub_0806D944
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x110a
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c110a
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x110b
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c110b
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
@@ -128,28 +94,19 @@ WaitForSomething2 0x00000004
 _0807EF80 0x0004
 Wait 0x003c
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x110c
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c110c
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x110d
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c110d
 _0807EA94 
 _0807E930 0x001f
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000004
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x110e
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c110e
 _0807EA94 
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
@@ -170,10 +127,7 @@ Jump 0xffe6
 _0807E864 
 _0807E930 0x0010
 StopScript 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1115
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1115
 _0807EA94 
 _0807E930 0x0018
 _0807E878 
@@ -185,10 +139,7 @@ Call sub_0807DF28
 _0807EB8C 
 Call sub_0806D944
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x110f
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c110f
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
 Call sub_0806D908
@@ -209,10 +160,7 @@ Jump 0xffe6
 _0807E864 
 _0807E930 0x0010
 StopScript 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1115
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1115
 _0807EA94 
 _0807E930 0x0018
 _0807E878 
@@ -224,10 +172,7 @@ Call sub_0807DF28
 _0807EB8C 
 Call sub_0806D944
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1110
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1110
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
 Call sub_0806D908
@@ -249,10 +194,7 @@ Jump 0xffe6
 _0807E864 
 _0807E930 0x0010
 StopScript 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1115
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1115
 _0807EA94 
 _0807E930 0x0018
 _0807E878 
@@ -266,10 +208,7 @@ _0807EF80 0x000b
 _0807EB8C 
 Call sub_0806D944
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1111
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1111
 _0807E930 0x0018
 SetEntityNonPlanarMovement 0x0080
 Call sub_0806D8A0
diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc
index 8e8f794d..2288d819 100644
--- a/data/scripts/gUnk_08012B24.inc
+++ b/data/scripts/gUnk_08012B24.inc
@@ -6,10 +6,6 @@ StopScript
 _0807EF80 0x0001
 _0807ECC4 0x0008
 _0807E5F8 0x00000002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB64
-.short 0xffe2
-.short 0xffff
-@ End of parameters
+CallWithArg sub_0807FB64, 0xffffffe2
 Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc
index ff9ca34e..9f72bb79 100644
--- a/data/scripts/gUnk_08012B50.inc
+++ b/data/scripts/gUnk_08012B50.inc
@@ -6,10 +6,6 @@ StopScript
 _0807EF80 0x0001
 _0807EC64 0x0008
 _0807E5F8 0x00000002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB64
-.short 0xffe2
-.short 0xffff
-@ End of parameters
+CallWithArg sub_0807FB64, 0xffffffe2
 Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc
index 9083222f..7a39ce95 100644
--- a/data/scripts/gUnk_08012B7C.inc
+++ b/data/scripts/gUnk_08012B7C.inc
@@ -6,10 +6,6 @@ StopScript
 _0807EF80 0x0001
 _0807EC94 0x0008
 _0807E5F8 0x00000002
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB64
-.short 0xffe2
-.short 0xffff
-@ End of parameters
+CallWithArg sub_0807FB64, 0xffffffe2
 Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc
index 09b786f6..f58b1f06 100644
--- a/data/scripts/gUnk_08012E88.inc
+++ b/data/scripts/gUnk_08012E88.inc
@@ -18,11 +18,7 @@ Jump 0xffe2
 .short 0x0000
 StartScript 
 _0807EB44 0x0004
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 _0807EF80 0x000a
 Call sub_0806B60C
 StopScript 
@@ -30,18 +26,10 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x000c
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x0000000c
 Call sub_0806B4F0
 _0807EA94 
 Wait 0x000f
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000008
 Jump 0xffd2
diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc
index 3ec14ff9..8b37b976 100644
--- a/data/scripts/gUnk_08012F0C.inc
+++ b/data/scripts/gUnk_08012F0C.inc
@@ -1,10 +1,6 @@
 SCRIPT_START gUnk_08012F0C
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806A93C
-.short 0x5678
-.short 0x1234
-@ End of parameters
+CallWithArg sub_0806A93C, 0x12345678
 _0807EB44 0x0004
 _0807E930 0x0002
 CheckInventory1 0x0015
diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc
index d546118e..bfac0bf0 100644
--- a/data/scripts/gUnk_08012F86.inc
+++ b/data/scripts/gUnk_08012F86.inc
@@ -11,11 +11,7 @@ StopScript
 WaitForSomething2 0x00000004
 _0807E908 0x0004
 Call sub_0806A958
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F93C
-.short 0xf2f4
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F93C, 0x0000f2f4
 Call sub_0807DF50
 _0807E878 
 SetLocalFlag 0x0062
@@ -24,11 +20,7 @@ StartScript
 _0807E930 0x000d
 _0807E908 0x0005
 SetLocalFlag 0x0062
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F93C
-.short 0xf2f4
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F93C, 0x0000f2f4
 Call sub_0806AA10
 StopScript 
 CheckInventory1 0x0038
diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc
index 0dba30ec..e1ddddb9 100644
--- a/data/scripts/gUnk_08013114.inc
+++ b/data/scripts/gUnk_08013114.inc
@@ -15,23 +15,11 @@ _0807E864
 StopScript 
 _0807EB74 
 Call sub_0806AED8
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AA50
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AA50, 0x00000000
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AA50
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AA50, 0x00000001
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AA50
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AA50, 0x00000002
 _0807EA94 
 JumpIf 0x0008
 _0807E878 
diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc
index 6112595c..befc408e 100644
--- a/data/scripts/gUnk_0801319A.inc
+++ b/data/scripts/gUnk_0801319A.inc
@@ -30,10 +30,7 @@ Call sub_080536B8
 _0807E864 
 Call sub_0807DF28
 WaitFor_2 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1602
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1602
 _0807EA94 
 _0807E5F8 0x00000008
 WaitForSomething2 0x00000010
@@ -47,10 +44,7 @@ WaitForSomething2 0x00000040
 StartPlayerScript gUnk_08013378
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000042
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1603
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1603
 _0807EA94 
 _0807E5F8 0x00000020
 WaitForSomething2 0x00000040
@@ -59,16 +53,11 @@ _0807E778 0x0004
 DoFade5 
 WaitFor_2 
 SoundReq0x80100000 
-.short 0x0842 @ _0807E858 with 1 parameters
-.short 0x0000
-@ End of parameters
+_0807E858 0x0000
 Wait 0x003c
 CameraTargetPlayer 
 Call sub_0807F5C0
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1604
-.short 0x0007
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00071604
 _0807EA94 
 _0807E788 0xffffffff
 _0807E778 0x0004
diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc
index 5aef14e5..b6dc0fa5 100644
--- a/data/scripts/gUnk_080133F8.inc
+++ b/data/scripts/gUnk_080133F8.inc
@@ -15,11 +15,7 @@ WaitForSomething2 0x00000020
 Wait 0x003c
 _0807EF80 0x0014
 SoundReq 0x0120
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095420
-.short 0x3494
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095420, 0x08013494
 Wait 0x005a
 _0807EF80 0x0016
 WaitForSomething2 0x00000080
diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc
index 96dd691d..41aaa6db 100644
--- a/data/scripts/gUnk_080134DC.inc
+++ b/data/scripts/gUnk_080134DC.inc
@@ -4,11 +4,7 @@ _0807EF80 0x0008
 StopScript 
 StartScript 
 Call sub_0807F92C
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000003
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -16,82 +12,38 @@ _0807E864
 Call sub_0807DF28
 StartPlayerScript gUnk_080136D8
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095A1C
-.short 0x3f04
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095A1C, 0x08013f04
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x3e04
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x3e28
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D54, 0x08013e04
+CallWithArg sub_08095D54, 0x08013e28
 StopScript 
 WaitForSomething2 0x18000000
 StartScript 
 SoundReq 0x01cf
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4054
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4074
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x08014054
+CallWithArg sub_08095D8C, 0x08014074
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x40dc
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4118
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x080140dc
+CallWithArg sub_08095D8C, 0x08014118
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x41dc
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4210
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x080141dc
+CallWithArg sub_08095D8C, 0x08014210
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 Wait 0x0078
 _0807E5F8 0x00000060
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000000
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -113,15 +65,8 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x0503
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c0503
 _0807EA94 
 _0807E5F8 0x00040000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000001
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc
index df963b06..6f8fb40d 100644
--- a/data/scripts/gUnk_08013650.inc
+++ b/data/scripts/gUnk_08013650.inc
@@ -7,11 +7,7 @@ CameraTargetEntity
 Wait 0x003c
 _0807E5F8 0x00000004
 Wait 0x0078
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000001
 _0807F0C8 0x0000, 0x0000
 StartPlayerScript gUnk_080136B4
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc
index bee3975f..8a73634a 100644
--- a/data/scripts/gUnk_080136D8.inc
+++ b/data/scripts/gUnk_080136D8.inc
@@ -3,22 +3,9 @@ StartScript
 SetEntityNonPlanarMovement 0x0100
 StopScript 
 Call sub_0807F584
-.short 0x1406 @ _0807E078 with 4 parameters
-.short 0x0008
-.short 0x0010
-.short 0x0018
-.short 0x000c
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F464
-.short 0x00d0
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F4F8
-.short 0x0124
-.short 0x0000
-@ End of parameters
+_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x000c
+CallWithArg sub_0807F464, 0x000000d0
+CallWithArg sub_0807F4F8, 0x00000124
 _0807EDD4 0x00e8, 0x0124
 _0807EB44 0x0004
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc
index 735a3f1e..4437f1c7 100644
--- a/data/scripts/gUnk_08013720.inc
+++ b/data/scripts/gUnk_08013720.inc
@@ -4,11 +4,7 @@ _0807EF80 0x0008
 StopScript 
 StartScript 
 Call sub_0807F92C
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000003
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -16,89 +12,41 @@ _0807E864
 Call sub_0807DF28
 StartPlayerScript gUnk_080136D8
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095A1C
-.short 0x3f34
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095A1C, 0x08013f34
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x3e4c
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D54, 0x08013e4c
 StopScript 
 WaitForSomething2 0x20000000
 StartScript 
 SoundReq 0x01cf
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4054
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4074
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4094
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x08014054
+CallWithArg sub_08095D8C, 0x08014074
+CallWithArg sub_08095D8C, 0x08014094
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x40dc
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4118
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4154
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x080140dc
+CallWithArg sub_08095D8C, 0x08014118
+CallWithArg sub_08095D8C, 0x08014154
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x41dc
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4210
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x080141dc
+CallWithArg sub_08095D8C, 0x08014210
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 _0807E5F8 0x00000800
 WaitForSomething2 0x00008000
 Wait 0x0078
 _0807E5F8 0x00000060
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000000
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -120,10 +68,7 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x0504
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c0504
 _0807EA94 
 _0807E5F8 0x00040000
 SetLocalFlag 0x007b
diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc
index 89f2d143..4dadb7dd 100644
--- a/data/scripts/gUnk_080138B4.inc
+++ b/data/scripts/gUnk_080138B4.inc
@@ -4,11 +4,7 @@ _0807EF80 0x0008
 StopScript 
 StartScript 
 Call sub_0807F92C
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000003
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
@@ -16,88 +12,36 @@ _0807E864
 Call sub_0807DF28
 StartPlayerScript gUnk_080136D8
 WaitForSomething2 0x00000001
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095A1C
-.short 0x3f64
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095A1C, 0x08013f64
 SoundReq 0x01cd
 Wait 0x005a
 StartScript 
 SoundReq 0x01ce
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x3e70
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D54, 0x08013e70
 StopScript 
 WaitForSomething2 0x40000000
 StartScript 
 SoundReq 0x01cf
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4054
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4074
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4094
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x40b8
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x08014054
+CallWithArg sub_08095D8C, 0x08014074
+CallWithArg sub_08095D8C, 0x08014094
+CallWithArg sub_08095D8C, 0x080140b8
 StopScript 
 Wait 0x001e
 StartScript 
 SoundReq 0x01d0
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x40dc
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4118
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4154
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4198
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x080140dc
+CallWithArg sub_08095D8C, 0x08014118
+CallWithArg sub_08095D8C, 0x08014154
+CallWithArg sub_08095D8C, 0x08014198
 StopScript 
 Wait 0x003c
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000000
 _0807E5F8 0x00000200
 WaitForSomething2 0x00002000
 SoundReq 0x01d2
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x41dc
-.short 0x0801
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D8C
-.short 0x4210
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095D8C, 0x080141dc
+CallWithArg sub_08095D8C, 0x08014210
 _0807E5F8 0x00000400
 WaitForSomething2 0x00004000
 _0807E5F8 0x00000800
@@ -106,11 +50,7 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00010000
 Wait 0x0078
 _0807E5F8 0x00000060
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000000
 Wait 0x0078
 _0807E5F8 0x00000080
 WaitForSomething2 0x00000100
@@ -133,38 +73,19 @@ _0807E778 0x0002
 DoFade6 
 WaitFor_2 
 SoundReq 0x0109
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x0505
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c0505
 _0807EA94 
 _0807E5F8 0x00040000
 _0807F0B4 0x0002
 SetEntityPositionRelative 0x00d800e8
 CameraTargetEntity 
 Call sub_0806DC3C
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F244
-.short 0x0001
-.short 0x0001
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x49fe
-.short 0x0800
-@ End of parameters
+CallWithArg sub_0807F244, 0x00010001
+CallWithArg sub_0807F29C, 0x080049fe
 Wait 0x00c8
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F29C
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F29C, 0x00000000
 Call sub_0806DC58
 CheckRoomFlag 0x0004
 JumpIfNot 0xfffa
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000001
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc
index d41b1fa9..476a3965 100644
--- a/data/scripts/gUnk_08013AA6.inc
+++ b/data/scripts/gUnk_08013AA6.inc
@@ -3,11 +3,7 @@ Call sub_0807F3F8
 Wait 0x003c
 _0807E5F8 0x00000008
 Wait 0x0078
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000001
 _0807F0C8 0x0000, 0x0000
 Wait 0x003c
 _0807F0B4 0x0004
diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc
index 944ceeee..32780a24 100644
--- a/data/scripts/gUnk_08013B18.inc
+++ b/data/scripts/gUnk_08013B18.inc
@@ -3,11 +3,7 @@ StartScript
 _0807EF80 0x0008
 StopScript 
 StartScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x01c8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x000001c8
 JumpIfNot 0xfff0
 CheckInventory1 0x0006
 JumpIfNot 0xffe8
diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc
index dd55bd47..8f2b17b3 100644
--- a/data/scripts/gUnk_08013B70.inc
+++ b/data/scripts/gUnk_08013B70.inc
@@ -1,10 +1,6 @@
 SCRIPT_START gUnk_08013B70
 SoundReq 0x01d3
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x08bf
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x000008bf
 Call sub_08096028
 Wait 0x003c
 _0807E5F8 0x00020000
diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc
index b47e2a60..a2337d5a 100644
--- a/data/scripts/gUnk_08013BA8.inc
+++ b/data/scripts/gUnk_08013BA8.inc
@@ -1,15 +1,7 @@
 SCRIPT_START gUnk_08013BA8
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095E7C
-.short 0x4248
-.short 0x0801
-@ End of parameters
+CallWithArg sub_08095E7C, 0x08014248
 SoundReq 0x01d3
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x08e3
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x000008e3
 Call sub_08096028
 Wait 0x0078
 _0807E5F8 0x00020000
diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc
index 9cf01e62..34d54f72 100644
--- a/data/scripts/gUnk_08013BE8.inc
+++ b/data/scripts/gUnk_08013BE8.inc
@@ -22,16 +22,8 @@ StartScript
 _0807EF80 0x0007
 Call sub_0807F934
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_080962F8
-.short 0x0000
-.short 0x0000
-@ End of parameters
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F8E8
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_080962F8, 0x00000000
+CallWithArg sub_0807F8E8, 0x00000004
 StopScript 
 StopScript 
 StartScript 
diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc
index 13d55e1d..7c2d6ade 100644
--- a/data/scripts/gUnk_08013D04.inc
+++ b/data/scripts/gUnk_08013D04.inc
@@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013D04
 StartScript 
 Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000004
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08095D54, 0x00000000
 SoundReq 0x01cd
 _0807E5F8 0x08000000
 Call sub_080791BC
diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc
index d8f002c5..1783ada4 100644
--- a/data/scripts/gUnk_08013D44.inc
+++ b/data/scripts/gUnk_08013D44.inc
@@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013D44
 StartScript 
 Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000004
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08095D54, 0x00000001
 SoundReq 0x01cd
 _0807E5F8 0x10000000
 Call sub_080791BC
diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc
index 73d9938d..cedc11ce 100644
--- a/data/scripts/gUnk_08013D84.inc
+++ b/data/scripts/gUnk_08013D84.inc
@@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013D84
 StartScript 
 Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000004
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x0002
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08095D54, 0x00000002
 SoundReq 0x01cd
 _0807E5F8 0x20000000
 Call sub_080791BC
diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc
index 3385a818..ddae770a 100644
--- a/data/scripts/gUnk_08013DC4.inc
+++ b/data/scripts/gUnk_08013DC4.inc
@@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013DC4
 StartScript 
 Call sub_0807F92C
 _0807EF80 0x0008
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000004
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095D54
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08095D54, 0x00000003
 SoundReq 0x01cd
 _0807E5F8 0x40000000
 Call sub_080791BC
diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc
index 86297bb7..6611152b 100644
--- a/data/scripts/gUnk_08013FE8.inc
+++ b/data/scripts/gUnk_08013FE8.inc
@@ -10,11 +10,7 @@ CheckLocalFlag 0x007a
 JumpIfNot 0xffee
 CheckInventory1 0x0003
 JumpIfNot 0xffe6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x00d0
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x000000d0
 JumpIfNot 0xffd8
 StopScript 
 Call sub_0807F9A4
diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc
index 6474c661..cc06dc39 100644
--- a/data/scripts/gUnk_080141DC.inc
+++ b/data/scripts/gUnk_080141DC.inc
@@ -3,11 +3,7 @@ StartScript
 _0807EF80 0x0007
 _0807E930 0x0014
 Call sub_0807F714
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfffc
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fffc
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc
index a8253a5c..1ed61b20 100644
--- a/data/scripts/gUnk_08014210.inc
+++ b/data/scripts/gUnk_08014210.inc
@@ -4,11 +4,7 @@ _0807EF80 0x0007
 _0807E930 0x0015
 Call sub_0807F714
 Call sub_0807F714
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F994
-.short 0xfffc
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F994, 0x0000fffc
 StopScript 
 WaitForSomething 0x00000020
 Wait 0x0078
diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/gUnk_08014248.inc
index dcbddfda..8e75f5d1 100644
--- a/data/scripts/gUnk_08014248.inc
+++ b/data/scripts/gUnk_08014248.inc
@@ -2,17 +2,9 @@ SCRIPT_START gUnk_08014248
 TestBit 0x00020000
 JumpIf 0x0014
 Wait 0x0008
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095EAC
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08095EAC, 0x00000000
 Jump 0xffe6
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_08095EAC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_08095EAC, 0x00000001
 Jump 0xfff4
 .short 0x0000
 StartScript 
@@ -22,19 +14,12 @@ CheckLocalFlag 0x0078
 JumpIfNot 0xfffa
 StartScript 
 Call sub_0807F934
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000008
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x0647
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c0647
 _0807EA94 
 _0807E878 
 Jump 0xffec
diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc
index 026708be..a19df24a 100644
--- a/data/scripts/gUnk_08014450.inc
+++ b/data/scripts/gUnk_08014450.inc
@@ -27,10 +27,7 @@ Call sub_0806E250
 JumpIfNot 0x000e
 TextboxNoOverlapFollow 0x420b
 _0807EB38 
-.short 0x0c06 @ _0807E078 with 2 parameters
-.short 0x0004
-.short 0x000a
-@ End of parameters
+_0807E078 0x0004, 0x000a
 ClearLocalFlag 0x0093
 Jump 0x000a
 SetLocalFlag 0x0093
diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc
index 7dfd951f..9cd637f6 100644
--- a/data/scripts/gUnk_080145B0.inc
+++ b/data/scripts/gUnk_080145B0.inc
@@ -10,10 +10,7 @@ _0807E864
 ClearRoomFlag 0x0005
 Wait 0x000c
 _0807EB8C 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x432e
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c432e
 _0807EA94 
 _0807E878 
 Jump 0xffe0
diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc
index 295e90ef..355e87e5 100644
--- a/data/scripts/gUnk_080145E8.inc
+++ b/data/scripts/gUnk_080145E8.inc
@@ -33,10 +33,7 @@ CheckLocalFlag 0x005e
 JumpIf 0x003e
 _0807E864 
 _0807EB8C 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x432b
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c432b
 Jump 0x015e
 Call sub_08088658
 JumpIfNot 0xffc0
@@ -57,10 +54,7 @@ Wait 0x0010
 _0807E930 0x0002
 CheckGlobalFlag 0x0059
 JumpIfNot 0x000c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x432f
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c432f
 Jump 0x010a
 CheckRoomFlag 0x0004
 JumpIf 0x0028
@@ -73,24 +67,15 @@ JumpIf 0x003c
 Call sub_08088574
 SetRoomFlag 0x0009
 Jump 0x004a
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x431e
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c431e
 Jump 0x00d2
 SetRoomFlag 0x0009
 SetLocalFlag 0x005c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x4305
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c4305
 _0807EA94 
 _0807E3BC 0x0001
 JumpIfNot 0x00b0
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x4306
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c4306
 Jump 0x001e
 SetRoomFlag 0x0009
 Call sub_08088504
@@ -110,10 +95,7 @@ JumpIfNot 0xfffa
 ClearRoomFlag 0x0003
 _0807EA94 
 SetRoomFlag 0x0004
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x431e
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c431e
 Jump 0x0060
 SetRoomFlag 0x0009
 _0807EA94 
@@ -137,10 +119,7 @@ Wait 0x008c
 _0807E930 0x0002
 Jump 0xffc8
 SetRoomFlag 0x0009
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x4307
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c4307
 _0807EA94 
 Wait 0x0004
 _0807E878 
diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc
index 599d21f1..bece2dfd 100644
--- a/data/scripts/gUnk_08014804.inc
+++ b/data/scripts/gUnk_08014804.inc
@@ -9,10 +9,7 @@ Call sub_0807DF38
 Wait 0x0010
 CheckLocalFlag 0x0093
 JumpIf 0x0092
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x4215
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c4215
 _0807E878 
 TestBit 0x00000001
 JumpIf 0x002c
@@ -24,10 +21,7 @@ _0807E864
 _0807E930 0x0008
 Wait 0x0020
 _0807E930 0x0002
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x4215
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c4215
 _0807E878 
 Jump 0xffce
 _0807E930 0x0008
@@ -50,10 +44,7 @@ _0807E864
 _0807E930 0x0008
 Wait 0x0020
 _0807E930 0x0002
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x4216
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c4216
 _0807E878 
 Jump 0xffce
 _0807E930 0x0008
diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc
index 93bb4a62..d16b16fa 100644
--- a/data/scripts/gUnk_08014CDC.inc
+++ b/data/scripts/gUnk_08014CDC.inc
@@ -11,10 +11,7 @@ StopScript
 WaitForSomething2 0x00000001
 Call sub_08066E08
 _0807E864 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1010
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1010
 _0807EA94 
 _0807E5F8 0x00000002
 StopScript 
@@ -33,11 +30,7 @@ Call sub_08066E08
 SetEntityPositionRelative 0x00c801f8
 Call sub_0807DF50
 _0807E878 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x00e8
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x000000e8
 JumpIf 0xfff4
 _0807E864 
 Call sub_0807DF28
diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc
index 42e337d5..abe606e1 100644
--- a/data/scripts/gUnk_08014E14.inc
+++ b/data/scripts/gUnk_08014E14.inc
@@ -3,21 +3,13 @@ StartScript
 _0807EB44 0x0004
 _0807E9D4 
 _0807EF80 0x000a
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 StopScript 
 CheckEntityInteractType 
 JumpIfNot 0xfffc
 _0807E864 
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F3D8
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F3D8, 0x00000000
 Call sub_08064428
 _0807EA94 
 _0807E878 
@@ -34,27 +26,15 @@ JumpIfNot 0xfffc
 _0807E864 
 Call sub_0807DF28
 _0807EB74 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F78C
-.short 0x0022
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F78C, 0x00000022
 _0807EA94 
 _0807E3E8 
 JumpIfNot 0x0038
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F7C4
-.short 0x0022
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F7C4, 0x00000022
 JumpIfNot 0x001e
 _0807E48C 0x0020
 JumpIfNot 0x001e
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F800
-.short 0x0022
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F800, 0x00000022
 WaitPlayerAction8 
 TextboxNoOverlap 0x0a04
 Jump 0x000e
@@ -114,11 +94,7 @@ _0807EB74
 _0807EF80 0x0000
 StartScript 
 TextboxNoOverlap 0x3b0b
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F854
-.short 0x0064
-.short 0x0001
-@ End of parameters
+CallWithArg sub_0807F854, 0x00010064
 StopScript 
 _0807EA94 
 _0807E3E8 
@@ -155,10 +131,7 @@ _0807F0B4 0x0001
 CameraTargetEntity 
 StartPlayerScript gUnk_080152B4
 WaitForSomething2 0x00000001
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1301
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021301
 _0807EA94 
 Call sub_0807F3F8
 Wait 0x003c
@@ -169,17 +142,11 @@ WaitForSomething2 0x00000004
 SoundReq2 0x000d
 _0807EB28 0x1302
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1303
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021303
 _0807EA94 
 _0807EB28 0x1304
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1305
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021305
 _0807EA94 
 _0807E5F8 0x00000002
 WaitForSomething2 0x00000004
@@ -264,11 +231,7 @@ WaitFor_2
 Call sub_08053B3C
 StartScript 
 _0807E864 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6E8
-.short 0x0008
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6E8, 0x00000008
 MoveEntityToPlayer 
 _0807F0B4 0x0004
 CameraTargetEntity 
diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc
index b54d6af8..ec27aae4 100644
--- a/data/scripts/gUnk_08015390.inc
+++ b/data/scripts/gUnk_08015390.inc
@@ -7,10 +7,7 @@ _0807E930 0x001f
 Call sub_0806D944
 WaitForSomething2 0x00000008
 _0807E930 0x0010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1314
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1314
 _0807EA94 
 _0807E930 0x0018
 Call sub_0806D8A0
diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc
index 8b455b9f..d3c28c86 100644
--- a/data/scripts/gUnk_080153EC.inc
+++ b/data/scripts/gUnk_080153EC.inc
@@ -17,39 +17,20 @@ _0807E5F8 0x00000880
 WaitForSomething2 0x00001100
 _0807F0B4 0x0004
 SetEntityPositionRelative 0x00900078
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1330
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021330
 _0807EA94 
 _0807E5F8 0x00008000
 WaitForSomething2 0x00010000
 _0807E5F8 0x00000880
 WaitForSomething2 0x00001000
 Wait 0x003c
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x130d
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002130d
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x130e
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c130e
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x130f
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x0002130f
 _0807EA94 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1310
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1310
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000001
 _0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc
index cad8956d..fc9f8372 100644
--- a/data/scripts/gUnk_0801548E.inc
+++ b/data/scripts/gUnk_0801548E.inc
@@ -2,32 +2,18 @@ SCRIPT_START gUnk_0801548E
 _0807E5F8 0x00000800
 WaitForSomething2 0x00001000
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 _0807E5F8 0x00048000
 WaitForSomething2 0x00090000
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1311
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021311
 _0807EA94 
 _0807E5F8 0x00008000
 WaitForSomething2 0x00010000
 _0807E5F8 0x00048000
 WaitForSomething2 0x00010000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0001
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000001
 _0807F0C8 0x0000, 0x0000
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1312
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1312
 _0807EA94 
 _0807E5F8 0x00000800
 WaitForSomething2 0x00001000
diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc
index 035ab2e5..f2635e78 100644
--- a/data/scripts/gUnk_0801550C.inc
+++ b/data/scripts/gUnk_0801550C.inc
@@ -5,57 +5,29 @@ _0807EF80 0x0007
 _0807EB44 0x0000
 Call sub_0807F338
 StopScript 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000000
 WaitForSomething2 0x00008000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000004
 _0807EDD4 0x0078, 0x00b8
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000000
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EF80 0x000d
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0004
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000004
 _0807EDD4 0x0078, 0x00c8
 _0807E5F8 0x00010000
 WaitForSomething2 0x00008000
 _0807EB44 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806AF60
-.short 0x0000
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806AF60, 0x00000000
 _0807EF80 0x0010
 Wait 0x0028
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 Wait 0x000a
 SoundReq 0x0125
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807FB28
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807FB28, 0x00000003
 Wait 0x000a
 _0807EF80 0x0010
 _0807E5F8 0x00010000
diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc
index 873a6fb5..fa0553ff 100644
--- a/data/scripts/gUnk_08015618.inc
+++ b/data/scripts/gUnk_08015618.inc
@@ -5,21 +5,13 @@ SetEntityNonPlanarMovement 0x0040
 Call sub_08094B80
 StopScript 
 WaitForSomething2 0x00000080
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DDEC
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DDEC, 0x00000003
 Call sub_08094B0C
 _0807EDD4 0x0078, 0x0068
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
 _0807EF3C 0xff80, 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0805DE18
-.short 0x0003
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0805DE18, 0x00000003
 Wait 0x003c
 _0807E5F8 0x00000100
 WaitForSomething2 0x00000080
diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc
index e2ce398e..13a7042e 100644
--- a/data/scripts/gUnk_08015684.inc
+++ b/data/scripts/gUnk_08015684.inc
@@ -29,11 +29,7 @@ _0807E5F8 0x00001000
 WaitForSomething2 0x00000800
 _0807EB44 0x0004
 _0807EF80 0x0014
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0809545C
-.short 0x5754
-.short 0x0801
-@ End of parameters
+CallWithArg sub_0809545C, 0x08015754
 SoundReq 0x01c4
 Wait 0x0078
 _0807EF80 0x0016
diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc
index e0b5bc89..aaa816ed 100644
--- a/data/scripts/gUnk_080157AC.inc
+++ b/data/scripts/gUnk_080157AC.inc
@@ -31,10 +31,7 @@ StartPlayerScript gUnk_08015918
 WaitForSomething2 0x00000010
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1066
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021066
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
@@ -54,18 +51,12 @@ SetEntityPositionRelative 0x02080248
 CameraTargetEntity 
 StartPlayerScript gUnk_08015938
 WaitForSomething2 0x00000010
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x106a
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c106a
 _0807EA94 
 _0807E5F8 0x00000008
 Wait 0x0078
 _0807E8E4_2 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1068
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021068
 _0807EA94 
 _0807E5F8 0x00000001
 WaitForSomething2 0x00000002
diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc
index 3e1dd800..a8c6eebf 100644
--- a/data/scripts/gUnk_08015958.inc
+++ b/data/scripts/gUnk_08015958.inc
@@ -15,10 +15,7 @@ _0807EB74
 _0807EDD4 0x01f8, 0x02f8
 _0807EB44 0x0004
 _0807EF80 0x0000
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1011
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021011
 _0807EA94 
 _0807EDD4 0x01f8, 0x0268
 SetEntityPositionRelative 0x02180248
@@ -59,10 +56,7 @@ JumpIf 0x0016
 CheckEntityInteractType 
 JumpIfNot 0xffee
 StopScript 
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1067
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00021067
 _0807EA94 
 Jump 0xffe0
 StopScript 
diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc
index 2f23520e..26bd551f 100644
--- a/data/scripts/gUnk_08015B34.inc
+++ b/data/scripts/gUnk_08015B34.inc
@@ -3,20 +3,13 @@ StopScript
 StartScript 
 CheckLocalFlag 0x008b
 JumpIf 0x0040
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F6B4
-.short 0x0318
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F6B4, 0x00000318
 JumpIfNot 0xffe8
 StopScript 
 _0807E864 
 Call sub_0807F9A4
 Call sub_0807DF28
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x2506
-.short 0x0002
-@ End of parameters
+TextboxNoOverlapFollowPos 0x00022506
 _0807EA94 
 StartPlayerScript gUnk_08015B84
 WaitForSomething2 0x00000004
diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc
index e7faab73..6c311115 100644
--- a/data/scripts/gUnk_08015C7C.inc
+++ b/data/scripts/gUnk_08015C7C.inc
@@ -6,22 +6,11 @@ _0807EF80 0x0001
 _0807EDD4 0x0168, 0x0058
 _0807EB44 0x0004
 _0807EF80 0x0000
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x03c5
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x000003c5
 Call sub_0807F304
-.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters
-.short 0x1318
-.short 0x000c
-@ End of parameters
+TextboxNoOverlapFollowPos 0x000c1318
 _0807EA94 
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F238
-.short 0x03c9
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0807F238, 0x000003c9
 Call sub_0807F304
 _0807EB44 0x0004
 _0807EF80 0x0000
diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc
index 533149ba..53484fd1 100644
--- a/data/scripts/gUnk_08015FC0.inc
+++ b/data/scripts/gUnk_08015FC0.inc
@@ -4,11 +4,7 @@ Call sub_0806DB84
 CheckKinstoneFused 0x0009
 JumpIf 0x005a
 _0807EA88 0x0009
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0806DA04
-.short 0x0007
-.short 0x0000
-@ End of parameters
+CallWithArg sub_0806DA04, 0x00000007
 _0807EF80 0x000a
 StopScript 
 _0807EA4C 
diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc
index 2a83a1ac..3595816a 100644
--- a/data/scripts/gUnk_080160A8.inc
+++ b/data/scripts/gUnk_080160A8.inc
@@ -18,7 +18,7 @@ Jump 0xffd2
 _0807E864 
 _0807EB74 
 StopScript 
-.short 0x0411 @ HasRoomItemForSale with 0 parameters
+HasRoomItemForSale 
 JumpIfNot 0x0030
 TextboxNoOverlapFollow 0x2d07
 _0807EA94 
@@ -51,12 +51,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 GetInventoryValue 0x0025
-.short 0x145d @ _0807EAF0 with 4 parameters
-.short 0x2d03
-.short 0x2d02
-.short 0x2d02
-.short 0x2d02
-@ End of parameters
+_0807EAF0_ssss 0x2d03, 0x2d02, 0x2d02, 0x2d02
 _0807E3E8 
 JumpIfNot 0x002a
 _0807E48C 0x0020
@@ -78,12 +73,7 @@ CheckEntityInteractType
 JumpIfNot 0xfffc
 _0807E864 
 GetInventoryValue 0x0024
-.short 0x145d @ _0807EAF0 with 4 parameters
-.short 0x2d05
-.short 0x2d04
-.short 0x2d04
-.short 0x2d04
-@ End of parameters
+_0807EAF0_ssss 0x2d05, 0x2d04, 0x2d04, 0x2d04
 _0807E3E8 
 JumpIfNot 0x002e
 _0807E48C 0x0020
@@ -140,11 +130,7 @@ JumpIf 0x009a
 Call sub_08068F00
 Call sub_08068F14
 Call sub_08068BB4
-.short 0x140c @ CallWithArg with 2 parameters
-.word sub_0807F244
-.short 0x0001
-.short 0x0001
-@ End of parameters
+CallWithArg sub_0807F244, 0x00010001
 Call sub_08068B84
 Call sub_0807F2A8
 Call sub_08068BD0
diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc
index 7802a910..72529ceb 100644
--- a/data/scripts/gUnk_0801637C.inc
+++ b/data/scripts/gUnk_0801637C.inc
@@ -1,8 +1,4 @@
 SCRIPT_START gUnk_0801637C
-@ this seems to be assembly for
-@ push       { lr }
-@ bl         CreateDust
-@ pop        { pc }
 .short 0xb500
 .short 0xf08c
 .short 0xfb1d
diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc
index 542c57f6..d1cfa60c 100644
--- a/data/scripts/gUnk_08016384.inc
+++ b/data/scripts/gUnk_08016384.inc
@@ -4,25 +4,18 @@ StopScript
 Jump 0xfffa
 JumpIf 0xfff6
 JumpIfNot 0xfff2
-.short 0x0c06 @ _0807E078 with 2 parameters
-.short 0xffee
-.short 0xffec
-@ End of parameters
+_0807E078 0xffee, 0xffec
 JumpAbsolute gUnk_08016384
 JumpAbsoluteIf gUnk_08016384
 JumpAbsoluteIfNot gUnk_08016384
 _0807E0E0 gUnk_08016384, gUnk_08016384
 Call 0x08016384
-.short 0x140c @ CallWithArg with 2 parameters
-.word 0x08016384
-.short 0x5678
-.short 0x1234
-@ End of parameters
+CallWithArg 0x08016384, 0x12345678
 LoadRoomEntityList gUnk_08016384
 TestBit 0x00000001
 CheckInventory1 0x0001
 CheckInventory2 0x0001
-.short 0x0411 @ HasRoomItemForSale with 0 parameters
+HasRoomItemForSale 
 CheckLocalFlag 0x0067
 CheckLocalFlagByOffset 0x0100, 0x006b
 CheckGlobalFlag 0x0013
diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc
index 355c4d59..98339999 100644
--- a/data/scripts/gUnk_08016482.inc
+++ b/data/scripts/gUnk_08016482.inc
@@ -7,7 +7,7 @@ DoFade6
 DoFade7 
 _0807E800 0x00000000
 _0807E80C 0x00000000
-.short 0x0442 @ _0807E858 with 0 parameters
+_0807E858_ 
 _0807E864 
 _0807E878 
 _0807E888 
@@ -31,14 +31,8 @@ _0807EA88 0x0001
 _0807EA94 
 TextboxNoOverlapFollow 0x0601
 TextboxNoOverlap 0x0601
-.short 0x085c @ TextboxNoOverlapFollowPos with 1 parameters
-.short 0x0601
-@ End of parameters
-.short 0x105d @ _0807EAF0 with 3 parameters
-.short 0x0601
-.short 0x0602
-.short 0x0603
-@ End of parameters
+TextboxNoOverlapFollowPos_s 0x0601
+_0807EAF0_sss 0x0601, 0x0602, 0x0603
 TextboxNoOverlapVar 
 _0807EB28 0x0602
 _0807EB38 
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index acd729c7..b161301f 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -59,18 +59,18 @@ commands = [
     {'fun': 'ScriptCommand_Jump', 'params': 's', 'name': 'jump by offset'},
     {'fun': 'ScriptCommand_JumpIf', 'params': 's', 'name': 'jump if'},
     {'fun': 'ScriptCommand_JumpIfNot', 'params': 's', 'name': 'jump if not'},
-    {'fun': 'ScriptCommand_0807E078', 'params': 'v'},
+    {'fun': 'ScriptCommand_0807E078', 'params': ['ss', 'sss', 'ssss', 'sssssss', 'sssssssss']},
     {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'd','name': 'abs jump' },
     {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'd', 'name': 'abs jump if'},
     {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'd', 'name': 'abs jump if not'},
     {'fun': 'ScriptCommand_0807E0E0', 'params': 'dd'},
     {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
-    {'fun': 'ScriptCommand_CallWithArg', 'params': 'pv'},
+    {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']},
     {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
     {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
-    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': 'v'},
+    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''},
     {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
     {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
     {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
@@ -119,7 +119,7 @@ commands = [
     {'fun': 'ScriptCommand_DoFade7', 'params': ''},
     {'fun': 'ScriptCommand_0807E800', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E80C', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E858', 'params': 'v'}, # TODO why are there both 0 and 1?
+    {'fun': 'ScriptCommand_0807E858', 'params': ['s', '']},
     {'fun': 'ScriptCommand_0807E864', 'params': ''},
     {'fun': 'ScriptCommand_0807E878', 'params': ''},
     {'fun': 'ScriptCommand_0807E888', 'params': ''},
@@ -145,8 +145,8 @@ commands = [
     {'fun': 'ScriptCommand_0807EA94', 'params': ''},
     {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': 'v'}, # TODO 1 or two
-    {'fun': 'ScriptCommand_0807EAF0', 'params': 'v'}, # TODO
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['w', 's']}, # TODO w or ss?
+    {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']},
     {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
     {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
     {'fun': 'ScriptCommand_0807EB38', 'params': ''},
@@ -194,6 +194,8 @@ commands = [
     {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'}
 ]
 
+# TODO replace variable parameters with parameter variants that explicitely define macros for all possibilities
+
 # definitions for parameters
 parameters = {
     '': {
@@ -231,7 +233,25 @@ parameters = {
         'param': 'a,b,c',
         'expr': '	.short \\a\n	.short \\b\n	.short \\c',
         'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8]))
+    },
+    'ssss': {
+        'length': 4,
+        'param': 'a,b,c,d',
+        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
     },    
+    'sssssss': {
+        'length': 7,
+        'param': 'a,b,c,d,e,f,g',
+        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d\n	.short \\e\n	.short \\f\n	.short \\g',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+16]))
+    },  
+    'sssssssss': {
+        'length': 9,
+        'param': 'a,b,c,d,e,f,g,h,i',
+        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d\n	.short \\e\n	.short \\f\n	.short \\g\n	.short \\h\n	.short \\i',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+20]))
+    }, 
     'p': {
         'length': 2,
         'param': 'w',
@@ -250,6 +270,12 @@ parameters = {
         'expr': '	.word \w',
         'read': lambda ctx: ''
     },
+    'pw': {
+        'length': 4,
+        'param': 'a,b',
+        'expr': '	.word \\a\n	.word \\b',
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+14])[0]
+    },
     'dd': {
         'length': 4,
         'param': 'a, b',
@@ -321,22 +347,38 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
     # Handle parameters
     if not 'params' in command:
         raise Exception('Parameters not defined for ' + command['fun'] + '   Should be of length ' + str(param_length))
-    if not command['params'] in parameters:
-        raise Exception('Parameter configuration ' + command['params'] + ' not defined')
 
+    params = None
+    suffix = '' 
+    # When there are multiple variants of parameters, choose the one with the correct count for this
+    if isinstance(command['params'], list):
+        for i,param in enumerate(command['params']):
+            if not param in parameters:
+                raise Exception(f'Parameter configuration {param} not defined')
+            candidate = parameters[param]
+            if candidate['length'] == commandSize -1:
+                params = candidate
+                if i != 0:
+                    suffix = f'_{param}'# We need to add a suffix to distinguish the correct parameter variant
+                break
+        if params is None:
+            raise Exception(f'No suitable parameter configuration with length {commandSize-1} found for {command["fun"]}')
+    else:
+        if not command['params'] in parameters:
+            raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+        params = parameters[command['params']]
 
-    params = parameters[command['params']]
-
+    command_name = f'{command["fun"]}{suffix}'
 
     if params['length'] == -1: # variable parameter length
-        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with {commandSize-1} parameters')
+        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
         if commandSize > 1:
             print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])]))
             print(f'@ End of parameters')
         ctx.ptr += commandSize*2
         return 1
     elif params['length'] == -2: # point and var
-        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command["fun"])} with {commandSize-3} parameters')
+        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
 
         print('.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
         if commandSize > 3:
@@ -346,15 +388,9 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
         return 1
 
     if commandSize-1 != params['length']:
-        raise Exception(f'Call {command["fun"]} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined')
-        return 0
-        #with open('log.txt', 'a') as log:
-#            log.write(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined\n')
-        # TEMPORARY WORKAROUND:
-        #ctx.ptr += unk_06*2
-        #return 1
+        raise Exception(f'Call {command_name} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined')
 
-    print(build_script_command(command['fun']) + ' ' + params['read'](ctx))
+    print(build_script_command(command_name) + ' ' + params['read'](ctx))
 
     # Execute script
     ctx.ptr += commandSize*2
@@ -423,21 +459,36 @@ def generate_macros():
     for num, command in enumerate(commands):
         if not 'params' in command:
             raise Exception('Parameters not defined for ' + command['fun'] + '!')
-        if not command['params'] in parameters:
-            raise Exception('Parameter configuration ' + command['params'] + ' not defined')
 
-        params = parameters[command['params']]
-        id = ((params['length']+1) << 0xA) + num
+        def emit_macro(command_name, id, params):
+            print(f'.macro {command_name} {params["param"]}')
+            print(f'	.short {u16_to_hex(id)}')
+            if params['expr'] != '':
+                print(params['expr'])
+            print('.endm')
+            print('')
 
-        if params['length'] < 0:
-            continue
+        if isinstance(command['params'], list):
+            # emit macros for all variants
+            for i,variant in enumerate(command['params']):
+                if not variant in parameters:
+                    raise Exception('Parameter configuration ' + variant + ' not defined')
+                params = parameters[variant]
+                id = ((params['length']+1) << 0xA) + num    
+                suffix = ''
+                if i != 0:
+                    suffix = f'_{variant}'
+                emit_macro(f'{build_script_command(command["fun"])}{suffix}', id, params)
+        else:
+            if not command['params'] in parameters:
+                raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+            params = parameters[command['params']]
+            id = ((params['length']+1) << 0xA) + num
 
-        print(f'.macro {build_script_command(command["fun"])} {params["param"]}')
-        print(f'	.short {u16_to_hex(id)}')
-        if params['expr'] != '':
-            print(params['expr'])
-        print('.endm')
-        print('')
+            if params['length'] < 0: # Don't emit anything for variable parameters
+                continue
+
+            emit_macro(build_script_command(command['fun']), id, params)
 
         #print('#define ' + command['fun'] + '(' + params['param'] + ') asm(".short '+u16_to_hex(id)+'");' + params['expr'])
     print('')

From 33b1445debb8b08a2cba349732d615b0a201cfd4 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 14:08:28 +0100
Subject: [PATCH 20/46] Prefix script files with script_ instead of gUnk_

---
 asm/bird.s                                    |   4 +-
 asm/businessScrubPrologue.s                   |   4 +-
 asm/code_080732D0.s                           |   8 +-
 asm/fourElements.s                            |   4 +-
 asm/mazaalMacro.s                             |   4 +-
 asm/object6A.s                                |  20 +-
 asm/object89.s                                |   4 +-
 asm/stockwell.s                               |  12 +-
 data/scripts.s                                | 804 +++++++++---------
 ...{gUnk_08008B5C.inc => script_08008B5C.inc} |   2 +-
 ...{gUnk_08008D50.inc => script_08008D50.inc} |   2 +-
 ...{gUnk_08008D8C.inc => script_08008D8C.inc} |   6 +-
 ...{gUnk_08008F74.inc => script_08008F74.inc} |   2 +-
 ...{gUnk_08008FC0.inc => script_08008FC0.inc} |   2 +-
 ...{gUnk_08008FFC.inc => script_08008FFC.inc} |   2 +-
 ...{gUnk_0800903C.inc => script_0800903C.inc} |   2 +-
 ...{gUnk_08009320.inc => script_08009320.inc} |   2 +-
 ...{gUnk_08009340.inc => script_08009340.inc} |   2 +-
 ...{gUnk_08009348.inc => script_08009348.inc} |   2 +-
 ...{gUnk_0800939A.inc => script_0800939A.inc} |   2 +-
 ...{gUnk_08009464.inc => script_08009464.inc} |   2 +-
 ...{gUnk_080094CC.inc => script_080094CC.inc} |   2 +-
 ...{gUnk_080094FC.inc => script_080094FC.inc} |   2 +-
 ...{gUnk_080095F2.inc => script_080095F2.inc} |   4 +-
 ...{gUnk_08009704.inc => script_08009704.inc} |   2 +-
 ...{gUnk_08009740.inc => script_08009740.inc} |   4 +-
 ...{gUnk_080097F0.inc => script_080097F0.inc} |   2 +-
 ...{gUnk_08009838.inc => script_08009838.inc} |   2 +-
 ...{gUnk_0800987C.inc => script_0800987C.inc} |   2 +-
 ...{gUnk_080098D4.inc => script_080098D4.inc} |   2 +-
 ...{gUnk_08009918.inc => script_08009918.inc} |   2 +-
 ...{gUnk_08009950.inc => script_08009950.inc} |   2 +-
 ...{gUnk_080099DC.inc => script_080099DC.inc} |   2 +-
 ...{gUnk_08009A34.inc => script_08009A34.inc} |   2 +-
 ...{gUnk_08009A84.inc => script_08009A84.inc} |   2 +-
 ...{gUnk_08009AF8.inc => script_08009AF8.inc} |   2 +-
 ...{gUnk_08009B30.inc => script_08009B30.inc} |   2 +-
 ...{gUnk_08009B78.inc => script_08009B78.inc} |   4 +-
 ...{gUnk_08009C68.inc => script_08009C68.inc} |   2 +-
 ...{gUnk_08009CFC.inc => script_08009CFC.inc} |   2 +-
 ...{gUnk_08009D6C.inc => script_08009D6C.inc} |   2 +-
 ...{gUnk_08009DB0.inc => script_08009DB0.inc} |   2 +-
 ...{gUnk_08009E4E.inc => script_08009E4E.inc} |   2 +-
 ...{gUnk_08009E58.inc => script_08009E58.inc} |   2 +-
 ...{gUnk_08009E80.inc => script_08009E80.inc} |   2 +-
 ...{gUnk_08009E88.inc => script_08009E88.inc} |   2 +-
 ...{gUnk_08009ECC.inc => script_08009ECC.inc} |   2 +-
 ...{gUnk_08009EF0.inc => script_08009EF0.inc} |   2 +-
 ...{gUnk_08009F14.inc => script_08009F14.inc} |   4 +-
 ...{gUnk_0800A088.inc => script_0800A088.inc} |   2 +-
 ...{gUnk_0800A0B4.inc => script_0800A0B4.inc} |   2 +-
 ...{gUnk_0800A0FC.inc => script_0800A0FC.inc} |   2 +-
 ...{gUnk_0800A160.inc => script_0800A160.inc} |   2 +-
 ...{gUnk_0800A1B4.inc => script_0800A1B4.inc} |   2 +-
 ...{gUnk_0800A1D8.inc => script_0800A1D8.inc} |   4 +-
 ...{gUnk_0800A310.inc => script_0800A310.inc} |   2 +-
 ...{gUnk_0800A3D8.inc => script_0800A3D8.inc} |   2 +-
 ...{gUnk_0800A500.inc => script_0800A500.inc} |   2 +-
 ...{gUnk_0800A590.inc => script_0800A590.inc} |   2 +-
 ...{gUnk_0800A638.inc => script_0800A638.inc} |   2 +-
 ...{gUnk_0800A65C.inc => script_0800A65C.inc} |   2 +-
 ...{gUnk_0800A680.inc => script_0800A680.inc} |   2 +-
 ...{gUnk_0800A6A4.inc => script_0800A6A4.inc} |   2 +-
 ...{gUnk_0800A6D4.inc => script_0800A6D4.inc} |   2 +-
 ...{gUnk_0800A704.inc => script_0800A704.inc} |   2 +-
 ...{gUnk_0800A734.inc => script_0800A734.inc} |   2 +-
 ...{gUnk_0800A764.inc => script_0800A764.inc} |   2 +-
 ...{gUnk_0800A7E4.inc => script_0800A7E4.inc} |   2 +-
 ...{gUnk_0800A964.inc => script_0800A964.inc} |   2 +-
 ...{gUnk_0800A988.inc => script_0800A988.inc} |   2 +-
 ...{gUnk_0800A9AC.inc => script_0800A9AC.inc} |   2 +-
 ...{gUnk_0800A9D0.inc => script_0800A9D0.inc} |   2 +-
 ...{gUnk_0800A9F4.inc => script_0800A9F4.inc} |   2 +-
 ...{gUnk_0800AA48.inc => script_0800AA48.inc} |   2 +-
 ...{gUnk_0800AA6C.inc => script_0800AA6C.inc} |   2 +-
 ...{gUnk_0800AA90.inc => script_0800AA90.inc} |   2 +-
 ...{gUnk_0800AAB4.inc => script_0800AAB4.inc} |   2 +-
 ...{gUnk_0800AAD8.inc => script_0800AAD8.inc} |   2 +-
 ...{gUnk_0800AB08.inc => script_0800AB08.inc} |   2 +-
 ...{gUnk_0800AB6E.inc => script_0800AB6E.inc} |   8 +-
 ...{gUnk_0800ACBC.inc => script_0800ACBC.inc} |   2 +-
 ...{gUnk_0800ACE0.inc => script_0800ACE0.inc} |   2 +-
 ...{gUnk_0800AD54.inc => script_0800AD54.inc} |   2 +-
 ...{gUnk_0800AEA4.inc => script_0800AEA4.inc} |   2 +-
 ...{gUnk_0800AEDC.inc => script_0800AEDC.inc} |   2 +-
 ...{gUnk_0800AF18.inc => script_0800AF18.inc} |   2 +-
 ...{gUnk_0800AF44.inc => script_0800AF44.inc} |   2 +-
 ...{gUnk_0800AF68.inc => script_0800AF68.inc} |   2 +-
 ...{gUnk_0800AF8C.inc => script_0800AF8C.inc} |   2 +-
 ...{gUnk_0800AFB0.inc => script_0800AFB0.inc} |   2 +-
 ...{gUnk_0800AFE8.inc => script_0800AFE8.inc} |   2 +-
 ...{gUnk_0800B00C.inc => script_0800B00C.inc} |   2 +-
 ...{gUnk_0800B0AC.inc => script_0800B0AC.inc} |   2 +-
 ...{gUnk_0800B0D0.inc => script_0800B0D0.inc} |   4 +-
 ...{gUnk_0800B1C0.inc => script_0800B1C0.inc} |   2 +-
 ...{gUnk_0800B200.inc => script_0800B200.inc} |   2 +-
 ...{gUnk_0800B254.inc => script_0800B254.inc} |   2 +-
 ...{gUnk_0800B308.inc => script_0800B308.inc} |   2 +-
 ...{gUnk_0800B3A4.inc => script_0800B3A4.inc} |   2 +-
 ...{gUnk_0800B41C.inc => script_0800B41C.inc} |   4 +-
 ...{gUnk_0800B4AC.inc => script_0800B4AC.inc} |   2 +-
 ...{gUnk_0800B54C.inc => script_0800B54C.inc} |   2 +-
 ...{gUnk_0800B574.inc => script_0800B574.inc} |   2 +-
 ...{gUnk_0800B5C4.inc => script_0800B5C4.inc} |   2 +-
 ...{gUnk_0800B5EC.inc => script_0800B5EC.inc} |   4 +-
 ...{gUnk_0800B6C8.inc => script_0800B6C8.inc} |   6 +-
 ...{gUnk_0800B7C4.inc => script_0800B7C4.inc} |   2 +-
 ...{gUnk_0800B7FC.inc => script_0800B7FC.inc} |   2 +-
 ...{gUnk_0800B828.inc => script_0800B828.inc} |   2 +-
 ...{gUnk_0800B9B4.inc => script_0800B9B4.inc} |   2 +-
 ...{gUnk_0800BACC.inc => script_0800BACC.inc} |   2 +-
 ...{gUnk_0800BB00.inc => script_0800BB00.inc} |   2 +-
 ...{gUnk_0800BB30.inc => script_0800BB30.inc} |   2 +-
 ...{gUnk_0800BB64.inc => script_0800BB64.inc} |   2 +-
 ...{gUnk_0800BBA4.inc => script_0800BBA4.inc} |   2 +-
 ...{gUnk_0800BBDC.inc => script_0800BBDC.inc} |   2 +-
 ...{gUnk_0800BC08.inc => script_0800BC08.inc} |   2 +-
 ...{gUnk_0800BC50.inc => script_0800BC50.inc} |   2 +-
 ...{gUnk_0800BCE8.inc => script_0800BCE8.inc} |   2 +-
 ...{gUnk_0800BD78.inc => script_0800BD78.inc} |   2 +-
 ...{gUnk_0800BE1C.inc => script_0800BE1C.inc} |   2 +-
 ...{gUnk_0800BECC.inc => script_0800BECC.inc} |   2 +-
 ...{gUnk_0800BF38.inc => script_0800BF38.inc} |   2 +-
 ...{gUnk_0800C004.inc => script_0800C004.inc} |   2 +-
 ...{gUnk_0800C0B0.inc => script_0800C0B0.inc} |   2 +-
 ...{gUnk_0800C160.inc => script_0800C160.inc} |   2 +-
 ...{gUnk_0800C1D8.inc => script_0800C1D8.inc} |   2 +-
 ...{gUnk_0800C2A4.inc => script_0800C2A4.inc} |   2 +-
 ...{gUnk_0800C350.inc => script_0800C350.inc} |   2 +-
 ...{gUnk_0800C370.inc => script_0800C370.inc} |   2 +-
 ...{gUnk_0800C3B0.inc => script_0800C3B0.inc} |   2 +-
 ...{gUnk_0800C3CC.inc => script_0800C3CC.inc} |   2 +-
 ...{gUnk_0800C410.inc => script_0800C410.inc} |   2 +-
 ...{gUnk_0800C45C.inc => script_0800C45C.inc} |   2 +-
 ...{gUnk_0800C494.inc => script_0800C494.inc} |   2 +-
 ...{gUnk_0800C4D0.inc => script_0800C4D0.inc} |   2 +-
 ...{gUnk_0800C50C.inc => script_0800C50C.inc} |   2 +-
 ...{gUnk_0800C550.inc => script_0800C550.inc} |   6 +-
 ...{gUnk_0800C8C8.inc => script_0800C8C8.inc} |   2 +-
 ...{gUnk_0800C8F0.inc => script_0800C8F0.inc} |   2 +-
 ...{gUnk_0800C91C.inc => script_0800C91C.inc} |   4 +-
 ...{gUnk_0800CA8C.inc => script_0800CA8C.inc} |   2 +-
 ...{gUnk_0800CABC.inc => script_0800CABC.inc} |   2 +-
 ...{gUnk_0800CB54.inc => script_0800CB54.inc} |   2 +-
 ...{gUnk_0800CBD4.inc => script_0800CBD4.inc} |   2 +-
 ...{gUnk_0800CC6C.inc => script_0800CC6C.inc} |   2 +-
 ...{gUnk_0800CD04.inc => script_0800CD04.inc} |   2 +-
 ...{gUnk_0800CD7C.inc => script_0800CD7C.inc} |  12 +-
 ...{gUnk_0800D190.inc => script_0800D190.inc} |   2 +-
 ...{gUnk_0800D1B4.inc => script_0800D1B4.inc} |   2 +-
 ...{gUnk_0800D1E0.inc => script_0800D1E0.inc} |   2 +-
 ...{gUnk_0800D218.inc => script_0800D218.inc} |   2 +-
 ...{gUnk_0800D242.inc => script_0800D242.inc} |   2 +-
 ...{gUnk_0800D24C.inc => script_0800D24C.inc} |   2 +-
 ...{gUnk_0800D254.inc => script_0800D254.inc} |   2 +-
 ...{gUnk_0800D278.inc => script_0800D278.inc} |   4 +-
 ...{gUnk_0800D3EC.inc => script_0800D3EC.inc} |   2 +-
 ...{gUnk_0800D414.inc => script_0800D414.inc} |   2 +-
 ...{gUnk_0800D698.inc => script_0800D698.inc} |   2 +-
 ...{gUnk_0800D6B4.inc => script_0800D6B4.inc} |   2 +-
 ...{gUnk_0800D6D0.inc => script_0800D6D0.inc} |   2 +-
 ...{gUnk_0800D6F0.inc => script_0800D6F0.inc} |   2 +-
 ...{gUnk_0800D710.inc => script_0800D710.inc} |   2 +-
 ...{gUnk_0800D76C.inc => script_0800D76C.inc} |   2 +-
 ...{gUnk_0800D84C.inc => script_0800D84C.inc} |   2 +-
 ...{gUnk_0800D874.inc => script_0800D874.inc} |   4 +-
 ...{gUnk_0800D92C.inc => script_0800D92C.inc} |   2 +-
 ...{gUnk_0800D954.inc => script_0800D954.inc} |   4 +-
 ...{gUnk_0800DA00.inc => script_0800DA00.inc} |   2 +-
 ...{gUnk_0800DA28.inc => script_0800DA28.inc} |   2 +-
 ...{gUnk_0800DA60.inc => script_0800DA60.inc} |   2 +-
 ...{gUnk_0800DB18.inc => script_0800DB18.inc} |   2 +-
 ...{gUnk_0800DB28.inc => script_0800DB28.inc} |   2 +-
 ...{gUnk_0800DB78.inc => script_0800DB78.inc} |   6 +-
 ...{gUnk_0800DC4C.inc => script_0800DC4C.inc} |   6 +-
 ...{gUnk_0800DCAC.inc => script_0800DCAC.inc} |   2 +-
 ...{gUnk_0800DDD0.inc => script_0800DDD0.inc} |   2 +-
 ...{gUnk_0800DE00.inc => script_0800DE00.inc} |   2 +-
 ...{gUnk_0800DE2C.inc => script_0800DE2C.inc} |   2 +-
 ...{gUnk_0800DE50.inc => script_0800DE50.inc} |   2 +-
 ...{gUnk_0800DE78.inc => script_0800DE78.inc} |   4 +-
 ...{gUnk_0800DEB0.inc => script_0800DEB0.inc} |   2 +-
 ...{gUnk_0800DED4.inc => script_0800DED4.inc} |   2 +-
 ...{gUnk_0800DF24.inc => script_0800DF24.inc} |   2 +-
 ...{gUnk_0800DFB4.inc => script_0800DFB4.inc} |   2 +-
 ...{gUnk_0800DFE4.inc => script_0800DFE4.inc} |   2 +-
 ...{gUnk_0800E050.inc => script_0800E050.inc} |   4 +-
 ...{gUnk_0800E094.inc => script_0800E094.inc} |   2 +-
 ...{gUnk_0800E0BC.inc => script_0800E0BC.inc} |   2 +-
 ...{gUnk_0800E504.inc => script_0800E504.inc} |   2 +-
 ...{gUnk_0800E544.inc => script_0800E544.inc} |   2 +-
 ...{gUnk_0800E58C.inc => script_0800E58C.inc} |   2 +-
 ...{gUnk_0800E5C4.inc => script_0800E5C4.inc} |   2 +-
 ...{gUnk_0800E5D6.inc => script_0800E5D6.inc} |   2 +-
 ...{gUnk_0800E600.inc => script_0800E600.inc} |   2 +-
 ...{gUnk_0800E62C.inc => script_0800E62C.inc} |   2 +-
 ...{gUnk_0800E658.inc => script_0800E658.inc} |   2 +-
 ...{gUnk_0800E684.inc => script_0800E684.inc} |   2 +-
 ...{gUnk_0800E6B0.inc => script_0800E6B0.inc} |   2 +-
 ...{gUnk_0800E8A4.inc => script_0800E8A4.inc} |   2 +-
 ...{gUnk_0800E8D6.inc => script_0800E8D6.inc} |   2 +-
 ...{gUnk_0800E908.inc => script_0800E908.inc} |   6 +-
 ...{gUnk_0800E9F4.inc => script_0800E9F4.inc} |   2 +-
 ...{gUnk_0800EA1C.inc => script_0800EA1C.inc} |   2 +-
 ...{gUnk_0800EA54.inc => script_0800EA54.inc} |   2 +-
 ...{gUnk_0800EF40.inc => script_0800EF40.inc} |   4 +-
 ...{gUnk_0800EF9C.inc => script_0800EF9C.inc} |   2 +-
 ...{gUnk_0800EFC0.inc => script_0800EFC0.inc} |   4 +-
 ...{gUnk_0800F14C.inc => script_0800F14C.inc} |   2 +-
 ...{gUnk_0800F184.inc => script_0800F184.inc} |  10 +-
 ...{gUnk_0800F33C.inc => script_0800F33C.inc} |   2 +-
 ...{gUnk_0800F354.inc => script_0800F354.inc} |   2 +-
 ...{gUnk_0800F36C.inc => script_0800F36C.inc} |   2 +-
 ...{gUnk_0800F384.inc => script_0800F384.inc} |   2 +-
 ...{gUnk_0800F39C.inc => script_0800F39C.inc} |   2 +-
 ...{gUnk_0800F430.inc => script_0800F430.inc} |   2 +-
 ...{gUnk_0800F4C4.inc => script_0800F4C4.inc} |   2 +-
 ...{gUnk_0800F554.inc => script_0800F554.inc} |   2 +-
 ...{gUnk_0800F724.inc => script_0800F724.inc} |  12 +-
 ...{gUnk_0800FA54.inc => script_0800FA54.inc} |   2 +-
 ...{gUnk_0800FA78.inc => script_0800FA78.inc} |   2 +-
 ...{gUnk_0800FA9C.inc => script_0800FA9C.inc} |   2 +-
 ...{gUnk_0800FAC0.inc => script_0800FAC0.inc} |   2 +-
 ...{gUnk_0800FAE4.inc => script_0800FAE4.inc} |   2 +-
 ...{gUnk_0800FB2C.inc => script_0800FB2C.inc} |   2 +-
 ...{gUnk_0800FB44.inc => script_0800FB44.inc} |   2 +-
 ...{gUnk_0800FD0C.inc => script_0800FD0C.inc} |   6 +-
 ...{gUnk_0800FD80.inc => script_0800FD80.inc} |   2 +-
 ...{gUnk_0800FDA0.inc => script_0800FDA0.inc} |   2 +-
 ...{gUnk_0800FF18.inc => script_0800FF18.inc} |   2 +-
 ...{gUnk_0800FF74.inc => script_0800FF74.inc} |   2 +-
 ...{gUnk_080100C8.inc => script_080100C8.inc} |   2 +-
 ...{gUnk_08010264.inc => script_08010264.inc} |   6 +-
 ...{gUnk_08010964.inc => script_08010964.inc} |   6 +-
 ...{gUnk_080109F0.inc => script_080109F0.inc} |   2 +-
 ...{gUnk_08010A14.inc => script_08010A14.inc} |   2 +-
 ...{gUnk_08010A38.inc => script_08010A38.inc} |   2 +-
 ...{gUnk_08010A5C.inc => script_08010A5C.inc} |   2 +-
 ...{gUnk_08010A98.inc => script_08010A98.inc} |   2 +-
 ...{gUnk_08010B68.inc => script_08010B68.inc} |   2 +-
 ...{gUnk_08010BB4.inc => script_08010BB4.inc} |   6 +-
 ...{gUnk_08010E5A.inc => script_08010E5A.inc} |   2 +-
 ...{gUnk_08010F84.inc => script_08010F84.inc} |   4 +-
 ...{gUnk_08011074.inc => script_08011074.inc} |   2 +-
 ...{gUnk_08011098.inc => script_08011098.inc} |   2 +-
 ...{gUnk_080110BC.inc => script_080110BC.inc} |   2 +-
 ...{gUnk_080110E8.inc => script_080110E8.inc} |   2 +-
 ...{gUnk_08011128.inc => script_08011128.inc} |   2 +-
 ...{gUnk_080111CC.inc => script_080111CC.inc} |   2 +-
 ...{gUnk_080112C4.inc => script_080112C4.inc} |   2 +-
 ...{gUnk_080113AA.inc => script_080113AA.inc} |   2 +-
 ...{gUnk_08011442.inc => script_08011442.inc} |   2 +-
 ...{gUnk_08011508.inc => script_08011508.inc} |   2 +-
 ...{gUnk_080115D0.inc => script_080115D0.inc} |   2 +-
 ...{gUnk_08011608.inc => script_08011608.inc} |   2 +-
 ...{gUnk_08011640.inc => script_08011640.inc} |   2 +-
 ...{gUnk_080116A8.inc => script_080116A8.inc} |   2 +-
 ...{gUnk_0801183C.inc => script_0801183C.inc} |   2 +-
 ...{gUnk_08011890.inc => script_08011890.inc} |   2 +-
 ...{gUnk_080118D4.inc => script_080118D4.inc} |   4 +-
 ...{gUnk_08011930.inc => script_08011930.inc} |   2 +-
 ...{gUnk_08011940.inc => script_08011940.inc} |   2 +-
 ...{gUnk_0801194C.inc => script_0801194C.inc} |   2 +-
 ...{gUnk_08011B20.inc => script_08011B20.inc} |   2 +-
 ...{gUnk_08011B40.inc => script_08011B40.inc} |   2 +-
 ...{gUnk_08011C50.inc => script_08011C50.inc} |   2 +-
 ...{gUnk_08011C7C.inc => script_08011C7C.inc} |   2 +-
 ...{gUnk_0801232C.inc => script_0801232C.inc} |   4 +-
 ...{gUnk_08012410.inc => script_08012410.inc} |   2 +-
 ...{gUnk_08012430.inc => script_08012430.inc} |   8 +-
 ...{gUnk_080126FC.inc => script_080126FC.inc} |   4 +-
 ...{gUnk_08012AB0.inc => script_08012AB0.inc} |   2 +-
 ...{gUnk_08012AC8.inc => script_08012AC8.inc} |   2 +-
 ...{gUnk_08012AF0.inc => script_08012AF0.inc} |   2 +-
 ...{gUnk_08012B18.inc => script_08012B18.inc} |   2 +-
 ...{gUnk_08012B24.inc => script_08012B24.inc} |   2 +-
 ...{gUnk_08012B50.inc => script_08012B50.inc} |   2 +-
 ...{gUnk_08012B7C.inc => script_08012B7C.inc} |   2 +-
 ...{gUnk_08012BA8.inc => script_08012BA8.inc} |   2 +-
 ...{gUnk_08012BF8.inc => script_08012BF8.inc} |   2 +-
 ...{gUnk_08012C48.inc => script_08012C48.inc} |   2 +-
 ...{gUnk_08012C68.inc => script_08012C68.inc} |   2 +-
 ...{gUnk_08012CD8.inc => script_08012CD8.inc} |   2 +-
 ...{gUnk_08012D18.inc => script_08012D18.inc} |   4 +-
 ...{gUnk_08012D70.inc => script_08012D70.inc} |   4 +-
 ...{gUnk_08012DB0.inc => script_08012DB0.inc} |   2 +-
 ...{gUnk_08012DD8.inc => script_08012DD8.inc} |   4 +-
 ...{gUnk_08012DF8.inc => script_08012DF8.inc} |   2 +-
 ...{gUnk_08012E20.inc => script_08012E20.inc} |   4 +-
 ...{gUnk_08012E44.inc => script_08012E44.inc} |   2 +-
 ...{gUnk_08012E88.inc => script_08012E88.inc} |   2 +-
 ...{gUnk_08012F0C.inc => script_08012F0C.inc} |   2 +-
 ...{gUnk_08012F86.inc => script_08012F86.inc} |   4 +-
 ...{gUnk_080130E4.inc => script_080130E4.inc} |   2 +-
 ...{gUnk_08013114.inc => script_08013114.inc} |   2 +-
 ...{gUnk_0801319A.inc => script_0801319A.inc} |  12 +-
 ...{gUnk_080132E4.inc => script_080132E4.inc} |   2 +-
 ...{gUnk_0801330C.inc => script_0801330C.inc} |   2 +-
 ...{gUnk_08013330.inc => script_08013330.inc} |   2 +-
 ...{gUnk_0801334C.inc => script_0801334C.inc} |   2 +-
 ...{gUnk_08013378.inc => script_08013378.inc} |   2 +-
 ...{gUnk_080133C4.inc => script_080133C4.inc} |   2 +-
 ...{gUnk_080133F8.inc => script_080133F8.inc} |   2 +-
 ...{gUnk_08013494.inc => script_08013494.inc} |   2 +-
 ...{gUnk_080134DC.inc => script_080134DC.inc} |   6 +-
 ...{gUnk_08013650.inc => script_08013650.inc} |   4 +-
 ...{gUnk_080136B4.inc => script_080136B4.inc} |   2 +-
 ...{gUnk_080136D8.inc => script_080136D8.inc} |   2 +-
 ...{gUnk_08013720.inc => script_08013720.inc} |   6 +-
 ...{gUnk_080138B4.inc => script_080138B4.inc} |   6 +-
 ...{gUnk_08013AA6.inc => script_08013AA6.inc} |   2 +-
 ...{gUnk_08013B18.inc => script_08013B18.inc} |   4 +-
 ...{gUnk_08013B70.inc => script_08013B70.inc} |   2 +-
 ...{gUnk_08013BA8.inc => script_08013BA8.inc} |   2 +-
 ...{gUnk_08013BE8.inc => script_08013BE8.inc} |   2 +-
 ...{gUnk_08013CA4.inc => script_08013CA4.inc} |   2 +-
 ...{gUnk_08013D04.inc => script_08013D04.inc} |   2 +-
 ...{gUnk_08013D44.inc => script_08013D44.inc} |   2 +-
 ...{gUnk_08013D84.inc => script_08013D84.inc} |   2 +-
 ...{gUnk_08013DC4.inc => script_08013DC4.inc} |   2 +-
 ...{gUnk_08013E04.inc => script_08013E04.inc} |   2 +-
 ...{gUnk_08013E28.inc => script_08013E28.inc} |   2 +-
 ...{gUnk_08013E4C.inc => script_08013E4C.inc} |   2 +-
 ...{gUnk_08013E70.inc => script_08013E70.inc} |   2 +-
 ...{gUnk_08013E94.inc => script_08013E94.inc} |   2 +-
 ...{gUnk_08013EB0.inc => script_08013EB0.inc} |   2 +-
 ...{gUnk_08013ECC.inc => script_08013ECC.inc} |   2 +-
 ...{gUnk_08013EE8.inc => script_08013EE8.inc} |   2 +-
 ...{gUnk_08013F04.inc => script_08013F04.inc} |   2 +-
 ...{gUnk_08013F34.inc => script_08013F34.inc} |   2 +-
 ...{gUnk_08013F64.inc => script_08013F64.inc} |   2 +-
 ...{gUnk_08013F94.inc => script_08013F94.inc} |   2 +-
 ...{gUnk_08013FE8.inc => script_08013FE8.inc} |   4 +-
 ...{gUnk_08014054.inc => script_08014054.inc} |   2 +-
 ...{gUnk_08014074.inc => script_08014074.inc} |   2 +-
 ...{gUnk_08014094.inc => script_08014094.inc} |   2 +-
 ...{gUnk_080140B8.inc => script_080140B8.inc} |   2 +-
 ...{gUnk_080140DC.inc => script_080140DC.inc} |   2 +-
 ...{gUnk_08014118.inc => script_08014118.inc} |   2 +-
 ...{gUnk_08014154.inc => script_08014154.inc} |   2 +-
 ...{gUnk_08014198.inc => script_08014198.inc} |   2 +-
 ...{gUnk_080141DC.inc => script_080141DC.inc} |   2 +-
 ...{gUnk_08014210.inc => script_08014210.inc} |   2 +-
 ...{gUnk_08014248.inc => script_08014248.inc} |   2 +-
 ...{gUnk_080142B0.inc => script_080142B0.inc} |   2 +-
 ...{gUnk_08014384.inc => script_08014384.inc} |   2 +-
 ...{gUnk_080143C0.inc => script_080143C0.inc} |   2 +-
 ...{gUnk_08014450.inc => script_08014450.inc} |   2 +-
 ...{gUnk_0801450C.inc => script_0801450C.inc} |   4 +-
 ...{gUnk_08014588.inc => script_08014588.inc} |   2 +-
 ...{gUnk_080145B0.inc => script_080145B0.inc} |   2 +-
 ...{gUnk_080145E8.inc => script_080145E8.inc} |   4 +-
 ...{gUnk_080147DC.inc => script_080147DC.inc} |   2 +-
 ...{gUnk_08014804.inc => script_08014804.inc} |   2 +-
 ...{gUnk_08014958.inc => script_08014958.inc} |   2 +-
 ...{gUnk_080149CC.inc => script_080149CC.inc} |   2 +-
 ...{gUnk_08014A80.inc => script_08014A80.inc} |   4 +-
 ...{gUnk_08014B10.inc => script_08014B10.inc} |   2 +-
 ...{gUnk_08014B34.inc => script_08014B34.inc} |   2 +-
 ...{gUnk_08014CDC.inc => script_08014CDC.inc} |   2 +-
 ...{gUnk_08014DCC.inc => script_08014DCC.inc} |   2 +-
 ...{gUnk_08014E14.inc => script_08014E14.inc} |  12 +-
 ...{gUnk_08015234.inc => script_08015234.inc} |   2 +-
 ...{gUnk_080152B4.inc => script_080152B4.inc} |   2 +-
 ...{gUnk_080152DC.inc => script_080152DC.inc} |   2 +-
 ...{gUnk_08015304.inc => script_08015304.inc} |   2 +-
 ...{gUnk_08015338.inc => script_08015338.inc} |   2 +-
 ...{gUnk_08015360.inc => script_08015360.inc} |   2 +-
 ...{gUnk_08015384.inc => script_08015384.inc} |   2 +-
 ...{gUnk_08015390.inc => script_08015390.inc} |   4 +-
 ...{gUnk_080153EC.inc => script_080153EC.inc} |   2 +-
 ...{gUnk_0801548E.inc => script_0801548E.inc} |   2 +-
 ...{gUnk_0801550C.inc => script_0801550C.inc} |   2 +-
 ...{gUnk_080155F4.inc => script_080155F4.inc} |   2 +-
 ...{gUnk_08015618.inc => script_08015618.inc} |   2 +-
 ...{gUnk_08015684.inc => script_08015684.inc} |   2 +-
 ...{gUnk_08015754.inc => script_08015754.inc} |   2 +-
 ...{gUnk_080157AC.inc => script_080157AC.inc} |   8 +-
 ...{gUnk_080158F8.inc => script_080158F8.inc} |   2 +-
 ...{gUnk_08015918.inc => script_08015918.inc} |   2 +-
 ...{gUnk_08015938.inc => script_08015938.inc} |   2 +-
 ...{gUnk_08015958.inc => script_08015958.inc} |   2 +-
 ...{gUnk_08015A7C.inc => script_08015A7C.inc} |   2 +-
 ...{gUnk_08015AA0.inc => script_08015AA0.inc} |   2 +-
 ...{gUnk_08015AC4.inc => script_08015AC4.inc} |   2 +-
 ...{gUnk_08015B14.inc => script_08015B14.inc} |   2 +-
 ...{gUnk_08015B34.inc => script_08015B34.inc} |   4 +-
 ...{gUnk_08015B84.inc => script_08015B84.inc} |   2 +-
 ...{gUnk_08015BA8.inc => script_08015BA8.inc} |   2 +-
 ...{gUnk_08015BE8.inc => script_08015BE8.inc} |   4 +-
 ...{gUnk_08015C7C.inc => script_08015C7C.inc} |   2 +-
 ...{gUnk_08015CD4.inc => script_08015CD4.inc} |   2 +-
 ...{gUnk_08015DF0.inc => script_08015DF0.inc} |   2 +-
 ...{gUnk_08015E58.inc => script_08015E58.inc} |   2 +-
 ...{gUnk_08015F08.inc => script_08015F08.inc} |   2 +-
 ...{gUnk_08015F3C.inc => script_08015F3C.inc} |   2 +-
 ...{gUnk_08015F80.inc => script_08015F80.inc} |   2 +-
 ...{gUnk_08015FA4.inc => script_08015FA4.inc} |   2 +-
 ...{gUnk_08015FC0.inc => script_08015FC0.inc} |   2 +-
 ...{gUnk_08016004.inc => script_08016004.inc} |   2 +-
 ...{gUnk_08016030.inc => script_08016030.inc} |   2 +-
 ...{gUnk_08016062.inc => script_08016062.inc} |   2 +-
 ...{gUnk_0801606C.inc => script_0801606C.inc} |   2 +-
 ...{gUnk_0801609E.inc => script_0801609E.inc} |   2 +-
 ...{gUnk_080160A8.inc => script_080160A8.inc} |   4 +-
 ...{gUnk_0801635C.inc => script_0801635C.inc} |   2 +-
 ...{gUnk_0801637C.inc => script_0801637C.inc} |   2 +-
 ...{gUnk_08016384.inc => script_08016384.inc} |  16 +-
 ...{gUnk_08016482.inc => script_08016482.inc} |   4 +-
 ...{gUnk_080165A4.inc => script_080165A4.inc} |   4 +-
 ...{gUnk_080165D8.inc => script_080165D8.inc} |   8 +-
 src/npc/ezloCap.c                             |   8 +-
 src/npc/rem.c                                 |   4 +-
 src/npc/talon.c                               |   4 +-
 src/npc/windTribespeople.c                    |   4 +-
 src/room.c                                    |  26 +-
 tools/script_disassembler/incbin_parser.py    |   2 +-
 .../script_disassembler.py                    |  62 +-
 418 files changed, 1004 insertions(+), 986 deletions(-)
 rename data/scripts/{gUnk_08008B5C.inc => script_08008B5C.inc} (98%)
 rename data/scripts/{gUnk_08008D50.inc => script_08008D50.inc} (90%)
 rename data/scripts/{gUnk_08008D8C.inc => script_08008D8C.inc} (95%)
 rename data/scripts/{gUnk_08008F74.inc => script_08008F74.inc} (92%)
 rename data/scripts/{gUnk_08008FC0.inc => script_08008FC0.inc} (89%)
 rename data/scripts/{gUnk_08008FFC.inc => script_08008FFC.inc} (90%)
 rename data/scripts/{gUnk_0800903C.inc => script_0800903C.inc} (99%)
 rename data/scripts/{gUnk_08009320.inc => script_08009320.inc} (83%)
 rename data/scripts/{gUnk_08009340.inc => script_08009340.inc} (63%)
 rename data/scripts/{gUnk_08009348.inc => script_08009348.inc} (92%)
 rename data/scripts/{gUnk_0800939A.inc => script_0800939A.inc} (96%)
 rename data/scripts/{gUnk_08009464.inc => script_08009464.inc} (93%)
 rename data/scripts/{gUnk_080094CC.inc => script_080094CC.inc} (88%)
 rename data/scripts/{gUnk_080094FC.inc => script_080094FC.inc} (97%)
 rename data/scripts/{gUnk_080095F2.inc => script_080095F2.inc} (94%)
 rename data/scripts/{gUnk_08009704.inc => script_08009704.inc} (90%)
 rename data/scripts/{gUnk_08009740.inc => script_08009740.inc} (91%)
 rename data/scripts/{gUnk_080097F0.inc => script_080097F0.inc} (91%)
 rename data/scripts/{gUnk_08009838.inc => script_08009838.inc} (90%)
 rename data/scripts/{gUnk_0800987C.inc => script_0800987C.inc} (92%)
 rename data/scripts/{gUnk_080098D4.inc => script_080098D4.inc} (91%)
 rename data/scripts/{gUnk_08009918.inc => script_08009918.inc} (88%)
 rename data/scripts/{gUnk_08009950.inc => script_08009950.inc} (95%)
 rename data/scripts/{gUnk_080099DC.inc => script_080099DC.inc} (93%)
 rename data/scripts/{gUnk_08009A34.inc => script_08009A34.inc} (91%)
 rename data/scripts/{gUnk_08009A84.inc => script_08009A84.inc} (95%)
 rename data/scripts/{gUnk_08009AF8.inc => script_08009AF8.inc} (89%)
 rename data/scripts/{gUnk_08009B30.inc => script_08009B30.inc} (90%)
 rename data/scripts/{gUnk_08009B78.inc => script_08009B78.inc} (94%)
 rename data/scripts/{gUnk_08009C68.inc => script_08009C68.inc} (95%)
 rename data/scripts/{gUnk_08009CFC.inc => script_08009CFC.inc} (94%)
 rename data/scripts/{gUnk_08009D6C.inc => script_08009D6C.inc} (90%)
 rename data/scripts/{gUnk_08009DB0.inc => script_08009DB0.inc} (95%)
 rename data/scripts/{gUnk_08009E4E.inc => script_08009E4E.inc} (64%)
 rename data/scripts/{gUnk_08009E58.inc => script_08009E58.inc} (85%)
 rename data/scripts/{gUnk_08009E80.inc => script_08009E80.inc} (63%)
 rename data/scripts/{gUnk_08009E88.inc => script_08009E88.inc} (90%)
 rename data/scripts/{gUnk_08009ECC.inc => script_08009ECC.inc} (85%)
 rename data/scripts/{gUnk_08009EF0.inc => script_08009EF0.inc} (85%)
 rename data/scripts/{gUnk_08009F14.inc => script_08009F14.inc} (96%)
 rename data/scripts/{gUnk_0800A088.inc => script_0800A088.inc} (87%)
 rename data/scripts/{gUnk_0800A0B4.inc => script_0800A0B4.inc} (91%)
 rename data/scripts/{gUnk_0800A0FC.inc => script_0800A0FC.inc} (93%)
 rename data/scripts/{gUnk_0800A160.inc => script_0800A160.inc} (92%)
 rename data/scripts/{gUnk_0800A1B4.inc => script_0800A1B4.inc} (85%)
 rename data/scripts/{gUnk_0800A1D8.inc => script_0800A1D8.inc} (95%)
 rename data/scripts/{gUnk_0800A310.inc => script_0800A310.inc} (96%)
 rename data/scripts/{gUnk_0800A3D8.inc => script_0800A3D8.inc} (97%)
 rename data/scripts/{gUnk_0800A500.inc => script_0800A500.inc} (95%)
 rename data/scripts/{gUnk_0800A590.inc => script_0800A590.inc} (95%)
 rename data/scripts/{gUnk_0800A638.inc => script_0800A638.inc} (85%)
 rename data/scripts/{gUnk_0800A65C.inc => script_0800A65C.inc} (85%)
 rename data/scripts/{gUnk_0800A680.inc => script_0800A680.inc} (85%)
 rename data/scripts/{gUnk_0800A6A4.inc => script_0800A6A4.inc} (87%)
 rename data/scripts/{gUnk_0800A6D4.inc => script_0800A6D4.inc} (87%)
 rename data/scripts/{gUnk_0800A704.inc => script_0800A704.inc} (87%)
 rename data/scripts/{gUnk_0800A734.inc => script_0800A734.inc} (87%)
 rename data/scripts/{gUnk_0800A764.inc => script_0800A764.inc} (94%)
 rename data/scripts/{gUnk_0800A7E4.inc => script_0800A7E4.inc} (98%)
 rename data/scripts/{gUnk_0800A964.inc => script_0800A964.inc} (84%)
 rename data/scripts/{gUnk_0800A988.inc => script_0800A988.inc} (84%)
 rename data/scripts/{gUnk_0800A9AC.inc => script_0800A9AC.inc} (84%)
 rename data/scripts/{gUnk_0800A9D0.inc => script_0800A9D0.inc} (84%)
 rename data/scripts/{gUnk_0800A9F4.inc => script_0800A9F4.inc} (91%)
 rename data/scripts/{gUnk_0800AA48.inc => script_0800AA48.inc} (84%)
 rename data/scripts/{gUnk_0800AA6C.inc => script_0800AA6C.inc} (84%)
 rename data/scripts/{gUnk_0800AA90.inc => script_0800AA90.inc} (84%)
 rename data/scripts/{gUnk_0800AAB4.inc => script_0800AAB4.inc} (84%)
 rename data/scripts/{gUnk_0800AAD8.inc => script_0800AAD8.inc} (87%)
 rename data/scripts/{gUnk_0800AB08.inc => script_0800AB08.inc} (93%)
 rename data/scripts/{gUnk_0800AB6E.inc => script_0800AB6E.inc} (91%)
 rename data/scripts/{gUnk_0800ACBC.inc => script_0800ACBC.inc} (85%)
 rename data/scripts/{gUnk_0800ACE0.inc => script_0800ACE0.inc} (93%)
 rename data/scripts/{gUnk_0800AD54.inc => script_0800AD54.inc} (97%)
 rename data/scripts/{gUnk_0800AEA4.inc => script_0800AEA4.inc} (90%)
 rename data/scripts/{gUnk_0800AEDC.inc => script_0800AEDC.inc} (90%)
 rename data/scripts/{gUnk_0800AF18.inc => script_0800AF18.inc} (87%)
 rename data/scripts/{gUnk_0800AF44.inc => script_0800AF44.inc} (84%)
 rename data/scripts/{gUnk_0800AF68.inc => script_0800AF68.inc} (84%)
 rename data/scripts/{gUnk_0800AF8C.inc => script_0800AF8C.inc} (84%)
 rename data/scripts/{gUnk_0800AFB0.inc => script_0800AFB0.inc} (90%)
 rename data/scripts/{gUnk_0800AFE8.inc => script_0800AFE8.inc} (84%)
 rename data/scripts/{gUnk_0800B00C.inc => script_0800B00C.inc} (96%)
 rename data/scripts/{gUnk_0800B0AC.inc => script_0800B0AC.inc} (83%)
 rename data/scripts/{gUnk_0800B0D0.inc => script_0800B0D0.inc} (93%)
 rename data/scripts/{gUnk_0800B1C0.inc => script_0800B1C0.inc} (90%)
 rename data/scripts/{gUnk_0800B200.inc => script_0800B200.inc} (93%)
 rename data/scripts/{gUnk_0800B254.inc => script_0800B254.inc} (96%)
 rename data/scripts/{gUnk_0800B308.inc => script_0800B308.inc} (96%)
 rename data/scripts/{gUnk_0800B3A4.inc => script_0800B3A4.inc} (93%)
 rename data/scripts/{gUnk_0800B41C.inc => script_0800B41C.inc} (90%)
 rename data/scripts/{gUnk_0800B4AC.inc => script_0800B4AC.inc} (96%)
 rename data/scripts/{gUnk_0800B54C.inc => script_0800B54C.inc} (86%)
 rename data/scripts/{gUnk_0800B574.inc => script_0800B574.inc} (92%)
 rename data/scripts/{gUnk_0800B5C4.inc => script_0800B5C4.inc} (86%)
 rename data/scripts/{gUnk_0800B5EC.inc => script_0800B5EC.inc} (93%)
 rename data/scripts/{gUnk_0800B6C8.inc => script_0800B6C8.inc} (91%)
 rename data/scripts/{gUnk_0800B7C4.inc => script_0800B7C4.inc} (89%)
 rename data/scripts/{gUnk_0800B7FC.inc => script_0800B7FC.inc} (86%)
 rename data/scripts/{gUnk_0800B828.inc => script_0800B828.inc} (98%)
 rename data/scripts/{gUnk_0800B9B4.inc => script_0800B9B4.inc} (97%)
 rename data/scripts/{gUnk_0800BACC.inc => script_0800BACC.inc} (88%)
 rename data/scripts/{gUnk_0800BB00.inc => script_0800BB00.inc} (87%)
 rename data/scripts/{gUnk_0800BB30.inc => script_0800BB30.inc} (88%)
 rename data/scripts/{gUnk_0800BB64.inc => script_0800BB64.inc} (90%)
 rename data/scripts/{gUnk_0800BBA4.inc => script_0800BBA4.inc} (89%)
 rename data/scripts/{gUnk_0800BBDC.inc => script_0800BBDC.inc} (87%)
 rename data/scripts/{gUnk_0800BC08.inc => script_0800BC08.inc} (91%)
 rename data/scripts/{gUnk_0800BC50.inc => script_0800BC50.inc} (95%)
 rename data/scripts/{gUnk_0800BCE8.inc => script_0800BCE8.inc} (95%)
 rename data/scripts/{gUnk_0800BD78.inc => script_0800BD78.inc} (96%)
 rename data/scripts/{gUnk_0800BE1C.inc => script_0800BE1C.inc} (96%)
 rename data/scripts/{gUnk_0800BECC.inc => script_0800BECC.inc} (94%)
 rename data/scripts/{gUnk_0800BF38.inc => script_0800BF38.inc} (96%)
 rename data/scripts/{gUnk_0800C004.inc => script_0800C004.inc} (96%)
 rename data/scripts/{gUnk_0800C0B0.inc => script_0800C0B0.inc} (96%)
 rename data/scripts/{gUnk_0800C160.inc => script_0800C160.inc} (94%)
 rename data/scripts/{gUnk_0800C1D8.inc => script_0800C1D8.inc} (96%)
 rename data/scripts/{gUnk_0800C2A4.inc => script_0800C2A4.inc} (96%)
 rename data/scripts/{gUnk_0800C350.inc => script_0800C350.inc} (84%)
 rename data/scripts/{gUnk_0800C370.inc => script_0800C370.inc} (90%)
 rename data/scripts/{gUnk_0800C3B0.inc => script_0800C3B0.inc} (81%)
 rename data/scripts/{gUnk_0800C3CC.inc => script_0800C3CC.inc} (90%)
 rename data/scripts/{gUnk_0800C410.inc => script_0800C410.inc} (91%)
 rename data/scripts/{gUnk_0800C45C.inc => script_0800C45C.inc} (89%)
 rename data/scripts/{gUnk_0800C494.inc => script_0800C494.inc} (90%)
 rename data/scripts/{gUnk_0800C4D0.inc => script_0800C4D0.inc} (90%)
 rename data/scripts/{gUnk_0800C50C.inc => script_0800C50C.inc} (91%)
 rename data/scripts/{gUnk_0800C550.inc => script_0800C550.inc} (97%)
 rename data/scripts/{gUnk_0800C8C8.inc => script_0800C8C8.inc} (86%)
 rename data/scripts/{gUnk_0800C8F0.inc => script_0800C8F0.inc} (87%)
 rename data/scripts/{gUnk_0800C91C.inc => script_0800C91C.inc} (96%)
 rename data/scripts/{gUnk_0800CA8C.inc => script_0800CA8C.inc} (89%)
 rename data/scripts/{gUnk_0800CABC.inc => script_0800CABC.inc} (96%)
 rename data/scripts/{gUnk_0800CB54.inc => script_0800CB54.inc} (95%)
 rename data/scripts/{gUnk_0800CBD4.inc => script_0800CBD4.inc} (96%)
 rename data/scripts/{gUnk_0800CC6C.inc => script_0800CC6C.inc} (96%)
 rename data/scripts/{gUnk_0800CD04.inc => script_0800CD04.inc} (95%)
 rename data/scripts/{gUnk_0800CD7C.inc => script_0800CD7C.inc} (95%)
 rename data/scripts/{gUnk_0800D190.inc => script_0800D190.inc} (85%)
 rename data/scripts/{gUnk_0800D1B4.inc => script_0800D1B4.inc} (87%)
 rename data/scripts/{gUnk_0800D1E0.inc => script_0800D1E0.inc} (88%)
 rename data/scripts/{gUnk_0800D218.inc => script_0800D218.inc} (87%)
 rename data/scripts/{gUnk_0800D242.inc => script_0800D242.inc} (60%)
 rename data/scripts/{gUnk_0800D24C.inc => script_0800D24C.inc} (59%)
 rename data/scripts/{gUnk_0800D254.inc => script_0800D254.inc} (85%)
 rename data/scripts/{gUnk_0800D278.inc => script_0800D278.inc} (96%)
 rename data/scripts/{gUnk_0800D3EC.inc => script_0800D3EC.inc} (86%)
 rename data/scripts/{gUnk_0800D414.inc => script_0800D414.inc} (98%)
 rename data/scripts/{gUnk_0800D698.inc => script_0800D698.inc} (80%)
 rename data/scripts/{gUnk_0800D6B4.inc => script_0800D6B4.inc} (80%)
 rename data/scripts/{gUnk_0800D6D0.inc => script_0800D6D0.inc} (84%)
 rename data/scripts/{gUnk_0800D6F0.inc => script_0800D6F0.inc} (84%)
 rename data/scripts/{gUnk_0800D710.inc => script_0800D710.inc} (93%)
 rename data/scripts/{gUnk_0800D76C.inc => script_0800D76C.inc} (97%)
 rename data/scripts/{gUnk_0800D84C.inc => script_0800D84C.inc} (85%)
 rename data/scripts/{gUnk_0800D874.inc => script_0800D874.inc} (92%)
 rename data/scripts/{gUnk_0800D92C.inc => script_0800D92C.inc} (86%)
 rename data/scripts/{gUnk_0800D954.inc => script_0800D954.inc} (91%)
 rename data/scripts/{gUnk_0800DA00.inc => script_0800DA00.inc} (86%)
 rename data/scripts/{gUnk_0800DA28.inc => script_0800DA28.inc} (89%)
 rename data/scripts/{gUnk_0800DA60.inc => script_0800DA60.inc} (96%)
 rename data/scripts/{gUnk_0800DB18.inc => script_0800DB18.inc} (71%)
 rename data/scripts/{gUnk_0800DB28.inc => script_0800DB28.inc} (92%)
 rename data/scripts/{gUnk_0800DB78.inc => script_0800DB78.inc} (89%)
 rename data/scripts/{gUnk_0800DC4C.inc => script_0800DC4C.inc} (78%)
 rename data/scripts/{gUnk_0800DCAC.inc => script_0800DCAC.inc} (97%)
 rename data/scripts/{gUnk_0800DDD0.inc => script_0800DDD0.inc} (88%)
 rename data/scripts/{gUnk_0800DE00.inc => script_0800DE00.inc} (87%)
 rename data/scripts/{gUnk_0800DE2C.inc => script_0800DE2C.inc} (85%)
 rename data/scripts/{gUnk_0800DE50.inc => script_0800DE50.inc} (83%)
 rename data/scripts/{gUnk_0800DE78.inc => script_0800DE78.inc} (76%)
 rename data/scripts/{gUnk_0800DEB0.inc => script_0800DEB0.inc} (85%)
 rename data/scripts/{gUnk_0800DED4.inc => script_0800DED4.inc} (92%)
 rename data/scripts/{gUnk_0800DF24.inc => script_0800DF24.inc} (95%)
 rename data/scripts/{gUnk_0800DFB4.inc => script_0800DFB4.inc} (87%)
 rename data/scripts/{gUnk_0800DFE4.inc => script_0800DFE4.inc} (94%)
 rename data/scripts/{gUnk_0800E050.inc => script_0800E050.inc} (81%)
 rename data/scripts/{gUnk_0800E094.inc => script_0800E094.inc} (86%)
 rename data/scripts/{gUnk_0800E0BC.inc => script_0800E0BC.inc} (99%)
 rename data/scripts/{gUnk_0800E504.inc => script_0800E504.inc} (90%)
 rename data/scripts/{gUnk_0800E544.inc => script_0800E544.inc} (91%)
 rename data/scripts/{gUnk_0800E58C.inc => script_0800E58C.inc} (88%)
 rename data/scripts/{gUnk_0800E5C4.inc => script_0800E5C4.inc} (76%)
 rename data/scripts/{gUnk_0800E5D6.inc => script_0800E5D6.inc} (86%)
 rename data/scripts/{gUnk_0800E600.inc => script_0800E600.inc} (88%)
 rename data/scripts/{gUnk_0800E62C.inc => script_0800E62C.inc} (88%)
 rename data/scripts/{gUnk_0800E658.inc => script_0800E658.inc} (88%)
 rename data/scripts/{gUnk_0800E684.inc => script_0800E684.inc} (88%)
 rename data/scripts/{gUnk_0800E6B0.inc => script_0800E6B0.inc} (98%)
 rename data/scripts/{gUnk_0800E8A4.inc => script_0800E8A4.inc} (89%)
 rename data/scripts/{gUnk_0800E8D6.inc => script_0800E8D6.inc} (89%)
 rename data/scripts/{gUnk_0800E908.inc => script_0800E908.inc} (91%)
 rename data/scripts/{gUnk_0800E9F4.inc => script_0800E9F4.inc} (86%)
 rename data/scripts/{gUnk_0800EA1C.inc => script_0800EA1C.inc} (88%)
 rename data/scripts/{gUnk_0800EA54.inc => script_0800EA54.inc} (99%)
 rename data/scripts/{gUnk_0800EF40.inc => script_0800EF40.inc} (86%)
 rename data/scripts/{gUnk_0800EF9C.inc => script_0800EF9C.inc} (85%)
 rename data/scripts/{gUnk_0800EFC0.inc => script_0800EFC0.inc} (96%)
 rename data/scripts/{gUnk_0800F14C.inc => script_0800F14C.inc} (89%)
 rename data/scripts/{gUnk_0800F184.inc => script_0800F184.inc} (91%)
 rename data/scripts/{gUnk_0800F33C.inc => script_0800F33C.inc} (79%)
 rename data/scripts/{gUnk_0800F354.inc => script_0800F354.inc} (79%)
 rename data/scripts/{gUnk_0800F36C.inc => script_0800F36C.inc} (79%)
 rename data/scripts/{gUnk_0800F384.inc => script_0800F384.inc} (79%)
 rename data/scripts/{gUnk_0800F39C.inc => script_0800F39C.inc} (96%)
 rename data/scripts/{gUnk_0800F430.inc => script_0800F430.inc} (96%)
 rename data/scripts/{gUnk_0800F4C4.inc => script_0800F4C4.inc} (95%)
 rename data/scripts/{gUnk_0800F554.inc => script_0800F554.inc} (98%)
 rename data/scripts/{gUnk_0800F724.inc => script_0800F724.inc} (94%)
 rename data/scripts/{gUnk_0800FA54.inc => script_0800FA54.inc} (86%)
 rename data/scripts/{gUnk_0800FA78.inc => script_0800FA78.inc} (85%)
 rename data/scripts/{gUnk_0800FA9C.inc => script_0800FA9C.inc} (85%)
 rename data/scripts/{gUnk_0800FAC0.inc => script_0800FAC0.inc} (85%)
 rename data/scripts/{gUnk_0800FAE4.inc => script_0800FAE4.inc} (91%)
 rename data/scripts/{gUnk_0800FB2C.inc => script_0800FB2C.inc} (77%)
 rename data/scripts/{gUnk_0800FB44.inc => script_0800FB44.inc} (98%)
 rename data/scripts/{gUnk_0800FD0C.inc => script_0800FD0C.inc} (83%)
 rename data/scripts/{gUnk_0800FD80.inc => script_0800FD80.inc} (83%)
 rename data/scripts/{gUnk_0800FDA0.inc => script_0800FDA0.inc} (98%)
 rename data/scripts/{gUnk_0800FF18.inc => script_0800FF18.inc} (93%)
 rename data/scripts/{gUnk_0800FF74.inc => script_0800FF74.inc} (98%)
 rename data/scripts/{gUnk_080100C8.inc => script_080100C8.inc} (98%)
 rename data/scripts/{gUnk_08010264.inc => script_08010264.inc} (98%)
 rename data/scripts/{gUnk_08010964.inc => script_08010964.inc} (85%)
 rename data/scripts/{gUnk_080109F0.inc => script_080109F0.inc} (85%)
 rename data/scripts/{gUnk_08010A14.inc => script_08010A14.inc} (85%)
 rename data/scripts/{gUnk_08010A38.inc => script_08010A38.inc} (85%)
 rename data/scripts/{gUnk_08010A5C.inc => script_08010A5C.inc} (89%)
 rename data/scripts/{gUnk_08010A98.inc => script_08010A98.inc} (96%)
 rename data/scripts/{gUnk_08010B68.inc => script_08010B68.inc} (92%)
 rename data/scripts/{gUnk_08010BB4.inc => script_08010BB4.inc} (96%)
 rename data/scripts/{gUnk_08010E5A.inc => script_08010E5A.inc} (97%)
 rename data/scripts/{gUnk_08010F84.inc => script_08010F84.inc} (93%)
 rename data/scripts/{gUnk_08011074.inc => script_08011074.inc} (85%)
 rename data/scripts/{gUnk_08011098.inc => script_08011098.inc} (84%)
 rename data/scripts/{gUnk_080110BC.inc => script_080110BC.inc} (88%)
 rename data/scripts/{gUnk_080110E8.inc => script_080110E8.inc} (90%)
 rename data/scripts/{gUnk_08011128.inc => script_08011128.inc} (96%)
 rename data/scripts/{gUnk_080111CC.inc => script_080111CC.inc} (97%)
 rename data/scripts/{gUnk_080112C4.inc => script_080112C4.inc} (97%)
 rename data/scripts/{gUnk_080113AA.inc => script_080113AA.inc} (95%)
 rename data/scripts/{gUnk_08011442.inc => script_08011442.inc} (96%)
 rename data/scripts/{gUnk_08011508.inc => script_08011508.inc} (96%)
 rename data/scripts/{gUnk_080115D0.inc => script_080115D0.inc} (90%)
 rename data/scripts/{gUnk_08011608.inc => script_08011608.inc} (90%)
 rename data/scripts/{gUnk_08011640.inc => script_08011640.inc} (94%)
 rename data/scripts/{gUnk_080116A8.inc => script_080116A8.inc} (98%)
 rename data/scripts/{gUnk_0801183C.inc => script_0801183C.inc} (92%)
 rename data/scripts/{gUnk_08011890.inc => script_08011890.inc} (90%)
 rename data/scripts/{gUnk_080118D4.inc => script_080118D4.inc} (85%)
 rename data/scripts/{gUnk_08011930.inc => script_08011930.inc} (71%)
 rename data/scripts/{gUnk_08011940.inc => script_08011940.inc} (65%)
 rename data/scripts/{gUnk_0801194C.inc => script_0801194C.inc} (98%)
 rename data/scripts/{gUnk_08011B20.inc => script_08011B20.inc} (83%)
 rename data/scripts/{gUnk_08011B40.inc => script_08011B40.inc} (97%)
 rename data/scripts/{gUnk_08011C50.inc => script_08011C50.inc} (86%)
 rename data/scripts/{gUnk_08011C7C.inc => script_08011C7C.inc} (99%)
 rename data/scripts/{gUnk_0801232C.inc => script_0801232C.inc} (94%)
 rename data/scripts/{gUnk_08012410.inc => script_08012410.inc} (83%)
 rename data/scripts/{gUnk_08012430.inc => script_08012430.inc} (95%)
 rename data/scripts/{gUnk_080126FC.inc => script_080126FC.inc} (98%)
 rename data/scripts/{gUnk_08012AB0.inc => script_08012AB0.inc} (76%)
 rename data/scripts/{gUnk_08012AC8.inc => script_08012AC8.inc} (86%)
 rename data/scripts/{gUnk_08012AF0.inc => script_08012AF0.inc} (86%)
 rename data/scripts/{gUnk_08012B18.inc => script_08012B18.inc} (61%)
 rename data/scripts/{gUnk_08012B24.inc => script_08012B24.inc} (87%)
 rename data/scripts/{gUnk_08012B50.inc => script_08012B50.inc} (87%)
 rename data/scripts/{gUnk_08012B7C.inc => script_08012B7C.inc} (87%)
 rename data/scripts/{gUnk_08012BA8.inc => script_08012BA8.inc} (92%)
 rename data/scripts/{gUnk_08012BF8.inc => script_08012BF8.inc} (92%)
 rename data/scripts/{gUnk_08012C48.inc => script_08012C48.inc} (84%)
 rename data/scripts/{gUnk_08012C68.inc => script_08012C68.inc} (94%)
 rename data/scripts/{gUnk_08012CD8.inc => script_08012CD8.inc} (91%)
 rename data/scripts/{gUnk_08012D18.inc => script_08012D18.inc} (85%)
 rename data/scripts/{gUnk_08012D70.inc => script_08012D70.inc} (80%)
 rename data/scripts/{gUnk_08012DB0.inc => script_08012DB0.inc} (86%)
 rename data/scripts/{gUnk_08012DD8.inc => script_08012DD8.inc} (67%)
 rename data/scripts/{gUnk_08012DF8.inc => script_08012DF8.inc} (86%)
 rename data/scripts/{gUnk_08012E20.inc => script_08012E20.inc} (68%)
 rename data/scripts/{gUnk_08012E44.inc => script_08012E44.inc} (90%)
 rename data/scripts/{gUnk_08012E88.inc => script_08012E88.inc} (95%)
 rename data/scripts/{gUnk_08012F0C.inc => script_08012F0C.inc} (94%)
 rename data/scripts/{gUnk_08012F86.inc => script_08012F86.inc} (95%)
 rename data/scripts/{gUnk_080130E4.inc => script_080130E4.inc} (88%)
 rename data/scripts/{gUnk_08013114.inc => script_08013114.inc} (95%)
 rename data/scripts/{gUnk_0801319A.inc => script_0801319A.inc} (87%)
 rename data/scripts/{gUnk_080132E4.inc => script_080132E4.inc} (86%)
 rename data/scripts/{gUnk_0801330C.inc => script_0801330C.inc} (85%)
 rename data/scripts/{gUnk_08013330.inc => script_08013330.inc} (81%)
 rename data/scripts/{gUnk_0801334C.inc => script_0801334C.inc} (87%)
 rename data/scripts/{gUnk_08013378.inc => script_08013378.inc} (90%)
 rename data/scripts/{gUnk_080133C4.inc => script_080133C4.inc} (88%)
 rename data/scripts/{gUnk_080133F8.inc => script_080133F8.inc} (95%)
 rename data/scripts/{gUnk_08013494.inc => script_08013494.inc} (90%)
 rename data/scripts/{gUnk_080134DC.inc => script_080134DC.inc} (93%)
 rename data/scripts/{gUnk_08013650.inc => script_08013650.inc} (86%)
 rename data/scripts/{gUnk_080136B4.inc => script_080136B4.inc} (85%)
 rename data/scripts/{gUnk_080136D8.inc => script_080136D8.inc} (91%)
 rename data/scripts/{gUnk_08013720.inc => script_08013720.inc} (94%)
 rename data/scripts/{gUnk_080138B4.inc => script_080138B4.inc} (95%)
 rename data/scripts/{gUnk_08013AA6.inc => script_08013AA6.inc} (94%)
 rename data/scripts/{gUnk_08013B18.inc => script_08013B18.inc} (84%)
 rename data/scripts/{gUnk_08013B70.inc => script_08013B70.inc} (87%)
 rename data/scripts/{gUnk_08013BA8.inc => script_08013BA8.inc} (88%)
 rename data/scripts/{gUnk_08013BE8.inc => script_08013BE8.inc} (96%)
 rename data/scripts/{gUnk_08013CA4.inc => script_08013CA4.inc} (93%)
 rename data/scripts/{gUnk_08013D04.inc => script_08013D04.inc} (90%)
 rename data/scripts/{gUnk_08013D44.inc => script_08013D44.inc} (90%)
 rename data/scripts/{gUnk_08013D84.inc => script_08013D84.inc} (90%)
 rename data/scripts/{gUnk_08013DC4.inc => script_08013DC4.inc} (90%)
 rename data/scripts/{gUnk_08013E04.inc => script_08013E04.inc} (86%)
 rename data/scripts/{gUnk_08013E28.inc => script_08013E28.inc} (86%)
 rename data/scripts/{gUnk_08013E4C.inc => script_08013E4C.inc} (86%)
 rename data/scripts/{gUnk_08013E70.inc => script_08013E70.inc} (86%)
 rename data/scripts/{gUnk_08013E94.inc => script_08013E94.inc} (82%)
 rename data/scripts/{gUnk_08013EB0.inc => script_08013EB0.inc} (82%)
 rename data/scripts/{gUnk_08013ECC.inc => script_08013ECC.inc} (82%)
 rename data/scripts/{gUnk_08013EE8.inc => script_08013EE8.inc} (82%)
 rename data/scripts/{gUnk_08013F04.inc => script_08013F04.inc} (88%)
 rename data/scripts/{gUnk_08013F34.inc => script_08013F34.inc} (88%)
 rename data/scripts/{gUnk_08013F64.inc => script_08013F64.inc} (88%)
 rename data/scripts/{gUnk_08013F94.inc => script_08013F94.inc} (92%)
 rename data/scripts/{gUnk_08013FE8.inc => script_08013FE8.inc} (87%)
 rename data/scripts/{gUnk_08014054.inc => script_08014054.inc} (83%)
 rename data/scripts/{gUnk_08014074.inc => script_08014074.inc} (83%)
 rename data/scripts/{gUnk_08014094.inc => script_08014094.inc} (85%)
 rename data/scripts/{gUnk_080140B8.inc => script_080140B8.inc} (85%)
 rename data/scripts/{gUnk_080140DC.inc => script_080140DC.inc} (89%)
 rename data/scripts/{gUnk_08014118.inc => script_08014118.inc} (89%)
 rename data/scripts/{gUnk_08014154.inc => script_08014154.inc} (91%)
 rename data/scripts/{gUnk_08014198.inc => script_08014198.inc} (91%)
 rename data/scripts/{gUnk_080141DC.inc => script_080141DC.inc} (88%)
 rename data/scripts/{gUnk_08014210.inc => script_08014210.inc} (88%)
 rename data/scripts/{gUnk_08014248.inc => script_08014248.inc} (94%)
 rename data/scripts/{gUnk_080142B0.inc => script_080142B0.inc} (96%)
 rename data/scripts/{gUnk_08014384.inc => script_08014384.inc} (90%)
 rename data/scripts/{gUnk_080143C0.inc => script_080143C0.inc} (95%)
 rename data/scripts/{gUnk_08014450.inc => script_08014450.inc} (96%)
 rename data/scripts/{gUnk_0801450C.inc => script_0801450C.inc} (89%)
 rename data/scripts/{gUnk_08014588.inc => script_08014588.inc} (86%)
 rename data/scripts/{gUnk_080145B0.inc => script_080145B0.inc} (90%)
 rename data/scripts/{gUnk_080145E8.inc => script_080145E8.inc} (97%)
 rename data/scripts/{gUnk_080147DC.inc => script_080147DC.inc} (86%)
 rename data/scripts/{gUnk_08014804.inc => script_08014804.inc} (97%)
 rename data/scripts/{gUnk_08014958.inc => script_08014958.inc} (94%)
 rename data/scripts/{gUnk_080149CC.inc => script_080149CC.inc} (96%)
 rename data/scripts/{gUnk_08014A80.inc => script_08014A80.inc} (91%)
 rename data/scripts/{gUnk_08014B10.inc => script_08014B10.inc} (85%)
 rename data/scripts/{gUnk_08014B34.inc => script_08014B34.inc} (98%)
 rename data/scripts/{gUnk_08014CDC.inc => script_08014CDC.inc} (97%)
 rename data/scripts/{gUnk_08014DCC.inc => script_08014DCC.inc} (91%)
 rename data/scripts/{gUnk_08014E14.inc => script_08014E14.inc} (95%)
 rename data/scripts/{gUnk_08015234.inc => script_08015234.inc} (94%)
 rename data/scripts/{gUnk_080152B4.inc => script_080152B4.inc} (86%)
 rename data/scripts/{gUnk_080152DC.inc => script_080152DC.inc} (86%)
 rename data/scripts/{gUnk_08015304.inc => script_08015304.inc} (87%)
 rename data/scripts/{gUnk_08015338.inc => script_08015338.inc} (86%)
 rename data/scripts/{gUnk_08015360.inc => script_08015360.inc} (86%)
 rename data/scripts/{gUnk_08015384.inc => script_08015384.inc} (61%)
 rename data/scripts/{gUnk_08015390.inc => script_08015390.inc} (85%)
 rename data/scripts/{gUnk_080153EC.inc => script_080153EC.inc} (96%)
 rename data/scripts/{gUnk_0801548E.inc => script_0801548E.inc} (95%)
 rename data/scripts/{gUnk_0801550C.inc => script_0801550C.inc} (96%)
 rename data/scripts/{gUnk_080155F4.inc => script_080155F4.inc} (84%)
 rename data/scripts/{gUnk_08015618.inc => script_08015618.inc} (93%)
 rename data/scripts/{gUnk_08015684.inc => script_08015684.inc} (96%)
 rename data/scripts/{gUnk_08015754.inc => script_08015754.inc} (93%)
 rename data/scripts/{gUnk_080157AC.inc => script_080157AC.inc} (91%)
 rename data/scripts/{gUnk_080158F8.inc => script_080158F8.inc} (83%)
 rename data/scripts/{gUnk_08015918.inc => script_08015918.inc} (83%)
 rename data/scripts/{gUnk_08015938.inc => script_08015938.inc} (83%)
 rename data/scripts/{gUnk_08015958.inc => script_08015958.inc} (97%)
 rename data/scripts/{gUnk_08015A7C.inc => script_08015A7C.inc} (85%)
 rename data/scripts/{gUnk_08015AA0.inc => script_08015AA0.inc} (85%)
 rename data/scripts/{gUnk_08015AC4.inc => script_08015AC4.inc} (92%)
 rename data/scripts/{gUnk_08015B14.inc => script_08015B14.inc} (84%)
 rename data/scripts/{gUnk_08015B34.inc => script_08015B34.inc} (83%)
 rename data/scripts/{gUnk_08015B84.inc => script_08015B84.inc} (85%)
 rename data/scripts/{gUnk_08015BA8.inc => script_08015BA8.inc} (91%)
 rename data/scripts/{gUnk_08015BE8.inc => script_08015BE8.inc} (91%)
 rename data/scripts/{gUnk_08015C7C.inc => script_08015C7C.inc} (92%)
 rename data/scripts/{gUnk_08015CD4.inc => script_08015CD4.inc} (97%)
 rename data/scripts/{gUnk_08015DF0.inc => script_08015DF0.inc} (94%)
 rename data/scripts/{gUnk_08015E58.inc => script_08015E58.inc} (96%)
 rename data/scripts/{gUnk_08015F08.inc => script_08015F08.inc} (89%)
 rename data/scripts/{gUnk_08015F3C.inc => script_08015F3C.inc} (91%)
 rename data/scripts/{gUnk_08015F80.inc => script_08015F80.inc} (85%)
 rename data/scripts/{gUnk_08015FA4.inc => script_08015FA4.inc} (81%)
 rename data/scripts/{gUnk_08015FC0.inc => script_08015FC0.inc} (90%)
 rename data/scripts/{gUnk_08016004.inc => script_08016004.inc} (86%)
 rename data/scripts/{gUnk_08016030.inc => script_08016030.inc} (89%)
 rename data/scripts/{gUnk_08016062.inc => script_08016062.inc} (66%)
 rename data/scripts/{gUnk_0801606C.inc => script_0801606C.inc} (89%)
 rename data/scripts/{gUnk_0801609E.inc => script_0801609E.inc} (66%)
 rename data/scripts/{gUnk_080160A8.inc => script_080160A8.inc} (97%)
 rename data/scripts/{gUnk_0801635C.inc => script_0801635C.inc} (83%)
 rename data/scripts/{gUnk_0801637C.inc => script_0801637C.inc} (65%)
 rename data/scripts/{gUnk_08016384.inc => script_08016384.inc} (79%)
 rename data/scripts/{gUnk_08016482.inc => script_08016482.inc} (95%)
 rename data/scripts/{gUnk_080165A4.inc => script_080165A4.inc} (80%)
 rename data/scripts/{gUnk_080165D8.inc => script_080165D8.inc} (97%)

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

From 15f480dc0f99437a5ff08c5a8c5c037107b89663 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 15:53:39 +0100
Subject: [PATCH 21/46] Add labels for relative jumps

---
 asm/macros/script.inc                         |  682 ----------
 asm/macros/scripts.inc                        |   82 +-
 data/scripts/script_08008B5C.inc              |  249 ++--
 data/scripts/script_08008D50.inc              |   30 +-
 data/scripts/script_08008D8C.inc              |  213 ++--
 data/scripts/script_08008F74.inc              |   34 +-
 data/scripts/script_08008FC0.inc              |   20 +-
 data/scripts/script_08008FFC.inc              |   32 +-
 data/scripts/script_0800903C.inc              |  388 +++---
 data/scripts/script_08009320.inc              |   15 +-
 data/scripts/script_08009340.inc              |    6 +-
 data/scripts/script_08009348.inc              |   48 +-
 data/scripts/script_0800939A.inc              |  106 +-
 data/scripts/script_08009464.inc              |   53 +-
 data/scripts/script_080094CC.inc              |   25 +-
 data/scripts/script_080094FC.inc              |  138 ++-
 data/scripts/script_080095F2.inc              |  151 +--
 data/scripts/script_08009704.inc              |   26 +-
 data/scripts/script_08009740.inc              |   87 +-
 data/scripts/script_080097F0.inc              |   37 +-
 data/scripts/script_08009838.inc              |   30 +-
 data/scripts/script_0800987C.inc              |   36 +-
 data/scripts/script_080098D4.inc              |   39 +-
 data/scripts/script_08009918.inc              |   26 +-
 data/scripts/script_08009950.inc              |   70 +-
 data/scripts/script_080099DC.inc              |   42 +-
 data/scripts/script_08009A34.inc              |   37 +-
 data/scripts/script_08009A84.inc              |   48 +-
 data/scripts/script_08009AF8.inc              |   28 +-
 data/scripts/script_08009B30.inc              |   36 +-
 data/scripts/script_08009B78.inc              |  120 +-
 data/scripts/script_08009C68.inc              |   74 +-
 data/scripts/script_08009CFC.inc              |   50 +-
 data/scripts/script_08009D6C.inc              |   32 +-
 data/scripts/script_08009DB0.inc              |   80 +-
 data/scripts/script_08009E4E.inc              |    7 +-
 data/scripts/script_08009E58.inc              |   20 +-
 data/scripts/script_08009E80.inc              |    6 +-
 data/scripts/script_08009E88.inc              |   35 +-
 data/scripts/script_08009ECC.inc              |   18 +-
 data/scripts/script_08009EF0.inc              |   18 +-
 data/scripts/script_08009F14.inc              |  224 ++--
 data/scripts/script_0800A088.inc              |   20 +-
 data/scripts/script_0800A0B4.inc              |   37 +-
 data/scripts/script_0800A0FC.inc              |   45 +-
 data/scripts/script_0800A160.inc              |   34 +-
 data/scripts/script_0800A1B4.inc              |   16 +-
 data/scripts/script_0800A1D8.inc              |  122 +-
 data/scripts/script_0800A310.inc              |   82 +-
 data/scripts/script_0800A3D8.inc              |  116 +-
 data/scripts/script_0800A500.inc              |   56 +-
 data/scripts/script_0800A590.inc              |   66 +-
 data/scripts/script_0800A638.inc              |   16 +-
 data/scripts/script_0800A65C.inc              |   16 +-
 data/scripts/script_0800A680.inc              |   16 +-
 data/scripts/script_0800A6A4.inc              |   20 +-
 data/scripts/script_0800A6D4.inc              |   20 +-
 data/scripts/script_0800A704.inc              |   20 +-
 data/scripts/script_0800A734.inc              |   20 +-
 data/scripts/script_0800A764.inc              |   58 +-
 data/scripts/script_0800A7E4.inc              |  189 +--
 data/scripts/script_0800A964.inc              |   18 +-
 data/scripts/script_0800A988.inc              |   18 +-
 data/scripts/script_0800A9AC.inc              |   18 +-
 data/scripts/script_0800A9D0.inc              |   18 +-
 data/scripts/script_0800A9F4.inc              |   34 +-
 data/scripts/script_0800AA48.inc              |   18 +-
 data/scripts/script_0800AA6C.inc              |   18 +-
 data/scripts/script_0800AA90.inc              |   18 +-
 data/scripts/script_0800AAB4.inc              |   18 +-
 data/scripts/script_0800AAD8.inc              |   20 +-
 data/scripts/script_0800AB08.inc              |   40 +-
 data/scripts/script_0800AB6E.inc              |  134 +-
 data/scripts/script_0800ACBC.inc              |   18 +-
 data/scripts/script_0800ACE0.inc              |   48 +-
 data/scripts/script_0800AD54.inc              |  126 +-
 data/scripts/script_0800AEA4.inc              |   26 +-
 data/scripts/script_0800AEDC.inc              |   26 +-
 data/scripts/script_0800AF18.inc              |   20 +-
 data/scripts/script_0800AF44.inc              |   18 +-
 data/scripts/script_0800AF68.inc              |   18 +-
 data/scripts/script_0800AF8C.inc              |   18 +-
 data/scripts/script_0800AFB0.inc              |   31 +-
 data/scripts/script_0800AFE8.inc              |   18 +-
 data/scripts/script_0800B00C.inc              |   88 +-
 data/scripts/script_0800B0AC.inc              |   18 +-
 data/scripts/script_0800B0D0.inc              |  104 +-
 data/scripts/script_0800B1C0.inc              |   28 +-
 data/scripts/script_0800B200.inc              |   42 +-
 data/scripts/script_0800B254.inc              |  111 +-
 data/scripts/script_0800B308.inc              |   79 +-
 data/scripts/script_0800B3A4.inc              |   47 +-
 data/scripts/script_0800B41C.inc              |   68 +-
 data/scripts/script_0800B4AC.inc              |   85 +-
 data/scripts/script_0800B54C.inc              |   18 +-
 data/scripts/script_0800B574.inc              |   37 +-
 data/scripts/script_0800B5C4.inc              |   20 +-
 data/scripts/script_0800B5EC.inc              |  124 +-
 data/scripts/script_0800B6C8.inc              |  127 +-
 data/scripts/script_0800B7C4.inc              |   21 +-
 data/scripts/script_0800B7FC.inc              |   19 +-
 data/scripts/script_0800B828.inc              |  243 ++--
 data/scripts/script_0800B9B4.inc              |  153 +--
 data/scripts/script_0800BACC.inc              |   27 +-
 data/scripts/script_0800BB00.inc              |   27 +-
 data/scripts/script_0800BB30.inc              |   27 +-
 data/scripts/script_0800BB64.inc              |   31 +-
 data/scripts/script_0800BBA4.inc              |   29 +-
 data/scripts/script_0800BBDC.inc              |   25 +-
 data/scripts/script_0800BC08.inc              |   39 +-
 data/scripts/script_0800BC50.inc              |   71 +-
 data/scripts/script_0800BCE8.inc              |   69 +-
 data/scripts/script_0800BD78.inc              |   66 +-
 data/scripts/script_0800BE1C.inc              |   92 +-
 data/scripts/script_0800BECC.inc              |   46 +-
 data/scripts/script_0800BF38.inc              |  104 +-
 data/scripts/script_0800C004.inc              |   68 +-
 data/scripts/script_0800C0B0.inc              |   92 +-
 data/scripts/script_0800C160.inc              |   50 +-
 data/scripts/script_0800C1D8.inc              |  104 +-
 data/scripts/script_0800C2A4.inc              |   68 +-
 data/scripts/script_0800C350.inc              |   15 +-
 data/scripts/script_0800C370.inc              |   24 +-
 data/scripts/script_0800C3B0.inc              |   10 +-
 data/scripts/script_0800C3CC.inc              |   24 +-
 data/scripts/script_0800C410.inc              |   28 +-
 data/scripts/script_0800C45C.inc              |   31 +-
 data/scripts/script_0800C494.inc              |   30 +-
 data/scripts/script_0800C4D0.inc              |   30 +-
 data/scripts/script_0800C50C.inc              |   32 +-
 data/scripts/script_0800C550.inc              |  510 ++++----
 data/scripts/script_0800C8C8.inc              |   18 +-
 data/scripts/script_0800C8F0.inc              |   20 +-
 data/scripts/script_0800C91C.inc              |  159 +--
 data/scripts/script_0800CA8C.inc              |   22 +-
 data/scripts/script_0800CABC.inc              |   64 +-
 data/scripts/script_0800CB54.inc              |   56 +-
 data/scripts/script_0800CBD4.inc              |   64 +-
 data/scripts/script_0800CC6C.inc              |   64 +-
 data/scripts/script_0800CD04.inc              |   52 +-
 data/scripts/script_0800CD7C.inc              |  557 +++++----
 data/scripts/script_0800D190.inc              |   16 +-
 data/scripts/script_0800D1B4.inc              |   20 +-
 data/scripts/script_0800D1E0.inc              |   18 +-
 data/scripts/script_0800D218.inc              |   20 +-
 data/scripts/script_0800D242.inc              |    5 +-
 data/scripts/script_0800D24C.inc              |    5 +-
 data/scripts/script_0800D254.inc              |   18 +-
 data/scripts/script_0800D278.inc              |  209 ++--
 data/scripts/script_0800D3EC.inc              |   20 +-
 data/scripts/script_0800D414.inc              |  297 ++---
 data/scripts/script_0800D698.inc              |   16 +-
 data/scripts/script_0800D6B4.inc              |   14 +-
 data/scripts/script_0800D6D0.inc              |   20 +-
 data/scripts/script_0800D6F0.inc              |   19 +-
 data/scripts/script_0800D710.inc              |   42 +-
 data/scripts/script_0800D76C.inc              |   94 +-
 data/scripts/script_0800D84C.inc              |   23 +-
 data/scripts/script_0800D874.inc              |  100 +-
 data/scripts/script_0800D92C.inc              |   18 +-
 data/scripts/script_0800D954.inc              |   79 +-
 data/scripts/script_0800DA00.inc              |   18 +-
 data/scripts/script_0800DA28.inc              |   24 +-
 data/scripts/script_0800DA60.inc              |   87 +-
 data/scripts/script_0800DB18.inc              |    8 +-
 data/scripts/script_0800DB28.inc              |   38 +-
 data/scripts/script_0800DB78.inc              |   88 +-
 data/scripts/script_0800DC4C.inc              |   38 +-
 data/scripts/script_0800DCAC.inc              |  131 +-
 data/scripts/script_0800DDD0.inc              |   20 +-
 data/scripts/script_0800DE00.inc              |   22 +-
 data/scripts/script_0800DE2C.inc              |   16 +-
 data/scripts/script_0800DE50.inc              |   14 +-
 data/scripts/script_0800DE78.inc              |   24 +-
 data/scripts/script_0800DEB0.inc              |   16 +-
 data/scripts/script_0800DED4.inc              |   38 +-
 data/scripts/script_0800DF24.inc              |   72 +-
 data/scripts/script_0800DFB4.inc              |   23 +-
 data/scripts/script_0800DFE4.inc              |   56 +-
 data/scripts/script_0800E050.inc              |   36 +-
 data/scripts/script_0800E094.inc              |   18 +-
 data/scripts/script_0800E0BC.inc              |  614 ++++-----
 data/scripts/script_0800E504.inc              |   34 +-
 data/scripts/script_0800E544.inc              |   38 +-
 data/scripts/script_0800E58C.inc              |   30 +-
 data/scripts/script_0800E5C4.inc              |   10 +-
 data/scripts/script_0800E5D6.inc              |   24 +-
 data/scripts/script_0800E600.inc              |   24 +-
 data/scripts/script_0800E62C.inc              |   24 +-
 data/scripts/script_0800E658.inc              |   24 +-
 data/scripts/script_0800E684.inc              |   24 +-
 data/scripts/script_0800E6B0.inc              |  293 ++---
 data/scripts/script_0800E8A4.inc              |   25 +-
 data/scripts/script_0800E8D6.inc              |   25 +-
 data/scripts/script_0800E908.inc              |  135 +-
 data/scripts/script_0800E9F4.inc              |   18 +-
 data/scripts/script_0800EA1C.inc              |   26 +-
 data/scripts/script_0800EA54.inc              |  669 +++++-----
 data/scripts/script_0800EF40.inc              |   51 +-
 data/scripts/script_0800EF9C.inc              |   18 +-
 data/scripts/script_0800EFC0.inc              |  173 +--
 data/scripts/script_0800F14C.inc              |   26 +-
 data/scripts/script_0800F184.inc              |  216 ++--
 data/scripts/script_0800F33C.inc              |   10 +-
 data/scripts/script_0800F354.inc              |   10 +-
 data/scripts/script_0800F36C.inc              |   10 +-
 data/scripts/script_0800F384.inc              |   10 +-
 data/scripts/script_0800F39C.inc              |   78 +-
 data/scripts/script_0800F430.inc              |   80 +-
 data/scripts/script_0800F4C4.inc              |   78 +-
 data/scripts/script_0800F554.inc              |  286 ++---
 data/scripts/script_0800F724.inc              |  346 +++---
 data/scripts/script_0800FA54.inc              |   16 +-
 data/scripts/script_0800FA78.inc              |   16 +-
 data/scripts/script_0800FA9C.inc              |   16 +-
 data/scripts/script_0800FAC0.inc              |   16 +-
 data/scripts/script_0800FAE4.inc              |   27 +-
 data/scripts/script_0800FB2C.inc              |   10 +-
 data/scripts/script_0800FB44.inc              |  201 +--
 data/scripts/script_0800FD0C.inc              |   55 +-
 data/scripts/script_0800FD80.inc              |   14 +-
 data/scripts/script_0800FDA0.inc              |  217 ++--
 data/scripts/script_0800FF18.inc              |   50 +-
 data/scripts/script_0800FF74.inc              |  169 +--
 data/scripts/script_080100C8.inc              |  225 ++--
 data/scripts/script_08010264.inc              | 1012 ++++++++-------
 data/scripts/script_08010964.inc              |   73 +-
 data/scripts/script_080109F0.inc              |   18 +-
 data/scripts/script_08010A14.inc              |   18 +-
 data/scripts/script_08010A38.inc              |   18 +-
 data/scripts/script_08010A5C.inc              |   33 +-
 data/scripts/script_08010A98.inc              |  108 +-
 data/scripts/script_08010B68.inc              |   50 +-
 data/scripts/script_08010BB4.inc              |  273 ++--
 data/scripts/script_08010E5A.inc              |  108 +-
 data/scripts/script_08010F84.inc              |   84 +-
 data/scripts/script_08011074.inc              |   16 +-
 data/scripts/script_08011098.inc              |   14 +-
 data/scripts/script_080110BC.inc              |   20 +-
 data/scripts/script_080110E8.inc              |   28 +-
 data/scripts/script_08011128.inc              |   69 +-
 data/scripts/script_080111CC.inc              |  104 +-
 data/scripts/script_080112C4.inc              |   99 +-
 data/scripts/script_080113AA.inc              |   65 +-
 data/scripts/script_08011442.inc              |   83 +-
 data/scripts/script_08011508.inc              |   85 +-
 data/scripts/script_080115D0.inc              |   26 +-
 data/scripts/script_08011608.inc              |   26 +-
 data/scripts/script_08011640.inc              |   46 +-
 data/scripts/script_080116A8.inc              |  166 +--
 data/scripts/script_0801183C.inc              |   34 +-
 data/scripts/script_08011890.inc              |   28 +-
 data/scripts/script_080118D4.inc              |   38 +-
 data/scripts/script_08011930.inc              |    6 +-
 data/scripts/script_08011940.inc              |    4 +-
 data/scripts/script_0801194C.inc              |  258 ++--
 data/scripts/script_08011B20.inc              |   16 +-
 data/scripts/script_08011B40.inc              |  154 +--
 data/scripts/script_08011C50.inc              |   22 +-
 data/scripts/script_08011C7C.inc              | 1096 +++++++++--------
 data/scripts/script_0801232C.inc              |  135 +-
 data/scripts/script_08012410.inc              |   16 +-
 data/scripts/script_08012430.inc              |  310 ++---
 data/scripts/script_080126FC.inc              |  470 +++----
 data/scripts/script_08012AB0.inc              |   15 +-
 data/scripts/script_08012AC8.inc              |   20 +-
 data/scripts/script_08012AF0.inc              |   18 +-
 data/scripts/script_08012B18.inc              |    4 +-
 data/scripts/script_08012B24.inc              |   18 +-
 data/scripts/script_08012B50.inc              |   18 +-
 data/scripts/script_08012B7C.inc              |   18 +-
 data/scripts/script_08012BA8.inc              |   36 +-
 data/scripts/script_08012BF8.inc              |   36 +-
 data/scripts/script_08012C48.inc              |   16 +-
 data/scripts/script_08012C68.inc              |   68 +-
 data/scripts/script_08012CD8.inc              |   35 +-
 data/scripts/script_08012D18.inc              |   44 +-
 data/scripts/script_08012D70.inc              |   29 +-
 data/scripts/script_08012DB0.inc              |   18 +-
 data/scripts/script_08012DD8.inc              |   18 +-
 data/scripts/script_08012DF8.inc              |   20 +-
 data/scripts/script_08012E20.inc              |   18 +-
 data/scripts/script_08012E44.inc              |   34 +-
 data/scripts/script_08012E88.inc              |   70 +-
 data/scripts/script_08012F0C.inc              |   63 +-
 data/scripts/script_08012F86.inc              |  189 +--
 data/scripts/script_080130E4.inc              |   24 +-
 data/scripts/script_08013114.inc              |   71 +-
 data/scripts/script_0801319A.inc              |  152 +--
 data/scripts/script_080132E4.inc              |   18 +-
 data/scripts/script_0801330C.inc              |   18 +-
 data/scripts/script_08013330.inc              |   12 +-
 data/scripts/script_0801334C.inc              |   22 +-
 data/scripts/script_08013378.inc              |   28 +-
 data/scripts/script_080133C4.inc              |   24 +-
 data/scripts/script_080133F8.inc              |   64 +-
 data/scripts/script_08013494.inc              |   32 +-
 data/scripts/script_080134DC.inc              |  143 +--
 data/scripts/script_08013650.inc              |   42 +-
 data/scripts/script_080136B4.inc              |   16 +-
 data/scripts/script_080136D8.inc              |   27 +-
 data/scripts/script_08013720.inc              |  157 +--
 data/scripts/script_080138B4.inc              |  182 +--
 data/scripts/script_08013AA6.inc              |   52 +-
 data/scripts/script_08013B18.inc              |   45 +-
 data/scripts/script_08013B70.inc              |   20 +-
 data/scripts/script_08013BA8.inc              |   20 +-
 data/scripts/script_08013BE8.inc              |  105 +-
 data/scripts/script_08013CA4.inc              |   45 +-
 data/scripts/script_08013D04.inc              |   27 +-
 data/scripts/script_08013D44.inc              |   27 +-
 data/scripts/script_08013D84.inc              |   27 +-
 data/scripts/script_08013DC4.inc              |   27 +-
 data/scripts/script_08013E04.inc              |   18 +-
 data/scripts/script_08013E28.inc              |   18 +-
 data/scripts/script_08013E4C.inc              |   18 +-
 data/scripts/script_08013E70.inc              |   18 +-
 data/scripts/script_08013E94.inc              |   14 +-
 data/scripts/script_08013EB0.inc              |   14 +-
 data/scripts/script_08013ECC.inc              |   14 +-
 data/scripts/script_08013EE8.inc              |   14 +-
 data/scripts/script_08013F04.inc              |   22 +-
 data/scripts/script_08013F34.inc              |   22 +-
 data/scripts/script_08013F64.inc              |   22 +-
 data/scripts/script_08013F94.inc              |   48 +-
 data/scripts/script_08013FE8.inc              |   58 +-
 data/scripts/script_08014054.inc              |   16 +-
 data/scripts/script_08014074.inc              |   16 +-
 data/scripts/script_08014094.inc              |   16 +-
 data/scripts/script_080140B8.inc              |   16 +-
 data/scripts/script_080140DC.inc              |   26 +-
 data/scripts/script_08014118.inc              |   26 +-
 data/scripts/script_08014154.inc              |   30 +-
 data/scripts/script_08014198.inc              |   30 +-
 data/scripts/script_080141DC.inc              |   22 +-
 data/scripts/script_08014210.inc              |   22 +-
 data/scripts/script_08014248.inc              |   54 +-
 data/scripts/script_080142B0.inc              |  119 +-
 data/scripts/script_08014384.inc              |   39 +-
 data/scripts/script_080143C0.inc              |   72 +-
 data/scripts/script_08014450.inc              |  107 +-
 data/scripts/script_0801450C.inc              |   65 +-
 data/scripts/script_08014588.inc              |   16 +-
 data/scripts/script_080145B0.inc              |   34 +-
 data/scripts/script_080145E8.inc              |  271 ++--
 data/scripts/script_080147DC.inc              |   16 +-
 data/scripts/script_08014804.inc              |  180 +--
 data/scripts/script_08014958.inc              |   70 +-
 data/scripts/script_080149CC.inc              |  112 +-
 data/scripts/script_08014A80.inc              |   88 +-
 data/scripts/script_08014B10.inc              |   16 +-
 data/scripts/script_08014B34.inc              |  243 ++--
 data/scripts/script_08014CDC.inc              |  113 +-
 data/scripts/script_08014DCC.inc              |   36 +-
 data/scripts/script_08014E14.inc              |  533 ++++----
 data/scripts/script_08015234.inc              |   56 +-
 data/scripts/script_080152B4.inc              |   18 +-
 data/scripts/script_080152DC.inc              |   18 +-
 data/scripts/script_08015304.inc              |   24 +-
 data/scripts/script_08015338.inc              |   18 +-
 data/scripts/script_08015360.inc              |   16 +-
 data/scripts/script_08015384.inc              |    4 +-
 data/scripts/script_08015390.inc              |   43 +-
 data/scripts/script_080153EC.inc              |   70 +-
 data/scripts/script_0801548E.inc              |   48 +-
 data/scripts/script_0801550C.inc              |   85 +-
 data/scripts/script_080155F4.inc              |   17 +-
 data/scripts/script_08015618.inc              |   40 +-
 data/scripts/script_08015684.inc              |   88 +-
 data/scripts/script_08015754.inc              |   36 +-
 data/scripts/script_080157AC.inc              |  140 ++-
 data/scripts/script_080158F8.inc              |   12 +-
 data/scripts/script_08015918.inc              |   12 +-
 data/scripts/script_08015938.inc              |   12 +-
 data/scripts/script_08015958.inc              |  140 +--
 data/scripts/script_08015A7C.inc              |   16 +-
 data/scripts/script_08015AA0.inc              |   16 +-
 data/scripts/script_08015AC4.inc              |   38 +-
 data/scripts/script_08015B14.inc              |   16 +-
 data/scripts/script_08015B34.inc              |   38 +-
 data/scripts/script_08015B84.inc              |   16 +-
 data/scripts/script_08015BA8.inc              |   38 +-
 data/scripts/script_08015BE8.inc              |   75 +-
 data/scripts/script_08015C7C.inc              |   34 +-
 data/scripts/script_08015CD4.inc              |  130 +-
 data/scripts/script_08015DF0.inc              |   48 +-
 data/scripts/script_08015E58.inc              |   76 +-
 data/scripts/script_08015F08.inc              |   24 +-
 data/scripts/script_08015F3C.inc              |   32 +-
 data/scripts/script_08015F80.inc              |   18 +-
 data/scripts/script_08015FA4.inc              |   14 +-
 data/scripts/script_08015FC0.inc              |   36 +-
 data/scripts/script_08016004.inc              |   21 +-
 data/scripts/script_08016030.inc              |   24 +-
 data/scripts/script_08016062.inc              |    5 +-
 data/scripts/script_0801606C.inc              |   24 +-
 data/scripts/script_0801609E.inc              |    5 +-
 data/scripts/script_080160A8.inc              |  387 +++---
 data/scripts/script_0801635C.inc              |   12 +-
 data/scripts/script_0801637C.inc              |   10 +-
 data/scripts/script_08016384.inc              |  113 +-
 data/scripts/script_08016482.inc              |  156 +--
 data/scripts/script_080165A4.inc              |   32 +-
 data/scripts/script_080165D8.inc              |  490 ++++----
 src/script.c                                  |   12 +-
 tools/script_disassembler/.gitignore          |    1 +
 tools/script_disassembler/definitions.py      |  326 +++++
 tools/script_disassembler/incbin_parser.py    |   70 +-
 .../script_disassembler.py                    |  338 +----
 tools/script_disassembler/utils.py            |   21 +
 410 files changed, 14861 insertions(+), 14697 deletions(-)
 delete mode 100644 asm/macros/script.inc
 create mode 100644 tools/script_disassembler/.gitignore
 create mode 100644 tools/script_disassembler/definitions.py
 create mode 100644 tools/script_disassembler/utils.py

diff --git a/asm/macros/script.inc b/asm/macros/script.inc
deleted file mode 100644
index 314edf4c..00000000
--- a/asm/macros/script.inc
+++ /dev/null
@@ -1,682 +0,0 @@
-@ All the macro functions for scripts
-@ Generated by disassemble_script.py
-.macro SCRIPT_START name
-	.globl \name
-	.section .text
-\name:
-.endm
-.macro SCRIPT_END
-	.short 0xffff
-.endm
-
-.macro ScriptCommandNop 
-	.short 0x0400
-.endm
-
-.macro StartScript 
-	.short 0x0401
-.endm
-
-.macro StopScript 
-	.short 0x0402
-.endm
-
-.macro Jump s
-	.short 0x0803
-	.short \s
-.endm
-
-.macro JumpIf s
-	.short 0x0804
-	.short \s
-.endm
-
-.macro JumpIfNot s
-	.short 0x0805
-	.short \s
-.endm
-
-.macro _0807E078 s
-	.short 0x0806
-	.short \s
-.endm
-
-.macro JumpAbsolute w
-	.short 0x0c07
-	.word \w
-.endm
-
-.macro JumpAbsoluteIf w
-	.short 0x0c08
-	.word \w
-.endm
-
-.macro JumpAbsoluteIfNot w
-	.short 0x0c09
-	.word \w
-.endm
-
-.macro _0807E0E0 w
-	.short 0x0c0a
-	.word \w
-.endm
-
-.macro Call w
-	.short 0x0c0b
-	.word \w
-.endm
-
-.macro CallWithArg a,b
-	.short 0x140c
-	.word \a
-	.word \b
-.endm
-
-.macro LoadRoomEntityList w
-	.short 0x0c0d
-	.word \w
-.endm
-
-.macro TestBit w
-	.short 0x0c0e
-	.word \w
-.endm
-
-.macro CheckInventory1 s
-	.short 0x080f
-	.short \s
-.endm
-
-.macro CheckInventory2 s
-	.short 0x0810
-	.short \s
-.endm
-
-.macro HasRoomItemForSale s
-	.short 0x0811
-	.short \s
-.endm
-
-.macro CheckLocalFlag s
-	.short 0x0812
-	.short \s
-.endm
-
-.macro CheckLocalFlagByOffset a,b
-	.short 0x0c13
-	.short \a
-	.short \b
-.endm
-
-.macro CheckGlobalFlag s
-	.short 0x0814
-	.short \s
-.endm
-
-.macro CheckRoomFlag s
-	.short 0x0815
-	.short \s
-.endm
-
-.macro CheckPlayerInRegion a,b,c
-	.short 0x1016
-	.short \a
-	.short \b
-	.short \c
-.endm
-
-.macro CheckPlayerInRegion2 s
-	.short 0x0817
-	.short \s
-.endm
-
-.macro CheckEntityInteractType 
-	.short 0x0418
-.endm
-
-.macro _0807E30C 
-	.short 0x0419
-.endm
-
-.macro HasRupees s
-	.short 0x081a
-	.short \s
-.endm
-
-.macro _0807E3BC s
-	.short 0x081b
-	.short \s
-.endm
-
-.macro _0807E3E8 
-	.short 0x041c
-.endm
-
-.macro CheckKinstoneFused s
-	.short 0x081d
-	.short \s
-.endm
-
-.macro BuyItem a,b
-	.short 0x0c1e
-	.short \a
-	.short \b
-.endm
-
-.macro _0807E48C s
-	.short 0x081f
-	.short \s
-.endm
-
-.macro _0807E4CC w
-	.short 0x0c20
-	.word \w
-.endm
-
-.macro _0807E4EC w
-	.short 0x0c21
-	.word \w
-.endm
-
-.macro _0807E51 s
-	.short 0x0822
-	.short \s
-.endm
-
-.macro CheckPlayerFlags w
-	.short 0x0c23
-	.word \w
-.endm
-
-.macro _0807E564 
-	.short 0x0424
-.endm
-
-.macro EntityHasHeight 
-	.short 0x0425
-.endm
-
-.macro ComparePlayerAction s
-	.short 0x0826
-	.short \s
-.endm
-
-.macro ComparePlayerAnimationState s
-	.short 0x0827
-	.short \s
-.endm
-
-.macro _0807E5F8 w
-	.short 0x0c28
-	.word \w
-.endm
-
-.macro _0807E610 w
-	.short 0x0c29
-	.word \w
-.endm
-
-.macro SetLocalFlag s
-	.short 0x082a
-	.short \s
-.endm
-
-.macro SetLocalFlagByOffset a,b
-	.short 0x0c2b
-	.short \a
-	.short \b
-.endm
-
-.macro ClearLocalFlag s
-	.short 0x082c
-	.short \s
-.endm
-
-.macro SetGlobalFlag s
-	.short 0x082d
-	.short \s
-.endm
-
-.macro ClearGlobalFlag s
-	.short 0x082e
-	.short \s
-.endm
-
-.macro SetRoomFlag s
-	.short 0x082f
-	.short \s
-.endm
-
-.macro ClearRoomFlag s
-	.short 0x0830
-	.short \s
-.endm
-
-.macro Wait s
-	.short 0x0831
-	.short \s
-.endm
-
-.macro WaitForSomething w
-	.short 0x0c32
-	.word \w
-.endm
-
-.macro WaitForSomething2 w
-	.short 0x0c33
-	.word \w
-.endm
-
-.macro WaitPlayerAction8 
-	.short 0x0434
-.endm
-
-.macro WaitForPlayerAction0x17 
-	.short 0x0435
-.endm
-
-.macro WaitFor_1 
-	.short 0x0436
-.endm
-
-.macro WaitFor_2 
-	.short 0x0437
-.endm
-
-.macro _0807E778 s
-	.short 0x0838
-	.short \s
-.endm
-
-.macro _0807E788 w
-	.short 0x0c39
-	.word \w
-.endm
-
-.macro _0807E79C 
-	.short 0x043a
-.endm
-
-.macro ScriptCommandNop2 s
-	.short 0x083b
-	.short \s
-.endm
-
-.macro DoFade4 
-	.short 0x043c
-.endm
-
-.macro DoFade5 
-	.short 0x043d
-.endm
-
-.macro DoFade6 
-	.short 0x043e
-.endm
-
-.macro DoFade7 
-	.short 0x043f
-.endm
-
-.macro _0807E800 w
-	.short 0x0c40
-	.word \w
-.endm
-
-.macro _0807E80C w
-	.short 0x0c41
-	.word \w
-.endm
-
-.macro _0807E858 s
-	.short 0x0842
-	.short \s
-.endm
-
-.macro _0807E864 
-	.short 0x0443
-.endm
-
-.macro _0807E878 
-	.short 0x0444
-.endm
-
-.macro _0807E888 
-	.short 0x0445
-.endm
-
-.macro SetPlayerAction w
-	.short 0x0c46
-	.word \w
-.endm
-
-.macro StartPlayerScript w
-	.short 0x0c47
-	.word \w
-.endm
-
-.macro _0807E8D4 s
-	.short 0x0848
-	.short \s
-.endm
-
-.macro _0807E8E4_0 
-	.short 0x0449
-.endm
-
-.macro _0807E8E4_1 
-	.short 0x044a
-.endm
-
-.macro _0807E8E4_2 
-	.short 0x044b
-.endm
-
-.macro _0807E8E4_3 
-	.short 0x044c
-.endm
-
-.macro _0807E908 s
-	.short 0x084d
-	.short \s
-.endm
-
-.macro _0807E914 w
-	.short 0x0c4e
-	.word \w
-.endm
-
-.macro _0807E924 
-	.short 0x044f
-.endm
-
-.macro _0807E930 s
-	.short 0x0850
-	.short \s
-.endm
-
-.macro _0807E944 
-	.short 0x0451
-.endm
-
-.macro _0807E974 s
-	.short 0x0852
-	.short \s
-.endm
-
-.macro _0807E9D4 
-	.short 0x0453
-.endm
-
-.macro _0807E9DC 
-	.short 0x0454
-.endm
-
-.macro _0807E9E4 s
-	.short 0x0855
-	.short \s
-.endm
-
-.macro _0807E9F0 
-	.short 0x0456
-.endm
-
-.macro _0807EA4C 
-	.short 0x0457
-.endm
-
-.macro _0807EA88 s
-	.short 0x0858
-	.short \s
-.endm
-
-.macro _0807EA94 
-	.short 0x0459
-.endm
-
-.macro TextboxNoOverlapFollow s
-	.short 0x085a
-	.short \s
-.endm
-
-.macro TextboxNoOverlap s
-	.short 0x085b
-	.short \s
-.endm
-
-.macro TextboxNoOverlapFollowPos a,b
-	.short 0x0c5c
-	.short \a
-	.short \b
-.endm
-
-.macro _0807EAF0 w
-	.short 0x0c5d
-	.word \w
-.endm
-
-.macro TextboxNoOverlapVar 
-	.short 0x045e
-.endm
-
-.macro _0807EB28 s
-	.short 0x085f
-	.short \s
-.endm
-
-.macro _0807EB38 
-	.short 0x0460
-.endm
-
-.macro _0807EB44 s
-	.short 0x0861
-	.short \s
-.endm
-
-.macro _0807EB4C a,b
-	.short 0x0c62
-	.short \a
-	.short \b
-.endm
-
-.macro _0807EB74 
-	.short 0x0463
-.endm
-
-.macro _0807EB8C 
-	.short 0x0464
-.endm
-
-.macro SetEntityDirection s
-	.short 0x0865
-	.short \s
-.endm
-
-.macro SetEntityDirectionWithAnimationState s
-	.short 0x0866
-	.short \s
-.endm
-
-.macro SetEntityNonPlanarMovement s
-	.short 0x0867
-	.short \s
-.endm
-
-.macro SetEntity0x20 w
-	.short 0x0c68
-	.word \w
-.endm
-
-.macro SetEntityPositionRelative w
-	.short 0x0c69
-	.word \w
-.endm
-
-.macro SetEntityPosition a,b
-	.short 0x0c6a
-	.short \a
-	.short \b
-.endm
-
-.macro MoveEntityToPlayer 
-	.short 0x046b
-.endm
-
-.macro ScriptCommandNop3 
-	.short 0x046c
-.endm
-
-.macro _0807EC1C s
-	.short 0x086d
-	.short \s
-.endm
-
-.macro _0807EC64 s
-	.short 0x086e
-	.short \s
-.endm
-
-.macro _0807EC94 s
-	.short 0x086f
-	.short \s
-.endm
-
-.macro _0807ECC4 s
-	.short 0x0870
-	.short \s
-.endm
-
-.macro _0807ECF4 s
-	.short 0x0871
-	.short \s
-.endm
-
-.macro _0807ED24 a,b,c
-	.short 0x1072
-	.short \a
-	.short \b
-	.short \c
-.endm
-
-.macro _0807EDD4 a,b
-	.short 0x0c73
-	.short \a
-	.short \b
-.endm
-
-.macro _0807EE04 a,b
-	.short 0x0c74
-	.short \a
-	.short \b
-.endm
-
-.macro _0807EE30 
-	.short 0x0475
-.endm
-
-.macro _0807EEB4 
-	.short 0x0476
-.endm
-
-.macro _0807EEF4 a,b
-	.short 0x0c77
-	.short \a
-	.short \b
-.endm
-
-.macro _0807EF3C a,b
-	.short 0x0c78
-	.short \a
-	.short \b
-.endm
-
-.macro _0807EF80 s
-	.short 0x0879
-	.short \s
-.endm
-
-.macro _0807EF90 s
-	.short 0x087a
-	.short \s
-.endm
-
-.macro SoundReq s
-	.short 0x087b
-	.short \s
-.endm
-
-.macro SoundReq2 s
-	.short 0x087c
-	.short \s
-.endm
-
-.macro SoundReq3 w
-	.short 0x0c7d
-	.word \w
-.endm
-
-.macro SoundReq0x80100000 
-	.short 0x047e
-.endm
-
-.macro ModRupees s
-	.short 0x087f
-	.short \s
-.endm
-
-.macro ModHealth s
-	.short 0x0880
-	.short \s
-.endm
-
-.macro IncreaseMaxHealth s
-	.short 0x0881
-	.short \s
-.endm
-
-.macro _0807F034 s
-	.short 0x0882
-	.short \s
-.endm
-
-.macro _0807F050 s
-	.short 0x0883
-	.short \s
-.endm
-
-.macro GetInventoryValue s
-	.short 0x0884
-	.short \s
-.endm
-
-.macro _0807F078 a,b
-	.short 0x0c85
-	.short \a
-	.short \b
-.endm
-
-.macro _0807F088 s
-	.short 0x0886
-	.short \s
-.endm
-
-.macro CameraTargetEntity 
-	.short 0x0487
-.endm
-
-.macro CameraTargetPlayer 
-	.short 0x0488
-.endm
-
-.macro _0807F0B4 s
-	.short 0x0889
-	.short \s
-.endm
-
-.macro _0807F0C8 a,b
-	.short 0x0c8a
-	.short \a
-	.short \b
-.endm
-
-
diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 5be0e732..77f497a2 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -9,6 +9,10 @@
 	.short 0xffff
 .endm
 
+.macro ScriptCommandNop 
+	.short 0x0400
+.endm
+
 .macro StartScript 
 	.short 0x0401
 .endm
@@ -19,62 +23,62 @@
 
 .macro Jump s
 	.short 0x0803
-	.short \s
+1:	.short \s - 1b
 .endm
 
 .macro JumpIf s
 	.short 0x0804
-	.short \s
+1:	.short \s - 1b
 .endm
 
 .macro JumpIfNot s
 	.short 0x0805
-	.short \s
+1:	.short \s - 1b
 .endm
 
-.macro _0807E078 a,b
+.macro JumpSwitch a,b
 	.short 0x0c06
-	.short \a
-	.short \b
+1:	.short \a - 1b
+	.short \b - 1b - 2
 .endm
 
-.macro _0807E078_sss a,b,c
+.macro JumpSwitch_3 a,b,c
 	.short 0x1006
-	.short \a
-	.short \b
-	.short \c
+1:	.short \a - 1b
+	.short \b - 1b - 2
+	.short \c - 1b - 4
 .endm
 
-.macro _0807E078_ssss a,b,c,d
+.macro JumpSwitch_4 a,b,c,d
 	.short 0x1406
-	.short \a
-	.short \b
-	.short \c
-	.short \d
+1:	.short \a - 1b
+	.short \b - 1b - 2
+	.short \c - 1b - 4
+	.short \d - 1b - 6
 .endm
 
-.macro _0807E078_sssssss a,b,c,d,e,f,g
+.macro JumpSwitch_7 a,b,c,d,e,f,g
 	.short 0x2006
-	.short \a
-	.short \b
-	.short \c
-	.short \d
-	.short \e
-	.short \f
-	.short \g
+1:	.short \a - 1b
+	.short \b - 1b - 2
+	.short \c - 1b - 4
+	.short \d - 1b - 6
+	.short \e - 1b - 8
+	.short \f - 1b - 10
+	.short \g - 1b - 12
 .endm
 
-.macro _0807E078_sssssssss a,b,c,d,e,f,g,h,i
+.macro JumpSwitch_9 a,b,c,d,e,f,g,h,i
 	.short 0x2806
-	.short \a
-	.short \b
-	.short \c
-	.short \d
-	.short \e
-	.short \f
-	.short \g
-	.short \h
-	.short \i
+1:	.short \a - 1b
+	.short \b - 1b - 2
+	.short \c - 1b - 4
+	.short \d - 1b - 6
+	.short \e - 1b - 8
+	.short \f - 1b - 10
+	.short \g - 1b - 12
+	.short \h - 1b - 14
+	.short \i - 1b - 16
 .endm
 
 .macro JumpAbsolute w
@@ -92,7 +96,7 @@
 	.word \w
 .endm
 
-.macro _0807E0E0 a, b
+.macro JumpAbsoluteSwitch a, b
 	.short 0x140a
 	.word \a
 	.word \b
@@ -109,7 +113,7 @@
 	.word \b
 .endm
 
-.macro CallWithArg_p w
+.macro CallWithArg_2 w
 	.short 0x0c0c
 	.word \w
 .endm
@@ -374,7 +378,7 @@
 	.short \s
 .endm
 
-.macro _0807E858_ 
+.macro _0807E858_0 
 	.short 0x0442
 .endm
 
@@ -494,7 +498,7 @@
 	.word \w
 .endm
 
-.macro TextboxNoOverlapFollowPos_s s
+.macro TextboxNoOverlapFollowPos_1 s
 	.short 0x085c
 	.short \s
 .endm
@@ -505,14 +509,14 @@
 	.short \b
 .endm
 
-.macro _0807EAF0_sss a,b,c
+.macro _0807EAF0_3 a,b,c
 	.short 0x105d
 	.short \a
 	.short \b
 	.short \c
 .endm
 
-.macro _0807EAF0_ssss a,b,c,d
+.macro _0807EAF0_4 a,b,c,d
 	.short 0x145d
 	.short \a
 	.short \b
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc
index 29fac399..72121fe0 100644
--- a/data/scripts/script_08008B5C.inc
+++ b/data/scripts/script_08008B5C.inc
@@ -1,124 +1,129 @@
 SCRIPT_START script_08008B5C
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E944 
-_0807E864 
-_0807E930 0x0004
-Call sub_0807F2D4
-Call sub_0806BBB0
-_0807EA94 
-_0807E930 0x0008
-_0807E878 
-Jump 0xffe2
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-_0807E930 0x0004
-Call sub_0807F2D4
-TextboxNoOverlapFollow 0x4912
-_0807EA94 
-_0807E930 0x0008
-_0807E878 
-Jump 0xffe4
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-SetGlobalFlag 0x0061
-_0807E930 0x0004
-Call sub_0807F2D4
-_0807EA94 
-Call sub_0806BA34
-JumpIfNot 0x0066
-_0807EA94 
-CallWithArg sub_0806BB1C, 0x00000000
-Call sub_0807F2D4
-CallWithArg sub_0806BB1C, 0x00000001
-Call sub_0806BB7C
-JumpIfNot 0x0048
-TextboxNoOverlap 0x490c
-_0807EA94 
-LoadRoomEntityList gUnk_080D6784
-WaitForSomething 0x00000001
-WaitForSomething 0x00000004
-Wait 0x000f
-SoundReq 0x0072
-_0807E930 0x0004
-Call sub_0807F2D4
-TextboxNoOverlap 0x4913
-_0807EA94 
-_0807E930 0x0008
-Call sub_0807F2D4
-Jump 0x000a
-_0807E930 0x0008
-Wait 0x000f
-_0807EA94 
-_0807E878 
-Jump 0xff70
-StartScript 
-SetEntityPositionRelative 0x00180068
-_0807EF80 0x000f
-_0807EB44 0x0004
-_0807E930 0x0004
-SetEntityNonPlanarMovement 0x0300
-SoundReq 0x0121
-StopScript 
-WaitForSomething 0x00000002
-TextboxNoOverlap 0x490d
-_0807EA94 
-_0807EF80 0x0007
-Call sub_08064D08
-_0807EDD4 0x0068, 0x0078
-Call sub_08064D10
-Wait 0x000f
-_0807EB44 0x0002
-Wait 0x000f
-Call sub_08064D08
-_0807EDD4 0x0098, 0x0078
-Call sub_08064D10
-Wait 0x000f
-_0807EB44 0x0004
-SoundReq 0x007f
-Wait 0x000f
-_0807EB44 0x0002
-_0807EDD4 0x00ac, 0x0078
-Wait 0x000f
-_0807EB44 0x0004
-SoundReq 0x007f
-Wait 0x000f
-_0807EB44 0x0002
-_0807EDD4 0x00c0, 0x0078
-Wait 0x000f
-_0807EB44 0x0004
-SoundReq 0x007f
-Wait 0x000f
-_0807EB44 0x0006
-Wait 0x001e
-Call sub_08064D08
-_0807EDD4 0x0068, 0x0078
-Call sub_08064D10
-Wait 0x000f
-_0807EB44 0x0000
-Wait 0x000f
-Call sub_08064D08
-_0807EDD4 0x0068, 0x0018
-Call sub_08064D10
-SoundReq 0x0121
-_0807E5F8 0x00000001
-_0807EF80 0x0006
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_08008B6E:
+	_0807E944 
+	_0807E864 
+	_0807E930 0x0004
+	Call sub_0807F2D4
+	Call sub_0806BBB0
+	_0807EA94 
+	_0807E930 0x0008
+	_0807E878 
+	Jump script_08008B6E
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	_0807E930 0x0000
+	StopScript 
+script_08008BA2:
+	_0807E944 
+	_0807E864 
+	_0807E930 0x0004
+	Call sub_0807F2D4
+	TextboxNoOverlapFollow 0x4912
+	_0807EA94 
+	_0807E930 0x0008
+	_0807E878 
+	Jump script_08008BA2
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	_0807E930 0x0000
+	StopScript 
+script_08008BD2:
+	_0807E944 
+	_0807E864 
+	SetGlobalFlag 0x0061
+	_0807E930 0x0004
+	Call sub_0807F2D4
+	_0807EA94 
+	Call sub_0806BA34
+	JumpIfNot script_08008C54
+	_0807EA94 
+	CallWithArg sub_0806BB1C, 0x00000000
+	Call sub_0807F2D4
+	CallWithArg sub_0806BB1C, 0x00000001
+	Call sub_0806BB7C
+	JumpIfNot script_08008C5C
+	TextboxNoOverlap 0x490c
+	_0807EA94 
+	LoadRoomEntityList gUnk_080D6784
+	WaitForSomething 0x00000001
+	WaitForSomething 0x00000004
+	Wait 0x000f
+	SoundReq 0x0072
+	_0807E930 0x0004
+	Call sub_0807F2D4
+	TextboxNoOverlap 0x4913
+	_0807EA94 
+	_0807E930 0x0008
+	Call sub_0807F2D4
+	Jump script_08008C5C
+script_08008C54:
+	_0807E930 0x0008
+	Wait 0x000f
+script_08008C5C:
+	_0807EA94 
+	_0807E878 
+	Jump script_08008BD2
+	StartScript 
+	SetEntityPositionRelative 0x00180068
+	_0807EF80 0x000f
+	_0807EB44 0x0004
+	_0807E930 0x0004
+	SetEntityNonPlanarMovement 0x0300
+	SoundReq 0x0121
+	StopScript 
+	WaitForSomething 0x00000002
+	TextboxNoOverlap 0x490d
+	_0807EA94 
+	_0807EF80 0x0007
+	Call sub_08064D08
+	_0807EDD4 0x0068, 0x0078
+	Call sub_08064D10
+	Wait 0x000f
+	_0807EB44 0x0002
+	Wait 0x000f
+	Call sub_08064D08
+	_0807EDD4 0x0098, 0x0078
+	Call sub_08064D10
+	Wait 0x000f
+	_0807EB44 0x0004
+	SoundReq 0x007f
+	Wait 0x000f
+	_0807EB44 0x0002
+	_0807EDD4 0x00ac, 0x0078
+	Wait 0x000f
+	_0807EB44 0x0004
+	SoundReq 0x007f
+	Wait 0x000f
+	_0807EB44 0x0002
+	_0807EDD4 0x00c0, 0x0078
+	Wait 0x000f
+	_0807EB44 0x0004
+	SoundReq 0x007f
+	Wait 0x000f
+	_0807EB44 0x0006
+	Wait 0x001e
+	Call sub_08064D08
+	_0807EDD4 0x0068, 0x0078
+	Call sub_08064D10
+	Wait 0x000f
+	_0807EB44 0x0000
+	Wait 0x000f
+	Call sub_08064D08
+	_0807EDD4 0x0068, 0x0018
+	Call sub_08064D10
+	SoundReq 0x0121
+	_0807E5F8 0x00000001
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc
index 66abeeb8..208c1630 100644
--- a/data/scripts/script_08008D50.inc
+++ b/data/scripts/script_08008D50.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_08008D50
-StartScript 
-SetEntityPositionRelative 0x00680068
-_0807F0B4 0x0004
-CameraTargetEntity 
-StopScript 
-Wait 0x001e
-_0807E5F8 0x00000002
-WaitForSomething 0x00000001
-Wait 0x000f
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Wait 0x001e
-_0807E5F8 0x00000004
-_0807EF80 0x0006
+	StartScript 
+	SetEntityPositionRelative 0x00680068
+	_0807F0B4 0x0004
+	CameraTargetEntity 
+	StopScript 
+	Wait 0x001e
+	_0807E5F8 0x00000002
+	WaitForSomething 0x00000001
+	Wait 0x000f
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Wait 0x001e
+	_0807E5F8 0x00000004
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index c9ee8f7d..8b59708e 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -1,107 +1,110 @@
 SCRIPT_START script_08008D8C
-StartScript 
-Call sub_08061FD8
-Call sub_08061E70
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-Call sub_080643D8
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-Jump 0xffd2
-StartScript 
-SetEntityPositionRelative 0x00780088
-StopScript 
-CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807F0B4 0x0001
-CameraTargetEntity 
-WaitForPlayerAction0x17 
-Wait 0x003c
-StartPlayerScript script_08008F74
-WaitForSomething2 0x00000020
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Wait 0x003c
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Wait 0x000f
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos 0x000e1053
-_0807EA94 
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807F034 0x0035
-WaitPlayerAction8 
-StartPlayerScript script_08008FC0
-WaitForSomething2 0x00000020
-_0807E8E4_0 
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000010
-Wait 0x0078
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E8E4_1 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807F034 0x0047
-WaitPlayerAction8 
-_0807E914 0x00000003
-Call sub_0807F420
-_0807E8E4_0 
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetGlobalFlag 0x0015
-Call sub_0806DCC0
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08061FD8
+	Call sub_08061E70
+	_0807EF80 0x000a
+	StopScript 
+script_08008DA0:
+	CheckEntityInteractType 
+	JumpIfNot script_08008DA0
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	Jump script_08008DA0
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08008DD8:
+	CheckEntityInteractType 
+	JumpIfNot script_08008DD8
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Call sub_080643D8
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000000
+	Jump script_08008DD8
+	StartScript 
+	SetEntityPositionRelative 0x00780088
+	StopScript 
+script_08008E12:
+	CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
+	JumpIfNot script_08008E12
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807F0B4 0x0001
+	CameraTargetEntity 
+	WaitForPlayerAction0x17 
+	Wait 0x003c
+	StartPlayerScript script_08008F74
+	WaitForSomething2 0x00000020
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Wait 0x003c
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Wait 0x000f
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollowPos 0x000e1053
+	_0807EA94 
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807F034 0x0035
+	WaitPlayerAction8 
+	StartPlayerScript script_08008FC0
+	WaitForSomething2 0x00000020
+	_0807E8E4_0 
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000010
+	Wait 0x0078
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E8E4_1 
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807F034 0x0047
+	WaitPlayerAction8 
+	_0807E914 0x00000003
+	Call sub_0807F420
+	_0807E8E4_0 
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	SetGlobalFlag 0x0015
+	Call sub_0806DCC0
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc
index 7885d2a5..e77c1d10 100644
--- a/data/scripts/script_08008F74.inc
+++ b/data/scripts/script_08008F74.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_08008F74
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x00b8, 0x0090
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000040
-_0807EF80 0x0001
-_0807EDD4 0x0088, 0x0078
-_0807EB44 0x0000
-_0807EF80 0x0000
-Wait 0x000f
-_0807E5F8 0x00000020
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x00b8, 0x0090
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000040
+	_0807EF80 0x0001
+	_0807EDD4 0x0088, 0x0078
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	Wait 0x000f
+	_0807E5F8 0x00000020
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc
index 3480d0a2..ec4888e8 100644
--- a/data/scripts/script_08008FC0.inc
+++ b/data/scripts/script_08008FC0.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08008FC0
-_0807F078 0x0001, 0x0001
-CallWithArg sub_0807F918, 0x00000001
-SoundReq 0x0109
-CallWithArg sub_0807F238, 0x0000045f
-Call sub_0807F304
-TextboxNoOverlapFollowPos 0x000e0501
-_0807EA94 
-_0807E5F8 0x00000020
-Call sub_080791BC
+	_0807F078 0x0001, 0x0001
+	CallWithArg sub_0807F918, 0x00000001
+	SoundReq 0x0109
+	CallWithArg sub_0807F238, 0x0000045f
+	Call sub_0807F304
+	TextboxNoOverlapFollowPos 0x000e0501
+	_0807EA94 
+	_0807E5F8 0x00000020
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc
index 5414ad80..2f52e90e 100644
--- a/data/scripts/script_08008FFC.inc
+++ b/data/scripts/script_08008FFC.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08008FFC
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0000
-StopScript 
-WaitForSomething 0x00000010
-SoundReq 0x011c
-_0807E930 0x0001
-Wait 0x0010
-SoundReq 0x011c
-_0807EB44 0x0004
-_0807E930 0x0006
-Wait 0x0010
-_0807EF80 0x000f
-SetEntityNonPlanarMovement 0x0200
-_0807ECC4 0x1c20
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething 0x00000010
+	SoundReq 0x011c
+	_0807E930 0x0001
+	Wait 0x0010
+	SoundReq 0x011c
+	_0807EB44 0x0004
+	_0807E930 0x0006
+	Wait 0x0010
+	_0807EF80 0x000f
+	SetEntityNonPlanarMovement 0x0200
+	_0807ECC4 0x1c20
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index 352bd061..dec7d6b5 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -1,193 +1,199 @@
 SCRIPT_START script_0800903C
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000004
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-_0807EB44 0x0002
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EB44 0x0004
-_0807E5F8 0x00000008
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-Jump 0x0202
-.short 0x0000
-StartScript 
-Call sub_0807F348
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-WaitForSomething2 0x00000080
-_0807EB44 0x0004
-_0807ECC4 0x0008
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x000e1050
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x000e1052
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807EB44 0x0006
-_0807E930 0x0005
-TextboxNoOverlapFollowPos 0x000e1054
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807EB44 0x0004
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x000e1056
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x000e1057
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x000e1058
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0004
-TextboxNoOverlapFollowPos 0x000e105c
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806673C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-StartScript 
-Call sub_0807F348
-_0807EB44 0x0006
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000001
-_0807EB74 
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x0000105b
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EF80 0x0005
-Wait 0x003c
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x00001051
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB74 
-_0807EB8C 
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x00001055
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB74 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0001
-_0807EDD4 0x0098, 0x0078
-_0807EB74 
-_0807EF80 0x0000
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x00001059
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-Jump 0x0042
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_080668F0
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08066904
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
-StartScript 
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x105e
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0806672C
-_0807EF80 0x000a
-StopScript 
-Jump 0xfe90
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-Call sub_08066E38
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x1071
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
-StartScript 
-StopScript 
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000004
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	_0807EB44 0x0002
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EB44 0x0004
+	_0807E5F8 0x00000008
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	Jump script_0800927E
+	.short 0x0000
+	StartScript 
+	Call sub_0807F348
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+	WaitForSomething2 0x00000080
+	_0807EB44 0x0004
+	_0807ECC4 0x0008
+	_0807E930 0x0004
+	TextboxNoOverlapFollowPos 0x000e1050
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807E930 0x0004
+	TextboxNoOverlapFollowPos 0x000e1052
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807EB44 0x0006
+	_0807E930 0x0005
+	TextboxNoOverlapFollowPos 0x000e1054
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807EB44 0x0004
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807E930 0x0004
+	TextboxNoOverlapFollowPos 0x000e1056
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807E930 0x0004
+	TextboxNoOverlapFollowPos 0x000e1057
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807E930 0x0004
+	TextboxNoOverlapFollowPos 0x000e1058
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807E930 0x0004
+	TextboxNoOverlapFollowPos 0x000e105c
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+script_0800917C:
+	CheckEntityInteractType 
+	JumpIfNot script_0800917C
+	_0807E864 
+	_0807EB74 
+	Call sub_0806673C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800917C
+	StartScript 
+	Call sub_0807F348
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000001
+	_0807EB74 
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x0000105b
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EF80 0x0005
+	Wait 0x003c
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x00001051
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EB74 
+	_0807EB8C 
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x00001055
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EB74 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0001
+	_0807EDD4 0x0098, 0x0078
+	_0807EB74 
+	_0807EF80 0x0000
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x00001059
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	Jump script_080092B2
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+script_0800927E:
+	Call sub_080668F0
+	_0807EF80 0x000a
+	StopScript 
+script_0800928A:
+	CheckEntityInteractType 
+	JumpIfNot script_0800928A
+	_0807E864 
+	_0807EB74 
+	Call sub_08066904
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800928A
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+script_080092B2:
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_080092BA:
+	CheckEntityInteractType 
+	JumpIfNot script_080092BA
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x105e
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_080092BA
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Call sub_0806672C
+	_0807EF80 0x000a
+	StopScript 
+	Jump script_0800917C
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_08066E38
+	_0807E9D4 
+	StopScript 
+script_08009300:
+	CheckEntityInteractType 
+	JumpIfNot script_08009300
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x1071
+	_0807EA94 
+	_0807E878 
+	Jump script_08009300
+	.short 0x0000
+	StartScript 
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc
index 10935b22..f136823f 100644
--- a/data/scripts/script_08009320.inc
+++ b/data/scripts/script_08009320.inc
@@ -1,9 +1,10 @@
 SCRIPT_START script_08009320
-StartScript 
-Call sub_0806D650
-SetEntityNonPlanarMovement 0x0010
-StopScript 
-_0807EEF4 0xfff8, 0x0000
-_0807EEF4 0x0008, 0x0000
-Jump 0xfff2
+	StartScript 
+	Call sub_0806D650
+	SetEntityNonPlanarMovement 0x0010
+	StopScript 
+script_0800932E:
+	_0807EEF4 0xfff8, 0x0000
+	_0807EEF4 0x0008, 0x0000
+	Jump script_0800932E
 SCRIPT_END
diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc
index 78861283..99204711 100644
--- a/data/scripts/script_08009340.inc
+++ b/data/scripts/script_08009340.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08009340
-StartScript 
-StopScript 
+	StartScript 
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc
index fcfdafd9..ee4e8ac4 100644
--- a/data/scripts/script_08009348.inc
+++ b/data/scripts/script_08009348.inc
@@ -1,25 +1,27 @@
 SCRIPT_START script_08009348
-StartScript 
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-Call sub_0806D638
-_0807F0B4 0x0001
-CameraTargetEntity 
-CheckGlobalFlag 0x0055
-JumpIf 0x002c
-TextboxNoOverlap 0x1d01
-_0807EA94 
-_0807EA94 
-Call sub_0806D640
-_0807F0B4 0x0001
-CameraTargetPlayer 
-Wait 0x002d
-_0807F0B4 0x0004
-_0807E878 
-Call sub_0807DF50
-Jump 0xffb8
+	StartScript 
+	_0807E9D4 
+	StopScript 
+script_0800934E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800934E
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_0806D638
+	_0807F0B4 0x0001
+	CameraTargetEntity 
+	CheckGlobalFlag 0x0055
+	JumpIf script_0800939A
+	TextboxNoOverlap 0x1d01
+	_0807EA94 
+script_08009376:
+	_0807EA94 
+	Call sub_0806D640
+	_0807F0B4 0x0001
+	CameraTargetPlayer 
+	Wait 0x002d
+	_0807F0B4 0x0004
+	_0807E878 
+	Call sub_0807DF50
+	Jump script_0800934E
 SCRIPT_END
diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc
index a6880a48..bc773cc5 100644
--- a/data/scripts/script_0800939A.inc
+++ b/data/scripts/script_0800939A.inc
@@ -1,51 +1,57 @@
 SCRIPT_START script_0800939A
-CheckLocalFlag 0x00ae
-JumpIf 0x009e
-CheckInventory1 0x000d
-JumpIf 0x0014
-CheckInventory1 0x000e
-JumpIf 0x000c
-TextboxNoOverlap 0x1d02
-_0807EA94 
-Jump 0xffbc
-CheckInventory1 0x000e
-JumpIfNot 0x0018
-Call sub_0806D788
-TextboxNoOverlap 0x1d03
-_0807EA94 
-Call sub_0806D70C
-Jump 0xff9e
-_0807E914 0x00001d05
-CheckLocalFlag 0x00ad
-JumpIf 0x0008
-_0807E914 0x00001d04
-TextboxNoOverlapVar 
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0xff80
-Wait 0x001e
-TextboxNoOverlap 0x1d08
-_0807EA94 
-LoadRoomEntityList gUnk_080F9C38
-Wait 0x0078
-Call sub_0806D6D0
-Wait 0x00b4
-Call sub_0806D70C
-Wait 0x0078
-SetLocalFlag 0x00ae
-SetLocalFlag 0x00ad
-Call sub_0806D5D4
-_0807EB8C 
-TextboxNoOverlap 0x1d09
-_0807EA94 
-Wait 0x000a
-Jump 0xff3a
-Call sub_0806D600
-JumpIf 0x000c
-TextboxNoOverlap 0x1d0a
-_0807EA94 
-JumpIfNot 0xff26
-TextboxNoOverlap 0x1d0b
-_0807EA94 
-Call sub_0806D74C
-_0807F0C8 0xffff, 0x0000
+script_0800939A:
+	CheckLocalFlag 0x00ae
+	JumpIf script_0800943E
+	CheckInventory1 0x000d
+	JumpIf script_080093BC
+	CheckInventory1 0x000e
+	JumpIf script_080093BC
+	TextboxNoOverlap 0x1d02
+	_0807EA94 
+	Jump script_08009376
+script_080093BC:
+	CheckInventory1 0x000e
+	JumpIfNot script_080093DA
+	Call sub_0806D788
+	TextboxNoOverlap 0x1d03
+	_0807EA94 
+	Call sub_0806D70C
+	Jump script_08009376
+script_080093DA:
+	_0807E914 0x00001d05
+	CheckLocalFlag 0x00ad
+	JumpIf script_080093EE
+	_0807E914 0x00001d04
+script_080093EE:
+	TextboxNoOverlapVar 
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08009376
+	Wait 0x001e
+	TextboxNoOverlap 0x1d08
+	_0807EA94 
+	LoadRoomEntityList gUnk_080F9C38
+	Wait 0x0078
+	Call sub_0806D6D0
+	Wait 0x00b4
+	Call sub_0806D70C
+	Wait 0x0078
+	SetLocalFlag 0x00ae
+	SetLocalFlag 0x00ad
+	Call sub_0806D5D4
+	_0807EB8C 
+	TextboxNoOverlap 0x1d09
+	_0807EA94 
+	Wait 0x000a
+	Jump script_08009376
+script_0800943E:
+	Call sub_0806D600
+	JumpIf script_08009452
+	TextboxNoOverlap 0x1d0a
+	_0807EA94 
+	JumpIfNot script_08009376
+script_08009452:
+	TextboxNoOverlap 0x1d0b
+	_0807EA94 
+	Call sub_0806D74C
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc
index 727eb0b6..74aaae79 100644
--- a/data/scripts/script_08009464.inc
+++ b/data/scripts/script_08009464.inc
@@ -1,28 +1,29 @@
 SCRIPT_START script_08009464
-Wait 0x003c
-_0807F0C8 0x0000, 0x0000
-LoadRoomEntityList gUnk_080F9C58
-Wait 0x003c
-Call sub_0806D70C
-Wait 0x003c
-ClearLocalFlag 0x00ae
-Call sub_0806D620
-Wait 0x003c
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlap 0x1d0c
-_0807EA94 
-Wait 0x000a
-Jump 0xfed6
-.short 0x0000
-StartScript 
-Call sub_0806D7C4
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-Wait 0x003c
-SetEntity0x20 0x00018000
-_0807EE30 
-JumpIfNot 0xfffc
-Wait 0x003c
-_0807EF80 0x0006
+	Wait 0x003c
+	_0807F0C8 0x0000, 0x0000
+	LoadRoomEntityList gUnk_080F9C58
+	Wait 0x003c
+	Call sub_0806D70C
+	Wait 0x003c
+	ClearLocalFlag 0x00ae
+	Call sub_0806D620
+	Wait 0x003c
+	WaitPlayerAction8 
+	_0807EB8C 
+	TextboxNoOverlap 0x1d0c
+	_0807EA94 
+	Wait 0x000a
+	Jump script_08009376
+	.short 0x0000
+	StartScript 
+	Call sub_0806D7C4
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	Wait 0x003c
+	SetEntity0x20 0x00018000
+script_080094BC:
+	_0807EE30 
+	JumpIfNot script_080094BC
+	Wait 0x003c
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc
index 50758bea..a2d19eb9 100644
--- a/data/scripts/script_080094CC.inc
+++ b/data/scripts/script_080094CC.inc
@@ -1,14 +1,15 @@
 SCRIPT_START script_080094CC
-StartScript 
-Call sub_0806D804
-SetEntityNonPlanarMovement 0x0180
-StopScript 
-Wait 0x003c
-SetEntity0x20 0x00018000
-Call sub_0806D858
-_0807EE30 
-JumpIfNot 0xfffc
-Wait 0x001e
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0806D804
+	SetEntityNonPlanarMovement 0x0180
+	StopScript 
+	Wait 0x003c
+	SetEntity0x20 0x00018000
+	Call sub_0806D858
+script_080094EA:
+	_0807EE30 
+	JumpIfNot script_080094EA
+	Wait 0x001e
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc
index 45fe9870..9bf9b1a4 100644
--- a/data/scripts/script_080094FC.inc
+++ b/data/scripts/script_080094FC.inc
@@ -1,69 +1,73 @@
 SCRIPT_START script_080094FC
-StartScript 
-Call sub_08067100
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EF80 0x0001
-_0807EB74 
-Call sub_080670B4
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
-StartScript 
-Call sub_08067100
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EF80 0x0001
-_0807EB74 
-Call sub_080670E4
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
-StartScript 
-Call sub_08067314
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E914 0x00000000
-Call sub_080672B0
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807E914 0x00000004
-Call sub_080672B0
-Call sub_080672C8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EB44 0x0004
-_0807E914 0x00000000
-Call sub_080672B0
-Jump 0xffca
-.short 0x0000
-StartScript 
-Call sub_0806BE3C
-_0807EF80 0x000a
-_0807EF80 0x0007
-StopScript 
-Call sub_0806BF44
-JumpIf 0x000c
-_0807EF80 0x000b
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08067100
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_08009512:
+	CheckEntityInteractType 
+	JumpIfNot script_08009512
+	_0807E864 
+	_0807EF80 0x0001
+	_0807EB74 
+	Call sub_080670B4
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Jump script_08009512
+	.short 0x0000
+	StartScript 
+	Call sub_08067100
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_0800954E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800954E
+	_0807E864 
+	_0807EF80 0x0001
+	_0807EB74 
+	Call sub_080670E4
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Jump script_0800954E
+	.short 0x0000
+	StartScript 
+	Call sub_08067314
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E914 0x00000000
+	Call sub_080672B0
+	StopScript 
+script_08009592:
+	CheckEntityInteractType 
+	JumpIfNot script_08009592
+	_0807E864 
+	_0807EB74 
+	_0807E914 0x00000004
+	Call sub_080672B0
+	Call sub_080672C8
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	_0807EB44 0x0004
+	_0807E914 0x00000000
+	Call sub_080672B0
+	Jump script_08009592
+	.short 0x0000
+	StartScript 
+	Call sub_0806BE3C
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	StopScript 
+script_080095DE:
+	Call sub_0806BF44
+	JumpIf script_080095F2
+	_0807EF80 0x000b
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc
index 5b177c6f..1cadb7ab 100644
--- a/data/scripts/script_080095F2.inc
+++ b/data/scripts/script_080095F2.inc
@@ -1,73 +1,82 @@
 SCRIPT_START script_080095F2
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-_0807E864 
-_0807EB74 
-_0807EF80 0x0001
-Call sub_0806BE84
-_0807EA94 
-JumpIfNot 0x0018
-SoundReq 0x0109
-_0807F088 0x003c
-TextboxNoOverlapFollow 0x053c
-WaitPlayerAction8 
-_0807EA94 
-_0807F078 0x003c, 0x0001
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffb4
-StartScript 
-_0807EF80 0x000b
-_0807EF80 0x0008
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x0020
-JumpIfNot 0xfff6
-StopScript 
-Call sub_0806BF44
-JumpIf 0xfff8
-StopScript 
-Call sub_0806BE3C
-_0807EF80 0x000a
-_0807EF80 0x0007
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0001
-Call sub_0806BEC8
-_0807EA94 
-JumpIfNot 0x0016
-SoundReq 0x0111
-SoundReq 0x0072
-_0807F078 0x003c, 0x0002
-Call sub_0806BEFC
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffca
-StartScript 
-_0807EF80 0x0007
-Jump 0x005c
-CheckGlobalFlag 0x0020
-JumpIf 0x0054
-StopScript 
-CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_08009704
-WaitForSomething2 0x00000001
-SoundReq 0x0111
-_0807EF80 0x0008
-LoadRoomEntityList gUnk_080D9048
-Wait 0x000f
-SoundReq 0x0111
-_0807EF80 0x0007
-CheckGlobalFlag 0x0020
-JumpIfNot 0xfffa
-Call sub_0807DF50
-_0807E878 
-Call sub_0808692C
+script_080095F2:
+	CheckEntityInteractType 
+	JumpIfNot script_080095DE
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0001
+	Call sub_0806BE84
+	_0807EA94 
+	JumpIfNot script_08009622
+	SoundReq 0x0109
+	_0807F088 0x003c
+	TextboxNoOverlapFollow 0x053c
+	WaitPlayerAction8 
+	_0807EA94 
+	_0807F078 0x003c, 0x0001
+script_08009622:
+	_0807E878 
+	_0807EF80 0x0000
+	Jump script_080095DE
+	StartScript 
+	_0807EF80 0x000b
+	_0807EF80 0x0008
+	StopScript 
+script_08009638:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x0020
+	JumpIfNot script_08009638
+	StopScript 
+script_08009646:
+	Call sub_0806BF44
+	JumpIf script_08009646
+	StopScript 
+	Call sub_0806BE3C
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+script_08009660:
+	CheckEntityInteractType 
+	JumpIfNot script_08009660
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0001
+	Call sub_0806BEC8
+	_0807EA94 
+	JumpIfNot script_0800968E
+	SoundReq 0x0111
+	SoundReq 0x0072
+	_0807F078 0x003c, 0x0002
+	Call sub_0806BEFC
+script_0800968E:
+	_0807E878 
+	_0807EF80 0x0000
+	Jump script_08009660
+	StartScript 
+	_0807EF80 0x0007
+	Jump script_080096FC
+	CheckGlobalFlag 0x0020
+	JumpIf script_080096FC
+	StopScript 
+script_080096AC:
+	CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
+	JumpIfNot script_080096AC
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08009704
+	WaitForSomething2 0x00000001
+	SoundReq 0x0111
+	_0807EF80 0x0008
+	LoadRoomEntityList gUnk_080D9048
+	Wait 0x000f
+	SoundReq 0x0111
+	_0807EF80 0x0007
+script_080096EC:
+	CheckGlobalFlag 0x0020
+	JumpIfNot script_080096EC
+	Call sub_0807DF50
+	_0807E878 
+script_080096FC:
+	Call sub_0808692C
 SCRIPT_END
diff --git a/data/scripts/script_08009704.inc b/data/scripts/script_08009704.inc
index 0738cbac..9c0f3cd2 100644
--- a/data/scripts/script_08009704.inc
+++ b/data/scripts/script_08009704.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_08009704
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0001
-_0807EDD4 0x01a0, 0x01b0
-_0807EB44 0x0000
-_0807EF80 0x0000
-Wait 0x000a
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EF80 0x000d
-SetEntityNonPlanarMovement 0x0100
-_0807ECC4 0x0010
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0001
+	_0807EDD4 0x01a0, 0x01b0
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	Wait 0x000a
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	_0807EF80 0x000d
+	SetEntityNonPlanarMovement 0x0100
+	_0807ECC4 0x0010
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc
index f443adb3..e921a864 100644
--- a/data/scripts/script_08009740.inc
+++ b/data/scripts/script_08009740.inc
@@ -1,45 +1,46 @@
 SCRIPT_START script_08009740
-StartScript 
-Call sub_08065D00
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807EF80 0x0007
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-Call sub_08065F64
-_0807EA94 
-_0807E878 
-Jump 0xffe6
-.short 0x0000
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-SoundReq 0x01f3
-Call sub_0807F40C
-_0807E8E4_1 
-Wait 0x000a
-_0807E8E4_3 
-Wait 0x0032
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-StartPlayerScript script_0800987C
-WaitForSomething2 0x00000040
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000010
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000040
-_0807F078 0x003c, 0x0000
-SetGlobalFlag 0x0020
-_0807E8E4_3 
-Wait 0x001e
-_0807EB28 0x2809
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08065D00
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	StopScript 
+script_0800975A:
+	CheckEntityInteractType 
+	JumpIfNot script_0800975A
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	Call sub_08065F64
+	_0807EA94 
+	_0807E878 
+	Jump script_0800975A
+	.short 0x0000
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	SoundReq 0x01f3
+	Call sub_0807F40C
+	_0807E8E4_1 
+	Wait 0x000a
+	_0807E8E4_3 
+	Wait 0x0032
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	StartPlayerScript script_0800987C
+	WaitForSomething2 0x00000040
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000010
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000040
+	_0807F078 0x003c, 0x0000
+	SetGlobalFlag 0x0020
+	_0807E8E4_3 
+	Wait 0x001e
+	_0807EB28 0x2809
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc
index 98e06831..0e6e195b 100644
--- a/data/scripts/script_080097F0.inc
+++ b/data/scripts/script_080097F0.inc
@@ -1,20 +1,21 @@
 SCRIPT_START script_080097F0
-StartScript 
-_0807E930 0x0003
-_0807EF80 0x0007
-SetEntityNonPlanarMovement 0x0300
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000002
-SoundReq 0x0123
-Call sub_0807F1A0
-StopScript 
-StartScript 
-_0807EE30 
-JumpIfNot 0xfff8
-StopScript 
-_0807E5F8 0x00000004
-Call sub_0807FBD4
-SoundReq 0x01f3
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0003
+	_0807EF80 0x0007
+	SetEntityNonPlanarMovement 0x0300
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000002
+	SoundReq 0x0123
+	Call sub_0807F1A0
+script_08009816:
+	StopScript 
+	StartScript 
+	_0807EE30 
+	JumpIfNot script_08009816
+	StopScript 
+	_0807E5F8 0x00000004
+	Call sub_0807FBD4
+	SoundReq 0x01f3
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc
index 9ff46dfd..54f4a5dc 100644
--- a/data/scripts/script_08009838.inc
+++ b/data/scripts/script_08009838.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_08009838
-StartScript 
-_0807E930 0x0003
-_0807EF80 0x0007
-SetEntityNonPlanarMovement 0x0300
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000008
-Call sub_0809E0A0
-Call sub_0809E0D4
-SoundReq 0x01f3
-Call sub_0807FBD4
-SoundReq 0x01f3
-_0807E5F8 0x00000010
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0003
+	_0807EF80 0x0007
+	SetEntityNonPlanarMovement 0x0300
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000008
+	Call sub_0809E0A0
+	Call sub_0809E0D4
+	SoundReq 0x01f3
+	Call sub_0807FBD4
+	SoundReq 0x01f3
+	_0807E5F8 0x00000010
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc
index 92c1e4f4..c25d85ee 100644
--- a/data/scripts/script_0800987C.inc
+++ b/data/scripts/script_0800987C.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_0800987C
-SoundReq 0x007a
-_0807EB44 0x0004
-SoundReq 0x0086
-Call sub_0807F36C
-SetEntityNonPlanarMovement 0x0400
-_0807ECF4 0x0004
-Call sub_0807F1E8
-Wait 0x001e
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-SoundReq 0x007c
-_0807EB44 0x0004
-Call sub_0807F210
-_0807EF3C 0x0200, 0x0020
-_0807EF80 0x0000
-_0807E5F8 0x00000040
-Call sub_080791BC
+	SoundReq 0x007a
+	_0807EB44 0x0004
+	SoundReq 0x0086
+	Call sub_0807F36C
+	SetEntityNonPlanarMovement 0x0400
+	_0807ECF4 0x0004
+	Call sub_0807F1E8
+	Wait 0x001e
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	SoundReq 0x007c
+	_0807EB44 0x0004
+	Call sub_0807F210
+	_0807EF3C 0x0200, 0x0020
+	_0807EF80 0x0000
+	_0807E5F8 0x00000040
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc
index 0f027694..78e235cc 100644
--- a/data/scripts/script_080098D4.inc
+++ b/data/scripts/script_080098D4.inc
@@ -1,20 +1,23 @@
 SCRIPT_START script_080098D4
-StartScript 
-StopScript 
-CheckGlobalFlag 0x0020
-JumpIfNot 0xfffa
-CheckInventory1 0x003c
-JumpIfNot 0xfffa
-CheckLocalFlag 0x005d
-JumpIf 0x0022
-SetLocalFlag 0x005d
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807EB28 0x280a
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	StopScript 
+script_080098D8:
+	CheckGlobalFlag 0x0020
+	JumpIfNot script_080098D8
+script_080098E0:
+	CheckInventory1 0x003c
+	JumpIfNot script_080098E0
+	CheckLocalFlag 0x005d
+	JumpIf script_08009910
+	SetLocalFlag 0x005d
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807EB28 0x280a
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+script_08009910:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc
index 1722df97..263a4da6 100644
--- a/data/scripts/script_08009918.inc
+++ b/data/scripts/script_08009918.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_08009918
-StartScript 
-Call sub_0807DF28
-_0807E864 
-_0807E5F8 0x00000000
-StopScript 
-WaitFor_2 
-Wait 0x0078
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000001
-SetGlobalFlag 0x001c
-Call sub_0807DF50
-_0807E878 
-Call sub_0807921C
+	StartScript 
+	Call sub_0807DF28
+	_0807E864 
+	_0807E5F8 0x00000000
+	StopScript 
+	WaitFor_2 
+	Wait 0x0078
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000001
+	SetGlobalFlag 0x001c
+	Call sub_0807DF50
+	_0807E878 
+	Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc
index 3ac1419c..2de6f57f 100644
--- a/data/scripts/script_08009950.inc
+++ b/data/scripts/script_08009950.inc
@@ -1,37 +1,37 @@
 SCRIPT_START script_08009950
-StartScript 
-Call sub_0807F348
-SetEntityNonPlanarMovement 0x0040
-_0807EB44 0x0004
-_0807E930 0x000c
-_0807E908 0x0003
-StopScript 
-Wait 0x001e
-CameraTargetEntity 
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-WaitForSomething2 0x00000008
-_0807EF80 0x0004
-Wait 0x001e
-_0807E930 0x000b
-Wait 0x001e
-TextboxNoOverlapFollow 0x1002
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E908 0x0001
-_0807EB44 0x0004
-_0807EDD4 0x00b8, 0x005c
-_0807EB44 0x0006
-_0807EF80 0x0001
-TextboxNoOverlapFollow 0x1004
-_0807EA94 
-_0807EF80 0x0000
-Wait 0x001e
-_0807E778 0x0002
-DoFade5 
-WaitFor_2 
-Call sub_08053634
+	StartScript 
+	Call sub_0807F348
+	SetEntityNonPlanarMovement 0x0040
+	_0807EB44 0x0004
+	_0807E930 0x000c
+	_0807E908 0x0003
+	StopScript 
+	Wait 0x001e
+	CameraTargetEntity 
+	_0807E778 0x0004
+	_0807E800 0x00000000
+	WaitFor_2 
+	WaitForSomething2 0x00000008
+	_0807EF80 0x0004
+	Wait 0x001e
+	_0807E930 0x000b
+	Wait 0x001e
+	TextboxNoOverlapFollow 0x1002
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E908 0x0001
+	_0807EB44 0x0004
+	_0807EDD4 0x00b8, 0x005c
+	_0807EB44 0x0006
+	_0807EF80 0x0001
+	TextboxNoOverlapFollow 0x1004
+	_0807EA94 
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807E778 0x0002
+	DoFade5 
+	WaitFor_2 
+	Call sub_08053634
 SCRIPT_END
diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc
index 30916b9d..5682be55 100644
--- a/data/scripts/script_080099DC.inc
+++ b/data/scripts/script_080099DC.inc
@@ -1,23 +1,23 @@
 SCRIPT_START script_080099DC
-StartScript 
-Call sub_0807F348
-SetEntityNonPlanarMovement 0x00c0
-_0807EB44 0x0002
-_0807EF80 0x0008
-StopScript 
-WaitForSomething2 0x00000004
-_0807EF80 0x0007
-_0807EDD4 0x0068, 0x0060
-Wait 0x000f
-TextboxNoOverlapFollow 0x1001
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0001
-TextboxNoOverlapFollow 0x1003
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000008
+	StartScript 
+	Call sub_0807F348
+	SetEntityNonPlanarMovement 0x00c0
+	_0807EB44 0x0002
+	_0807EF80 0x0008
+	StopScript 
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0007
+	_0807EDD4 0x0068, 0x0060
+	Wait 0x000f
+	TextboxNoOverlapFollow 0x1001
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0001
+	TextboxNoOverlapFollow 0x1003
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc
index cc58658e..f0d821e2 100644
--- a/data/scripts/script_08009A34.inc
+++ b/data/scripts/script_08009A34.inc
@@ -1,20 +1,21 @@
 SCRIPT_START script_08009A34
-Wait 0x003c
-Call sub_08066258
-Wait 0x001e
-Call sub_08066258
-Wait 0x005a
-Jump 0xffea
-SetEntityPositionRelative 0x01780240
-CameraTargetEntity 
-SetEntityNonPlanarMovement 0x0080
-Wait 0x0078
-SoundReq2 0x0036
-_0807E778 0x0002
-DoFade4 
-WaitFor_2 
-Wait 0x0078
-_0807E5F8 0x00000004
-Call sub_08053648
-_0807EDD4 0x0240, 0x0228
+	Wait 0x003c
+script_08009A38:
+	Call sub_08066258
+	Wait 0x001e
+	Call sub_08066258
+	Wait 0x005a
+	Jump script_08009A38
+	SetEntityPositionRelative 0x01780240
+	CameraTargetEntity 
+	SetEntityNonPlanarMovement 0x0080
+	Wait 0x0078
+	SoundReq2 0x0036
+	_0807E778 0x0002
+	DoFade4 
+	WaitFor_2 
+	Wait 0x0078
+	_0807E5F8 0x00000004
+	Call sub_08053648
+	_0807EDD4 0x0240, 0x0228
 SCRIPT_END
diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc
index f5aabb94..b48e74e6 100644
--- a/data/scripts/script_08009A84.inc
+++ b/data/scripts/script_08009A84.inc
@@ -1,26 +1,26 @@
 SCRIPT_START script_08009A84
-StartScript 
-SetEntityPositionRelative 0x011001e8
-SetEntityNonPlanarMovement 0x00c0
-_0807EF80 0x0008
-StopScript 
-WaitForSomething2 0x00000004
-_0807EF80 0x0007
-_0807EDD4 0x01e8, 0x0200
-_0807EDD4 0x01f8, 0x0218
-_0807EDD4 0x0220, 0x0228
-_0807EDD4 0x0240, 0x0228
-CameraTargetEntity 
-_0807EDD4 0x0290, 0x0228
-_0807EDD4 0x0290, 0x01f8
-SetEntityNonPlanarMovement 0x0080
-_0807EDD4 0x0290, 0x01c8
-SetEntityNonPlanarMovement 0x00c0
-_0807EDD4 0x0290, 0x0198
-Wait 0x001e
-_0807E5F8 0x00000010
-_0807EDD4 0x0290, 0x0190
-_0807EF80 0x0008
-_0807EDD4 0x0290, 0x0188
+	StartScript 
+	SetEntityPositionRelative 0x011001e8
+	SetEntityNonPlanarMovement 0x00c0
+	_0807EF80 0x0008
+	StopScript 
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0007
+	_0807EDD4 0x01e8, 0x0200
+	_0807EDD4 0x01f8, 0x0218
+	_0807EDD4 0x0220, 0x0228
+	_0807EDD4 0x0240, 0x0228
+	CameraTargetEntity 
+	_0807EDD4 0x0290, 0x0228
+	_0807EDD4 0x0290, 0x01f8
+	SetEntityNonPlanarMovement 0x0080
+	_0807EDD4 0x0290, 0x01c8
+	SetEntityNonPlanarMovement 0x00c0
+	_0807EDD4 0x0290, 0x0198
+	Wait 0x001e
+	_0807E5F8 0x00000010
+	_0807EDD4 0x0290, 0x0190
+	_0807EF80 0x0008
+	_0807EDD4 0x0290, 0x0188
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc
index 1c416468..9ba7e216 100644
--- a/data/scripts/script_08009AF8.inc
+++ b/data/scripts/script_08009AF8.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_08009AF8
-StartScript 
-StopScript 
-WaitForSomething2 0x00000010
-SoundReq 0x00f0
-_0807EF80 0x0008
-Wait 0x001e
-SoundReq 0x00f1
-_0807EF80 0x0007
-Wait 0x005a
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-Call sub_0805367C
+	StartScript 
+	StopScript 
+	WaitForSomething2 0x00000010
+	SoundReq 0x00f0
+	_0807EF80 0x0008
+	Wait 0x001e
+	SoundReq 0x00f1
+	_0807EF80 0x0007
+	Wait 0x005a
+	_0807E778 0x0004
+	_0807E80C 0x00000000
+	WaitFor_2 
+	Call sub_0805367C
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc
index ec9af874..685f2e66 100644
--- a/data/scripts/script_08009B30.inc
+++ b/data/scripts/script_08009B30.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_08009B30
-StartScript 
-Call sub_0807DF28
-_0807E864 
-SetLocalFlag 0x0046
-StopScript 
-WaitFor_2 
-Wait 0x001e
-TextboxNoOverlapFollow 0x1005
-_0807EA94 
-Wait 0x003c
-Call sub_0807529C
-Wait 0x003c
-_0807EF80 0x0014
-Wait 0x001e
-Call sub_08053250
-_0807E878 
-Call sub_0807DF50
-Call sub_080791D0
+	StartScript 
+	Call sub_0807DF28
+	_0807E864 
+	SetLocalFlag 0x0046
+	StopScript 
+	WaitFor_2 
+	Wait 0x001e
+	TextboxNoOverlapFollow 0x1005
+	_0807EA94 
+	Wait 0x003c
+	Call sub_0807529C
+	Wait 0x003c
+	_0807EF80 0x0014
+	Wait 0x001e
+	Call sub_08053250
+	_0807E878 
+	Call sub_0807DF50
+	Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc
index a7450ecf..9bd9569a 100644
--- a/data/scripts/script_08009B78.inc
+++ b/data/scripts/script_08009B78.inc
@@ -1,61 +1,63 @@
 SCRIPT_START script_08009B78
-StartScript 
-_0807EB44 0x0006
-SetEntityNonPlanarMovement 0x0080
-_0807E9D4 
-Call sub_0807F348
-StopScript 
-CheckGlobalFlag 0x0013
-JumpIf 0x00ba
-_0807E888 
-Wait 0x000a
-_0807E864 
-StartPlayerScript script_08009CFC
-Call sub_0807DF28
-WaitForSomething2 0x00000008
-_0807EDD4 0x0080, 0x005c
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x000f
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x00001009
-_0807E8E4_1 
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807EB8C 
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x0000100b
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000008
-_0807EDD4 0x007c, 0x005c
-Wait 0x000f
-_0807EF80 0x000d
-_0807EDD4 0x0084, 0x005c
-_0807EB44 0x0006
-_0807EF80 0x000c
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000008
-Call sub_08053250
-_0807F034 0x0034
-WaitPlayerAction8 
-_0807E8E4_1 
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x0000100c
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x100e
-_0807E878 
-Jump 0xffee
+	StartScript 
+	_0807EB44 0x0006
+	SetEntityNonPlanarMovement 0x0080
+	_0807E9D4 
+	Call sub_0807F348
+	StopScript 
+	CheckGlobalFlag 0x0013
+	JumpIf script_08009C4C
+	_0807E888 
+	Wait 0x000a
+	_0807E864 
+	StartPlayerScript script_08009CFC
+	Call sub_0807DF28
+	WaitForSomething2 0x00000008
+	_0807EDD4 0x0080, 0x005c
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	Wait 0x000f
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x00001009
+	_0807E8E4_1 
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807EB8C 
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x0000100b
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000008
+	_0807EDD4 0x007c, 0x005c
+	Wait 0x000f
+	_0807EF80 0x000d
+	_0807EDD4 0x0084, 0x005c
+	_0807EB44 0x0006
+	_0807EF80 0x000c
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000008
+	Call sub_08053250
+	_0807F034 0x0034
+	WaitPlayerAction8 
+	_0807E8E4_1 
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x0000100c
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+script_08009C4C:
+	_0807EF80 0x000a
+script_08009C50:
+	CheckEntityInteractType 
+	JumpIfNot script_08009C50
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x100e
+	_0807E878 
+	Jump script_08009C50
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc
index 4dfe4771..fece2a6f 100644
--- a/data/scripts/script_08009C68.inc
+++ b/data/scripts/script_08009C68.inc
@@ -1,39 +1,39 @@
 SCRIPT_START script_08009C68
-StartScript 
-_0807EB44 0x0002
-SetEntityNonPlanarMovement 0x0100
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-_0807EB74 
-WaitForSomething2 0x00000004
-_0807EB74 
-WaitForSomething2 0x00000004
-_0807EB74 
-_0807EB8C 
-_0807EF80 0x0001
-TextboxNoOverlapFollowPos 0x0000100a
-_0807EA94 
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EB8C 
-_0807EF80 0x0001
-_0807EB8C 
-_0807EB44 0x0002
-TextboxNoOverlapFollowPos 0x0000100d
-_0807EA94 
-_0807EF80 0x0000
-_0807EDD4 0x0028, 0x0060
-_0807EDD4 0x0000, 0x0060
-Call sub_080536A8
-Wait 0x001e
-StartScript 
-SetGlobalFlag 0x0013
-Call sub_0807DF50
-Call sub_080791D0
-_0807E878 
-StopScript 
+	StartScript 
+	_0807EB44 0x0002
+	SetEntityNonPlanarMovement 0x0100
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0004
+	_0807EB74 
+	WaitForSomething2 0x00000004
+	_0807EB74 
+	WaitForSomething2 0x00000004
+	_0807EB74 
+	_0807EB8C 
+	_0807EF80 0x0001
+	TextboxNoOverlapFollowPos 0x0000100a
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EB8C 
+	_0807EF80 0x0001
+	_0807EB8C 
+	_0807EB44 0x0002
+	TextboxNoOverlapFollowPos 0x0000100d
+	_0807EA94 
+	_0807EF80 0x0000
+	_0807EDD4 0x0028, 0x0060
+	_0807EDD4 0x0000, 0x0060
+	Call sub_080536A8
+	Wait 0x001e
+	StartScript 
+	SetGlobalFlag 0x0013
+	Call sub_0807DF50
+	Call sub_080791D0
+	_0807E878 
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc
index e096f627..39e00046 100644
--- a/data/scripts/script_08009CFC.inc
+++ b/data/scripts/script_08009CFC.inc
@@ -1,27 +1,27 @@
 SCRIPT_START script_08009CFC
-StartScript 
-_0807E8E4_1 
-SetEntityNonPlanarMovement 0x00c0
-StopScript 
-_0807E5F8 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807EDD4 0x0040, 0x0060
-_0807EDD4 0x0060, 0x0068
-_0807E5F8 0x00000004
-_0807EF80 0x0000
-_0807E8E4_0 
-Wait 0x000f
-SoundReq 0x0094
-_0807EF80 0x0000
-Wait 0x001e
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000002
-_0807EDD4 0x0070, 0x005c
-_0807E8E4_1 
-_0807EF80 0x0000
-Wait 0x000f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000008
+	StartScript 
+	_0807E8E4_1 
+	SetEntityNonPlanarMovement 0x00c0
+	StopScript 
+	_0807E5F8 0x00000004
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EDD4 0x0040, 0x0060
+	_0807EDD4 0x0060, 0x0068
+	_0807E5F8 0x00000004
+	_0807EF80 0x0000
+	_0807E8E4_0 
+	Wait 0x000f
+	SoundReq 0x0094
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000002
+	_0807EDD4 0x0070, 0x005c
+	_0807E8E4_1 
+	_0807EF80 0x0000
+	Wait 0x000f
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000008
 SCRIPT_END
diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc
index 80d89114..e20bc108 100644
--- a/data/scripts/script_08009D6C.inc
+++ b/data/scripts/script_08009D6C.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08009D6C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0006
-StopScript 
-_0807EDD4 0x0078, 0x0060
-_0807EDD4 0x0078, 0x007c
-Wait 0x001e
-Call sub_0805368C
-Wait 0x0008
-_0807EDD4 0x0078, 0x0098
-_0807EF80 0x0008
-_0807E778 0x0010
-DoFade5 
-WaitFor_2 
-Call sub_08053634
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0006
+	StopScript 
+	_0807EDD4 0x0078, 0x0060
+	_0807EDD4 0x0078, 0x007c
+	Wait 0x001e
+	Call sub_0805368C
+	Wait 0x0008
+	_0807EDD4 0x0078, 0x0098
+	_0807EF80 0x0008
+	_0807E778 0x0010
+	DoFade5 
+	WaitFor_2 
+	Call sub_08053634
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc
index 32ec35e1..fe3be26d 100644
--- a/data/scripts/script_08009DB0.inc
+++ b/data/scripts/script_08009DB0.inc
@@ -1,41 +1,43 @@
 SCRIPT_START script_08009DB0
-StartScript 
-Call sub_0807F348
-Call sub_08066288
-Call sub_08066274
-_0807EF80 0x000a
-_0807E930 0x000c
-_0807E908 0x0003
-StopScript 
-_0807E944 
-_0807E908 0x0002
-Call sub_0806622C
-_0807EA94 
-_0807E908 0x0003
-_0807E930 0x000c
-Jump 0xffe8
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Wait 0x0008
-_0807EB28 0x3207
-_0807E3E8 
-JumpIfNot 0x003e
-Call sub_0807DF28
-_0807E778 0x0002
-DoFade5 
-WaitFor_2 
-Call sub_0804E864
-Wait 0x001e
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB28 0x3209
-Wait 0x000f
-_0807EA94 
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F348
+	Call sub_08066288
+	Call sub_08066274
+	_0807EF80 0x000a
+	_0807E930 0x000c
+	_0807E908 0x0003
+	StopScript 
+script_08009DD2:
+	_0807E944 
+	_0807E908 0x0002
+	Call sub_0806622C
+	_0807EA94 
+	_0807E908 0x0003
+	_0807E930 0x000c
+	Jump script_08009DD2
+	StartScript 
+	StopScript 
+script_08009DF0:
+	CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
+	JumpIfNot script_08009DF0
+	_0807E864 
+	Call sub_0807F9A4
+	Wait 0x0008
+	_0807EB28 0x3207
+	_0807E3E8 
+	JumpIfNot script_08009E4E
+	Call sub_0807DF28
+	_0807E778 0x0002
+	DoFade5 
+	WaitFor_2 
+	Call sub_0804E864
+	Wait 0x001e
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EB28 0x3209
+	Wait 0x000f
+	_0807EA94 
+	_0807E878 
+	Call sub_0807DF50
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc
index 6291b750..41213ed3 100644
--- a/data/scripts/script_08009E4E.inc
+++ b/data/scripts/script_08009E4E.inc
@@ -1,5 +1,6 @@
 SCRIPT_START script_08009E4E
-_0807E878 
-_0807EF80 0x0006
+script_08009E4E:
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc
index 7b6d0607..a6106130 100644
--- a/data/scripts/script_08009E58.inc
+++ b/data/scripts/script_08009E58.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08009E58
-StartScript 
-Call sub_0807DF28
-StopScript 
-WaitForSomething2 0x00000002
-_0807E778 0x0002
-DoFade4 
-WaitFor_2 
-_0807EF80 0x0014
-Wait 0x001e
-_0807E5F8 0x00000001
+	StartScript 
+	Call sub_0807DF28
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807E778 0x0002
+	DoFade4 
+	WaitFor_2 
+	_0807EF80 0x0014
+	Wait 0x001e
+	_0807E5F8 0x00000001
 SCRIPT_END
diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc
index d6fd3b14..66e11e42 100644
--- a/data/scripts/script_08009E80.inc
+++ b/data/scripts/script_08009E80.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08009E80
-StartScript 
-StopScript 
+	StartScript 
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc
index 61ff496f..e5cba4a5 100644
--- a/data/scripts/script_08009E88.inc
+++ b/data/scripts/script_08009E88.inc
@@ -1,19 +1,20 @@
 SCRIPT_START script_08009E88
-StartScript 
-Call sub_0807DF28
-_0807E864 
-SetLocalFlag 0x009f
-StopScript 
-Wait 0x003c
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-Call sub_0807F0D8
-JumpIfNot 0xfff8
-_0807EF80 0x0014
-Wait 0x000a
-Call sub_08053250
-_0807E878 
-Call sub_0807DF50
-Call sub_080791D0
+	StartScript 
+	Call sub_0807DF28
+	_0807E864 
+	SetLocalFlag 0x009f
+	StopScript 
+	Wait 0x003c
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+script_08009EA4:
+	Call sub_0807F0D8
+	JumpIfNot script_08009EA4
+	_0807EF80 0x0014
+	Wait 0x000a
+	Call sub_08053250
+	_0807E878 
+	Call sub_0807DF50
+	Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc
index 59e47d9a..6a7dd099 100644
--- a/data/scripts/script_08009ECC.inc
+++ b/data/scripts/script_08009ECC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009ECC
-StartScript 
-_0807E914 0x00000002
-_0807EF80 0x0001
-StopScript 
-WaitForSomething2 0x00000004
-StartScript 
-_0807E914 0x00000003
-_0807EF80 0x0001
-StopScript 
+	StartScript 
+	_0807E914 0x00000002
+	_0807EF80 0x0001
+	StopScript 
+	WaitForSomething2 0x00000004
+	StartScript 
+	_0807E914 0x00000003
+	_0807EF80 0x0001
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc
index 0800fa63..31f60a6b 100644
--- a/data/scripts/script_08009EF0.inc
+++ b/data/scripts/script_08009EF0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009EF0
-StartScript 
-_0807E914 0x00000000
-_0807EF80 0x0001
-StopScript 
-WaitForSomething2 0x00000004
-StartScript 
-_0807E914 0x00000001
-_0807EF80 0x0001
-StopScript 
+	StartScript 
+	_0807E914 0x00000000
+	_0807EF80 0x0001
+	StopScript 
+	WaitForSomething2 0x00000004
+	StartScript 
+	_0807E914 0x00000001
+	_0807EF80 0x0001
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc
index 9ec617ac..706d06c5 100644
--- a/data/scripts/script_08009F14.inc
+++ b/data/scripts/script_08009F14.inc
@@ -1,108 +1,118 @@
 SCRIPT_START script_08009F14
-StartScript 
-_0807EB44 0x0004
-Call sub_08060090
-_0807EF80 0x000a
-CheckKinstoneFused 0x001c
-JumpIf 0x00a8
-CheckInventory1 0x0007
-JumpIf 0x0052
-StopScript 
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-Call sub_0807DF28
-_0807EF80 0x000b
-StartPlayerScript script_0800A088
-WaitForSomething2 0x00000002
-Call sub_0806014C
-TextboxNoOverlapFollowPos 0x00001f01
-_0807EA94 
-Wait 0x001e
-_0807F034 0x0065
-WaitPlayerAction8 
-_0807EF80 0x000a
-Call sub_0807DF50
-_0807E878 
-StopScript 
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-Call sub_080602BC
-_0807EA94 
-CallWithArg sub_0807F970, 0x00001f03
-JumpIf 0x0008
-_0807E878 
-Jump 0xffd2
-Wait 0x0008
-SoundReq 0x0103
-CallWithArg sub_0806030C, 0x00000063
-Wait 0x0008
-_0807E878 
-Jump 0xffb6
-StopScript 
-CheckLocalFlag 0x00b0
-JumpIf 0x004a
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-TextboxNoOverlap 0x1f0e
-_0807EA94 
-_0807E3E8 
-JumpIf 0x0008
-_0807E878 
-Jump 0xffdc
-Wait 0x0008
-_0807F034 0x0008
-Call sub_08060318
-WaitPlayerAction8 
-Wait 0x0008
-_0807EB8C 
-TextboxNoOverlapFollow 0x1f13
-_0807EA94 
-SetLocalFlag 0x00b0
-_0807E878 
-StopScript 
-StartScript 
-Call sub_08060158
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-CheckInventory1 0x0008
-JumpIf 0x0014
-TextboxNoOverlap 0x1f14
-_0807EA94 
-_0807E3E8 
-JumpIf 0xffb8
-_0807E878 
-Jump 0xffd4
-TextboxNoOverlap 0x1f11
-_0807EA94 
-_0807E3E8 
-JumpIf 0x0008
-_0807E878 
-Jump 0xffc2
-Wait 0x0008
-_0807F034 0x0007
-Call sub_08060318
-WaitPlayerAction8 
-Wait 0x0008
-_0807EB8C 
-TextboxNoOverlapFollow 0x1f10
-_0807EA94 
-_0807E878 
-Jump 0xffa0
-.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	Call sub_08060090
+	_0807EF80 0x000a
+	CheckKinstoneFused 0x001c
+	JumpIf script_08009FD2
+	CheckInventory1 0x0007
+	JumpIf script_08009F84
+	StopScript 
+script_08009F36:
+	StopScript 
+	StartScript 
+	Call sub_08060158
+	CheckEntityInteractType 
+	JumpIfNot script_08009F36
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	_0807EF80 0x000b
+	StartPlayerScript script_0800A088
+	WaitForSomething2 0x00000002
+	Call sub_0806014C
+	TextboxNoOverlapFollowPos 0x00001f01
+	_0807EA94 
+	Wait 0x001e
+	_0807F034 0x0065
+	WaitPlayerAction8 
+	_0807EF80 0x000a
+	Call sub_0807DF50
+	_0807E878 
+script_08009F84:
+	StopScript 
+script_08009F86:
+	StopScript 
+	StartScript 
+	Call sub_08060158
+	CheckEntityInteractType 
+	JumpIfNot script_08009F86
+	StopScript 
+	_0807E864 
+	Call sub_080602BC
+	_0807EA94 
+	CallWithArg sub_0807F970, 0x00001f03
+	JumpIf script_08009FB6
+	_0807E878 
+	Jump script_08009F86
+script_08009FB6:
+	Wait 0x0008
+	SoundReq 0x0103
+	CallWithArg sub_0806030C, 0x00000063
+	Wait 0x0008
+	_0807E878 
+	Jump script_08009F86
+script_08009FD2:
+	StopScript 
+	CheckLocalFlag 0x00b0
+	JumpIf script_0800A024
+script_08009FDC:
+	StopScript 
+	StartScript 
+	Call sub_08060158
+	CheckEntityInteractType 
+	JumpIfNot script_08009FDC
+	StopScript 
+	_0807E864 
+	TextboxNoOverlap 0x1f0e
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_0800A002
+	_0807E878 
+	Jump script_08009FDC
+script_0800A002:
+	Wait 0x0008
+	_0807F034 0x0008
+	Call sub_08060318
+	WaitPlayerAction8 
+	Wait 0x0008
+	_0807EB8C 
+	TextboxNoOverlapFollow 0x1f13
+	_0807EA94 
+	SetLocalFlag 0x00b0
+	_0807E878 
+script_0800A024:
+	StopScript 
+	StartScript 
+	Call sub_08060158
+	CheckEntityInteractType 
+	JumpIfNot script_0800A024
+	StopScript 
+	_0807E864 
+	CheckInventory1 0x0008
+	JumpIf script_0800A052
+	TextboxNoOverlap 0x1f14
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_0800A002
+	_0807E878 
+	Jump script_0800A024
+script_0800A052:
+	TextboxNoOverlap 0x1f11
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_0800A064
+	_0807E878 
+	Jump script_0800A024
+script_0800A064:
+	Wait 0x0008
+	_0807F034 0x0007
+	Call sub_08060318
+	WaitPlayerAction8 
+	Wait 0x0008
+	_0807EB8C 
+	TextboxNoOverlapFollow 0x1f10
+	_0807EA94 
+	_0807E878 
+	Jump script_0800A024
+	.short 0x0000
diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc
index f868a306..25189df6 100644
--- a/data/scripts/script_0800A088.inc
+++ b/data/scripts/script_0800A088.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A088
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807ECC4 0x0010
-_0807EDD4 0x0078, 0x0060
-_0807EB44 0x0000
-Wait 0x000f
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807ECC4 0x0010
+	_0807EDD4 0x0078, 0x0060
+	_0807EB44 0x0000
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc
index ba47f686..88e85d50 100644
--- a/data/scripts/script_0800A0B4.inc
+++ b/data/scripts/script_0800A0B4.inc
@@ -1,20 +1,21 @@
 SCRIPT_START script_0800A0B4
-StartScript 
-SetEntityNonPlanarMovement 0x0140
-_0807E864 
-Call sub_0807DF28
-StopScript 
-Wait 0x0078
-SoundReq2 0x0018
-Call sub_080A0464
-_0807EE30 
-JumpIfNot 0xfffc
-_0807E8E4_0 
-Wait 0x0008
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-Wait 0x003c
-SetEntityNonPlanarMovement 0x0080
-_0807EC64 0x0030
+	StartScript 
+	SetEntityNonPlanarMovement 0x0140
+	_0807E864 
+	Call sub_0807DF28
+	StopScript 
+	Wait 0x0078
+	SoundReq2 0x0018
+	Call sub_080A0464
+script_0800A0D2:
+	_0807EE30 
+	JumpIfNot script_0800A0D2
+	_0807E8E4_0 
+	Wait 0x0008
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	Wait 0x003c
+	SetEntityNonPlanarMovement 0x0080
+	_0807EC64 0x0030
 SCRIPT_END
diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc
index 6970ec48..d89a6ae7 100644
--- a/data/scripts/script_0800A0FC.inc
+++ b/data/scripts/script_0800A0FC.inc
@@ -1,24 +1,25 @@
 SCRIPT_START script_0800A0FC
-StopScript 
-CheckGlobalFlag 0x0051
-JumpIfNot 0xfffa
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SoundReq0x80100000 
-Call sub_0807FBFC
-SetEntityPositionRelative 0x005800b0
-Call sub_0807F844
-_0807E8E4_3 
-CallWithArg sub_0807F75C, 0x00d00060
-CallWithArg sub_08094AE8, 0x0800a160
-SoundReq 0x00f7
-_0807E778 0x0002
-DoFade6 
-StopScript 
-WaitFor_2 
-WaitForSomething2 0x00000004
-CallWithArg sub_0806DA1C, 0x00000006
-_0807EF80 0x0006
+	StopScript 
+script_0800A0FE:
+	CheckGlobalFlag 0x0051
+	JumpIfNot script_0800A0FE
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SoundReq0x80100000 
+	Call sub_0807FBFC
+	SetEntityPositionRelative 0x005800b0
+	Call sub_0807F844
+	_0807E8E4_3 
+	CallWithArg sub_0807F75C, 0x00d00060
+	CallWithArg sub_08094AE8, 0x0800a160
+	SoundReq 0x00f7
+	_0807E778 0x0002
+	DoFade6 
+	StopScript 
+	WaitFor_2 
+	WaitForSomething2 0x00000004
+	CallWithArg sub_0806DA1C, 0x00000006
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc
index 9016c077..60aa3b19 100644
--- a/data/scripts/script_0800A160.inc
+++ b/data/scripts/script_0800A160.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0800A160
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807E930 0x0002
-SetEntityPositionRelative 0x008000b0
-CallWithArg sub_0807F98C, 0xff800000
-CallWithArg sub_080960C4, 0x0800a1b4
-StopScript 
-SoundReq 0x0142
-_0807EF3C 0xff80, 0x0000
-SoundReq 0x0143
-_0807E930 0x0004
-_0807E5F8 0x00000002
-Wait 0x003c
-_0807E5F8 0x00000004
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807E930 0x0002
+	SetEntityPositionRelative 0x008000b0
+	CallWithArg sub_0807F98C, 0xff800000
+	CallWithArg sub_080960C4, 0x0800a1b4
+	StopScript 
+	SoundReq 0x0142
+	_0807EF3C 0xff80, 0x0000
+	SoundReq 0x0143
+	_0807E930 0x0004
+	_0807E5F8 0x00000002
+	Wait 0x003c
+	_0807E5F8 0x00000004
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc
index bc7b9f02..6a5b0e52 100644
--- a/data/scripts/script_0800A1B4.inc
+++ b/data/scripts/script_0800A1B4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A1B4
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
-StopScript 
-WaitForSomething 0x00000002
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	CallWithArg sub_0807F994, 0x0000fff8
+	StopScript 
+	WaitForSomething 0x00000002
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc
index 7b80fe1b..5ee10dbb 100644
--- a/data/scripts/script_0800A1D8.inc
+++ b/data/scripts/script_0800A1D8.inc
@@ -1,63 +1,63 @@
 SCRIPT_START script_0800A1D8
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x00800088
-Call sub_0807F844
-_0807E8E4_3 
-CallWithArg sub_0807F75C, 0x00a80088
-StopScript 
-Wait 0x003c
-StartPlayerScript script_0800A310
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000080
-TextboxNoOverlapFollowPos 0x00001659
-_0807EA94 
-Wait 0x003c
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000200
-_0807E5F8 0x00000004
-_0807E8E4_0 
-WaitForSomething2 0x00000080
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000200
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000040
-_0807E5F8 0x00000004
-Call sub_0807F3F8
-WaitForSomething2 0x00000080
-TextboxNoOverlapFollowPos 0x000e165a
-_0807EA94 
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000e165b
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000040
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000100
-Wait 0x003c
-_0807E8E4_3 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000080
-Wait 0x003c
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000006
-WaitForSomething2 0x000000c0
-TextboxNoOverlapFollowPos 0x000e165c
-_0807EA94 
-SoundReq0x80100000 
-TextboxNoOverlapFollowPos 0x000e165d
-_0807EA94 
-_0807E5F8 0x00000006
-WaitForSomething2 0x000000c0
-_0807E5F8 0x00000006
-WaitForSomething2 0x00000080
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000100
-SoundReq2 0x0008
-SoundReq 0x00f7
-CallWithArg sub_0806DA1C, 0x00000007
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x00800088
+	Call sub_0807F844
+	_0807E8E4_3 
+	CallWithArg sub_0807F75C, 0x00a80088
+	StopScript 
+	Wait 0x003c
+	StartPlayerScript script_0800A310
+	WaitForSomething2 0x00000001
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000080
+	TextboxNoOverlapFollowPos 0x00001659
+	_0807EA94 
+	Wait 0x003c
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000200
+	_0807E5F8 0x00000004
+	_0807E8E4_0 
+	WaitForSomething2 0x00000080
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000200
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000040
+	_0807E5F8 0x00000004
+	Call sub_0807F3F8
+	WaitForSomething2 0x00000080
+	TextboxNoOverlapFollowPos 0x000e165a
+	_0807EA94 
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000e165b
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000040
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000100
+	Wait 0x003c
+	_0807E8E4_3 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000080
+	Wait 0x003c
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000006
+	WaitForSomething2 0x000000c0
+	TextboxNoOverlapFollowPos 0x000e165c
+	_0807EA94 
+	SoundReq0x80100000 
+	TextboxNoOverlapFollowPos 0x000e165d
+	_0807EA94 
+	_0807E5F8 0x00000006
+	WaitForSomething2 0x000000c0
+	_0807E5F8 0x00000006
+	WaitForSomething2 0x00000080
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000100
+	SoundReq2 0x0008
+	SoundReq 0x00f7
+	CallWithArg sub_0806DA1C, 0x00000007
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc
index 0e351738..13e28e4c 100644
--- a/data/scripts/script_0800A310.inc
+++ b/data/scripts/script_0800A310.inc
@@ -1,43 +1,43 @@
 SCRIPT_START script_0800A310
-StopScript 
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807E5F8 0x00000001
-Call sub_080791BC
-.short 0x0000
-StartScript 
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x000b
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-WaitForSomething2 0x00000002
-_0807E930 0x000e
-_0807EF80 0x0007
-Call sub_0807F2D4
-_0807EF80 0x0004
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-_0807E930 0x000c
-Call sub_0807F2D4
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-_0807E930 0x000f
-Call sub_0807F2D4
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-_0807E930 0x000c
-Call sub_0807F2D4
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-CallWithArg sub_080960C4, 0x0800a680
-_0807E5F8 0x00000040
+	StopScript 
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807E5F8 0x00000001
+	Call sub_080791BC
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x000b
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807E930 0x000e
+	_0807EF80 0x0007
+	Call sub_0807F2D4
+	_0807EF80 0x0004
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+	_0807E930 0x000c
+	Call sub_0807F2D4
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+	_0807E930 0x000f
+	Call sub_0807F2D4
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+	_0807E930 0x000c
+	Call sub_0807F2D4
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+	CallWithArg sub_080960C4, 0x0800a680
+	_0807E5F8 0x00000040
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc
index ffa148db..13202ee2 100644
--- a/data/scripts/script_0800A3D8.inc
+++ b/data/scripts/script_0800A3D8.inc
@@ -1,60 +1,60 @@
 SCRIPT_START script_0800A3D8
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807EB44 0x0002
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000004
-StartScript 
-_0807EF80 0x0004
-Call sub_0807F3F8
-StopScript 
-Wait 0x003c
-_0807EC94 0x0010
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-_0807EB44 0x0004
-_0807EF80 0x0000
-SoundReq 0x0142
-CallWithArg sub_080960C4, 0x0800a638
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-SoundReq 0x0143
-_0807E5F8 0x00001000
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-Call sub_08066E68
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-SoundReq 0x0142
-CallWithArg sub_080960C4, 0x0800a680
-Wait 0x0078
-SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000003
-Wait 0x000f
-SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000003
-Wait 0x000f
-SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000003
-Wait 0x003c
-SoundReq 0x0153
-CallWithArg sub_0807FADC, 0x00000001
-SoundReq 0x0143
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000004
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000004
+	StartScript 
+	_0807EF80 0x0004
+	Call sub_0807F3F8
+	StopScript 
+	Wait 0x003c
+	_0807EC94 0x0010
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	SoundReq 0x0142
+	CallWithArg sub_080960C4, 0x0800a638
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	SoundReq 0x0143
+	_0807E5F8 0x00001000
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	Call sub_08066E68
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	SoundReq 0x0142
+	CallWithArg sub_080960C4, 0x0800a680
+	Wait 0x0078
+	SoundReq 0x0153
+	CallWithArg sub_0807FADC, 0x00000003
+	Wait 0x000f
+	SoundReq 0x0153
+	CallWithArg sub_0807FADC, 0x00000003
+	Wait 0x000f
+	SoundReq 0x0153
+	CallWithArg sub_0807FADC, 0x00000003
+	Wait 0x003c
+	SoundReq 0x0153
+	CallWithArg sub_0807FADC, 0x00000001
+	SoundReq 0x0143
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc
index 3febb687..9b15189e 100644
--- a/data/scripts/script_0800A500.inc
+++ b/data/scripts/script_0800A500.inc
@@ -1,30 +1,30 @@
 SCRIPT_START script_0800A500
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807E930 0x0005
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000008
-SoundReq 0x0142
-_0807E610 0x00000800
-CallWithArg sub_080960C4, 0x0800a65c
-_0807E930 0x0002
-Call sub_08094B0C
-_0807EDD4 0x0068, 0x0088
-Call sub_08094B80
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000008
-Call sub_08094B3C
-_0807E930 0x0004
-_0807E5F8 0x00000800
-SoundReq 0x0143
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000008
-_0807EF80 0x0008
-Call sub_080961B0
-SoundReq 0x00fa
-Wait 0x003c
-_0807E5F8 0x00000100
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807E930 0x0005
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000008
+	SoundReq 0x0142
+	_0807E610 0x00000800
+	CallWithArg sub_080960C4, 0x0800a65c
+	_0807E930 0x0002
+	Call sub_08094B0C
+	_0807EDD4 0x0068, 0x0088
+	Call sub_08094B80
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000008
+	Call sub_08094B3C
+	_0807E930 0x0004
+	_0807E5F8 0x00000800
+	SoundReq 0x0143
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000008
+	_0807EF80 0x0008
+	Call sub_080961B0
+	SoundReq 0x00fa
+	Wait 0x003c
+	_0807E5F8 0x00000100
 SCRIPT_END
diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc
index dfeeb93c..0e52c71c 100644
--- a/data/scripts/script_0800A590.inc
+++ b/data/scripts/script_0800A590.inc
@@ -1,35 +1,35 @@
 SCRIPT_START script_0800A590
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-SetEntity0x20 0x00000000
-_0807EF80 0x0008
-_0807EB44 0x0000
-Call sub_0807F714
-MoveEntityToPlayer 
-CallWithArg sub_0807F98C, 0xfff00000
-StopScript 
-_0807E930 0x0023
-WaitForSomething2 0x00000010
-CallWithArg sub_0807F6E8, 0x00000008
-_0807EF80 0x0007
-SoundReq 0x0142
-_0807E610 0x00000800
-CallWithArg sub_080960C4, 0x0800a65c
-Wait 0x003c
-_0807EDD4 0x0088, 0x0068
-Wait 0x0078
-_0807E5F8 0x00000800
-SoundReq 0x0143
-_0807EF3C 0x0000, 0x0020
-_0807E930 0x001f
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000010
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000200
-Wait 0x0001
-_0807EF80 0x0008
-WaitForSomething2 0x00000010
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	SetEntity0x20 0x00000000
+	_0807EF80 0x0008
+	_0807EB44 0x0000
+	Call sub_0807F714
+	MoveEntityToPlayer 
+	CallWithArg sub_0807F98C, 0xfff00000
+	StopScript 
+	_0807E930 0x0023
+	WaitForSomething2 0x00000010
+	CallWithArg sub_0807F6E8, 0x00000008
+	_0807EF80 0x0007
+	SoundReq 0x0142
+	_0807E610 0x00000800
+	CallWithArg sub_080960C4, 0x0800a65c
+	Wait 0x003c
+	_0807EDD4 0x0088, 0x0068
+	Wait 0x0078
+	_0807E5F8 0x00000800
+	SoundReq 0x0143
+	_0807EF3C 0x0000, 0x0020
+	_0807E930 0x001f
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000010
+	Wait 0x0078
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E5F8 0x00000200
+	Wait 0x0001
+	_0807EF80 0x0008
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc
index b043d489..db394caf 100644
--- a/data/scripts/script_0800A638.inc
+++ b/data/scripts/script_0800A638.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A638
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
-StopScript 
-WaitForSomething 0x00001000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	CallWithArg sub_0807F994, 0x0000fff8
+	StopScript 
+	WaitForSomething 0x00001000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc
index 3bce0abf..e1065b79 100644
--- a/data/scripts/script_0800A65C.inc
+++ b/data/scripts/script_0800A65C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A65C
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
-StopScript 
-WaitForSomething 0x00000800
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	CallWithArg sub_0807F994, 0x0000fff8
+	StopScript 
+	WaitForSomething 0x00000800
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc
index a90d2cc0..2c2211ae 100644
--- a/data/scripts/script_0800A680.inc
+++ b/data/scripts/script_0800A680.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A680
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
-StopScript 
-WaitForSomething 0x00000020
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	CallWithArg sub_0807F994, 0x0000fff8
+	StopScript 
+	WaitForSomething 0x00000020
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc
index bf51e73b..82316f18 100644
--- a/data/scripts/script_0800A6A4.inc
+++ b/data/scripts/script_0800A6A4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A6A4
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x00680088
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x00000008
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x00680088
+	Call sub_0807F844
+	StopScript 
+	Wait 0x003c
+	SoundReq 0x00f6
+	CallWithArg sub_0806DA1C, 0x00000008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc
index 9b92c7aa..f1396ad1 100644
--- a/data/scripts/script_0800A6D4.inc
+++ b/data/scripts/script_0800A6D4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A6D4
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x00700088
-Call sub_0807F844
-SoundReq 0x00f7
-StopScript 
-Wait 0x003c
-CallWithArg sub_0806DA1C, 0x00000009
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x00700088
+	Call sub_0807F844
+	SoundReq 0x00f7
+	StopScript 
+	Wait 0x003c
+	CallWithArg sub_0806DA1C, 0x00000009
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc
index 19f20c8c..34836f30 100644
--- a/data/scripts/script_0800A704.inc
+++ b/data/scripts/script_0800A704.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A704
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01c80198
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x0000000a
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x01c80198
+	Call sub_0807F844
+	StopScript 
+	Wait 0x003c
+	SoundReq 0x00f6
+	CallWithArg sub_0806DA1C, 0x0000000a
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc
index 17c68b8b..2f5ea451 100644
--- a/data/scripts/script_0800A734.inc
+++ b/data/scripts/script_0800A734.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A734
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01c800d8
-Call sub_0807F844
-SoundReq 0x00f7
-StopScript 
-Wait 0x003c
-CallWithArg sub_0806DA1C, 0x0000000b
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x01c800d8
+	Call sub_0807F844
+	SoundReq 0x00f7
+	StopScript 
+	Wait 0x003c
+	CallWithArg sub_0806DA1C, 0x0000000b
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc
index ab94aa38..bc1620b5 100644
--- a/data/scripts/script_0800A764.inc
+++ b/data/scripts/script_0800A764.inc
@@ -1,31 +1,31 @@
 SCRIPT_START script_0800A764
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01b800f8
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-SoundReq 0x00f6
-_0807E778 0x0004
-DoFade7 
-WaitFor_2 
-_0807E5F8 0x00000001
-SoundReq 0x00f7
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-Wait 0x001e
-_0807E5F8 0x00000002
-Wait 0x0014
-_0807E5F8 0x00000004
-Wait 0x000a
-_0807E5F8 0x00000008
-Wait 0x0005
-_0807E5F8 0x00000010
-Wait 0x0002
-_0807E5F8 0x00000020
-Wait 0x0078
-CallWithArg sub_0806DA1C, 0x0000000c
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x01b800f8
+	Call sub_0807F844
+	StopScript 
+	Wait 0x003c
+	SoundReq 0x00f6
+	_0807E778 0x0004
+	DoFade7 
+	WaitFor_2 
+	_0807E5F8 0x00000001
+	SoundReq 0x00f7
+	_0807E778 0x0002
+	DoFade6 
+	WaitFor_2 
+	Wait 0x001e
+	_0807E5F8 0x00000002
+	Wait 0x0014
+	_0807E5F8 0x00000004
+	Wait 0x000a
+	_0807E5F8 0x00000008
+	Wait 0x0005
+	_0807E5F8 0x00000010
+	Wait 0x0002
+	_0807E5F8 0x00000020
+	Wait 0x0078
+	CallWithArg sub_0806DA1C, 0x0000000c
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc
index be0e9930..9155e29a 100644
--- a/data/scripts/script_0800A7E4.inc
+++ b/data/scripts/script_0800A7E4.inc
@@ -1,94 +1,99 @@
 SCRIPT_START script_0800A7E4
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0010
-StopScript 
-WaitForSomething 0x00000001
-_0807E930 0x0002
-WaitForSomething2 0x00000002
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0001
-Wait 0x001e
-_0807E930 0x0003
-Wait 0x001e
-Jump 0xffee
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0010
-StopScript 
-WaitForSomething 0x00000001
-_0807E930 0x0002
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0001
-Wait 0x0014
-_0807E930 0x0003
-Wait 0x0014
-Jump 0xffee
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0010
-StopScript 
-WaitForSomething 0x00000001
-_0807E930 0x0002
-WaitForSomething2 0x00000008
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0001
-Wait 0x000a
-_0807E930 0x0003
-Wait 0x000a
-Jump 0xffee
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0008
-StopScript 
-WaitForSomething 0x00000001
-_0807EF80 0x0000
-WaitForSomething2 0x00000010
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0002
-Wait 0x0019
-_0807EB44 0x0006
-Wait 0x0019
-Jump 0xffee
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0008
-StopScript 
-WaitForSomething 0x00000001
-_0807EF80 0x0000
-WaitForSomething2 0x00000020
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0002
-Wait 0x000f
-_0807EB44 0x0006
-Wait 0x000f
-Jump 0xffee
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01780378
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-_0807E5F8 0x00000001
-Wait 0x001e
-_0807E5F8 0x00000002
-Wait 0x0014
-_0807E5F8 0x00000004
-Wait 0x000a
-_0807E5F8 0x00000008
-Wait 0x003c
-CallWithArg sub_0806DA1C, 0x0000000d
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0010
+	StopScript 
+	WaitForSomething 0x00000001
+	_0807E930 0x0002
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0004
+	Wait 0x003c
+script_0800A80C:
+	_0807E930 0x0001
+	Wait 0x001e
+	_0807E930 0x0003
+	Wait 0x001e
+	Jump script_0800A80C
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0010
+	StopScript 
+	WaitForSomething 0x00000001
+	_0807E930 0x0002
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0004
+	Wait 0x003c
+script_0800A848:
+	_0807E930 0x0001
+	Wait 0x0014
+	_0807E930 0x0003
+	Wait 0x0014
+	Jump script_0800A848
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0010
+	StopScript 
+	WaitForSomething 0x00000001
+	_0807E930 0x0002
+	WaitForSomething2 0x00000008
+	_0807EF80 0x0004
+	Wait 0x003c
+script_0800A884:
+	_0807E930 0x0001
+	Wait 0x000a
+	_0807E930 0x0003
+	Wait 0x000a
+	Jump script_0800A884
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	StopScript 
+	WaitForSomething 0x00000001
+	_0807EF80 0x0000
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0004
+	Wait 0x003c
+script_0800A8C0:
+	_0807EB44 0x0002
+	Wait 0x0019
+	_0807EB44 0x0006
+	Wait 0x0019
+	Jump script_0800A8C0
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	StopScript 
+	WaitForSomething 0x00000001
+	_0807EF80 0x0000
+	WaitForSomething2 0x00000020
+	_0807EF80 0x0004
+	Wait 0x003c
+script_0800A8FC:
+	_0807EB44 0x0002
+	Wait 0x000f
+	_0807EB44 0x0006
+	Wait 0x000f
+	Jump script_0800A8FC
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x01780378
+	Call sub_0807F844
+	StopScript 
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	Wait 0x001e
+	_0807E5F8 0x00000002
+	Wait 0x0014
+	_0807E5F8 0x00000004
+	Wait 0x000a
+	_0807E5F8 0x00000008
+	Wait 0x003c
+	CallWithArg sub_0806DA1C, 0x0000000d
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc
index f846c8ce..ca526a2c 100644
--- a/data/scripts/script_0800A964.inc
+++ b/data/scripts/script_0800A964.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A964
-StartScript 
-_0807EB44 0x0002
-_0807EF80 0x0007
-_0807E930 0x0001
-StopScript 
-WaitForSomething2 0x00000001
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0002
+	_0807EF80 0x0007
+	_0807E930 0x0001
+	StopScript 
+	WaitForSomething2 0x00000001
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc
index d3ea7f83..d9cb36b6 100644
--- a/data/scripts/script_0800A988.inc
+++ b/data/scripts/script_0800A988.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A988
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0007
-_0807E930 0x0002
-StopScript 
-WaitForSomething2 0x00000002
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0007
+	_0807E930 0x0002
+	StopScript 
+	WaitForSomething2 0x00000002
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc
index 6c25b9fb..be230b67 100644
--- a/data/scripts/script_0800A9AC.inc
+++ b/data/scripts/script_0800A9AC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A9AC
-StartScript 
-_0807EB44 0x0000
-_0807EF80 0x0007
-_0807E930 0x0000
-StopScript 
-WaitForSomething2 0x00000004
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0000
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething2 0x00000004
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc
index 3377620d..115da3fb 100644
--- a/data/scripts/script_0800A9D0.inc
+++ b/data/scripts/script_0800A9D0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A9D0
-StartScript 
-_0807EB44 0x0006
-_0807EF80 0x0007
-_0807E930 0x0003
-StopScript 
-WaitForSomething2 0x00000008
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0006
+	_0807EF80 0x0007
+	_0807E930 0x0003
+	StopScript 
+	WaitForSomething2 0x00000008
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc
index a6864ba4..c2e89b42 100644
--- a/data/scripts/script_0800A9F4.inc
+++ b/data/scripts/script_0800A9F4.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0800A9F4
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x00580128
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-_0807E5F8 0x00000001
-Wait 0x000a
-_0807E5F8 0x00000002
-Wait 0x0014
-_0807E5F8 0x00000004
-Wait 0x001e
-_0807E5F8 0x00000008
-Wait 0x003c
-CallWithArg sub_0806DA1C, 0x0000000e
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x00580128
+	Call sub_0807F844
+	StopScript 
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	Wait 0x000a
+	_0807E5F8 0x00000002
+	Wait 0x0014
+	_0807E5F8 0x00000004
+	Wait 0x001e
+	_0807E5F8 0x00000008
+	Wait 0x003c
+	CallWithArg sub_0806DA1C, 0x0000000e
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc
index 23c9fba2..e7b7408e 100644
--- a/data/scripts/script_0800AA48.inc
+++ b/data/scripts/script_0800AA48.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AA48
-StartScript 
-_0807EB44 0x0002
-_0807EF80 0x0007
-_0807E930 0x0000
-StopScript 
-WaitForSomething2 0x00000001
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0002
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething2 0x00000001
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc
index 99b9ab72..82bcf68a 100644
--- a/data/scripts/script_0800AA6C.inc
+++ b/data/scripts/script_0800AA6C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AA6C
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0007
-_0807E930 0x0000
-StopScript 
-WaitForSomething2 0x00000002
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething2 0x00000002
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc
index 061b6c07..975efbf8 100644
--- a/data/scripts/script_0800AA90.inc
+++ b/data/scripts/script_0800AA90.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AA90
-StartScript 
-_0807EB44 0x0000
-_0807EF80 0x0007
-_0807E930 0x0000
-StopScript 
-WaitForSomething2 0x00000004
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0000
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething2 0x00000004
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc
index ea0202f5..dbd05c71 100644
--- a/data/scripts/script_0800AAB4.inc
+++ b/data/scripts/script_0800AAB4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AAB4
-StartScript 
-_0807EB44 0x0006
-_0807EF80 0x0007
-_0807E930 0x0000
-StopScript 
-WaitForSomething2 0x00000008
-Call CreateDust
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0006
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething2 0x00000008
+	Call CreateDust
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc
index b497ebf8..d7f59883 100644
--- a/data/scripts/script_0800AAD8.inc
+++ b/data/scripts/script_0800AAD8.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800AAD8
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01480088
-Call sub_0807F844
-StopScript 
-Wait 0x003c
-SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x0000000f
-_0807EF80 0x0006
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x01480088
+	Call sub_0807F844
+	StopScript 
+	Wait 0x003c
+	SoundReq 0x00f6
+	CallWithArg sub_0806DA1C, 0x0000000f
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc
index c7bb0b85..0c012046 100644
--- a/data/scripts/script_0800AB08.inc
+++ b/data/scripts/script_0800AB08.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_0800AB08
-StartScript 
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x01480088
-Call sub_0807F844
-_0807E8E4_3 
-CallWithArg sub_0807F6E8, 0x00000008
-CallWithArg sub_0807F75C, 0x00a80088
-SoundReq 0x00f7
-StopScript 
-Wait 0x0078
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x00780088
-Call sub_0807F5C0
-TextboxNoOverlapFollowPos 0x00001664
-_0807EA94 
-TextboxNoOverlapFollowPos 0x000e165e
-_0807EA94 
-CallWithArg sub_0805DDEC, 0x00000001
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x01480088
+	Call sub_0807F844
+	_0807E8E4_3 
+	CallWithArg sub_0807F6E8, 0x00000008
+	CallWithArg sub_0807F75C, 0x00a80088
+	SoundReq 0x00f7
+	StopScript 
+	Wait 0x0078
+	_0807F0B4 0x0001
+	SetEntityPositionRelative 0x00780088
+	Call sub_0807F5C0
+	TextboxNoOverlapFollowPos 0x00001664
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x000e165e
+	_0807EA94 
+	CallWithArg sub_0805DDEC, 0x00000001
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc
index 6a996a20..cbab020d 100644
--- a/data/scripts/script_0800AB6E.inc
+++ b/data/scripts/script_0800AB6E.inc
@@ -1,69 +1,69 @@
 SCRIPT_START script_0800AB6E
-Call sub_0808D2CC
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E8E4_0 
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000080
-SetEntityPosition 0x0000, 0xffe0
-Call sub_0807F5C0
-Wait 0x003c
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x000e165f
-_0807EA94 
-StartPlayerScript script_0800ACBC
-WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos 0x000e1660
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x000e1661
-_0807EA94 
-_0807E5F8 0x00000008
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-SetEntityPosition 0x0000, 0x0020
-Call sub_0807F5C0
-WaitForSomething2 0x00000010
-StartPlayerScript script_0800ACE0
-WaitForSomething2 0x00000001
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000e1662
-_0807EA94 
-TextboxNoOverlapFollowPos 0x000e1663
-_0807EA94 
-SetEntityPosition 0x0000, 0xffe0
-Call sub_0807F5C0
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-StartPlayerScript script_0800AD54
-WaitForSomething2 0x00000001
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000e1665
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Wait 0x0078
-Call sub_0808D280
-Wait 0x0078
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-Call sub_0807FB94
-MoveEntityToPlayer 
-Call sub_0807F844
-_0807F0B4 0x0004
-CameraTargetPlayer 
-_0807E5F8 0x80000000
-DoFade4 
-WaitFor_2 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	Call sub_0808D2CC
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E8E4_0 
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000080
+	SetEntityPosition 0x0000, 0xffe0
+	Call sub_0807F5C0
+	Wait 0x003c
+	CallWithArg sub_0805DE18, 0x00000001
+	_0807F0C8 0x0000, 0x0000
+	Wait 0x003c
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	TextboxNoOverlapFollowPos 0x000e165f
+	_0807EA94 
+	StartPlayerScript script_0800ACBC
+	WaitForSomething2 0x00000001
+	TextboxNoOverlapFollowPos 0x000e1660
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	TextboxNoOverlapFollowPos 0x000e1661
+	_0807EA94 
+	_0807E5F8 0x00000008
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	SetEntityPosition 0x0000, 0x0020
+	Call sub_0807F5C0
+	WaitForSomething2 0x00000010
+	StartPlayerScript script_0800ACE0
+	WaitForSomething2 0x00000001
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000e1662
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x000e1663
+	_0807EA94 
+	SetEntityPosition 0x0000, 0xffe0
+	Call sub_0807F5C0
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	StartPlayerScript script_0800AD54
+	WaitForSomething2 0x00000001
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000e1665
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	Wait 0x0078
+	Call sub_0808D280
+	Wait 0x0078
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	Call sub_0807FB94
+	MoveEntityToPlayer 
+	Call sub_0807F844
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	_0807E5F8 0x80000000
+	DoFade4 
+	WaitFor_2 
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc
index 1926462e..becd20d0 100644
--- a/data/scripts/script_0800ACBC.inc
+++ b/data/scripts/script_0800ACBC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800ACBC
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0088, 0x0080
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
-.short 0x0000
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0088, 0x0080
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
+	.short 0x0000
diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc
index af37423e..205ba767 100644
--- a/data/scripts/script_0800ACE0.inc
+++ b/data/scripts/script_0800ACE0.inc
@@ -1,25 +1,25 @@
 SCRIPT_START script_0800ACE0
-StartScript 
-Call sub_08094BE0
-CallWithArg sub_0807F238, 0x0000045b
-SoundReq 0x0109
-StopScript 
-Call sub_0807F304
-Wait 0x005a
-_0807E5F8 0x00000008
-StartScript 
-CallWithArg sub_0807F6F8, 0x00000008
-CallWithArg sub_0807F238, 0x000008e4
-StopScript 
-Call sub_0807F304
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x003c
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x0004
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
-.short 0x0000
+	StartScript 
+	Call sub_08094BE0
+	CallWithArg sub_0807F238, 0x0000045b
+	SoundReq 0x0109
+	StopScript 
+	Call sub_0807F304
+	Wait 0x005a
+	_0807E5F8 0x00000008
+	StartScript 
+	CallWithArg sub_0807F6F8, 0x00000008
+	CallWithArg sub_0807F238, 0x000008e4
+	StopScript 
+	Call sub_0807F304
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Wait 0x003c
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x0004
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
+	.short 0x0000
diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc
index 1284344a..f29b0aea 100644
--- a/data/scripts/script_0800AD54.inc
+++ b/data/scripts/script_0800AD54.inc
@@ -1,65 +1,65 @@
 SCRIPT_START script_0800AD54
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EC64 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0004
-Wait 0x001e
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000000
-Wait 0x0006
-_0807EB44 0x0000
-CallWithArg sub_0807F3D8, 0x00000000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000000
-Wait 0x0014
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807E930 0x000c
-Call sub_0807F2D4
-Call sub_08094B94
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807E930 0x000f
-Call sub_0807F2D4
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-CallWithArg sub_080960C4, 0x0800af18
-_0807E930 0x0012
-Call sub_0807F2D4
-Wait 0x001e
-_0807E5F8 0x00000020
-SoundReq0x80100000 
-Call CreateDust
-Call sub_0806305C
-Call sub_080630A4
-_0807EF3C 0x0000, 0x0020
-Wait 0x001e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xfff0
-Wait 0x003c
-_0807EEF4 0x0000, 0xfff0
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EDD4 0x0088, 0x0040
-_0807E5F8 0x00000004
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EC64 0x0020
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0004
+	Wait 0x001e
+	_0807EB44 0x0002
+	CallWithArg sub_0807F3D8, 0x00000000
+	Wait 0x0006
+	_0807EB44 0x0000
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EB44 0x0002
+	CallWithArg sub_0807F3D8, 0x00000000
+	Wait 0x0014
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807E930 0x000c
+	Call sub_0807F2D4
+	Call sub_08094B94
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807E930 0x000f
+	Call sub_0807F2D4
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	CallWithArg sub_080960C4, 0x0800af18
+	_0807E930 0x0012
+	Call sub_0807F2D4
+	Wait 0x001e
+	_0807E5F8 0x00000020
+	SoundReq0x80100000 
+	Call CreateDust
+	Call sub_0806305C
+	Call sub_080630A4
+	_0807EF3C 0x0000, 0x0020
+	Wait 0x001e
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xfff0
+	Wait 0x003c
+	_0807EEF4 0x0000, 0xfff0
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EDD4 0x0088, 0x0040
+	_0807E5F8 0x00000004
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc
index 13a61d5a..43e75217 100644
--- a/data/scripts/script_0800AEA4.inc
+++ b/data/scripts/script_0800AEA4.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_0800AEA4
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807EB44 0x0002
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000040
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000080
-WaitForSomething2 0x80000000
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000040
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x80000000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc
index ea9dca91..b0cb89b6 100644
--- a/data/scripts/script_0800AEDC.inc
+++ b/data/scripts/script_0800AEDC.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_0800AEDC
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807E930 0x0000
-StopScript 
-WaitForSomething2 0x00000008
-Call sub_08094B80
-_0807EF3C 0x0000, 0x0001
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000008
-_0807EF80 0x0008
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething2 0x00000008
+	Call sub_08094B80
+	_0807EF3C 0x0000, 0x0001
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000008
+	_0807EF80 0x0008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc
index f70c8253..f22ee38e 100644
--- a/data/scripts/script_0800AF18.inc
+++ b/data/scripts/script_0800AF18.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800AF18
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000b
-CallWithArg sub_0807F994, 0x0000fff8
-SoundReq 0x0142
-StopScript 
-WaitForSomething 0x00000020
-SoundReq 0x0143
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	CallWithArg sub_0807F994, 0x0000fff8
+	SoundReq 0x0142
+	StopScript 
+	WaitForSomething 0x00000020
+	SoundReq 0x0143
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc
index cdd41a9b..6dc7083e 100644
--- a/data/scripts/script_0800AF44.inc
+++ b/data/scripts/script_0800AF44.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AF44
-_0807E864 
-Call sub_0807DF28
-_0807EB28 0x1c01
-_0807EA94 
-SetLocalFlagByOffset 0x0100, 0x0001
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB28 0x1c01
+	_0807EA94 
+	SetLocalFlagByOffset 0x0100, 0x0001
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc
index ed9ca2e7..0484fab7 100644
--- a/data/scripts/script_0800AF68.inc
+++ b/data/scripts/script_0800AF68.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AF68
-_0807E864 
-Call sub_0807DF28
-_0807EB28 0x1c02
-_0807EA94 
-SetLocalFlagByOffset 0x0100, 0x0002
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB28 0x1c02
+	_0807EA94 
+	SetLocalFlagByOffset 0x0100, 0x0002
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc
index 3801e06a..a39fc1ed 100644
--- a/data/scripts/script_0800AF8C.inc
+++ b/data/scripts/script_0800AF8C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AF8C
-_0807E864 
-Call sub_0807DF28
-_0807EB28 0x1c03
-_0807EA94 
-SetLocalFlagByOffset 0x0100, 0x0003
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB28 0x1c03
+	_0807EA94 
+	SetLocalFlagByOffset 0x0100, 0x0003
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc
index ff669eb8..255c71f2 100644
--- a/data/scripts/script_0800AFB0.inc
+++ b/data/scripts/script_0800AFB0.inc
@@ -1,17 +1,18 @@
 SCRIPT_START script_0800AFB0
-_0807E864 
-StopScript 
-StartScript 
-Call sub_0807FBB4
-ComparePlayerAction 0x0001
-JumpIfNot 0xfff0
-StopScript 
-Call sub_0807DF28
-_0807EB28 0x1c04
-_0807EA94 
-SetLocalFlagByOffset 0x0100, 0x0004
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E864 
+script_0800AFB2:
+	StopScript 
+	StartScript 
+	Call sub_0807FBB4
+	ComparePlayerAction 0x0001
+	JumpIfNot script_0800AFB2
+	StopScript 
+	Call sub_0807DF28
+	_0807EB28 0x1c04
+	_0807EA94 
+	SetLocalFlagByOffset 0x0100, 0x0004
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc
index 51206f3e..19d420e7 100644
--- a/data/scripts/script_0800AFE8.inc
+++ b/data/scripts/script_0800AFE8.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AFE8
-_0807E864 
-Call sub_0807DF28
-_0807EB28 0x1c05
-_0807EA94 
-SetLocalFlagByOffset 0x0100, 0x0005
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB28 0x1c05
+	_0807EA94 
+	SetLocalFlagByOffset 0x0100, 0x0005
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc
index 7ff71558..02fad519 100644
--- a/data/scripts/script_0800B00C.inc
+++ b/data/scripts/script_0800B00C.inc
@@ -1,44 +1,48 @@
 SCRIPT_START script_0800B00C
-StartScript 
-Call sub_0807F934
-Call sub_080A2124
-_0807EF80 0x000a
-_0807EF80 0x0007
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-CheckGlobalFlag 0x0052
-JumpIf 0x004a
-CheckGlobalFlag 0x0053
-JumpIf 0x0024
-TextboxNoOverlap 0x3f32
-_0807EA94 
-_0807EF80 0x0008
-Call Windcrest_Unlock
-Wait 0x003c
-_0807EB28 0x0b5c
-_0807EA94 
-SetGlobalFlag 0x0053
-Jump 0x003a
-TextboxNoOverlap 0x3f32
-_0807EA94 
-_0807EF80 0x0008
-Call Windcrest_Unlock
-Wait 0x003c
-_0807EB28 0x0b5d
-_0807EA94 
-Jump 0x001c
-TextboxNoOverlap 0x3f32
-_0807EA94 
-_0807EF80 0x0008
-Call Windcrest_Unlock
-Wait 0x003c
-_0807EB28 0x0b5e
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F934
+	Call sub_080A2124
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	StopScript 
+script_0800B024:
+	CheckEntityInteractType 
+	JumpIfNot script_0800B024
+	_0807E864 
+	Call sub_0807DF28
+	CheckGlobalFlag 0x0052
+	JumpIf script_0800B082
+	CheckGlobalFlag 0x0053
+	JumpIf script_0800B064
+	TextboxNoOverlap 0x3f32
+	_0807EA94 
+	_0807EF80 0x0008
+	Call Windcrest_Unlock
+	Wait 0x003c
+	_0807EB28 0x0b5c
+	_0807EA94 
+	SetGlobalFlag 0x0053
+	Jump script_0800B09C
+script_0800B064:
+	TextboxNoOverlap 0x3f32
+	_0807EA94 
+	_0807EF80 0x0008
+	Call Windcrest_Unlock
+	Wait 0x003c
+	_0807EB28 0x0b5d
+	_0807EA94 
+	Jump script_0800B09C
+script_0800B082:
+	TextboxNoOverlap 0x3f32
+	_0807EA94 
+	_0807EF80 0x0008
+	Call Windcrest_Unlock
+	Wait 0x003c
+	_0807EB28 0x0b5e
+	_0807EA94 
+script_0800B09C:
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc
index e6cc09c3..acd761d1 100644
--- a/data/scripts/script_0800B0AC.inc
+++ b/data/scripts/script_0800B0AC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800B0AC
-StopScript 
-_0807E864 
-Call sub_0807FA40
-Call sub_0807DF28
-_0807EB28 0x0b5f
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StopScript 
+	_0807E864 
+	Call sub_0807FA40
+	Call sub_0807DF28
+	_0807EB28 0x0b5f
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index 12d9570c..f72fc30e 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -1,52 +1,56 @@
 SCRIPT_START script_0800B0D0
-StartScript 
-Call sub_0806BCD4
-_0807EF80 0x000a
-CallWithArg sub_0806BC94, 0x00000000
-StopScript 
-Call sub_0807F434
-_0807E078_sss 0xfff8, 0x0004, 0x0040
-_0807E864 
-Call sub_0807DF28
-Call sub_0807F2D4
-_0807EB74 
-CallWithArg sub_0806BC94, 0x00000004
-Call sub_0806BCE8
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Call sub_0806BCB8
-CallWithArg sub_0806BC94, 0x00000000
-Jump 0xffb6
-_0807E864 
-Call sub_0807DF28
-Call sub_0807F2D4
-_0807EB74 
-CallWithArg sub_0806BC94, 0x00000004
-Call sub_0807F650
-_0807E9F0 
-JumpIfNot 0x0008
-Call sub_0806BCC0
-Call sub_0807DF50
-_0807E878 
-Call sub_0806BCB8
-CallWithArg sub_0806BC94, 0x00000000
-Jump 0xff6e
-StartScript 
-Call sub_0807DF28
-SetLocalFlag 0x0039
-_0807E864 
-StopScript 
-WaitForPlayerAction0x17 
-StartPlayerScript script_0800B1C0
-Wait 0x0018
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetRoomFlag 0x0000
-Wait 0x0010
-SoundReq2 0x002d
-_0807EB28 0x2701
-_0807E878 
-Call sub_0807DF50
+	StartScript 
+	Call sub_0806BCD4
+	_0807EF80 0x000a
+	CallWithArg sub_0806BC94, 0x00000000
+	StopScript 
+script_0800B0E8:
+	Call sub_0807F434
+	JumpSwitch_3 script_0800B0E8, script_0800B0F6, script_0800B134
+script_0800B0F6:
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_0807F2D4
+	_0807EB74 
+	CallWithArg sub_0806BC94, 0x00000004
+	Call sub_0806BCE8
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Call sub_0806BCB8
+	CallWithArg sub_0806BC94, 0x00000000
+	Jump script_0800B0E8
+script_0800B134:
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_0807F2D4
+	_0807EB74 
+	CallWithArg sub_0806BC94, 0x00000004
+	Call sub_0807F650
+	_0807E9F0 
+	JumpIfNot script_0800B160
+	Call sub_0806BCC0
+script_0800B160:
+	Call sub_0807DF50
+	_0807E878 
+	Call sub_0806BCB8
+	CallWithArg sub_0806BC94, 0x00000000
+	Jump script_0800B0E8
+	StartScript 
+	Call sub_0807DF28
+	SetLocalFlag 0x0039
+	_0807E864 
+	StopScript 
+	WaitForPlayerAction0x17 
+	StartPlayerScript script_0800B1C0
+	Wait 0x0018
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	SetRoomFlag 0x0000
+	Wait 0x0010
+	SoundReq2 0x002d
+	_0807EB28 0x2701
+	_0807E878 
+	Call sub_0807DF50
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc
index 442229d5..8c2683e9 100644
--- a/data/scripts/script_0800B1C0.inc
+++ b/data/scripts/script_0800B1C0.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_0800B1C0
-StartScript 
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x00e0
-_0807EDD4 0x0088, 0x0090
-ClearLocalFlag 0x0039
-_0807EF80 0x0000
-_0807EF80 0x0004
-Wait 0x002c
-LoadRoomEntityList gUnk_080DA260
-Wait 0x001e
-_0807E5F8 0x00000001
-Call sub_0807921C
+	StartScript 
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x00e0
+	_0807EDD4 0x0088, 0x0090
+	ClearLocalFlag 0x0039
+	_0807EF80 0x0000
+	_0807EF80 0x0004
+	Wait 0x002c
+	LoadRoomEntityList gUnk_080DA260
+	Wait 0x001e
+	_0807E5F8 0x00000001
+	Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc
index f892c31b..a1a25e7d 100644
--- a/data/scripts/script_0800B200.inc
+++ b/data/scripts/script_0800B200.inc
@@ -1,22 +1,24 @@
 SCRIPT_START script_0800B200
-StartScript 
-_0807E5F8 0x00000000
-CheckLocalFlag 0x001d
-JumpIf 0x0044
-SetEntityNonPlanarMovement 0x00c0
-StopScript 
-WaitForSomething2 0x00000001
-Call sub_0807DF28
-MoveEntityToPlayer 
-CameraTargetEntity 
-_0807EDD4 0x0068, 0x0380
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-Call sub_0807DF50
-Wait 0x000c
-CameraTargetPlayer 
-Wait 0x0008
-_0807E878 
-CheckLocalFlag 0x001d
-JumpIfNot 0xffc6
+	StartScript 
+	_0807E5F8 0x00000000
+	CheckLocalFlag 0x001d
+	JumpIf script_0800B252
+	SetEntityNonPlanarMovement 0x00c0
+	StopScript 
+script_0800B216:
+	WaitForSomething2 0x00000001
+	Call sub_0807DF28
+	MoveEntityToPlayer 
+	CameraTargetEntity 
+	_0807EDD4 0x0068, 0x0380
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	Call sub_0807DF50
+	Wait 0x000c
+	CameraTargetPlayer 
+	Wait 0x0008
+	_0807E878 
+	CheckLocalFlag 0x001d
+	JumpIfNot script_0800B216
+script_0800B252:
 SCRIPT_END
diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc
index 9aace125..e6ffe461 100644
--- a/data/scripts/script_0800B254.inc
+++ b/data/scripts/script_0800B254.inc
@@ -1,55 +1,60 @@
 SCRIPT_START script_0800B254
-StartScript 
-CheckKinstoneFused 0x0006
-JumpIf 0x00a6
-_0807EA88 0x0006
-_0807EB44 0x0002
-StopScript 
-_0807EA4C 
-_0807E9F0 
-_0807E864 
-CheckKinstoneFused 0x0006
-JumpIf 0x006e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-.short 0x0000
-StartScript 
-CheckKinstoneFused 0x0007
-JumpIf 0x0076
-_0807EA88 0x0007
-_0807EB44 0x0002
-StopScript 
-_0807EA4C 
-_0807E9F0 
-_0807E864 
-CheckKinstoneFused 0x0007
-JumpIf 0x003e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-.short 0x0000
-StartScript 
-CheckKinstoneFused 0x0008
-JumpIf 0x0046
-_0807EA88 0x0008
-_0807EB44 0x0002
-StopScript 
-_0807EA4C 
-_0807E9F0 
-_0807E864 
-CheckKinstoneFused 0x0008
-JumpIf 0x000e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-_0807EF80 0x0013
-_0807EB44 0x0004
-_0807E9DC 
-Call sub_080676E0
-Call sub_08067534
-_0807EF80 0x0012
-_0807E5F8 0x00000001
-StopScript 
+	StartScript 
+	CheckKinstoneFused 0x0006
+	JumpIf script_0800B302
+	_0807EA88 0x0006
+	_0807EB44 0x0002
+	StopScript 
+script_0800B268:
+	_0807EA4C 
+	_0807E9F0 
+	_0807E864 
+	CheckKinstoneFused 0x0006
+	JumpIf script_0800B2E2
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800B268
+	.short 0x0000
+	StartScript 
+	CheckKinstoneFused 0x0007
+	JumpIf script_0800B302
+	_0807EA88 0x0007
+	_0807EB44 0x0002
+	StopScript 
+script_0800B298:
+	_0807EA4C 
+	_0807E9F0 
+	_0807E864 
+	CheckKinstoneFused 0x0007
+	JumpIf script_0800B2E2
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800B298
+	.short 0x0000
+	StartScript 
+	CheckKinstoneFused 0x0008
+	JumpIf script_0800B302
+	_0807EA88 0x0008
+	_0807EB44 0x0002
+	StopScript 
+script_0800B2C8:
+	_0807EA4C 
+	_0807E9F0 
+	_0807E864 
+	CheckKinstoneFused 0x0008
+	JumpIf script_0800B2E2
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800B2C8
+script_0800B2E2:
+	_0807EF80 0x0013
+	_0807EB44 0x0004
+	_0807E9DC 
+	Call sub_080676E0
+	Call sub_08067534
+	_0807EF80 0x0012
+	_0807E5F8 0x00000001
+script_0800B302:
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc
index 33df9d9f..7b0e2e4a 100644
--- a/data/scripts/script_0800B308.inc
+++ b/data/scripts/script_0800B308.inc
@@ -1,39 +1,44 @@
 SCRIPT_START script_0800B308
-StartScript 
-CheckLocalFlag 0x001d
-JumpIf 0x008c
-_0807EF80 0x0001
-SetEntityNonPlanarMovement 0x0040
-SetEntityDirection 0x0010
-CheckKinstoneFused 0x0006
-JumpIfNot 0x0008
-Call sub_080676D8
-CheckKinstoneFused 0x0007
-JumpIfNot 0x0008
-Call sub_080676D8
-CheckKinstoneFused 0x0008
-JumpIfNot 0x0008
-Call sub_080676D8
-StopScript 
-Call sub_0806757C
-StopScript 
-WaitForSomething2 0x00000002
-SoundReq 0x00fd
-Call sub_080676D8
-Call sub_0806757C
-Call sub_080675D4
-Wait 0x0014
-StartScript 
-_0807E5F8 0x00000001
-CheckKinstoneFused 0x0006
-JumpIfNot 0xffd0
-CheckKinstoneFused 0x0007
-JumpIfNot 0xffc8
-CheckKinstoneFused 0x0008
-JumpIfNot 0xffc0
-StopScript 
-SetLocalFlag 0x001d
-SoundReq 0x0072
-_0807EF80 0x0006
+	StartScript 
+	CheckLocalFlag 0x001d
+	JumpIf script_0800B39C
+	_0807EF80 0x0001
+	SetEntityNonPlanarMovement 0x0040
+	SetEntityDirection 0x0010
+	CheckKinstoneFused 0x0006
+	JumpIfNot script_0800B32C
+	Call sub_080676D8
+script_0800B32C:
+	CheckKinstoneFused 0x0007
+	JumpIfNot script_0800B33A
+	Call sub_080676D8
+script_0800B33A:
+	CheckKinstoneFused 0x0008
+	JumpIfNot script_0800B348
+	Call sub_080676D8
+script_0800B348:
+	StopScript 
+	Call sub_0806757C
+script_0800B350:
+	StopScript 
+	WaitForSomething2 0x00000002
+	SoundReq 0x00fd
+	Call sub_080676D8
+	Call sub_0806757C
+	Call sub_080675D4
+	Wait 0x0014
+	StartScript 
+	_0807E5F8 0x00000001
+	CheckKinstoneFused 0x0006
+	JumpIfNot script_0800B350
+	CheckKinstoneFused 0x0007
+	JumpIfNot script_0800B350
+	CheckKinstoneFused 0x0008
+	JumpIfNot script_0800B350
+	StopScript 
+	SetLocalFlag 0x001d
+	SoundReq 0x0072
+script_0800B39C:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc
index ea436ed6..db2c7930 100644
--- a/data/scripts/script_0800B3A4.inc
+++ b/data/scripts/script_0800B3A4.inc
@@ -1,24 +1,25 @@
 SCRIPT_START script_0800B3A4
-StartScript 
-_0807EF80 0x000a
-Call sub_0807F158
-SetEntityNonPlanarMovement 0x0120
-_0807EB44 0x0004
-_0807E908 0x0002
-_0807E914 0x0000200a
-StopScript 
-_0807EDD4 0x0158, 0x0290
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-_0807EDD4 0x0128, 0x0290
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Call sub_08065780
-Jump 0xffaa
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_0807F158
+	SetEntityNonPlanarMovement 0x0120
+	_0807EB44 0x0004
+	_0807E908 0x0002
+	_0807E914 0x0000200a
+	StopScript 
+script_0800B3C4:
+	_0807EDD4 0x0158, 0x0290
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	_0807EDD4 0x0128, 0x0290
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Call sub_08065780
+	Jump script_0800B3C4
diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc
index 30682a8f..d498b4bd 100644
--- a/data/scripts/script_0800B41C.inc
+++ b/data/scripts/script_0800B41C.inc
@@ -1,36 +1,36 @@
 SCRIPT_START script_0800B41C
-StartScript 
-SetEntityNonPlanarMovement 0x00c0
-_0807E908 0x0001
-_0807EF80 0x000b
-_0807E864 
-Call sub_0807FBC4
-StopScript 
-Wait 0x000a
-_0807EF80 0x0004
-_0807E5F8 0x00000008
-StartPlayerScript script_0800B54C
-_0807EDD4 0x0140, 0x0298
-_0807EB74 
-WaitForSomething2 0x00000004
-_0807EB74 
-Wait 0x003c
-SoundReq 0x00cd
-_0807F088 0x0037
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlapFollow 0x200c
-_0807EA94 
-Wait 0x0014
-_0807EDD4 0x0158, 0x0290
-Wait 0x000a
-_0807EDD4 0x0158, 0x0288
-Wait 0x0014
-_0807E5F8 0x00000010
-_0807EDD4 0x0158, 0x0280
-Wait 0x000a
-_0807EF80 0x0008
-_0807E5F8 0x00000010
-_0807E5F8 0x00000008
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x00c0
+	_0807E908 0x0001
+	_0807EF80 0x000b
+	_0807E864 
+	Call sub_0807FBC4
+	StopScript 
+	Wait 0x000a
+	_0807EF80 0x0004
+	_0807E5F8 0x00000008
+	StartPlayerScript script_0800B54C
+	_0807EDD4 0x0140, 0x0298
+	_0807EB74 
+	WaitForSomething2 0x00000004
+	_0807EB74 
+	Wait 0x003c
+	SoundReq 0x00cd
+	_0807F088 0x0037
+	WaitPlayerAction8 
+	_0807EB8C 
+	TextboxNoOverlapFollow 0x200c
+	_0807EA94 
+	Wait 0x0014
+	_0807EDD4 0x0158, 0x0290
+	Wait 0x000a
+	_0807EDD4 0x0158, 0x0288
+	Wait 0x0014
+	_0807E5F8 0x00000010
+	_0807EDD4 0x0158, 0x0280
+	Wait 0x000a
+	_0807EF80 0x0008
+	_0807E5F8 0x00000010
+	_0807E5F8 0x00000008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc
index 76de2d08..5df7564c 100644
--- a/data/scripts/script_0800B4AC.inc
+++ b/data/scripts/script_0800B4AC.inc
@@ -1,43 +1,46 @@
 SCRIPT_START script_0800B4AC
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0001
-SetEntityNonPlanarMovement 0x00c0
-_0807E9D4 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x0010
-TestBit 0x00000008
-JumpIf 0x0022
-Jump 0xffea
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlapFollow 0x200b
-StopScript 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffce
-StopScript 
-_0807E610 0x00000008
-_0807EDD4 0x0134, 0x0288
-_0807EB44 0x0004
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollow 0x2016
-_0807EA94 
-_0807EDD4 0x0158, 0x0288
-_0807EF80 0x0000
-_0807EB44 0x0000
-Wait 0x000a
-_0807E5F8 0x00000010
-_0807EF80 0x0008
-Wait 0x001e
-_0807E5F8 0x00000010
-SetGlobalFlag 0x001d
-Call sub_0807921C
-_0807E878 
-Call sub_0807FBCC
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x000a
+	_0807EF80 0x0001
+	SetEntityNonPlanarMovement 0x00c0
+	_0807E9D4 
+script_0800B4BC:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800B4D4
+	TestBit 0x00000008
+	JumpIf script_0800B4F0
+	Jump script_0800B4BC
+script_0800B4D4:
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlapFollow 0x200b
+	StopScript 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_0800B4BC
+script_0800B4F0:
+	StopScript 
+	_0807E610 0x00000008
+	_0807EDD4 0x0134, 0x0288
+	_0807EB44 0x0004
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollow 0x2016
+	_0807EA94 
+	_0807EDD4 0x0158, 0x0288
+	_0807EF80 0x0000
+	_0807EB44 0x0000
+	Wait 0x000a
+	_0807E5F8 0x00000010
+	_0807EF80 0x0008
+	Wait 0x001e
+	_0807E5F8 0x00000010
+	SetGlobalFlag 0x001d
+	Call sub_0807921C
+	_0807E878 
+	Call sub_0807FBCC
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc
index 3b05f7c3..a0934d6f 100644
--- a/data/scripts/script_0800B54C.inc
+++ b/data/scripts/script_0800B54C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800B54C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0128, 0x0298
-Wait 0x000a
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0128, 0x0298
+	Wait 0x000a
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
 SCRIPT_END
diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc
index 30a3e55d..6181966e 100644
--- a/data/scripts/script_0800B574.inc
+++ b/data/scripts/script_0800B574.inc
@@ -1,20 +1,21 @@
 SCRIPT_START script_0800B574
-StartScript 
-_0807EF80 0x0007
-CheckGlobalFlag 0x001d
-JumpIf 0x003c
-StopScript 
-WaitForSomething2 0x00000010
-_0807EF80 0x0008
-SoundReq 0x0111
-WaitForSomething2 0x00000010
-_0807EF80 0x0007
-SoundReq 0x0111
-WaitForSomething2 0x00000010
-_0807EF80 0x0008
-SoundReq 0x0111
-WaitForSomething2 0x00000010
-_0807EF80 0x0007
-SoundReq 0x0111
-Call sub_0808692C
+	StartScript 
+	_0807EF80 0x0007
+	CheckGlobalFlag 0x001d
+	JumpIf script_0800B5BC
+	StopScript 
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0008
+	SoundReq 0x0111
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0007
+	SoundReq 0x0111
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0008
+	SoundReq 0x0111
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0007
+	SoundReq 0x0111
+script_0800B5BC:
+	Call sub_0808692C
 SCRIPT_END
diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc
index e793ed91..b264a34e 100644
--- a/data/scripts/script_0800B5C4.inc
+++ b/data/scripts/script_0800B5C4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800B5C4
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0004
-StopScript 
-Wait 0x001e
-SoundReq 0x00d1
-_0807EDD4 0x008a, 0x005a
-Wait 0x000a
-Call sub_08069EE8
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0004
+	StopScript 
+	Wait 0x001e
+	SoundReq 0x00d1
+	_0807EDD4 0x008a, 0x005a
+	Wait 0x000a
+	Call sub_08069EE8
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc
index 8f54c1ac..22ee139e 100644
--- a/data/scripts/script_0800B5EC.inc
+++ b/data/scripts/script_0800B5EC.inc
@@ -1,61 +1,67 @@
 SCRIPT_START script_0800B5EC
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0001
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2009
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-Jump 0xffe8
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
-JumpIfNot 0xfff6
-Call sub_08079184
-_0807E864 
-Call sub_0807F9A4
-StartPlayerScript script_0800B7C4
-WaitForSomething2 0x00000004
-SetRoomFlag 0x0000
-WaitForSomething2 0x00000004
-CheckLocalFlag 0x009e
-JumpIf 0x0154
-TextboxNoOverlap 0x0583
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x002a
-Wait 0x000f
-TextboxNoOverlap 0x0584
-CallWithArg sub_0807F970, 0x0000058b
-JumpIf 0x001e
-CallWithArg sub_08087424, 0x00000000
-Wait 0x00b4
-Jump 0x0024
-TextboxNoOverlap 0x057d
-_0807EA94 
-Jump 0x001a
-_0807EA94 
-SetLocalFlag 0x009e
-_0807F034 0x0066
-WaitPlayerAction8 
-_0807EB8C 
-Wait 0x001e
-TextboxNoOverlap 0x057f
-_0807EA94 
-_0807E778 0x0004
-DoFade7 
-WaitFor_2 
-Call sub_080873FC
-DoFade6 
-WaitFor_2 
-CameraTargetPlayer 
-Wait 0x001e
-Call sub_0807DF50
-_0807E878 
+	StartScript 
+	_0807EF80 0x000a
+	_0807EF80 0x0001
+	_0807E9D4 
+	StopScript 
+script_0800B5FA:
+	CheckEntityInteractType 
+	JumpIfNot script_0800B5FA
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x2009
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	Jump script_0800B5FA
+	StartScript 
+	StopScript 
+script_0800B618:
+	CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
+	JumpIfNot script_0800B618
+	Call sub_08079184
+	_0807E864 
+	Call sub_0807F9A4
+	StartPlayerScript script_0800B7C4
+	WaitForSomething2 0x00000004
+	SetRoomFlag 0x0000
+	WaitForSomething2 0x00000004
+	CheckLocalFlag 0x009e
+	JumpIf script_0800B7A2
+	TextboxNoOverlap 0x0583
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0800B684
+	Wait 0x000f
+	TextboxNoOverlap 0x0584
+	CallWithArg sub_0807F970, 0x0000058b
+	JumpIf script_0800B68E
+	CallWithArg sub_08087424, 0x00000000
+	Wait 0x00b4
+	Jump script_0800B6A6
+script_0800B684:
+	TextboxNoOverlap 0x057d
+	_0807EA94 
+	Jump script_0800B6A6
+script_0800B68E:
+	_0807EA94 
+	SetLocalFlag 0x009e
+	_0807F034 0x0066
+script_0800B698:
+	WaitPlayerAction8 
+	_0807EB8C 
+	Wait 0x001e
+	TextboxNoOverlap 0x057f
+	_0807EA94 
+script_0800B6A6:
+	_0807E778 0x0004
+	DoFade7 
+	WaitFor_2 
+	Call sub_080873FC
+	DoFade6 
+	WaitFor_2 
+	CameraTargetPlayer 
+	Wait 0x001e
+	Call sub_0807DF50
+	_0807E878 
 SCRIPT_END
diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc
index b2cd2eee..44d64afa 100644
--- a/data/scripts/script_0800B6C8.inc
+++ b/data/scripts/script_0800B6C8.inc
@@ -1,62 +1,67 @@
 SCRIPT_START script_0800B6C8
-StartScript 
-StopScript 
-HasRupees 0x0001
-JumpIfNot 0xfffa
-CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
-JumpIfNot 0xfff6
-Call sub_08079184
-_0807E864 
-Call sub_0807F9A4
-StartPlayerScript script_0800B7C4
-WaitForSomething2 0x00000004
-SetRoomFlag 0x0000
-WaitForSomething2 0x00000004
-CheckLocalFlag 0x009f
-JumpIf 0x0098
-TextboxNoOverlap 0x057b
-_0807EA94 
-CallWithArg sub_0807F970, 0x0000057d
-JumpIf 0xff88
-_0807EA94 
-SetLocalFlag 0x009f
-_0807F034 0x0064
-Jump 0xff6c
-.short 0x0000
-StartScript 
-StopScript 
-Call sub_0808747C
-JumpIfNot 0xfff8
-Call sub_08079184
-_0807E864 
-Wait 0x000a
-Call sub_0807F9A4
-StartPlayerScript script_0800B7C4
-WaitForSomething2 0x00000004
-SetRoomFlag 0x0000
-WaitForSomething2 0x00000004
-CheckLocalFlag 0x00a0
-JumpIf 0x0036
-TextboxNoOverlap 0x0580
-_0807EA94 
-CallWithArg sub_0807F970, 0x00000582
-JumpIf 0x0014
-CallWithArg sub_08087424, 0x00000001
-Wait 0x00b4
-Jump 0xff14
-_0807EA94 
-SetLocalFlag 0x00a0
-_0807F034 0x0065
-Jump 0xfef8
-TextboxNoOverlap 0x0590
-_0807EA94 
-_0807E778 0x0010
-DoFade7 
-WaitFor_2 
-ModHealth 0x00a0
-DoFade6 
-WaitFor_2 
-TextboxNoOverlap 0x057f
-_0807EA94 
-Jump 0xfee6
-.short 0x0000
+	StartScript 
+	StopScript 
+script_0800B6CC:
+	HasRupees 0x0001
+	JumpIfNot script_0800B6CC
+script_0800B6D4:
+	CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
+	JumpIfNot script_0800B6D4
+	Call sub_08079184
+	_0807E864 
+	Call sub_0807F9A4
+	StartPlayerScript script_0800B7C4
+	WaitForSomething2 0x00000004
+	SetRoomFlag 0x0000
+	WaitForSomething2 0x00000004
+	CheckLocalFlag 0x009f
+	JumpIf script_0800B7A2
+	TextboxNoOverlap 0x057b
+	_0807EA94 
+	CallWithArg sub_0807F970, 0x0000057d
+	JumpIf script_0800B6A6
+	_0807EA94 
+	SetLocalFlag 0x009f
+	_0807F034 0x0064
+	Jump script_0800B698
+	.short 0x0000
+	StartScript 
+	StopScript 
+script_0800B734:
+	Call sub_0808747C
+	JumpIfNot script_0800B734
+	Call sub_08079184
+	_0807E864 
+	Wait 0x000a
+	Call sub_0807F9A4
+	StartPlayerScript script_0800B7C4
+	WaitForSomething2 0x00000004
+	SetRoomFlag 0x0000
+	WaitForSomething2 0x00000004
+	CheckLocalFlag 0x00a0
+	JumpIf script_0800B7A2
+	TextboxNoOverlap 0x0580
+	_0807EA94 
+	CallWithArg sub_0807F970, 0x00000582
+	JumpIf script_0800B794
+	CallWithArg sub_08087424, 0x00000001
+	Wait 0x00b4
+	Jump script_0800B6A6
+script_0800B794:
+	_0807EA94 
+	SetLocalFlag 0x00a0
+	_0807F034 0x0065
+	Jump script_0800B698
+script_0800B7A2:
+	TextboxNoOverlap 0x0590
+	_0807EA94 
+	_0807E778 0x0010
+	DoFade7 
+	WaitFor_2 
+	ModHealth 0x00a0
+	DoFade6 
+	WaitFor_2 
+	TextboxNoOverlap 0x057f
+	_0807EA94 
+	Jump script_0800B6A6
+	.short 0x0000
diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc
index d57fd547..d3f15385 100644
--- a/data/scripts/script_0800B7C4.inc
+++ b/data/scripts/script_0800B7C4.inc
@@ -1,12 +1,13 @@
 SCRIPT_START script_0800B7C4
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-CallWithArg sub_0807F6B4, 0x00000090
-JumpIfNot 0x0024
-CallWithArg sub_0807F464, 0x00000078
-CallWithArg sub_0807F4F8, 0x00000090
-_0807E8E4_0 
-_0807EF80 0x0000
-_0807E5F8 0x00000004
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	CallWithArg sub_0807F6B4, 0x00000090
+	JumpIfNot script_0800B7FC
+	CallWithArg sub_0807F464, 0x00000078
+	CallWithArg sub_0807F4F8, 0x00000090
+script_0800B7EE:
+	_0807E8E4_0 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
 SCRIPT_END
diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc
index c8482b71..900e005e 100644
--- a/data/scripts/script_0800B7FC.inc
+++ b/data/scripts/script_0800B7FC.inc
@@ -1,11 +1,12 @@
 SCRIPT_START script_0800B7FC
-CallWithArg sub_0807F4F8, 0x00000090
-CallWithArg sub_0807F464, 0x00000078
-Jump 0xffdc
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
+script_0800B7FC:
+	CallWithArg sub_0807F4F8, 0x00000090
+	CallWithArg sub_0807F464, 0x00000078
+	Jump script_0800B7EE
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc
index 1128e712..7b4b5591 100644
--- a/data/scripts/script_0800B828.inc
+++ b/data/scripts/script_0800B828.inc
@@ -1,118 +1,129 @@
 SCRIPT_START script_0800B828
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E944 
-_0807E864 
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-Wait 0x003c
-Call sub_080646A4
-Jump 0xfff4
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807EF80 0x000a
-StopScript 
-Wait 0x003c
-Call sub_0806407C
-Jump 0xfff4
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-CallWithArg sub_08064644, 0x0806464d
-StopScript 
-Wait 0x003c
-Call sub_080646A4
-Jump 0xfff4
-.short 0x0000
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-CheckLocalFlag 0x005f
-JumpIf 0x001c
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x3f19
-_0807EA94 
-SetLocalFlag 0x005f
-_0807E878 
-Jump 0xffe8
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x3f1a
-_0807EA94 
-_0807E878 
-Jump 0xffec
-StartScript 
-_0807EF80 0x000b
-_0807EF80 0x0008
-Call sub_0806DAAC
-JumpIf 0x0036
-Call sub_0806DAD0
-CallWithArg sub_0806DA04, 0x00000005
-StopScript 
-_0807EA4C 
-_0807E9F0 
-JumpIf 0x000e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffee
-Call sub_0806F188
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0800B836:
+	_0807E944 
+	_0807E864 
+	TextboxNoOverlapFollow 0x0a01
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800B836
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0800B85E:
+	Wait 0x003c
+	Call sub_080646A4
+	Jump script_0800B85E
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0800B87E:
+	Wait 0x003c
+	Call sub_0806407C
+	Jump script_0800B87E
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0800B89E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800B89E
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlapFollow 0x0a01
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800B89E
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	CallWithArg sub_08064644, 0x0806464d
+	StopScript 
+script_0800B8D4:
+	Wait 0x003c
+	Call sub_080646A4
+	Jump script_0800B8D4
+	.short 0x0000
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	Call sub_08061FD8
+	StopScript 
+script_0800B8FC:
+	CheckEntityInteractType 
+	JumpIfNot script_0800B8FC
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	Jump script_0800B8FC
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	StopScript 
+	CheckLocalFlag 0x005f
+	JumpIf script_0800B94E
+script_0800B934:
+	CheckEntityInteractType 
+	JumpIfNot script_0800B934
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlapFollow 0x3f19
+	_0807EA94 
+	SetLocalFlag 0x005f
+	_0807E878 
+	Jump script_0800B934
+script_0800B94E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800B94E
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlapFollow 0x3f1a
+	_0807EA94 
+	_0807E878 
+	Jump script_0800B94E
+	StartScript 
+	_0807EF80 0x000b
+	_0807EF80 0x0008
+	Call sub_0806DAAC
+	JumpIf script_0800B9AC
+	Call sub_0806DAD0
+	CallWithArg sub_0806DA04, 0x00000005
+	StopScript 
+script_0800B98A:
+	_0807EA4C 
+	_0807E9F0 
+	JumpIf script_0800B99E
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800B98A
+script_0800B99E:
+	Call sub_0806F188
+	Call sub_0807DF50
+	_0807E878 
+script_0800B9AC:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc
index 3714f88c..3211a53b 100644
--- a/data/scripts/script_0800B9B4.inc
+++ b/data/scripts/script_0800B9B4.inc
@@ -1,75 +1,82 @@
 SCRIPT_START script_0800B9B4
-StartScript 
-_0807E9D4 
-Call sub_080694EC
-_0807EF80 0x000a
-Call sub_080694B0
-StopScript 
-Call sub_0807F434
-_0807E078_sss 0xfff8, 0x0004, 0x001e
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-Call sub_080694D8
-_0807EA94 
-Call sub_080694EC
-_0807E878 
-Jump 0xffd8
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-Call sub_0807F650
-_0807E9F0 
-_0807E864 
-Call sub_0806948C
-JumpIf 0x0016
-_0807EA94 
-Call sub_080694EC
-Call sub_0807DF50
-_0807E878 
-Jump 0xffa8
-_0807EA94 
-_0807E9DC 
-_0807E9D4 
-Call sub_080694EC
-Call sub_0807DF50
-_0807E878 
-Jump 0xff90
-StartScript 
-Call sub_0807F934
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlapFollow 0x3301
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x000e
-SoundReq0x80100000 
-Call sub_0806E964
-SoundReq2 0xffff
-Call sub_0807DF50
-_0807E878 
-Jump 0xffd0
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0040
-Call sub_0807F348
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EDD4 0x02f8, 0x0350
-Wait 0x001e
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0006
-Wait 0x001e
-_0807EDD4 0x02f0, 0x0350
-Wait 0x001e
-TextboxNoOverlap 0x0e00
-_0807EA94 
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807E9D4 
+	Call sub_080694EC
+	_0807EF80 0x000a
+	Call sub_080694B0
+	StopScript 
+script_0800B9CA:
+	Call sub_0807F434
+	JumpSwitch_3 script_0800B9CA, script_0800B9D8, script_0800B9F4
+script_0800B9D8:
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	Call sub_080694D8
+	_0807EA94 
+	Call sub_080694EC
+	_0807E878 
+	Jump script_0800B9CA
+script_0800B9F4:
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	Call sub_0807F650
+	_0807E9F0 
+	_0807E864 
+	Call sub_0806948C
+	JumpIf script_0800BA24
+	_0807EA94 
+	Call sub_080694EC
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800B9CA
+script_0800BA24:
+	_0807EA94 
+	_0807E9DC 
+	_0807E9D4 
+	Call sub_080694EC
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800B9CA
+	StartScript 
+	Call sub_0807F934
+	StopScript 
+script_0800BA46:
+	CheckEntityInteractType 
+	JumpIfNot script_0800BA46
+	_0807E864 
+	Call sub_0807DF28
+	TextboxNoOverlapFollow 0x3301
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0800BA6C
+	SoundReq0x80100000 
+	Call sub_0806E964
+	SoundReq2 0xffff
+script_0800BA6C:
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800BA46
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	SetEntityNonPlanarMovement 0x0040
+	Call sub_0807F348
+	StopScript 
+script_0800BA8E:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BA8E
+	_0807EDD4 0x02f8, 0x0350
+	Wait 0x001e
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EB44 0x0006
+	Wait 0x001e
+	_0807EDD4 0x02f0, 0x0350
+	Wait 0x001e
+	TextboxNoOverlap 0x0e00
+	_0807EA94 
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc
index 3c95fe68..5a4d8e56 100644
--- a/data/scripts/script_0800BACC.inc
+++ b/data/scripts/script_0800BACC.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_0800BACC
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0807F348
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e01
-_0807EA94 
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Call sub_0807F348
+	StopScript 
+script_0800BADE:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BADE
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e01
+	_0807EA94 
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc
index 6032796c..71885490 100644
--- a/data/scripts/script_0800BB00.inc
+++ b/data/scripts/script_0800BB00.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_0800BB00
-StartScript 
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e02
-_0807EA94 
-Wait 0x003c
-_0807EF80 0x000f
-Wait 0x00b4
-Call sub_08054968
+	StartScript 
+	StopScript 
+script_0800BB04:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BB04
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e02
+	_0807EA94 
+	Wait 0x003c
+	_0807EF80 0x000f
+	Wait 0x00b4
+	Call sub_08054968
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc
index 0bd31198..22531885 100644
--- a/data/scripts/script_0800BB30.inc
+++ b/data/scripts/script_0800BB30.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_0800BB30
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0807F348
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e05
-_0807EA94 
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Call sub_0807F348
+	StopScript 
+script_0800BB42:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BB42
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e05
+	_0807EA94 
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc
index 56fc79fd..bd88b9c9 100644
--- a/data/scripts/script_0800BB64.inc
+++ b/data/scripts/script_0800BB64.inc
@@ -1,17 +1,18 @@
 SCRIPT_START script_0800BB64
-StartScript 
-_0807EB44 0x0006
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0040
-Call sub_0807F348
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EDD4 0x03a0, 0x00f8
-Wait 0x001e
-TextboxNoOverlap 0x0e06
-_0807EA94 
-Wait 0x000f
-_0807EDD4 0x0380, 0x00f8
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	SetEntityNonPlanarMovement 0x0040
+	Call sub_0807F348
+	StopScript 
+script_0800BB7A:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BB7A
+	_0807EDD4 0x03a0, 0x00f8
+	Wait 0x001e
+	TextboxNoOverlap 0x0e06
+	_0807EA94 
+	Wait 0x000f
+	_0807EDD4 0x0380, 0x00f8
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc
index 6e72f1f0..85355bf4 100644
--- a/data/scripts/script_0800BBA4.inc
+++ b/data/scripts/script_0800BBA4.inc
@@ -1,16 +1,17 @@
 SCRIPT_START script_0800BBA4
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0807F348
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e04
-_0807EA94 
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Call sub_0807F348
+	StopScript 
+script_0800BBBA:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BBBA
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e04
+	_0807EA94 
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc
index 3f3ea682..917322b3 100644
--- a/data/scripts/script_0800BBDC.inc
+++ b/data/scripts/script_0800BBDC.inc
@@ -1,14 +1,15 @@
 SCRIPT_START script_0800BBDC
-StartScript 
-_0807E930 0x0000
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e03
-_0807EA94 
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807E930 0x0000
+	StopScript 
+script_0800BBE4:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BBE4
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e03
+	_0807EA94 
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc
index 181a22c4..67633e0e 100644
--- a/data/scripts/script_0800BC08.inc
+++ b/data/scripts/script_0800BC08.inc
@@ -1,21 +1,22 @@
 SCRIPT_START script_0800BC08
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e07
-_0807EA94 
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0004
-StopScript 
-Wait 0x003c
-Call sub_08065CCC
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_0800BC18:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BC18
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e07
+	_0807EA94 
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0004
+	StopScript 
+	Wait 0x003c
+	Call sub_08065CCC
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc
index 188a1616..1341fcc8 100644
--- a/data/scripts/script_0800BC50.inc
+++ b/data/scripts/script_0800BC50.inc
@@ -1,37 +1,38 @@
 SCRIPT_START script_0800BC50
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_08054EB8
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E930 0x0000
-Wait 0x001e
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e08
-_0807EA94 
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
-Call sub_08054EFC
-_0807EB44 0x0000
-_0807E930 0x0000
-SetEntityNonPlanarMovement 0x0040
-_0807EF80 0x000d
-CallWithArg sub_0807F4F8, 0x00000378
-Wait 0x003c
-_0807EF80 0x000c
-Wait 0x003c
-TextboxNoOverlap 0x0e09
-_0807EA94 
-Call sub_0807F158
-CallWithArg sub_0807F4F8, 0x0000035c
-Wait 0x001e
-SoundReq 0x0188
-_0807EF80 0x0008
-Wait 0x0078
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_08054EB8
+	StopScript 
+script_0800BC62:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BC62
+	_0807E930 0x0000
+	Wait 0x001e
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e08
+	_0807EA94 
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00f0
+	Call sub_08054EFC
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	SetEntityNonPlanarMovement 0x0040
+	_0807EF80 0x000d
+	CallWithArg sub_0807F4F8, 0x00000378
+	Wait 0x003c
+	_0807EF80 0x000c
+	Wait 0x003c
+	TextboxNoOverlap 0x0e09
+	_0807EA94 
+	Call sub_0807F158
+	CallWithArg sub_0807F4F8, 0x0000035c
+	Wait 0x001e
+	SoundReq 0x0188
+	_0807EF80 0x0008
+	Wait 0x0078
+	Call sub_08054968
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc
index d1e4c324..e19635f9 100644
--- a/data/scripts/script_0800BCE8.inc
+++ b/data/scripts/script_0800BCE8.inc
@@ -1,36 +1,37 @@
 SCRIPT_START script_0800BCE8
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-Wait 0x003c
-TextboxNoOverlap 0x0e0a
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e0c
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x0168
-_0807E930 0x0000
-Wait 0x003c
-_0807EB44 0x0002
-WaitForSomething2 0x00000004
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xffe0
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	Wait 0x003c
+	TextboxNoOverlap 0x0e0a
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	_0807E5F8 0x00000001
+script_0800BD1C:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BD1C
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E930 0x0000
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e0c
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x0168
+	_0807E930 0x0000
+	Wait 0x003c
+	_0807EB44 0x0002
+	WaitForSomething2 0x00000004
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc
index 5c08c0b5..6e4bf7ee 100644
--- a/data/scripts/script_0800BD78.inc
+++ b/data/scripts/script_0800BD78.inc
@@ -1,35 +1,35 @@
 SCRIPT_START script_0800BD78
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x00000270
-Wait 0x001e
-TextboxNoOverlap 0x0e0b
-_0807EA94 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0088, 0x0228
-Wait 0x000f
-_0807E5F8 0x00000004
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00b4
-CallWithArg sub_0804BF38, 0x00000000
-Wait 0x00b4
-CallWithArg sub_0804BF38, 0x00000003
-_0807EB44 0x0004
-_0807E930 0x0000
-Wait 0x003c
-_0807EB44 0x0006
-_0807E5F8 0x00000004
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xffe0
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0007
+	CallWithArg sub_0807F4F8, 0x00000270
+	Wait 0x001e
+	TextboxNoOverlap 0x0e0b
+	_0807EA94 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0088, 0x0228
+	Wait 0x000f
+	_0807E5F8 0x00000004
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00b4
+	CallWithArg sub_0804BF38, 0x00000000
+	Wait 0x00b4
+	CallWithArg sub_0804BF38, 0x00000003
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Wait 0x003c
+	_0807EB44 0x0006
+	_0807E5F8 0x00000004
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xffe0
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc
index 4c4db21b..6b68a09c 100644
--- a/data/scripts/script_0800BE1C.inc
+++ b/data/scripts/script_0800BE1C.inc
@@ -1,47 +1,49 @@
 SCRIPT_START script_0800BE1C
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0002
-Wait 0x003c
-TextboxNoOverlap 0x0e0d
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-Jump 0x0038
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e0f
-_0807EA94 
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0002
+	Wait 0x003c
+	TextboxNoOverlap 0x0e0d
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	Jump script_0800BE88
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0006
+	Wait 0x003c
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	_0807E5F8 0x00000001
+script_0800BE88:
+	_0807EB44 0x0004
+script_0800BE8C:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BE8C
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807E930 0x0000
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e0f
+	_0807EA94 
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00f0
 SCRIPT_END
diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc
index 40e3dcd9..c4559547 100644
--- a/data/scripts/script_0800BECC.inc
+++ b/data/scripts/script_0800BECC.inc
@@ -1,25 +1,25 @@
 SCRIPT_START script_0800BECC
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x000001b8
-Wait 0x001e
-TextboxNoOverlap 0x0e0e
-_0807EA94 
-_0807E5F8 0x0000000c
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0088, 0x0178
-Wait 0x000f
-_0807E5F8 0x0000000c
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0007
+	CallWithArg sub_0807F4F8, 0x000001b8
+	Wait 0x001e
+	TextboxNoOverlap 0x0e0e
+	_0807EA94 
+	_0807E5F8 0x0000000c
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0088, 0x0178
+	Wait 0x000f
+	_0807E5F8 0x0000000c
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00f0
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc
index 34693099..f4a9d017 100644
--- a/data/scripts/script_0800BF38.inc
+++ b/data/scripts/script_0800BF38.inc
@@ -1,53 +1,55 @@
 SCRIPT_START script_0800BF38
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0002
-Wait 0x003c
-TextboxNoOverlap 0x0e10
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-Jump 0x0038
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e12
-_0807EA94 
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x0168
-_0807EB44 0x0004
-_0807E930 0x0000
-Wait 0x003c
-Call sub_08054F64
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xffe0
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0002
+	Wait 0x003c
+	TextboxNoOverlap 0x0e10
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	Jump script_0800BFA4
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0006
+	Wait 0x003c
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	_0807E5F8 0x00000001
+script_0800BFA4:
+	_0807EB44 0x0004
+script_0800BFA8:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800BFA8
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807E930 0x0000
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e12
+	_0807EA94 
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x0168
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Wait 0x003c
+	Call sub_08054F64
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc
index 1e63525f..635b8068 100644
--- a/data/scripts/script_0800C004.inc
+++ b/data/scripts/script_0800C004.inc
@@ -1,36 +1,36 @@
 SCRIPT_START script_0800C004
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x000001b8
-Wait 0x001e
-TextboxNoOverlap 0x0e11
-_0807EA94 
-_0807E5F8 0x0000001c
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0088, 0x0188
-_0807EDD4 0x00a8, 0x0188
-_0807EDD4 0x00a8, 0x0178
-Wait 0x000f
-_0807E5F8 0x0000001c
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00b4
-CallWithArg sub_0804BF38, 0x00000001
-Wait 0x00b4
-CallWithArg sub_0804BF38, 0x00000004
-_0807EB44 0x0004
-_0807E930 0x0000
-Wait 0x003c
-_0807E5F8 0x0000001c
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xffe0
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0007
+	CallWithArg sub_0807F4F8, 0x000001b8
+	Wait 0x001e
+	TextboxNoOverlap 0x0e11
+	_0807EA94 
+	_0807E5F8 0x0000001c
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0088, 0x0188
+	_0807EDD4 0x00a8, 0x0188
+	_0807EDD4 0x00a8, 0x0178
+	Wait 0x000f
+	_0807E5F8 0x0000001c
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00b4
+	CallWithArg sub_0804BF38, 0x00000001
+	Wait 0x00b4
+	CallWithArg sub_0804BF38, 0x00000004
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Wait 0x003c
+	_0807E5F8 0x0000001c
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xffe0
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc
index 2e646766..37dfcb17 100644
--- a/data/scripts/script_0800C0B0.inc
+++ b/data/scripts/script_0800C0B0.inc
@@ -1,47 +1,49 @@
 SCRIPT_START script_0800C0B0
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0002
-Wait 0x003c
-TextboxNoOverlap 0x0e13
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-Jump 0x0038
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e15
-_0807EA94 
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0002
+	Wait 0x003c
+	TextboxNoOverlap 0x0e13
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	Jump script_0800C11C
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0006
+	Wait 0x003c
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	_0807E5F8 0x00000001
+script_0800C11C:
+	_0807EB44 0x0004
+script_0800C120:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800C120
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807E930 0x0000
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e15
+	_0807EA94 
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00f0
 SCRIPT_END
diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc
index 67ec144b..58c62453 100644
--- a/data/scripts/script_0800C160.inc
+++ b/data/scripts/script_0800C160.inc
@@ -1,27 +1,27 @@
 SCRIPT_START script_0800C160
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x00000128
-Wait 0x001e
-TextboxNoOverlap 0x0e14
-_0807EA94 
-_0807E5F8 0x0000003c
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0098, 0x00e8
-_0807EDD4 0x00a8, 0x00e8
-_0807EDD4 0x00a8, 0x00d8
-Wait 0x000f
-_0807E5F8 0x0000003c
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00f0
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0007
+	CallWithArg sub_0807F4F8, 0x00000128
+	Wait 0x001e
+	TextboxNoOverlap 0x0e14
+	_0807EA94 
+	_0807E5F8 0x0000003c
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0098, 0x00e8
+	_0807EDD4 0x00a8, 0x00e8
+	_0807EDD4 0x00a8, 0x00d8
+	Wait 0x000f
+	_0807E5F8 0x0000003c
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00f0
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc
index 196042c1..9cbeb6f1 100644
--- a/data/scripts/script_0800C1D8.inc
+++ b/data/scripts/script_0800C1D8.inc
@@ -1,53 +1,55 @@
 SCRIPT_START script_0800C1D8
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0002
-Wait 0x003c
-TextboxNoOverlap 0x0e16
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-Jump 0x0038
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0807F348
-StopScript 
-WaitFor_2 
-Wait 0x00f0
-_0807E930 0x0000
-_0807EB44 0x0006
-Wait 0x003c
-_0807EA94 
-_0807E930 0x0008
-Wait 0x003c
-_0807E5F8 0x00000001
-_0807EB44 0x0004
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807E930 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x0e18
-_0807EA94 
-_0807E5F8 0x00000002
-Call sub_08054F64
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x0168
-_0807EB44 0x0004
-_0807E930 0x0000
-Wait 0x003c
-Call sub_08054F64
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xffe0
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0002
+	Wait 0x003c
+	TextboxNoOverlap 0x0e16
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	Jump script_0800C244
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0807F348
+	StopScript 
+	WaitFor_2 
+	Wait 0x00f0
+	_0807E930 0x0000
+	_0807EB44 0x0006
+	Wait 0x003c
+	_0807EA94 
+	_0807E930 0x0008
+	Wait 0x003c
+	_0807E5F8 0x00000001
+script_0800C244:
+	_0807EB44 0x0004
+script_0800C248:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800C248
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807E930 0x0000
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x0e18
+	_0807EA94 
+	_0807E5F8 0x00000002
+	Call sub_08054F64
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x0168
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Wait 0x003c
+	Call sub_08054F64
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc
index 04f24c22..4a873345 100644
--- a/data/scripts/script_0800C2A4.inc
+++ b/data/scripts/script_0800C2A4.inc
@@ -1,36 +1,36 @@
 SCRIPT_START script_0800C2A4
-StartScript 
-_0807EB44 0x0000
-_0807E930 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-Call sub_0807F348
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0007
-CallWithArg sub_0807F4F8, 0x00000128
-Wait 0x001e
-TextboxNoOverlap 0x0e17
-_0807EA94 
-_0807E5F8 0x0000007c
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0098, 0x00e8
-_0807EDD4 0x00c8, 0x00e8
-_0807EDD4 0x00c8, 0x00d8
-Wait 0x000f
-_0807E5F8 0x0000007c
-_0807EF80 0x000f
-_0807E930 0x0008
-Wait 0x00b4
-CallWithArg sub_0804BF38, 0x00000002
-Wait 0x00b4
-CallWithArg sub_0804BF38, 0x00000005
-_0807EB44 0x0004
-_0807E930 0x0000
-Wait 0x003c
-_0807E5F8 0x0000007c
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xffe0
-Call sub_08054968
+	StartScript 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0807F348
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0007
+	CallWithArg sub_0807F4F8, 0x00000128
+	Wait 0x001e
+	TextboxNoOverlap 0x0e17
+	_0807EA94 
+	_0807E5F8 0x0000007c
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0098, 0x00e8
+	_0807EDD4 0x00c8, 0x00e8
+	_0807EDD4 0x00c8, 0x00d8
+	Wait 0x000f
+	_0807E5F8 0x0000007c
+	_0807EF80 0x000f
+	_0807E930 0x0008
+	Wait 0x00b4
+	CallWithArg sub_0804BF38, 0x00000002
+	Wait 0x00b4
+	CallWithArg sub_0804BF38, 0x00000005
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Wait 0x003c
+	_0807E5F8 0x0000007c
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xffe0
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc
index 5f92a5d0..7d8ef911 100644
--- a/data/scripts/script_0800C350.inc
+++ b/data/scripts/script_0800C350.inc
@@ -1,8 +1,9 @@
 SCRIPT_START script_0800C350
-StartScript 
-CallWithArg sub_0806D658, 0x00000003
-SetEntityNonPlanarMovement 0x0200
-StopScript 
-CheckRoomFlag 0x00ff
-JumpIfNot 0xfffa
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	CallWithArg sub_0806D658, 0x00000003
+	SetEntityNonPlanarMovement 0x0200
+	StopScript 
+script_0800C362:
+	CheckRoomFlag 0x00ff
+	JumpIfNot script_0800C362
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc
index 07a55018..a19ec82a 100644
--- a/data/scripts/script_0800C370.inc
+++ b/data/scripts/script_0800C370.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_0800C370
-_0807EEF4 0xfff8, 0x0000
-_0807EEF4 0x0010, 0x0000
-_0807EEF4 0xfff0, 0x0000
-_0807EEF4 0x0010, 0x0000
-_0807EEF4 0xfff8, 0x0000
-_0807F0C8 0x0000, 0x0000
-Wait 0x001e
-TextboxNoOverlap 0x1d00
-_0807EA94 
-_0807E5F8 0x00000006
-WaitForSomething2 0x00000001
-_0807F0C8 0xffff, 0x0000
+	_0807EEF4 0xfff8, 0x0000
+	_0807EEF4 0x0010, 0x0000
+	_0807EEF4 0xfff0, 0x0000
+	_0807EEF4 0x0010, 0x0000
+	_0807EEF4 0xfff8, 0x0000
+	_0807F0C8 0x0000, 0x0000
+	Wait 0x001e
+	TextboxNoOverlap 0x1d00
+	_0807EA94 
+	_0807E5F8 0x00000006
+	WaitForSomething2 0x00000001
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0800C3B0.inc b/data/scripts/script_0800C3B0.inc
index dd68e9b7..95da6f56 100644
--- a/data/scripts/script_0800C3B0.inc
+++ b/data/scripts/script_0800C3B0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C3B0
-SetEntityNonPlanarMovement 0x0080
-_0807EEF4 0x0000, 0xff30
-_0807F0C8 0x0000, 0x0000
-Wait 0x00b4
-Call sub_08054968
+	SetEntityNonPlanarMovement 0x0080
+	_0807EEF4 0x0000, 0xff30
+	_0807F0C8 0x0000, 0x0000
+	Wait 0x00b4
+	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc
index 407a8d54..7d60617c 100644
--- a/data/scripts/script_0800C3CC.inc
+++ b/data/scripts/script_0800C3CC.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800C3CC
-StartScript 
-Call sub_0806D660
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-WaitForSomething2 0x00000002
-CallWithArg sub_0807F4F8, 0x00000048
-Call sub_0806D66C
-Wait 0x000f
-CallWithArg sub_0807F4F8, 0x00000068
-Call sub_0806D67C
-_0807F0C8 0x001e, 0x0000
-SoundReq 0x010b
+	StartScript 
+	Call sub_0806D660
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	WaitForSomething2 0x00000002
+	CallWithArg sub_0807F4F8, 0x00000048
+	Call sub_0806D66C
+	Wait 0x000f
+	CallWithArg sub_0807F4F8, 0x00000068
+	Call sub_0806D67C
+	_0807F0C8 0x001e, 0x0000
+	SoundReq 0x010b
 SCRIPT_END
diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc
index 040b41fc..5db4ce83 100644
--- a/data/scripts/script_0800C410.inc
+++ b/data/scripts/script_0800C410.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_0800C410
-StartScript 
-Call sub_0806D660
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-WaitForSomething2 0x00000004
-CallWithArg sub_0807F4F8, 0x00000048
-Call sub_0806D66C
-Wait 0x000f
-CallWithArg sub_0807F4F8, 0x00000068
-Call sub_0806D67C
-_0807F0C8 0x001e, 0x0000
-SoundReq 0x010b
-_0807E5F8 0x00000001
+	StartScript 
+	Call sub_0806D660
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	WaitForSomething2 0x00000004
+	CallWithArg sub_0807F4F8, 0x00000048
+	Call sub_0806D66C
+	Wait 0x000f
+	CallWithArg sub_0807F4F8, 0x00000068
+	Call sub_0806D67C
+	_0807F0C8 0x001e, 0x0000
+	SoundReq 0x010b
+	_0807E5F8 0x00000001
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc
index 6fa6a6f0..f13cd822 100644
--- a/data/scripts/script_0800C45C.inc
+++ b/data/scripts/script_0800C45C.inc
@@ -1,17 +1,18 @@
 SCRIPT_START script_0800C45C
-StartScript 
-SetEntityNonPlanarMovement 0x0180
-_0807E930 0x0004
-Call sub_080A0B28
-StopScript 
-Wait 0x000a
-_0807EF80 0x0007
-SoundReq 0x0136
-_0807EE30 
-JumpIfNot 0xfffc
-Wait 0x003c
-SetRoomFlag 0x00ff
-_0807E930 0x0005
-Wait 0x000f
+	StartScript 
+	SetEntityNonPlanarMovement 0x0180
+	_0807E930 0x0004
+	Call sub_080A0B28
+	StopScript 
+	Wait 0x000a
+	_0807EF80 0x0007
+	SoundReq 0x0136
+script_0800C47A:
+	_0807EE30 
+	JumpIfNot script_0800C47A
+	Wait 0x003c
+	SetRoomFlag 0x00ff
+	_0807E930 0x0005
+	Wait 0x000f
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc
index df3b473b..0c3f544c 100644
--- a/data/scripts/script_0800C494.inc
+++ b/data/scripts/script_0800C494.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_0800C494
-StartScript 
-SetEntityNonPlanarMovement 0x0120
-_0807E930 0x0004
-StopScript 
-Wait 0x000a
-_0807EF80 0x0007
-SoundReq 0x0136
-_0807EEF4 0x0000, 0xff90
-Wait 0x001e
-_0807EEF4 0x0000, 0xffb0
-Wait 0x003c
-SetRoomFlag 0x00ff
-_0807E930 0x0005
-Wait 0x000f
+	StartScript 
+	SetEntityNonPlanarMovement 0x0120
+	_0807E930 0x0004
+	StopScript 
+	Wait 0x000a
+	_0807EF80 0x0007
+	SoundReq 0x0136
+	_0807EEF4 0x0000, 0xff90
+	Wait 0x001e
+	_0807EEF4 0x0000, 0xffb0
+	Wait 0x003c
+	SetRoomFlag 0x00ff
+	_0807E930 0x0005
+	Wait 0x000f
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc
index 468dc634..fc78cae8 100644
--- a/data/scripts/script_0800C4D0.inc
+++ b/data/scripts/script_0800C4D0.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_0800C4D0
-StartScript 
-SetEntityNonPlanarMovement 0x0180
-_0807E930 0x0004
-StopScript 
-Wait 0x000a
-_0807EF80 0x0007
-SoundReq 0x0136
-_0807EEF4 0x00c0, 0x0000
-Wait 0x001e
-_0807EEF4 0x0070, 0x0000
-Wait 0x003c
-SetRoomFlag 0x00ff
-_0807E930 0x0005
-Wait 0x000f
+	StartScript 
+	SetEntityNonPlanarMovement 0x0180
+	_0807E930 0x0004
+	StopScript 
+	Wait 0x000a
+	_0807EF80 0x0007
+	SoundReq 0x0136
+	_0807EEF4 0x00c0, 0x0000
+	Wait 0x001e
+	_0807EEF4 0x0070, 0x0000
+	Wait 0x003c
+	SetRoomFlag 0x00ff
+	_0807E930 0x0005
+	Wait 0x000f
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc
index 583dc207..cb7731f8 100644
--- a/data/scripts/script_0800C50C.inc
+++ b/data/scripts/script_0800C50C.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_0800C50C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807E930 0x0004
-_0807EF80 0x0008
-StopScript 
-WaitForSomething2 0x00000001
-Wait 0x000a
-_0807EF80 0x0007
-SoundReq 0x0136
-_0807EEF4 0x0000, 0x0060
-Wait 0x003c
-_0807EEF4 0x0000, 0x0060
-Wait 0x001e
-SetRoomFlag 0x00ff
-_0807E930 0x0005
-Wait 0x000f
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807E930 0x0004
+	_0807EF80 0x0008
+	StopScript 
+	WaitForSomething2 0x00000001
+	Wait 0x000a
+	_0807EF80 0x0007
+	SoundReq 0x0136
+	_0807EEF4 0x0000, 0x0060
+	Wait 0x003c
+	_0807EEF4 0x0000, 0x0060
+	Wait 0x001e
+	SetRoomFlag 0x00ff
+	_0807E930 0x0005
+	Wait 0x000f
 SCRIPT_END
diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc
index 3bef42e8..f4d2ca1c 100644
--- a/data/scripts/script_0800C550.inc
+++ b/data/scripts/script_0800C550.inc
@@ -1,243 +1,269 @@
 SCRIPT_START script_0800C550
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_08060208
-_0807EA94 
-_0807E878 
-Jump 0xffdc
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-CheckInventory1 0x0067
-JumpIfNot 0x000c
-Call sub_08060208
-Jump 0x0006
-TextboxNoOverlap 0x4710
-_0807EA94 
-_0807E878 
-Jump 0xffcc
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_08060270
-_0807EA94 
-_0807E878 
-Jump 0xffdc
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_0806021C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd8
-StartScript 
-_0807EF80 0x000a
-SetEntityNonPlanarMovement 0x0080
-_0807EB44 0x0004
-CheckLocalFlag 0x0082
-JumpIfNot 0x0008
-SetEntityPosition 0x0010, 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x0082
-JumpIf 0x0022
-CheckPlayerInRegion 0x00e8, 0x0028, 0x1810
-JumpIfNot 0x0006
-_0807EF80 0x000b
-StartPlayerScript script_0800C8C8
-WaitForSomething2 0x00000001
-_0807EF80 0x000a
-CheckInventory1 0x0040
-JumpIf 0x00a6
-CheckInventory1 0x005b
-JumpIf 0x0024
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f16
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-SetLocalFlag 0x0080
-Call sub_0807DF50
-_0807E878 
-Jump 0xff9e
-CheckLocalFlag 0x0081
-JumpIf 0x0020
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f1b
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xff78
-CheckLocalFlag 0x0082
-JumpIf 0x0030
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f17
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807EC94 0x0020
-_0807EB44 0x0004
-Wait 0x000f
-SoundReq 0x0072
-SetLocalFlag 0x0082
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f18
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xff24
-CheckLocalFlag 0x0083
-JumpIf 0x0020
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f19
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xfefe
-_0807EF80 0x0002
-TextboxNoOverlapFollow 0x1f1a
-_0807EA94 
-_0807EF80 0x0015
-Wait 0x000a
-Call sub_0807DF50
-_0807E878 
-Jump 0xfee0
-StartScript 
-_0807EF80 0x000a
-_0807EB44 0x0004
-StopScript 
-_0807E944 
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_0800C8F0
-WaitForSomething2 0x00000001
-CheckInventory1 0x0040
-JumpIf 0x0088
-CheckInventory1 0x005b
-JumpIf 0x001c
-_0807E930 0x0008
-TextboxNoOverlapFollow 0x2122
-_0807EA94 
-_0807EF80 0x0000
-Call sub_0807DF50
-_0807E878 
-Jump 0xffc2
-_0807E930 0x0008
-CheckLocalFlag 0x0081
-JumpIf 0x0040
-TextboxNoOverlapFollow 0x1130
-_0807EA94 
-_0807EB28 0x1131
-_0807EA94 
-_0807EB8C 
-TextboxNoOverlapFollow 0x1132
-_0807EA94 
-_0807E914 0x00000103
-Call sub_0807F420
-TextboxNoOverlapFollow 0x1133
-_0807EA94 
-Wait 0x000a
-_0807EF80 0x0000
-SetLocalFlag 0x0081
-Call sub_0807DF50
-_0807E878 
-Jump 0xff78
-TextboxNoOverlapFollow 0x1133
-_0807EA94 
-Wait 0x000a
-_0807E930 0x0000
-Call sub_0807DF50
-_0807E878 
-Jump 0xff5e
-_0807E930 0x0008
-CheckLocalFlag 0x0083
-JumpIf 0x0080
-TextboxNoOverlapFollow 0x1135
-_0807EA94 
-SetEntityNonPlanarMovement 0x0040
-_0807EDD4 0x0038, 0x0044
-_0807EF80 0x0000
-Wait 0x000f
-SetLocalFlag 0x0083
-Wait 0x003c
-SoundReq 0x0072
-Wait 0x003c
-_0807EB74 
-_0807EB8C 
-TextboxNoOverlapFollow 0x1136
-_0807EA94 
-_0807EB28 0x1137
-_0807EA94 
-Wait 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0807DF50
-_0807E878 
-_0807E944 
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-_0807E914 0x00000008
-Call sub_0807F3D8
-TextboxNoOverlapFollow 0x1136
-_0807EA94 
-Wait 0x000a
-_0807EF80 0x0000
-Call sub_0807DF50
-_0807E878 
-Jump 0xffd0
-TextboxNoOverlapFollow 0x1136
-_0807EA94 
-Wait 0x000a
-_0807EF80 0x0000
-Call sub_0807DF50
-_0807E878 
-Jump 0xfeba
+	StartScript 
+	Call sub_08060090
+	_0807EF80 0x000a
+	StopScript 
+script_0800C55E:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800C572
+	Call sub_08060158
+	StopScript 
+	Jump script_0800C55E
+script_0800C572:
+	StopScript 
+	_0807E864 
+	Call sub_08060208
+	_0807EA94 
+	_0807E878 
+	Jump script_0800C55E
+	StartScript 
+	Call sub_08060090
+	_0807EF80 0x000a
+	StopScript 
+script_0800C592:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800C5A6
+	Call sub_08060158
+	StopScript 
+	Jump script_0800C592
+script_0800C5A6:
+	StopScript 
+	_0807E864 
+	CheckInventory1 0x0067
+	JumpIfNot script_0800C5BC
+	Call sub_08060208
+	Jump script_0800C5C0
+script_0800C5BC:
+	TextboxNoOverlap 0x4710
+script_0800C5C0:
+	_0807EA94 
+	_0807E878 
+	Jump script_0800C592
+	StartScript 
+	Call sub_08060090
+	_0807EF80 0x000a
+	StopScript 
+script_0800C5D6:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800C5EA
+	Call sub_08060158
+	StopScript 
+	Jump script_0800C5D6
+script_0800C5EA:
+	StopScript 
+	_0807E864 
+	Call sub_08060270
+	_0807EA94 
+	_0807E878 
+	Jump script_0800C5D6
+	StartScript 
+script_0800C5FE:
+	Call sub_08060090
+	_0807EF80 0x000a
+	StopScript 
+script_0800C60A:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800C61E
+	Call sub_08060158
+	StopScript 
+	Jump script_0800C60A
+script_0800C61E:
+	StopScript 
+	_0807E864 
+	Call sub_0806021C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800C60A
+	StartScript 
+	_0807EF80 0x000a
+	SetEntityNonPlanarMovement 0x0080
+	_0807EB44 0x0004
+	CheckLocalFlag 0x0082
+	JumpIfNot script_0800C650
+	SetEntityPosition 0x0010, 0x0000
+script_0800C650:
+	StopScript 
+script_0800C652:
+	_0807E944 
+	_0807E864 
+	Call sub_0807DF28
+	CheckLocalFlag 0x0082
+	JumpIf script_0800C684
+	CheckPlayerInRegion 0x00e8, 0x0028, 0x1810
+	JumpIfNot script_0800C674
+	_0807EF80 0x000b
+script_0800C674:
+	StartPlayerScript script_0800C8C8
+	WaitForSomething2 0x00000001
+	_0807EF80 0x000a
+script_0800C684:
+	CheckInventory1 0x0040
+	JumpIf script_0800C730
+	CheckInventory1 0x005b
+	JumpIf script_0800C6B6
+	_0807EF80 0x0002
+	TextboxNoOverlapFollow 0x1f16
+	_0807EA94 
+	_0807EF80 0x0015
+	Wait 0x000a
+	SetLocalFlag 0x0080
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C652
+script_0800C6B6:
+	CheckLocalFlag 0x0081
+	JumpIf script_0800C6DC
+	_0807EF80 0x0002
+	TextboxNoOverlapFollow 0x1f1b
+	_0807EA94 
+	_0807EF80 0x0015
+	Wait 0x000a
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C652
+script_0800C6DC:
+	CheckLocalFlag 0x0082
+	JumpIf script_0800C712
+	_0807EF80 0x0002
+	TextboxNoOverlapFollow 0x1f17
+	_0807EA94 
+	_0807EF80 0x0015
+	Wait 0x000a
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	_0807EC94 0x0020
+	_0807EB44 0x0004
+	Wait 0x000f
+	SoundReq 0x0072
+	SetLocalFlag 0x0082
+script_0800C712:
+	_0807EF80 0x0002
+	TextboxNoOverlapFollow 0x1f18
+	_0807EA94 
+	_0807EF80 0x0015
+	Wait 0x000a
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C652
+script_0800C730:
+	CheckLocalFlag 0x0083
+	JumpIf script_0800C756
+	_0807EF80 0x0002
+	TextboxNoOverlapFollow 0x1f19
+	_0807EA94 
+	_0807EF80 0x0015
+	Wait 0x000a
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C652
+script_0800C756:
+	_0807EF80 0x0002
+	TextboxNoOverlapFollow 0x1f1a
+	_0807EA94 
+	_0807EF80 0x0015
+	Wait 0x000a
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C652
+	StartScript 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	StopScript 
+script_0800C780:
+	_0807E944 
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_0800C8F0
+	WaitForSomething2 0x00000001
+	CheckInventory1 0x0040
+	JumpIf script_0800C824
+	CheckInventory1 0x005b
+	JumpIf script_0800C7C0
+	_0807E930 0x0008
+	TextboxNoOverlapFollow 0x2122
+	_0807EA94 
+	_0807EF80 0x0000
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C780
+script_0800C7C0:
+	_0807E930 0x0008
+	CheckLocalFlag 0x0081
+	JumpIf script_0800C80A
+	TextboxNoOverlapFollow 0x1130
+	_0807EA94 
+	_0807EB28 0x1131
+	_0807EA94 
+	_0807EB8C 
+	TextboxNoOverlapFollow 0x1132
+	_0807EA94 
+	_0807E914 0x00000103
+	Call sub_0807F420
+	TextboxNoOverlapFollow 0x1133
+	_0807EA94 
+	Wait 0x000a
+	_0807EF80 0x0000
+	SetLocalFlag 0x0081
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C780
+script_0800C80A:
+	TextboxNoOverlapFollow 0x1133
+	_0807EA94 
+	Wait 0x000a
+	_0807E930 0x0000
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C780
+script_0800C824:
+	_0807E930 0x0008
+	CheckLocalFlag 0x0083
+	JumpIf script_0800C8AE
+	TextboxNoOverlapFollow 0x1135
+	_0807EA94 
+	SetEntityNonPlanarMovement 0x0040
+	_0807EDD4 0x0038, 0x0044
+	_0807EF80 0x0000
+	Wait 0x000f
+	SetLocalFlag 0x0083
+	Wait 0x003c
+	SoundReq 0x0072
+	Wait 0x003c
+	_0807EB74 
+	_0807EB8C 
+	TextboxNoOverlapFollow 0x1136
+	_0807EA94 
+	_0807EB28 0x1137
+	_0807EA94 
+	Wait 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Call sub_0807DF50
+	_0807E878 
+script_0800C87C:
+	_0807E944 
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB74 
+	_0807E914 0x00000008
+	Call sub_0807F3D8
+	TextboxNoOverlapFollow 0x1136
+	_0807EA94 
+	Wait 0x000a
+	_0807EF80 0x0000
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C87C
+script_0800C8AE:
+	TextboxNoOverlapFollow 0x1136
+	_0807EA94 
+	Wait 0x000a
+	_0807EF80 0x0000
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800C780
diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc
index 013c731a..26a6b405 100644
--- a/data/scripts/script_0800C8C8.inc
+++ b/data/scripts/script_0800C8C8.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800C8C8
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x00e8, 0x0068
-_0807EB44 0x0000
-Wait 0x000f
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x00e8, 0x0068
+	_0807EB44 0x0000
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc
index 6f3b500d..2e809c16 100644
--- a/data/scripts/script_0800C8F0.inc
+++ b/data/scripts/script_0800C8F0.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800C8F0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807ECC4 0x0010
-_0807EDD4 0x0078, 0x0058
-_0807EB44 0x0000
-Wait 0x000f
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807ECC4 0x0010
+	_0807EDD4 0x0078, 0x0058
+	_0807EB44 0x0000
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc
index d7d4ab75..aa5b10a9 100644
--- a/data/scripts/script_0800C91C.inc
+++ b/data/scripts/script_0800C91C.inc
@@ -1,81 +1,82 @@
 SCRIPT_START script_0800C91C
-StartScript 
-_0807EB44 0x0004
-SetEntityNonPlanarMovement 0x0300
-StopScript 
-CheckPlayerInRegion 0x0208, 0x0360, 0x2040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_0800CA8C
-WaitForSomething2 0x00000002
-Wait 0x003c
-_0807EB28 0x1125
-_0807EA94 
-_0807E5F8 0x00000800
-_0807E8E4_3 
-Wait 0x003c
-_0807E5F8 0x00000200
-_0807E8E4_0 
-Wait 0x001e
-_0807E5F8 0x00002000
-_0807E8E4_1 
-Wait 0x0014
-_0807E5F8 0x00020000
-_0807E8E4_1 
-Wait 0x000a
-_0807E5F8 0x00008000
-_0807E8E4_3 
-Wait 0x001e
-WaitForSomething2 0x00000400
-WaitForSomething2 0x00001000
-WaitForSomething2 0x00004000
-WaitForSomething2 0x00010000
-WaitForSomething2 0x00040000
-_0807E8E4_0 
-Wait 0x003c
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000400
-_0807E8E4_0 
-TextboxNoOverlapFollow 0x1126
-Call sub_0807F40C
-_0807EA94 
-_0807E5F8 0x00000200
-_0807E5F8 0x00000800
-_0807E5F8 0x00002000
-_0807E5F8 0x00008000
-_0807E5F8 0x00020000
-WaitForSomething2 0x00000400
-WaitForSomething2 0x00001000
-WaitForSomething2 0x00004000
-WaitForSomething2 0x00010000
-WaitForSomething2 0x00040000
-_0807E5F8 0x00008000
-WaitForSomething2 0x00010000
-_0807E8E4_3 
-TextboxNoOverlapFollow 0x1127
-_0807EA94 
-_0807E5F8 0x00002000
-WaitForSomething2 0x00004000
-_0807E8E4_1 
-TextboxNoOverlapFollow 0x1128
-_0807EA94 
-_0807E5F8 0x00000200
-_0807E5F8 0x00000800
-_0807E5F8 0x00002000
-_0807E5F8 0x00008000
-_0807E5F8 0x00020000
-WaitForSomething2 0x00000400
-WaitForSomething2 0x00001000
-WaitForSomething2 0x00004000
-WaitForSomething2 0x00010000
-WaitForSomething2 0x00040000
-_0807E8E4_0 
-_0807EB28 0x1129
-_0807EA94 
-SetLocalFlag 0x008d
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	SetEntityNonPlanarMovement 0x0300
+	StopScript 
+script_0800C928:
+	CheckPlayerInRegion 0x0208, 0x0360, 0x2040
+	JumpIfNot script_0800C928
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_0800CA8C
+	WaitForSomething2 0x00000002
+	Wait 0x003c
+	_0807EB28 0x1125
+	_0807EA94 
+	_0807E5F8 0x00000800
+	_0807E8E4_3 
+	Wait 0x003c
+	_0807E5F8 0x00000200
+	_0807E8E4_0 
+	Wait 0x001e
+	_0807E5F8 0x00002000
+	_0807E8E4_1 
+	Wait 0x0014
+	_0807E5F8 0x00020000
+	_0807E8E4_1 
+	Wait 0x000a
+	_0807E5F8 0x00008000
+	_0807E8E4_3 
+	Wait 0x001e
+	WaitForSomething2 0x00000400
+	WaitForSomething2 0x00001000
+	WaitForSomething2 0x00004000
+	WaitForSomething2 0x00010000
+	WaitForSomething2 0x00040000
+	_0807E8E4_0 
+	Wait 0x003c
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000400
+	_0807E8E4_0 
+	TextboxNoOverlapFollow 0x1126
+	Call sub_0807F40C
+	_0807EA94 
+	_0807E5F8 0x00000200
+	_0807E5F8 0x00000800
+	_0807E5F8 0x00002000
+	_0807E5F8 0x00008000
+	_0807E5F8 0x00020000
+	WaitForSomething2 0x00000400
+	WaitForSomething2 0x00001000
+	WaitForSomething2 0x00004000
+	WaitForSomething2 0x00010000
+	WaitForSomething2 0x00040000
+	_0807E5F8 0x00008000
+	WaitForSomething2 0x00010000
+	_0807E8E4_3 
+	TextboxNoOverlapFollow 0x1127
+	_0807EA94 
+	_0807E5F8 0x00002000
+	WaitForSomething2 0x00004000
+	_0807E8E4_1 
+	TextboxNoOverlapFollow 0x1128
+	_0807EA94 
+	_0807E5F8 0x00000200
+	_0807E5F8 0x00000800
+	_0807E5F8 0x00002000
+	_0807E5F8 0x00008000
+	_0807E5F8 0x00020000
+	WaitForSomething2 0x00000400
+	WaitForSomething2 0x00001000
+	WaitForSomething2 0x00004000
+	WaitForSomething2 0x00010000
+	WaitForSomething2 0x00040000
+	_0807E8E4_0 
+	_0807EB28 0x1129
+	_0807EA94 
+	SetLocalFlag 0x008d
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc
index d0fce5fb..c769676b 100644
--- a/data/scripts/script_0800CA8C.inc
+++ b/data/scripts/script_0800CA8C.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_0800CA8C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0208, 0x0358
-SetEntityNonPlanarMovement 0x0080
-_0807EDD4 0x0208, 0x0340
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x0208, 0x0358
+	SetEntityNonPlanarMovement 0x0080
+	_0807EDD4 0x0208, 0x0340
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc
index a837e4ff..55c914fd 100644
--- a/data/scripts/script_0800CABC.inc
+++ b/data/scripts/script_0800CABC.inc
@@ -1,34 +1,34 @@
 SCRIPT_START script_0800CABC
-StartScript 
-_0807EF80 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x000f
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00000200
-_0807EF80 0x0007
-_0807EDD4 0x0208, 0x0308
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000400
-WaitForSomething2 0x00000200
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-_0807E5F8 0x00000400
-WaitForSomething2 0x00000200
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x000f
-_0807EDD4 0x0208, 0x0328
-_0807EF80 0x0000
-_0807E5F8 0x00000400
-WaitForSomething2 0x00000200
-SetEntityNonPlanarMovement 0x0300
-_0807EF80 0x000f
-_0807EDD4 0x0208, 0x02b0
-_0807E5F8 0x00000400
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x000f
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00000200
+	_0807EF80 0x0007
+	_0807EDD4 0x0208, 0x0308
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000400
+	WaitForSomething2 0x00000200
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	_0807E5F8 0x00000400
+	WaitForSomething2 0x00000200
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x000f
+	_0807EDD4 0x0208, 0x0328
+	_0807EF80 0x0000
+	_0807E5F8 0x00000400
+	WaitForSomething2 0x00000200
+	SetEntityNonPlanarMovement 0x0300
+	_0807EF80 0x000f
+	_0807EDD4 0x0208, 0x02b0
+	_0807E5F8 0x00000400
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc
index 6085dce3..c27c42af 100644
--- a/data/scripts/script_0800CB54.inc
+++ b/data/scripts/script_0800CB54.inc
@@ -1,30 +1,30 @@
 SCRIPT_START script_0800CB54
-StartScript 
-_0807EF80 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x000f
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00000800
-_0807EF80 0x0007
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807EDD4 0x01a8, 0x0330
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x000f
-_0807EDD4 0x01f8, 0x0348
-_0807EF80 0x0000
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-SetEntityNonPlanarMovement 0x0300
-_0807EF80 0x000f
-_0807EDD4 0x0178, 0x0328
-_0807E5F8 0x00001000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x000f
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00000800
+	_0807EF80 0x0007
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	_0807EDD4 0x01a8, 0x0330
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x000f
+	_0807EDD4 0x01f8, 0x0348
+	_0807EF80 0x0000
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	SetEntityNonPlanarMovement 0x0300
+	_0807EF80 0x000f
+	_0807EDD4 0x0178, 0x0328
+	_0807E5F8 0x00001000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc
index 0c81901b..474c6c95 100644
--- a/data/scripts/script_0800CBD4.inc
+++ b/data/scripts/script_0800CBD4.inc
@@ -1,34 +1,34 @@
 SCRIPT_START script_0800CBD4
-StartScript 
-_0807EF80 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x000f
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00002000
-_0807EF80 0x0007
-_0807EDD4 0x0258, 0x0330
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00004000
-WaitForSomething2 0x00002000
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x000f
-_0807EDD4 0x0218, 0x0340
-_0807EF80 0x0000
-_0807E5F8 0x00004000
-WaitForSomething2 0x00002000
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-_0807E5F8 0x00004000
-WaitForSomething2 0x00002000
-SetEntityNonPlanarMovement 0x0300
-_0807EF80 0x000f
-_0807EDD4 0x0288, 0x02d8
-_0807E5F8 0x00004000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x000f
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00002000
+	_0807EF80 0x0007
+	_0807EDD4 0x0258, 0x0330
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00004000
+	WaitForSomething2 0x00002000
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x000f
+	_0807EDD4 0x0218, 0x0340
+	_0807EF80 0x0000
+	_0807E5F8 0x00004000
+	WaitForSomething2 0x00002000
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	_0807E5F8 0x00004000
+	WaitForSomething2 0x00002000
+	SetEntityNonPlanarMovement 0x0300
+	_0807EF80 0x000f
+	_0807EDD4 0x0288, 0x02d8
+	_0807E5F8 0x00004000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc
index 86c9feb5..319b7d51 100644
--- a/data/scripts/script_0800CC6C.inc
+++ b/data/scripts/script_0800CC6C.inc
@@ -1,34 +1,34 @@
 SCRIPT_START script_0800CC6C
-StartScript 
-_0807EF80 0x0008
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x000f
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00008000
-_0807EF80 0x0007
-_0807EDD4 0x01b8, 0x0320
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x000f
-_0807EDD4 0x01f8, 0x0330
-_0807EF80 0x0000
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-SetEntityNonPlanarMovement 0x0300
-_0807EF80 0x000f
-_0807EDD4 0x0188, 0x02d8
-_0807E5F8 0x00010000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	_0807EF80 0x0000
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x000f
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00008000
+	_0807EF80 0x0007
+	_0807EDD4 0x01b8, 0x0320
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x000f
+	_0807EDD4 0x01f8, 0x0330
+	_0807EF80 0x0000
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	SetEntityNonPlanarMovement 0x0300
+	_0807EF80 0x000f
+	_0807EDD4 0x0188, 0x02d8
+	_0807E5F8 0x00010000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc
index 7f1351a9..e5e1a880 100644
--- a/data/scripts/script_0800CD04.inc
+++ b/data/scripts/script_0800CD04.inc
@@ -1,28 +1,28 @@
 SCRIPT_START script_0800CD04
-StartScript 
-_0807EF80 0x0000
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x000f
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00020000
-_0807EF80 0x0007
-_0807EDD4 0x0268, 0x0338
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x000f
-_0807EDD4 0x0218, 0x0350
-_0807EF80 0x0000
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-SetEntityNonPlanarMovement 0x0300
-_0807EF80 0x000f
-_0807EDD4 0x02a8, 0x0328
-_0807E5F8 0x00040000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0000
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x000f
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00020000
+	_0807EF80 0x0007
+	_0807EDD4 0x0268, 0x0338
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x000f
+	_0807EDD4 0x0218, 0x0350
+	_0807EF80 0x0000
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	SetEntityNonPlanarMovement 0x0300
+	_0807EF80 0x000f
+	_0807EDD4 0x02a8, 0x0328
+	_0807E5F8 0x00040000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index 19923a89..9f05e3e9 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -1,266 +1,293 @@
 SCRIPT_START script_0800CD7C
-StartScript 
-CheckInventory1 0x005b
-JumpIfNot 0xf87a
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000c
-Call sub_08060158
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x009d
-JumpIf 0x000e
-SetLocalFlag 0x009d
-TextboxNoOverlap 0x213d
-Jump 0x017e
-CheckGlobalFlag 0x003b
-JumpIf 0x007c
-CheckGlobalFlag 0x0054
-JumpIfNot 0x001a
-CheckRoomFlag 0x0000
-JumpIfNot 0x0150
-SetGlobalFlag 0x003b
-ClearGlobalFlag 0x0054
-TextboxNoOverlap 0x2141
-Jump 0x0156
-TextboxNoOverlap 0x213e
-_0807EA94 
-_0807E48C 0x0023
-JumpIfNot 0x001c
-TextboxNoOverlap 0x214b
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x013c
-SoundReq 0x00cd
-_0807F088 0x0023
-WaitPlayerAction8 
-Jump 0x0020
-_0807E48C 0x0022
-JumpIfNot 0x0126
-TextboxNoOverlap 0x214b
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x011a
-SoundReq 0x00cd
-_0807F088 0x0022
-WaitPlayerAction8 
-_0807EB8C 
-SetGlobalFlag 0x0054
-Call sub_08060340
-TextboxNoOverlap 0x213f
-Jump 0x00be
-CheckGlobalFlag 0x003c
-JumpIf 0x005a
-CheckGlobalFlag 0x0054
-JumpIfNot 0x001a
-CheckRoomFlag 0x0000
-JumpIfNot 0x00ce
-SetGlobalFlag 0x003c
-ClearGlobalFlag 0x0054
-TextboxNoOverlap 0x2145
-Jump 0x00d4
-TextboxNoOverlap 0x2142
-_0807EA94 
-_0807E48C 0x0027
-JumpIfNot 0x00c6
-TextboxNoOverlap 0x214c
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x00ba
-SoundReq 0x00cd
-_0807F088 0x0027
-WaitPlayerAction8 
-_0807EB8C 
-SetGlobalFlag 0x0054
-Call sub_08060340
-TextboxNoOverlap 0x2143
-Jump 0x005e
-CheckGlobalFlag 0x003d
-JumpIf 0x0090
-CheckGlobalFlag 0x0054
-JumpIfNot 0x001a
-CheckRoomFlag 0x0000
-JumpIfNot 0x006e
-SetGlobalFlag 0x003d
-ClearGlobalFlag 0x0054
-TextboxNoOverlap 0x2149
-Jump 0x0074
-TextboxNoOverlap 0x2146
-_0807EA94 
-_0807E48C 0x0024
-JumpIfNot 0x0066
-TextboxNoOverlap 0x214d
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x005a
-SoundReq 0x00cd
-_0807F088 0x0024
-WaitPlayerAction8 
-_0807EB8C 
-SetGlobalFlag 0x0054
-Call sub_08060340
-TextboxNoOverlap 0x2147
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000c
-Call sub_08060158
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlap 0x2140
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xffd2
-TextboxNoOverlap 0x214a
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xfe46
-.short 0x0000
-StartScript 
-Call sub_08068104
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806811C
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd8
-StartScript 
-Call sub_08068104
-_0807EF80 0x000a
-StopScript 
-_0807E944 
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffec
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-CheckInventory1 0x0041
-JumpIf 0x000e
-CheckLocalFlag 0x007e
-JumpIfNot 0x0006
-_0807E930 0x0008
-CheckInventory1 0x0002
-JumpIf 0x0022
-CheckInventory1 0x0041
-JumpIfNot 0x000c
-_0807E5F8 0x00000020
-Jump 0x0010
-CheckLocalFlag 0x007e
-JumpIfNot 0x0008
-_0807E5F8 0x00000010
-StopScript 
-StartScript 
-Call sub_08068910
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-Call sub_0807DF28
-CheckInventory1 0x0002
-JumpIfNot 0x0018
-_0807EB74 
-_0807E914 0x00000000
-Call sub_0806C028
-TextboxNoOverlap 0x1219
-Jump 0x014c
-CheckInventory1 0x0041
-JumpIfNot 0x0060
-StartPlayerScript script_0800D190
-WaitForSomething2 0x00000008
-_0807EB74 
-_0807E914 0x00000000
-Call sub_0806C028
-TextboxNoOverlapFollowPos 0x0002125c
-_0807EA94 
-StartPlayerScript script_0800D1B4
-WaitForSomething2 0x00000008
-_0807EB44 0x0002
-_0807E914 0x00000000
-Call sub_0806C028
-Wait 0x000f
-_0807E5F8 0x00000020
-StartPlayerScript script_0800D1E0
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos 0x0002125d
-Jump 0x00e6
-CheckLocalFlag 0x007e
-JumpIfNot 0x000a
-TextboxNoOverlapFollow 0x123e
-Jump 0x00d6
-StartPlayerScript script_0800D190
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000004
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000004
-_0807EB74 
-_0807E914 0x00000000
-Call sub_0806C028
-TextboxNoOverlapFollowPos 0x0002123d
-_0807EA94 
-StartPlayerScript script_0800D1B4
-WaitForSomething2 0x00000008
-_0807EB44 0x0002
-_0807E914 0x00000000
-Call sub_0806C028
-SoundReq 0x00cd
-Call sub_08068964
-ComparePlayerAction 0x0008
-JumpIf 0xfffa
-SoundReq 0x00f8
-_0807E5F8 0x00000010
-SetLocalFlag 0x007e
-TextboxNoOverlapFollowPos 0x0002123e
-_0807EA94 
-Wait 0x000f
-_0807E930 0x0009
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Wait 0x001e
-TextboxNoOverlapFollowPos 0x0002123f
-_0807EA94 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000004
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000004
-_0807E930 0x0008
-Wait 0x003c
-Call sub_08095164
-_0807EB28 0x1240
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Call sub_0807DF50
-Jump 0xfe6e
-.short 0x0000
+	StartScript 
+	CheckInventory1 0x005b
+	JumpIfNot script_0800C5FE
+	Call sub_08060090
+	_0807EF80 0x000a
+	StopScript 
+script_0800CD92:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800CDA6
+	Call sub_08060158
+	Jump script_0800CD92
+script_0800CDA6:
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	CheckLocalFlag 0x009d
+	JumpIf script_0800CDC4
+	SetLocalFlag 0x009d
+	TextboxNoOverlap 0x213d
+	Jump script_0800CF40
+script_0800CDC4:
+	CheckGlobalFlag 0x003b
+	JumpIf script_0800CE46
+	CheckGlobalFlag 0x0054
+	JumpIfNot script_0800CDEC
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800CF2A
+	SetGlobalFlag 0x003b
+	ClearGlobalFlag 0x0054
+	TextboxNoOverlap 0x2141
+	Jump script_0800CF40
+script_0800CDEC:
+	TextboxNoOverlap 0x213e
+	_0807EA94 
+	_0807E48C 0x0023
+	JumpIfNot script_0800CE14
+	TextboxNoOverlap 0x214b
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0800CF40
+	SoundReq 0x00cd
+	_0807F088 0x0023
+	WaitPlayerAction8 
+	Jump script_0800CE32
+script_0800CE14:
+	_0807E48C 0x0022
+	JumpIfNot script_0800CF40
+	TextboxNoOverlap 0x214b
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0800CF40
+	SoundReq 0x00cd
+	_0807F088 0x0022
+	WaitPlayerAction8 
+script_0800CE32:
+	_0807EB8C 
+	SetGlobalFlag 0x0054
+	Call sub_08060340
+	TextboxNoOverlap 0x213f
+	Jump script_0800CF02
+script_0800CE46:
+	CheckGlobalFlag 0x003c
+	JumpIf script_0800CEA6
+	CheckGlobalFlag 0x0054
+	JumpIfNot script_0800CE6E
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800CF2A
+	SetGlobalFlag 0x003c
+	ClearGlobalFlag 0x0054
+	TextboxNoOverlap 0x2145
+	Jump script_0800CF40
+script_0800CE6E:
+	TextboxNoOverlap 0x2142
+	_0807EA94 
+	_0807E48C 0x0027
+	JumpIfNot script_0800CF40
+	TextboxNoOverlap 0x214c
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0800CF40
+	SoundReq 0x00cd
+	_0807F088 0x0027
+	WaitPlayerAction8 
+	_0807EB8C 
+	SetGlobalFlag 0x0054
+	Call sub_08060340
+	TextboxNoOverlap 0x2143
+	Jump script_0800CF02
+script_0800CEA6:
+	CheckGlobalFlag 0x003d
+	JumpIf script_0800CF3C
+	CheckGlobalFlag 0x0054
+	JumpIfNot script_0800CECE
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800CF2A
+	SetGlobalFlag 0x003d
+	ClearGlobalFlag 0x0054
+	TextboxNoOverlap 0x2149
+	Jump script_0800CF40
+script_0800CECE:
+	TextboxNoOverlap 0x2146
+	_0807EA94 
+	_0807E48C 0x0024
+	JumpIfNot script_0800CF40
+	TextboxNoOverlap 0x214d
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0800CF40
+	SoundReq 0x00cd
+	_0807F088 0x0024
+	WaitPlayerAction8 
+	_0807EB8C 
+	SetGlobalFlag 0x0054
+	Call sub_08060340
+	TextboxNoOverlap 0x2147
+script_0800CF02:
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+script_0800CF0C:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800CF20
+	Call sub_08060158
+	Jump script_0800CF0C
+script_0800CF20:
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+script_0800CF2A:
+	TextboxNoOverlap 0x2140
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800CF0C
+script_0800CF3C:
+	TextboxNoOverlap 0x214a
+script_0800CF40:
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800CD92
+	.short 0x0000
+	StartScript 
+	Call sub_08068104
+	_0807EF80 0x000a
+	StopScript 
+script_0800CF5E:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800CF72
+	Call sub_0806811C
+	StopScript 
+	Jump script_0800CF5E
+script_0800CF72:
+	StopScript 
+	_0807E864 
+	Call sub_08068190
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800CF5E
+	StartScript 
+	Call sub_08068104
+	_0807EF80 0x000a
+	StopScript 
+script_0800CF96:
+	_0807E944 
+	_0807E864 
+	Call sub_08068190
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800CF96
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	StopScript 
+	CheckInventory1 0x0041
+	JumpIf script_0800CFD2
+	CheckLocalFlag 0x007e
+	JumpIfNot script_0800CFD2
+	_0807E930 0x0008
+script_0800CFD2:
+	CheckInventory1 0x0002
+	JumpIf script_0800CFFA
+	CheckInventory1 0x0041
+	JumpIfNot script_0800CFEC
+	_0807E5F8 0x00000020
+	Jump script_0800CFFA
+script_0800CFEC:
+	CheckLocalFlag 0x007e
+	JumpIfNot script_0800CFFA
+	_0807E5F8 0x00000010
+script_0800CFFA:
+	StopScript 
+	StartScript 
+	Call sub_08068910
+	CheckEntityInteractType 
+	JumpIfNot script_0800CFFA
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	CheckInventory1 0x0002
+	JumpIfNot script_0800D032
+	_0807EB74 
+	_0807E914 0x00000000
+	Call sub_0806C028
+	TextboxNoOverlap 0x1219
+	Jump script_0800D17C
+script_0800D032:
+	CheckInventory1 0x0041
+	JumpIfNot script_0800D098
+	StartPlayerScript script_0800D190
+	WaitForSomething2 0x00000008
+	_0807EB74 
+	_0807E914 0x00000000
+	Call sub_0806C028
+	TextboxNoOverlapFollowPos 0x0002125c
+	_0807EA94 
+	StartPlayerScript script_0800D1B4
+	WaitForSomething2 0x00000008
+	_0807EB44 0x0002
+	_0807E914 0x00000000
+	Call sub_0806C028
+	Wait 0x000f
+	_0807E5F8 0x00000020
+	StartPlayerScript script_0800D1E0
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollowPos 0x0002125d
+	Jump script_0800D17C
+script_0800D098:
+	CheckLocalFlag 0x007e
+	JumpIfNot script_0800D0A8
+	TextboxNoOverlapFollow 0x123e
+	Jump script_0800D17C
+script_0800D0A8:
+	StartPlayerScript script_0800D190
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000004
+	_0807EB74 
+	_0807E914 0x00000000
+	Call sub_0806C028
+	TextboxNoOverlapFollowPos 0x0002123d
+	_0807EA94 
+	StartPlayerScript script_0800D1B4
+	WaitForSomething2 0x00000008
+	_0807EB44 0x0002
+	_0807E914 0x00000000
+	Call sub_0806C028
+	SoundReq 0x00cd
+	Call sub_08068964
+script_0800D108:
+	ComparePlayerAction 0x0008
+	JumpIf script_0800D108
+	SoundReq 0x00f8
+	_0807E5F8 0x00000010
+	SetLocalFlag 0x007e
+	TextboxNoOverlapFollowPos 0x0002123e
+	_0807EA94 
+	Wait 0x000f
+	_0807E930 0x0009
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	Wait 0x001e
+	TextboxNoOverlapFollowPos 0x0002123f
+	_0807EA94 
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000004
+	_0807E930 0x0008
+	Wait 0x003c
+	Call sub_08095164
+	_0807EB28 0x1240
+script_0800D17C:
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Call sub_0807DF50
+	Jump script_0800CFFA
+	.short 0x0000
diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc
index 0e499a60..5732aec5 100644
--- a/data/scripts/script_0800D190.inc
+++ b/data/scripts/script_0800D190.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800D190
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0170, 0x0140
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0170, 0x0140
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc
index 04fcc46d..6cdc8b0a 100644
--- a/data/scripts/script_0800D1B4.inc
+++ b/data/scripts/script_0800D1B4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800D1B4
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0170, 0x0120
-_0807EDD4 0x01a8, 0x0120
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0170, 0x0120
+	_0807EDD4 0x01a8, 0x0120
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc
index 94c352f3..2ff93e40 100644
--- a/data/scripts/script_0800D1E0.inc
+++ b/data/scripts/script_0800D1E0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800D1E0
-_0807F078 0x0002, 0x0001
-CallWithArg sub_0807F918, 0x00000002
-SoundReq 0x0109
-CallWithArg sub_0807F238, 0x000001e2
-Call sub_0807F304
-TextboxNoOverlap 0x0502
-_0807EA94 
-_0807E5F8 0x00000008
-Call sub_080791BC
+	_0807F078 0x0002, 0x0001
+	CallWithArg sub_0807F918, 0x00000002
+	SoundReq 0x0109
+	CallWithArg sub_0807F238, 0x000001e2
+	Call sub_0807F304
+	TextboxNoOverlap 0x0502
+	_0807EA94 
+	_0807E5F8 0x00000008
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc
index 573f8fc9..eff7f8f0 100644
--- a/data/scripts/script_0800D218.inc
+++ b/data/scripts/script_0800D218.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800D218
-StartScript 
-CheckInventory1 0x0041
-JumpIf 0x002c
-CheckLocalFlag 0x007e
-JumpIf 0x001a
-_0807EF80 0x0008
-StopScript 
-WaitForSomething2 0x00000010
-_0807EF80 0x0007
-WaitForSomething2 0x00000010
+	StartScript 
+	CheckInventory1 0x0041
+	JumpIf script_0800D24C
+	CheckLocalFlag 0x007e
+	JumpIf script_0800D242
+	_0807EF80 0x0008
+	StopScript 
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0007
+	WaitForSomething2 0x00000010
 SCRIPT_END
diff --git a/data/scripts/script_0800D242.inc b/data/scripts/script_0800D242.inc
index 5cede490..6dd2aa01 100644
--- a/data/scripts/script_0800D242.inc
+++ b/data/scripts/script_0800D242.inc
@@ -1,4 +1,5 @@
 SCRIPT_START script_0800D242
-_0807EF80 0x0007
-_0807E930 0x0003
+script_0800D242:
+	_0807EF80 0x0007
+	_0807E930 0x0003
 SCRIPT_END
diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc
index 7a7abd8e..d9304479 100644
--- a/data/scripts/script_0800D24C.inc
+++ b/data/scripts/script_0800D24C.inc
@@ -1,4 +1,5 @@
 SCRIPT_START script_0800D24C
-_0807EF80 0x0006
+script_0800D24C:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc
index 34b1b5ee..a10af6f6 100644
--- a/data/scripts/script_0800D254.inc
+++ b/data/scripts/script_0800D254.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800D254
-StartScript 
-_0807EF80 0x0008
-StopScript 
-WaitForSomething2 0x00000020
-_0807EF80 0x0007
-WaitForSomething2 0x00000020
-_0807EF80 0x0008
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+	WaitForSomething2 0x00000020
+	_0807EF80 0x0007
+	WaitForSomething2 0x00000020
+	_0807EF80 0x0008
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index 17624e5e..d72f4220 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -1,100 +1,111 @@
 SCRIPT_START script_0800D278
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckInventory1 0x0041
-JumpIf 0x000a
-CheckLocalFlag 0x007e
-JumpIf 0x005a
-StartScript 
-TestBit 0x00000001
-JumpIf 0x002a
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806811C
-StopScript 
-Jump 0xffd4
-StopScript 
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffbe
-StopScript 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000004
-_0807E930 0x000c
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000004
-_0807E930 0x000b
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-StartScript 
-Call sub_08068884
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-StopScript 
-StartScript 
-Call sub_08068910
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-_0807EB74 
-_0807E914 0x00000000
-Call sub_0806C028
-TextboxNoOverlapFollow 0x1219
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd0
-StartScript 
-Call sub_08068104
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806811C
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_08068190
-_0807EA94 
-Wait 0x000f
-CheckLocalFlag 0x007f
-JumpIf 0x005c
-CheckLocalFlag 0x007e
-JumpIfNot 0x0054
-_0807EF80 0x000b
-SetEntityNonPlanarMovement 0x0100
-CheckPlayerInRegion 0x0090, 0x0130, 0x0810
-JumpIfNot 0x000e
-StartPlayerScript script_0800D3EC
-WaitForSomething2 0x00000001
-_0807EB44 0x0002
-_0807E930 0x0005
-_0807EDD4 0x00a0, 0x0130
-_0807EB44 0x0006
-_0807E930 0x0003
-_0807E914 0x00000004
-Call sub_080681D8
-SoundReq 0x00cd
-Wait 0x001e
-_0807EF80 0x000a
-SetLocalFlag 0x007f
-_0807E878 
-Jump 0xff76
-.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_0800D282:
+	CheckInventory1 0x0041
+	JumpIf script_0800D292
+	CheckLocalFlag 0x007e
+	JumpIf script_0800D2EA
+script_0800D292:
+	StartScript 
+	TestBit 0x00000001
+	JumpIf script_0800D2C6
+	CheckEntityInteractType 
+	JumpIf script_0800D2B0
+	Call sub_0806811C
+	StopScript 
+	Jump script_0800D282
+script_0800D2B0:
+	StopScript 
+	_0807E864 
+	Call sub_08068190
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800D282
+script_0800D2C6:
+	StopScript 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000004
+	_0807E930 0x000c
+	WaitForSomething2 0x00000001
+	_0807E5F8 0x00000004
+script_0800D2EA:
+	_0807E930 0x000b
+script_0800D2EE:
+	CheckEntityInteractType 
+	JumpIfNot script_0800D2EE
+	_0807E864 
+	Call sub_08068190
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800D2EE
+	StartScript 
+	Call sub_08068884
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	StopScript 
+script_0800D31E:
+	StopScript 
+	StartScript 
+	Call sub_08068910
+	CheckEntityInteractType 
+	JumpIfNot script_0800D31E
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807E914 0x00000000
+	Call sub_0806C028
+	TextboxNoOverlapFollow 0x1219
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800D31E
+	StartScript 
+	Call sub_08068104
+	_0807EF80 0x000a
+	StopScript 
+script_0800D35E:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800D372
+	Call sub_0806811C
+	StopScript 
+	Jump script_0800D35E
+script_0800D372:
+	StopScript 
+	_0807E864 
+	Call sub_08068190
+	_0807EA94 
+	Wait 0x000f
+	CheckLocalFlag 0x007f
+	JumpIf script_0800D3E4
+	CheckLocalFlag 0x007e
+	JumpIfNot script_0800D3E4
+	_0807EF80 0x000b
+	SetEntityNonPlanarMovement 0x0100
+	CheckPlayerInRegion 0x0090, 0x0130, 0x0810
+	JumpIfNot script_0800D3B2
+	StartPlayerScript script_0800D3EC
+	WaitForSomething2 0x00000001
+script_0800D3B2:
+	_0807EB44 0x0002
+	_0807E930 0x0005
+	_0807EDD4 0x00a0, 0x0130
+	_0807EB44 0x0006
+	_0807E930 0x0003
+	_0807E914 0x00000004
+	Call sub_080681D8
+	SoundReq 0x00cd
+	Wait 0x001e
+	_0807EF80 0x000a
+	SetLocalFlag 0x007f
+script_0800D3E4:
+	_0807E878 
+	Jump script_0800D35E
+	.short 0x0000
diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc
index 43bde4e8..4977889d 100644
--- a/data/scripts/script_0800D3EC.inc
+++ b/data/scripts/script_0800D3EC.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800D3EC
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x000d
-_0807ECC4 0x0020
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807EF80 0x000d
+	_0807ECC4 0x0020
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index db5e8a68..00327d2a 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -1,140 +1,161 @@
 SCRIPT_START script_0800D414
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-Call sub_08068104
-_0807EF80 0x000a
-StopScript 
-_0807EB44 0x0002
-_0807E914 0x00000000
-Call sub_0806AF60
-Wait 0x0014
-_0807EB44 0x0004
-_0807E914 0x00000000
-Call sub_0806AF60
-Wait 0x0014
-_0807EB44 0x0006
-_0807E914 0x00000000
-Call sub_0806AF60
-Wait 0x0014
-_0807EB44 0x0006
-_0807E914 0x00000004
-Call sub_0806AF60
-_0807EDD4 0x00a8, 0x01e8
-_0807EB44 0x0006
-_0807E914 0x00000000
-Call sub_0806AF60
-Wait 0x0014
-_0807EB44 0x0004
-_0807E914 0x00000000
-Call sub_0806AF60
-Wait 0x0014
-_0807EB44 0x0002
-_0807E914 0x00000000
-Call sub_0806AF60
-Wait 0x0014
-_0807EB44 0x0002
-_0807E914 0x00000004
-Call sub_0806AF60
-_0807EDD4 0x0228, 0x01e8
-Jump 0xff5a
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-Call sub_08062A48
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-Call sub_08062698
-Call sub_080626AC
-CallWithArg sub_0807F0EC, 0x00000009
-_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052
-_0807EE04 0x0038, 0x0068
-Jump 0x004e
-_0807EE04 0x0078, 0x0068
-Jump 0x0044
-_0807EE04 0x00b8, 0x0068
-Jump 0x003a
-_0807EE04 0x0038, 0x0090
-Jump 0x0030
-_0807EE04 0x0078, 0x0090
-Jump 0x0026
-_0807EE04 0x00b8, 0x0090
-Jump 0x001c
-_0807EE04 0x0038, 0x00b8
-Jump 0x0012
-_0807EE04 0x0078, 0x00b8
-Jump 0x0008
-_0807EE04 0x00b8, 0x00b8
-StopScript 
-StartScript 
-Call sub_080626C0
-JumpIf 0xff72
-CheckEntityInteractType 
-JumpIf 0x000c
-_0807EE30 
-JumpIfNot 0xffe8
-Jump 0xff62
-StopScript 
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xff4a
-StartScript 
-_0807EF80 0x000a
-Call sub_08062A48
-_0807EF80 0x0000
-StopScript 
-Call sub_08062698
-Call sub_080626AC
-CallWithArg sub_0807F0EC, 0x00000004
-_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x0020
-_0807EE04 0x0038, 0x0098
-Jump 0x001c
-_0807EE04 0x0058, 0x0098
-Jump 0x0012
-_0807EE04 0x0038, 0x00c8
-Jump 0x0008
-_0807EE04 0x0058, 0x00c8
-StopScript 
-StartScript 
-Call sub_080626C0
-JumpIf 0xffae
-_0807EE30 
-JumpIfNot 0xffee
-Jump 0xffa4
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000b
-_0807EF80 0x0008
-Call sub_0806DAAC
-JumpIf 0x008c
-Call sub_0806DAD0
-CallWithArg sub_0806DA04, 0x00000002
-StopScript 
-_0807EA4C 
-_0807E9F0 
-Call sub_0806DAAC
-JumpIf 0x000e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-_0807E864 
-Call sub_0807DF28
-Call sub_0807FBC4
-Call sub_0807FBA0
-SetEntityNonPlanarMovement 0x0700
-_0807F0B4 0x0007
-CameraTargetEntity 
-_0807EDD4 0x01e8, 0x01b8
-Wait 0x003c
-Call sub_0806DAE8
-Wait 0x0078
-Call sub_0806DB44
-JumpIfNot 0x000e
-LoadRoomEntityList gUnk_080DD730
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	Call sub_08068104
+	_0807EF80 0x000a
+	StopScript 
+script_0800D426:
+	_0807EB44 0x0002
+	_0807E914 0x00000000
+	Call sub_0806AF60
+	Wait 0x0014
+	_0807EB44 0x0004
+	_0807E914 0x00000000
+	Call sub_0806AF60
+	Wait 0x0014
+	_0807EB44 0x0006
+	_0807E914 0x00000000
+	Call sub_0806AF60
+	Wait 0x0014
+	_0807EB44 0x0006
+	_0807E914 0x00000004
+	Call sub_0806AF60
+	_0807EDD4 0x00a8, 0x01e8
+	_0807EB44 0x0006
+	_0807E914 0x00000000
+	Call sub_0806AF60
+	Wait 0x0014
+	_0807EB44 0x0004
+	_0807E914 0x00000000
+	Call sub_0806AF60
+	Wait 0x0014
+	_0807EB44 0x0002
+	_0807E914 0x00000000
+	Call sub_0806AF60
+	Wait 0x0014
+	_0807EB44 0x0002
+	_0807E914 0x00000004
+	Call sub_0806AF60
+	_0807EDD4 0x0228, 0x01e8
+	Jump script_0800D426
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_08062A48
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+script_0800D4E4:
+	StopScript 
+	Call sub_08062698
+	Call sub_080626AC
+	CallWithArg sub_0807F0EC, 0x00000009
+	JumpSwitch_9 script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560
+script_0800D510:
+	_0807EE04 0x0038, 0x0068
+	Jump script_0800D566
+script_0800D51A:
+	_0807EE04 0x0078, 0x0068
+	Jump script_0800D566
+script_0800D524:
+	_0807EE04 0x00b8, 0x0068
+	Jump script_0800D566
+script_0800D52E:
+	_0807EE04 0x0038, 0x0090
+	Jump script_0800D566
+script_0800D538:
+	_0807EE04 0x0078, 0x0090
+	Jump script_0800D566
+script_0800D542:
+	_0807EE04 0x00b8, 0x0090
+	Jump script_0800D566
+script_0800D54C:
+	_0807EE04 0x0038, 0x00b8
+	Jump script_0800D566
+script_0800D556:
+	_0807EE04 0x0078, 0x00b8
+	Jump script_0800D566
+script_0800D560:
+	_0807EE04 0x00b8, 0x00b8
+script_0800D566:
+	StopScript 
+	StartScript 
+	Call sub_080626C0
+	JumpIf script_0800D4E4
+	CheckEntityInteractType 
+	JumpIf script_0800D584
+	_0807EE30 
+	JumpIfNot script_0800D566
+	Jump script_0800D4E4
+script_0800D584:
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	Call sub_0806265C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800D4E4
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_08062A48
+	_0807EF80 0x0000
+script_0800D5AC:
+	StopScript 
+	Call sub_08062698
+	Call sub_080626AC
+	CallWithArg sub_0807F0EC, 0x00000004
+	JumpSwitch_4 script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC
+script_0800D5CE:
+	_0807EE04 0x0038, 0x0098
+	Jump script_0800D5F2
+script_0800D5D8:
+	_0807EE04 0x0058, 0x0098
+	Jump script_0800D5F2
+script_0800D5E2:
+	_0807EE04 0x0038, 0x00c8
+	Jump script_0800D5F2
+script_0800D5EC:
+	_0807EE04 0x0058, 0x00c8
+script_0800D5F2:
+	StopScript 
+	StartScript 
+	Call sub_080626C0
+	JumpIf script_0800D5AC
+	_0807EE30 
+	JumpIfNot script_0800D5F2
+	Jump script_0800D5AC
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x000b
+	_0807EF80 0x0008
+	Call sub_0806DAAC
+	JumpIf script_0800D6AE
+	Call sub_0806DAD0
+	CallWithArg sub_0806DA04, 0x00000002
+	StopScript 
+script_0800D636:
+	_0807EA4C 
+	_0807E9F0 
+	Call sub_0806DAAC
+	JumpIf script_0800D650
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800D636
+script_0800D650:
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_0807FBC4
+	Call sub_0807FBA0
+	SetEntityNonPlanarMovement 0x0700
+	_0807F0B4 0x0007
+	CameraTargetEntity 
+	_0807EDD4 0x01e8, 0x01b8
+	Wait 0x003c
+	Call sub_0806DAE8
+	Wait 0x0078
+	Call sub_0806DB44
+	JumpIfNot script_0800D698
+	LoadRoomEntityList gUnk_080DD730
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc
index 4164ea12..3326499e 100644
--- a/data/scripts/script_0800D698.inc
+++ b/data/scripts/script_0800D698.inc
@@ -1,9 +1,11 @@
 SCRIPT_START script_0800D698
-_0807EEB4 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807FBCC
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
+script_0800D698:
+	_0807EEB4 
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807FBCC
+	_0807E878 
+	Call sub_0807DF50
+script_0800D6AE:
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc
index 3752c921..d34c14ff 100644
--- a/data/scripts/script_0800D6B4.inc
+++ b/data/scripts/script_0800D6B4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800D6B4
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x0011
-Call sub_0807F158
-Call sub_0807F738
-StopScript 
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x0011
+	Call sub_0807F158
+	Call sub_0807F738
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc
index 59addb72..03706d7b 100644
--- a/data/scripts/script_0800D6D0.inc
+++ b/data/scripts/script_0800D6D0.inc
@@ -1,11 +1,13 @@
 SCRIPT_START script_0800D6D0
-StartScript 
-CheckLocalFlag 0x00f3
-JumpIf 0x0010
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x00f3
-JumpIfNot 0xfffa
-_0807EF80 0x0007
+	StartScript 
+	CheckLocalFlag 0x00f3
+	JumpIf script_0800D6E8
+	_0807EF80 0x0008
+	StopScript 
+script_0800D6E0:
+	CheckLocalFlag 0x00f3
+	JumpIfNot script_0800D6E0
+script_0800D6E8:
+	_0807EF80 0x0007
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc
index a7d79528..796f0c6c 100644
--- a/data/scripts/script_0800D6F0.inc
+++ b/data/scripts/script_0800D6F0.inc
@@ -1,11 +1,12 @@
 SCRIPT_START script_0800D6F0
-StartScript 
-CheckLocalFlag 0x00f5
-JumpIf 0xfff0
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x00f5
-JumpIfNot 0xfffa
-_0807EF80 0x0007
+	StartScript 
+	CheckLocalFlag 0x00f5
+	JumpIf script_0800D6E8
+	_0807EF80 0x0008
+	StopScript 
+script_0800D700:
+	CheckLocalFlag 0x00f5
+	JumpIfNot script_0800D700
+	_0807EF80 0x0007
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc
index 1340fbcc..657cb9b1 100644
--- a/data/scripts/script_0800D710.inc
+++ b/data/scripts/script_0800D710.inc
@@ -1,23 +1,23 @@
 SCRIPT_START script_0800D710
-StartScript 
-Call sub_0807F360
-SetEntityNonPlanarMovement 0x0700
-_0807F0B4 0x0007
-CameraTargetEntity 
-Call sub_0807FBC4
-StopScript 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000010
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E5F8 0x0000000a
-WaitForSomething2 0x00000004
-_0807EEB4 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807FBCC
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F360
+	SetEntityNonPlanarMovement 0x0700
+	_0807F0B4 0x0007
+	CameraTargetEntity 
+	Call sub_0807FBC4
+	StopScript 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000010
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x0000000a
+	WaitForSomething2 0x00000004
+	_0807EEB4 
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807FBCC
+	_0807E878 
+	Call sub_0807DF50
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc
index d4bb04a7..b7eb9079 100644
--- a/data/scripts/script_0800D76C.inc
+++ b/data/scripts/script_0800D76C.inc
@@ -1,48 +1,50 @@
 SCRIPT_START script_0800D76C
-StartScript 
-Call sub_0807F360
-_0807EF80 0x000b
-SetEntityNonPlanarMovement 0x0200
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000008
-_0807EF80 0x0004
-Wait 0x003c
-SoundReq 0x0123
-CallWithArg sub_0807F464, 0x000001e0
-_0807EDD4 0x01e0, 0x01d8
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000010
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-SoundReq 0x007c
-_0807EF3C 0x0180, 0x0030
-_0807EB44 0x0002
-_0807EF80 0x0001
-WaitForSomething2 0x00000008
-Jump 0x0032
-StartScript 
-Call sub_0807F360
-_0807EF80 0x000b
-SetEntityPositionRelative 0x01d80268
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-WaitForSomething2 0x00000002
-_0807EDD4 0x01f0, 0x01d8
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EEF4 0x0000, 0xffe0
-_0807EF80 0x000e
-Call sub_0806CA5C
-SetEntity0x20 0x00040000
-SoundReq 0x00f5
-CallWithArg sub_0807F8D0, 0xffffe000
-Call sub_0807F8BC
-JumpIf 0xffee
-_0807E5F8 0x00000004
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F360
+	_0807EF80 0x000b
+	SetEntityNonPlanarMovement 0x0200
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000008
+	_0807EF80 0x0004
+	Wait 0x003c
+	SoundReq 0x0123
+	CallWithArg sub_0807F464, 0x000001e0
+	_0807EDD4 0x01e0, 0x01d8
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000010
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	SoundReq 0x007c
+	_0807EF3C 0x0180, 0x0030
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	WaitForSomething2 0x00000008
+	Jump script_0800D80C
+	StartScript 
+	Call sub_0807F360
+	_0807EF80 0x000b
+	SetEntityPositionRelative 0x01d80268
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EDD4 0x01f0, 0x01d8
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+script_0800D80C:
+	SetEntityNonPlanarMovement 0x0100
+	_0807EEF4 0x0000, 0xffe0
+	_0807EF80 0x000e
+	Call sub_0806CA5C
+	SetEntity0x20 0x00040000
+	SoundReq 0x00f5
+script_0800D82A:
+	CallWithArg sub_0807F8D0, 0xffffe000
+	Call sub_0807F8BC
+	JumpIf script_0800D82A
+	_0807E5F8 0x00000004
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc
index bb06e896..b4f2becc 100644
--- a/data/scripts/script_0800D84C.inc
+++ b/data/scripts/script_0800D84C.inc
@@ -1,13 +1,14 @@
 SCRIPT_START script_0800D84C
-StartScript 
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807DF28
-Wait 0x003c
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	StopScript 
+script_0800D850:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800D850
+	_0807E864 
+	Call sub_0807DF28
+	Wait 0x003c
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc
index e569da45..0de3e444 100644
--- a/data/scripts/script_0800D874.inc
+++ b/data/scripts/script_0800D874.inc
@@ -1,49 +1,55 @@
 SCRIPT_START script_0800D874
-StartScript 
-Call sub_0807F934
-_0807EF80 0x0008
-_0807E914 0x00000001
-Call sub_0806DA04
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x0045
-JumpIf 0x000e
-StartPlayerScript script_0800D92C
-WaitForSomething2 0x00000001
-_0807E8E4_0 
-TextboxNoOverlap 0x1324
-_0807EA94 
-CheckInventory1 0x0017
-JumpIf 0x0018
-CheckLocalFlag 0x0045
-JumpIf 0x0010
-LoadRoomEntityList gUnk_080E3830
-CheckLocalFlag 0x0045
-JumpIfNot 0xfffa
-Call sub_0807DF50
-_0807E878 
-Jump 0xffae
-.short 0x0000
-StartScript 
-_0807EF80 0x0008
-CheckInventory1 0x0017
-JumpIf 0x0034
-StopScript 
-CheckInventory1 0x0017
-JumpIfNot 0xfffa
-Call sub_0807DF28
-_0807E864 
-WaitPlayerAction8 
-_0807EB28 0x1325
-_0807EA94 
-SoundReq 0x0113
-_0807E914 0x00000000
-Call sub_0806DA1C
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F934
+	_0807EF80 0x0008
+	_0807E914 0x00000001
+	Call sub_0806DA04
+	StopScript 
+script_0800D88E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800D88E
+	_0807E864 
+	Call sub_0807DF28
+	CheckLocalFlag 0x0045
+	JumpIf script_0800D8B0
+	StartPlayerScript script_0800D92C
+	WaitForSomething2 0x00000001
+script_0800D8B0:
+	_0807E8E4_0 
+	TextboxNoOverlap 0x1324
+	_0807EA94 
+	CheckInventory1 0x0017
+	JumpIf script_0800D8D6
+	CheckLocalFlag 0x0045
+	JumpIf script_0800D8D6
+	LoadRoomEntityList gUnk_080E3830
+script_0800D8CE:
+	CheckLocalFlag 0x0045
+	JumpIfNot script_0800D8CE
+script_0800D8D6:
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800D88E
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0008
+	CheckInventory1 0x0017
+	JumpIf script_0800D924
+	StopScript 
+script_0800D8F4:
+	CheckInventory1 0x0017
+	JumpIfNot script_0800D8F4
+	Call sub_0807DF28
+	_0807E864 
+	WaitPlayerAction8 
+	_0807EB28 0x1325
+	_0807EA94 
+	SoundReq 0x0113
+	_0807E914 0x00000000
+	Call sub_0806DA1C
+	_0807E878 
+	Call sub_0807DF50
+script_0800D924:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc
index a806a09f..e87da7d3 100644
--- a/data/scripts/script_0800D92C.inc
+++ b/data/scripts/script_0800D92C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800D92C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x00a0, 0x0078
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x00a0, 0x0078
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc
index a77a8092..40de08ce 100644
--- a/data/scripts/script_0800D954.inc
+++ b/data/scripts/script_0800D954.inc
@@ -1,41 +1,42 @@
 SCRIPT_START script_0800D954
-StartScript 
-_0807EF80 0x0008
-Call sub_0807F180
-StopScript 
-CheckPlayerInRegion 0x0118, 0x0038, 0x3050
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_0800DA00
-WaitForSomething2 0x00000001
-Wait 0x003c
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x0007
-SoundReq 0x01ce
-SetEntity0x20 0xffff8000
-TextboxNoOverlap 0x1701
-_0807EA94 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-TextboxNoOverlap 0x1702
-_0807EA94 
-SetEntity0x20 0x00010000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807F050 0x006d
-WaitPlayerAction8 
-_0807EB28 0x1703
-_0807EA94 
-Wait 0x003c
-SetLocalFlag 0x0032
-SoundReq 0x0113
-_0807E914 0x00000001
-Call sub_0806DA1C
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	Call sub_0807F180
+	StopScript 
+script_0800D962:
+	CheckPlayerInRegion 0x0118, 0x0038, 0x3050
+	JumpIfNot script_0800D962
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_0800DA00
+	WaitForSomething2 0x00000001
+	Wait 0x003c
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x0007
+	SoundReq 0x01ce
+	SetEntity0x20 0xffff8000
+	TextboxNoOverlap 0x1701
+	_0807EA94 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	TextboxNoOverlap 0x1702
+	_0807EA94 
+	SetEntity0x20 0x00010000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807F050 0x006d
+	WaitPlayerAction8 
+	_0807EB28 0x1703
+	_0807EA94 
+	Wait 0x003c
+	SetLocalFlag 0x0032
+	SoundReq 0x0113
+	_0807E914 0x00000001
+	Call sub_0806DA1C
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc
index 564c1eb7..33601801 100644
--- a/data/scripts/script_0800DA00.inc
+++ b/data/scripts/script_0800DA00.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800DA00
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0118, 0x0060
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x0118, 0x0060
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc
index 8fdc555e..8c30c6b2 100644
--- a/data/scripts/script_0800DA28.inc
+++ b/data/scripts/script_0800DA28.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800DA28
-StartScript 
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-WaitForSomething2 0x00000004
-_0807EF80 0x0007
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807EDD4 0x0118, 0x0060
-_0807E5F8 0x00000002
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0007
+	Wait 0x003c
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807EDD4 0x0118, 0x0060
+	_0807E5F8 0x00000002
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc
index 9fc90d46..7fbe0073 100644
--- a/data/scripts/script_0800DA60.inc
+++ b/data/scripts/script_0800DA60.inc
@@ -1,45 +1,46 @@
 SCRIPT_START script_0800DA60
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x0078, 0x0148, 0x4040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807E8E4_0 
-Call sub_0807F3F8
-Wait 0x003c
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x00800078
-CameraTargetEntity 
-Call sub_0807F5C0
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-TextboxNoOverlapFollowPos 0x0002162d
-_0807EA94 
-_0807E5F8 0x00000001
-Wait 0x001e
-TextboxNoOverlapFollowPos 0x0002162e
-_0807EA94 
-_0807E8E4_0 
-CallWithArg sub_0807F75C, 0x00780138
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807F5C0
-SetRoomFlag 0x0000
-Call sub_0807F40C
-Wait 0x001e
-_0807E8E4_1 
-Wait 0x000a
-_0807E8E4_3 
-Wait 0x000a
-_0807E8E4_2 
-Call sub_0807F3F8
-Wait 0x003c
-SetRoomFlag 0x0001
-SetLocalFlag 0x0077
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	StopScript 
+script_0800DA64:
+	CheckPlayerInRegion 0x0078, 0x0148, 0x4040
+	JumpIfNot script_0800DA64
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807E8E4_0 
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x00800078
+	CameraTargetEntity 
+	Call sub_0807F5C0
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	TextboxNoOverlapFollowPos 0x0002162d
+	_0807EA94 
+	_0807E5F8 0x00000001
+	Wait 0x001e
+	TextboxNoOverlapFollowPos 0x0002162e
+	_0807EA94 
+	_0807E8E4_0 
+	CallWithArg sub_0807F75C, 0x00780138
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807F5C0
+	SetRoomFlag 0x0000
+	Call sub_0807F40C
+	Wait 0x001e
+	_0807E8E4_1 
+	Wait 0x000a
+	_0807E8E4_3 
+	Wait 0x000a
+	_0807E8E4_2 
+	Call sub_0807F3F8
+	Wait 0x003c
+	SetRoomFlag 0x0001
+	SetLocalFlag 0x0077
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc
index db878083..28eb65ea 100644
--- a/data/scripts/script_0800DB18.inc
+++ b/data/scripts/script_0800DB18.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DB18
-StartScript 
-_0807EF80 0x000a
-Call sub_08066E38
-StopScript 
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_08066E38
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc
index f26054bc..c633b659 100644
--- a/data/scripts/script_0800DB28.inc
+++ b/data/scripts/script_0800DB28.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_0800DB28
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0000
-_0807EF80 0x0014
-StopScript 
-WaitForSomething2 0x00000001
-Wait 0x003c
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0004
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EF80 0x0000
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB44 0x0004
-_0807EF80 0x0014
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0000
+	_0807EF80 0x0014
+	StopScript 
+	WaitForSomething2 0x00000001
+	Wait 0x003c
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EB44 0x0004
+	_0807EF80 0x001c
+	Call sub_0807F2D4
+	_0807EF80 0x0000
+	Wait 0x003c
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EB44 0x0004
+	_0807EF80 0x0014
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc
index 64ddbba6..cede39e2 100644
--- a/data/scripts/script_0800DB78.inc
+++ b/data/scripts/script_0800DB78.inc
@@ -1,44 +1,46 @@
 SCRIPT_START script_0800DB78
-StartScript 
-StopScript 
-CallWithArg sub_0807F6B4, 0x000000a0
-JumpIf 0xfff4
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x00780078
-CameraTargetEntity 
-Call sub_0807F5C0
-_0807EB28 0x1648
-_0807EA94 
-Call sub_0804D7EC
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Call sub_0807DF50
-_0807E878 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0804D810
-Call sub_0807F3F8
-Wait 0x003c
-StartPlayerScript script_0800DDD0
-WaitForSomething2 0x00000004
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000001
-StartPlayerScript script_0800DE00
-WaitForSomething2 0x00000006
-TextboxNoOverlapFollowPos 0x00021643
-_0807EA94 
-_0807EB28 0x1645
-_0807EA94 
-Call sub_0807F3F8
-_0807E5F8 0x00000001
-SoundReq0x80100000 
-Call sub_08094F98
-CallWithArg sub_0805DDEC, 0x00000001
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	StopScript 
+script_0800DB7C:
+	CallWithArg sub_0807F6B4, 0x000000a0
+	JumpIf script_0800DB7C
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807F0B4 0x0001
+	SetEntityPositionRelative 0x00780078
+	CameraTargetEntity 
+	Call sub_0807F5C0
+	_0807EB28 0x1648
+	_0807EA94 
+	Call sub_0804D7EC
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+script_0800DBCA:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800DBCA
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	Call sub_0804D810
+	Call sub_0807F3F8
+	Wait 0x003c
+	StartPlayerScript script_0800DDD0
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000001
+	StartPlayerScript script_0800DE00
+	WaitForSomething2 0x00000006
+	TextboxNoOverlapFollowPos 0x00021643
+	_0807EA94 
+	_0807EB28 0x1645
+	_0807EA94 
+	Call sub_0807F3F8
+	_0807E5F8 0x00000001
+	SoundReq0x80100000 
+	Call sub_08094F98
+	CallWithArg sub_0805DDEC, 0x00000001
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc
index 6f24dffd..8c9ddfc9 100644
--- a/data/scripts/script_0800DC4C.inc
+++ b/data/scripts/script_0800DC4C.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_0800DC4C
-Wait 0x003c
-SoundReq2 0x0031
-StartPlayerScript script_0800DE50
-WaitForSomething2 0x00000006
-_0807EB28 0x1646
-_0807EA94 
-_0807E5F8 0x00000001
-StartPlayerScript script_0800DE2C
-CameraTargetPlayer 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-SetLocalFlag 0x0079
-CallWithArg sub_0806DA1C, 0x00000002
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	Wait 0x003c
+	SoundReq2 0x0031
+	StartPlayerScript script_0800DE50
+	WaitForSomething2 0x00000006
+	_0807EB28 0x1646
+	_0807EA94 
+	_0807E5F8 0x00000001
+	StartPlayerScript script_0800DE2C
+	CameraTargetPlayer 
+	_0807E778 0x0004
+	_0807E80C 0x00000000
+	WaitFor_2 
+	CallWithArg sub_0805DE18, 0x00000001
+	_0807F0C8 0x0000, 0x0000
+	SetLocalFlag 0x0079
+	CallWithArg sub_0806DA1C, 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc
index 720d8db0..fda1cc9e 100644
--- a/data/scripts/script_0800DCAC.inc
+++ b/data/scripts/script_0800DCAC.inc
@@ -1,67 +1,68 @@
 SCRIPT_START script_0800DCAC
-StartScript 
-_0807EF80 0x000a
-Call sub_08066E38
-StopScript 
-WaitForSomething2 0x00000001
-CallWithArg sub_0807F8E8, 0x00000000
-_0807E5F8 0x00000002
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807EF80 0x0010
-Wait 0x003c
-_0807EF80 0x0010
-SetEntityPositionRelative 0x00680078
-WaitForSomething2 0x00000001
-SoundReq0x80100000 
-Call sub_08066E50
-SoundReq 0x01c9
-Call sub_0807F2D4
-SoundReq 0x01ca
-Wait 0x003c
-_0807EF80 0x0004
-SoundReq2 0x000b
-Wait 0x0078
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x0100
-_0807EEF4 0x0000, 0x0008
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x001e
-Call sub_08066E80
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x0100
-_0807EEF4 0x0000, 0x0080
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_08066E38
+	StopScript 
+	WaitForSomething2 0x00000001
+	CallWithArg sub_0807F8E8, 0x00000000
+	_0807E5F8 0x00000002
+script_0800DCD0:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800DCD0
+	_0807EF80 0x0010
+	Wait 0x003c
+	_0807EF80 0x0010
+	SetEntityPositionRelative 0x00680078
+	WaitForSomething2 0x00000001
+	SoundReq0x80100000 
+	Call sub_08066E50
+	SoundReq 0x01c9
+	Call sub_0807F2D4
+	SoundReq 0x01ca
+	Wait 0x003c
+	_0807EF80 0x0004
+	SoundReq2 0x000b
+	Wait 0x0078
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Wait 0x003c
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	SetEntityNonPlanarMovement 0x0100
+	_0807EEF4 0x0000, 0x0008
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Wait 0x001e
+	Call sub_08066E80
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	SetEntityNonPlanarMovement 0x0100
+	_0807EEF4 0x0000, 0x0080
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc
index e3b9e05e..11cac803 100644
--- a/data/scripts/script_0800DDD0.inc
+++ b/data/scripts/script_0800DDD0.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800DDD0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-CallWithArg sub_0807F4F8, 0x000000a0
-_0807EDD4 0x0078, 0x00a0
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	CallWithArg sub_0807F4F8, 0x000000a0
+	_0807EDD4 0x0078, 0x00a0
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc
index 14fe1a9a..7d76102c 100644
--- a/data/scripts/script_0800DE00.inc
+++ b/data/scripts/script_0800DE00.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_0800DE00
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EB44 0x0000
-_0807EF80 0x000d
-_0807EF80 0x0000
-_0807ECC4 0x0010
-_0807EF80 0x000c
-_0807E5F8 0x00000004
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EB44 0x0000
+	_0807EF80 0x000d
+	_0807EF80 0x0000
+	_0807ECC4 0x0010
+	_0807EF80 0x000c
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc
index eb637dbb..dabfc445 100644
--- a/data/scripts/script_0800DE2C.inc
+++ b/data/scripts/script_0800DE2C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800DE2C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EEF4 0x0000, 0x0080
-_0807E5F8 0x00000004
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EEF4 0x0000, 0x0080
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc
index 0c1bf300..3ace4f33 100644
--- a/data/scripts/script_0800DE50.inc
+++ b/data/scripts/script_0800DE50.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800DE50
-StopScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-CallWithArg sub_0807F238, 0x000003c5
-Call sub_0807F304
-_0807E5F8 0x00000004
-Call sub_080791BC
+	StopScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	CallWithArg sub_0807F238, 0x000003c5
+	Call sub_0807F304
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800DE78.inc b/data/scripts/script_0800DE78.inc
index 48175b61..0ecd30e4 100644
--- a/data/scripts/script_0800DE78.inc
+++ b/data/scripts/script_0800DE78.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800DE78
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_0800DEB0
-WaitForSomething2 0x00000001
-WaitForSomething2 0x00000002
-_0807EB28 0x1647
-_0807EA94 
-SetLocalFlag 0x007a
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_0800DEB0
+	WaitForSomething2 0x00000001
+	WaitForSomething2 0x00000002
+	_0807EB28 0x1647
+	_0807EA94 
+	SetLocalFlag 0x007a
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc
index a1dd6d33..e6184c8a 100644
--- a/data/scripts/script_0800DEB0.inc
+++ b/data/scripts/script_0800DEB0.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800DEB0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0198, 0x01c8
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0198, 0x01c8
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc
index f4bcd9eb..657180ad 100644
--- a/data/scripts/script_0800DED4.inc
+++ b/data/scripts/script_0800DED4.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_0800DED4
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x000b
-Call sub_08066D04
-StopScript 
-StartScript 
-Call sub_08066D14
-SetEntityPositionRelative 0x01480198
-_0807EF80 0x0007
-StopScript 
-_0807EDD4 0x0198, 0x01a8
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_08066D4C
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x000b
+	Call sub_08066D04
+	StopScript 
+	StartScript 
+	Call sub_08066D14
+	SetEntityPositionRelative 0x01480198
+	_0807EF80 0x0007
+	StopScript 
+	_0807EDD4 0x0198, 0x01a8
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_08066D4C
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc
index fefbdbc5..4e8fa449 100644
--- a/data/scripts/script_0800DF24.inc
+++ b/data/scripts/script_0800DF24.inc
@@ -1,38 +1,38 @@
 SCRIPT_START script_0800DF24
-StartScript 
-_0807EF80 0x0008
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-SoundReq0x80100000 
-_0807E8E4_2 
-Wait 0x005a
-Call sub_0807F3F8
-Wait 0x003c
-_0807E8E4_0 
-_0807F0B4 0x0001
-CameraTargetEntity 
-Call sub_0807F5C0
-Call sub_08066C94
-Wait 0x00e9
-_0807EF80 0x0007
-TextboxNoOverlapFollowPos 0x0002162f
-_0807EA94 
-SoundReq2 0x002f
-_0807EF80 0x0019
-SoundReq 0x0198
-Call sub_0807F2D4
-SetRoomFlag 0x0000
-_0807EF80 0x0008
-Wait 0x0080
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807F5C0
-SetLocalFlag 0x0078
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	SoundReq0x80100000 
+	_0807E8E4_2 
+	Wait 0x005a
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807E8E4_0 
+	_0807F0B4 0x0001
+	CameraTargetEntity 
+	Call sub_0807F5C0
+	Call sub_08066C94
+	Wait 0x00e9
+	_0807EF80 0x0007
+	TextboxNoOverlapFollowPos 0x0002162f
+	_0807EA94 
+	SoundReq2 0x002f
+	_0807EF80 0x0019
+	SoundReq 0x0198
+	Call sub_0807F2D4
+	SetRoomFlag 0x0000
+	_0807EF80 0x0008
+	Wait 0x0080
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807F5C0
+	SetLocalFlag 0x0078
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc
index 9544ee48..c253847f 100644
--- a/data/scripts/script_0800DFB4.inc
+++ b/data/scripts/script_0800DFB4.inc
@@ -1,13 +1,14 @@
 SCRIPT_START script_0800DFB4
-StopScript 
-CheckRoomFlag 0x0001
-JumpIfNot 0xfffa
-SoundReq0x80100000 
-_0807E864 
-Call sub_0807DF28
-SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x00000004
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StopScript 
+script_0800DFB6:
+	CheckRoomFlag 0x0001
+	JumpIfNot script_0800DFB6
+	SoundReq0x80100000 
+	_0807E864 
+	Call sub_0807DF28
+	SoundReq 0x00f6
+	CallWithArg sub_0806DA1C, 0x00000004
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc
index 0f349407..8a0ba9e4 100644
--- a/data/scripts/script_0800DFE4.inc
+++ b/data/scripts/script_0800DFE4.inc
@@ -1,29 +1,31 @@
 SCRIPT_START script_0800DFE4
-StartScript 
-Call sub_0807DF28
-_0807E864 
-StopScript 
-SoundReq0x80100000 
-TextboxNoOverlapFollowPos 0x00021632
-_0807EA94 
-SetRoomFlag 0x0003
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-SoundReq2 0x0030
-Call sub_0807DF50
-_0807E878 
-CheckRoomFlag 0x0002
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807DF28
-SetLocalFlag 0x007b
-TextboxNoOverlapFollowPos 0x000c1639
-_0807EA94 
-Wait 0x0096
-SoundReq 0x00f6
-CallWithArg sub_0806DA1C, 0x00000005
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807DF28
+	_0807E864 
+	StopScript 
+	SoundReq0x80100000 
+	TextboxNoOverlapFollowPos 0x00021632
+	_0807EA94 
+	SetRoomFlag 0x0003
+script_0800DFFE:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800DFFE
+	SoundReq2 0x0030
+	Call sub_0807DF50
+	_0807E878 
+script_0800E012:
+	CheckRoomFlag 0x0002
+	JumpIfNot script_0800E012
+	_0807E864 
+	Call sub_0807DF28
+	SetLocalFlag 0x007b
+	TextboxNoOverlapFollowPos 0x000c1639
+	_0807EA94 
+	Wait 0x0096
+	SoundReq 0x00f6
+	CallWithArg sub_0806DA1C, 0x00000005
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc
index fde5b354..1b8c6edb 100644
--- a/data/scripts/script_0800E050.inc
+++ b/data/scripts/script_0800E050.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_0800E050
-StartScript 
-Call sub_0807DF28
-_0807E864 
-StopScript 
-SoundReq0x80100000 
-SoundReq0x80100000 
-Wait 0x0078
-_0807EB28 0x1638
-_0807EA94 
-SetRoomFlag 0x0000
-Wait 0x001e
-_0807E5F8 0x00000001
-StartPlayerScript script_0800E094
-WaitForSomething2 0x00000002
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807DF28
+	_0807E864 
+	StopScript 
+	SoundReq0x80100000 
+	SoundReq0x80100000 
+	Wait 0x0078
+	_0807EB28 0x1638
+	_0807EA94 
+	SetRoomFlag 0x0000
+	Wait 0x001e
+	_0807E5F8 0x00000001
+	StartPlayerScript script_0800E094
+	WaitForSomething2 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc
index d6e24d18..35daad29 100644
--- a/data/scripts/script_0800E094.inc
+++ b/data/scripts/script_0800E094.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800E094
-StartScript 
-SetEntityNonPlanarMovement 0x00c0
-StopScript 
-WaitForSomething2 0x00000001
-_0807EF80 0x0001
-_0807EDD4 0x00a8, 0x002c
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x00c0
+	StopScript 
+	WaitForSomething2 0x00000001
+	_0807EF80 0x0001
+	_0807EDD4 0x00a8, 0x002c
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc
index 6ee5d073..3770edbc 100644
--- a/data/scripts/script_0800E0BC.inc
+++ b/data/scripts/script_0800E0BC.inc
@@ -1,298 +1,320 @@
 SCRIPT_START script_0800E0BC
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0093
-JumpIf 0x0062
-_0807E930 0x0008
-CallWithArg sub_0807F8E8, 0x00000000
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x0009
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB8C 
-_0807EB74 
-Wait 0x000a
-TextboxNoOverlap 0x2402
-_0807EA94 
-SetLocalFlag 0x0093
-Call sub_080668F0
-_0807E878 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2402
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0094
-JumpIf 0x006c
-_0807E930 0x0010
-CallWithArg sub_0807F8E8, 0x00000001
-StopScript 
-CheckRoomFlag 0x0001
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x0015
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB8C 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-Wait 0x000a
-TextboxNoOverlap 0x2401
-_0807EA94 
-SetLocalFlag 0x0094
-CallWithArg sub_0807F3D8, 0x00000000
-_0807E9D4 
-_0807E878 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlap 0x2401
-_0807EA94 
-_0807E878 
-Jump 0xffe2
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0073
-JumpIfNot 0x001e
-_0807E9D4 
-SetEntityPositionRelative 0x01680070
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-Jump 0x00fe
-CheckLocalFlag 0x0095
-JumpIf 0x0062
-_0807E930 0x0010
-CallWithArg sub_0807F8E8, 0x00000002
-StopScript 
-CheckRoomFlag 0x0002
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x0015
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB8C 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-SetLocalFlag 0x0095
-_0807EF80 0x0000
-CallWithArg sub_0807F3D8, 0x00000000
-_0807E9D4 
-_0807E878 
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x005c
-CheckLocalFlag 0x0093
-JumpIfNot 0xfff0
-CheckLocalFlag 0x0094
-JumpIfNot 0xffe8
-CheckLocalFlag 0x0095
-JumpIfNot 0xffe0
-_0807E9DC 
-SetLocalFlag 0x0073
-StopScript 
-_0807EB44 0x0000
-CallWithArg sub_0807F3D8, 0x00000004
-_0807EDD4 0x0088, 0x0168
-_0807EB44 0x0006
-CallWithArg sub_0807F3D8, 0x00000004
-_0807EDD4 0x0070, 0x0168
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-_0807E9D4 
-Jump 0x001e
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-TextboxNoOverlap 0x2404
-_0807EA94 
-_0807E878 
-Jump 0xff82
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlap 0x2403
-_0807EA94 
-_0807E878 
-Jump 0xffe2
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CheckLocalFlag 0x0071
-JumpIf 0x0088
-CheckLocalFlag 0x0096
-JumpIf 0x0056
-_0807E930 0x000c
-CallWithArg sub_0807F8E8, 0x00000000
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x001e
-_0807EF80 0x0010
-SoundReq 0x01c9
-_0807E930 0x000d
-Wait 0x003c
-SoundReq 0x01ca
-_0807EF80 0x0010
-Wait 0x001e
-SoundReq 0x0072
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x001e
-_0807EF80 0x0000
-_0807EB74 
-SetLocalFlag 0x0096
-_0807EF80 0x0000
-_0807E9D4 
-_0807E878 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x240c
-_0807EA94 
-Wait 0x000f
-_0807F034 0x0053
-WaitPlayerAction8 
-SetLocalFlag 0x0071
-_0807E878 
-_0807E9D4 
-_0807E878 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x240d
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-StartScript 
-_0807EB44 0x0002
-_0807EF80 0x000a
-Call sub_080668F0
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2406
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe8
-StartScript 
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlap 0x2405
-_0807EA94 
-_0807E878 
-Jump 0xffe2
-StartScript 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlap 0x2407
-_0807EA94 
-_0807E878 
-Jump 0xffe2
-StartScript 
-Call sub_0807F354
-StopScript 
-CheckLocalFlag 0x007c
-JumpIf 0x0046
-CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
-JumpIfNot 0xfff6
-StartScript 
-_0807E864 
-StopScript 
-Call sub_0807F3F8
-Wait 0x003c
-TextboxNoOverlapFollow 0x160c
-_0807EA94 
-Wait 0x001e
-TextboxNoOverlapFollow 0x160d
-_0807EA94 
-Wait 0x001e
-_0807EB28 0x160e
-Wait 0x003c
-_0807EA94 
-StartScript 
-SoundReq2 0x0033
-SetLocalFlag 0x007c
-_0807E878 
-_0807EF80 0x0006
-StopScript 
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CheckLocalFlag 0x0093
+	JumpIf script_0800E12E
+	_0807E930 0x0008
+	CallWithArg sub_0807F8E8, 0x00000000
+	StopScript 
+script_0800E0DE:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800E0DE
+	_0807E864 
+	Wait 0x001e
+	_0807EF80 0x0010
+	SoundReq 0x01c9
+	_0807E930 0x0009
+	Wait 0x003c
+	SoundReq 0x01ca
+	_0807EF80 0x0010
+	Wait 0x001e
+	SoundReq 0x0072
+	Wait 0x0078
+	_0807EF80 0x0004
+	Wait 0x001e
+	_0807EF80 0x0000
+	_0807EB8C 
+	_0807EB74 
+	Wait 0x000a
+	TextboxNoOverlap 0x2402
+	_0807EA94 
+	SetLocalFlag 0x0093
+script_0800E12E:
+	Call sub_080668F0
+	_0807E878 
+	StopScript 
+script_0800E138:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E138
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x2402
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800E138
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CheckLocalFlag 0x0094
+	JumpIf script_0800E1D0
+	_0807E930 0x0010
+	CallWithArg sub_0807F8E8, 0x00000001
+	StopScript 
+script_0800E176:
+	CheckRoomFlag 0x0001
+	JumpIfNot script_0800E176
+	_0807E864 
+	Wait 0x001e
+	_0807EF80 0x0010
+	SoundReq 0x01c9
+	_0807E930 0x0015
+	Wait 0x003c
+	SoundReq 0x01ca
+	_0807EF80 0x0010
+	Wait 0x001e
+	SoundReq 0x0072
+	Wait 0x0078
+	_0807EF80 0x0004
+	Wait 0x001e
+	_0807EF80 0x0000
+	_0807EB8C 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Wait 0x000a
+	TextboxNoOverlap 0x2401
+	_0807EA94 
+	SetLocalFlag 0x0094
+script_0800E1D0:
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807E9D4 
+	_0807E878 
+	StopScript 
+script_0800E1E0:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E1E0
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	TextboxNoOverlap 0x2401
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E1E0
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CheckLocalFlag 0x0073
+	JumpIfNot script_0800E232
+	_0807E9D4 
+	SetEntityPositionRelative 0x01680070
+	_0807EB44 0x0002
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+	Jump script_0800E32E
+script_0800E232:
+	CheckLocalFlag 0x0095
+	JumpIf script_0800E29A
+	_0807E930 0x0010
+	CallWithArg sub_0807F8E8, 0x00000002
+	StopScript 
+script_0800E24A:
+	CheckRoomFlag 0x0002
+	JumpIfNot script_0800E24A
+	_0807E864 
+	Wait 0x001e
+	_0807EF80 0x0010
+	SoundReq 0x01c9
+	_0807E930 0x0015
+	Wait 0x003c
+	SoundReq 0x01ca
+	_0807EF80 0x0010
+	Wait 0x001e
+	SoundReq 0x0072
+	Wait 0x0078
+	_0807EF80 0x0004
+	Wait 0x001e
+	_0807EF80 0x0000
+	_0807EB8C 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	SetLocalFlag 0x0095
+script_0800E29A:
+	_0807EF80 0x0000
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807E9D4 
+	_0807E878 
+	StopScript 
+script_0800E2AE:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800E312
+	CheckLocalFlag 0x0093
+	JumpIfNot script_0800E2AE
+	CheckLocalFlag 0x0094
+	JumpIfNot script_0800E2AE
+	CheckLocalFlag 0x0095
+	JumpIfNot script_0800E2AE
+	_0807E9DC 
+	SetLocalFlag 0x0073
+	StopScript 
+	_0807EB44 0x0000
+	CallWithArg sub_0807F3D8, 0x00000004
+	_0807EDD4 0x0088, 0x0168
+	_0807EB44 0x0006
+	CallWithArg sub_0807F3D8, 0x00000004
+	_0807EDD4 0x0070, 0x0168
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807E9D4 
+	Jump script_0800E32E
+script_0800E312:
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+	TextboxNoOverlap 0x2404
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E2AE
+script_0800E32E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E32E
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	TextboxNoOverlap 0x2403
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E32E
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CheckLocalFlag 0x0071
+	JumpIf script_0800E3E8
+	CheckLocalFlag 0x0096
+	JumpIf script_0800E3BE
+	_0807E930 0x000c
+	CallWithArg sub_0807F8E8, 0x00000000
+	StopScript 
+script_0800E37A:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0800E37A
+	_0807E864 
+	Wait 0x001e
+	_0807EF80 0x0010
+	SoundReq 0x01c9
+	_0807E930 0x000d
+	Wait 0x003c
+	SoundReq 0x01ca
+	_0807EF80 0x0010
+	Wait 0x001e
+	SoundReq 0x0072
+	Wait 0x0078
+	_0807EF80 0x0004
+	Wait 0x001e
+	_0807EF80 0x0000
+	_0807EB74 
+	SetLocalFlag 0x0096
+script_0800E3BE:
+	_0807EF80 0x0000
+	_0807E9D4 
+	_0807E878 
+	StopScript 
+script_0800E3C8:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E3C8
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x240c
+	_0807EA94 
+	Wait 0x000f
+	_0807F034 0x0053
+	WaitPlayerAction8 
+	SetLocalFlag 0x0071
+	_0807E878 
+script_0800E3E8:
+	_0807E9D4 
+	_0807E878 
+	StopScript 
+script_0800E3EE:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E3EE
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x240d
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800E3EE
+	StartScript 
+	_0807EB44 0x0002
+	_0807EF80 0x000a
+	Call sub_080668F0
+	StopScript 
+script_0800E41A:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E41A
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x2406
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800E41A
+	StartScript 
+	_0807EB44 0x0002
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807EF80 0x000a
+	_0807E9D4 
+	StopScript 
+script_0800E44C:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E44C
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	TextboxNoOverlap 0x2405
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E44C
+	StartScript 
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000000
+	_0807EF80 0x000a
+	_0807E9D4 
+	StopScript 
+script_0800E484:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E484
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	TextboxNoOverlap 0x2407
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E484
+	StartScript 
+	Call sub_0807F354
+	StopScript 
+	CheckLocalFlag 0x007c
+	JumpIf script_0800E4FA
+script_0800E4B6:
+	CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
+	JumpIfNot script_0800E4B6
+	StartScript 
+	_0807E864 
+	StopScript 
+	Call sub_0807F3F8
+	Wait 0x003c
+	TextboxNoOverlapFollow 0x160c
+	_0807EA94 
+	Wait 0x001e
+	TextboxNoOverlapFollow 0x160d
+	_0807EA94 
+	Wait 0x001e
+	_0807EB28 0x160e
+	Wait 0x003c
+	_0807EA94 
+	StartScript 
+	SoundReq2 0x0033
+	SetLocalFlag 0x007c
+script_0800E4FA:
+	_0807E878 
+	_0807EF80 0x0006
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc
index 9d141143..1b63855a 100644
--- a/data/scripts/script_0800E504.inc
+++ b/data/scripts/script_0800E504.inc
@@ -1,18 +1,20 @@
 SCRIPT_START script_0800E504
-StartScript 
-StopScript 
-CheckLocalFlag 0x007d
-JumpIf 0x002e
-CheckPlayerInRegion 0x00a8, 0x0178, 0x1080
-JumpIfNot 0xfff6
-_0807E864 
-Wait 0x001e
-Call sub_0807F3F8
-Wait 0x003c
-SoundReq 0x0105
-Wait 0x001e
-_0807EB28 0x1617
-SetLocalFlag 0x007d
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	StopScript 
+	CheckLocalFlag 0x007d
+	JumpIf script_0800E53C
+script_0800E510:
+	CheckPlayerInRegion 0x00a8, 0x0178, 0x1080
+	JumpIfNot script_0800E510
+	_0807E864 
+	Wait 0x001e
+	Call sub_0807F3F8
+	Wait 0x003c
+	SoundReq 0x0105
+	Wait 0x001e
+	_0807EB28 0x1617
+	SetLocalFlag 0x007d
+script_0800E53C:
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc
index 8c7adb02..b0a31238 100644
--- a/data/scripts/script_0800E544.inc
+++ b/data/scripts/script_0800E544.inc
@@ -1,20 +1,22 @@
 SCRIPT_START script_0800E544
-StartScript 
-StopScript 
-CheckLocalFlag 0x007e
-JumpIf 0x0034
-CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880
-JumpIfNot 0xfff6
-_0807E864 
-Wait 0x001e
-Call sub_0807F3F8
-Wait 0x003c
-SoundReq 0x0105
-Wait 0x001e
-_0807EB28 0x1622
-Call sub_08053494
-SetLocalFlag 0x007e
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	StopScript 
+	CheckLocalFlag 0x007e
+	JumpIf script_0800E582
+script_0800E550:
+	CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880
+	JumpIfNot script_0800E550
+	_0807E864 
+	Wait 0x001e
+	Call sub_0807F3F8
+	Wait 0x003c
+	SoundReq 0x0105
+	Wait 0x001e
+	_0807EB28 0x1622
+	Call sub_08053494
+	SetLocalFlag 0x007e
+script_0800E582:
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc
index 836c03c6..8fdde827 100644
--- a/data/scripts/script_0800E58C.inc
+++ b/data/scripts/script_0800E58C.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_0800E58C
-StartScript 
-_0807EF80 0x0007
-_0807EB44 0x0000
-_0807EF80 0x0014
-StopScript 
-Wait 0x003c
-SoundReq 0x0105
-Wait 0x003c
-SoundReq 0x009b
-Wait 0x001e
-TextboxNoOverlap 0x1625
-_0807EA94 
-Wait 0x003c
-Call sub_08053C84
+	StartScript 
+	_0807EF80 0x0007
+	_0807EB44 0x0000
+	_0807EF80 0x0014
+	StopScript 
+	Wait 0x003c
+	SoundReq 0x0105
+	Wait 0x003c
+	SoundReq 0x009b
+	Wait 0x001e
+	TextboxNoOverlap 0x1625
+	_0807EA94 
+	Wait 0x003c
+	Call sub_08053C84
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc
index 75392878..59366432 100644
--- a/data/scripts/script_0800E5C4.inc
+++ b/data/scripts/script_0800E5C4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800E5C4
-StartScript 
-CheckLocalFlag 0x0086
-JumpIfNot 0x000a
-_0807EF80 0x0006
-StopScript 
+	StartScript 
+	CheckLocalFlag 0x0086
+	JumpIfNot script_0800E5D6
+	_0807EF80 0x0006
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc
index e09df4d0..f4fb76ae 100644
--- a/data/scripts/script_0800E5D6.inc
+++ b/data/scripts/script_0800E5D6.inc
@@ -1,13 +1,15 @@
 SCRIPT_START script_0800E5D6
-StopScript 
-CheckLocalFlag 0x0086
-JumpIfNot 0xfffa
-_0807E864 
-Wait 0x003c
-_0807E914 0x00000905
-Call sub_0807F420
-SetRoomFlag 0x0001
-Wait 0x001e
-_0807E878 
+script_0800E5D6:
+	StopScript 
+script_0800E5D8:
+	CheckLocalFlag 0x0086
+	JumpIfNot script_0800E5D8
+	_0807E864 
+	Wait 0x003c
+	_0807E914 0x00000905
+	Call sub_0807F420
+	SetRoomFlag 0x0001
+	Wait 0x001e
+	_0807E878 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc
index 7a7d199a..36445e10 100644
--- a/data/scripts/script_0800E600.inc
+++ b/data/scripts/script_0800E600.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800E600
-StartScript 
-SetEntityNonPlanarMovement 0x0140
-SetEntityDirection 0x0000
-_0807E864 
-Call sub_0807F354
-StopScript 
-WaitForPlayerAction0x17 
-_0807E8E4_0 
-_0807EF80 0x0001
-Call sub_080752AC
-_0807E878 
-Call sub_080791D0
+	StartScript 
+	SetEntityNonPlanarMovement 0x0140
+	SetEntityDirection 0x0000
+	_0807E864 
+	Call sub_0807F354
+	StopScript 
+	WaitForPlayerAction0x17 
+	_0807E8E4_0 
+	_0807EF80 0x0001
+	Call sub_080752AC
+	_0807E878 
+	Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc
index 2c383dd8..96b1273e 100644
--- a/data/scripts/script_0800E62C.inc
+++ b/data/scripts/script_0800E62C.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800E62C
-StartScript 
-SetEntityNonPlanarMovement 0x0140
-SetEntityDirection 0x0008
-_0807E864 
-Call sub_0807F354
-StopScript 
-WaitForPlayerAction0x17 
-_0807E8E4_1 
-_0807EF80 0x0001
-Call sub_080752AC
-_0807E878 
-Call sub_080791D0
+	StartScript 
+	SetEntityNonPlanarMovement 0x0140
+	SetEntityDirection 0x0008
+	_0807E864 
+	Call sub_0807F354
+	StopScript 
+	WaitForPlayerAction0x17 
+	_0807E8E4_1 
+	_0807EF80 0x0001
+	Call sub_080752AC
+	_0807E878 
+	Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc
index 618409df..54d3c254 100644
--- a/data/scripts/script_0800E658.inc
+++ b/data/scripts/script_0800E658.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800E658
-StartScript 
-SetEntityNonPlanarMovement 0x0140
-SetEntityDirection 0x0010
-_0807E864 
-Call sub_0807F354
-StopScript 
-WaitForPlayerAction0x17 
-_0807E8E4_2 
-_0807EF80 0x0001
-Call sub_080752AC
-_0807E878 
-Call sub_080791D0
+	StartScript 
+	SetEntityNonPlanarMovement 0x0140
+	SetEntityDirection 0x0010
+	_0807E864 
+	Call sub_0807F354
+	StopScript 
+	WaitForPlayerAction0x17 
+	_0807E8E4_2 
+	_0807EF80 0x0001
+	Call sub_080752AC
+	_0807E878 
+	Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc
index f89e6a52..569e8ad8 100644
--- a/data/scripts/script_0800E684.inc
+++ b/data/scripts/script_0800E684.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800E684
-StartScript 
-SetEntityNonPlanarMovement 0x0140
-SetEntityDirection 0x0018
-_0807E864 
-Call sub_0807F354
-StopScript 
-WaitForPlayerAction0x17 
-_0807E8E4_3 
-_0807EF80 0x0001
-Call sub_080752AC
-_0807E878 
-Call sub_080791D0
+	StartScript 
+	SetEntityNonPlanarMovement 0x0140
+	SetEntityDirection 0x0018
+	_0807E864 
+	Call sub_0807F354
+	StopScript 
+	WaitForPlayerAction0x17 
+	_0807E8E4_3 
+	_0807EF80 0x0001
+	Call sub_080752AC
+	_0807E878 
+	Call sub_080791D0
 SCRIPT_END
diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc
index 8dfc9375..c1ff4dcb 100644
--- a/data/scripts/script_0800E6B0.inc
+++ b/data/scripts/script_0800E6B0.inc
@@ -1,141 +1,156 @@
 SCRIPT_START script_0800E6B0
-StartScript 
-Call sub_08060090
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_08060158
-StopScript 
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_0806025C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd8
-StartScript 
-Call sub_0806ADFC
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000c
-Call sub_0806AEE4
-Jump 0xffee
-StopScript 
-_0807E864 
-Call sub_0806AFE8
-JumpIf 0x000e
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd4
-_0807EA94 
-_0807F034 0x0057
-WaitPlayerAction8 
-_0807EA94 
-_0807E878 
-Jump 0xffc4
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0806AF60, 0x00000000
-Call sub_0806AFE8
-_0807EA94 
-_0807E878 
-Jump 0xffe0
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-SetEntityNonPlanarMovement 0x0200
-CheckGlobalFlag 0x0029
-JumpIfNot 0x000a
-CheckGlobalFlag 0x002a
-JumpIfNot 0x000c
-SetEntityPositionRelative 0x00980188
-Jump 0xff70
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002a
-JumpIf 0x002a
-CheckEntityInteractType 
-JumpIf 0x000e
-Call sub_0806AEE4
-StopScript 
-Jump 0xffe6
-StopScript 
-_0807E864 
-Call sub_0806AFE8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffd0
-_0807EF80 0x000f
-_0807EB44 0x0002
-CallWithArg sub_0806AF60, 0x00000004
-Call sub_0806AF70
-_0807EE04 0x0188, 0x0058
-StopScript 
-StartScript 
-Call sub_0806AF78
-_0807EE30 
-JumpIfNot 0xfff2
-EntityHasHeight 
-JumpIf 0xffec
-StopScript 
-Jump 0xff02
-StartScript 
-Call sub_0806C674
-_0807EF80 0x000a
-_0807EB44 0x0004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C70C
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-Jump 0xffe6
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB44 0x0004
-StartScript 
-TextboxNoOverlapFollow 0x4501
-CallWithArg sub_0807F854, 0x00010032
-CallWithArg sub_0807F854, 0x000200c8
-CallWithArg sub_0807F854, 0x00030190
-StopScript 
-_0807EA94 
-_0807EB38 
-_0807E078_ssss 0x00a6, 0x006a, 0x0036, 0x0002
-StartScript 
-TextboxNoOverlapFollow 0x4505
-CallWithArg sub_0807F854, 0x00010190
-StopScript 
-_0807EA94 
-HasRupees 0x0190
-JumpIfNot 0x007c
-ModRupees 0xfe70
-SetLocalFlag 0x0091
-TextboxNoOverlapFollow 0x4508
-_0807EA94 
-Call sub_0806C578
+	StartScript 
+	Call sub_08060090
+	_0807EF80 0x000a
+	StopScript 
+script_0800E6BE:
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800E6D2
+	Call sub_08060158
+	StopScript 
+	Jump script_0800E6BE
+script_0800E6D2:
+	StopScript 
+	_0807E864 
+	Call sub_0806025C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800E6BE
+	StartScript 
+	Call sub_0806ADFC
+	_0807EF80 0x000a
+script_0800E6F4:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800E708
+	Call sub_0806AEE4
+	Jump script_0800E6F4
+script_0800E708:
+	StopScript 
+	_0807E864 
+	Call sub_0806AFE8
+	JumpIf script_0800E722
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800E6F4
+script_0800E722:
+	_0807EA94 
+	_0807F034 0x0057
+	WaitPlayerAction8 
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E6F4
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_0800E73E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E73E
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0806AF60, 0x00000000
+	Call sub_0806AFE8
+	_0807EA94 
+	_0807E878 
+	Jump script_0800E73E
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	SetEntityNonPlanarMovement 0x0200
+	CheckGlobalFlag 0x0029
+	JumpIfNot script_0800E77C
+	CheckGlobalFlag 0x002a
+	JumpIfNot script_0800E786
+script_0800E77C:
+	SetEntityPositionRelative 0x00980188
+	Jump script_0800E6F4
+script_0800E786:
+	StopScript 
+script_0800E788:
+	StartScript 
+	CheckGlobalFlag 0x002a
+	JumpIf script_0800E7BA
+	CheckEntityInteractType 
+	JumpIf script_0800E7A4
+	Call sub_0806AEE4
+	StopScript 
+	Jump script_0800E788
+script_0800E7A4:
+	StopScript 
+	_0807E864 
+	Call sub_0806AFE8
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800E788
+script_0800E7BA:
+	_0807EF80 0x000f
+	_0807EB44 0x0002
+	CallWithArg sub_0806AF60, 0x00000004
+	Call sub_0806AF70
+	_0807EE04 0x0188, 0x0058
+script_0800E7D8:
+	StopScript 
+	StartScript 
+	Call sub_0806AF78
+	_0807EE30 
+	JumpIfNot script_0800E7D8
+	EntityHasHeight 
+	JumpIf script_0800E7D8
+	StopScript 
+	Jump script_0800E6F4
+	StartScript 
+	Call sub_0806C674
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	StopScript 
+script_0800E806:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E806
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C70C
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	Jump script_0800E806
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0000
+	StopScript 
+script_0800E832:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E832
+	_0807E864 
+	_0807EB44 0x0004
+	StartScript 
+	TextboxNoOverlapFollow 0x4501
+	CallWithArg sub_0807F854, 0x00010032
+	CallWithArg sub_0807F854, 0x000200c8
+	CallWithArg sub_0807F854, 0x00030190
+	StopScript 
+	_0807EA94 
+	_0807EB38 
+	JumpSwitch_4 script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872
+script_0800E872:
+	StartScript 
+	TextboxNoOverlapFollow 0x4505
+	CallWithArg sub_0807F854, 0x00010190
+	StopScript 
+	_0807EA94 
+	HasRupees 0x0190
+	JumpIfNot script_0800E908
+	ModRupees 0xfe70
+	SetLocalFlag 0x0091
+	TextboxNoOverlapFollow 0x4508
+	_0807EA94 
+	Call sub_0806C578
 SCRIPT_END
diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc
index eae4041a..321568d2 100644
--- a/data/scripts/script_0800E8A4.inc
+++ b/data/scripts/script_0800E8A4.inc
@@ -1,14 +1,15 @@
 SCRIPT_START script_0800E8A4
-StartScript 
-TextboxNoOverlapFollow 0x4504
-CallWithArg sub_0807F854, 0x000100c8
-StopScript 
-_0807EA94 
-HasRupees 0x00c8
-JumpIfNot 0x004a
-ModRupees 0xff38
-SetLocalFlag 0x0091
-TextboxNoOverlapFollow 0x4508
-_0807EA94 
-Call sub_0806C588
+script_0800E8A4:
+	StartScript 
+	TextboxNoOverlapFollow 0x4504
+	CallWithArg sub_0807F854, 0x000100c8
+	StopScript 
+	_0807EA94 
+	HasRupees 0x00c8
+	JumpIfNot script_0800E908
+	ModRupees 0xff38
+	SetLocalFlag 0x0091
+	TextboxNoOverlapFollow 0x4508
+	_0807EA94 
+	Call sub_0806C588
 SCRIPT_END
diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc
index 1c9221a8..77873d81 100644
--- a/data/scripts/script_0800E8D6.inc
+++ b/data/scripts/script_0800E8D6.inc
@@ -1,14 +1,15 @@
 SCRIPT_START script_0800E8D6
-StartScript 
-TextboxNoOverlapFollow 0x4503
-CallWithArg sub_0807F854, 0x00010032
-StopScript 
-_0807EA94 
-HasRupees 0x0032
-JumpIfNot 0x0018
-ModRupees 0xffce
-SetLocalFlag 0x0091
-TextboxNoOverlapFollow 0x4508
-_0807EA94 
-Call FUN_0806c598
+script_0800E8D6:
+	StartScript 
+	TextboxNoOverlapFollow 0x4503
+	CallWithArg sub_0807F854, 0x00010032
+	StopScript 
+	_0807EA94 
+	HasRupees 0x0032
+	JumpIfNot script_0800E908
+	ModRupees 0xffce
+	SetLocalFlag 0x0091
+	TextboxNoOverlapFollow 0x4508
+	_0807EA94 
+	Call FUN_0806c598
 SCRIPT_END
diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc
index f1bc6922..ccee015f 100644
--- a/data/scripts/script_0800E908.inc
+++ b/data/scripts/script_0800E908.inc
@@ -1,65 +1,72 @@
 SCRIPT_START script_0800E908
-TextboxNoOverlapFollow 0x4507
-Jump 0x0006
-TextboxNoOverlapFollow 0x4509
-_0807EA94 
-_0807E878 
-_0807EB44 0x0000
-Jump 0xff14
-StartScript 
-Call sub_0806C4F8
-_0807EF80 0x000a
-_0807EB44 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB44 0x0004
-_0807E930 0x0004
-Call sub_0806C4A8
-JumpIfNot 0xfff8
-Call sub_0806C4DC
-_0807EA94 
-_0807E878 
-_0807EB44 0x0000
-_0807E930 0x0000
-Jump 0xffd2
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E930 0x0008
-Call sub_0807F2D4
-_0807E930 0x0009
-Call sub_0806B260
-JumpIfNot 0x0052
-_0807EA94 
-_0807EF80 0x000b
-StartPlayerScript script_0800E9F4
-WaitForSomething2 0x00000001
-_0807EF80 0x000a
-TextboxNoOverlapFollow 0x4a24
-_0807EA94 
-_0807E930 0x000a
-Wait 0x0014
-TextboxNoOverlapFollow 0x4a25
-_0807EA94 
-_0807E930 0x0000
-StartPlayerScript script_0800EA1C
-WaitForSomething2 0x00000001
-SetLocalFlag 0x0074
-SoundReq 0x0072
-Wait 0x00f0
-TextboxNoOverlapFollow 0x4a26
-_0807EA94 
-SetLocalFlag 0x0075
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807E930 0x0000
-Jump 0xff82
+script_0800E908:
+	TextboxNoOverlapFollow 0x4507
+	Jump script_0800E914
+script_0800E910:
+	TextboxNoOverlapFollow 0x4509
+script_0800E914:
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0000
+	Jump script_0800E832
+	StartScript 
+	Call sub_0806C4F8
+	_0807EF80 0x000a
+	_0807EB44 0x0000
+	StopScript 
+script_0800E932:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E932
+	_0807E864 
+	_0807EB44 0x0004
+	_0807E930 0x0004
+script_0800E942:
+	Call sub_0806C4A8
+	JumpIfNot script_0800E942
+	Call sub_0806C4DC
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	Jump script_0800E932
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	StopScript 
+script_0800E974:
+	CheckEntityInteractType 
+	JumpIfNot script_0800E974
+	_0807E864 
+	_0807E930 0x0008
+	Call sub_0807F2D4
+	_0807E930 0x0009
+	Call sub_0806B260
+	JumpIfNot script_0800E9E4
+	_0807EA94 
+	_0807EF80 0x000b
+	StartPlayerScript script_0800E9F4
+	WaitForSomething2 0x00000001
+	_0807EF80 0x000a
+	TextboxNoOverlapFollow 0x4a24
+	_0807EA94 
+	_0807E930 0x000a
+	Wait 0x0014
+	TextboxNoOverlapFollow 0x4a25
+	_0807EA94 
+	_0807E930 0x0000
+	StartPlayerScript script_0800EA1C
+	WaitForSomething2 0x00000001
+	SetLocalFlag 0x0074
+	SoundReq 0x0072
+	Wait 0x00f0
+	TextboxNoOverlapFollow 0x4a26
+	_0807EA94 
+	SetLocalFlag 0x0075
+script_0800E9E4:
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	_0807E930 0x0000
+	Jump script_0800E974
diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc
index 4886ddca..f31ca4d3 100644
--- a/data/scripts/script_0800E9F4.inc
+++ b/data/scripts/script_0800E9F4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800E9F4
-StartScript 
-_0807EB44 0x0004
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0078, 0x0080
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	_0807EB44 0x0004
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x0078, 0x0080
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800EA1C.inc b/data/scripts/script_0800EA1C.inc
index 90231e22..294402ba 100644
--- a/data/scripts/script_0800EA1C.inc
+++ b/data/scripts/script_0800EA1C.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_0800EA1C
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x0014
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x0014
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x0005
-Wait 0x003c
-_0807E5F8 0x00000001
-Call sub_080791BC
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	Wait 0x0014
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x0014
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x0005
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc
index aa15a6e9..4177a721 100644
--- a/data/scripts/script_0800EA54.inc
+++ b/data/scripts/script_0800EA54.inc
@@ -1,326 +1,347 @@
 SCRIPT_START script_0800EA54
-StartScript 
-Call sub_0806CE5C
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0008
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-Call sub_0807F2D4
-_0807E930 0x0009
-Call sub_0806CE80
-_0807EA94 
-_0807E878 
-_0807E930 0x000a
-Call sub_0807F2D4
-_0807E930 0x0008
-Jump 0xffc8
-StartScript 
-_0807E9D4 
-Call sub_0806C09C
-_0807EF80 0x000a
-_0807E930 0x0000
-_0807EB44 0x0004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-StartScript 
-_0807E864 
-_0807EB74 
-CallWithArg sub_0806C028, 0x00000004
-StopScript 
-Call sub_0806C00C
-JumpIfNot 0xfff8
-_0807E930 0x0008
-Call sub_0806C038
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807E930 0x0000
-Jump 0xffc6
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0006
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-_0807EB44 0x0006
-Call sub_08061FD8
-Jump 0xffda
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0002
-Call sub_08061FD8
-StopScript 
-Jump 0x0036
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-Jump 0x001a
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0006
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0002
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-_0807EB44 0x0002
-Call sub_08061FD8
-Jump 0xffda
-StartScript 
-Call sub_08061E70
-_0807EF80 0x000a
-_0807EB44 0x0004
-Call sub_08061FD8
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FD8
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-_0807E9D4 
-CallWithArg sub_08061FB8, 0x00000001
-SetEntityNonPlanarMovement 0x0040
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0002
-StopScript 
-_0807EB44 0x0006
-_0807E930 0x0007
-_0807EDD4 0x0028, 0x0050
-Wait 0x001e
-_0807EB44 0x0004
-_0807E930 0x0002
-Wait 0x001e
-_0807EB44 0x0002
-_0807E930 0x0001
-Wait 0x001e
-_0807EB44 0x0002
-_0807E930 0x0005
-_0807EDD4 0x0048, 0x0050
-Wait 0x001e
-_0807EB44 0x0004
-_0807E930 0x0002
-Wait 0x001e
-_0807EB44 0x0006
-_0807E930 0x0003
-Wait 0x001e
-Jump 0xffaa
-StartScript 
-Call sub_080639D0
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CallWithArg sub_08063850, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_08063850, 0x00000000
-Call sub_08063944
-_0807EA94 
-JumpIfNot 0x0008
-_0807F050 0x0070
-WaitPlayerAction8 
-_0807E878 
-Call sub_08063874
-CallWithArg sub_08063850, 0x00000000
-Jump 0xffc6
-StartScript 
-Call sub_08064CC0
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0002
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-_0807EB74 
-Call sub_08064CD8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x0016
-TestBit 0x00000001
-JumpIf 0x0068
-Call sub_0806AEE4
-Jump 0xffe4
-StopScript 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x00ae
-JumpIf 0x0078
-Wait 0x000a
-_0807E5F8 0x00000001
-TextboxNoOverlapFollow 0x4c07
-_0807EA94 
-_0807E5F8 0x00000010
-TextboxNoOverlapFollow 0x4c08
-_0807EA94 
-_0807E5F8 0x00000020
-TextboxNoOverlapFollow 0x4c09
-_0807EA94 
-_0807E914 0x00000503
-Call sub_0807F420
-_0807E5F8 0x00000040
-Call sub_0807DF50
-_0807E878 
-SetLocalFlag 0x00ae
-Jump 0xff88
-StopScript 
-WaitForSomething2 0x00000002
-_0807EB44 0x0002
-CallWithArg sub_0806AF60, 0x00000008
-WaitForSomething2 0x00000004
-Call sub_0806AED8
-WaitForSomething2 0x00000008
-Jump 0xff5c
-TextboxNoOverlapFollow 0x4c16
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xff4a
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x0016
-TestBit 0x00000001
-JumpIf 0x0068
-Call sub_0806AEE4
-Jump 0xffe4
-StopScript 
-_0807E864 
-Call sub_0807DF28
-CheckLocalFlag 0x00ae
-JumpIf 0x0078
-Wait 0x000a
-_0807E5F8 0x00000001
-TextboxNoOverlapFollow 0x4c07
-_0807EA94 
-_0807E5F8 0x00000002
-TextboxNoOverlapFollow 0x4c08
-_0807EA94 
-_0807E5F8 0x00000004
-TextboxNoOverlapFollow 0x4c09
-_0807EA94 
-_0807E914 0x00000503
-Call sub_0807F420
-_0807E5F8 0x00000008
-Call sub_0807DF50
-_0807E878 
-SetLocalFlag 0x00ae
-Jump 0xff88
-StopScript 
-WaitForSomething2 0x00000010
-_0807EB44 0x0006
-CallWithArg sub_0806AF60, 0x00000008
-WaitForSomething2 0x00000020
-Call sub_0806AED8
-WaitForSomething2 0x00000040
-Jump 0xff5c
-TextboxNoOverlapFollow 0x4c15
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xff4a
-TextboxNoOverlapFollow 0x4c07
-_0807EA94 
-_0807E5F8 0x00000012
-Wait 0x000a
-TextboxNoOverlapFollow 0x4c08
-_0807EA94 
-_0807E5F8 0x00000024
-TextboxNoOverlapFollow 0x4c09
-_0807EA94 
-_0807E5F8 0x00000048
-Call sub_080791BC
+	StartScript 
+	Call sub_0806CE5C
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	StopScript 
+script_0800EA6A:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EA6A
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000004
+	Call sub_0807F2D4
+	_0807E930 0x0009
+	Call sub_0806CE80
+	_0807EA94 
+	_0807E878 
+	_0807E930 0x000a
+	Call sub_0807F2D4
+	_0807E930 0x0008
+	Jump script_0800EA6A
+	StartScript 
+	_0807E9D4 
+	Call sub_0806C09C
+	_0807EF80 0x000a
+	_0807E930 0x0000
+	_0807EB44 0x0004
+	StopScript 
+script_0800EABC:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EABC
+	StartScript 
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0806C028, 0x00000004
+	StopScript 
+script_0800EAD4:
+	Call sub_0806C00C
+	JumpIfNot script_0800EAD4
+	_0807E930 0x0008
+	Call sub_0806C038
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	_0807E930 0x0000
+	Jump script_0800EABC
+	StartScript 
+	Call sub_0806C870
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	StopScript 
+script_0800EB0E:
+	_0807E30C 
+	JumpIfNot script_0800EB0E
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800EB0E
+	.short 0x0000
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	Call sub_08061FD8
+	StopScript 
+script_0800EB44:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EB44
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	Jump script_0800EB44
+	.short 0x0000
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0006
+	Call sub_08061FD8
+	StopScript 
+script_0800EB7C:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EB7C
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0006
+	Call sub_08061FD8
+	Jump script_0800EB7C
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0002
+	Call sub_08061FD8
+	StopScript 
+	Jump script_0800EBF4
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	Call sub_08061FD8
+	StopScript 
+	Jump script_0800EBF4
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0006
+	Call sub_08061FD8
+	StopScript 
+script_0800EBF4:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EBF4
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	Jump script_0800EBF4
+	.short 0x0000
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0002
+	Call sub_08061FD8
+	StopScript 
+script_0800EC2C:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EC2C
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0002
+	Call sub_08061FD8
+	Jump script_0800EC2C
+	StartScript 
+	Call sub_08061E70
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	Call sub_08061FD8
+	StopScript 
+script_0800EC6C:
+	CheckEntityInteractType 
+	JumpIfNot script_0800EC6C
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FD8
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	Jump script_0800EC6C
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	CallWithArg sub_08061FB8, 0x00000001
+	SetEntityNonPlanarMovement 0x0040
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0002
+	StopScript 
+script_0800ECAC:
+	_0807EB44 0x0006
+	_0807E930 0x0007
+	_0807EDD4 0x0028, 0x0050
+	Wait 0x001e
+	_0807EB44 0x0004
+	_0807E930 0x0002
+	Wait 0x001e
+	_0807EB44 0x0002
+	_0807E930 0x0001
+	Wait 0x001e
+	_0807EB44 0x0002
+	_0807E930 0x0005
+	_0807EDD4 0x0048, 0x0050
+	Wait 0x001e
+	_0807EB44 0x0004
+	_0807E930 0x0002
+	Wait 0x001e
+	_0807EB44 0x0006
+	_0807E930 0x0003
+	Wait 0x001e
+	Jump script_0800ECAC
+	StartScript 
+	Call sub_080639D0
+	_0807EF80 0x000a
+	StopScript 
+	StartScript 
+	CallWithArg sub_08063850, 0x00000000
+	StopScript 
+script_0800ED20:
+	CheckEntityInteractType 
+	JumpIfNot script_0800ED20
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_08063850, 0x00000000
+	Call sub_08063944
+	_0807EA94 
+	JumpIfNot script_0800ED46
+	_0807F050 0x0070
+	WaitPlayerAction8 
+script_0800ED46:
+	_0807E878 
+	Call sub_08063874
+	CallWithArg sub_08063850, 0x00000000
+	Jump script_0800ED20
+	StartScript 
+	Call sub_08064CC0
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	_0807EB44 0x0002
+	_0807E930 0x0000
+	StopScript 
+script_0800ED76:
+	_0807E944 
+	_0807E864 
+	_0807EB74 
+	Call sub_08064CD8
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800ED76
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+script_0800ED98:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800EDB6
+	TestBit 0x00000001
+	JumpIf script_0800EE12
+	Call sub_0806AEE4
+	Jump script_0800ED98
+script_0800EDB6:
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	CheckLocalFlag 0x00ae
+	JumpIf script_0800EE3E
+	Wait 0x000a
+	_0807E5F8 0x00000001
+	TextboxNoOverlapFollow 0x4c07
+	_0807EA94 
+	_0807E5F8 0x00000010
+	TextboxNoOverlapFollow 0x4c08
+	_0807EA94 
+	_0807E5F8 0x00000020
+	TextboxNoOverlapFollow 0x4c09
+	_0807EA94 
+	_0807E914 0x00000503
+	Call sub_0807F420
+	_0807E5F8 0x00000040
+	Call sub_0807DF50
+	_0807E878 
+	SetLocalFlag 0x00ae
+	Jump script_0800ED98
+script_0800EE12:
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EB44 0x0002
+	CallWithArg sub_0806AF60, 0x00000008
+	WaitForSomething2 0x00000004
+	Call sub_0806AED8
+	WaitForSomething2 0x00000008
+	Jump script_0800ED98
+script_0800EE3E:
+	TextboxNoOverlapFollow 0x4c16
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800ED98
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+script_0800EE58:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0800EE76
+	TestBit 0x00000001
+	JumpIf script_0800EED2
+	Call sub_0806AEE4
+	Jump script_0800EE58
+script_0800EE76:
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	CheckLocalFlag 0x00ae
+	JumpIf script_0800EEFE
+	Wait 0x000a
+	_0807E5F8 0x00000001
+	TextboxNoOverlapFollow 0x4c07
+	_0807EA94 
+	_0807E5F8 0x00000002
+	TextboxNoOverlapFollow 0x4c08
+	_0807EA94 
+	_0807E5F8 0x00000004
+	TextboxNoOverlapFollow 0x4c09
+	_0807EA94 
+	_0807E914 0x00000503
+	Call sub_0807F420
+	_0807E5F8 0x00000008
+	Call sub_0807DF50
+	_0807E878 
+	SetLocalFlag 0x00ae
+	Jump script_0800EE58
+script_0800EED2:
+	StopScript 
+	WaitForSomething2 0x00000010
+	_0807EB44 0x0006
+	CallWithArg sub_0806AF60, 0x00000008
+	WaitForSomething2 0x00000020
+	Call sub_0806AED8
+	WaitForSomething2 0x00000040
+	Jump script_0800EE58
+script_0800EEFE:
+	TextboxNoOverlapFollow 0x4c15
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0800EE58
+	TextboxNoOverlapFollow 0x4c07
+	_0807EA94 
+	_0807E5F8 0x00000012
+	Wait 0x000a
+	TextboxNoOverlapFollow 0x4c08
+	_0807EA94 
+	_0807E5F8 0x00000024
+	TextboxNoOverlapFollow 0x4c09
+	_0807EA94 
+	_0807E5F8 0x00000048
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc
index 88068427..ac9171e9 100644
--- a/data/scripts/script_0800EF40.inc
+++ b/data/scripts/script_0800EF40.inc
@@ -1,26 +1,29 @@
 SCRIPT_START script_0800EF40
-StartScript 
-_0807EF80 0x0007
-CheckGlobalFlag 0x001f
-JumpIf 0x0046
-StopScript 
-Call sub_080869A4
-JumpIfNot 0xfff8
-_0807E864 
-CheckLocalFlagByOffset 0x0200, 0x006d
-JumpIf 0x001e
-TextboxNoOverlapFollow 0x4d01
-_0807EA94 
-StartPlayerScript script_0800EF9C
-WaitForSomething2 0x00000001
-Wait 0x000f
-_0807E878 
-Jump 0xffd0
-SetGlobalFlag 0x001f
-TextboxNoOverlapFollow 0x4d02
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Call sub_0808692C
+	StartScript 
+	_0807EF80 0x0007
+	CheckGlobalFlag 0x001f
+	JumpIf script_0800EF92
+	StopScript 
+script_0800EF50:
+	Call sub_080869A4
+	JumpIfNot script_0800EF50
+	_0807E864 
+	CheckLocalFlagByOffset 0x0200, 0x006d
+	JumpIf script_0800EF82
+	TextboxNoOverlapFollow 0x4d01
+	_0807EA94 
+	StartPlayerScript script_0800EF9C
+	WaitForSomething2 0x00000001
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800EF50
+script_0800EF82:
+	SetGlobalFlag 0x001f
+	TextboxNoOverlapFollow 0x4d02
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+script_0800EF92:
+	Call sub_0808692C
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc
index f595e913..3b34ef6f 100644
--- a/data/scripts/script_0800EF9C.inc
+++ b/data/scripts/script_0800EF9C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800EF9C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807ECC4 0x0008
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807ECC4 0x0008
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc
index b9f57673..d6e86144 100644
--- a/data/scripts/script_0800EFC0.inc
+++ b/data/scripts/script_0800EFC0.inc
@@ -1,86 +1,91 @@
 SCRIPT_START script_0800EFC0
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807E9D4 
-_0807EF80 0x000a
-CheckLocalFlag 0x007b
-JumpIf 0x00b0
-StopScript 
-Jump 0x0026
-_0807EB44 0x0006
-CallWithArg sub_0806AF60, 0x00000008
-Wait 0x0004
-_0807EB44 0x0004
-CallWithArg sub_0806AF60, 0x00000008
-Wait 0x0004
-_0807EB44 0x0002
-CallWithArg sub_0806AF60, 0x00000008
-Wait 0x0004
-_0807EB44 0x0002
-CallWithArg sub_0806AF60, 0x00000004
-_0807EDD4 0x0088, 0x0040
-_0807EF80 0x000a
-_0807EB44 0x0002
-CallWithArg sub_0806AF60, 0x00000008
-Wait 0x0004
-_0807EB44 0x0004
-CallWithArg sub_0806AF60, 0x00000008
-Wait 0x0004
-_0807EB44 0x0006
-CallWithArg sub_0806AF60, 0x00000008
-Wait 0x0004
-_0807EB44 0x0006
-CallWithArg sub_0806AF60, 0x00000004
-_0807EDD4 0x0068, 0x0040
-_0807EF80 0x000a
-CheckLocalFlag 0x007b
-JumpIf 0x0006
-Jump 0xff5a
-StopScript 
-Call sub_0806AEE4
-Jump 0xfff6
-.short 0x0000
-StartScript 
-_0807F0B4 0x0001
-CameraTargetPlayer 
-StopScript 
-CheckPlayerInRegion 0x01f8, 0x0338, 0x1030
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-LoadRoomEntityList gUnk_080EE8AC
-StartPlayerScript script_0800F14C
-WaitForSomething2 0x00000001
-_0807E5F8 0x0000001e
-WaitForSomething2 0x00000040
-TextboxNoOverlapFollowPos 0x000c1201
-_0807EA94 
-WaitForSomething2 0x000003c0
-_0807E8E4_0 
-TextboxNoOverlapFollowPos 0x000c1202
-_0807EA94 
-_0807F034 0x0067
-WaitPlayerAction8 
-_0807E8E4_0 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000040
-TextboxNoOverlapFollowPos 0x000c1203
-_0807EA94 
-_0807E5F8 0x00000002
-Call sub_0807DF50
-_0807E878 
-WaitForSomething2 0x00000040
-CheckKinstoneFused 0x0032
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807DF28
-_0807E5F8 0x0000001e
-Wait 0x003c
-_0807E8E4_1 
-WaitForSomething2 0x000003c0
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807E9D4 
+	_0807EF80 0x000a
+	CheckLocalFlag 0x007b
+	JumpIf script_0800F082
+	StopScript 
+	Jump script_0800EFFE
+script_0800EFDA:
+	_0807EB44 0x0006
+	CallWithArg sub_0806AF60, 0x00000008
+	Wait 0x0004
+	_0807EB44 0x0004
+	CallWithArg sub_0806AF60, 0x00000008
+	Wait 0x0004
+script_0800EFFE:
+	_0807EB44 0x0002
+	CallWithArg sub_0806AF60, 0x00000008
+	Wait 0x0004
+	_0807EB44 0x0002
+	CallWithArg sub_0806AF60, 0x00000004
+	_0807EDD4 0x0088, 0x0040
+	_0807EF80 0x000a
+	_0807EB44 0x0002
+	CallWithArg sub_0806AF60, 0x00000008
+	Wait 0x0004
+	_0807EB44 0x0004
+	CallWithArg sub_0806AF60, 0x00000008
+	Wait 0x0004
+	_0807EB44 0x0006
+	CallWithArg sub_0806AF60, 0x00000008
+	Wait 0x0004
+	_0807EB44 0x0006
+	CallWithArg sub_0806AF60, 0x00000004
+	_0807EDD4 0x0068, 0x0040
+	_0807EF80 0x000a
+	CheckLocalFlag 0x007b
+	JumpIf script_0800F082
+	Jump script_0800EFDA
+script_0800F082:
+	StopScript 
+	Call sub_0806AEE4
+	Jump script_0800F082
+	.short 0x0000
+	StartScript 
+	_0807F0B4 0x0001
+	CameraTargetPlayer 
+	StopScript 
+script_0800F09A:
+	CheckPlayerInRegion 0x01f8, 0x0338, 0x1030
+	JumpIfNot script_0800F09A
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	LoadRoomEntityList gUnk_080EE8AC
+	StartPlayerScript script_0800F14C
+	WaitForSomething2 0x00000001
+	_0807E5F8 0x0000001e
+	WaitForSomething2 0x00000040
+	TextboxNoOverlapFollowPos 0x000c1201
+	_0807EA94 
+	WaitForSomething2 0x000003c0
+	_0807E8E4_0 
+	TextboxNoOverlapFollowPos 0x000c1202
+	_0807EA94 
+	_0807F034 0x0067
+	WaitPlayerAction8 
+	_0807E8E4_0 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000040
+	TextboxNoOverlapFollowPos 0x000c1203
+	_0807EA94 
+	_0807E5F8 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+	WaitForSomething2 0x00000040
+script_0800F11A:
+	CheckKinstoneFused 0x0032
+	JumpIfNot script_0800F11A
+	_0807E864 
+	Call sub_0807DF28
+	_0807E5F8 0x0000001e
+	Wait 0x003c
+	_0807E8E4_1 
+	WaitForSomething2 0x000003c0
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc
index ef9c6782..caf956b4 100644
--- a/data/scripts/script_0800F14C.inc
+++ b/data/scripts/script_0800F14C.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_0800F14C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0000
-_0807EB44 0x0006
-_0807EF80 0x0004
-Wait 0x003c
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x0338
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0000
+	_0807EB44 0x0006
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x0338
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc
index d7085d14..0970d0a9 100644
--- a/data/scripts/script_0800F184.inc
+++ b/data/scripts/script_0800F184.inc
@@ -1,107 +1,113 @@
 SCRIPT_START script_0800F184
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0008
-_0807EF80 0x000a
-StopScript 
-Call sub_0807F348
-_0807EB44 0x0002
-WaitForSomething2 0x00000002
-_0807EF80 0x0007
-_0807EDD4 0x01b8, 0x0328
-_0807E5F8 0x00000040
-_0807EDD4 0x01f8, 0x0328
-_0807EB44 0x0004
-_0807E930 0x0008
-_0807E8E4_0 
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-Call sub_0806E440
-Wait 0x0078
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-StopScript 
-StartScript 
-CallWithArg sub_0807F680, 0x000001c0
-JumpIf 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000c1206
-_0807EA94 
-StartPlayerScript script_0800F33C
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xffbe
-CallWithArg sub_0807F680, 0x00000230
-JumpIfNot 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000c1206
-_0807EA94 
-StartPlayerScript script_0800F354
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xff7e
-CallWithArg sub_0807F6B4, 0x00000310
-JumpIf 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000c1206
-_0807EA94 
-StartPlayerScript script_0800F36C
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xff3e
-CallWithArg sub_0807F6B4, 0x00000340
-JumpIfNot 0x0034
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-_0807EB74 
-_0807E930 0x0008
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000c1206
-_0807EA94 
-StartPlayerScript script_0800F384
-WaitForSomething2 0x00000400
-_0807E878 
-Jump 0xfefe
-StopScript 
-StartScript 
-CheckKinstoneFused 0x0032
-JumpIf 0x0020
-CheckEntityInteractType 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-_0807EB74 
-_0807E930 0x0008
-TextboxNoOverlapFollowPos 0x000c1208
-_0807EA94 
-_0807E878 
-Jump 0xfed4
-StopScript 
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0002
-_0807EEF4 0x00c0, 0x0000
-_0807E5F8 0x00000040
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0008
+	_0807EF80 0x000a
+	StopScript 
+	Call sub_0807F348
+	_0807EB44 0x0002
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0007
+	_0807EDD4 0x01b8, 0x0328
+	_0807E5F8 0x00000040
+	_0807EDD4 0x01f8, 0x0328
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	_0807E8E4_0 
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+	Call sub_0806E440
+	Wait 0x0078
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+script_0800F1E6:
+	StopScript 
+	StartScript 
+	CallWithArg sub_0807F680, 0x000001c0
+	JumpIf script_0800F22A
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	_0807EB74 
+	_0807E930 0x0008
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000c1206
+	_0807EA94 
+	StartPlayerScript script_0800F33C
+	WaitForSomething2 0x00000400
+	_0807E878 
+	Jump script_0800F1E6
+script_0800F22A:
+	CallWithArg sub_0807F680, 0x00000230
+	JumpIfNot script_0800F26A
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	_0807EB74 
+	_0807E930 0x0008
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000c1206
+	_0807EA94 
+	StartPlayerScript script_0800F354
+	WaitForSomething2 0x00000400
+	_0807E878 
+	Jump script_0800F1E6
+script_0800F26A:
+	CallWithArg sub_0807F6B4, 0x00000310
+	JumpIf script_0800F2AA
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	_0807EB74 
+	_0807E930 0x0008
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000c1206
+	_0807EA94 
+	StartPlayerScript script_0800F36C
+	WaitForSomething2 0x00000400
+	_0807E878 
+	Jump script_0800F1E6
+script_0800F2AA:
+	CallWithArg sub_0807F6B4, 0x00000340
+	JumpIfNot script_0800F2EA
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	_0807EB74 
+	_0807E930 0x0008
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000c1206
+	_0807EA94 
+	StartPlayerScript script_0800F384
+	WaitForSomething2 0x00000400
+	_0807E878 
+	Jump script_0800F1E6
+script_0800F2EA:
+	StopScript 
+	StartScript 
+	CheckKinstoneFused 0x0032
+	JumpIf script_0800F314
+	CheckEntityInteractType 
+	JumpIfNot script_0800F2EA
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807E930 0x0008
+	TextboxNoOverlapFollowPos 0x000c1208
+	_0807EA94 
+	_0807E878 
+	Jump script_0800F1E6
+script_0800F314:
+	StopScript 
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0002
+	_0807EEF4 0x00c0, 0x0000
+	_0807E5F8 0x00000040
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc
index dc1f6082..7fa6f67e 100644
--- a/data/scripts/script_0800F33C.inc
+++ b/data/scripts/script_0800F33C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800F33C
-SetEntityNonPlanarMovement 0x0100
-_0807EC94 0x0008
-_0807E5F8 0x00000400
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EC94 0x0008
+	_0807E5F8 0x00000400
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc
index 5c1f73fc..faa7609d 100644
--- a/data/scripts/script_0800F354.inc
+++ b/data/scripts/script_0800F354.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800F354
-SetEntityNonPlanarMovement 0x0100
-_0807ECF4 0x0008
-_0807E5F8 0x00000400
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807ECF4 0x0008
+	_0807E5F8 0x00000400
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc
index bbcf2d2d..3f5d8959 100644
--- a/data/scripts/script_0800F36C.inc
+++ b/data/scripts/script_0800F36C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800F36C
-SetEntityNonPlanarMovement 0x0100
-_0807ECC4 0x0008
-_0807E5F8 0x00000400
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807ECC4 0x0008
+	_0807E5F8 0x00000400
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc
index 73715ca6..349b1715 100644
--- a/data/scripts/script_0800F384.inc
+++ b/data/scripts/script_0800F384.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800F384
-SetEntityNonPlanarMovement 0x0100
-_0807EC64 0x0008
-_0807E5F8 0x00000400
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EC64 0x0008
+	_0807E5F8 0x00000400
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc
index c1b6971f..2bd4c895 100644
--- a/data/scripts/script_0800F39C.inc
+++ b/data/scripts/script_0800F39C.inc
@@ -1,40 +1,42 @@
 SCRIPT_START script_0800F39C
-StartScript 
-_0807E9D4 
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x000b
-StopScript 
-Call sub_0807F348
-WaitForSomething2 0x00000004
-_0807EF80 0x0007
-_0807EDD4 0x01f8, 0x0318
-_0807EDD4 0x0208, 0x0318
-_0807EDD4 0x0208, 0x0338
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E5F8 0x00000080
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0x0010
-StopScript 
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x1237
-_0807EA94 
-_0807E878 
-TestBit 0x00000004
-JumpIfNot 0xffe0
-StopScript 
-_0807EF80 0x000b
-Wait 0x0010
-SetEntityNonPlanarMovement 0x0100
-_0807EC64 0x0010
-_0807EDD4 0x0288, 0x0328
-_0807E5F8 0x00000080
-_0807EF80 0x0006
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x000b
+	StopScript 
+	Call sub_0807F348
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0007
+	_0807EDD4 0x01f8, 0x0318
+	_0807EDD4 0x0208, 0x0318
+	_0807EDD4 0x0208, 0x0338
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E5F8 0x00000080
+script_0800F3EA:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIfNot script_0800F402
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x1237
+	_0807EA94 
+	_0807E878 
+script_0800F402:
+	TestBit 0x00000004
+	JumpIfNot script_0800F3EA
+	StopScript 
+	_0807EF80 0x000b
+	Wait 0x0010
+	SetEntityNonPlanarMovement 0x0100
+	_0807EC64 0x0010
+	_0807EDD4 0x0288, 0x0328
+	_0807E5F8 0x00000080
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc
index 224af45b..1eb6f57c 100644
--- a/data/scripts/script_0800F430.inc
+++ b/data/scripts/script_0800F430.inc
@@ -1,41 +1,43 @@
 SCRIPT_START script_0800F430
-StartScript 
-_0807E9D4 
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x000b
-StopScript 
-Call sub_0807F348
-WaitForSomething2 0x00000008
-_0807EF80 0x0007
-_0807EDD4 0x01d8, 0x0328
-_0807EDD4 0x01f8, 0x0348
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E5F8 0x00000100
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0x0010
-StopScript 
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x1238
-_0807EA94 
-_0807E878 
-TestBit 0x00000008
-JumpIfNot 0xffe0
-StopScript 
-_0807EF80 0x000b
-Wait 0x0018
-SetEntityNonPlanarMovement 0x0100
-_0807EC94 0x0010
-_0807EC64 0x0020
-_0807EDD4 0x0288, 0x0328
-_0807E5F8 0x00000100
-_0807EF80 0x0006
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x000b
+	StopScript 
+	Call sub_0807F348
+	WaitForSomething2 0x00000008
+	_0807EF80 0x0007
+	_0807EDD4 0x01d8, 0x0328
+	_0807EDD4 0x01f8, 0x0348
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E5F8 0x00000100
+script_0800F478:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIfNot script_0800F490
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x1238
+	_0807EA94 
+	_0807E878 
+script_0800F490:
+	TestBit 0x00000008
+	JumpIfNot script_0800F478
+	StopScript 
+	_0807EF80 0x000b
+	Wait 0x0018
+	SetEntityNonPlanarMovement 0x0100
+	_0807EC94 0x0010
+	_0807EC64 0x0020
+	_0807EDD4 0x0288, 0x0328
+	_0807E5F8 0x00000100
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc
index b8d07b80..f3fe6d92 100644
--- a/data/scripts/script_0800F4C4.inc
+++ b/data/scripts/script_0800F4C4.inc
@@ -1,40 +1,42 @@
 SCRIPT_START script_0800F4C4
-StartScript 
-_0807E9D4 
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x000b
-StopScript 
-Call sub_0807F348
-WaitForSomething2 0x00000010
-_0807EF80 0x0007
-_0807EDD4 0x01c8, 0x0328
-_0807EDD4 0x01e8, 0x0338
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E5F8 0x00000200
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0x0010
-StopScript 
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x1239
-_0807EA94 
-_0807E878 
-TestBit 0x00000010
-JumpIfNot 0xffe0
-StopScript 
-_0807EF80 0x000b
-Wait 0x0028
-SetEntityNonPlanarMovement 0x0100
-_0807EC64 0x0010
-_0807EDD4 0x0288, 0x0328
-_0807E5F8 0x00000200
-_0807EF80 0x0006
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x000b
+	StopScript 
+	Call sub_0807F348
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0007
+	_0807EDD4 0x01c8, 0x0328
+	_0807EDD4 0x01e8, 0x0338
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E5F8 0x00000200
+script_0800F50C:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIfNot script_0800F524
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x1239
+	_0807EA94 
+	_0807E878 
+script_0800F524:
+	TestBit 0x00000010
+	JumpIfNot script_0800F50C
+	StopScript 
+	_0807EF80 0x000b
+	Wait 0x0028
+	SetEntityNonPlanarMovement 0x0100
+	_0807EC64 0x0010
+	_0807EDD4 0x0288, 0x0328
+	_0807E5F8 0x00000200
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc
index 3a838c38..e67e84b7 100644
--- a/data/scripts/script_0800F554.inc
+++ b/data/scripts/script_0800F554.inc
@@ -1,139 +1,151 @@
 SCRIPT_START script_0800F554
-StartScript 
-Call sub_08061FE4
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FE4
-Call sub_08061FF4
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-_0807EF80 0x0001
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-_0807EF80 0x0001
-Jump 0xffe6
-.short 0x0000
-StartScript 
-_0807EB44 0x0006
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000008
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-Call sub_08064428
-_0807EA94 
-_0807E878 
-Jump 0xffe0
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-TextboxNoOverlap 0x2511
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffde
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EF80 0x0001
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0001
-Call sub_0806B4F0
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807E9D4 
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-CheckLocalFlag 0x00cd
-JumpIf 0x000a
-TextboxNoOverlap 0x2512
-Jump 0x0006
-TextboxNoOverlap 0x251f
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000000
-Jump 0xffc4
-.short 0x0000
-StartScript 
-_0807EF80 0x0001
-_0807E9D4 
-_0807EF80 0x000a
-Call sub_08062788
-StopScript 
-CheckLocalFlag 0x00cd
-JumpIf 0x001e
-CheckEntityInteractType 
-JumpIfNot 0xfff4
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-_0807EF80 0x0001
-Jump 0xffde
-Call sub_080627E8
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08061FE4
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_0800F564:
+	CheckEntityInteractType 
+	JumpIfNot script_0800F564
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FE4
+	Call sub_08061FF4
+	_0807EA94 
+	_0807E878 
+	Jump script_0800F564
+	.short 0x0000
+script_0800F584:
+	StartScript 
+	_0807EF80 0x0001
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_0800F592:
+	CheckEntityInteractType 
+	JumpIfNot script_0800F592
+	_0807E864 
+	_0807EB74 
+	Call sub_0806265C
+	_0807EA94 
+	_0807E878 
+	_0807EF80 0x0001
+	Jump script_0800F592
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0006
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000008
+	StopScript 
+script_0800F5C8:
+	CheckEntityInteractType 
+	JumpIfNot script_0800F5C8
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	Call sub_08064428
+	_0807EA94 
+	_0807E878 
+	Jump script_0800F5C8
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	_0807E9D4 
+	_0807EF80 0x000a
+	Call sub_0807F348
+	StopScript 
+script_0800F604:
+	CheckEntityInteractType 
+	JumpIfNot script_0800F604
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	TextboxNoOverlap 0x2511
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800F604
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EF80 0x0001
+	StopScript 
+script_0800F636:
+	_0807E30C 
+	JumpIfNot script_0800F636
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	_0807E878 
+	Jump script_0800F636
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E9D4 
+	StopScript 
+script_0800F662:
+	CheckEntityInteractType 
+	JumpIfNot script_0800F662
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0001
+	Call sub_0806B4F0
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	_0807EF80 0x0000
+	Jump script_0800F662
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	_0807E9D4 
+	_0807EF80 0x000a
+	Call sub_0807F348
+	StopScript 
+script_0800F6A0:
+	CheckEntityInteractType 
+	JumpIfNot script_0800F6A0
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000004
+	CheckLocalFlag 0x00cd
+	JumpIf script_0800F6C4
+	TextboxNoOverlap 0x2512
+	Jump script_0800F6C8
+script_0800F6C4:
+	TextboxNoOverlap 0x251f
+script_0800F6C8:
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Jump script_0800F6A0
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0001
+	_0807E9D4 
+	_0807EF80 0x000a
+	Call sub_08062788
+	StopScript 
+script_0800F6F4:
+	CheckLocalFlag 0x00cd
+	JumpIf script_0800F718
+	CheckEntityInteractType 
+	JumpIfNot script_0800F6F4
+	_0807E864 
+	_0807EB74 
+	Call sub_0806265C
+	_0807EA94 
+	_0807E878 
+	_0807EF80 0x0001
+	Jump script_0800F6F4
+script_0800F718:
+	Call sub_080627E8
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 45a3d14b..2420d650 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -1,174 +1,176 @@
 SCRIPT_START script_0800F724
-StartScript 
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x00cd
-JumpIfNot 0xfffa
-_0807EF80 0x0007
-Jump 0xfe4a
-CheckLocalFlag 0x00cd
-JumpIf 0x030a
-_0807E864 
-Call sub_0807DF28
-SetEntityPositionRelative 0x014800c8
-Call sub_0807F844
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-StartPlayerScript script_0800FA54
-_0807E5F8 0x00000002
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x021800c8
-Call sub_0807F5C0
-Wait 0x0064
-_0807F0B4 0x0002
-SetEntityPositionRelative 0x036800c8
-Call sub_0807F5C0
-WaitForSomething2 0x00000001
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x00002501
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000004
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_0800FA78
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x000e2503
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Call sub_0807DF50
-_0807E878 
-WaitForSomething2 0x00000004
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_0800FA9C
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x000e2504
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Call sub_0807DF50
-_0807E878 
-WaitForSomething2 0x00000004
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_0800FAC0
-WaitForSomething2 0x00000001
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-TextboxNoOverlapFollowPos 0x000e2505
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Call sub_0807DF50
-_0807E878 
-WaitForSomething2 0x00000004
-_0807E864 
-Call sub_0807DF28
-Call sub_08063C5C
-SoundReq 0x00e2
-Wait 0x001e
-_0807E8E4_0 
-Call sub_0807F3F8
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x000e1021
-_0807EA94 
-StartPlayerScript script_0800FAE4
-SetEntityPositionRelative 0x025800f0
-_0807F0B4 0x0001
-CameraTargetEntity 
-Wait 0x001e
-Call sub_08063C2C
-WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos 0x000e1022
-_0807EA94 
-_0807E8E4_0 
-Call sub_08063C14
-Call sub_08094CDC
-Wait 0x001e
-TextboxNoOverlapFollowPos 0x000e1023
-_0807EA94 
-Call sub_08063C14
-Call sub_08094DD8
-Wait 0x001e
-TextboxNoOverlapFollowPos 0x000e1024
-_0807EA94 
-Call sub_08063C14
-Call sub_08094D34
-Wait 0x001e
-TextboxNoOverlapFollowPos 0x000e1025
-_0807EA94 
-Call sub_08063C5C
-TextboxNoOverlapFollowPos 0x000e1026
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E8E4_1 
-Call sub_08063C2C
-TextboxNoOverlapFollowPos 0x00001027
-_0807EA94 
-Call sub_08063C74
-Wait 0x003c
-Call sub_08063C14
-_0807E8E4_0 
-TextboxNoOverlapFollowPos 0x000e1028
-_0807EA94 
-_0807E8E4_1 
-TextboxNoOverlapFollowPos 0x00001029
-_0807EA94 
-_0807E8E4_0 
-TextboxNoOverlapFollowPos 0x000e102a
-_0807EA94 
-Call sub_08063C14
-Call sub_08094D70
-SoundReq 0x0103
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-Call sub_08063C14
-Call sub_08094D10
-Wait 0x001e
-Call sub_08094E0C
-Wait 0x001e
-_0807E8E4_1 
-Call sub_0807F3F8
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x0000102b
-_0807EA94 
-_0807F034 0x000d
-WaitPlayerAction8 
-Call sub_0806DC3C
-Call sub_080791BC
-CallWithArg sub_0807F244, 0x0000000d
-_0807E914 0x000000ff
-Call sub_0807F5B0
-CallWithArg sub_0807F29C, 0x080049d6
-Wait 0x00b7
-_0807E914 0x00000000
-Call sub_0807F5B0
-TextboxNoOverlapFollowPos 0x0000102c
-_0807EA94 
-CallWithArg sub_0807F29C, 0x00000000
-Call sub_0806DC58
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Wait 0x000a
-_0807E5F8 0x00000002
-Call sub_08063C44
-SetLocalFlag 0x00cd
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+script_0800F72C:
+	CheckLocalFlag 0x00cd
+	JumpIfNot script_0800F72C
+	_0807EF80 0x0007
+	Jump script_0800F584
+	CheckLocalFlag 0x00cd
+	JumpIf script_0800FA4C
+	_0807E864 
+	Call sub_0807DF28
+	SetEntityPositionRelative 0x014800c8
+	Call sub_0807F844
+	_0807E778 0x0002
+	DoFade6 
+	WaitFor_2 
+	StartPlayerScript script_0800FA54
+	_0807E5F8 0x00000002
+	_0807F0B4 0x0001
+	SetEntityPositionRelative 0x021800c8
+	Call sub_0807F5C0
+	Wait 0x0064
+	_0807F0B4 0x0002
+	SetEntityPositionRelative 0x036800c8
+	Call sub_0807F5C0
+	WaitForSomething2 0x00000001
+	WaitForSomething2 0x00000004
+	TextboxNoOverlapFollowPos 0x00002501
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807DF50
+	_0807E878 
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000004
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_0800FA78
+	WaitForSomething2 0x00000001
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	TextboxNoOverlapFollowPos 0x000e2503
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	Call sub_0807DF50
+	_0807E878 
+	WaitForSomething2 0x00000004
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_0800FA9C
+	WaitForSomething2 0x00000001
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	TextboxNoOverlapFollowPos 0x000e2504
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	Call sub_0807DF50
+	_0807E878 
+	WaitForSomething2 0x00000004
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_0800FAC0
+	WaitForSomething2 0x00000001
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	TextboxNoOverlapFollowPos 0x000e2505
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	Call sub_0807DF50
+	_0807E878 
+	WaitForSomething2 0x00000004
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_08063C5C
+	SoundReq 0x00e2
+	Wait 0x001e
+	_0807E8E4_0 
+	Call sub_0807F3F8
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x000e1021
+	_0807EA94 
+	StartPlayerScript script_0800FAE4
+	SetEntityPositionRelative 0x025800f0
+	_0807F0B4 0x0001
+	CameraTargetEntity 
+	Wait 0x001e
+	Call sub_08063C2C
+	WaitForSomething2 0x00000001
+	TextboxNoOverlapFollowPos 0x000e1022
+	_0807EA94 
+	_0807E8E4_0 
+	Call sub_08063C14
+	Call sub_08094CDC
+	Wait 0x001e
+	TextboxNoOverlapFollowPos 0x000e1023
+	_0807EA94 
+	Call sub_08063C14
+	Call sub_08094DD8
+	Wait 0x001e
+	TextboxNoOverlapFollowPos 0x000e1024
+	_0807EA94 
+	Call sub_08063C14
+	Call sub_08094D34
+	Wait 0x001e
+	TextboxNoOverlapFollowPos 0x000e1025
+	_0807EA94 
+	Call sub_08063C5C
+	TextboxNoOverlapFollowPos 0x000e1026
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E8E4_1 
+	Call sub_08063C2C
+	TextboxNoOverlapFollowPos 0x00001027
+	_0807EA94 
+	Call sub_08063C74
+	Wait 0x003c
+	Call sub_08063C14
+	_0807E8E4_0 
+	TextboxNoOverlapFollowPos 0x000e1028
+	_0807EA94 
+	_0807E8E4_1 
+	TextboxNoOverlapFollowPos 0x00001029
+	_0807EA94 
+	_0807E8E4_0 
+	TextboxNoOverlapFollowPos 0x000e102a
+	_0807EA94 
+	Call sub_08063C14
+	Call sub_08094D70
+	SoundReq 0x0103
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	Call sub_08063C14
+	Call sub_08094D10
+	Wait 0x001e
+	Call sub_08094E0C
+	Wait 0x001e
+	_0807E8E4_1 
+	Call sub_0807F3F8
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x0000102b
+	_0807EA94 
+	_0807F034 0x000d
+	WaitPlayerAction8 
+	Call sub_0806DC3C
+	Call sub_080791BC
+	CallWithArg sub_0807F244, 0x0000000d
+	_0807E914 0x000000ff
+	Call sub_0807F5B0
+	CallWithArg sub_0807F29C, 0x080049d6
+	Wait 0x00b7
+	_0807E914 0x00000000
+	Call sub_0807F5B0
+	TextboxNoOverlapFollowPos 0x0000102c
+	_0807EA94 
+	CallWithArg sub_0807F29C, 0x00000000
+	Call sub_0806DC58
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Wait 0x000a
+	_0807E5F8 0x00000002
+	Call sub_08063C44
+	SetLocalFlag 0x00cd
+	Call sub_0807DF50
+	_0807E878 
+script_0800FA4C:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc
index f6eb72af..f81e8316 100644
--- a/data/scripts/script_0800FA54.inc
+++ b/data/scripts/script_0800FA54.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800FA54
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-SetEntityPositionRelative 0x039800d8
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	SetEntityPositionRelative 0x039800d8
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc
index 51fbf2e9..70a38166 100644
--- a/data/scripts/script_0800FA78.inc
+++ b/data/scripts/script_0800FA78.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800FA78
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x00a0, 0x0278
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x00a0, 0x0278
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc
index 3e15877a..ae3e58e0 100644
--- a/data/scripts/script_0800FA9C.inc
+++ b/data/scripts/script_0800FA9C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800FA9C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0078, 0x01c0
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0078, 0x01c0
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc
index 639b8be9..bfd30c11 100644
--- a/data/scripts/script_0800FAC0.inc
+++ b/data/scripts/script_0800FAC0.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800FAC0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0108, 0x01c8
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0108, 0x01c8
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc
index cd171e2e..6dc86894 100644
--- a/data/scripts/script_0800FAE4.inc
+++ b/data/scripts/script_0800FAE4.inc
@@ -1,14 +1,17 @@
 SCRIPT_START script_0800FAE4
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-Call sub_0807F584
-_0807E078_ssss 0x0012, 0x001a, 0x000e, 0x0002
-CallWithArg sub_0807F4F8, 0x0000027c
-CallWithArg sub_0807F464, 0x000000e8
-_0807EDD4 0x00e8, 0x0270
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	Call sub_0807F584
+	JumpSwitch_4 script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
+script_0800FAFC:
+	CallWithArg sub_0807F4F8, 0x0000027c
+script_0800FB06:
+	CallWithArg sub_0807F464, 0x000000e8
+script_0800FB10:
+	_0807EDD4 0x00e8, 0x0270
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0800FB2C.inc b/data/scripts/script_0800FB2C.inc
index 469f4278..bc358f9f 100644
--- a/data/scripts/script_0800FB2C.inc
+++ b/data/scripts/script_0800FB2C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800FB2C
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc
index 829881ce..b741e922 100644
--- a/data/scripts/script_0800FB44.inc
+++ b/data/scripts/script_0800FB44.inc
@@ -1,100 +1,105 @@
 SCRIPT_START script_0800FB44
-StartScript 
-_0807EF80 0x0008
-_0807EF80 0x000b
-SetEntityNonPlanarMovement 0x0080
-Call sub_08066D04
-StopScript 
-WaitForSomething2 0x00000002
-Call sub_08066D14
-JumpIf 0x0004
-MoveEntityToPlayer 
-_0807EF80 0x0007
-SetEntityPositionRelative 0x039800b8
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0200
-_0807EDD4 0x00b8, 0x0318
-SetEntityPositionRelative 0x026000a0
-_0807EB44 0x0000
-_0807EF80 0x0001
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-_0807E9D4 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807EF80 0x000b
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0200
-_0807EDD4 0x00a0, 0x0268
-_0807EDD4 0x0070, 0x0268
-_0807EDD4 0x0070, 0x0208
-SetEntityPositionRelative 0x01a80078
-_0807EB44 0x0000
-_0807EF80 0x0001
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-_0807E30C 
-JumpIfNot 0xfffc
-_0807EF80 0x000b
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0200
-_0807EDD4 0x00f8, 0x01a8
-SetEntityPositionRelative 0x01c80118
-_0807EB44 0x0002
-_0807EF80 0x0001
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-_0807E30C 
-JumpIfNot 0xfffc
-_0807EF80 0x000b
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x0200
-_0807EDD4 0x0118, 0x0260
-SetEntityPositionRelative 0x027000f8
-_0807EB44 0x0000
-_0807EF80 0x0001
-_0807E5F8 0x00000004
-_0807EF80 0x000a
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807EF80 0x000b
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-_0807EF80 0x0004
-WaitForSomething2 0x00000002
-_0807EF80 0x000d
-SetEntityNonPlanarMovement 0x0040
-_0807EC94 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EF80 0x000c
-SetEntityNonPlanarMovement 0x0040
-_0807ECF4 0x0020
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-Call sub_08066D4C
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	_0807EF80 0x000b
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_08066D04
+	StopScript 
+	WaitForSomething2 0x00000002
+	Call sub_08066D14
+	JumpIf script_0800FB6C
+	MoveEntityToPlayer 
+script_0800FB6C:
+	_0807EF80 0x0007
+	SetEntityPositionRelative 0x039800b8
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0200
+	_0807EDD4 0x00b8, 0x0318
+	SetEntityPositionRelative 0x026000a0
+	_0807EB44 0x0000
+	_0807EF80 0x0001
+	_0807E5F8 0x00000004
+	_0807EF80 0x000a
+	_0807E9D4 
+script_0800FBAE:
+	_0807E30C 
+	JumpIfNot script_0800FBAE
+	_0807EF80 0x000b
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0200
+	_0807EDD4 0x00a0, 0x0268
+	_0807EDD4 0x0070, 0x0268
+	_0807EDD4 0x0070, 0x0208
+	SetEntityPositionRelative 0x01a80078
+	_0807EB44 0x0000
+	_0807EF80 0x0001
+	_0807E5F8 0x00000004
+	_0807EF80 0x000a
+script_0800FC06:
+	_0807E30C 
+	JumpIfNot script_0800FC06
+	_0807EF80 0x000b
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0200
+	_0807EDD4 0x00f8, 0x01a8
+	SetEntityPositionRelative 0x01c80118
+	_0807EB44 0x0002
+	_0807EF80 0x0001
+	_0807E5F8 0x00000004
+	_0807EF80 0x000a
+script_0800FC52:
+	_0807E30C 
+	JumpIfNot script_0800FC52
+	_0807EF80 0x000b
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x0200
+	_0807EDD4 0x0118, 0x0260
+	SetEntityPositionRelative 0x027000f8
+	_0807EB44 0x0000
+	_0807EF80 0x0001
+	_0807E5F8 0x00000004
+	_0807EF80 0x000a
+script_0800FC9E:
+	CheckEntityInteractType 
+	JumpIfNot script_0800FC9E
+	_0807EF80 0x000b
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	_0807EF80 0x0004
+	WaitForSomething2 0x00000002
+	_0807EF80 0x000d
+	SetEntityNonPlanarMovement 0x0040
+	_0807EC94 0x0020
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EF80 0x000c
+	SetEntityNonPlanarMovement 0x0040
+	_0807ECF4 0x0020
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	Call sub_08066D4C
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc
index 301295b4..e3f8b423 100644
--- a/data/scripts/script_0800FD0C.inc
+++ b/data/scripts/script_0800FD0C.inc
@@ -1,27 +1,30 @@
 SCRIPT_START script_0800FD0C
-CheckLocalFlag 0x00cd
-JumpIf 0x003e
-WaitForSomething2 0x00000010
-CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
-JumpIfNot 0xfff6
-CheckLocalFlag 0x00cd
-JumpIf 0x0030
-_0807E864 
-Call sub_0807F9A4
-TextboxNoOverlapFollowPos 0x00002506
-_0807EA94 
-StartPlayerScript script_0800FD80
-WaitForSomething2 0x00000008
-_0807E878 
-Jump 0xffcc
-CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-TextboxNoOverlapFollowPos 0x0000106c
-_0807EA94 
-StartPlayerScript script_0800FD80
-WaitForSomething2 0x00000008
-_0807E878 
-Jump 0xffd4
-.short 0x0000
+	CheckLocalFlag 0x00cd
+	JumpIf script_0800FD50
+	WaitForSomething2 0x00000010
+script_0800FD1A:
+	CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
+	JumpIfNot script_0800FD1A
+	CheckLocalFlag 0x00cd
+	JumpIf script_0800FD5C
+	_0807E864 
+	Call sub_0807F9A4
+	TextboxNoOverlapFollowPos 0x00002506
+	_0807EA94 
+	StartPlayerScript script_0800FD80
+	WaitForSomething2 0x00000008
+	_0807E878 
+	Jump script_0800FD1A
+script_0800FD50:
+	CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
+	JumpIfNot script_0800FD50
+script_0800FD5C:
+	_0807E864 
+	Call sub_0807F9A4
+	TextboxNoOverlapFollowPos 0x0000106c
+	_0807EA94 
+	StartPlayerScript script_0800FD80
+	WaitForSomething2 0x00000008
+	_0807E878 
+	Jump script_0800FD50
+	.short 0x0000
diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc
index d78afb7c..d95b4687 100644
--- a/data/scripts/script_0800FD80.inc
+++ b/data/scripts/script_0800FD80.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800FD80
-SetEntityNonPlanarMovement 0x0080
-_0807EC64 0x0020
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0080
+	_0807EC64 0x0020
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc
index 29f45131..fcbc78bd 100644
--- a/data/scripts/script_0800FDA0.inc
+++ b/data/scripts/script_0800FDA0.inc
@@ -1,105 +1,116 @@
 SCRIPT_START script_0800FDA0
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08069888
-_0807EA94 
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-SetEntityNonPlanarMovement 0x0040
-StopScript 
-Call sub_08069A60
-Call sub_0806991C
-StopScript 
-StartScript 
-Call sub_08069ACC
-JumpIf 0x000c
-_0807EE30 
-JumpIfNot 0xffee
-Jump 0xffde
-StopScript 
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x003c
-Call sub_08069A3C
-Jump 0xffa8
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-SetEntityNonPlanarMovement 0x0040
-StopScript 
-Call sub_08069AA8
-Call sub_080699AC
-StopScript 
-StartScript 
-Call sub_08069ACC
-JumpIf 0x000c
-_0807EE30 
-JumpIfNot 0xffee
-Jump 0xffde
-StopScript 
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0002
-_0807EF80 0x0000
-Wait 0x001e
-_0807EB44 0x0006
-_0807EF80 0x0000
-Wait 0x003c
-Call sub_08069A84
-Jump 0xffa8
-.short 0x0000
-StartScript 
-CheckInventory1 0x0012
-JumpIf 0x004a
-_0807EB44 0x0006
-_0807E9D4 
-CallWithArg sub_0807F3D8, 0x00000008
-StopScript 
-StopScript 
-StartScript 
-_0807EF80 0x000b
-Call sub_080642B8
-CheckEntityInteractType 
-JumpIfNot 0xffee
-StopScript 
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-Call sub_08064428
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffcc
-_0807EF80 0x0008
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E9D4 
+	StopScript 
+script_0800FDB2:
+	CheckEntityInteractType 
+	JumpIfNot script_0800FDB2
+	_0807E864 
+	_0807EB74 
+	Call sub_08069888
+	_0807EA94 
+	_0807E878 
+	Jump script_0800FDB2
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E9D4 
+	SetEntityNonPlanarMovement 0x0040
+	StopScript 
+script_0800FDE2:
+	Call sub_08069A60
+script_0800FDE8:
+	Call sub_0806991C
+script_0800FDEE:
+	StopScript 
+	StartScript 
+	Call sub_08069ACC
+	JumpIf script_0800FE06
+	_0807EE30 
+	JumpIfNot script_0800FDEE
+	Jump script_0800FDE2
+script_0800FE06:
+	StopScript 
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	Wait 0x003c
+	Call sub_08069A3C
+	Jump script_0800FDE8
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E9D4 
+	SetEntityNonPlanarMovement 0x0040
+	StopScript 
+script_0800FE5A:
+	Call sub_08069AA8
+script_0800FE60:
+	Call sub_080699AC
+script_0800FE66:
+	StopScript 
+	StartScript 
+	Call sub_08069ACC
+	JumpIf script_0800FE7E
+	_0807EE30 
+	JumpIfNot script_0800FE66
+	Jump script_0800FE5A
+script_0800FE7E:
+	StopScript 
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	Wait 0x003c
+	Call sub_08069A84
+	Jump script_0800FE60
+	.short 0x0000
+	StartScript 
+	CheckInventory1 0x0012
+	JumpIf script_0800FF0E
+	_0807EB44 0x0006
+	_0807E9D4 
+	CallWithArg sub_0807F3D8, 0x00000008
+	StopScript 
+script_0800FED8:
+	StopScript 
+	StartScript 
+	_0807EF80 0x000b
+	Call sub_080642B8
+	CheckEntityInteractType 
+	JumpIfNot script_0800FED8
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	Call sub_08064428
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800FED8
+script_0800FF0E:
+	_0807EF80 0x0008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc
index eb89f772..2f212a83 100644
--- a/data/scripts/script_0800FF18.inc
+++ b/data/scripts/script_0800FF18.inc
@@ -1,26 +1,28 @@
 SCRIPT_START script_0800FF18
-StartScript 
-CheckInventory1 0x0012
-JumpIf 0x004a
-_0807EB44 0x0006
-_0807E9D4 
-CallWithArg sub_0807F3D8, 0x00000008
-StopScript 
-StopScript 
-StartScript 
-_0807EF80 0x000b
-Call sub_08064198
-CheckEntityInteractType 
-JumpIfNot 0xffee
-StopScript 
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-Call sub_08064428
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffcc
-_0807EF80 0x0008
-_0807EF80 0x0006
+	StartScript 
+	CheckInventory1 0x0012
+	JumpIf script_0800FF6A
+	_0807EB44 0x0006
+	_0807E9D4 
+	CallWithArg sub_0807F3D8, 0x00000008
+	StopScript 
+script_0800FF34:
+	StopScript 
+	StartScript 
+	_0807EF80 0x000b
+	Call sub_08064198
+	CheckEntityInteractType 
+	JumpIfNot script_0800FF34
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	Call sub_08064428
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0800FF34
+script_0800FF6A:
+	_0807EF80 0x0008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc
index f48107eb..58b01a6e 100644
--- a/data/scripts/script_0800FF74.inc
+++ b/data/scripts/script_0800FF74.inc
@@ -1,83 +1,90 @@
 SCRIPT_START script_0800FF74
-StartScript 
-_0807EB44 0x0002
-_0807E9D4 
-CallWithArg sub_0807F3D8, 0x00000008
-Call sub_080644A4
-ClearLocalFlag 0x00c7
-StopScript 
-StopScript 
-StartScript 
-_0807EF80 0x000a
-CheckLocalFlag 0x00ce
-JumpIf 0x002c
-_0807EF80 0x000b
-Call sub_08064198
-CheckLocalFlag 0x00c7
-JumpIfNot 0x001a
-Call sub_08064488
-CheckPlayerInRegion2 0x4040
-JumpIfNot 0x000c
-Call sub_08064470
-JumpIf 0x004a
-CheckEntityInteractType 
-JumpIfNot 0xffc2
-StopScript 
-SetLocalFlag 0x00c7
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-CheckInventory1 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x3401
-_0807EA94 
-Jump 0x006a
-CheckLocalFlag 0x00ce
-JumpIfNot 0x000c
-TextboxNoOverlap 0x340b
-_0807EA94 
-Jump 0x0058
-TextboxNoOverlap 0x3402
-_0807EA94 
-Jump 0x004e
-StopScript 
-_0807E888 
-Call sub_0807F594
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-SoundReq 0x00cd
-TextboxNoOverlap 0x340a
-_0807EA94 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x0000000c
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0018, 0x0108
-_0807EB44 0x0002
-CallWithArg sub_0807F3D8, 0x00000008
-SetLocalFlag 0x00ce
-Call sub_080644A4
-CallWithArg sub_0807F5B0, 0x0000000a
-_0807E878 
-Jump 0xff1e
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-CallWithArg sub_080672B0, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_080672B0, 0x00000004
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EB44 0x0004
-CallWithArg sub_080672B0, 0x00000000
-Jump 0xffd0
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0002
+	_0807E9D4 
+	CallWithArg sub_0807F3D8, 0x00000008
+	Call sub_080644A4
+	ClearLocalFlag 0x00c7
+	StopScript 
+script_0800FF92:
+	StopScript 
+	StartScript 
+	_0807EF80 0x000a
+	CheckLocalFlag 0x00ce
+	JumpIf script_0800FFCC
+	_0807EF80 0x000b
+	Call sub_08064198
+	CheckLocalFlag 0x00c7
+	JumpIfNot script_0800FFCC
+	Call sub_08064488
+	CheckPlayerInRegion2 0x4040
+	JumpIfNot script_0800FFCC
+	Call sub_08064470
+	JumpIf script_08010014
+script_0800FFCC:
+	CheckEntityInteractType 
+	JumpIfNot script_0800FF92
+	StopScript 
+	SetLocalFlag 0x00c7
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	CheckInventory1 0x0048
+	JumpIf script_0800FFF8
+	TextboxNoOverlap 0x3401
+	_0807EA94 
+	Jump script_08010060
+script_0800FFF8:
+	CheckLocalFlag 0x00ce
+	JumpIfNot script_0801000A
+	TextboxNoOverlap 0x340b
+	_0807EA94 
+	Jump script_08010060
+script_0801000A:
+	TextboxNoOverlap 0x3402
+	_0807EA94 
+	Jump script_08010060
+script_08010014:
+	StopScript 
+	_0807E888 
+	Call sub_0807F594
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	SoundReq 0x00cd
+	TextboxNoOverlap 0x340a
+	_0807EA94 
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x0000000c
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0018, 0x0108
+	_0807EB44 0x0002
+	CallWithArg sub_0807F3D8, 0x00000008
+	SetLocalFlag 0x00ce
+script_08010060:
+	Call sub_080644A4
+	CallWithArg sub_0807F5B0, 0x0000000a
+	_0807E878 
+	Jump script_0800FF92
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	CallWithArg sub_080672B0, 0x00000000
+	StopScript 
+script_08010090:
+	CheckEntityInteractType 
+	JumpIfNot script_08010090
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_080672B0, 0x00000004
+	TextboxNoOverlapFollow 0x0a01
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	_0807EB44 0x0004
+	CallWithArg sub_080672B0, 0x00000000
+	Jump script_08010090
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index ee3ed7d3..462aa194 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -1,111 +1,118 @@
 SCRIPT_START script_080100C8
-StartScript 
-Call sub_08061FE4
-Call sub_08061E70
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08061FE4
-Call sub_08062048
-_0807EA94 
-_0807E878 
-Jump 0xffe4
-.short 0x0000
-StartScript 
-Call sub_08061FE4
-Call sub_08061E70
-_0807EF80 0x000a
-StopScript 
-Wait 0x003c
-Call sub_08061E90
-Jump 0xfff4
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x4f22
-_0807EA94 
-_0807E878 
-Jump 0xffec
-StartScript 
-_0807EF80 0x0001
-Call sub_0806C354
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CheckRoomFlag 0x0001
-JumpIf 0x0034
-TextboxNoOverlapFollowPos 0x00003001
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x002e
-Call sub_080A1608
-_0807EA94 
-_0807E878 
-CallWithArg sub_080A1550, 0x080101ac
-JumpIfNot 0xffca
-SoundReq2 0x0015
-SetRoomFlag 0x0001
-Jump 0xffbe
-Call sub_080A1608
-_0807EA94 
-_0807E878 
-Jump 0xffb0
-StartScript 
-_0807EF80 0x0008
-Call sub_080A1648
-StopScript 
-Call sub_080A1270
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x00073004
-_0807EA94 
-SoundReq0x80100000 
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-CallWithArg sub_0807F75C, 0x03400378
-Call sub_080791BC
-Call sub_0807FB74
-_0807E8E4_1 
-Call sub_0807F168
-Call sub_080A1388
-Call sub_0806EC38
-StartScript 
-MoveEntityToPlayer 
-Call sub_0807F844
-CameraTargetPlayer 
-StopScript 
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-SoundReq2 0xffff
-Call sub_080A13B4
-_0807EA94 
-JumpIfNot 0x0018
-Call sub_080A13E8
-WaitPlayerAction8 
-Call sub_080A1460
-_0807EA94 
-Call sub_080A14A8
-Call sub_0807DF50
-_0807E878 
-CallWithArg sub_0807F5B0, 0x00000000
-ClearRoomFlag 0x0001
-Call sub_080A169C
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08061FE4
+	Call sub_08061E70
+	_0807EF80 0x000a
+	StopScript 
+script_080100DC:
+	CheckEntityInteractType 
+	JumpIfNot script_080100DC
+	_0807E864 
+	_0807EB74 
+	Call sub_08061FE4
+	Call sub_08062048
+	_0807EA94 
+	_0807E878 
+	Jump script_080100DC
+	.short 0x0000
+	StartScript 
+	Call sub_08061FE4
+	Call sub_08061E70
+	_0807EF80 0x000a
+	StopScript 
+script_08010110:
+	Wait 0x003c
+	Call sub_08061E90
+	Jump script_08010110
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_08010132:
+	CheckEntityInteractType 
+	JumpIfNot script_08010132
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlapFollow 0x4f22
+	_0807EA94 
+	_0807E878 
+	Jump script_08010132
+	StartScript 
+	_0807EF80 0x0001
+	Call sub_0806C354
+	_0807EF80 0x000a
+	StopScript 
+script_0801015A:
+	CheckEntityInteractType 
+	JumpIfNot script_0801015A
+	_0807E864 
+	_0807EB74 
+	CheckRoomFlag 0x0001
+	JumpIf script_0801019E
+	TextboxNoOverlapFollowPos 0x00003001
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_080101A6
+	Call sub_080A1608
+	_0807EA94 
+	_0807E878 
+	CallWithArg sub_080A1550, 0x080101ac
+	JumpIfNot script_0801015A
+	SoundReq2 0x0015
+	SetRoomFlag 0x0001
+	Jump script_0801015A
+script_0801019E:
+	Call sub_080A1608
+	_0807EA94 
+script_080101A6:
+	_0807E878 
+	Jump script_0801015A
+	StartScript 
+	_0807EF80 0x0008
+	Call sub_080A1648
+	StopScript 
+	Call sub_080A1270
+	_0807E864 
+	Call sub_0807DF28
+	TextboxNoOverlapFollowPos 0x00073004
+	_0807EA94 
+	SoundReq0x80100000 
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	CallWithArg sub_0807F75C, 0x03400378
+	Call sub_080791BC
+	Call sub_0807FB74
+	_0807E8E4_1 
+	Call sub_0807F168
+	Call sub_080A1388
+	Call sub_0806EC38
+	StartScript 
+	MoveEntityToPlayer 
+	Call sub_0807F844
+	CameraTargetPlayer 
+	StopScript 
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+	SoundReq2 0xffff
+	Call sub_080A13B4
+	_0807EA94 
+	JumpIfNot script_08010240
+	Call sub_080A13E8
+	WaitPlayerAction8 
+	Call sub_080A1460
+	_0807EA94 
+	Call sub_080A14A8
+script_08010240:
+	Call sub_0807DF50
+	_0807E878 
+	CallWithArg sub_0807F5B0, 0x00000000
+	ClearRoomFlag 0x0001
+	Call sub_080A169C
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index 2410a1ba..a2666a68 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -1,479 +1,537 @@
 SCRIPT_START script_08010264
-StartScript 
-_0807EF80 0x0007
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0006
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08065F64
-_0807EA94 
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807EF80 0x0000
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-CheckRoomFlag 0x0009
-JumpIfNot 0x001a
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-Call sub_08062500
-Jump 0xffdc
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-Jump 0xffca
-.short 0x0000
-StartScript 
-_0807EF80 0x0000
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807EF80 0x0000
-StopScript 
-StopScript 
-Call sub_08062698
-Call sub_080626AC
-CallWithArg sub_0807F0EC, 0x00000009
-_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052
-_0807EE04 0x0358, 0x0078
-Jump 0x004e
-_0807EE04 0x0390, 0x0078
-Jump 0x0044
-_0807EE04 0x03c8, 0x0078
-Jump 0x003a
-_0807EE04 0x0358, 0x0098
-Jump 0x0030
-_0807EE04 0x0390, 0x0098
-Jump 0x0026
-_0807EE04 0x03c8, 0x0098
-Jump 0x001c
-_0807EE04 0x0358, 0x00b8
-Jump 0x0012
-_0807EE04 0x0390, 0x00b8
-Jump 0x0008
-_0807EE04 0x03c8, 0x00b8
-StopScript 
-StartScript 
-Call sub_080626C0
-JumpIf 0xff72
-_0807EE30 
-JumpIfNot 0xffee
-Jump 0xff68
-.short 0x0000
-StartScript 
-_0807EF80 0x0000
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-Wait 0x001e
-Call sub_08062948
-Jump 0xfff4
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000004
-StopScript 
-Wait 0x003c
-Call sub_0806407C
-Jump 0xfff4
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08064428
-_0807EA94 
-_0807E878 
-Jump 0xffea
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E914 0x08064689
-Call sub_08064644
-StopScript 
-Wait 0x003c
-Call sub_080646A4
-Jump 0xfff4
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-Call sub_080636F4
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-Call sub_080636D8
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000000
-Jump 0xffd2
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-Call sub_08063CAC
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000004
-Call sub_08063C90
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000000
-Jump 0xffd2
-StartScript 
-_0807EB44 0x0004
-_0807E930 0x0000
-_0807EF80 0x000a
-Call sub_0807F348
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000008
-CheckRoomFlag 0x000e
-JumpIf 0x000c
-SetRoomFlag 0x000e
-TextboxNoOverlap 0x2b10
-_0807EA94 
-Call sub_080634E4
-_0807E078_sssssss 0x000e, 0x0020, 0x0036, 0x0034, 0x000e, 0x0024, 0x002e
-TextboxNoOverlap 0x2b0d
-Jump 0x0096
-CheckGlobalFlag 0x003d
-JumpIfNot 0x008a
-Jump 0x001a
-CheckGlobalFlag 0x003c
-JumpIfNot 0x007e
-Jump 0x000e
-CheckGlobalFlag 0x003b
-JumpIfNot 0x0072
-Jump 0x0002
-Call sub_080634EC
-CallWithArg sub_0807F78C, 0x00000000
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x005a
-CallWithArg sub_0807F7C4, 0x00000000
-JumpIfNot 0x0030
-_0807E48C 0x0020
-JumpIfNot 0x0030
-Call sub_08063504
-JumpIf 0x002e
-TextboxNoOverlap 0x2b07
-_0807EA94 
-CallWithArg sub_0807F800, 0x00000000
-WaitPlayerAction8 
-_0807EA94 
-TextboxNoOverlap 0x2b0c
-Jump 0x001e
-TextboxNoOverlap 0x2b09
-Jump 0x0016
-TextboxNoOverlap 0x2b0a
-Jump 0x000e
-TextboxNoOverlap 0x2b0b
-Jump 0x0006
-TextboxNoOverlap 0x2b0e
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xff16
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-Jump 0xffe8
-StartScript 
-_0807E930 0x0008
-Call sub_08062A48
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0806265C
-_0807EA94 
-_0807E878 
-Jump 0xffec
-StartScript 
-_0807E930 0x0009
-Jump 0xffd6
-.short 0x0000
-StartScript 
-_0807E930 0x000b
-Jump 0xffca
-.short 0x0000
-StartScript 
-_0807E930 0x000c
-Jump 0xffbe
-.short 0x0000
-StartScript 
-_0807E930 0x000d
-Jump 0xffb2
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-HasRoomItemForSale 
-Call sub_0807F77C
-_0807EAF0 0x3c08, 0x3c09
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-Jump 0xffde
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0807F2D4
-_0807EF80 0x0000
-HasRoomItemForSale 
-JumpIf 0x000a
-TextboxNoOverlap 0x3c07
-Jump 0x0048
-Call sub_08062EB8
-CallWithArg sub_0807F78C, 0x00000000
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0030
-_0807EA94 
-BuyItem 0x0000, 0x0000
-JumpIf 0x000a
-TextboxNoOverlap 0x3c04
-Jump 0x001c
-WaitPlayerAction8 
-ModHealth 0x0008
-Call sub_08062EDC
-JumpIf 0x000a
-TextboxNoOverlap 0x3c06
-Jump 0x0004
-WaitPlayerAction8 
-_0807EA94 
-_0807E878 
-_0807EF80 0x0001
-Jump 0xff8e
-.short 0x0000
-StartScript 
-_0807EF80 0x0007
-_0807E9D4 
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E930 0x0004
-StartScript 
-Call sub_08062D18
-JumpIfNot 0x002a
-StopScript 
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0020
-HasRupees 0x00c8
-JumpIf 0x000a
-TextboxNoOverlap 0x4008
-Jump 0x0010
-ModRupees 0xff38
-Call sub_08062E14
-TextboxNoOverlap 0x4007
-StopScript 
-_0807EA94 
-_0807E878 
-_0807E930 0x0008
-Jump 0xffb4
-StartScript 
-_0807EF80 0x0007
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807F2D4
-_0807EF80 0x0001
-Call sub_08062CBC
-_0807EA94 
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffde
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807E9D4 
-Call sub_0807F348
-Call sub_08069684
-StopScript 
-StopScript 
-StartScript 
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0xfff6
-Call sub_080696B0
-StopScript 
-StartScript 
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0xffe4
-HasRoomItemForSale 
-JumpIf 0x004c
-CheckEntityInteractType 
-JumpIfNot 0xffea
-StopScript 
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-CheckGlobalFlag 0x0042
-JumpIfNot 0x002a
-CheckGlobalFlag 0x0043
-JumpIfNot 0x0022
-CheckGlobalFlag 0x0044
-JumpIfNot 0x001a
-CheckGlobalFlag 0x0041
-JumpIfNot 0x000a
-TextboxNoOverlap 0x3f39
-Jump 0x006c
-TextboxNoOverlap 0x2c1b
-Jump 0x0064
-TextboxNoOverlap 0x2c1a
-Jump 0x005c
-StopScript 
-_0807E864 
-Call sub_0807DF38
-_0807EB74 
-Call sub_08069660
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x003a
-Call sub_08069718
-JumpIfNot 0x0030
-WaitPlayerAction8 
-_0807EA94 
-_0807EB8C 
-CheckGlobalFlag 0x0042
-JumpIfNot 0x001a
-CheckGlobalFlag 0x0043
-JumpIfNot 0x0012
-CheckGlobalFlag 0x0044
-JumpIfNot 0x000a
-TextboxNoOverlap 0x2c21
-Jump 0x000a
-SetLocalFlag 0x00fa
-TextboxNoOverlap 0x2c20
-_0807EA94 
-Call sub_0807F83C
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xff36
-CheckPlayerInRegion2 0x0808
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_080109F0
-WaitForSomething2 0x00000001
-CheckRoomFlag 0x0001
-JumpIf 0x0008
-_0807EB28 0x0b63
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xffc6
-StartScript 
-_0807EF80 0x0007
-CheckKinstoneFused 0x001b
-JumpIf 0xe67a
-StopScript 
-Call sub_080869A4
-JumpIfNot 0xfff8
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-CheckRoomFlag 0x0001
-JumpIf 0x0008
-_0807EB28 0x0b62
-_0807EA94 
-StartPlayerScript script_080109F0
-WaitForSomething2 0x00000001
-Call sub_0807DF50
-_0807E878 
-Jump 0xffc4
-Call sub_0808692C
+	StartScript 
+	_0807EF80 0x0007
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	StopScript 
+script_0801027A:
+	CheckEntityInteractType 
+	JumpIfNot script_0801027A
+	_0807E864 
+	_0807EB74 
+	Call sub_08065F64
+	_0807EA94 
+	_0807E878 
+	Jump script_0801027A
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0000
+	Call sub_08062A48
+	_0807EF80 0x000a
+	StopScript 
+script_080102A6:
+	CheckEntityInteractType 
+	JumpIfNot script_080102A6
+	CheckRoomFlag 0x0009
+	JumpIfNot script_080102CC
+	_0807E864 
+	_0807EB74 
+	Call sub_0806265C
+	_0807EA94 
+	_0807E878 
+	Call sub_08062500
+	Jump script_080102A6
+script_080102CC:
+	_0807E864 
+	_0807EB74 
+	Call sub_0806265C
+	_0807EA94 
+	_0807E878 
+	Jump script_080102A6
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0000
+	Call sub_08062A48
+	_0807EF80 0x000a
+	StopScript 
+script_080102F2:
+	CheckEntityInteractType 
+	JumpIfNot script_080102F2
+	_0807E864 
+	_0807EB74 
+	Call sub_0806265C
+	_0807EA94 
+	_0807E878 
+	Jump script_080102F2
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0000
+	StopScript 
+script_08010314:
+	StopScript 
+	Call sub_08062698
+	Call sub_080626AC
+	CallWithArg sub_0807F0EC, 0x00000009
+	JumpSwitch_9 script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390
+script_08010340:
+	_0807EE04 0x0358, 0x0078
+	Jump script_08010396
+script_0801034A:
+	_0807EE04 0x0390, 0x0078
+	Jump script_08010396
+script_08010354:
+	_0807EE04 0x03c8, 0x0078
+	Jump script_08010396
+script_0801035E:
+	_0807EE04 0x0358, 0x0098
+	Jump script_08010396
+script_08010368:
+	_0807EE04 0x0390, 0x0098
+	Jump script_08010396
+script_08010372:
+	_0807EE04 0x03c8, 0x0098
+	Jump script_08010396
+script_0801037C:
+	_0807EE04 0x0358, 0x00b8
+	Jump script_08010396
+script_08010386:
+	_0807EE04 0x0390, 0x00b8
+	Jump script_08010396
+script_08010390:
+	_0807EE04 0x03c8, 0x00b8
+script_08010396:
+	StopScript 
+	StartScript 
+	Call sub_080626C0
+	JumpIf script_08010314
+	_0807EE30 
+	JumpIfNot script_08010396
+	Jump script_08010314
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0000
+	Call sub_08062A48
+	_0807EF80 0x000a
+	StopScript 
+script_080103C2:
+	Wait 0x001e
+	Call sub_08062948
+	Jump script_080103C2
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000004
+	StopScript 
+script_080103E8:
+	Wait 0x003c
+	Call sub_0806407C
+	Jump script_080103E8
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08010410:
+	CheckEntityInteractType 
+	JumpIfNot script_08010410
+	_0807E864 
+	_0807EB74 
+	Call sub_08064428
+	_0807EA94 
+	_0807E878 
+	Jump script_08010410
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E914 0x08064689
+	Call sub_08064644
+	StopScript 
+script_08010446:
+	Wait 0x003c
+	Call sub_080646A4
+	Jump script_08010446
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Call sub_080636F4
+	_0807EF80 0x000a
+	Call sub_0807F348
+	StopScript 
+script_08010470:
+	CheckEntityInteractType 
+	JumpIfNot script_08010470
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000004
+	Call sub_080636D8
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Jump script_08010470
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	Call sub_08063CAC
+	_0807EF80 0x000a
+	Call sub_0807F348
+	StopScript 
+script_080104BC:
+	CheckEntityInteractType 
+	JumpIfNot script_080104BC
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000004
+	Call sub_08063C90
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Jump script_080104BC
+	StartScript 
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	_0807EF80 0x000a
+	Call sub_0807F348
+	StopScript 
+script_08010502:
+	CheckEntityInteractType 
+	JumpIfNot script_08010502
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000008
+	CheckRoomFlag 0x000e
+	JumpIf script_0801052E
+	SetRoomFlag 0x000e
+	TextboxNoOverlap 0x2b10
+	_0807EA94 
+script_0801052E:
+	Call sub_080634E4
+	JumpSwitch_7 script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
+script_08010544:
+	TextboxNoOverlap 0x2b0d
+	Jump script_080105E0
+script_0801054C:
+	CheckGlobalFlag 0x003d
+	JumpIfNot script_080105DC
+	Jump script_08010570
+script_08010558:
+	CheckGlobalFlag 0x003c
+	JumpIfNot script_080105DC
+	Jump script_08010570
+script_08010564:
+	CheckGlobalFlag 0x003b
+	JumpIfNot script_080105DC
+	Jump script_08010570
+script_08010570:
+	Call sub_080634EC
+	CallWithArg sub_0807F78C, 0x00000000
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_080105E0
+	CallWithArg sub_0807F7C4, 0x00000000
+	JumpIfNot script_080105C4
+	_0807E48C 0x0020
+	JumpIfNot script_080105CC
+	Call sub_08063504
+	JumpIf script_080105D4
+	TextboxNoOverlap 0x2b07
+	_0807EA94 
+	CallWithArg sub_0807F800, 0x00000000
+	WaitPlayerAction8 
+	_0807EA94 
+	TextboxNoOverlap 0x2b0c
+	Jump script_080105E0
+script_080105C4:
+	TextboxNoOverlap 0x2b09
+	Jump script_080105E0
+script_080105CC:
+	TextboxNoOverlap 0x2b0a
+	Jump script_080105E0
+script_080105D4:
+	TextboxNoOverlap 0x2b0b
+	Jump script_080105E0
+script_080105DC:
+	TextboxNoOverlap 0x2b0e
+script_080105E0:
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08010502
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_08010602:
+	CheckEntityInteractType 
+	JumpIfNot script_08010602
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlapFollow 0x0a01
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	Jump script_08010602
+	StartScript 
+	_0807E930 0x0008
+script_08010622:
+	Call sub_08062A48
+	_0807EF80 0x000a
+	StopScript 
+script_0801062E:
+	CheckEntityInteractType 
+	JumpIfNot script_0801062E
+	_0807E864 
+	Call sub_0806265C
+	_0807EA94 
+	_0807E878 
+	Jump script_0801062E
+	StartScript 
+	_0807E930 0x0009
+	Jump script_08010622
+	.short 0x0000
+	StartScript 
+	_0807E930 0x000b
+	Jump script_08010622
+	.short 0x0000
+	StartScript 
+	_0807E930 0x000c
+	Jump script_08010622
+	.short 0x0000
+	StartScript 
+	_0807E930 0x000d
+	Jump script_08010622
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_08010686:
+	CheckEntityInteractType 
+	JumpIfNot script_08010686
+	_0807E864 
+	_0807EB74 
+	HasRoomItemForSale 
+	Call sub_0807F77C
+	_0807EAF0 0x3c08, 0x3c09
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	Jump script_08010686
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_080106BE:
+	CheckEntityInteractType 
+	JumpIfNot script_080106BE
+	_0807E864 
+	_0807EB74 
+	Call sub_0807F2D4
+	_0807EF80 0x0000
+	HasRoomItemForSale 
+	JumpIf script_080106E0
+	TextboxNoOverlap 0x3c07
+	Jump script_08010726
+script_080106E0:
+	Call sub_08062EB8
+	CallWithArg sub_0807F78C, 0x00000000
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08010726
+	_0807EA94 
+	BuyItem 0x0000, 0x0000
+	JumpIf script_0801070C
+	TextboxNoOverlap 0x3c04
+	Jump script_08010726
+script_0801070C:
+	WaitPlayerAction8 
+	ModHealth 0x0008
+	Call sub_08062EDC
+	JumpIf script_08010724
+	TextboxNoOverlap 0x3c06
+	Jump script_08010726
+script_08010724:
+	WaitPlayerAction8 
+script_08010726:
+	_0807EA94 
+	_0807E878 
+	_0807EF80 0x0001
+	Jump script_080106BE
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0007
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807E930 0x0000
+	StopScript 
+script_08010746:
+	CheckEntityInteractType 
+	JumpIfNot script_08010746
+	_0807E864 
+	_0807E930 0x0004
+	StartScript 
+	Call sub_08062D18
+	JumpIfNot script_08010786
+	StopScript 
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08010786
+	HasRupees 0x00c8
+	JumpIf script_08010778
+	TextboxNoOverlap 0x4008
+	Jump script_08010786
+script_08010778:
+	ModRupees 0xff38
+	Call sub_08062E14
+	TextboxNoOverlap 0x4007
+script_08010786:
+	StopScript 
+	_0807EA94 
+	_0807E878 
+	_0807E930 0x0008
+	Jump script_08010746
+	StartScript 
+	_0807EF80 0x0007
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_080107AA:
+	CheckEntityInteractType 
+	JumpIfNot script_080107AA
+	_0807E864 
+	Call sub_0807F2D4
+	_0807EF80 0x0001
+	Call sub_08062CBC
+	_0807EA94 
+	_0807E878 
+	_0807EF80 0x0000
+	Jump script_080107AA
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	_0807E9D4 
+	Call sub_0807F348
+	Call sub_08069684
+	StopScript 
+script_080107F2:
+	StopScript 
+	StartScript 
+	CheckPlayerInRegion2 0x3030
+	JumpIfNot script_080107F2
+	Call sub_080696B0
+script_08010804:
+	StopScript 
+	StartScript 
+	CheckPlayerInRegion2 0x3030
+	JumpIfNot script_080107F2
+	HasRoomItemForSale 
+	JumpIf script_08010860
+	CheckEntityInteractType 
+	JumpIfNot script_08010804
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB74 
+	CheckGlobalFlag 0x0042
+	JumpIfNot script_08010858
+	CheckGlobalFlag 0x0043
+	JumpIfNot script_08010858
+	CheckGlobalFlag 0x0044
+	JumpIfNot script_08010858
+	CheckGlobalFlag 0x0041
+	JumpIfNot script_08010850
+	TextboxNoOverlap 0x3f39
+	Jump script_080108BA
+script_08010850:
+	TextboxNoOverlap 0x2c1b
+	Jump script_080108BA
+script_08010858:
+	TextboxNoOverlap 0x2c1a
+	Jump script_080108BA
+script_08010860:
+	StopScript 
+	_0807E864 
+	Call sub_0807DF38
+	_0807EB74 
+	Call sub_08069660
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_080108B2
+	Call sub_08069718
+	JumpIfNot script_080108B2
+	WaitPlayerAction8 
+	_0807EA94 
+	_0807EB8C 
+	CheckGlobalFlag 0x0042
+	JumpIfNot script_080108AA
+	CheckGlobalFlag 0x0043
+	JumpIfNot script_080108AA
+	CheckGlobalFlag 0x0044
+	JumpIfNot script_080108AA
+	TextboxNoOverlap 0x2c21
+	Jump script_080108B2
+script_080108AA:
+	SetLocalFlag 0x00fa
+	TextboxNoOverlap 0x2c20
+script_080108B2:
+	_0807EA94 
+	Call sub_0807F83C
+script_080108BA:
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Jump script_08010804
+script_080108D0:
+	CheckPlayerInRegion2 0x0808
+	JumpIfNot script_080108D0
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_080109F0
+	WaitForSomething2 0x00000001
+	CheckRoomFlag 0x0001
+	JumpIf script_08010900
+	_0807EB28 0x0b63
+	_0807EA94 
+script_08010900:
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_080108D0
+	StartScript 
+	_0807EF80 0x0007
+	CheckKinstoneFused 0x001b
+	JumpIf script_0800EF92
+	StopScript 
+script_0801091C:
+	Call sub_080869A4
+	JumpIfNot script_0801091C
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	CheckRoomFlag 0x0001
+	JumpIf script_08010942
+	_0807EB28 0x0b62
+	_0807EA94 
+script_08010942:
+	StartPlayerScript script_080109F0
+	WaitForSomething2 0x00000001
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_0801091C
+	Call sub_0808692C
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc
index f0b44321..d8a83f03 100644
--- a/data/scripts/script_08010964.inc
+++ b/data/scripts/script_08010964.inc
@@ -1,36 +1,41 @@
 SCRIPT_START script_08010964
-CheckPlayerInRegion2 0x0808
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_08010A38
-WaitForSomething2 0x00000001
-CheckRoomFlag 0x0001
-JumpIf 0x0008
-_0807EB28 0x0b63
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xffc6
-StartScript 
-StopScript 
-CheckLocalFlag 0x00d1
-JumpIf 0x0040
-CheckPlayerInRegion2 0x0808
-JumpIfNot 0xffee
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_08010A38
-WaitForSomething2 0x00000001
-CheckRoomFlag 0x0001
-JumpIf 0x0008
-_0807EB28 0x0b64
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xffb8
-_0807EF80 0x0006
+script_08010964:
+	CheckPlayerInRegion2 0x0808
+	JumpIfNot script_08010964
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08010A38
+	WaitForSomething2 0x00000001
+	CheckRoomFlag 0x0001
+	JumpIf script_08010994
+	_0807EB28 0x0b63
+	_0807EA94 
+script_08010994:
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08010964
+script_080109A0:
+	StartScript 
+	StopScript 
+	CheckLocalFlag 0x00d1
+	JumpIf script_080109EA
+	CheckPlayerInRegion2 0x0808
+	JumpIfNot script_080109A0
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08010A38
+	WaitForSomething2 0x00000001
+	CheckRoomFlag 0x0001
+	JumpIf script_080109DE
+	_0807EB28 0x0b64
+	_0807EA94 
+script_080109DE:
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_080109A0
+script_080109EA:
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc
index 160b1c86..9bbf1e4f 100644
--- a/data/scripts/script_080109F0.inc
+++ b/data/scripts/script_080109F0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_080109F0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807ECC4 0x0010
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807ECC4 0x0010
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc
index b07950eb..9d650196 100644
--- a/data/scripts/script_08010A14.inc
+++ b/data/scripts/script_08010A14.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08010A14
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EC64 0x0010
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EC64 0x0010
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc
index b40dce05..0089c3fa 100644
--- a/data/scripts/script_08010A38.inc
+++ b/data/scripts/script_08010A38.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08010A38
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EC94 0x0010
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EC94 0x0010
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc
index 66ef1bff..22e1090b 100644
--- a/data/scripts/script_08010A5C.inc
+++ b/data/scripts/script_08010A5C.inc
@@ -1,18 +1,19 @@
 SCRIPT_START script_08010A5C
-StartScript 
-Call sub_0807DF28
-_0807E864 
-ModHealth 0x00a0
-StopScript 
-Wait 0x003c
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-Call sub_0807F0D8
-JumpIfNot 0xfff8
-_0807EF80 0x0014
-_0807E878 
-Call sub_0807DF50
-Call sub_080791D0
+	StartScript 
+	Call sub_0807DF28
+	_0807E864 
+	ModHealth 0x00a0
+	StopScript 
+	Wait 0x003c
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+script_08010A78:
+	Call sub_0807F0D8
+	JumpIfNot script_08010A78
+	_0807EF80 0x0014
+	_0807E878 
+	Call sub_0807DF50
+	Call sub_080791D0
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc
index f647c1fe..12cf866c 100644
--- a/data/scripts/script_08010A98.inc
+++ b/data/scripts/script_08010A98.inc
@@ -1,52 +1,60 @@
 SCRIPT_START script_08010A98
-StartScript 
-_0807EB44 0x0004
-CallWithArg sub_080672B0, 0x00000000
-_0807EF80 0x000a
-Call sub_08067314
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_080672B0, 0x00000004
-Call sub_08067304
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-CallWithArg sub_080672B0, 0x00000000
-Jump 0xffd2
-StartScript 
-CheckInventory1 0x0067
-JumpIfNot 0x0076
-_0807EB44 0x0004
-_0807EF80 0x0000
-SetEntityNonPlanarMovement 0x0180
-CallWithArg_p sub_0807F348
-Call sub_0806075C
-StopScript 
-_0807EA94 
-Call sub_080606C0
-StopScript 
-Call sub_0806076C
-_0807EF80 0x0007
-Call sub_08060700
-StopScript 
-StartScript 
-_0807E564 
-JumpIf 0x0010
-CallWithArg sub_080608E4, 0x00000000
-JumpIf 0x000c
-_0807EE30 
-JumpIfNot 0xffe4
-Jump 0xffce
-StopScript 
-_0807EF80 0x0000
-StopScript 
-StartScript 
-CallWithArg sub_080608E4, 0x00000001
-JumpIf 0xfff0
-StopScript 
-Jump 0xffbc
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	CallWithArg sub_080672B0, 0x00000000
+	_0807EF80 0x000a
+	Call sub_08067314
+	StopScript 
+script_08010AB4:
+	CheckEntityInteractType 
+	JumpIfNot script_08010AB4
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_080672B0, 0x00000004
+	Call sub_08067304
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	CallWithArg sub_080672B0, 0x00000000
+	Jump script_08010AB4
+	StartScript 
+	CheckInventory1 0x0067
+	JumpIfNot script_08010B62
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	SetEntityNonPlanarMovement 0x0180
+	CallWithArg_2 sub_0807F348
+	Call sub_0806075C
+	StopScript 
+	_0807EA94 
+	Call sub_080606C0
+script_08010B10:
+	StopScript 
+	Call sub_0806076C
+	_0807EF80 0x0007
+script_08010B1C:
+	Call sub_08060700
+script_08010B22:
+	StopScript 
+	StartScript 
+	_0807E564 
+	JumpIf script_08010B3A
+	CallWithArg sub_080608E4, 0x00000000
+	JumpIf script_08010B44
+script_08010B3A:
+	_0807EE30 
+	JumpIfNot script_08010B22
+	Jump script_08010B10
+script_08010B44:
+	StopScript 
+	_0807EF80 0x0000
+script_08010B4A:
+	StopScript 
+	StartScript 
+	CallWithArg sub_080608E4, 0x00000001
+	JumpIf script_08010B4A
+	StopScript 
+	Jump script_08010B1C
+script_08010B62:
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc
index 65f424ae..119ca37c 100644
--- a/data/scripts/script_08010B68.inc
+++ b/data/scripts/script_08010B68.inc
@@ -1,26 +1,28 @@
 SCRIPT_START script_08010B68
-StartScript 
-_0807E564 
-JumpIfNot 0x003e
-Call sub_0807F924
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x0007
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-_0807E564 
-JumpIfNot 0x001c
-CheckEntityInteractType 
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-_0807EB74 
-Call sub_0806E2DC
-_0807EA94 
-_0807E878 
-Jump 0xffde
-_0807EF80 0x0006
+	StartScript 
+	_0807E564 
+	JumpIfNot script_08010BAC
+	Call sub_0807F924
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x0007
+	_0807EF80 0x000a
+	StopScript 
+script_08010B88:
+	StopScript 
+	StartScript 
+	_0807E564 
+	JumpIfNot script_08010BAC
+	CheckEntityInteractType 
+	JumpIfNot script_08010B88
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	Call sub_0806E2DC
+	_0807EA94 
+	_0807E878 
+	Jump script_08010B88
+script_08010BAC:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index 7f9f1b99..58da62e2 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -1,137 +1,138 @@
 SCRIPT_START script_08010BB4
-StartScript 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0008
-Call sub_0806E440
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-Call sub_0806E418
-_0807EA94 
-_0807E878 
-_0807E930 0x0008
-Jump 0xffe2
-.short 0x0000
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_08011074
-WaitForSomething2 0x00000400
-_0807F078 0x0034, 0x0002
-TextboxNoOverlapFollowPos 0x000c1036
-_0807EA94 
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-TextboxNoOverlapFollowPos 0x00021037
-_0807EA94 
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-TextboxNoOverlapFollowPos 0x000c1038
-_0807EA94 
-SoundReq0x80100000 
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-Call sub_08064180
-LoadRoomEntityList gUnk_080F06E0
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-StartPlayerScript script_08011098
-WaitForSomething2 0x00000400
-SetEntityPositionRelative 0x005001f8
-_0807F0B4 0x0007
-CameraTargetEntity 
-Wait 0x000a
-_0807F0B4 0x0001
-_0807E778 0x0001
-DoFade4 
-_0807E5F8 0x0002a800
-WaitForSomething2 0x00055000
-SetEntityPositionRelative 0x007801f8
-Wait 0x003c
-_0807E5F8 0x00800000
-WaitForSomething2 0x01000000
-_0807E5F8 0x0002a800
-WaitForSomething2 0x00055000
-_0807E8E4_1 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos 0x000c1039
-_0807EA94 
-SoundReq2 0x0001
-_0807E8E4_2 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000010
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-WaitForSomething2 0x00000080
-Wait 0x012c
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-TextboxNoOverlapFollowPos 0x000c103a
-_0807EA94 
-SetEntityPositionRelative 0x01c001f8
-_0807F0B4 0x0004
-Wait 0x0078
-_0807E5F8 0x00280000
-WaitForSomething2 0x00500000
-_0807E5F8 0x00000100
-SetEntityPositionRelative 0x022001f8
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x01f8, 0x0098
-Wait 0x003c
-WaitForSomething2 0x00000200
-_0807E5F8 0x00280000
-SoundReq0x80100000 
-SoundReq 0x009b
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-TextboxNoOverlapFollowPos 0x00001043
-_0807EA94 
-SoundReq2 0x000d
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-_0807E5F8 0x0002a800
-WaitForSomething2 0x00055000
-SoundReq 0x01c7
-SoundReq 0x00e5
-_0807E5F8 0x00000100
-_0807E5F8 0x00002800
-CallWithArg sub_0807FB28, 0x00000003
-WaitForSomething2 0x00000200
-WaitForSomething2 0x00005000
-_0807E5F8 0x00028000
-WaitForSomething2 0x00050000
-TextboxNoOverlapFollowPos 0x00001044
-_0807EA94 
-SetEntityPositionRelative 0x009801f8
-SoundReq0x80100000 
-Wait 0x003c
-SoundReq2 0x002f
-_0807E5F8 0x00028000
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-WaitForSomething2 0x00050000
-CallWithArg sub_0807FB28, 0x00000003
-SoundReq 0x00e5
-_0807E5F8 0x00028000
-WaitForSomething2 0x00050000
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-_0807E5F8 0x08000000
-_0807E5F8 0x00800000
-WaitForSomething2 0x01000000
-CallWithArg sub_0805DDEC, 0x00000002
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0806E440
+	StopScript 
+script_08010BCA:
+	CheckEntityInteractType 
+	JumpIfNot script_08010BCA
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	Call sub_0806E418
+	_0807EA94 
+	_0807E878 
+	_0807E930 0x0008
+	Jump script_08010BCA
+	.short 0x0000
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08011074
+	WaitForSomething2 0x00000400
+	_0807F078 0x0034, 0x0002
+	TextboxNoOverlapFollowPos 0x000c1036
+	_0807EA94 
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	TextboxNoOverlapFollowPos 0x00021037
+	_0807EA94 
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	TextboxNoOverlapFollowPos 0x000c1038
+	_0807EA94 
+	SoundReq0x80100000 
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	LoadRoomEntityList gUnk_080F06E0
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	StartPlayerScript script_08011098
+	WaitForSomething2 0x00000400
+	SetEntityPositionRelative 0x005001f8
+	_0807F0B4 0x0007
+	CameraTargetEntity 
+	Wait 0x000a
+	_0807F0B4 0x0001
+	_0807E778 0x0001
+	DoFade4 
+	_0807E5F8 0x0002a800
+	WaitForSomething2 0x00055000
+	SetEntityPositionRelative 0x007801f8
+	Wait 0x003c
+	_0807E5F8 0x00800000
+	WaitForSomething2 0x01000000
+	_0807E5F8 0x0002a800
+	WaitForSomething2 0x00055000
+	_0807E8E4_1 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollowPos 0x000c1039
+	_0807EA94 
+	SoundReq2 0x0001
+	_0807E8E4_2 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000010
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	WaitForSomething2 0x00000080
+	Wait 0x012c
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollowPos 0x000c103a
+	_0807EA94 
+	SetEntityPositionRelative 0x01c001f8
+	_0807F0B4 0x0004
+	Wait 0x0078
+	_0807E5F8 0x00280000
+	WaitForSomething2 0x00500000
+	_0807E5F8 0x00000100
+	SetEntityPositionRelative 0x022001f8
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x01f8, 0x0098
+	Wait 0x003c
+	WaitForSomething2 0x00000200
+	_0807E5F8 0x00280000
+	SoundReq0x80100000 
+	SoundReq 0x009b
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	TextboxNoOverlapFollowPos 0x00001043
+	_0807EA94 
+	SoundReq2 0x000d
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	_0807E5F8 0x0002a800
+	WaitForSomething2 0x00055000
+	SoundReq 0x01c7
+	SoundReq 0x00e5
+	_0807E5F8 0x00000100
+	_0807E5F8 0x00002800
+	CallWithArg sub_0807FB28, 0x00000003
+	WaitForSomething2 0x00000200
+	WaitForSomething2 0x00005000
+	_0807E5F8 0x00028000
+	WaitForSomething2 0x00050000
+	TextboxNoOverlapFollowPos 0x00001044
+	_0807EA94 
+	SetEntityPositionRelative 0x009801f8
+	SoundReq0x80100000 
+	Wait 0x003c
+	SoundReq2 0x002f
+	_0807E5F8 0x00028000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	WaitForSomething2 0x00050000
+	CallWithArg sub_0807FB28, 0x00000003
+	SoundReq 0x00e5
+	_0807E5F8 0x00028000
+	WaitForSomething2 0x00050000
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	_0807E5F8 0x08000000
+	_0807E5F8 0x00800000
+	WaitForSomething2 0x01000000
+	CallWithArg sub_0805DDEC, 0x00000002
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc
index 2e6e3b36..46021b6a 100644
--- a/data/scripts/script_08010E5A.inc
+++ b/data/scripts/script_08010E5A.inc
@@ -1,55 +1,55 @@
 SCRIPT_START script_08010E5A
-Wait 0x001e
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-Wait 0x003c
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-Wait 0x0004
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-Wait 0x001e
-SoundReq 0x012c
-_0807E5F8 0x00800000
-WaitForSomething2 0x01000000
-_0807E778 0x0004
-DoFade7 
-WaitFor_2 
-Wait 0x003c
-SoundReq 0x00ab
-SoundReq 0x01c2
-LoadRoomEntityList gUnk_080F0770
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-CallWithArg sub_0805DE18, 0x00000002
-_0807F0C8 0x0000, 0x0000
-Call sub_0806DC3C
-Call sub_080791BC
-CallWithArg sub_0807F244, 0x0000000d
-CallWithArg sub_0807F29C, 0x080049f6
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x006801f8
-_0807E5F8 0x00000004
-Wait 0x001e
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000008
-WaitForSomething2 0x00000080
-SoundReq 0x01c3
-_0807E5F8 0x20000000
-Wait 0x0078
-CallWithArg sub_0807F29C, 0x00000000
-Call sub_0806DC58
-_0807E5F8 0x40000000
-_0807E5F8 0x00000010
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000020
-WaitForSomething2 0x00000200
-TextboxNoOverlapFollowPos 0x000c1045
-_0807EA94 
-TextboxNoOverlapFollowPos 0x00001046
-_0807EA94 
-CallWithArg sub_0805DDEC, 0x00000002
-_0807F0C8 0xffff, 0x0000
+	Wait 0x001e
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	Wait 0x003c
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	Wait 0x0004
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	Wait 0x001e
+	SoundReq 0x012c
+	_0807E5F8 0x00800000
+	WaitForSomething2 0x01000000
+	_0807E778 0x0004
+	DoFade7 
+	WaitFor_2 
+	Wait 0x003c
+	SoundReq 0x00ab
+	SoundReq 0x01c2
+	LoadRoomEntityList gUnk_080F0770
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	_0807E778 0x0002
+	DoFade6 
+	WaitFor_2 
+	CallWithArg sub_0805DE18, 0x00000002
+	_0807F0C8 0x0000, 0x0000
+	Call sub_0806DC3C
+	Call sub_080791BC
+	CallWithArg sub_0807F244, 0x0000000d
+	CallWithArg sub_0807F29C, 0x080049f6
+	_0807F0B4 0x0001
+	SetEntityPositionRelative 0x006801f8
+	_0807E5F8 0x00000004
+	Wait 0x001e
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000008
+	WaitForSomething2 0x00000080
+	SoundReq 0x01c3
+	_0807E5F8 0x20000000
+	Wait 0x0078
+	CallWithArg sub_0807F29C, 0x00000000
+	Call sub_0806DC58
+	_0807E5F8 0x40000000
+	_0807E5F8 0x00000010
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000020
+	WaitForSomething2 0x00000200
+	TextboxNoOverlapFollowPos 0x000c1045
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x00001046
+	_0807EA94 
+	CallWithArg sub_0805DDEC, 0x00000002
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index 35b90c64..bb24aa9d 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -1,44 +1,44 @@
 SCRIPT_START script_08010F84
-Wait 0x003c
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-StartPlayerScript script_080110BC
-WaitForSomething2 0x00000400
-TextboxNoOverlapFollowPos 0x00001047
-_0807EA94 
-Call sub_0806DC3C
-Call sub_080791BC
-CallWithArg sub_0807F244, 0x0000000d
-CallWithArg sub_0807F29C, 0x080049f6
-Wait 0x001e
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-CallWithArg sub_0807F29C, 0x00000000
-Call sub_0806DC58
-Wait 0x003c
-_0807E5F8 0x08000000
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-Wait 0x000f
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-CallWithArg sub_0805DE18, 0x00000002
-_0807F0C8 0x0000, 0x0000
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-SoundReq0x80100000 
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x0000104a
-_0807EA94 
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-TextboxNoOverlapFollowPos 0x00001049
-_0807EA94 
-SetEntityPositionRelative 0x009801f8
-Wait 0x0078
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000200
-Call sub_0804BCDC
-_0807EF80 0x0006
+	Wait 0x003c
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	StartPlayerScript script_080110BC
+	WaitForSomething2 0x00000400
+	TextboxNoOverlapFollowPos 0x00001047
+	_0807EA94 
+	Call sub_0806DC3C
+	Call sub_080791BC
+	CallWithArg sub_0807F244, 0x0000000d
+	CallWithArg sub_0807F29C, 0x080049f6
+	Wait 0x001e
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	CallWithArg sub_0807F29C, 0x00000000
+	Call sub_0806DC58
+	Wait 0x003c
+	_0807E5F8 0x08000000
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	Wait 0x000f
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	CallWithArg sub_0805DE18, 0x00000002
+	_0807F0C8 0x0000, 0x0000
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	SoundReq0x80100000 
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x0000104a
+	_0807EA94 
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	TextboxNoOverlapFollowPos 0x00001049
+	_0807EA94 
+	SetEntityPositionRelative 0x009801f8
+	Wait 0x0078
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	Call sub_0804BCDC
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc
index 195c75f3..65a2a6f0 100644
--- a/data/scripts/script_08011074.inc
+++ b/data/scripts/script_08011074.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08011074
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EDD4 0x01e8, 0x0050
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000400
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EDD4 0x01e8, 0x0050
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000400
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc
index 00f37a96..2a7af781 100644
--- a/data/scripts/script_08011098.inc
+++ b/data/scripts/script_08011098.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08011098
-SetEntityPositionRelative 0x005801a8
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000400
-_0807E610 0x00000002
-StopScript 
-Call sub_080791BC
+	SetEntityPositionRelative 0x005801a8
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000400
+	_0807E610 0x00000002
+	StopScript 
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc
index e2e590ef..1c93b869 100644
--- a/data/scripts/script_080110BC.inc
+++ b/data/scripts/script_080110BC.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_080110BC
-StartScript 
-SetEntityNonPlanarMovement 0x0040
-StopScript 
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x0001
-_0807EDD4 0x01d8, 0x0068
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000400
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0040
+	StopScript 
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x0001
+	_0807EDD4 0x01d8, 0x0068
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000400
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc
index 5ecc77d8..16dc59f0 100644
--- a/data/scripts/script_080110E8.inc
+++ b/data/scripts/script_080110E8.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_080110E8
-SoundReq 0x007a
-_0807EB44 0x0004
-_0807EF80 0x000d
-SoundReq 0x0086
-Call sub_0807F36C
-SetEntityNonPlanarMovement 0x0400
-_0807ECF4 0x0008
-StartScript 
-Call sub_0807F1E8
-_0807EF80 0x0011
-StopScript 
-Call sub_0807F2D4
-WaitForSomething 0x80000000
-Call sub_080791BC
+	SoundReq 0x007a
+	_0807EB44 0x0004
+	_0807EF80 0x000d
+	SoundReq 0x0086
+	Call sub_0807F36C
+	SetEntityNonPlanarMovement 0x0400
+	_0807ECF4 0x0008
+	StartScript 
+	Call sub_0807F1E8
+	_0807EF80 0x0011
+	StopScript 
+	Call sub_0807F2D4
+	WaitForSomething 0x80000000
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc
index f79ade44..5427f0d9 100644
--- a/data/scripts/script_08011128.inc
+++ b/data/scripts/script_08011128.inc
@@ -1,36 +1,37 @@
 SCRIPT_START script_08011128
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
-JumpIfNot 0xfff6
-LoadRoomEntityList gUnk_080F06B0
-_0807EF80 0x000b
-WaitForSomething2 0x00000004
-SetEntityPositionRelative 0x005801b8
-_0807EB44 0x0004
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EB44 0x0006
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EB44 0x0004
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x0001
-_0807ECC4 0x0010
-_0807EF80 0x0000
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0010
-Wait 0x001e
-_0807EF80 0x0010
-Call sub_0807F3C8
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x001c
-_0807EC1C 0x003c
-_0807E5F8 0x00000008
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_08011134:
+	CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
+	JumpIfNot script_08011134
+	LoadRoomEntityList gUnk_080F06B0
+	_0807EF80 0x000b
+	WaitForSomething2 0x00000004
+	SetEntityPositionRelative 0x005801b8
+	_0807EB44 0x0004
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EB44 0x0006
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EB44 0x0004
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x0001
+	_0807ECC4 0x0010
+	_0807EF80 0x0000
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0010
+	Wait 0x001e
+	_0807EF80 0x0010
+	Call sub_0807F3C8
+	SetEntityNonPlanarMovement 0x0400
+	SetEntityDirection 0x001c
+	_0807EC1C 0x003c
+	_0807E5F8 0x00000008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc
index ccfee28b..1abef76f 100644
--- a/data/scripts/script_080111CC.inc
+++ b/data/scripts/script_080111CC.inc
@@ -1,53 +1,55 @@
 SCRIPT_START script_080111CC
-StartScript 
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0100
-Call sub_08066D04
-StopScript 
-Call sub_0807F338
-WaitForSomething2 0x00000010
-Call sub_08066D14
-JumpIf 0x0004
-MoveEntityToPlayer 
-Call sub_0807F8BC
-JumpIf 0x0008
-SetEntityPositionRelative 0x00b801f8
-_0807EF80 0x0007
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x0050
-_0807EB74 
-_0807EF80 0x0000
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x0020
-_0807EF80 0x0008
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-_0807EF80 0x0007
-_0807EF80 0x0001
-SetEntityNonPlanarMovement 0x0040
-_0807EDD4 0x01e8, 0x0040
-_0807EF80 0x0000
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-Call sub_08095810
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-_0807EF80 0x0001
-_0807EDD4 0x01d8, 0x0058
-_0807EF80 0x0000
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-SoundReq 0x01c9
-_0807EF80 0x0010
-Wait 0x0014
-Call sub_08066E20
-Wait 0x0014
-_0807EF80 0x0010
-Call sub_0807F2D4
-SoundReq 0x01ca
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0100
+	Call sub_08066D04
+	StopScript 
+	Call sub_0807F338
+	WaitForSomething2 0x00000010
+	Call sub_08066D14
+	JumpIf script_080111F6
+	MoveEntityToPlayer 
+script_080111F6:
+	Call sub_0807F8BC
+	JumpIf script_08011206
+	SetEntityPositionRelative 0x00b801f8
+script_08011206:
+	_0807EF80 0x0007
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x0050
+	_0807EB74 
+	_0807EF80 0x0000
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x0020
+	_0807EF80 0x0008
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0007
+	_0807EF80 0x0001
+	SetEntityNonPlanarMovement 0x0040
+	_0807EDD4 0x01e8, 0x0040
+	_0807EF80 0x0000
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	Call sub_08095810
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0001
+	_0807EDD4 0x01d8, 0x0058
+	_0807EF80 0x0000
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	SoundReq 0x01c9
+	_0807EF80 0x0010
+	Wait 0x0014
+	Call sub_08066E20
+	Wait 0x0014
+	_0807EF80 0x0010
+	Call sub_0807F2D4
+	SoundReq 0x01ca
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc
index d6ef7fb1..fe2bc3f8 100644
--- a/data/scripts/script_080112C4.inc
+++ b/data/scripts/script_080112C4.inc
@@ -1,51 +1,52 @@
 SCRIPT_START script_080112C4
-StartScript 
-_0807EF80 0x0008
-SetEntityNonPlanarMovement 0x0100
-Call sub_08095244
-Call sub_0807F338
-StopScript 
-WaitForSomething 0x0002a800
-_0807EF80 0x0007
-_0807E930 0x0006
-_0807ECC4 0x0010
-Wait 0x003c
-_0807ECC4 0x0010
-Wait 0x003c
-_0807ECC4 0x0010
-_0807E930 0x0002
-Call sub_08064050
-_0807E078_ssss 0x0008, 0x009e, 0x0134, 0x01f8
-_0807E610 0x00000800
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807E930 0x0007
-_0807EB44 0x0006
-_0807ECF4 0x0010
-_0807EB44 0x0004
-_0807E930 0x0002
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0012
-SoundReq 0x011e
-Wait 0x003c
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x01f0, 0x0098
-_0807EDD4 0x01f0, 0x00c8
-_0807E930 0x0013
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807EF80 0x0010
-Wait 0x000a
-_0807EF80 0x0010
-Call sub_0807F3C8
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x001e
-_0807EC1C 0x003c
-_0807E5F8 0x00001000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	SetEntityNonPlanarMovement 0x0100
+	Call sub_08095244
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething 0x0002a800
+	_0807EF80 0x0007
+	_0807E930 0x0006
+	_0807ECC4 0x0010
+	Wait 0x003c
+	_0807ECC4 0x0010
+	Wait 0x003c
+	_0807ECC4 0x0010
+	_0807E930 0x0002
+	Call sub_08064050
+	JumpSwitch_4 script_08011312, script_080113AA, script_08011442, script_08011508
+script_08011312:
+	_0807E610 0x00000800
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	_0807E930 0x0007
+	_0807EB44 0x0006
+	_0807ECF4 0x0010
+	_0807EB44 0x0004
+	_0807E930 0x0002
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E930 0x0012
+	SoundReq 0x011e
+	Wait 0x003c
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x01f0, 0x0098
+	_0807EDD4 0x01f0, 0x00c8
+	_0807E930 0x0013
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	_0807EF80 0x0010
+	Wait 0x000a
+	_0807EF80 0x0010
+	Call sub_0807F3C8
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0400
+	SetEntityDirection 0x001e
+	_0807EC1C 0x003c
+	_0807E5F8 0x00001000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc
index 0c831ff8..790c8547 100644
--- a/data/scripts/script_080113AA.inc
+++ b/data/scripts/script_080113AA.inc
@@ -1,34 +1,35 @@
 SCRIPT_START script_080113AA
-_0807E610 0x00002000
-_0807E5F8 0x00004000
-WaitForSomething2 0x00002000
-_0807E930 0x0005
-_0807EB44 0x0002
-_0807EC94 0x0010
-_0807EB44 0x0004
-_0807E930 0x0002
-_0807E5F8 0x00004000
-WaitForSomething2 0x00002000
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0012
-SoundReq 0x011e
-Wait 0x003c
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0200, 0x0098
-_0807EDD4 0x0200, 0x00c8
-_0807E930 0x0013
-_0807E5F8 0x00004000
-WaitForSomething2 0x00002000
-_0807EF80 0x0010
-Wait 0x000a
-_0807EF80 0x0010
-Call sub_0807F3C8
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x0002
-_0807EC1C 0x003c
-_0807E5F8 0x00004000
-_0807EF80 0x0006
+script_080113AA:
+	_0807E610 0x00002000
+	_0807E5F8 0x00004000
+	WaitForSomething2 0x00002000
+	_0807E930 0x0005
+	_0807EB44 0x0002
+	_0807EC94 0x0010
+	_0807EB44 0x0004
+	_0807E930 0x0002
+	_0807E5F8 0x00004000
+	WaitForSomething2 0x00002000
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E930 0x0012
+	SoundReq 0x011e
+	Wait 0x003c
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0200, 0x0098
+	_0807EDD4 0x0200, 0x00c8
+	_0807E930 0x0013
+	_0807E5F8 0x00004000
+	WaitForSomething2 0x00002000
+	_0807EF80 0x0010
+	Wait 0x000a
+	_0807EF80 0x0010
+	Call sub_0807F3C8
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0400
+	SetEntityDirection 0x0002
+	_0807EC1C 0x003c
+	_0807E5F8 0x00004000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc
index 01bbc757..fe2d6936 100644
--- a/data/scripts/script_08011442.inc
+++ b/data/scripts/script_08011442.inc
@@ -1,43 +1,44 @@
 SCRIPT_START script_08011442
-_0807E610 0x00008000
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807E930 0x0007
-_0807EB44 0x0006
-_0807ECF4 0x0020
-_0807EB44 0x0004
-_0807E930 0x0006
-_0807ECC4 0x0010
-_0807E930 0x0002
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0012
-SoundReq 0x011e
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x01e8, 0x0098
-SetEntityNonPlanarMovement 0x0040
-_0807EEF4 0x0000, 0x0010
-_0807E930 0x0013
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807EF80 0x000d
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0020
-_0807EEF4 0x0000, 0xfff0
-_0807E930 0x0013
-_0807EF80 0x0010
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-Call sub_0807F3C8
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x001e
-_0807EC1C 0x003c
-_0807E5F8 0x00010000
-_0807EF80 0x0006
+script_08011442:
+	_0807E610 0x00008000
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807E930 0x0007
+	_0807EB44 0x0006
+	_0807ECF4 0x0020
+	_0807EB44 0x0004
+	_0807E930 0x0006
+	_0807ECC4 0x0010
+	_0807E930 0x0002
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E930 0x0012
+	SoundReq 0x011e
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x01e8, 0x0098
+	SetEntityNonPlanarMovement 0x0040
+	_0807EEF4 0x0000, 0x0010
+	_0807E930 0x0013
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807EF80 0x000d
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0020
+	_0807EEF4 0x0000, 0xfff0
+	_0807E930 0x0013
+	_0807EF80 0x0010
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	Call sub_0807F3C8
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0400
+	SetEntityDirection 0x001e
+	_0807EC1C 0x003c
+	_0807E5F8 0x00010000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc
index cffe3462..c70497c3 100644
--- a/data/scripts/script_08011508.inc
+++ b/data/scripts/script_08011508.inc
@@ -1,44 +1,45 @@
 SCRIPT_START script_08011508
-_0807E610 0x00020000
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-_0807E930 0x0005
-_0807EB44 0x0002
-_0807EC94 0x0020
-_0807EB44 0x0004
-_0807E930 0x0006
-_0807ECC4 0x0010
-_0807E930 0x0002
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0012
-SoundReq 0x011e
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0208, 0x0098
-SetEntityNonPlanarMovement 0x0040
-_0807EEF4 0x0000, 0x0010
-_0807E930 0x0013
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-_0807EF80 0x000d
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0020
-_0807EEF4 0x0000, 0xfff0
-_0807E930 0x0013
-_0807EF80 0x0010
-_0807E5F8 0x00040000
-WaitForSomething2 0x00020000
-Call sub_0807F3C8
-_0807E930 0x0014
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x0002
-_0807EC1C 0x003c
-_0807E5F8 0x00040000
-_0807EF80 0x0006
+script_08011508:
+	_0807E610 0x00020000
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	_0807E930 0x0005
+	_0807EB44 0x0002
+	_0807EC94 0x0020
+	_0807EB44 0x0004
+	_0807E930 0x0006
+	_0807ECC4 0x0010
+	_0807E930 0x0002
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E930 0x0012
+	SoundReq 0x011e
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0208, 0x0098
+	SetEntityNonPlanarMovement 0x0040
+	_0807EEF4 0x0000, 0x0010
+	_0807E930 0x0013
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	_0807EF80 0x000d
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0020
+	_0807EEF4 0x0000, 0xfff0
+	_0807E930 0x0013
+	_0807EF80 0x0010
+	_0807E5F8 0x00040000
+	WaitForSomething2 0x00020000
+	Call sub_0807F3C8
+	_0807E930 0x0014
+	SetEntityNonPlanarMovement 0x0400
+	SetEntityDirection 0x0002
+	_0807EC1C 0x003c
+	_0807E5F8 0x00040000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc
index 6b01020c..17db073e 100644
--- a/data/scripts/script_080115D0.inc
+++ b/data/scripts/script_080115D0.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_080115D0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0002
-_0807E930 0x0001
-StopScript 
-WaitForSomething2 0x00080000
-_0807E930 0x0005
-SoundReq 0x011c
-_0807ECF4 0x0010
-_0807E930 0x0001
-_0807E5F8 0x00100000
-WaitForSomething2 0x00080000
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0002
+	_0807E930 0x0001
+	StopScript 
+	WaitForSomething2 0x00080000
+	_0807E930 0x0005
+	SoundReq 0x011c
+	_0807ECF4 0x0010
+	_0807E930 0x0001
+	_0807E5F8 0x00100000
+	WaitForSomething2 0x00080000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc
index f3e4d1bf..7c1f94fe 100644
--- a/data/scripts/script_08011608.inc
+++ b/data/scripts/script_08011608.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_08011608
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0006
-_0807E930 0x0003
-StopScript 
-WaitForSomething2 0x00200000
-_0807E930 0x0007
-SoundReq 0x011c
-_0807EC94 0x0010
-_0807E930 0x0003
-_0807E5F8 0x00400000
-WaitForSomething2 0x00200000
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0006
+	_0807E930 0x0003
+	StopScript 
+	WaitForSomething2 0x00200000
+	_0807E930 0x0007
+	SoundReq 0x011c
+	_0807EC94 0x0010
+	_0807E930 0x0003
+	_0807E5F8 0x00400000
+	WaitForSomething2 0x00200000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc
index d2917c75..6a94cb85 100644
--- a/data/scripts/script_08011640.inc
+++ b/data/scripts/script_08011640.inc
@@ -1,25 +1,25 @@
 SCRIPT_START script_08011640
-StartScript 
-_0807EF80 0x0008
-_0807EB44 0x0004
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-Call sub_0807F338
-WaitForSomething2 0x00000040
-_0807EF80 0x0007
-_0807EF80 0x0001
-SetEntityNonPlanarMovement 0x0040
-_0807EDD4 0x01f8, 0x0048
-_0807EF80 0x0000
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000040
-_0807EF80 0x0010
-Wait 0x001e
-_0807EF80 0x0010
-Call sub_0807F3C8
-SetEntityNonPlanarMovement 0x0400
-SetEntityDirection 0x0008
-_0807EC1C 0x003c
-_0807E5F8 0x00000080
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	_0807EB44 0x0004
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	Call sub_0807F338
+	WaitForSomething2 0x00000040
+	_0807EF80 0x0007
+	_0807EF80 0x0001
+	SetEntityNonPlanarMovement 0x0040
+	_0807EDD4 0x01f8, 0x0048
+	_0807EF80 0x0000
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000040
+	_0807EF80 0x0010
+	Wait 0x001e
+	_0807EF80 0x0010
+	Call sub_0807F3C8
+	SetEntityNonPlanarMovement 0x0400
+	SetEntityDirection 0x0008
+	_0807EC1C 0x003c
+	_0807E5F8 0x00000080
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc
index d5f85594..034deb1b 100644
--- a/data/scripts/script_080116A8.inc
+++ b/data/scripts/script_080116A8.inc
@@ -1,85 +1,85 @@
 SCRIPT_START script_080116A8
-StartScript 
-_0807EB44 0x0000
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-Call sub_0807F338
-WaitForSomething2 0x00000100
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x00d0
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-_0807EB44 0x0004
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-_0807EB44 0x0000
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-_0807EB44 0x0000
-_0807EF80 0x001a
-Call sub_0807F2D4
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-_0807EB44 0x0000
-_0807EF80 0x0014
-SoundReq 0x0120
-CallWithArg sub_08095420, 0x08011890
-Wait 0x00f0
-_0807EF80 0x0016
-SoundReq 0x01cb
-WaitForSomething2 0x10000000
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0001
-_0807EDD4 0x01d8, 0x00a8
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-_0807EF80 0x0014
-SoundReq 0x01c4
-CallWithArg sub_0809545C, 0x080118d4
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-Wait 0x003c
-_0807EF80 0x0016
-SoundReq 0x01c5
-_0807E5F8 0x08000000
-WaitForSomething2 0x10000000
-_0807EF80 0x0000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x0098
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x0004
-Wait 0x005a
-_0807EB44 0x0004
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EB44 0x0004
-_0807EF80 0x0000
-Wait 0x001e
-_0807E5F8 0x00000200
-WaitForSomething2 0x00000100
-Call sub_08066CA4
-_0807EF80 0x0008
-Wait 0x0078
-_0807E5F8 0x00000200
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0000
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	Call sub_0807F338
+	WaitForSomething2 0x00000100
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x00d0
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	_0807EB44 0x0004
+	_0807EF80 0x001c
+	Call sub_0807F2D4
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	_0807EB44 0x0000
+	_0807EF80 0x001c
+	Call sub_0807F2D4
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	_0807EB44 0x0000
+	_0807EF80 0x001a
+	Call sub_0807F2D4
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	_0807EB44 0x0000
+	_0807EF80 0x0014
+	SoundReq 0x0120
+	CallWithArg sub_08095420, 0x08011890
+	Wait 0x00f0
+	_0807EF80 0x0016
+	SoundReq 0x01cb
+	WaitForSomething2 0x10000000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0001
+	_0807EDD4 0x01d8, 0x00a8
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	_0807EF80 0x0014
+	SoundReq 0x01c4
+	CallWithArg sub_0809545C, 0x080118d4
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	Wait 0x003c
+	_0807EF80 0x0016
+	SoundReq 0x01c5
+	_0807E5F8 0x08000000
+	WaitForSomething2 0x10000000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x0098
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807EF80 0x0004
+	Wait 0x005a
+	_0807EB44 0x0004
+	_0807EF80 0x001c
+	Call sub_0807F2D4
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00000100
+	Call sub_08066CA4
+	_0807EF80 0x0008
+	Wait 0x0078
+	_0807E5F8 0x00000200
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc
index 55af706a..a3ddcd66 100644
--- a/data/scripts/script_0801183C.inc
+++ b/data/scripts/script_0801183C.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0801183C
-StartScript 
-Call sub_08095330
-StopScript 
-WaitForSomething2 0x00800000
-_0807EF3C 0x0000, 0x0020
-_0807E5F8 0x01000000
-WaitForSomething2 0x00800000
-Call sub_08095364
-SoundReq 0x0122
-Wait 0x003c
-_0807E5F8 0x01000000
-WaitForSomething2 0x00800000
-_0807E930 0x0002
-_0807E5F8 0x01000000
-WaitForSomething2 0x00800000
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08095330
+	StopScript 
+	WaitForSomething2 0x00800000
+	_0807EF3C 0x0000, 0x0020
+	_0807E5F8 0x01000000
+	WaitForSomething2 0x00800000
+	Call sub_08095364
+	SoundReq 0x0122
+	Wait 0x003c
+	_0807E5F8 0x01000000
+	WaitForSomething2 0x00800000
+	_0807E930 0x0002
+	_0807E5F8 0x01000000
+	WaitForSomething2 0x00800000
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc
index 11144e47..aa846e13 100644
--- a/data/scripts/script_08011890.inc
+++ b/data/scripts/script_08011890.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_08011890
-StartScript 
-_0807E930 0x0000
-SetEntityNonPlanarMovement 0x0200
-Call nullsub_527
-Call sub_08094B80
-StopScript 
-Wait 0x00f0
-Call sub_08094B6C
-_0807EDD4 0x01f8, 0x0088
-Call sub_08094B80
-SoundReq 0x01cc
-_0807E5F8 0x10000000
-WaitForSomething2 0x08000000
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0000
+	SetEntityNonPlanarMovement 0x0200
+	Call nullsub_527
+	Call sub_08094B80
+	StopScript 
+	Wait 0x00f0
+	Call sub_08094B6C
+	_0807EDD4 0x01f8, 0x0088
+	Call sub_08094B80
+	SoundReq 0x01cc
+	_0807E5F8 0x10000000
+	WaitForSomething2 0x08000000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc
index dcd95a7b..6c05e051 100644
--- a/data/scripts/script_080118D4.inc
+++ b/data/scripts/script_080118D4.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_080118D4
-StartScript 
-_0807E930 0x0000
-SetEntityNonPlanarMovement 0x0200
-Call nullsub_527
-Call sub_08094B80
-StopScript 
-WaitForSomething2 0x08000000
-Call sub_08094B6C
-_0807EDD4 0x01d8, 0x0078
-StartPlayerScript script_080110E8
-_0807EDD4 0x01d8, 0x0058
-Call sub_08094B80
-SoundReq 0x009a
-SoundReq 0x01c6
-_0807E5F8 0x10000000
-WaitForSomething2 0x08000000
-SoundReq 0x011d
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0000
+	SetEntityNonPlanarMovement 0x0200
+	Call nullsub_527
+	Call sub_08094B80
+	StopScript 
+	WaitForSomething2 0x08000000
+	Call sub_08094B6C
+	_0807EDD4 0x01d8, 0x0078
+	StartPlayerScript script_080110E8
+	_0807EDD4 0x01d8, 0x0058
+	Call sub_08094B80
+	SoundReq 0x009a
+	SoundReq 0x01c6
+	_0807E5F8 0x10000000
+	WaitForSomething2 0x08000000
+	SoundReq 0x011d
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011930.inc b/data/scripts/script_08011930.inc
index 14e12821..387c954c 100644
--- a/data/scripts/script_08011930.inc
+++ b/data/scripts/script_08011930.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08011930
-WaitForSomething 0x20000000
-Call sub_0809567C
+	WaitForSomething 0x20000000
+	Call sub_0809567C
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011940.inc b/data/scripts/script_08011940.inc
index 3c327214..faacc51a 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
+	WaitForSomething 0x40000000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc
index 6931c790..29618db8 100644
--- a/data/scripts/script_0801194C.inc
+++ b/data/scripts/script_0801194C.inc
@@ -1,125 +1,137 @@
 SCRIPT_START script_0801194C
-StartScript 
-_0807EB44 0x0002
-Jump 0x0016
-.short 0x0000
-StartScript 
-_0807EB44 0x0006
-Jump 0x000a
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-CheckGlobalFlag 0x0015
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x103d
-Jump 0x0006
-TextboxNoOverlapFollow 0x103f
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffce
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x0000000c
-StopScript 
-Wait 0x003c
-Call sub_0806407C
-Jump 0xfff4
-.short 0x0000
-StartScript 
-_0807EB44 0x0002
-Jump 0x0016
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-Jump 0x000a
-.short 0x0000
-StartScript 
-_0807EB44 0x0006
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-Call sub_08064428
-_0807EA94 
-_0807E878 
-Jump 0xffe0
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlapFollow 0x1320
-_0807EA94 
-_0807E878 
-Jump 0xffe2
-StartScript 
-_0807EB44 0x0002
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-CallWithArg sub_080644B4, 0x00000006
-JumpIf 0x005e
-TextboxNoOverlapFollow 0x1320
-_0807EA94 
-_0807E878 
-Jump 0xffd4
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-TextboxNoOverlapFollow 0x1322
-_0807EA94 
-_0807E878 
-Jump 0xffe2
-CheckRoomFlag 0x000f
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x00071321
-_0807EA94 
-SetLocalFlag 0x0010
-CallWithArg sub_0806DA1C, 0x00000003
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0002
+	Jump script_0801196A
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0006
+	Jump script_0801196A
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+script_0801196A:
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_0801197C:
+	CheckEntityInteractType 
+	JumpIfNot script_0801197C
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	CheckGlobalFlag 0x0015
+	JumpIf script_080119A0
+	TextboxNoOverlapFollow 0x103d
+	Jump script_080119A4
+script_080119A0:
+	TextboxNoOverlapFollow 0x103f
+script_080119A4:
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0801197C
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x0000000c
+	StopScript 
+script_080119C8:
+	Wait 0x003c
+	Call sub_0806407C
+	Jump script_080119C8
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0002
+	Jump script_080119F6
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	Jump script_080119F6
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0006
+script_080119F6:
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08011A08:
+	CheckEntityInteractType 
+	JumpIfNot script_08011A08
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Call sub_08064428
+	_0807EA94 
+	_0807E878 
+	Jump script_08011A08
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08011A44:
+	CheckEntityInteractType 
+	JumpIfNot script_08011A44
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	TextboxNoOverlapFollow 0x1320
+	_0807EA94 
+	_0807E878 
+	Jump script_08011A44
+	StartScript 
+	_0807EB44 0x0002
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08011A7C:
+	CheckEntityInteractType 
+	JumpIfNot script_08011A7C
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	CallWithArg sub_080644B4, 0x00000006
+	JumpIf script_08011AFA
+	TextboxNoOverlapFollow 0x1320
+	_0807EA94 
+	_0807E878 
+	Jump script_08011A7C
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08011AC4:
+	CheckEntityInteractType 
+	JumpIfNot script_08011AC4
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	TextboxNoOverlapFollow 0x1322
+	_0807EA94 
+	_0807E878 
+	Jump script_08011AC4
+script_08011AE4:
+	CheckRoomFlag 0x000f
+	JumpIfNot script_08011AE4
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+script_08011AFA:
+	TextboxNoOverlapFollowPos 0x00071321
+	_0807EA94 
+	SetLocalFlag 0x0010
+	CallWithArg sub_0806DA1C, 0x00000003
+	_0807E878 
+	Call sub_0807DF50
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc
index 26e034fa..c568336a 100644
--- a/data/scripts/script_08011B20.inc
+++ b/data/scripts/script_08011B20.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08011B20
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x000c1320
-_0807EA94 
-_0807E878 
-Call sub_0807DF50
-_0807EF80 0x0006
+	_0807E864 
+	Call sub_0807DF28
+	TextboxNoOverlapFollowPos 0x000c1320
+	_0807EA94 
+	_0807E878 
+	Call sub_0807DF50
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc
index ed37af0a..bc4f4c26 100644
--- a/data/scripts/script_08011B40.inc
+++ b/data/scripts/script_08011B40.inc
@@ -1,76 +1,82 @@
 SCRIPT_START script_08011B40
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckGlobalFlag 0x0050
-JumpIfNot 0x002c
-WaitForSomething2 0x00000004
-_0807EB44 0x0006
-_0807EF80 0x0004
-Wait 0x003c
-_0807EB8C 
-TextboxNoOverlap 0x3d07
-_0807EA94 
-_0807EB44 0x0004
-ClearGlobalFlag 0x0050
-Call sub_0807DF50
-_0807E878 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x3d01
-_0807EA94 
-_0807E3E8 
-JumpIf 0x000c
-_0807E878 
-_0807EB44 0x0004
-Jump 0xffe2
-HasRupees 0x000a
-JumpIf 0x0012
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x3d05
-Jump 0xffe0
-ModRupees 0xfff6
-Wait 0x001e
-TextboxNoOverlap 0x3d06
-_0807EA94 
-CallWithArg sub_0806C2A0, 0x00000000
-WaitFor_2 
-Wait 0x003c
-Call sub_0806C224
-Jump 0xffb8
-StartScript 
-_0807E888 
-StopScript 
-CallWithArg sub_0806C2A0, 0x00000001
-WaitFor_2 
-Wait 0x003c
-_0807E878 
-SetRoomFlag 0x0000
-SoundReq2 0x0033
-CheckRoomFlag 0x0064
-JumpIfNot 0xfffa
-SoundReq0x80100000 
-_0807E864 
-Wait 0x003c
-CameraTargetEntity 
-Wait 0x003c
-Call Simon_CreateChest
-Wait 0x003c
-CameraTargetPlayer 
-_0807E878 
-CheckLocalFlag 0x0001
-JumpIfNot 0xfffa
-_0807E888 
-WaitPlayerAction8 
-Wait 0x001e
-CallWithArg sub_0806C2A0, 0x00000000
-WaitFor_2 
-Wait 0x003c
-Call sub_0806C280
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	CheckGlobalFlag 0x0050
+	JumpIfNot script_08011B84
+	WaitForSomething2 0x00000004
+	_0807EB44 0x0006
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807EB8C 
+	TextboxNoOverlap 0x3d07
+	_0807EA94 
+	_0807EB44 0x0004
+	ClearGlobalFlag 0x0050
+	Call sub_0807DF50
+	_0807E878 
+script_08011B84:
+	CheckEntityInteractType 
+	JumpIfNot script_08011B84
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x3d01
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_08011BA4
+script_08011B9A:
+	_0807E878 
+	_0807EB44 0x0004
+	Jump script_08011B84
+script_08011BA4:
+	HasRupees 0x000a
+	JumpIf script_08011BBC
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x3d05
+	Jump script_08011B9A
+script_08011BBC:
+	ModRupees 0xfff6
+	Wait 0x001e
+	TextboxNoOverlap 0x3d06
+	_0807EA94 
+	CallWithArg sub_0806C2A0, 0x00000000
+	WaitFor_2 
+	Wait 0x003c
+	Call sub_0806C224
+	Jump script_08011B9A
+	StartScript 
+	_0807E888 
+	StopScript 
+	CallWithArg sub_0806C2A0, 0x00000001
+	WaitFor_2 
+	Wait 0x003c
+	_0807E878 
+	SetRoomFlag 0x0000
+	SoundReq2 0x0033
+script_08011C04:
+	CheckRoomFlag 0x0064
+	JumpIfNot script_08011C04
+	SoundReq0x80100000 
+	_0807E864 
+	Wait 0x003c
+	CameraTargetEntity 
+	Wait 0x003c
+	Call Simon_CreateChest
+	Wait 0x003c
+	CameraTargetPlayer 
+	_0807E878 
+script_08011C28:
+	CheckLocalFlag 0x0001
+	JumpIfNot script_08011C28
+	_0807E888 
+	WaitPlayerAction8 
+	Wait 0x001e
+	CallWithArg sub_0806C2A0, 0x00000000
+	WaitFor_2 
+	Wait 0x003c
+	Call sub_0806C280
 SCRIPT_END
diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc
index 9bce285e..fb147eb5 100644
--- a/data/scripts/script_08011C50.inc
+++ b/data/scripts/script_08011C50.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08011C50
-StartScript 
-_0807E864 
-StopScript 
-Wait 0x003c
-CallWithArg sub_0806C2A0, 0x00000001
-WaitFor_2 
-Wait 0x003c
-_0807EF80 0x0014
-Wait 0x001e
-_0807E5F8 0x00000004
+	StartScript 
+	_0807E864 
+	StopScript 
+	Wait 0x003c
+	CallWithArg sub_0806C2A0, 0x00000001
+	WaitFor_2 
+	Wait 0x003c
+	_0807EF80 0x0014
+	Wait 0x001e
+	_0807E5F8 0x00000004
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc
index 270d8857..3c70f88d 100644
--- a/data/scripts/script_08011C7C.inc
+++ b/data/scripts/script_08011C7C.inc
@@ -1,525 +1,575 @@
 SCRIPT_START script_08011C7C
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-CheckGlobalFlag 0x0047
-JumpIf 0x002c
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0xfff8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4515
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffda
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002c
-JumpIf 0xffce
-CheckGlobalFlag 0x002d
-JumpIf 0xffc6
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3105
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffc4
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3108
-_0807EA94 
-SetGlobalFlag 0x002b
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-.short 0x0000
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-CheckGlobalFlag 0x0047
-JumpIf 0x002c
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0xfff8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4513
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffda
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002b
-JumpIf 0xffce
-CheckGlobalFlag 0x002d
-JumpIf 0xffc6
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3103
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffc4
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3106
-_0807EA94 
-SetGlobalFlag 0x002c
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-.short 0x0000
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-CheckGlobalFlag 0x0047
-JumpIf 0x002c
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIfNot 0xfff8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4514
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffda
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002b
-JumpIf 0xffce
-CheckGlobalFlag 0x002c
-JumpIf 0xffc6
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3104
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffc4
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3107
-_0807EA94 
-SetGlobalFlag 0x002d
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-.short 0x0000
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002f
-JumpIf 0xfdfa
-CheckGlobalFlag 0x0030
-JumpIf 0xfdf2
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckGlobalFlag 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x4524
-_0807EA94 
-Jump 0x000e
-TextboxNoOverlap 0x3111
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffb2
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3114
-_0807EA94 
-SetGlobalFlag 0x002e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002e
-JumpIf 0xfe1a
-CheckGlobalFlag 0x0030
-JumpIf 0xfe12
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckGlobalFlag 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x4522
-_0807EA94 
-Jump 0x000e
-TextboxNoOverlap 0x310f
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffb2
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3112
-_0807EA94 
-SetGlobalFlag 0x002f
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x002e
-JumpIf 0xfe3a
-CheckGlobalFlag 0x002f
-JumpIf 0xfe32
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckGlobalFlag 0x0048
-JumpIf 0x000c
-TextboxNoOverlap 0x4523
-_0807EA94 
-Jump 0x000e
-TextboxNoOverlap 0x3110
-_0807EA94 
-_0807E3E8 
-JumpIf 0x001e
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffb2
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x3113
-_0807EA94 
-SetGlobalFlag 0x0030
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffdc
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckLocalFlag 0x0094
-JumpIf 0x0010
-TextboxNoOverlap 0x3122
-_0807EA94 
-SetLocalFlag 0x0094
-Jump 0x0042
-_0807E48C 0x0031
-JumpIfNot 0x000c
-TextboxNoOverlap 0x3123
-_0807EA94 
-Jump 0x0030
-TextboxNoOverlap 0x3124
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0024
-_0807E48C 0x0020
-JumpIfNot 0x0018
-TextboxNoOverlap 0x3125
-_0807EA94 
-_0807F034 0x0031
-WaitPlayerAction8 
-Call sub_0807FC24
-Jump 0x0006
-TextboxNoOverlap 0x3127
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xff8e
-.short 0x0000
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckLocalFlag 0x0095
-JumpIf 0x0010
-TextboxNoOverlap 0x3116
-_0807EA94 
-SetLocalFlag 0x0095
-Jump 0x0042
-_0807E48C 0x002f
-JumpIfNot 0x000c
-TextboxNoOverlap 0x3117
-_0807EA94 
-Jump 0x0030
-TextboxNoOverlap 0x3118
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0024
-_0807E48C 0x0020
-JumpIfNot 0x0018
-TextboxNoOverlap 0x3119
-_0807EA94 
-_0807F034 0x002f
-WaitPlayerAction8 
-Call sub_0807FC24
-Jump 0x0006
-TextboxNoOverlap 0x311b
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xff8e
-.short 0x0000
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-CheckLocalFlag 0x0096
-JumpIf 0x0010
-TextboxNoOverlap 0x311c
-_0807EA94 
-SetLocalFlag 0x0096
-Jump 0x0042
-_0807E48C 0x0030
-JumpIfNot 0x000c
-TextboxNoOverlap 0x311d
-_0807EA94 
-Jump 0x0030
-TextboxNoOverlap 0x311e
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0024
-_0807E48C 0x0020
-JumpIfNot 0x0018
-TextboxNoOverlap 0x311f
-_0807EA94 
-_0807F034 0x0030
-WaitPlayerAction8 
-Call sub_0807FC24
-Jump 0x0006
-TextboxNoOverlap 0x3121
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xff8e
-.short 0x0000
-StartScript 
-Call sub_08064828
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4527
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffe0
-StartScript 
-Call sub_08064928
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4525
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffe0
-StartScript 
-Call sub_08064A28
-_0807EB44 0x0004
-_0807EF80 0x0001
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x4526
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0001
-Jump 0xffe0
-StartScript 
-_0807EB44 0x0004
-Call sub_08061FD8
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x001e
-JumpIfNot 0x000a
-CheckInventory1 0x0015
-JumpIf 0x0024
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807EB74 
-_0807E864 
-Call sub_08061FD8
-TextboxNoOverlapFollow 0x2302
-_0807EA94 
-_0807E878 
-SetGlobalFlag 0x001e
-Jump 0xffcc
-StopScript 
-StartScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0x000a
-CheckRoomFlag 0x0001
-JumpIf 0x0020
-CheckEntityInteractType 
-JumpIfNot 0xffe8
-StopScript 
-_0807EB74 
-_0807E864 
-Call sub_08061FD8
-TextboxNoOverlapFollow 0x2303
-_0807EA94 
-_0807E878 
-Jump 0xffd0
-StopScript 
-_0807EB74 
-_0807E864 
-Call sub_08061FD8
-_0807EF80 0x000b
-Call sub_08061FB0
-Call sub_08061F94
-LoadRoomEntityList gUnk_080F2758
-_0807EF80 0x0008
-Wait 0x003c
-SoundReq 0x0072
-SetLocalFlag 0x0043
-Wait 0x001e
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	Call sub_08064828
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	CheckGlobalFlag 0x0047
+	JumpIf script_08011CC2
+	StopScript 
+script_08011C9A:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIfNot script_08011C9A
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x4515
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011C9A
+script_08011CC2:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x002c
+	JumpIf script_08011C9A
+	CheckGlobalFlag 0x002d
+	JumpIf script_08011C9A
+	CheckEntityInteractType 
+	JumpIfNot script_08011CC2
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x3105
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_08011D0E
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011CC2
+script_08011D00:
+	CheckEntityInteractType 
+	JumpIfNot script_08011D00
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+script_08011D0E:
+	TextboxNoOverlap 0x3108
+	_0807EA94 
+	SetGlobalFlag 0x002b
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011D00
+	.short 0x0000
+	StartScript 
+	Call sub_08064928
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	CheckGlobalFlag 0x0047
+	JumpIf script_08011D6E
+	StopScript 
+script_08011D46:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIfNot script_08011D46
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x4513
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011D46
+script_08011D6E:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x002b
+	JumpIf script_08011D46
+	CheckGlobalFlag 0x002d
+	JumpIf script_08011D46
+	CheckEntityInteractType 
+	JumpIfNot script_08011D6E
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x3103
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_08011DBA
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011D6E
+script_08011DAC:
+	CheckEntityInteractType 
+	JumpIfNot script_08011DAC
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+script_08011DBA:
+	TextboxNoOverlap 0x3106
+	_0807EA94 
+	SetGlobalFlag 0x002c
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011DAC
+	.short 0x0000
+	StartScript 
+	Call sub_08064A28
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	CheckGlobalFlag 0x0047
+	JumpIf script_08011E1A
+	StopScript 
+script_08011DF2:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIfNot script_08011DF2
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x4514
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011DF2
+script_08011E1A:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x002b
+	JumpIf script_08011DF2
+	CheckGlobalFlag 0x002c
+	JumpIf script_08011DF2
+	CheckEntityInteractType 
+	JumpIfNot script_08011E1A
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x3104
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_08011E66
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011E1A
+script_08011E58:
+	CheckEntityInteractType 
+	JumpIfNot script_08011E58
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+script_08011E66:
+	TextboxNoOverlap 0x3107
+	_0807EA94 
+	SetGlobalFlag 0x002d
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011E58
+	.short 0x0000
+	StartScript 
+	Call sub_08064828
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_08011E96:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x002f
+	JumpIf script_08011C9A
+	CheckGlobalFlag 0x0030
+	JumpIf script_08011C9A
+	CheckEntityInteractType 
+	JumpIfNot script_08011E96
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	CheckGlobalFlag 0x0048
+	JumpIf script_08011ECC
+	TextboxNoOverlap 0x4524
+	_0807EA94 
+	Jump script_08011ED8
+script_08011ECC:
+	TextboxNoOverlap 0x3111
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_08011EF4
+script_08011ED8:
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011E96
+script_08011EE6:
+	CheckEntityInteractType 
+	JumpIfNot script_08011EE6
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+script_08011EF4:
+	TextboxNoOverlap 0x3114
+	_0807EA94 
+	SetGlobalFlag 0x002e
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011EE6
+	StartScript 
+	Call sub_08064928
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_08011F22:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x002e
+	JumpIf script_08011D46
+	CheckGlobalFlag 0x0030
+	JumpIf script_08011D46
+	CheckEntityInteractType 
+	JumpIfNot script_08011F22
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	CheckGlobalFlag 0x0048
+	JumpIf script_08011F58
+	TextboxNoOverlap 0x4522
+	_0807EA94 
+	Jump script_08011F64
+script_08011F58:
+	TextboxNoOverlap 0x310f
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_08011F80
+script_08011F64:
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011F22
+script_08011F72:
+	CheckEntityInteractType 
+	JumpIfNot script_08011F72
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+script_08011F80:
+	TextboxNoOverlap 0x3112
+	_0807EA94 
+	SetGlobalFlag 0x002f
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011F72
+	StartScript 
+	Call sub_08064A28
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_08011FAE:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x002e
+	JumpIf script_08011DF2
+	CheckGlobalFlag 0x002f
+	JumpIf script_08011DF2
+	CheckEntityInteractType 
+	JumpIfNot script_08011FAE
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	CheckGlobalFlag 0x0048
+	JumpIf script_08011FE4
+	TextboxNoOverlap 0x4523
+	_0807EA94 
+	Jump script_08011FF0
+script_08011FE4:
+	TextboxNoOverlap 0x3110
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_0801200C
+script_08011FF0:
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011FAE
+script_08011FFE:
+	CheckEntityInteractType 
+	JumpIfNot script_08011FFE
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+script_0801200C:
+	TextboxNoOverlap 0x3113
+	_0807EA94 
+	SetGlobalFlag 0x0030
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08011FFE
+	StartScript 
+	Call sub_08064828
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_0801203A:
+	CheckEntityInteractType 
+	JumpIfNot script_0801203A
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	CheckLocalFlag 0x0094
+	JumpIf script_0801205E
+	TextboxNoOverlap 0x3122
+	_0807EA94 
+	SetLocalFlag 0x0094
+	Jump script_0801209E
+script_0801205E:
+	_0807E48C 0x0031
+	JumpIfNot script_08012070
+	TextboxNoOverlap 0x3123
+	_0807EA94 
+	Jump script_0801209E
+script_08012070:
+	TextboxNoOverlap 0x3124
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0801209E
+	_0807E48C 0x0020
+	JumpIfNot script_0801209A
+	TextboxNoOverlap 0x3125
+	_0807EA94 
+	_0807F034 0x0031
+	WaitPlayerAction8 
+	Call sub_0807FC24
+	Jump script_0801209E
+script_0801209A:
+	TextboxNoOverlap 0x3127
+script_0801209E:
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_0801203A
+	.short 0x0000
+	StartScript 
+	Call sub_08064928
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_080120C6:
+	CheckEntityInteractType 
+	JumpIfNot script_080120C6
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	CheckLocalFlag 0x0095
+	JumpIf script_080120EA
+	TextboxNoOverlap 0x3116
+	_0807EA94 
+	SetLocalFlag 0x0095
+	Jump script_0801212A
+script_080120EA:
+	_0807E48C 0x002f
+	JumpIfNot script_080120FC
+	TextboxNoOverlap 0x3117
+	_0807EA94 
+	Jump script_0801212A
+script_080120FC:
+	TextboxNoOverlap 0x3118
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_0801212A
+	_0807E48C 0x0020
+	JumpIfNot script_08012126
+	TextboxNoOverlap 0x3119
+	_0807EA94 
+	_0807F034 0x002f
+	WaitPlayerAction8 
+	Call sub_0807FC24
+	Jump script_0801212A
+script_08012126:
+	TextboxNoOverlap 0x311b
+script_0801212A:
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_080120C6
+	.short 0x0000
+	StartScript 
+	Call sub_08064A28
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_08012152:
+	CheckEntityInteractType 
+	JumpIfNot script_08012152
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	CheckLocalFlag 0x0096
+	JumpIf script_08012176
+	TextboxNoOverlap 0x311c
+	_0807EA94 
+	SetLocalFlag 0x0096
+	Jump script_080121B6
+script_08012176:
+	_0807E48C 0x0030
+	JumpIfNot script_08012188
+	TextboxNoOverlap 0x311d
+	_0807EA94 
+	Jump script_080121B6
+script_08012188:
+	TextboxNoOverlap 0x311e
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_080121B6
+	_0807E48C 0x0020
+	JumpIfNot script_080121B2
+	TextboxNoOverlap 0x311f
+	_0807EA94 
+	_0807F034 0x0030
+	WaitPlayerAction8 
+	Call sub_0807FC24
+	Jump script_080121B6
+script_080121B2:
+	TextboxNoOverlap 0x3121
+script_080121B6:
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08012152
+	.short 0x0000
+	StartScript 
+	Call sub_08064828
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_080121DE:
+	CheckEntityInteractType 
+	JumpIfNot script_080121DE
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x4527
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_080121DE
+	StartScript 
+	Call sub_08064928
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_08012216:
+	CheckEntityInteractType 
+	JumpIfNot script_08012216
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x4525
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_08012216
+	StartScript 
+	Call sub_08064A28
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	_0807EF80 0x000a
+	StopScript 
+script_0801224E:
+	CheckEntityInteractType 
+	JumpIfNot script_0801224E
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x4526
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0001
+	Jump script_0801224E
+	StartScript 
+	_0807EB44 0x0004
+	Call sub_08061FD8
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_08012284:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x001e
+	JumpIfNot script_08012298
+	CheckInventory1 0x0015
+	JumpIf script_080122BA
+script_08012298:
+	CheckEntityInteractType 
+	JumpIfNot script_08012284
+	StopScript 
+	_0807EB74 
+	_0807E864 
+	Call sub_08061FD8
+	TextboxNoOverlapFollow 0x2302
+	_0807EA94 
+	_0807E878 
+	SetGlobalFlag 0x001e
+	Jump script_08012284
+script_080122BA:
+	StopScript 
+	StartScript 
+	CheckRoomFlag 0x0000
+	JumpIfNot script_080122CE
+	CheckRoomFlag 0x0001
+	JumpIf script_080122EC
+script_080122CE:
+	CheckEntityInteractType 
+	JumpIfNot script_080122BA
+	StopScript 
+	_0807EB74 
+	_0807E864 
+	Call sub_08061FD8
+	TextboxNoOverlapFollow 0x2303
+	_0807EA94 
+	_0807E878 
+	Jump script_080122BA
+script_080122EC:
+	StopScript 
+	_0807EB74 
+	_0807E864 
+	Call sub_08061FD8
+	_0807EF80 0x000b
+	Call sub_08061FB0
+	Call sub_08061F94
+	LoadRoomEntityList gUnk_080F2758
+	_0807EF80 0x0008
+	Wait 0x003c
+	SoundReq 0x0072
+	SetLocalFlag 0x0043
+	Wait 0x001e
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc
index 5e8aa941..c434f93b 100644
--- a/data/scripts/script_0801232C.inc
+++ b/data/scripts/script_0801232C.inc
@@ -1,68 +1,71 @@
 SCRIPT_START script_0801232C
-StartScript 
-_0807EB74 
-_0807E9D4 
-_0807EF80 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807EB74 
-_0807E864 
-TextboxNoOverlapFollow 0x2304
-_0807EA94 
-CheckLocalFlag 0x0042
-JumpIf 0x000c
-SetLocalFlag 0x0042
-_0807F034 0x0057
-WaitPlayerAction8 
-_0807E878 
-Jump 0xffda
-StartScript 
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x0004
-JumpIfNot 0xfffa
-Call sub_0807DF28
-_0807E864 
-SoundReq0x80100000 
-StartScript 
-_0807E778 0x0004
-_0807E788 0x00007fff
-DoFade5 
-_0807E858 0x0080
-StopScript 
-WaitFor_2 
-SoundReq2 0x002c
-_0807EB28 0x1401
-_0807EA94 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x0007
-SoundReq 0x01ce
-SetEntity0x20 0xffff8000
-Wait 0x003c
-_0807E8E4_0 
-StartPlayerScript script_08012410
-WaitForSomething2 0x00000001
-TextboxNoOverlap 0x1402
-_0807EA94 
-SoundReq0x80100000 
-SetEntity0x20 0x00010000
-Wait 0x003c
-StartScript 
-_0807E778 0x0004
-_0807E788 0xffffffff
-DoFade4 
-_0807E858 0x0080
-StopScript 
-WaitFor_2 
-SoundReq2 0xffff
-_0807EB28 0x1403
-_0807EA94 
-_0807E914 0x00000203
-Call sub_0807F420
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EB74 
+	_0807E9D4 
+	_0807EF80 0x000a
+	StopScript 
+script_08012338:
+	CheckEntityInteractType 
+	JumpIfNot script_08012338
+	_0807EB74 
+	_0807E864 
+	TextboxNoOverlapFollow 0x2304
+	_0807EA94 
+	CheckLocalFlag 0x0042
+	JumpIf script_0801235A
+	SetLocalFlag 0x0042
+	_0807F034 0x0057
+	WaitPlayerAction8 
+script_0801235A:
+	_0807E878 
+	Jump script_08012338
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+script_08012368:
+	CheckLocalFlag 0x0004
+	JumpIfNot script_08012368
+	Call sub_0807DF28
+	_0807E864 
+	SoundReq0x80100000 
+	StartScript 
+	_0807E778 0x0004
+	_0807E788 0x00007fff
+	DoFade5 
+	_0807E858 0x0080
+	StopScript 
+	WaitFor_2 
+	SoundReq2 0x002c
+	_0807EB28 0x1401
+	_0807EA94 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x0007
+	SoundReq 0x01ce
+	SetEntity0x20 0xffff8000
+	Wait 0x003c
+	_0807E8E4_0 
+	StartPlayerScript script_08012410
+	WaitForSomething2 0x00000001
+	TextboxNoOverlap 0x1402
+	_0807EA94 
+	SoundReq0x80100000 
+	SetEntity0x20 0x00010000
+	Wait 0x003c
+	StartScript 
+	_0807E778 0x0004
+	_0807E788 0xffffffff
+	DoFade4 
+	_0807E858 0x0080
+	StopScript 
+	WaitFor_2 
+	SoundReq2 0xffff
+	_0807EB28 0x1403
+	_0807EA94 
+	_0807E914 0x00000203
+	Call sub_0807F420
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc
index ee6be58f..ce244ad3 100644
--- a/data/scripts/script_08012410.inc
+++ b/data/scripts/script_08012410.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08012410
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index f3bcc8f2..ed7b71f5 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -1,155 +1,159 @@
 SCRIPT_START script_08012430
-StartScript 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E930 0x0008
-Call sub_0807F2D4
-_0807E930 0x0009
-Call sub_0806B2B4
-_0807EA94 
-CheckLocalFlag 0x00b3
-JumpIf 0x0010
-SetLocalFlag 0x00b3
-_0807F034 0x0062
-WaitPlayerAction8 
-SetLocalFlag 0x00d0
-_0807E878 
-_0807E930 0x0000
-Jump 0xffc4
-.short 0x0000
-StartScript 
-Call sub_08054564
-StopScript 
-CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
-JumpIfNot 0xfff6
-SoundReq0x80100000 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_08012AB0
-TextboxNoOverlapFollowPos 0x00071101
-_0807EA94 
-CameraTargetPlayer 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-_0807E858 0x0000
-Call sub_080791BC
-LoadRoomEntityList gUnk_080F4D70
-Call DeleteAllEnemies
-SetEntityPositionRelative 0x01680388
-Call sub_0807F844
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-SoundReq2 0x000e
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-MoveEntityToPlayer 
-Call sub_0807F844
-CameraTargetPlayer 
-_0807E788 0xffffffff
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-Call sub_0807DF50
-_0807E878 
-SoundReq2 0xffff
-CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0806DC7C
-SoundReq0x80100000 
-StartPlayerScript script_08012AC8
-WaitForSomething2 0x00000001
-SetEntityPositionRelative 0x01680388
-_0807F0B4 0x0001
-CameraTargetEntity 
-Wait 0x005a
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq2 0x000e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-SoundReq2 0x0033
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000050
-LoadRoomEntityList gUnk_080F51D0
-WaitForSomething2 0x00000008
-_0807E864 
-Call sub_0807FA40
-Call sub_0807DF28
-SoundReq 0x0072
-SoundReq0x80100000 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-StartPlayerScript script_08012AF0
-WaitForSomething2 0x00000001
-_0807E8E4_0 
-SoundReq2 0x000e
-Wait 0x001e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-Wait 0x003c
-SoundReq2 0xffff
-Call sub_0806DCA0
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-SoundReq0x80100000 
-Wait 0x003c
-SoundReq2 0xffff
-Call sub_08054570
-SetGlobalFlag 0x0014
-CallWithArg sub_0807F6F8, 0x00000008
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	StopScript 
+script_08012440:
+	CheckEntityInteractType 
+	JumpIfNot script_08012440
+	_0807E864 
+	_0807E930 0x0008
+	Call sub_0807F2D4
+	_0807E930 0x0009
+	Call sub_0806B2B4
+	_0807EA94 
+	CheckLocalFlag 0x00b3
+	JumpIf script_08012474
+	SetLocalFlag 0x00b3
+	_0807F034 0x0062
+	WaitPlayerAction8 
+	SetLocalFlag 0x00d0
+script_08012474:
+	_0807E878 
+	_0807E930 0x0000
+	Jump script_08012440
+	.short 0x0000
+	StartScript 
+	Call sub_08054564
+	StopScript 
+script_0801248A:
+	CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
+	JumpIfNot script_0801248A
+	SoundReq0x80100000 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08012AB0
+	TextboxNoOverlapFollowPos 0x00071101
+	_0807EA94 
+	CameraTargetPlayer 
+	_0807E778 0x0004
+	_0807E80C 0x00000000
+	WaitFor_2 
+	_0807E858 0x0000
+	Call sub_080791BC
+	LoadRoomEntityList gUnk_080F4D70
+	Call DeleteAllEnemies
+	SetEntityPositionRelative 0x01680388
+	Call sub_0807F844
+	_0807E778 0x0004
+	_0807E800 0x00000000
+	WaitFor_2 
+	SoundReq2 0x000e
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	SoundReq0x80100000 
+	_0807E778 0x0004
+	_0807E80C 0x00000000
+	WaitFor_2 
+	MoveEntityToPlayer 
+	Call sub_0807F844
+	CameraTargetPlayer 
+	_0807E788 0xffffffff
+	_0807E778 0x0004
+	_0807E800 0x00000000
+	WaitFor_2 
+	Call sub_0807DF50
+	_0807E878 
+	SoundReq2 0xffff
+script_08012566:
+	CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
+	JumpIfNot script_08012566
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	Call sub_0806DC7C
+	SoundReq0x80100000 
+	StartPlayerScript script_08012AC8
+	WaitForSomething2 0x00000001
+	SetEntityPositionRelative 0x01680388
+	_0807F0B4 0x0001
+	CameraTargetEntity 
+	Wait 0x005a
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	SoundReq2 0x000e
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	SoundReq0x80100000 
+	SoundReq2 0x0033
+	Call sub_0807DF50
+	_0807E878 
+	_0807E5F8 0x00000050
+	LoadRoomEntityList gUnk_080F51D0
+	WaitForSomething2 0x00000008
+	_0807E864 
+	Call sub_0807FA40
+	Call sub_0807DF28
+	SoundReq 0x0072
+	SoundReq0x80100000 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	StartPlayerScript script_08012AF0
+	WaitForSomething2 0x00000001
+	_0807E8E4_0 
+	SoundReq2 0x000e
+	Wait 0x001e
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	SoundReq0x80100000 
+	Wait 0x003c
+	SoundReq2 0xffff
+	Call sub_0806DCA0
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807DF50
+	_0807E878 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	SoundReq0x80100000 
+	Wait 0x003c
+	SoundReq2 0xffff
+	Call sub_08054570
+	SetGlobalFlag 0x0014
+	CallWithArg sub_0807F6F8, 0x00000008
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc
index 06b388b0..c700ebed 100644
--- a/data/scripts/script_080126FC.inc
+++ b/data/scripts/script_080126FC.inc
@@ -1,231 +1,243 @@
 SCRIPT_START script_080126FC
-StartScript 
-SetEntityNonPlanarMovement 0x0040
-_0807EF80 0x0007
-StopScript 
-_0807E930 0x0020
-WaitForSomething2 0x00000004
-_0807E930 0x0022
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x000c1102
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0021
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x000c1103
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0011
-_0807E930 0x001c
-TextboxNoOverlapFollowPos 0x000c1105
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0022
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x000c1106
-_0807EA94 
-_0807E930 0x001c
-Call sub_0806D96C
-TextboxNoOverlapFollowPos 0x000c1107
-_0807EA94 
-_0807E930 0x0020
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0021
-Call sub_0807F3C8
-TextboxNoOverlapFollowPos 0x000c1108
-_0807EA94 
-_0807E930 0x001c
-Call sub_0806D96C
-TextboxNoOverlapFollowPos 0x000c1109
-_0807EA94 
-_0807E930 0x0020
-_0807EF80 0x000a
-_0807E9D4 
-_0807E5F8 0x00000008
-StopScript 
-StartScript 
-CheckRoomFlag 0x0000
-JumpIf 0x0028
-CheckEntityInteractType 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-Call sub_0806D944
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c1114
-_0807EA94 
-_0807E930 0x0020
-_0807E878 
-Jump 0xffd0
-_0807E864 
-_0807E9DC 
-CallWithArg sub_0807F5B0, 0x0000003c
-Call sub_080791D0
-StopScript 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x000b
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-Call sub_0806D944
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c110a
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c110b
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c110c
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c110d
-_0807EA94 
-_0807E930 0x001f
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c110e
-_0807EA94 
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D908
-_0807EC1C 0x0010
-_0807EF80 0x000a
-_0807E9D4 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-StopScript 
-StartScript 
-Call sub_0806D944
-CheckEntityInteractType 
-JumpIf 0x000e
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0x0020
-Jump 0xffe6
-_0807E864 
-_0807E930 0x0010
-StopScript 
-TextboxNoOverlapFollowPos 0x000c1115
-_0807EA94 
-_0807E930 0x0018
-_0807E878 
-Jump 0xffcc
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807EB8C 
-Call sub_0806D944
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c110f
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D908
-_0807EC1C 0x0050
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-StopScript 
-StartScript 
-Call sub_0806D944
-CheckEntityInteractType 
-JumpIf 0x000e
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0x0020
-Jump 0xffe6
-_0807E864 
-_0807E930 0x0010
-StopScript 
-TextboxNoOverlapFollowPos 0x000c1115
-_0807EA94 
-_0807E930 0x0018
-_0807E878 
-Jump 0xffcc
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807EB8C 
-Call sub_0806D944
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c1110
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D908
-_0807EC1C 0x0050
-_0807E930 0x0018
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-StopScript 
-StartScript 
-Call sub_0806D944
-CheckEntityInteractType 
-JumpIf 0x000e
-CheckPlayerInRegion2 0x3030
-JumpIfNot 0x0020
-Jump 0xffe6
-_0807E864 
-_0807E930 0x0010
-StopScript 
-TextboxNoOverlapFollowPos 0x000c1115
-_0807EA94 
-_0807E930 0x0018
-_0807E878 
-Jump 0xffcc
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-SoundReq0x80100000 
-_0807EF80 0x000b
-_0807EB8C 
-Call sub_0806D944
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c1111
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806D8A0
-_0807EE30 
-JumpIfNot 0xfffc
-_0807E930 0x001f
-_0807EA94 
-StartPlayerScript script_08012B18
-Call sub_0806D9A4
-_0807EF80 0x0008
-Wait 0x0078
-SoundReq2 0x000e
-StartScript 
-_0807E8E4_2 
-_0807EB28 0x1112
-StopScript 
-_0807EA94 
-_0807E5F8 0x00000008
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0040
+	_0807EF80 0x0007
+	StopScript 
+	_0807E930 0x0020
+	WaitForSomething2 0x00000004
+	_0807E930 0x0022
+	Call sub_0807F3C8
+	TextboxNoOverlapFollowPos 0x000c1102
+	_0807EA94 
+	_0807E930 0x0020
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807E930 0x0021
+	Call sub_0807F3C8
+	TextboxNoOverlapFollowPos 0x000c1103
+	_0807EA94 
+	_0807E930 0x0020
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0011
+	_0807E930 0x001c
+	TextboxNoOverlapFollowPos 0x000c1105
+	_0807EA94 
+	_0807E930 0x0020
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807E930 0x0022
+	Call sub_0807F3C8
+	TextboxNoOverlapFollowPos 0x000c1106
+	_0807EA94 
+	_0807E930 0x001c
+	Call sub_0806D96C
+	TextboxNoOverlapFollowPos 0x000c1107
+	_0807EA94 
+	_0807E930 0x0020
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807E930 0x0021
+	Call sub_0807F3C8
+	TextboxNoOverlapFollowPos 0x000c1108
+	_0807EA94 
+	_0807E930 0x001c
+	Call sub_0806D96C
+	TextboxNoOverlapFollowPos 0x000c1109
+	_0807EA94 
+	_0807E930 0x0020
+	_0807EF80 0x000a
+	_0807E9D4 
+	_0807E5F8 0x00000008
+script_080127F2:
+	StopScript 
+	StartScript 
+	CheckRoomFlag 0x0000
+	JumpIf script_08012824
+	CheckEntityInteractType 
+	JumpIfNot script_080127F2
+	StopScript 
+	_0807E864 
+	Call sub_0806D944
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c1114
+	_0807EA94 
+	_0807E930 0x0020
+	_0807E878 
+	Jump script_080127F2
+script_08012824:
+	_0807E864 
+	_0807E9DC 
+	CallWithArg sub_0807F5B0, 0x0000003c
+	Call sub_080791D0
+	StopScript 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EF80 0x000b
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	Call sub_0806D944
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c110a
+	_0807EA94 
+	_0807E930 0x001f
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c110b
+	_0807EA94 
+	_0807E930 0x001f
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c110c
+	_0807EA94 
+	_0807E930 0x001f
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c110d
+	_0807EA94 
+	_0807E930 0x001f
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c110e
+	_0807EA94 
+	_0807E930 0x0018
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0806D908
+	_0807EC1C 0x0010
+	_0807EF80 0x000a
+	_0807E9D4 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+script_08012904:
+	StopScript 
+	StartScript 
+	Call sub_0806D944
+	CheckEntityInteractType 
+	JumpIf script_08012920
+	CheckPlayerInRegion2 0x3030
+	JumpIfNot script_0801293A
+	Jump script_08012904
+script_08012920:
+	_0807E864 
+	_0807E930 0x0010
+	StopScript 
+	TextboxNoOverlapFollowPos 0x000c1115
+	_0807EA94 
+	_0807E930 0x0018
+	_0807E878 
+	Jump script_08012904
+script_0801293A:
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807EB8C 
+	Call sub_0806D944
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c110f
+	_0807E930 0x0018
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0806D908
+	_0807EC1C 0x0050
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+script_08012984:
+	StopScript 
+	StartScript 
+	Call sub_0806D944
+	CheckEntityInteractType 
+	JumpIf script_080129A0
+	CheckPlayerInRegion2 0x3030
+	JumpIfNot script_080129BA
+	Jump script_08012984
+script_080129A0:
+	_0807E864 
+	_0807E930 0x0010
+	StopScript 
+	TextboxNoOverlapFollowPos 0x000c1115
+	_0807EA94 
+	_0807E930 0x0018
+	_0807E878 
+	Jump script_08012984
+script_080129BA:
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807EB8C 
+	Call sub_0806D944
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c1110
+	_0807E930 0x0018
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0806D908
+	_0807EC1C 0x0050
+	_0807E930 0x0018
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+script_08012A08:
+	StopScript 
+	StartScript 
+	Call sub_0806D944
+	CheckEntityInteractType 
+	JumpIf script_08012A24
+	CheckPlayerInRegion2 0x3030
+	JumpIfNot script_08012A3E
+	Jump script_08012A08
+script_08012A24:
+	_0807E864 
+	_0807E930 0x0010
+	StopScript 
+	TextboxNoOverlapFollowPos 0x000c1115
+	_0807EA94 
+	_0807E930 0x0018
+	_0807E878 
+	Jump script_08012A08
+script_08012A3E:
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	SoundReq0x80100000 
+	_0807EF80 0x000b
+	_0807EB8C 
+	Call sub_0806D944
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c1111
+	_0807E930 0x0018
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0806D8A0
+script_08012A74:
+	_0807EE30 
+	JumpIfNot script_08012A74
+	_0807E930 0x001f
+	_0807EA94 
+	StartPlayerScript script_08012B18
+	Call sub_0806D9A4
+	_0807EF80 0x0008
+	Wait 0x0078
+	SoundReq2 0x000e
+	StartScript 
+	_0807E8E4_2 
+	_0807EB28 0x1112
+	StopScript 
+	_0807EA94 
+	_0807E5F8 0x00000008
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc
index b5829c97..8cc59657 100644
--- a/data/scripts/script_08012AB0.inc
+++ b/data/scripts/script_08012AB0.inc
@@ -1,8 +1,9 @@
 SCRIPT_START script_08012AB0
-StopScript 
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-Jump 0xffee
-.short 0x0000
+	StopScript 
+script_08012AB2:
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	Jump script_08012AB2
+	.short 0x0000
diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc
index b3d05417..b50a637d 100644
--- a/data/scripts/script_08012AC8.inc
+++ b/data/scripts/script_08012AC8.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08012AC8
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x0004
-Wait 0x003c
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807EF80 0x0004
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc
index e1ad6a1c..0b5cb168 100644
--- a/data/scripts/script_08012AF0.inc
+++ b/data/scripts/script_08012AF0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012AF0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0388, 0x0180
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x0388, 0x0180
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08012B18.inc b/data/scripts/script_08012B18.inc
index f353c587..4b79a8fe 100644
--- a/data/scripts/script_08012B18.inc
+++ b/data/scripts/script_08012B18.inc
@@ -1,4 +1,4 @@
 SCRIPT_START script_08012B18
-_0807EF80 0x0015
-Call sub_080791BC
+	_0807EF80 0x0015
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc
index fbdacf64..0bdf249c 100644
--- a/data/scripts/script_08012B24.inc
+++ b/data/scripts/script_08012B24.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012B24
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0004
-StopScript 
-_0807EF80 0x0001
-_0807ECC4 0x0008
-_0807E5F8 0x00000002
-CallWithArg sub_0807FB64, 0xffffffe2
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0004
+	StopScript 
+	_0807EF80 0x0001
+	_0807ECC4 0x0008
+	_0807E5F8 0x00000002
+	CallWithArg sub_0807FB64, 0xffffffe2
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc
index d4f1c6ac..32a9f788 100644
--- a/data/scripts/script_08012B50.inc
+++ b/data/scripts/script_08012B50.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012B50
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0000
-StopScript 
-_0807EF80 0x0001
-_0807EC64 0x0008
-_0807E5F8 0x00000002
-CallWithArg sub_0807FB64, 0xffffffe2
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0000
+	StopScript 
+	_0807EF80 0x0001
+	_0807EC64 0x0008
+	_0807E5F8 0x00000002
+	CallWithArg sub_0807FB64, 0xffffffe2
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc
index 1c5aaea2..df1d2ec1 100644
--- a/data/scripts/script_08012B7C.inc
+++ b/data/scripts/script_08012B7C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012B7C
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-_0807EB44 0x0002
-StopScript 
-_0807EF80 0x0001
-_0807EC94 0x0008
-_0807E5F8 0x00000002
-CallWithArg sub_0807FB64, 0xffffffe2
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	_0807EB44 0x0002
+	StopScript 
+	_0807EF80 0x0001
+	_0807EC94 0x0008
+	_0807E5F8 0x00000002
+	CallWithArg sub_0807FB64, 0xffffffe2
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc
index 56aeb8f1..e87df7ea 100644
--- a/data/scripts/script_08012BA8.inc
+++ b/data/scripts/script_08012BA8.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_08012BA8
-StartScript 
-_0807EB44 0x0002
-_0807EF80 0x0007
-_0807E930 0x0001
-StopScript 
-WaitForSomething2 0x00000040
-_0807E930 0x0005
-Wait 0x001e
-_0807E5F8 0x00000080
-_0807E930 0x0001
-WaitForSomething2 0x00000040
-_0807E930 0x0005
-Wait 0x001e
-_0807E5F8 0x00000080
-_0807E930 0x0001
-WaitForSomething2 0x00000040
-Wait 0x0001
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0002
+	_0807EF80 0x0007
+	_0807E930 0x0001
+	StopScript 
+	WaitForSomething2 0x00000040
+	_0807E930 0x0005
+	Wait 0x001e
+	_0807E5F8 0x00000080
+	_0807E930 0x0001
+	WaitForSomething2 0x00000040
+	_0807E930 0x0005
+	Wait 0x001e
+	_0807E5F8 0x00000080
+	_0807E930 0x0001
+	WaitForSomething2 0x00000040
+	Wait 0x0001
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc
index a85c95bf..643c7cdf 100644
--- a/data/scripts/script_08012BF8.inc
+++ b/data/scripts/script_08012BF8.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_08012BF8
-StartScript 
-_0807EB44 0x0006
-_0807EF80 0x0007
-_0807E930 0x0003
-StopScript 
-WaitForSomething2 0x00000010
-_0807E930 0x0007
-Wait 0x001e
-_0807E5F8 0x00000020
-_0807E930 0x0003
-WaitForSomething2 0x00000010
-_0807E930 0x0007
-Wait 0x001e
-_0807E5F8 0x00000020
-_0807E930 0x0003
-WaitForSomething2 0x00000010
-Wait 0x0001
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0006
+	_0807EF80 0x0007
+	_0807E930 0x0003
+	StopScript 
+	WaitForSomething2 0x00000010
+	_0807E930 0x0007
+	Wait 0x001e
+	_0807E5F8 0x00000020
+	_0807E930 0x0003
+	WaitForSomething2 0x00000010
+	_0807E930 0x0007
+	Wait 0x001e
+	_0807E5F8 0x00000020
+	_0807E930 0x0003
+	WaitForSomething2 0x00000010
+	Wait 0x0001
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc
index ae59b6df..5d7ab8c6 100644
--- a/data/scripts/script_08012C48.inc
+++ b/data/scripts/script_08012C48.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08012C48
-StartScript 
-_0807EF80 0x0007
-SetEntityNonPlanarMovement 0x0280
-StopScript 
-_0807EDD4 0x0388, 0x0168
-_0807E5F8 0x00000100
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	SetEntityNonPlanarMovement 0x0280
+	StopScript 
+	_0807EDD4 0x0388, 0x0168
+	_0807E5F8 0x00000100
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc
index 302e1196..de28d340 100644
--- a/data/scripts/script_08012C68.inc
+++ b/data/scripts/script_08012C68.inc
@@ -1,34 +1,38 @@
 SCRIPT_START script_08012C68
-StartScript 
-_0807E9D4 
-_0807EF80 0x0008
-_0807E914 0x00000000
-Call sub_0806DA04
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E8E4_0 
-TextboxNoOverlapFollow 0x111d
-_0807EA94 
-SetGlobalFlag 0x0022
-_0807E878 
-Jump 0xffe8
-CheckGlobalFlag 0x0014
-JumpIfNot 0xfffa
-StopScript 
-StartScript 
-CheckPlayerInRegion 0x0398, 0x03b0, 0x2040
-JumpIfNot 0xfff2
-_0807E564 
-JumpIf 0x001e
-StopScript 
-_0807E864 
-Call sub_0807DF28
-_0807EB28 0x2202
-_0807EA94 
-SetLocalFlag 0x003b
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x0008
+	_0807E914 0x00000000
+	Call sub_0806DA04
+	StopScript 
+script_08012C7E:
+	CheckEntityInteractType 
+	JumpIfNot script_08012C7E
+	_0807E864 
+	_0807E8E4_0 
+	TextboxNoOverlapFollow 0x111d
+	_0807EA94 
+	SetGlobalFlag 0x0022
+	_0807E878 
+	Jump script_08012C7E
+script_08012C98:
+	CheckGlobalFlag 0x0014
+	JumpIfNot script_08012C98
+script_08012CA0:
+	StopScript 
+	StartScript 
+	CheckPlayerInRegion 0x0398, 0x03b0, 0x2040
+	JumpIfNot script_08012CA0
+	_0807E564 
+	JumpIf script_08012CD2
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB28 0x2202
+	_0807EA94 
+	SetLocalFlag 0x003b
+	Call sub_0807DF50
+	_0807E878 
+script_08012CD2:
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc
index e335e8a5..8d27c8c6 100644
--- a/data/scripts/script_08012CD8.inc
+++ b/data/scripts/script_08012CD8.inc
@@ -1,19 +1,20 @@
 SCRIPT_START script_08012CD8
-StopScript 
-StartScript 
-_0807E564 
-JumpIfNot 0xfff8
-CheckPlayerInRegion 0x0380, 0x03b0, 0x4040
-JumpIfNot 0xffec
-ComparePlayerAction 0x0015
-JumpIf 0xffe4
-_0807E864 
-Call sub_0807DF28
-StopScript 
-_0807EB28 0x2203
-_0807EA94 
-SetLocalFlag 0x003e
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+script_08012CD8:
+	StopScript 
+	StartScript 
+	_0807E564 
+	JumpIfNot script_08012CD8
+	CheckPlayerInRegion 0x0380, 0x03b0, 0x4040
+	JumpIfNot script_08012CD8
+	ComparePlayerAction 0x0015
+	JumpIf script_08012CD8
+	_0807E864 
+	Call sub_0807DF28
+	StopScript 
+	_0807EB28 0x2203
+	_0807EA94 
+	SetLocalFlag 0x003e
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc
index 78dc4d0f..d3bcc14c 100644
--- a/data/scripts/script_08012D18.inc
+++ b/data/scripts/script_08012D18.inc
@@ -1,23 +1,25 @@
 SCRIPT_START script_08012D18
-StopScript 
-StartScript 
-CheckGlobalFlag 0x0014
-JumpIfNot 0xfff6
-CheckLocalFlagByOffset 0x0200, 0x008d
-JumpIf 0x003c
-CheckPlayerInRegion 0x0000, 0x01a8, 0x2010
-JumpIfNot 0xffe0
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807EB28 0x111a
-_0807EA94 
-StartPlayerScript script_08010A38
-WaitForSomething2 0x00000001
-Call sub_0807DF50
-_0807E878 
-Jump 0xffb2
-_0807EF80 0x0006
+script_08012D18:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x0014
+	JumpIfNot script_08012D18
+	CheckLocalFlagByOffset 0x0200, 0x008d
+	JumpIf script_08012D68
+	CheckPlayerInRegion 0x0000, 0x01a8, 0x2010
+	JumpIfNot script_08012D18
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807EB28 0x111a
+	_0807EA94 
+	StartPlayerScript script_08010A38
+	WaitForSomething2 0x00000001
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08012D18
+script_08012D68:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc
index 9e9593b6..5aaf0d08 100644
--- a/data/scripts/script_08012D70.inc
+++ b/data/scripts/script_08012D70.inc
@@ -1,16 +1,17 @@
 SCRIPT_START script_08012D70
-CheckPlayerInRegion 0x0088, 0x0048, 0x3030
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_08012DB0
-WaitForSomething2 0x00000001
-_0807EB28 0x132d
-_0807EA94 
-SetLocalFlag 0x0014
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+script_08012D70:
+	CheckPlayerInRegion 0x0088, 0x0048, 0x3030
+	JumpIfNot script_08012D70
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08012DB0
+	WaitForSomething2 0x00000001
+	_0807EB28 0x132d
+	_0807EA94 
+	SetLocalFlag 0x0014
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc
index 9f8eb1fa..11d4783c 100644
--- a/data/scripts/script_08012DB0.inc
+++ b/data/scripts/script_08012DB0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012DB0
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0088, 0x0068
-_0807EB44 0x0000
-_0807EF80 0x0000
-Wait 0x001e
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0088, 0x0068
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	Wait 0x001e
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc
index 4fdc4053..44f9936e 100644
--- a/data/scripts/script_08012DD8.inc
+++ b/data/scripts/script_08012DD8.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012DD8
-StartScript 
-StopScript 
-_0807E888 
-Wait 0x0018
-_0807E864 
-StartPlayerScript script_08012DF8
-WaitForSomething2 0x00000001
-_0807E908 0x0002
+	StartScript 
+	StopScript 
+	_0807E888 
+	Wait 0x0018
+	_0807E864 
+	StartPlayerScript script_08012DF8
+	WaitForSomething2 0x00000001
+	_0807E908 0x0002
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc
index 05b001aa..801db2c3 100644
--- a/data/scripts/script_08012DF8.inc
+++ b/data/scripts/script_08012DF8.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08012DF8
-StartScript 
-_0807EB44 0x0000
-SetEntityNonPlanarMovement 0x0140
-StopScript 
-_0807EDD4 0x00b8, 0x0094
-Wait 0x0008
-_0807EF80 0x0000
-Wait 0x0008
-_0807E5F8 0x00000001
+	StartScript 
+	_0807EB44 0x0000
+	SetEntityNonPlanarMovement 0x0140
+	StopScript 
+	_0807EDD4 0x00b8, 0x0094
+	Wait 0x0008
+	_0807EF80 0x0000
+	Wait 0x0008
+	_0807E5F8 0x00000001
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc
index 667813e0..5c9488c8 100644
--- a/data/scripts/script_08012E20.inc
+++ b/data/scripts/script_08012E20.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08012E20
-StartScript 
-_0807E864 
-StopScript 
-Wait 0x0078
-_0807E908 0x0004
-StartPlayerScript script_08012E44
-WaitForSomething2 0x00000002
-Wait 0x000c
-_0807E908 0x0005
+	StartScript 
+	_0807E864 
+	StopScript 
+	Wait 0x0078
+	_0807E908 0x0004
+	StartPlayerScript script_08012E44
+	WaitForSomething2 0x00000002
+	Wait 0x000c
+	_0807E908 0x0005
 SCRIPT_END
diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc
index a2efd4be..1ccebdf6 100644
--- a/data/scripts/script_08012E44.inc
+++ b/data/scripts/script_08012E44.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_08012E44
-StartScript 
-SetEntityNonPlanarMovement 0x0140
-StopScript 
-Wait 0x003c
-_0807EB44 0x0004
-Wait 0x000f
-_0807EB44 0x0002
-Wait 0x0012
-_0807EB44 0x0006
-Wait 0x000c
-_0807EB44 0x0000
-Wait 0x0015
-_0807EB44 0x0004
-Wait 0x0008
-_0807E5F8 0x00000002
-_0807EDD4 0x0088, 0x0158
+	StartScript 
+	SetEntityNonPlanarMovement 0x0140
+	StopScript 
+	Wait 0x003c
+	_0807EB44 0x0004
+	Wait 0x000f
+	_0807EB44 0x0002
+	Wait 0x0012
+	_0807EB44 0x0006
+	Wait 0x000c
+	_0807EB44 0x0000
+	Wait 0x0015
+	_0807EB44 0x0004
+	Wait 0x0008
+	_0807E5F8 0x00000002
+	_0807EDD4 0x0088, 0x0158
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc
index 30d0c1c0..a6b10e48 100644
--- a/data/scripts/script_08012E88.inc
+++ b/data/scripts/script_08012E88.inc
@@ -1,35 +1,37 @@
 SCRIPT_START script_08012E88
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-Call sub_0806B60C
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0001
-Call sub_0806B4F0
-_0807EA94 
-_0807E878 
-_0807EF80 0x0000
-Jump 0xffe2
-.short 0x0000
-StartScript 
-_0807EB44 0x0004
-CallWithArg sub_0807F3D8, 0x00000008
-_0807EF80 0x000a
-Call sub_0806B60C
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x0000000c
-Call sub_0806B4F0
-_0807EA94 
-Wait 0x000f
-_0807E878 
-CallWithArg sub_0807F3D8, 0x00000008
-Jump 0xffd2
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	Call sub_0806B60C
+	StopScript 
+script_08012E9E:
+	CheckEntityInteractType 
+	JumpIfNot script_08012E9E
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0001
+	Call sub_0806B4F0
+	_0807EA94 
+	_0807E878 
+	_0807EF80 0x0000
+	Jump script_08012E9E
+	.short 0x0000
+	StartScript 
+	_0807EB44 0x0004
+	CallWithArg sub_0807F3D8, 0x00000008
+	_0807EF80 0x000a
+	Call sub_0806B60C
+	StopScript 
+script_08012EDC:
+	CheckEntityInteractType 
+	JumpIfNot script_08012EDC
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x0000000c
+	Call sub_0806B4F0
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	CallWithArg sub_0807F3D8, 0x00000008
+	Jump script_08012EDC
diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc
index a3a5c863..47b3a5cc 100644
--- a/data/scripts/script_08012F0C.inc
+++ b/data/scripts/script_08012F0C.inc
@@ -1,32 +1,35 @@
 SCRIPT_START script_08012F0C
-StartScript 
-CallWithArg sub_0806A93C, 0x12345678
-_0807EB44 0x0004
-_0807E930 0x0002
-CheckInventory1 0x0015
-JumpIf 0x0190
-CheckLocalFlag 0x0060
-JumpIf 0x00a4
-CheckGlobalFlag 0x001e
-JumpIf 0x0050
-StopScript 
-CheckLocalFlag 0x0062
-JumpIfNot 0x0008
-Call sub_0806A9B0
-CheckLocalFlag 0x0061
-JumpIf 0x001e
-Call sub_0806A96C
-JumpIfNot 0xfff8
-_0807E864 
-TextboxNoOverlap 0x4401
-_0807EA94 
-SetLocalFlag 0x0061
-_0807E878 
-_0807E908 0x0001
-Call sub_0806A96C
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x4402
-_0807EA94 
-_0807E908 0x0001
-Jump 0xffea
+	StartScript 
+	CallWithArg sub_0806A93C, 0x12345678
+	_0807EB44 0x0004
+	_0807E930 0x0002
+	CheckInventory1 0x0015
+	JumpIf script_080130B6
+	CheckLocalFlag 0x0060
+	JumpIf script_08012FD2
+	CheckGlobalFlag 0x001e
+	JumpIf script_08012F86
+	StopScript 
+	CheckLocalFlag 0x0062
+	JumpIfNot script_08012F48
+	Call sub_0806A9B0
+script_08012F48:
+	CheckLocalFlag 0x0061
+	JumpIf script_08012F6C
+script_08012F50:
+	Call sub_0806A96C
+	JumpIfNot script_08012F50
+	_0807E864 
+	TextboxNoOverlap 0x4401
+	_0807EA94 
+	SetLocalFlag 0x0061
+	_0807E878 
+	_0807E908 0x0001
+script_08012F6C:
+	Call sub_0806A96C
+	JumpIfNot script_08012F6C
+	TextboxNoOverlap 0x4402
+	_0807EA94 
+	_0807E908 0x0001
+	Jump script_08012F6C
 SCRIPT_END
diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc
index 820f8c53..4b4ddb49 100644
--- a/data/scripts/script_08012F86.inc
+++ b/data/scripts/script_08012F86.inc
@@ -1,91 +1,100 @@
 SCRIPT_START script_08012F86
-StartScript 
-CheckLocalFlag 0x0060
-JumpIf 0x0044
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_080130E4
-SetLocalFlag 0x0060
-ClearLocalFlag 0x0061
-StopScript 
-WaitForSomething2 0x00000004
-_0807E908 0x0004
-Call sub_0806A958
-CallWithArg sub_0807F93C, 0x0000f2f4
-Call sub_0807DF50
-_0807E878 
-SetLocalFlag 0x0062
-Jump 0x002a
-StartScript 
-_0807E930 0x000d
-_0807E908 0x0005
-SetLocalFlag 0x0062
-CallWithArg sub_0807F93C, 0x0000f2f4
-Call sub_0806AA10
-StopScript 
-CheckInventory1 0x0038
-JumpIf 0x000e
-_0807E944 
-TextboxNoOverlap 0x4403
-_0807EA94 
-Jump 0xfff6
-_0807E944 
-StartScript 
-_0807E864 
-Call sub_0807DF28
-StopScript 
-SoundReq 0x00cd
-_0807F088 0x0038
-WaitPlayerAction8 
-Wait 0x001e
-_0807E8E4_0 
-Call sub_0806AB9C
-_0807E930 0x000b
-Wait 0x003c
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x4404
-_0807EA94 
-Wait 0x001e
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x440e
-_0807EA94 
-Wait 0x001e
-Call sub_0806A9E8
-_0807E930 0x000f
-Wait 0x00f0
-TextboxNoOverlap 0x4405
-_0807EA94 
-_0807E5F8 0x00000200
-_0807F034 0x0015
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlap 0x4406
-_0807EA94 
-_0807E908 0x0001
-Call sub_0807DF50
-_0807E878 
-Call sub_0806A96C
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x4407
-_0807EA94 
-_0807E908 0x0001
-Call sub_0806A96C
-JumpIfNot 0xfff8
-TextboxNoOverlap 0x440d
-_0807EA94 
-_0807E908 0x0001
-Jump 0xffd6
-CheckLocalFlag 0x0062
-JumpIfNot 0x0008
-Call sub_0806A9B0
-StopScript 
-Call sub_0806A96C
-JumpIfNot 0xfff8
-_0807E864 
-Call sub_0806AA18
-_0807EA94 
-_0807E878 
-_0807E908 0x0001
-Jump 0xffe4
+script_08012F86:
+	StartScript 
+	CheckLocalFlag 0x0060
+	JumpIf script_08012FD2
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_080130E4
+	SetLocalFlag 0x0060
+	ClearLocalFlag 0x0061
+	StopScript 
+	WaitForSomething2 0x00000004
+	_0807E908 0x0004
+	Call sub_0806A958
+	CallWithArg sub_0807F93C, 0x0000f2f4
+	Call sub_0807DF50
+	_0807E878 
+	SetLocalFlag 0x0062
+	Jump script_08012FFA
+script_08012FD2:
+	StartScript 
+	_0807E930 0x000d
+	_0807E908 0x0005
+	SetLocalFlag 0x0062
+	CallWithArg sub_0807F93C, 0x0000f2f4
+	Call sub_0806AA10
+	StopScript 
+	CheckInventory1 0x0038
+	JumpIf script_08013006
+script_08012FFA:
+	_0807E944 
+	TextboxNoOverlap 0x4403
+	_0807EA94 
+	Jump script_08012FFA
+script_08013006:
+	_0807E944 
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	StopScript 
+	SoundReq 0x00cd
+	_0807F088 0x0038
+	WaitPlayerAction8 
+	Wait 0x001e
+	_0807E8E4_0 
+	Call sub_0806AB9C
+	_0807E930 0x000b
+	Wait 0x003c
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x4404
+	_0807EA94 
+	Wait 0x001e
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x440e
+	_0807EA94 
+	Wait 0x001e
+	Call sub_0806A9E8
+	_0807E930 0x000f
+	Wait 0x00f0
+	TextboxNoOverlap 0x4405
+	_0807EA94 
+	_0807E5F8 0x00000200
+	_0807F034 0x0015
+	WaitPlayerAction8 
+	_0807EB8C 
+	TextboxNoOverlap 0x4406
+	_0807EA94 
+	_0807E908 0x0001
+	Call sub_0807DF50
+	_0807E878 
+script_0801308A:
+	Call sub_0806A96C
+	JumpIfNot script_0801308A
+	TextboxNoOverlap 0x4407
+	_0807EA94 
+	_0807E908 0x0001
+script_0801309E:
+	Call sub_0806A96C
+	JumpIfNot script_0801309E
+	TextboxNoOverlap 0x440d
+	_0807EA94 
+	_0807E908 0x0001
+	Jump script_0801308A
+script_080130B6:
+	CheckLocalFlag 0x0062
+	JumpIfNot script_080130C4
+	Call sub_0806A9B0
+script_080130C4:
+	StopScript 
+script_080130C6:
+	Call sub_0806A96C
+	JumpIfNot script_080130C6
+	_0807E864 
+	Call sub_0806AA18
+	_0807EA94 
+	_0807E878 
+	_0807E908 0x0001
+	Jump script_080130C6
diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc
index 929de154..434cfb38 100644
--- a/data/scripts/script_080130E4.inc
+++ b/data/scripts/script_080130E4.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_080130E4
-StartScript 
-_0807EB44 0x0006
-SetEntityNonPlanarMovement 0x0140
-StopScript 
-_0807EDD4 0x00a8, 0x0060
-Wait 0x0008
-_0807EF80 0x0000
-Wait 0x0008
-_0807EF80 0x0004
-Wait 0x000f
-_0807E5F8 0x00000004
+	StartScript 
+	_0807EB44 0x0006
+	SetEntityNonPlanarMovement 0x0140
+	StopScript 
+	_0807EDD4 0x00a8, 0x0060
+	Wait 0x0008
+	_0807EF80 0x0000
+	Wait 0x0008
+	_0807EF80 0x0004
+	Wait 0x000f
+	_0807E5F8 0x00000004
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc
index e7d6aa53..1b916d14 100644
--- a/data/scripts/script_08013114.inc
+++ b/data/scripts/script_08013114.inc
@@ -1,36 +1,39 @@
 SCRIPT_START script_08013114
-StartScript 
-_0807E9D4 
-_0807EF80 0x000a
-_0807EF80 0x0012
-Call sub_0807F348
-StopScript 
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x000c
-Call sub_0806AEE4
-Jump 0xffee
-_0807E864 
-StopScript 
-_0807EB74 
-Call sub_0806AED8
-CallWithArg sub_0806AA50, 0x00000000
-_0807EA94 
-CallWithArg sub_0806AA50, 0x00000001
-_0807EA94 
-CallWithArg sub_0806AA50, 0x00000002
-_0807EA94 
-JumpIf 0x0008
-_0807E878 
-Jump 0xffb4
-_0807E914 0x00000403
-Call sub_0807F420
-_0807E878 
-Jump 0xffa2
-StartScript 
-CheckLocalFlag 0x0062
-JumpIfNot 0x000a
-_0807EF80 0x0006
-StopScript 
+	StartScript 
+	_0807E9D4 
+	_0807EF80 0x000a
+	_0807EF80 0x0012
+	Call sub_0807F348
+	StopScript 
+script_08013128:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_0801313C
+	Call sub_0806AEE4
+	Jump script_08013128
+script_0801313C:
+	_0807E864 
+	StopScript 
+	_0807EB74 
+	Call sub_0806AED8
+	CallWithArg sub_0806AA50, 0x00000000
+	_0807EA94 
+	CallWithArg sub_0806AA50, 0x00000001
+	_0807EA94 
+	CallWithArg sub_0806AA50, 0x00000002
+	_0807EA94 
+	JumpIf script_08013176
+	_0807E878 
+	Jump script_08013128
+script_08013176:
+	_0807E914 0x00000403
+	Call sub_0807F420
+	_0807E878 
+	Jump script_08013128
+	StartScript 
+	CheckLocalFlag 0x0062
+	JumpIfNot script_0801319A
+	_0807EF80 0x0006
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index 7a9e15a2..a73ca71a 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -1,77 +1,79 @@
 SCRIPT_START script_0801319A
-StopScript 
-StartScript 
-CameraTargetEntity 
-MoveEntityToPlayer 
-Call sub_0806AB74
-Jump 0xfff0
-CheckPlayerInRegion 0x0098, 0x0038, 0x2060
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-StartPlayerScript script_080132E4
-WaitForSomething2 0x00000002
-_0807EB28 0x1601
-_0807EA94 
-StartPlayerScript script_0801330C
-WaitForSomething2 0x00000002
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-LoadRoomEntityList gUnk_080F5680
-StartPlayerScript script_08013330
-WaitForSomething2 0x00000002
-MoveEntityToPlayer 
-SetEntityPosition 0x0000, 0xfff0
-Call sub_0807F844
-CameraTargetEntity 
-Call sub_080536B8
-_0807E864 
-Call sub_0807DF28
-WaitFor_2 
-TextboxNoOverlapFollowPos 0x000c1602
-_0807EA94 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000010
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000040
-SoundReq2 0x000d
-StartPlayerScript script_0801334C
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000040
-StartPlayerScript script_08013378
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000042
-TextboxNoOverlapFollowPos 0x000c1603
-_0807EA94 
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000040
-_0807E788 0xffff7fff
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-SoundReq0x80100000 
-_0807E858 0x0000
-Wait 0x003c
-CameraTargetPlayer 
-Call sub_0807F5C0
-TextboxNoOverlapFollowPos 0x00071604
-_0807EA94 
-_0807E788 0xffffffff
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-_0807EB28 0x1605
-_0807EA94 
-SetLocalFlag 0x0078
-SoundReq2 0x0031
-SetGlobalFlag 0x005d
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+script_0801319A:
+	StopScript 
+	StartScript 
+	CameraTargetEntity 
+	MoveEntityToPlayer 
+	Call sub_0806AB74
+	Jump script_0801319A
+script_080131AC:
+	CheckPlayerInRegion 0x0098, 0x0038, 0x2060
+	JumpIfNot script_080131AC
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_080132E4
+	WaitForSomething2 0x00000002
+	_0807EB28 0x1601
+	_0807EA94 
+	StartPlayerScript script_0801330C
+	WaitForSomething2 0x00000002
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	LoadRoomEntityList gUnk_080F5680
+	StartPlayerScript script_08013330
+	WaitForSomething2 0x00000002
+	MoveEntityToPlayer 
+	SetEntityPosition 0x0000, 0xfff0
+	Call sub_0807F844
+	CameraTargetEntity 
+	Call sub_080536B8
+	_0807E864 
+	Call sub_0807DF28
+	WaitFor_2 
+	TextboxNoOverlapFollowPos 0x000c1602
+	_0807EA94 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000010
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000040
+	SoundReq2 0x000d
+	StartPlayerScript script_0801334C
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000040
+	StartPlayerScript script_08013378
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000042
+	TextboxNoOverlapFollowPos 0x000c1603
+	_0807EA94 
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000040
+	_0807E788 0xffff7fff
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	SoundReq0x80100000 
+	_0807E858 0x0000
+	Wait 0x003c
+	CameraTargetPlayer 
+	Call sub_0807F5C0
+	TextboxNoOverlapFollowPos 0x00071604
+	_0807EA94 
+	_0807E788 0xffffffff
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	_0807EB28 0x1605
+	_0807EA94 
+	SetLocalFlag 0x0078
+	SoundReq2 0x0031
+	SetGlobalFlag 0x005d
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc
index 40720dac..8d723657 100644
--- a/data/scripts/script_080132E4.inc
+++ b/data/scripts/script_080132E4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_080132E4
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0098, 0x0058
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x0098, 0x0058
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc
index 1254ccec..6d58d535 100644
--- a/data/scripts/script_0801330C.inc
+++ b/data/scripts/script_0801330C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0801330C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0001
-_0807EC64 0x0020
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0001
+	_0807EC64 0x0020
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013330.inc b/data/scripts/script_08013330.inc
index 9f51b8c4..74b1c20f 100644
--- a/data/scripts/script_08013330.inc
+++ b/data/scripts/script_08013330.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013330
-StartScript 
-_0807EB44 0x0000
-SetEntityPositionRelative 0x00700098
-StopScript 
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	_0807EB44 0x0000
+	SetEntityPositionRelative 0x00700098
+	StopScript 
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc
index e17fc35c..5d92b476 100644
--- a/data/scripts/script_0801334C.inc
+++ b/data/scripts/script_0801334C.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_0801334C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x000d
-StopScript 
-_0807EF80 0x0001
-_0807ECC4 0x0020
-_0807EF80 0x0000
-_0807EF80 0x000c
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x000d
+	StopScript 
+	_0807EF80 0x0001
+	_0807ECC4 0x0020
+	_0807EF80 0x0000
+	_0807EF80 0x000c
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc
index 5a767647..2d46d61c 100644
--- a/data/scripts/script_08013378.inc
+++ b/data/scripts/script_08013378.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_08013378
-Call sub_0807F1C4
-Call sub_0807F2D4
-Call sub_0807F1E8
-Call sub_0807F2D4
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-SoundReq 0x007c
-_0807EB44 0x0004
-Call sub_0807F210
-_0807EF3C 0x0200, 0x0020
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_080791BC
+	Call sub_0807F1C4
+	Call sub_0807F2D4
+	Call sub_0807F1E8
+	Call sub_0807F2D4
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	SoundReq 0x007c
+	_0807EB44 0x0004
+	Call sub_0807F210
+	_0807EF3C 0x0200, 0x0020
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc
index 223e3a5c..b4dad1da 100644
--- a/data/scripts/script_080133C4.inc
+++ b/data/scripts/script_080133C4.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_080133C4
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0007
-_0807EF80 0x000b
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00000008
-Call sub_08061F94
-Wait 0x000a
-_0807E5F8 0x00000010
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00000008
+	Call sub_08061F94
+	Wait 0x000a
+	_0807E5F8 0x00000010
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc
index a9730804..b863f4fa 100644
--- a/data/scripts/script_080133F8.inc
+++ b/data/scripts/script_080133F8.inc
@@ -1,34 +1,34 @@
 SCRIPT_START script_080133F8
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0008
-_0807EF80 0x000b
-Call sub_0807F338
-StopScript 
-WaitForSomething2 0x00000020
-SetEntityPositionRelative 0x00480098
-Call sub_08066C94
-Wait 0x00e9
-_0807EF80 0x0007
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-Wait 0x003c
-_0807EF80 0x0014
-SoundReq 0x0120
-CallWithArg sub_08095420, 0x08013494
-Wait 0x005a
-_0807EF80 0x0016
-WaitForSomething2 0x00000080
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000020
-Call sub_08066CA4
-_0807EF80 0x0008
-Wait 0x0078
-_0807E5F8 0x00000040
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0008
+	_0807EF80 0x000b
+	Call sub_0807F338
+	StopScript 
+	WaitForSomething2 0x00000020
+	SetEntityPositionRelative 0x00480098
+	Call sub_08066C94
+	Wait 0x00e9
+	_0807EF80 0x0007
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	Wait 0x003c
+	_0807EF80 0x0014
+	SoundReq 0x0120
+	CallWithArg sub_08095420, 0x08013494
+	Wait 0x005a
+	_0807EF80 0x0016
+	WaitForSomething2 0x00000080
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	Call sub_08066CA4
+	_0807EF80 0x0008
+	Wait 0x0078
+	_0807E5F8 0x00000040
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc
index 037082ba..f8b3499b 100644
--- a/data/scripts/script_08013494.inc
+++ b/data/scripts/script_08013494.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08013494
-StartScript 
-_0807E930 0x0000
-SetEntityNonPlanarMovement 0x0200
-Call nullsub_527
-Call sub_08094B80
-StopScript 
-Wait 0x005a
-Call sub_08094B6C
-_0807EDD4 0x0098, 0x0080
-StartScript 
-Call sub_08094B80
-SoundReq 0x01cc
-Call sub_0807F36C
-_0807E5F8 0x00000080
-StopScript 
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0000
+	SetEntityNonPlanarMovement 0x0200
+	Call nullsub_527
+	Call sub_08094B80
+	StopScript 
+	Wait 0x005a
+	Call sub_08094B6C
+	_0807EDD4 0x0098, 0x0080
+	StartScript 
+	Call sub_08094B80
+	SoundReq 0x01cc
+	Call sub_0807F36C
+	_0807E5F8 0x00000080
+	StopScript 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc
index af492fa6..08d464a2 100644
--- a/data/scripts/script_080134DC.inc
+++ b/data/scripts/script_080134DC.inc
@@ -1,72 +1,73 @@
 SCRIPT_START script_080134DC
-StartScript 
-_0807EF80 0x0008
-StopScript 
-StartScript 
-Call sub_0807F92C
-CallWithArg sub_0806DA04, 0x00000003
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_080136D8
-WaitForSomething2 0x00000001
-CallWithArg sub_08095A1C, 0x08013f04
-SoundReq 0x01cd
-Wait 0x005a
-StartScript 
-SoundReq 0x01ce
-CallWithArg sub_08095D54, 0x08013e04
-CallWithArg sub_08095D54, 0x08013e28
-StopScript 
-WaitForSomething2 0x18000000
-StartScript 
-SoundReq 0x01cf
-CallWithArg sub_08095D8C, 0x08014054
-CallWithArg sub_08095D8C, 0x08014074
-StopScript 
-Wait 0x001e
-StartScript 
-SoundReq 0x01d0
-CallWithArg sub_08095D8C, 0x080140dc
-CallWithArg sub_08095D8C, 0x08014118
-StopScript 
-Wait 0x003c
-CallWithArg sub_0805DDEC, 0x00000000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00002000
-SoundReq 0x01d2
-CallWithArg sub_08095D8C, 0x080141dc
-CallWithArg sub_08095D8C, 0x08014210
-_0807E5F8 0x00000400
-WaitForSomething2 0x00004000
-Wait 0x0078
-_0807E5F8 0x00000060
-CallWithArg sub_0805DE18, 0x00000000
-Wait 0x0078
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-Wait 0x003c
-StartPlayerScript script_08013B70
-_0807E5F8 0x00000080
-_0807F078 0x0003, 0x0001
-Call sub_0806DC3C
-Call sub_0806DC58
-Call sub_0807F304
-Wait 0x003c
-_0807E778 0x0004
-DoFade7 
-SoundReq 0x00f6
-WaitFor_2 
-Wait 0x003c
-_0807E5F8 0x00000010
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-SoundReq 0x0109
-TextboxNoOverlapFollowPos 0x000c0503
-_0807EA94 
-_0807E5F8 0x00040000
-CallWithArg sub_0805DDEC, 0x00000001
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+	StartScript 
+	Call sub_0807F92C
+	CallWithArg sub_0806DA04, 0x00000003
+	StopScript 
+script_080134F8:
+	CheckEntityInteractType 
+	JumpIfNot script_080134F8
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_080136D8
+	WaitForSomething2 0x00000001
+	CallWithArg sub_08095A1C, 0x08013f04
+	SoundReq 0x01cd
+	Wait 0x005a
+	StartScript 
+	SoundReq 0x01ce
+	CallWithArg sub_08095D54, 0x08013e04
+	CallWithArg sub_08095D54, 0x08013e28
+	StopScript 
+	WaitForSomething2 0x18000000
+	StartScript 
+	SoundReq 0x01cf
+	CallWithArg sub_08095D8C, 0x08014054
+	CallWithArg sub_08095D8C, 0x08014074
+	StopScript 
+	Wait 0x001e
+	StartScript 
+	SoundReq 0x01d0
+	CallWithArg sub_08095D8C, 0x080140dc
+	CallWithArg sub_08095D8C, 0x08014118
+	StopScript 
+	Wait 0x003c
+	CallWithArg sub_0805DDEC, 0x00000000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00002000
+	SoundReq 0x01d2
+	CallWithArg sub_08095D8C, 0x080141dc
+	CallWithArg sub_08095D8C, 0x08014210
+	_0807E5F8 0x00000400
+	WaitForSomething2 0x00004000
+	Wait 0x0078
+	_0807E5F8 0x00000060
+	CallWithArg sub_0805DE18, 0x00000000
+	Wait 0x0078
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	Wait 0x003c
+	StartPlayerScript script_08013B70
+	_0807E5F8 0x00000080
+	_0807F078 0x0003, 0x0001
+	Call sub_0806DC3C
+	Call sub_0806DC58
+	Call sub_0807F304
+	Wait 0x003c
+	_0807E778 0x0004
+	DoFade7 
+	SoundReq 0x00f6
+	WaitFor_2 
+	Wait 0x003c
+	_0807E5F8 0x00000010
+	_0807E778 0x0002
+	DoFade6 
+	WaitFor_2 
+	SoundReq 0x0109
+	TextboxNoOverlapFollowPos 0x000c0503
+	_0807EA94 
+	_0807E5F8 0x00040000
+	CallWithArg sub_0805DDEC, 0x00000001
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc
index d5ea9a8b..ee3a03ea 100644
--- a/data/scripts/script_08013650.inc
+++ b/data/scripts/script_08013650.inc
@@ -1,23 +1,23 @@
 SCRIPT_START script_08013650
-Call sub_0807F3F8
-Wait 0x003c
-_0807F0B4 0x0007
-SetEntityPositionRelative 0x00a800e8
-CameraTargetEntity 
-Wait 0x003c
-_0807E5F8 0x00000004
-Wait 0x0078
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-StartPlayerScript script_080136B4
-WaitForSomething2 0x00000002
-_0807EB28 0x1501
-_0807EA94 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetLocalFlag 0x007a
-Call sub_08053250
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807F0B4 0x0007
+	SetEntityPositionRelative 0x00a800e8
+	CameraTargetEntity 
+	Wait 0x003c
+	_0807E5F8 0x00000004
+	Wait 0x0078
+	CallWithArg sub_0805DE18, 0x00000001
+	_0807F0C8 0x0000, 0x0000
+	StartPlayerScript script_080136B4
+	WaitForSomething2 0x00000002
+	_0807EB28 0x1501
+	_0807EA94 
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	SetLocalFlag 0x007a
+	Call sub_08053250
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc
index 7fcd5496..45522e05 100644
--- a/data/scripts/script_080136B4.inc
+++ b/data/scripts/script_080136B4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080136B4
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x00e8, 0x00a8
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x00e8, 0x00a8
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc
index 47b9ea21..a69e0b6e 100644
--- a/data/scripts/script_080136D8.inc
+++ b/data/scripts/script_080136D8.inc
@@ -1,14 +1,17 @@
 SCRIPT_START script_080136D8
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-Call sub_0807F584
-_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x000c
-CallWithArg sub_0807F464, 0x000000d0
-CallWithArg sub_0807F4F8, 0x00000124
-_0807EDD4 0x00e8, 0x0124
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	Call sub_0807F584
+	JumpSwitch_4 script_080136F0, script_080136FA, script_08013704, script_080136FA
+script_080136F0:
+	CallWithArg sub_0807F464, 0x000000d0
+script_080136FA:
+	CallWithArg sub_0807F4F8, 0x00000124
+script_08013704:
+	_0807EDD4 0x00e8, 0x0124
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index c9e78093..bda54165 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -1,80 +1,81 @@
 SCRIPT_START script_08013720
-StartScript 
-_0807EF80 0x0008
-StopScript 
-StartScript 
-Call sub_0807F92C
-CallWithArg sub_0806DA04, 0x00000003
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_080136D8
-WaitForSomething2 0x00000001
-CallWithArg sub_08095A1C, 0x08013f34
-SoundReq 0x01cd
-Wait 0x005a
-StartScript 
-SoundReq 0x01ce
-CallWithArg sub_08095D54, 0x08013e4c
-StopScript 
-WaitForSomething2 0x20000000
-StartScript 
-SoundReq 0x01cf
-CallWithArg sub_08095D8C, 0x08014054
-CallWithArg sub_08095D8C, 0x08014074
-CallWithArg sub_08095D8C, 0x08014094
-StopScript 
-Wait 0x001e
-StartScript 
-SoundReq 0x01d0
-CallWithArg sub_08095D8C, 0x080140dc
-CallWithArg sub_08095D8C, 0x08014118
-CallWithArg sub_08095D8C, 0x08014154
-StopScript 
-Wait 0x003c
-CallWithArg sub_0805DDEC, 0x00000000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00002000
-SoundReq 0x01d2
-CallWithArg sub_08095D8C, 0x080141dc
-CallWithArg sub_08095D8C, 0x08014210
-_0807E5F8 0x00000400
-WaitForSomething2 0x00004000
-_0807E5F8 0x00000800
-WaitForSomething2 0x00008000
-Wait 0x0078
-_0807E5F8 0x00000060
-CallWithArg sub_0805DE18, 0x00000000
-Wait 0x0078
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-Wait 0x003c
-StartPlayerScript script_08013B70
-_0807E5F8 0x00000080
-_0807F078 0x0004, 0x0001
-Call sub_0806DC3C
-Call sub_0806DC58
-Call sub_0807F304
-Wait 0x003c
-_0807E778 0x0004
-DoFade7 
-SoundReq 0x00f6
-WaitFor_2 
-Wait 0x003c
-_0807E5F8 0x00000010
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-SoundReq 0x0109
-TextboxNoOverlapFollowPos 0x000c0504
-_0807EA94 
-_0807E5F8 0x00040000
-SetLocalFlag 0x007b
-Call sub_08053250
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+	StartScript 
+	Call sub_0807F92C
+	CallWithArg sub_0806DA04, 0x00000003
+	StopScript 
+script_0801373C:
+	CheckEntityInteractType 
+	JumpIfNot script_0801373C
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_080136D8
+	WaitForSomething2 0x00000001
+	CallWithArg sub_08095A1C, 0x08013f34
+	SoundReq 0x01cd
+	Wait 0x005a
+	StartScript 
+	SoundReq 0x01ce
+	CallWithArg sub_08095D54, 0x08013e4c
+	StopScript 
+	WaitForSomething2 0x20000000
+	StartScript 
+	SoundReq 0x01cf
+	CallWithArg sub_08095D8C, 0x08014054
+	CallWithArg sub_08095D8C, 0x08014074
+	CallWithArg sub_08095D8C, 0x08014094
+	StopScript 
+	Wait 0x001e
+	StartScript 
+	SoundReq 0x01d0
+	CallWithArg sub_08095D8C, 0x080140dc
+	CallWithArg sub_08095D8C, 0x08014118
+	CallWithArg sub_08095D8C, 0x08014154
+	StopScript 
+	Wait 0x003c
+	CallWithArg sub_0805DDEC, 0x00000000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00002000
+	SoundReq 0x01d2
+	CallWithArg sub_08095D8C, 0x080141dc
+	CallWithArg sub_08095D8C, 0x08014210
+	_0807E5F8 0x00000400
+	WaitForSomething2 0x00004000
+	_0807E5F8 0x00000800
+	WaitForSomething2 0x00008000
+	Wait 0x0078
+	_0807E5F8 0x00000060
+	CallWithArg sub_0805DE18, 0x00000000
+	Wait 0x0078
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	Wait 0x003c
+	StartPlayerScript script_08013B70
+	_0807E5F8 0x00000080
+	_0807F078 0x0004, 0x0001
+	Call sub_0806DC3C
+	Call sub_0806DC58
+	Call sub_0807F304
+	Wait 0x003c
+	_0807E778 0x0004
+	DoFade7 
+	SoundReq 0x00f6
+	WaitFor_2 
+	Wait 0x003c
+	_0807E5F8 0x00000010
+	_0807E778 0x0002
+	DoFade6 
+	WaitFor_2 
+	SoundReq 0x0109
+	TextboxNoOverlapFollowPos 0x000c0504
+	_0807EA94 
+	_0807E5F8 0x00040000
+	SetLocalFlag 0x007b
+	Call sub_08053250
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index c59dfcdd..101916b3 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -1,91 +1,93 @@
 SCRIPT_START script_080138B4
-StartScript 
-_0807EF80 0x0008
-StopScript 
-StartScript 
-Call sub_0807F92C
-CallWithArg sub_0806DA04, 0x00000003
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-StartPlayerScript script_080136D8
-WaitForSomething2 0x00000001
-CallWithArg sub_08095A1C, 0x08013f64
-SoundReq 0x01cd
-Wait 0x005a
-StartScript 
-SoundReq 0x01ce
-CallWithArg sub_08095D54, 0x08013e70
-StopScript 
-WaitForSomething2 0x40000000
-StartScript 
-SoundReq 0x01cf
-CallWithArg sub_08095D8C, 0x08014054
-CallWithArg sub_08095D8C, 0x08014074
-CallWithArg sub_08095D8C, 0x08014094
-CallWithArg sub_08095D8C, 0x080140b8
-StopScript 
-Wait 0x001e
-StartScript 
-SoundReq 0x01d0
-CallWithArg sub_08095D8C, 0x080140dc
-CallWithArg sub_08095D8C, 0x08014118
-CallWithArg sub_08095D8C, 0x08014154
-CallWithArg sub_08095D8C, 0x08014198
-StopScript 
-Wait 0x003c
-CallWithArg sub_0805DDEC, 0x00000000
-_0807E5F8 0x00000200
-WaitForSomething2 0x00002000
-SoundReq 0x01d2
-CallWithArg sub_08095D8C, 0x080141dc
-CallWithArg sub_08095D8C, 0x08014210
-_0807E5F8 0x00000400
-WaitForSomething2 0x00004000
-_0807E5F8 0x00000800
-WaitForSomething2 0x00008000
-_0807E5F8 0x00001000
-WaitForSomething2 0x00010000
-Wait 0x0078
-_0807E5F8 0x00000060
-CallWithArg sub_0805DE18, 0x00000000
-Wait 0x0078
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-Wait 0x003c
-StartPlayerScript script_08013BA8
-_0807E5F8 0x00000080
-_0807F078 0x0006, 0x0001
-Call sub_0807AEE4
-Call sub_0806DC3C
-Call sub_0806DC58
-Call sub_0807F304
-Wait 0x003c
-_0807E778 0x0004
-DoFade7 
-SoundReq 0x00f6
-WaitFor_2 
-Wait 0x003c
-_0807E5F8 0x00000010
-_0807E778 0x0002
-DoFade6 
-WaitFor_2 
-SoundReq 0x0109
-TextboxNoOverlapFollowPos 0x000c0505
-_0807EA94 
-_0807E5F8 0x00040000
-_0807F0B4 0x0002
-SetEntityPositionRelative 0x00d800e8
-CameraTargetEntity 
-Call sub_0806DC3C
-CallWithArg sub_0807F244, 0x00010001
-CallWithArg sub_0807F29C, 0x080049fe
-Wait 0x00c8
-CallWithArg sub_0807F29C, 0x00000000
-Call sub_0806DC58
-CheckRoomFlag 0x0004
-JumpIfNot 0xfffa
-CallWithArg sub_0805DDEC, 0x00000001
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+	StartScript 
+	Call sub_0807F92C
+	CallWithArg sub_0806DA04, 0x00000003
+	StopScript 
+script_080138D0:
+	CheckEntityInteractType 
+	JumpIfNot script_080138D0
+	_0807E864 
+	Call sub_0807DF28
+	StartPlayerScript script_080136D8
+	WaitForSomething2 0x00000001
+	CallWithArg sub_08095A1C, 0x08013f64
+	SoundReq 0x01cd
+	Wait 0x005a
+	StartScript 
+	SoundReq 0x01ce
+	CallWithArg sub_08095D54, 0x08013e70
+	StopScript 
+	WaitForSomething2 0x40000000
+	StartScript 
+	SoundReq 0x01cf
+	CallWithArg sub_08095D8C, 0x08014054
+	CallWithArg sub_08095D8C, 0x08014074
+	CallWithArg sub_08095D8C, 0x08014094
+	CallWithArg sub_08095D8C, 0x080140b8
+	StopScript 
+	Wait 0x001e
+	StartScript 
+	SoundReq 0x01d0
+	CallWithArg sub_08095D8C, 0x080140dc
+	CallWithArg sub_08095D8C, 0x08014118
+	CallWithArg sub_08095D8C, 0x08014154
+	CallWithArg sub_08095D8C, 0x08014198
+	StopScript 
+	Wait 0x003c
+	CallWithArg sub_0805DDEC, 0x00000000
+	_0807E5F8 0x00000200
+	WaitForSomething2 0x00002000
+	SoundReq 0x01d2
+	CallWithArg sub_08095D8C, 0x080141dc
+	CallWithArg sub_08095D8C, 0x08014210
+	_0807E5F8 0x00000400
+	WaitForSomething2 0x00004000
+	_0807E5F8 0x00000800
+	WaitForSomething2 0x00008000
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00010000
+	Wait 0x0078
+	_0807E5F8 0x00000060
+	CallWithArg sub_0805DE18, 0x00000000
+	Wait 0x0078
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	Wait 0x003c
+	StartPlayerScript script_08013BA8
+	_0807E5F8 0x00000080
+	_0807F078 0x0006, 0x0001
+	Call sub_0807AEE4
+	Call sub_0806DC3C
+	Call sub_0806DC58
+	Call sub_0807F304
+	Wait 0x003c
+	_0807E778 0x0004
+	DoFade7 
+	SoundReq 0x00f6
+	WaitFor_2 
+	Wait 0x003c
+	_0807E5F8 0x00000010
+	_0807E778 0x0002
+	DoFade6 
+	WaitFor_2 
+	SoundReq 0x0109
+	TextboxNoOverlapFollowPos 0x000c0505
+	_0807EA94 
+	_0807E5F8 0x00040000
+	_0807F0B4 0x0002
+	SetEntityPositionRelative 0x00d800e8
+	CameraTargetEntity 
+	Call sub_0806DC3C
+	CallWithArg sub_0807F244, 0x00010001
+	CallWithArg sub_0807F29C, 0x080049fe
+	Wait 0x00c8
+	CallWithArg sub_0807F29C, 0x00000000
+	Call sub_0806DC58
+script_08013A8E:
+	CheckRoomFlag 0x0004
+	JumpIfNot script_08013A8E
+	CallWithArg sub_0805DDEC, 0x00000001
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc
index 5857c5ee..d078369c 100644
--- a/data/scripts/script_08013AA6.inc
+++ b/data/scripts/script_08013AA6.inc
@@ -1,28 +1,28 @@
 SCRIPT_START script_08013AA6
-Call sub_0807F3F8
-Wait 0x003c
-_0807E5F8 0x00000008
-Wait 0x0078
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-Wait 0x003c
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x005000e8
-CameraTargetEntity 
-Wait 0x003c
-LoadRoomEntityList gUnk_080F55D8
-Wait 0x0078
-_0807F0B4 0x0007
-MoveEntityToPlayer 
-CameraTargetEntity 
-Wait 0x003c
-_0807EB28 0x1502
-_0807EA94 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetLocalFlag 0x007c
-Call sub_08053250
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807E5F8 0x00000008
+	Wait 0x0078
+	CallWithArg sub_0805DE18, 0x00000001
+	_0807F0C8 0x0000, 0x0000
+	Wait 0x003c
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x005000e8
+	CameraTargetEntity 
+	Wait 0x003c
+	LoadRoomEntityList gUnk_080F55D8
+	Wait 0x0078
+	_0807F0B4 0x0007
+	MoveEntityToPlayer 
+	CameraTargetEntity 
+	Wait 0x003c
+	_0807EB28 0x1502
+	_0807EA94 
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	SetLocalFlag 0x007c
+	Call sub_08053250
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc
index 72a7ca19..75643d49 100644
--- a/data/scripts/script_08013B18.inc
+++ b/data/scripts/script_08013B18.inc
@@ -1,23 +1,24 @@
 SCRIPT_START script_08013B18
-StartScript 
-_0807EF80 0x0008
-StopScript 
-StartScript 
-CallWithArg sub_0807F6B4, 0x000001c8
-JumpIfNot 0xfff0
-CheckInventory1 0x0006
-JumpIfNot 0xffe8
-CheckLocalFlag 0x0078
-JumpIf 0xffe0
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807EB28 0x1507
-_0807EA94 
-StartPlayerScript script_08010A14
-WaitForSomething2 0x00000001
-Call sub_0807DF50
-_0807E878 
-Jump 0xffb2
-.short 0x0000
+	StartScript 
+	_0807EF80 0x0008
+script_08013B1E:
+	StopScript 
+	StartScript 
+	CallWithArg sub_0807F6B4, 0x000001c8
+	JumpIfNot script_08013B1E
+	CheckInventory1 0x0006
+	JumpIfNot script_08013B1E
+	CheckLocalFlag 0x0078
+	JumpIf script_08013B1E
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807EB28 0x1507
+	_0807EA94 
+	StartPlayerScript script_08010A14
+	WaitForSomething2 0x00000001
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08013B1E
+	.short 0x0000
diff --git a/data/scripts/script_08013B70.inc b/data/scripts/script_08013B70.inc
index aae726f9..485fb1df 100644
--- a/data/scripts/script_08013B70.inc
+++ b/data/scripts/script_08013B70.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08013B70
-SoundReq 0x01d3
-CallWithArg sub_0807F238, 0x000008bf
-Call sub_08096028
-Wait 0x003c
-_0807E5F8 0x00020000
-Call sub_0807F304
-Wait 0x0078
-WaitForSomething2 0x00040000
-Call sub_080791BC
+	SoundReq 0x01d3
+	CallWithArg sub_0807F238, 0x000008bf
+	Call sub_08096028
+	Wait 0x003c
+	_0807E5F8 0x00020000
+	Call sub_0807F304
+	Wait 0x0078
+	WaitForSomething2 0x00040000
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013BA8.inc b/data/scripts/script_08013BA8.inc
index 97c11730..42a8b552 100644
--- a/data/scripts/script_08013BA8.inc
+++ b/data/scripts/script_08013BA8.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08013BA8
-CallWithArg sub_08095E7C, 0x08014248
-SoundReq 0x01d3
-CallWithArg sub_0807F238, 0x000008e3
-Call sub_08096028
-Wait 0x0078
-_0807E5F8 0x00020000
-Call sub_0807F304
-Wait 0x0078
-WaitForSomething2 0x00040000
-Call sub_080791BC
+	CallWithArg sub_08095E7C, 0x08014248
+	SoundReq 0x01d3
+	CallWithArg sub_0807F238, 0x000008e3
+	Call sub_08096028
+	Wait 0x0078
+	_0807E5F8 0x00020000
+	Call sub_0807F304
+	Wait 0x0078
+	WaitForSomething2 0x00040000
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc
index 64b87f5c..3208a12e 100644
--- a/data/scripts/script_08013BE8.inc
+++ b/data/scripts/script_08013BE8.inc
@@ -1,51 +1,58 @@
 SCRIPT_START script_08013BE8
-StartScript 
-CheckLocalFlag 0x007a
-JumpIf 0x003a
-CheckInventory1 0x0003
-JumpIf 0x0032
-CheckInventory1 0x0002
-JumpIfNot 0x0098
-CheckInventory1 0x0040
-JumpIfNot 0x0090
-CheckInventory1 0x0041
-JumpIfNot 0x0088
-StopScript 
-_0807EF80 0x0008
-WaitForSomething2 0x00000004
-_0807E908 0x0002
-SoundReq 0x0134
-Jump 0x000a
-CheckLocalFlag 0x007c
-JumpIf 0x0068
-StartScript 
-_0807EF80 0x0007
-Call sub_0807F934
-_0807EF80 0x000a
-CallWithArg sub_080962F8, 0x00000000
-CallWithArg sub_0807F8E8, 0x00000004
-StopScript 
-StopScript 
-StartScript 
-TestBit 0x00000008
-JumpIf 0x002e
-CheckEntityInteractType 
-JumpIfNot 0xffee
-StopScript 
-_0807E864 
-_0807EB74 
-CheckLocalFlag 0x007d
-JumpIf 0x000a
-_0807EB28 0x1501
-Jump 0x0006
-_0807EB28 0x1506
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffc8
-StopScript 
-_0807E908 0x0004
-_0807EF80 0x0008
-_0807EF80 0x0006
+	StartScript 
+	CheckLocalFlag 0x007a
+	JumpIf script_08013C2A
+	CheckInventory1 0x0003
+	JumpIf script_08013C2A
+	CheckInventory1 0x0002
+	JumpIfNot script_08013C98
+	CheckInventory1 0x0040
+	JumpIfNot script_08013C98
+	CheckInventory1 0x0041
+	JumpIfNot script_08013C98
+	StopScript 
+	_0807EF80 0x0008
+	WaitForSomething2 0x00000004
+	_0807E908 0x0002
+	SoundReq 0x0134
+	Jump script_08013C32
+script_08013C2A:
+	CheckLocalFlag 0x007c
+	JumpIf script_08013C98
+script_08013C32:
+	StartScript 
+	_0807EF80 0x0007
+	Call sub_0807F934
+	_0807EF80 0x000a
+	CallWithArg sub_080962F8, 0x00000000
+	CallWithArg sub_0807F8E8, 0x00000004
+	StopScript 
+script_08013C58:
+	StopScript 
+	StartScript 
+	TestBit 0x00000008
+	JumpIf script_08013C92
+	CheckEntityInteractType 
+	JumpIfNot script_08013C58
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	CheckLocalFlag 0x007d
+	JumpIf script_08013C82
+	_0807EB28 0x1501
+	Jump script_08013C86
+script_08013C82:
+	_0807EB28 0x1506
+script_08013C86:
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08013C58
+script_08013C92:
+	StopScript 
+	_0807E908 0x0004
+script_08013C98:
+	_0807EF80 0x0008
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc
index d0a809ef..e54c4494 100644
--- a/data/scripts/script_08013CA4.inc
+++ b/data/scripts/script_08013CA4.inc
@@ -1,24 +1,25 @@
 SCRIPT_START script_08013CA4
-StopScript 
-CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0807F3F8
-Wait 0x003c
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x013800e8
-CameraTargetEntity 
-Call sub_0807F5C0
-Wait 0x0078
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807F5C0
-_0807EB28 0x1504
-_0807EA94 
-SetLocalFlag 0x0079
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StopScript 
+script_08013CA6:
+	CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080
+	JumpIfNot script_08013CA6
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807F0B4 0x0001
+	SetEntityPositionRelative 0x013800e8
+	CameraTargetEntity 
+	Call sub_0807F5C0
+	Wait 0x0078
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807F5C0
+	_0807EB28 0x1504
+	_0807EA94 
+	SetLocalFlag 0x0079
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc
index 15b53482..5bc69e89 100644
--- a/data/scripts/script_08013D04.inc
+++ b/data/scripts/script_08013D04.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_08013D04
-StartScript 
-Call sub_0807F92C
-_0807EF80 0x0008
-CallWithArg sub_0806DA04, 0x00000004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-CallWithArg sub_08095D54, 0x00000000
-SoundReq 0x01cd
-_0807E5F8 0x08000000
-Call sub_080791BC
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F92C
+	_0807EF80 0x0008
+	CallWithArg sub_0806DA04, 0x00000004
+	StopScript 
+script_08013D1C:
+	CheckEntityInteractType 
+	JumpIfNot script_08013D1C
+	CallWithArg sub_08095D54, 0x00000000
+	SoundReq 0x01cd
+	_0807E5F8 0x08000000
+	Call sub_080791BC
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc
index ab9c3b08..e662df9c 100644
--- a/data/scripts/script_08013D44.inc
+++ b/data/scripts/script_08013D44.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_08013D44
-StartScript 
-Call sub_0807F92C
-_0807EF80 0x0008
-CallWithArg sub_0806DA04, 0x00000004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-CallWithArg sub_08095D54, 0x00000001
-SoundReq 0x01cd
-_0807E5F8 0x10000000
-Call sub_080791BC
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F92C
+	_0807EF80 0x0008
+	CallWithArg sub_0806DA04, 0x00000004
+	StopScript 
+script_08013D5C:
+	CheckEntityInteractType 
+	JumpIfNot script_08013D5C
+	CallWithArg sub_08095D54, 0x00000001
+	SoundReq 0x01cd
+	_0807E5F8 0x10000000
+	Call sub_080791BC
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc
index 019222fc..f4d79746 100644
--- a/data/scripts/script_08013D84.inc
+++ b/data/scripts/script_08013D84.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_08013D84
-StartScript 
-Call sub_0807F92C
-_0807EF80 0x0008
-CallWithArg sub_0806DA04, 0x00000004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-CallWithArg sub_08095D54, 0x00000002
-SoundReq 0x01cd
-_0807E5F8 0x20000000
-Call sub_080791BC
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F92C
+	_0807EF80 0x0008
+	CallWithArg sub_0806DA04, 0x00000004
+	StopScript 
+script_08013D9C:
+	CheckEntityInteractType 
+	JumpIfNot script_08013D9C
+	CallWithArg sub_08095D54, 0x00000002
+	SoundReq 0x01cd
+	_0807E5F8 0x20000000
+	Call sub_080791BC
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc
index cf903dce..ed233bf1 100644
--- a/data/scripts/script_08013DC4.inc
+++ b/data/scripts/script_08013DC4.inc
@@ -1,15 +1,16 @@
 SCRIPT_START script_08013DC4
-StartScript 
-Call sub_0807F92C
-_0807EF80 0x0008
-CallWithArg sub_0806DA04, 0x00000004
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-CallWithArg sub_08095D54, 0x00000003
-SoundReq 0x01cd
-_0807E5F8 0x40000000
-Call sub_080791BC
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0807F92C
+	_0807EF80 0x0008
+	CallWithArg sub_0806DA04, 0x00000004
+	StopScript 
+script_08013DDC:
+	CheckEntityInteractType 
+	JumpIfNot script_08013DDC
+	CallWithArg sub_08095D54, 0x00000003
+	SoundReq 0x01cd
+	_0807E5F8 0x40000000
+	Call sub_080791BC
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc
index 8f2da729..a5ab5e98 100644
--- a/data/scripts/script_08013E04.inc
+++ b/data/scripts/script_08013E04.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08013E04
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0000
-StopScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EDD4 0x00b0, 0x00f8
-_0807E930 0x0001
-_0807E5F8 0x08000000
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	StopScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EDD4 0x00b0, 0x00f8
+	_0807E930 0x0001
+	_0807E5F8 0x08000000
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc
index 1f105f4e..bf0f960f 100644
--- a/data/scripts/script_08013E28.inc
+++ b/data/scripts/script_08013E28.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08013E28
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0002
-StopScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EDD4 0x0120, 0x00f8
-_0807E930 0x0003
-_0807E5F8 0x10000000
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0002
+	StopScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EDD4 0x0120, 0x00f8
+	_0807E930 0x0003
+	_0807E5F8 0x10000000
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc
index 2c14b1a5..8b29d123 100644
--- a/data/scripts/script_08013E4C.inc
+++ b/data/scripts/script_08013E4C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08013E4C
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0004
-StopScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EDD4 0x0120, 0x0168
-_0807E930 0x0005
-_0807E5F8 0x20000000
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0004
+	StopScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EDD4 0x0120, 0x0168
+	_0807E930 0x0005
+	_0807E5F8 0x20000000
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc
index 1d9e6247..1f2dee86 100644
--- a/data/scripts/script_08013E70.inc
+++ b/data/scripts/script_08013E70.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08013E70
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0006
-StopScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EDD4 0x00b0, 0x0168
-_0807E930 0x0007
-_0807E5F8 0x40000000
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0006
+	StopScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EDD4 0x00b0, 0x0168
+	_0807E930 0x0007
+	_0807E5F8 0x40000000
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc
index f943d80e..bbaeb0af 100644
--- a/data/scripts/script_08013E94.inc
+++ b/data/scripts/script_08013E94.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013E94
-StartScript 
-_0807EF80 0x0007
-Call sub_0807F180
-SetEntityPositionRelative 0x00f800b0
-_0807E930 0x0001
-StopScript 
+	StartScript 
+	_0807EF80 0x0007
+	Call sub_0807F180
+	SetEntityPositionRelative 0x00f800b0
+	_0807E930 0x0001
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc
index b39b667d..07e14095 100644
--- a/data/scripts/script_08013EB0.inc
+++ b/data/scripts/script_08013EB0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013EB0
-StartScript 
-_0807EF80 0x0007
-Call sub_0807F180
-SetEntityPositionRelative 0x00f80120
-_0807E930 0x0003
-StopScript 
+	StartScript 
+	_0807EF80 0x0007
+	Call sub_0807F180
+	SetEntityPositionRelative 0x00f80120
+	_0807E930 0x0003
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc
index eb7de967..6798155b 100644
--- a/data/scripts/script_08013ECC.inc
+++ b/data/scripts/script_08013ECC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013ECC
-StartScript 
-_0807EF80 0x0007
-Call sub_0807F180
-SetEntityPositionRelative 0x01680120
-_0807E930 0x0005
-StopScript 
+	StartScript 
+	_0807EF80 0x0007
+	Call sub_0807F180
+	SetEntityPositionRelative 0x01680120
+	_0807E930 0x0005
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc
index 2981798d..9f5fe111 100644
--- a/data/scripts/script_08013EE8.inc
+++ b/data/scripts/script_08013EE8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013EE8
-StartScript 
-_0807EF80 0x0007
-Call sub_0807F180
-SetEntityPositionRelative 0x016800b0
-_0807E930 0x0007
-StopScript 
+	StartScript 
+	_0807EF80 0x0007
+	Call sub_0807F180
+	SetEntityPositionRelative 0x016800b0
+	_0807E930 0x0007
+	StopScript 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc
index 01af27f0..3f4d8395 100644
--- a/data/scripts/script_08013F04.inc
+++ b/data/scripts/script_08013F04.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08013F04
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0008
-StopScript 
-WaitForSomething2 0x00000080
-_0807E930 0x000b
-Call sub_0807F2D4
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0008
+	StopScript 
+	WaitForSomething2 0x00000080
+	_0807E930 0x000b
+	Call sub_0807F2D4
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc
index 18709dd7..2ead57a2 100644
--- a/data/scripts/script_08013F34.inc
+++ b/data/scripts/script_08013F34.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08013F34
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0009
-StopScript 
-WaitForSomething2 0x00000080
-_0807E930 0x000c
-Call sub_0807F2D4
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0009
+	StopScript 
+	WaitForSomething2 0x00000080
+	_0807E930 0x000c
+	Call sub_0807F2D4
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc
index 13e54873..6dded1b5 100644
--- a/data/scripts/script_08013F64.inc
+++ b/data/scripts/script_08013F64.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08013F64
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x000a
-StopScript 
-WaitForSomething2 0x00000080
-_0807E930 0x000d
-Call sub_0807F2D4
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x000a
+	StopScript 
+	WaitForSomething2 0x00000080
+	_0807E930 0x000d
+	Call sub_0807F2D4
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc
index 2d9ef7ca..78f7d4a3 100644
--- a/data/scripts/script_08013F94.inc
+++ b/data/scripts/script_08013F94.inc
@@ -1,25 +1,27 @@
 SCRIPT_START script_08013F94
-StartScript 
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x007d
-JumpIf 0x003e
-StopScript 
-StartScript 
-CheckInventory1 0x0003
-JumpIfNot 0xfff6
-CheckPlayerFlags 0x00400000
-JumpIfNot 0xffec
-StopScript 
-Call sub_0807FA40
-_0807E888 
-Call sub_0807DF38
-Wait 0x0078
-_0807EB28 0x1505
-_0807EA94 
-SetLocalFlag 0x007d
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+	CheckLocalFlag 0x007d
+	JumpIf script_08013FE0
+script_08013FA4:
+	StopScript 
+	StartScript 
+	CheckInventory1 0x0003
+	JumpIfNot script_08013FA4
+	CheckPlayerFlags 0x00400000
+	JumpIfNot script_08013FA4
+	StopScript 
+	Call sub_0807FA40
+	_0807E888 
+	Call sub_0807DF38
+	Wait 0x0078
+	_0807EB28 0x1505
+	_0807EA94 
+	SetLocalFlag 0x007d
+	Call sub_0807DF50
+	_0807E878 
+script_08013FE0:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc
index 55c53873..52526efd 100644
--- a/data/scripts/script_08013FE8.inc
+++ b/data/scripts/script_08013FE8.inc
@@ -1,30 +1,32 @@
 SCRIPT_START script_08013FE8
-StartScript 
-_0807EF80 0x0008
-StopScript 
-StopScript 
-StartScript 
-CheckLocalFlag 0x007d
-JumpIf 0x0052
-CheckLocalFlag 0x007a
-JumpIfNot 0xffee
-CheckInventory1 0x0003
-JumpIfNot 0xffe6
-CallWithArg sub_0807F6B4, 0x000000d0
-JumpIfNot 0xffd8
-StopScript 
-Call sub_0807F9A4
-StartScript 
-_0807E864 
-Call sub_0807DF28
-StopScript 
-_0807EB28 0x1508
-_0807EA94 
-StartPlayerScript script_08010A14
-WaitForSomething2 0x00000001
-Call sub_0807DF50
-_0807E878 
-Jump 0xffa6
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+script_08013FF0:
+	StopScript 
+	StartScript 
+	CheckLocalFlag 0x007d
+	JumpIf script_0801404C
+	CheckLocalFlag 0x007a
+	JumpIfNot script_08013FF0
+	CheckInventory1 0x0003
+	JumpIfNot script_08013FF0
+	CallWithArg sub_0807F6B4, 0x000000d0
+	JumpIfNot script_08013FF0
+	StopScript 
+	Call sub_0807F9A4
+	StartScript 
+	_0807E864 
+	Call sub_0807DF28
+	StopScript 
+	_0807EB28 0x1508
+	_0807EA94 
+	StartPlayerScript script_08010A14
+	WaitForSomething2 0x00000001
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08013FF0
+script_0801404C:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc
index e6234ea6..9e5c3776 100644
--- a/data/scripts/script_08014054.inc
+++ b/data/scripts/script_08014054.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014054
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0000
-Call sub_0807F738
-StopScript 
-WaitForSomething 0x00000040
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0000
+	Call sub_0807F738
+	StopScript 
+	WaitForSomething 0x00000040
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc
index c9a3a40e..cec22a8a 100644
--- a/data/scripts/script_08014074.inc
+++ b/data/scripts/script_08014074.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014074
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0001
-Call sub_0807F738
-StopScript 
-WaitForSomething 0x00000040
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0001
+	Call sub_0807F738
+	StopScript 
+	WaitForSomething 0x00000040
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc
index 68a9d64b..de27e295 100644
--- a/data/scripts/script_08014094.inc
+++ b/data/scripts/script_08014094.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014094
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0002
-Call sub_0807F738
-SetEntityPosition 0x0000, 0xfff0
-StopScript 
-WaitForSomething 0x00000040
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0002
+	Call sub_0807F738
+	SetEntityPosition 0x0000, 0xfff0
+	StopScript 
+	WaitForSomething 0x00000040
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc
index a43f3347..9586896b 100644
--- a/data/scripts/script_080140B8.inc
+++ b/data/scripts/script_080140B8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080140B8
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0003
-Call sub_0807F738
-SetEntityPosition 0x0000, 0xfff0
-StopScript 
-WaitForSomething 0x00000040
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0003
+	Call sub_0807F738
+	SetEntityPosition 0x0000, 0xfff0
+	StopScript 
+	WaitForSomething 0x00000040
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc
index 5f3efa8f..0dcfc894 100644
--- a/data/scripts/script_080140DC.inc
+++ b/data/scripts/script_080140DC.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_080140DC
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0004
-StopScript 
-WaitForSomething2 0x00000200
-_0807E930 0x0008
-Call sub_0807F2D4
-_0807E930 0x000c
-_0807E5F8 0x00002000
-WaitForSomething 0x00000020
-_0807E930 0x0010
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0004
+	StopScript 
+	WaitForSomething2 0x00000200
+	_0807E930 0x0008
+	Call sub_0807F2D4
+	_0807E930 0x000c
+	_0807E5F8 0x00002000
+	WaitForSomething 0x00000020
+	_0807E930 0x0010
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc
index 72bb7d44..30148b13 100644
--- a/data/scripts/script_08014118.inc
+++ b/data/scripts/script_08014118.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_08014118
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0005
-StopScript 
-WaitForSomething2 0x00000400
-_0807E930 0x0009
-Call sub_0807F2D4
-_0807E930 0x000d
-_0807E5F8 0x00004000
-WaitForSomething 0x00000020
-_0807E930 0x0011
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0005
+	StopScript 
+	WaitForSomething2 0x00000400
+	_0807E930 0x0009
+	Call sub_0807F2D4
+	_0807E930 0x000d
+	_0807E5F8 0x00004000
+	WaitForSomething 0x00000020
+	_0807E930 0x0011
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc
index b5cda454..a8845394 100644
--- a/data/scripts/script_08014154.inc
+++ b/data/scripts/script_08014154.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_08014154
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0006
-SetEntityPosition 0x0000, 0xfff0
-StopScript 
-WaitForSomething2 0x00000800
-_0807E930 0x000a
-Call sub_0807F2D4
-_0807E930 0x000e
-_0807E5F8 0x00008000
-WaitForSomething 0x00000020
-_0807E930 0x0012
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0006
+	SetEntityPosition 0x0000, 0xfff0
+	StopScript 
+	WaitForSomething2 0x00000800
+	_0807E930 0x000a
+	Call sub_0807F2D4
+	_0807E930 0x000e
+	_0807E5F8 0x00008000
+	WaitForSomething 0x00000020
+	_0807E930 0x0012
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc
index 210eb704..fcccb52d 100644
--- a/data/scripts/script_08014198.inc
+++ b/data/scripts/script_08014198.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_08014198
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0007
-SetEntityPosition 0x0000, 0xfff0
-StopScript 
-WaitForSomething2 0x00001000
-_0807E930 0x000b
-Call sub_0807F2D4
-_0807E930 0x000f
-_0807E5F8 0x00010000
-WaitForSomething 0x00000020
-_0807E930 0x0013
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0007
+	SetEntityPosition 0x0000, 0xfff0
+	StopScript 
+	WaitForSomething2 0x00001000
+	_0807E930 0x000b
+	Call sub_0807F2D4
+	_0807E930 0x000f
+	_0807E5F8 0x00010000
+	WaitForSomething 0x00000020
+	_0807E930 0x0013
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc
index 169fe792..bec09d97 100644
--- a/data/scripts/script_080141DC.inc
+++ b/data/scripts/script_080141DC.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_080141DC
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0014
-Call sub_0807F714
-CallWithArg sub_0807F994, 0x0000fffc
-StopScript 
-WaitForSomething 0x00000020
-Wait 0x0078
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0014
+	Call sub_0807F714
+	CallWithArg sub_0807F994, 0x0000fffc
+	StopScript 
+	WaitForSomething 0x00000020
+	Wait 0x0078
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc
index c1f211b5..912c58e2 100644
--- a/data/scripts/script_08014210.inc
+++ b/data/scripts/script_08014210.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08014210
-StartScript 
-_0807EF80 0x0007
-_0807E930 0x0015
-Call sub_0807F714
-Call sub_0807F714
-CallWithArg sub_0807F994, 0x0000fffc
-StopScript 
-WaitForSomething 0x00000020
-Wait 0x0078
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807E930 0x0015
+	Call sub_0807F714
+	Call sub_0807F714
+	CallWithArg sub_0807F994, 0x0000fffc
+	StopScript 
+	WaitForSomething 0x00000020
+	Wait 0x0078
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index 9517e0be..ab60a23f 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -1,26 +1,30 @@
 SCRIPT_START script_08014248
-TestBit 0x00020000
-JumpIf 0x0014
-Wait 0x0008
-CallWithArg sub_08095EAC, 0x00000000
-Jump 0xffe6
-CallWithArg sub_08095EAC, 0x00000001
-Jump 0xfff4
-.short 0x0000
-StartScript 
-_0807EF80 0x0008
-StopScript 
-CheckLocalFlag 0x0078
-JumpIfNot 0xfffa
-StartScript 
-Call sub_0807F934
-CallWithArg sub_0806DA04, 0x00000008
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-TextboxNoOverlapFollowPos 0x000c0647
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
+script_08014248:
+	TestBit 0x00020000
+	JumpIf script_08014264
+	Wait 0x0008
+	CallWithArg sub_08095EAC, 0x00000000
+	Jump script_08014248
+script_08014264:
+	CallWithArg sub_08095EAC, 0x00000001
+	Jump script_08014264
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x0008
+	StopScript 
+script_0801427C:
+	CheckLocalFlag 0x0078
+	JumpIfNot script_0801427C
+	StartScript 
+	Call sub_0807F934
+	CallWithArg sub_0806DA04, 0x00000008
+	StopScript 
+script_08014298:
+	CheckEntityInteractType 
+	JumpIfNot script_08014298
+	_0807E864 
+	TextboxNoOverlapFollowPos 0x000c0647
+	_0807EA94 
+	_0807E878 
+	Jump script_08014298
+	.short 0x0000
diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc
index c6eaee65..53bd4bf9 100644
--- a/data/scripts/script_080142B0.inc
+++ b/data/scripts/script_080142B0.inc
@@ -1,60 +1,63 @@
 SCRIPT_START script_080142B0
-StartScript 
-CheckLocalFlag 0x0054
-JumpIf 0x00ca
-CheckLocalFlag 0x0053
-JumpIf 0x0070
-StopScript 
-StopScript 
-StartScript 
-_0807E564 
-JumpIfNot 0xfff8
-CheckPlayerInRegion 0x0098, 0x0058, 0x1818
-JumpIfNot 0xffec
-StopScript 
-_0807E864 
-SetLocalFlag 0x0053
-Wait 0x0014
-_0807E908 0x0004
-Call sub_080654DC
-Wait 0x001e
-_0807E930 0x0001
-Wait 0x000a
-_0807E930 0x0003
-Wait 0x000a
-_0807E930 0x0001
-Wait 0x000a
-_0807E930 0x0003
-Wait 0x000a
-_0807E930 0x0002
-Wait 0x001e
-TextboxNoOverlap 0x2c12
-_0807EA94 
-Wait 0x0014
-_0807E930 0x0004
-_0807E878 
-_0807E908 0x0001
-StopScript 
-StartScript 
-_0807E564 
-JumpIf 0xfff8
-EntityHasHeight 
-JumpIf 0xfff2
-CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
-JumpIfNot 0xffe6
-StopScript 
-_0807E864 
-SetLocalFlag 0x0054
-Wait 0x005a
-_0807E908 0x0004
-Call sub_080654EC
-Wait 0x001e
-_0807E930 0x0001
-Wait 0x001e
-TextboxNoOverlap 0x2c13
-_0807EA94 
-Wait 0x0014
-_0807E930 0x0004
-_0807E908 0x0001
-_0807E878 
+	StartScript 
+	CheckLocalFlag 0x0054
+	JumpIf script_08014382
+	CheckLocalFlag 0x0053
+	JumpIf script_08014330
+	StopScript 
+script_080142C4:
+	StopScript 
+	StartScript 
+	_0807E564 
+	JumpIfNot script_080142C4
+	CheckPlayerInRegion 0x0098, 0x0058, 0x1818
+	JumpIfNot script_080142C4
+	StopScript 
+	_0807E864 
+	SetLocalFlag 0x0053
+	Wait 0x0014
+	_0807E908 0x0004
+	Call sub_080654DC
+	Wait 0x001e
+	_0807E930 0x0001
+	Wait 0x000a
+	_0807E930 0x0003
+	Wait 0x000a
+	_0807E930 0x0001
+	Wait 0x000a
+	_0807E930 0x0003
+	Wait 0x000a
+	_0807E930 0x0002
+	Wait 0x001e
+	TextboxNoOverlap 0x2c12
+	_0807EA94 
+	Wait 0x0014
+	_0807E930 0x0004
+	_0807E878 
+	_0807E908 0x0001
+script_08014330:
+	StopScript 
+	StartScript 
+	_0807E564 
+	JumpIf script_08014330
+	EntityHasHeight 
+	JumpIf script_08014330
+	CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
+	JumpIfNot script_08014330
+	StopScript 
+	_0807E864 
+	SetLocalFlag 0x0054
+	Wait 0x005a
+	_0807E908 0x0004
+	Call sub_080654EC
+	Wait 0x001e
+	_0807E930 0x0001
+	Wait 0x001e
+	TextboxNoOverlap 0x2c13
+	_0807EA94 
+	Wait 0x0014
+	_0807E930 0x0004
+	_0807E908 0x0001
+	_0807E878 
+script_08014382:
 SCRIPT_END
diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc
index aef41a86..6fb0f6f0 100644
--- a/data/scripts/script_08014384.inc
+++ b/data/scripts/script_08014384.inc
@@ -1,21 +1,22 @@
 SCRIPT_START script_08014384
-StopScript 
-_0807E864 
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x001e
-Wait 0x001e
-Call sub_08065370
-JumpIfNot 0x0010
-Wait 0x003c
-_0807EA94 
-_0807EB8C 
-Wait 0x001e
-TextboxNoOverlapVar 
-_0807EA94 
-Wait 0x001e
-_0807E930 0x0004
-_0807E908 0x0001
-_0807E878 
+	StopScript 
+	_0807E864 
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_080143AC
+	Wait 0x001e
+	Call sub_08065370
+	JumpIfNot script_080143AC
+	Wait 0x003c
+	_0807EA94 
+	_0807EB8C 
+	Wait 0x001e
+	TextboxNoOverlapVar 
+script_080143AC:
+	_0807EA94 
+	Wait 0x001e
+	_0807E930 0x0004
+	_0807E908 0x0001
+	_0807E878 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc
index 1029c85a..0ca9df4c 100644
--- a/data/scripts/script_080143C0.inc
+++ b/data/scripts/script_080143C0.inc
@@ -1,37 +1,39 @@
 SCRIPT_START script_080143C0
-StopScript 
-_0807E864 
-Call sub_0807DF28
-Call sub_080654FC
-_0807E930 0x0001
-Call sub_080654EC
-Wait 0x003c
-TextboxNoOverlap 0x2c16
-_0807EA94 
-_0807E3E8 
-JumpIf 0x0012
-_0807E914 0x00000002
-Call sub_08065528
-Jump 0x0046
-Call sub_080654EC
-Wait 0x001e
-TextboxNoOverlap 0x2c18
-_0807EA94 
-Wait 0x000a
-_0807E914 0x00000000
-Call sub_08065528
-_0807F034 0x0036
-WaitPlayerAction8 
-TextboxNoOverlap 0x2c19
-_0807EA94 
-_0807E914 0x00000303
-Call sub_0807F420
-Wait 0x001e
-_0807EB8C 
-TextboxNoOverlap 0x2c22
-_0807EA94 
-_0807E930 0x0004
-_0807E908 0x0001
-Call sub_0807DF50
-_0807E878 
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_080654FC
+	_0807E930 0x0001
+	Call sub_080654EC
+	Wait 0x003c
+	TextboxNoOverlap 0x2c16
+	_0807EA94 
+	_0807E3E8 
+	JumpIf script_080143FA
+	_0807E914 0x00000002
+	Call sub_08065528
+	Jump script_0801443E
+script_080143FA:
+	Call sub_080654EC
+	Wait 0x001e
+	TextboxNoOverlap 0x2c18
+	_0807EA94 
+	Wait 0x000a
+	_0807E914 0x00000000
+	Call sub_08065528
+	_0807F034 0x0036
+	WaitPlayerAction8 
+	TextboxNoOverlap 0x2c19
+	_0807EA94 
+	_0807E914 0x00000303
+	Call sub_0807F420
+	Wait 0x001e
+	_0807EB8C 
+	TextboxNoOverlap 0x2c22
+	_0807EA94 
+script_0801443E:
+	_0807E930 0x0004
+	_0807E908 0x0001
+	Call sub_0807DF50
+	_0807E878 
 SCRIPT_END
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index c0284446..8a8db693 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -1,52 +1,59 @@
 SCRIPT_START script_08014450
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-SetEntityNonPlanarMovement 0x01c0
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807E930 0x0008
-Wait 0x0020
-_0807E930 0x0002
-TextboxNoOverlapFollow 0x4202
-TextboxNoOverlapFollow 0x4203
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x006c
-_0807EF80 0x0001
-Wait 0x008c
-_0807EF80 0x0000
-HasRupees 0x000a
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x4204
-Jump 0x005c
-Call sub_0806E250
-JumpIfNot 0x000e
-TextboxNoOverlapFollow 0x420b
-_0807EB38 
-_0807E078 0x0004, 0x000a
-ClearLocalFlag 0x0093
-Jump 0x000a
-SetLocalFlag 0x0093
-SetLocalFlag 0x00d3
-ModRupees 0xfff6
-TextboxNoOverlapFollow 0x420c
-SoundReq 0x010c
-Wait 0x0018
-SetRoomFlag 0x0000
-SetLocalFlag 0x0092
-_0807EEF4 0x0000, 0xffa0
-Call sub_0807DF38
-Jump 0x000e
-_0807E930 0x0009
-Wait 0x003c
-_0807E930 0x0002
-_0807E878 
-CheckRoomFlag 0x0000
-JumpIfNot 0xff5e
-_0807E9DC 
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0000
+	SetEntityNonPlanarMovement 0x01c0
+	_0807EF80 0x000a
+	StopScript 
+script_08014462:
+	_0807E30C 
+	JumpIfNot script_08014462
+	_0807E864 
+	_0807E930 0x0008
+	Wait 0x0020
+	_0807E930 0x0002
+	TextboxNoOverlapFollow 0x4202
+	TextboxNoOverlapFollow 0x4203
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_080144F0
+	_0807EF80 0x0001
+	Wait 0x008c
+	_0807EF80 0x0000
+	HasRupees 0x000a
+	JumpIf script_080144A2
+	TextboxNoOverlapFollow 0x4204
+	Jump script_080144FC
+script_080144A2:
+	Call sub_0806E250
+	JumpIfNot script_080144B8
+	TextboxNoOverlapFollow 0x420b
+	_0807EB38 
+	JumpSwitch script_080144B8, script_080144C0
+script_080144B8:
+	ClearLocalFlag 0x0093
+	Jump script_080144C8
+script_080144C0:
+	SetLocalFlag 0x0093
+	SetLocalFlag 0x00d3
+script_080144C8:
+	ModRupees 0xfff6
+	TextboxNoOverlapFollow 0x420c
+	SoundReq 0x010c
+	Wait 0x0018
+	SetRoomFlag 0x0000
+	SetLocalFlag 0x0092
+	_0807EEF4 0x0000, 0xffa0
+	Call sub_0807DF38
+	Jump script_080144FC
+script_080144F0:
+	_0807E930 0x0009
+	Wait 0x003c
+	_0807E930 0x0002
+script_080144FC:
+	_0807E878 
+	CheckRoomFlag 0x0000
+	JumpIfNot script_08014462
+	_0807E9DC 
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc
index 8c771a51..9b0cb2ac 100644
--- a/data/scripts/script_0801450C.inc
+++ b/data/scripts/script_0801450C.inc
@@ -1,34 +1,35 @@
 SCRIPT_START script_0801450C
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-SetEntityNonPlanarMovement 0x01c0
-_0807EF80 0x000a
-StopScript 
-_0807E864 
-Call sub_0807DF28
-Call sub_0806E20C
-_0807EA94 
-Call sub_0806E23C
-ClearLocalFlag 0x0093
-ClearLocalFlag 0x0092
-Call sub_0807DF50
-Jump 0xffb8
-.short 0x0000
-StartScript 
-StopScript 
-CheckPlayerInRegion 0x0078, 0x0088, 0x0810
-JumpIfNot 0xfff6
-CheckRoomFlag 0x0000
-JumpIfNot 0xffee
-_0807E864 
-_0807EB28 0x4217
-_0807EA94 
-StartPlayerScript script_08014588
-Wait 0x0010
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E878 
-Jump 0xffca
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0000
+	SetEntityNonPlanarMovement 0x01c0
+	_0807EF80 0x000a
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	Call sub_0806E20C
+	_0807EA94 
+	Call sub_0806E23C
+	ClearLocalFlag 0x0093
+	ClearLocalFlag 0x0092
+	Call sub_0807DF50
+	Jump script_080144FC
+	.short 0x0000
+	StartScript 
+	StopScript 
+script_0801454C:
+	CheckPlayerInRegion 0x0078, 0x0088, 0x0810
+	JumpIfNot script_0801454C
+	CheckRoomFlag 0x0000
+	JumpIfNot script_0801454C
+	_0807E864 
+	_0807EB28 0x4217
+	_0807EA94 
+	StartPlayerScript script_08014588
+	Wait 0x0010
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807E878 
+	Jump script_0801454C
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc
index bba76a7e..07ce3e88 100644
--- a/data/scripts/script_08014588.inc
+++ b/data/scripts/script_08014588.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014588
-StopScript 
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x00e0
-_0807EDD4 0x0078, 0x0078
-_0807EF80 0x0000
-Wait 0x0010
-_0807E5F8 0x00000002
-Call sub_0807921C
+	StopScript 
+	WaitForSomething2 0x00000001
+	SetEntityNonPlanarMovement 0x00e0
+	_0807EDD4 0x0078, 0x0078
+	_0807EF80 0x0000
+	Wait 0x0010
+	_0807E5F8 0x00000002
+	Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc
index aa014d27..3344387e 100644
--- a/data/scripts/script_080145B0.inc
+++ b/data/scripts/script_080145B0.inc
@@ -1,18 +1,20 @@
 SCRIPT_START script_080145B0
-StartScript 
-SetEntityPositionRelative 0x00e001f8
-CheckLocalFlag 0x005e
-JumpIf 0x0026
-StopScript 
-CheckRoomFlag 0x0005
-JumpIfNot 0xfffa
-_0807E864 
-ClearRoomFlag 0x0005
-Wait 0x000c
-_0807EB8C 
-TextboxNoOverlapFollowPos 0x000c432e
-_0807EA94 
-_0807E878 
-Jump 0xffe0
-StopScript 
+	StartScript 
+	SetEntityPositionRelative 0x00e001f8
+	CheckLocalFlag 0x005e
+	JumpIf script_080145E4
+	StopScript 
+script_080145C2:
+	CheckRoomFlag 0x0005
+	JumpIfNot script_080145C2
+	_0807E864 
+	ClearRoomFlag 0x0005
+	Wait 0x000c
+	_0807EB8C 
+	TextboxNoOverlapFollowPos 0x000c432e
+	_0807EA94 
+	_0807E878 
+	Jump script_080145C2
+script_080145E4:
+	StopScript 
 SCRIPT_END
diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc
index c8d49369..0cab3269 100644
--- a/data/scripts/script_080145E8.inc
+++ b/data/scripts/script_080145E8.inc
@@ -1,127 +1,146 @@
 SCRIPT_START script_080145E8
-StartScript 
-_0807EF80 0x0008
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807DF28
-CheckRoomFlag 0x0004
-JumpIf 0xfffa
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-Call sub_0807DF50
-_0807E878 
-Jump 0xffd2
-StartScript 
-_0807E9D4 
-_0807EB44 0x0004
-SetEntityDirection 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIf 0x0062
-TestBit 0x00000004
-JumpIf 0x0132
-CheckRoomFlag 0x0004
-JumpIf 0x0022
-Call sub_0808861C
-JumpIfNot 0xffe0
-CheckLocalFlag 0x005e
-JumpIf 0x003e
-_0807E864 
-_0807EB8C 
-TextboxNoOverlapFollowPos 0x000c432b
-Jump 0x015e
-Call sub_08088658
-JumpIfNot 0xffc0
-_0807E864 
-_0807EB28 0x431f
-_0807EA94 
-StartPlayerScript script_080147DC
-Wait 0x0010
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807E878 
-Jump 0xff9c
-_0807E864 
-_0807E930 0x0008
-Wait 0x0010
-_0807EB8C 
-Wait 0x0010
-_0807E930 0x0002
-CheckGlobalFlag 0x0059
-JumpIfNot 0x000c
-TextboxNoOverlapFollowPos 0x000c432f
-Jump 0x010a
-CheckRoomFlag 0x0004
-JumpIf 0x0028
-CheckLocalFlag 0x005e
-JumpIfNot 0x002a
-CheckRoomFlag 0x0006
-JumpIf 0x0052
-CheckLocalFlag 0x005f
-JumpIf 0x003c
-Call sub_08088574
-SetRoomFlag 0x0009
-Jump 0x004a
-TextboxNoOverlapFollowPos 0x000c431e
-Jump 0x00d2
-SetRoomFlag 0x0009
-SetLocalFlag 0x005c
-TextboxNoOverlapFollowPos 0x000c4305
-_0807EA94 
-_0807E3BC 0x0001
-JumpIfNot 0x00b0
-TextboxNoOverlapFollowPos 0x000c4306
-Jump 0x001e
-SetRoomFlag 0x0009
-Call sub_08088504
-Jump 0x0010
-SetRoomFlag 0x0009
-ClearRoomFlag 0x0006
-Call sub_08088544
-_0807E3E8 
-JumpIfNot 0x0030
-_0807EA94 
-_0807E3BC 0x0001
-JumpIfNot 0x007a
-SetRoomFlag 0x0001
-Wait 0x0014
-CheckRoomFlag 0x0003
-JumpIfNot 0xfffa
-ClearRoomFlag 0x0003
-_0807EA94 
-SetRoomFlag 0x0004
-TextboxNoOverlapFollowPos 0x000c431e
-Jump 0x0060
-SetRoomFlag 0x0009
-_0807EA94 
-Jump 0x0056
-CheckRoomFlag 0x0008
-JumpIf 0x0034
-CheckRoomFlag 0x0007
-JumpIf 0x001c
-Call sub_08088478
-_0807EA94 
-Call sub_080885B0
-WaitPlayerAction8 
-_0807E5F8 0x00000008
-Jump 0x002c
-_0807E930 0x0009
-Wait 0x003c
-_0807E930 0x0002
-Jump 0xffd8
-_0807E930 0x000a
-Wait 0x008c
-_0807E930 0x0002
-Jump 0xffc8
-SetRoomFlag 0x0009
-TextboxNoOverlapFollowPos 0x000c4307
-_0807EA94 
-Wait 0x0004
-_0807E878 
-Jump 0xfe62
-.short 0x0000
+	StartScript 
+	_0807EF80 0x0008
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_080145F8:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_080145F8
+	_0807E864 
+	Call sub_0807DF28
+script_08014608:
+	CheckRoomFlag 0x0004
+	JumpIf script_08014608
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_080145F8
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0004
+	SetEntityDirection 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0801463A:
+	_0807E30C 
+	JumpIf script_080146A0
+	TestBit 0x00000004
+	JumpIf script_0801477A
+	CheckRoomFlag 0x0004
+	JumpIf script_08014672
+	Call sub_0808861C
+	JumpIfNot script_0801463A
+	CheckLocalFlag 0x005e
+	JumpIf script_080146A0
+	_0807E864 
+	_0807EB8C 
+	TextboxNoOverlapFollowPos 0x000c432b
+	Jump script_080147CE
+script_08014672:
+	Call sub_08088658
+	JumpIfNot script_0801463A
+	_0807E864 
+	_0807EB28 0x431f
+	_0807EA94 
+	StartPlayerScript script_080147DC
+	Wait 0x0010
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807E878 
+	Jump script_0801463A
+script_080146A0:
+	_0807E864 
+	_0807E930 0x0008
+	Wait 0x0010
+	_0807EB8C 
+	Wait 0x0010
+	_0807E930 0x0002
+	CheckGlobalFlag 0x0059
+	JumpIfNot script_080146C6
+	TextboxNoOverlapFollowPos 0x000c432f
+	Jump script_080147CE
+script_080146C6:
+	CheckRoomFlag 0x0004
+	JumpIf script_080146F4
+	CheckLocalFlag 0x005e
+	JumpIfNot script_080146FE
+	CheckRoomFlag 0x0006
+	JumpIf script_0801472E
+	CheckLocalFlag 0x005f
+	JumpIf script_08014720
+	Call sub_08088574
+	SetRoomFlag 0x0009
+	Jump script_0801473C
+script_080146F4:
+	TextboxNoOverlapFollowPos 0x000c431e
+	Jump script_080147CE
+script_080146FE:
+	SetRoomFlag 0x0009
+	SetLocalFlag 0x005c
+	TextboxNoOverlapFollowPos 0x000c4305
+	_0807EA94 
+	_0807E3BC 0x0001
+	JumpIfNot script_080147C4
+	TextboxNoOverlapFollowPos 0x000c4306
+	Jump script_0801473C
+script_08014720:
+	SetRoomFlag 0x0009
+	Call sub_08088504
+	Jump script_0801473C
+script_0801472E:
+	SetRoomFlag 0x0009
+	ClearRoomFlag 0x0006
+	Call sub_08088544
+script_0801473C:
+	_0807E3E8 
+	JumpIfNot script_08014770
+	_0807EA94 
+	_0807E3BC 0x0001
+	JumpIfNot script_080147C4
+	SetRoomFlag 0x0001
+	Wait 0x0014
+script_08014754:
+	CheckRoomFlag 0x0003
+	JumpIfNot script_08014754
+	ClearRoomFlag 0x0003
+	_0807EA94 
+	SetRoomFlag 0x0004
+	TextboxNoOverlapFollowPos 0x000c431e
+	Jump script_080147CE
+script_08014770:
+	SetRoomFlag 0x0009
+	_0807EA94 
+	Jump script_080147CE
+script_0801477A:
+	CheckRoomFlag 0x0008
+	JumpIf script_080147B4
+	CheckRoomFlag 0x0007
+	JumpIf script_080147A4
+script_0801478A:
+	Call sub_08088478
+	_0807EA94 
+	Call sub_080885B0
+	WaitPlayerAction8 
+	_0807E5F8 0x00000008
+	Jump script_080147CE
+script_080147A4:
+	_0807E930 0x0009
+	Wait 0x003c
+	_0807E930 0x0002
+	Jump script_0801478A
+script_080147B4:
+	_0807E930 0x000a
+	Wait 0x008c
+	_0807E930 0x0002
+	Jump script_0801478A
+script_080147C4:
+	SetRoomFlag 0x0009
+	TextboxNoOverlapFollowPos 0x000c4307
+script_080147CE:
+	_0807EA94 
+	Wait 0x0004
+	_0807E878 
+	Jump script_0801463A
+	.short 0x0000
diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc
index 5bec229e..554da330 100644
--- a/data/scripts/script_080147DC.inc
+++ b/data/scripts/script_080147DC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080147DC
-StopScript 
-WaitForSomething2 0x00000002
-SetEntityNonPlanarMovement 0x00e0
-_0807EDD4 0x0078, 0x0068
-_0807EF80 0x0000
-Wait 0x0010
-_0807E5F8 0x00000001
-Call sub_0807921C
+	StopScript 
+	WaitForSomething2 0x00000002
+	SetEntityNonPlanarMovement 0x00e0
+	_0807EDD4 0x0078, 0x0068
+	_0807EF80 0x0000
+	Wait 0x0010
+	_0807E5F8 0x00000001
+	Call sub_0807921C
 SCRIPT_END
diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc
index 38ffe052..605bc6cf 100644
--- a/data/scripts/script_08014804.inc
+++ b/data/scripts/script_08014804.inc
@@ -1,87 +1,97 @@
 SCRIPT_START script_08014804
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E864 
-Call sub_0807DF38
-Wait 0x0010
-CheckLocalFlag 0x0093
-JumpIf 0x0092
-TextboxNoOverlapFollowPos 0x000c4215
-_0807E878 
-TestBit 0x00000001
-JumpIf 0x002c
-TestBit 0x00000004
-JumpIf 0x0038
-_0807E30C 
-JumpIfNot 0xffe8
-_0807E864 
-_0807E930 0x0008
-Wait 0x0020
-_0807E930 0x0002
-TextboxNoOverlapFollowPos 0x000c4215
-_0807E878 
-Jump 0xffce
-_0807E930 0x0008
-Wait 0x0020
-_0807E930 0x0002
-_0807E5F8 0x00000002
-Jump 0xffb8
-_0807E930 0x0009
-Wait 0x003c
-_0807E930 0x0002
-_0807E5F8 0x00000008
-Jump 0xffa2
-TestBit 0x00000001
-JumpIf 0x002c
-TestBit 0x00000004
-JumpIf 0x0038
-_0807E30C 
-JumpIfNot 0xffe8
-_0807E864 
-_0807E930 0x0008
-Wait 0x0020
-_0807E930 0x0002
-TextboxNoOverlapFollowPos 0x000c4216
-_0807E878 
-Jump 0xffce
-_0807E930 0x0008
-Wait 0x0020
-_0807E930 0x0002
-_0807E5F8 0x00000002
-Jump 0xffb8
-_0807E930 0x0009
-Wait 0x003c
-_0807E930 0x0002
-_0807E5F8 0x00000008
-Jump 0xffa2
-.short 0x0000
-StartScript 
-StopScript 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-ClearRoomFlag 0x0000
-Call sub_0806E140
-JumpIfNot 0x002a
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0028
-_0807E864 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Call sub_0806E1E0
-_0807EA94 
-Wait 0x0018
-_0807E878 
-Jump 0xffc4
-_0807EA94 
-Jump 0x0002
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-Call sub_0806E1FC
-Wait 0x001e
-Call sub_0807DF50
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0000
+	_0807EF80 0x000a
+	StopScript 
+	_0807E864 
+	Call sub_0807DF38
+	Wait 0x0010
+	CheckLocalFlag 0x0093
+	JumpIf script_080148B6
+	TextboxNoOverlapFollowPos 0x000c4215
+	_0807E878 
+script_0801482E:
+	TestBit 0x00000001
+	JumpIf script_08014862
+	TestBit 0x00000004
+	JumpIf script_08014878
+	_0807E30C 
+	JumpIfNot script_0801482E
+	_0807E864 
+	_0807E930 0x0008
+	Wait 0x0020
+	_0807E930 0x0002
+	TextboxNoOverlapFollowPos 0x000c4215
+	_0807E878 
+	Jump script_0801482E
+script_08014862:
+	_0807E930 0x0008
+	Wait 0x0020
+	_0807E930 0x0002
+	_0807E5F8 0x00000002
+	Jump script_0801482E
+script_08014878:
+	_0807E930 0x0009
+	Wait 0x003c
+	_0807E930 0x0002
+	_0807E5F8 0x00000008
+	Jump script_0801482E
+script_0801488E:
+	TestBit 0x00000001
+	JumpIf script_080148C2
+	TestBit 0x00000004
+	JumpIf script_080148D8
+	_0807E30C 
+	JumpIfNot script_0801488E
+	_0807E864 
+	_0807E930 0x0008
+	Wait 0x0020
+	_0807E930 0x0002
+script_080148B6:
+	TextboxNoOverlapFollowPos 0x000c4216
+	_0807E878 
+	Jump script_0801488E
+script_080148C2:
+	_0807E930 0x0008
+	Wait 0x0020
+	_0807E930 0x0002
+	_0807E5F8 0x00000002
+	Jump script_0801488E
+script_080148D8:
+	_0807E930 0x0009
+	Wait 0x003c
+	_0807E930 0x0002
+	_0807E5F8 0x00000008
+	Jump script_0801488E
+	.short 0x0000
+	StartScript 
+	StopScript 
+script_080148F4:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_080148F4
+	ClearRoomFlag 0x0000
+	Call sub_0806E140
+	JumpIfNot script_08014932
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08014938
+	_0807E864 
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Call sub_0806E1E0
+	_0807EA94 
+	Wait 0x0018
+	_0807E878 
+	Jump script_080148F4
+script_08014932:
+	_0807EA94 
+	Jump script_08014938
+script_08014938:
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	Call sub_0806E1FC
+	Wait 0x001e
+	Call sub_0807DF50
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc
index 78024f4e..e175c1b4 100644
--- a/data/scripts/script_08014958.inc
+++ b/data/scripts/script_08014958.inc
@@ -1,35 +1,39 @@
 SCRIPT_START script_08014958
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-CheckGlobalFlag 0x0058
-JumpIf 0x000c
-_0807EB44 0x0004
-SetEntityPositionRelative 0x01280078
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-CheckGlobalFlag 0x0058
-JumpIfNot 0x0020
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-_0807EF80 0x0006
+	StartScript 
+	Call sub_0806C870
+	_0807EF80 0x000a
+	CheckGlobalFlag 0x0058
+	JumpIf script_08014976
+	_0807EB44 0x0004
+	SetEntityPositionRelative 0x01280078
+script_08014976:
+	StopScript 
+script_08014978:
+	_0807E30C 
+	JumpIfNot script_08014978
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08014978
+	StartScript 
+	Call sub_0806C870
+	_0807EF80 0x000a
+	CheckGlobalFlag 0x0058
+	JumpIfNot script_080149C6
+	StopScript 
+script_080149AA:
+	_0807E30C 
+	JumpIfNot script_080149AA
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_080149AA
+script_080149C6:
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc
index cbab30aa..7d4d8505 100644
--- a/data/scripts/script_080149CC.inc
+++ b/data/scripts/script_080149CC.inc
@@ -1,55 +1,59 @@
 SCRIPT_START script_080149CC
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-CheckLocalFlag 0x0064
-JumpIfNot 0x002a
-CheckLocalFlag 0x00b1
-JumpIf 0x0022
-SetLocalFlag 0x00b1
-_0807EF80 0x000b
-_0807EF80 0x0001
-_0807EDD4 0x0068, 0x00f8
-SoundReq 0x0072
-_0807EB74 
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E878 
-Jump 0xffba
-.short 0x0000
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffe6
-.short 0x0000
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	Call sub_0806C870
+	_0807EF80 0x000a
+	StopScript 
+script_080149DE:
+	_0807E30C 
+	JumpIfNot script_080149DE
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	CheckLocalFlag 0x0064
+	JumpIfNot script_08014A20
+	CheckLocalFlag 0x00b1
+	JumpIf script_08014A20
+	SetLocalFlag 0x00b1
+	_0807EF80 0x000b
+	_0807EF80 0x0001
+	_0807EDD4 0x0068, 0x00f8
+	SoundReq 0x0072
+	_0807EB74 
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+script_08014A20:
+	_0807E878 
+	Jump script_080149DE
+	.short 0x0000
+	StartScript 
+	Call sub_0806C870
+	_0807EF80 0x000a
+	StopScript 
+script_08014A36:
+	_0807E30C 
+	JumpIfNot script_08014A36
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08014A36
+	.short 0x0000
+	StartScript 
+	Call sub_0806C870
+	_0807EF80 0x000a
+	StopScript 
+script_08014A62:
+	_0807E30C 
+	JumpIfNot script_08014A62
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08014A62
+	.short 0x0000
diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc
index 90ff005f..ff644ca7 100644
--- a/data/scripts/script_08014A80.inc
+++ b/data/scripts/script_08014A80.inc
@@ -1,43 +1,47 @@
 SCRIPT_START script_08014A80
-StartScript 
-_0807EF80 0x000a
-StopScript 
-WaitForSomething2 0x00000001
-_0807EB74 
-_0807EF80 0x0004
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-TextboxNoOverlap 0x2f0a
-_0807EA94 
-_0807E5F8 0x00000002
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2f0a
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
-StartScript 
-Call sub_0806C870
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-StartPlayerScript script_08014B10
-WaitForSomething2 0x00000001
-_0807EB74 
-CheckLocalFlag 0x0064
-JumpIf 0x000e
-SetLocalFlag 0x0064
-TextboxNoOverlap 0x2f0b
-Jump 0x0006
-TextboxNoOverlap 0x2f0c
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffc6
-.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	StopScript 
+	WaitForSomething2 0x00000001
+	_0807EB74 
+	_0807EF80 0x0004
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	TextboxNoOverlap 0x2f0a
+	_0807EA94 
+	_0807E5F8 0x00000002
+script_08014AAC:
+	_0807E30C 
+	JumpIfNot script_08014AAC
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x2f0a
+	_0807EA94 
+	_0807E878 
+	Jump script_08014AAC
+	.short 0x0000
+	StartScript 
+	Call sub_0806C870
+	_0807EF80 0x000a
+	StopScript 
+script_08014AD2:
+	_0807E30C 
+	JumpIfNot script_08014AD2
+	_0807E864 
+	_0807EB74 
+	StartPlayerScript script_08014B10
+	WaitForSomething2 0x00000001
+	_0807EB74 
+	CheckLocalFlag 0x0064
+	JumpIf script_08014AFE
+	SetLocalFlag 0x0064
+	TextboxNoOverlap 0x2f0b
+	Jump script_08014B02
+script_08014AFE:
+	TextboxNoOverlap 0x2f0c
+script_08014B02:
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08014AD2
+	.short 0x0000
diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc
index efa971bf..381bb6fb 100644
--- a/data/scripts/script_08014B10.inc
+++ b/data/scripts/script_08014B10.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014B10
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EDD4 0x0078, 0x0040
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EDD4 0x0078, 0x0040
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc
index 8d7354c8..974af618 100644
--- a/data/scripts/script_08014B34.inc
+++ b/data/scripts/script_08014B34.inc
@@ -1,117 +1,130 @@
 SCRIPT_START script_08014B34
-StartScript 
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-CheckLocalFlag 0x0063
-JumpIf 0x00a2
-StopScript 
-StartScript 
-CheckRoomFlag 0x0000
-JumpIf 0x001e
-CheckEntityInteractType 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x2f01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffda
-StopScript 
-_0807E864 
-Call sub_0807DF28
-_0807E5F8 0x00000001
-_0807EF80 0x0004
-WaitForSomething2 0x00000002
-_0807E930 0x0010
-Call sub_0806CCF8
-Wait 0x0014
-Call sub_0806CD04
-Wait 0x0014
-Call sub_0806CD14
-Wait 0x0014
-Call sub_0806CD20
-Wait 0x0014
-Call sub_0806CD30
-Wait 0x0014
-Call sub_0806CD3C
-Wait 0x0014
-Call sub_0806CD4C
-SoundReq 0x0072
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Call sub_0807DF50
-_0807E878 
-_0807E930 0x0010
-Call sub_0806CD4C
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-CheckLocalFlag 0x0065
-JumpIf 0x001c
-SetLocalFlag 0x0065
-TextboxNoOverlap 0x2f07
-_0807EA94 
-_0807E914 0x00000064
-_0807F034 0x003f
-WaitPlayerAction8 
-Jump 0x0008
-TextboxNoOverlap 0x2f08
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffc8
-StartScript 
-Call sub_0806CD58
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E930 0x0006
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_0806CCD0
-JumpIfNot 0xfff8
-Call sub_0806CCB4
-JumpIfNot 0xfff8
-CheckLocalFlag 0x0066
-JumpIf 0x0016
-SetLocalFlag 0x0066
-TextboxNoOverlap 0x2f0d
-_0807EA94 
-_0807F034 0x000a
-WaitPlayerAction8 
-Jump 0x0008
-TextboxNoOverlap 0x2f09
-_0807EA94 
-Wait 0x000f
-_0807E878 
-_0807EB44 0x0004
-_0807E930 0x0006
-Jump 0xffb0
-StartScript 
-CheckGlobalFlag 0x0024
-JumpIf 0x0038
-Call sub_0806C870
-_0807EF80 0x000a
-_0807EF80 0x0000
-StopScript 
-StopScript 
-StartScript 
-CheckGlobalFlag 0x0024
-JumpIf 0x001c
-_0807E30C 
-JumpIfNot 0xfff0
-StopScript 
-_0807E864 
-_0807EB74 
-Call sub_0806C90C
-_0807EA94 
-_0807E878 
-Jump 0xffdc
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x000a
+	_0807E930 0x0000
+	StopScript 
+	CheckLocalFlag 0x0063
+	JumpIf script_08014BE8
+script_08014B48:
+	StopScript 
+	StartScript 
+	CheckRoomFlag 0x0000
+	JumpIf script_08014B70
+	CheckEntityInteractType 
+	JumpIfNot script_08014B48
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x2f01
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08014B48
+script_08014B70:
+	StopScript 
+	_0807E864 
+	Call sub_0807DF28
+	_0807E5F8 0x00000001
+	_0807EF80 0x0004
+	WaitForSomething2 0x00000002
+	_0807E930 0x0010
+	Call sub_0806CCF8
+	Wait 0x0014
+	Call sub_0806CD04
+	Wait 0x0014
+	Call sub_0806CD14
+	Wait 0x0014
+	Call sub_0806CD20
+	Wait 0x0014
+	Call sub_0806CD30
+	Wait 0x0014
+	Call sub_0806CD3C
+	Wait 0x0014
+	Call sub_0806CD4C
+	SoundReq 0x0072
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+script_08014BE8:
+	_0807E930 0x0010
+	Call sub_0806CD4C
+script_08014BF2:
+	CheckEntityInteractType 
+	JumpIfNot script_08014BF2
+	_0807E864 
+	CheckLocalFlag 0x0065
+	JumpIf script_08014C1C
+	SetLocalFlag 0x0065
+	TextboxNoOverlap 0x2f07
+	_0807EA94 
+	_0807E914 0x00000064
+	_0807F034 0x003f
+	WaitPlayerAction8 
+	Jump script_08014C22
+script_08014C1C:
+	TextboxNoOverlap 0x2f08
+	_0807EA94 
+script_08014C22:
+	Wait 0x000f
+	_0807E878 
+	Jump script_08014BF2
+	StartScript 
+	Call sub_0806CD58
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0006
+	StopScript 
+script_08014C42:
+	CheckEntityInteractType 
+	JumpIfNot script_08014C42
+	_0807E864 
+	_0807EB74 
+script_08014C4C:
+	Call sub_0806CCD0
+	JumpIfNot script_08014C4C
+script_08014C56:
+	Call sub_0806CCB4
+	JumpIfNot script_08014C56
+	CheckLocalFlag 0x0066
+	JumpIf script_08014C7C
+	SetLocalFlag 0x0066
+	TextboxNoOverlap 0x2f0d
+	_0807EA94 
+	_0807F034 0x000a
+	WaitPlayerAction8 
+	Jump script_08014C82
+script_08014C7C:
+	TextboxNoOverlap 0x2f09
+	_0807EA94 
+script_08014C82:
+	Wait 0x000f
+	_0807E878 
+	_0807EB44 0x0004
+	_0807E930 0x0006
+	Jump script_08014C42
+	StartScript 
+	CheckGlobalFlag 0x0024
+	JumpIf script_08014CD4
+	Call sub_0806C870
+	_0807EF80 0x000a
+	_0807EF80 0x0000
+	StopScript 
+script_08014CAE:
+	StopScript 
+	StartScript 
+	CheckGlobalFlag 0x0024
+	JumpIf script_08014CD4
+	_0807E30C 
+	JumpIfNot script_08014CAE
+	StopScript 
+	_0807E864 
+	_0807EB74 
+	Call sub_0806C90C
+	_0807EA94 
+	_0807E878 
+	Jump script_08014CAE
+script_08014CD4:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc
index dd6d926f..41a3ab83 100644
--- a/data/scripts/script_08014CDC.inc
+++ b/data/scripts/script_08014CDC.inc
@@ -1,57 +1,60 @@
 SCRIPT_START script_08014CDC
-StartScript 
-SetEntityNonPlanarMovement 0x0180
-_0807EF80 0x000a
-Call sub_08066D04
-Call sub_08066D14
-SetEntityPositionRelative 0x018001e8
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000001
-Call sub_08066E08
-_0807E864 
-TextboxNoOverlapFollowPos 0x000c1010
-_0807EA94 
-_0807E5F8 0x00000002
-StopScript 
-StartScript 
-CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
-JumpIfNot 0xfff2
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-TextboxNoOverlap 0x1012
-_0807EA94 
-_0807EC64 0x0040
-_0807EB44 0x0004
-Call sub_08066E08
-SetEntityPositionRelative 0x00c801f8
-Call sub_0807DF50
-_0807E878 
-CallWithArg sub_0807F6B4, 0x000000e8
-JumpIf 0xfff4
-_0807E864 
-Call sub_0807DF28
-TextboxNoOverlap 0x1013
-_0807EA94 
-_0807EC64 0x0040
-_0807EB44 0x0004
-_0807EF80 0x0000
-SetEntityPositionRelative 0x002801e8
-Call sub_0807DF50
-_0807E878 
-CheckPlayerInRegion 0x01f8, 0x0028, 0x2040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-TextboxNoOverlap 0x1014
-_0807EA94 
-_0807EC64 0x0018
-SetLocalFlag 0x006d
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0180
+	_0807EF80 0x000a
+	Call sub_08066D04
+	Call sub_08066D14
+	SetEntityPositionRelative 0x018001e8
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000001
+	Call sub_08066E08
+	_0807E864 
+	TextboxNoOverlapFollowPos 0x000c1010
+	_0807EA94 
+	_0807E5F8 0x00000002
+script_08014D1E:
+	StopScript 
+	StartScript 
+	CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
+	JumpIfNot script_08014D1E
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	TextboxNoOverlap 0x1012
+	_0807EA94 
+	_0807EC64 0x0040
+	_0807EB44 0x0004
+	Call sub_08066E08
+	SetEntityPositionRelative 0x00c801f8
+	Call sub_0807DF50
+	_0807E878 
+script_08014D60:
+	CallWithArg sub_0807F6B4, 0x000000e8
+	JumpIf script_08014D60
+	_0807E864 
+	Call sub_0807DF28
+	TextboxNoOverlap 0x1013
+	_0807EA94 
+	_0807EC64 0x0040
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	SetEntityPositionRelative 0x002801e8
+	Call sub_0807DF50
+	_0807E878 
+script_08014D96:
+	CheckPlayerInRegion 0x01f8, 0x0028, 0x2040
+	JumpIfNot script_08014D96
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	TextboxNoOverlap 0x1014
+	_0807EA94 
+	_0807EC64 0x0018
+	SetLocalFlag 0x006d
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc
index 7bdebcf1..a84cdb1b 100644
--- a/data/scripts/script_08014DCC.inc
+++ b/data/scripts/script_08014DCC.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_08014DCC
-StartScript 
-SetEntityPositionRelative 0x01a80238
-Call sub_0807F844
-Call sub_0807F348
-_0807E864 
-Call sub_0807DF28
-StopScript 
-_0807E778 0x0010
-DoFade6 
-WaitFor_2 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	SetEntityPositionRelative 0x01a80238
+	Call sub_0807F844
+	Call sub_0807F348
+	_0807E864 
+	Call sub_0807DF28
+	StopScript 
+	_0807E778 0x0010
+	DoFade6 
+	WaitFor_2 
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index 4371d2c2..798e9cc8 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -1,262 +1,275 @@
 SCRIPT_START script_08014E14
-StartScript 
-_0807EB44 0x0004
-_0807E9D4 
-_0807EF80 0x000a
-CallWithArg sub_0807F3D8, 0x00000000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-CallWithArg sub_0807F3D8, 0x00000000
-Call sub_08064428
-_0807EA94 
-_0807E878 
-Jump 0xffe0
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-CallWithArg sub_0807F78C, 0x00000022
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0038
-CallWithArg sub_0807F7C4, 0x00000022
-JumpIfNot 0x001e
-_0807E48C 0x0020
-JumpIfNot 0x001e
-CallWithArg sub_0807F800, 0x00000022
-WaitPlayerAction8 
-TextboxNoOverlap 0x0a04
-Jump 0x000e
-TextboxNoOverlap 0x0a03
-Jump 0x0006
-TextboxNoOverlap 0x0a02
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-Jump 0xff9c
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-TextboxNoOverlap 0x200d
-_0807EA94 
-_0807E878 
-Jump 0xffec
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x000a
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-_0807EF80 0x0000
-TextboxNoOverlap 0x200e
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-_0807E930 0x000a
-Jump 0xffe0
-.short 0x0000
-StartScript 
-_0807EF80 0x000a
-_0807EF80 0x0007
-_0807EB44 0x0004
-_0807E930 0x000e
-StopScript 
-Call sub_08065914
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-_0807EF80 0x0000
-StartScript 
-TextboxNoOverlap 0x3b0b
-CallWithArg sub_0807F854, 0x00010064
-StopScript 
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x0030
-HasRupees 0x0064
-JumpIfNot 0x001c
-_0807E48C 0x0020
-JumpIfNot 0x001c
-ModRupees 0xff9c
-_0807F034 0x0022
-WaitPlayerAction8 
-TextboxNoOverlap 0x3b11
-Jump 0x000e
-TextboxNoOverlap 0x3b0e
-Jump 0x0006
-TextboxNoOverlap 0x3b0f
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EB44 0x0004
-_0807E930 0x000e
-Jump 0xff90
-StartScript 
-SetEntityPositionRelative 0x00e001f8
-Call sub_08054564
-StopScript 
-CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-SoundReq0x80100000 
-_0807F0B4 0x0001
-CameraTargetEntity 
-StartPlayerScript script_080152B4
-WaitForSomething2 0x00000001
-TextboxNoOverlapFollowPos 0x00021301
-_0807EA94 
-Call sub_0807F3F8
-Wait 0x003c
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-SoundReq2 0x000d
-_0807EB28 0x1302
-_0807EA94 
-TextboxNoOverlapFollowPos 0x00021303
-_0807EA94 
-_0807EB28 0x1304
-_0807EA94 
-TextboxNoOverlapFollowPos 0x00021305
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000004
-_0807EB28 0x1306
-_0807EA94 
-SoundReq0x80100000 
-StartPlayerScript script_080152DC
-CameraTargetEntity 
-_0807F0B4 0x0003
-SetEntityPositionRelative 0x014801f8
-WaitForSomething2 0x00000001
-Call sub_0804F6A8
-Wait 0x0004
-Call sub_0804F808
-SoundReq 0x010b
-StartPlayerScript script_08015304
-Call sub_0804F6C8
-Wait 0x0004
-Call sub_0804F830
-SoundReq 0x010b
-Call sub_0804F6E8
-Wait 0x0004
-Call sub_0804F854
-SoundReq 0x010b
-Call sub_0804F724
-Wait 0x0004
-Call sub_0804F89C
-SoundReq 0x010b
-Call sub_0804F760
-Wait 0x0004
-Call sub_0804F8E0
-SoundReq 0x010b
-Wait 0x003c
-WaitForSomething2 0x00000001
-SoundReq 0x01b0
-Call sub_0804F79C
-Wait 0x000a
-LoadRoomEntityList gUnk_080F7FC0
-SoundReq2 0x002d
-Call sub_0807DF50
-_0807E878 
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-SoundReq0x80100000 
-StartPlayerScript script_08015338
-WaitForSomething2 0x00000001
-Wait 0x003c
-Call sub_0804F6A8
-Wait 0x0004
-Call sub_0804F928
-SoundReq 0x010b
-Call sub_0804F6C8
-Wait 0x0004
-Call sub_0804F944
-SoundReq 0x010b
-Call sub_0804F6E8
-Wait 0x0004
-Call sub_0804F960
-SoundReq 0x010b
-Call sub_0804F724
-Wait 0x0004
-Call sub_0804F994
-SoundReq 0x010b
-Call sub_0804F760
-Wait 0x0004
-Call sub_0804F9C8
-SoundReq 0x010b
-Wait 0x003c
-SoundReq 0x0072
-_0807F0B4 0x0004
-CameraTargetPlayer 
-SetLocalFlag 0x008c
-_0807EB28 0x130c
-_0807EA94 
-CameraTargetPlayer 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-Call sub_08053B3C
-StartScript 
-_0807E864 
-CallWithArg sub_0807F6E8, 0x00000008
-MoveEntityToPlayer 
-_0807F0B4 0x0004
-CameraTargetEntity 
-_0807E778 0x0100
-DoFade4 
-_0807E80C 0x00000000
-StopScript 
-StartPlayerScript script_08015360
-WaitForSomething2 0x00000001
-LoadRoomEntityList gUnk_080F7CB0
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000010
-StartScript 
-_0807E8E4_2 
-_0807EB28 0x1315
-StopScript 
-_0807EA94 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-Call sub_08054570
-SoundReq2 0xffff
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807E9D4 
+	_0807EF80 0x000a
+	CallWithArg sub_0807F3D8, 0x00000000
+	StopScript 
+script_08014E2C:
+	CheckEntityInteractType 
+	JumpIfNot script_08014E2C
+	_0807E864 
+	_0807EB74 
+	CallWithArg sub_0807F3D8, 0x00000000
+	Call sub_08064428
+	_0807EA94 
+	_0807E878 
+	Jump script_08014E2C
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_08014E64:
+	CheckEntityInteractType 
+	JumpIfNot script_08014E64
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB74 
+	CallWithArg sub_0807F78C, 0x00000022
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08014EBC
+	CallWithArg sub_0807F7C4, 0x00000022
+	JumpIfNot script_08014EB0
+	_0807E48C 0x0020
+	JumpIfNot script_08014EB8
+	CallWithArg sub_0807F800, 0x00000022
+	WaitPlayerAction8 
+	TextboxNoOverlap 0x0a04
+	Jump script_08014EBC
+script_08014EB0:
+	TextboxNoOverlap 0x0a03
+	Jump script_08014EBC
+script_08014EB8:
+	TextboxNoOverlap 0x0a02
+script_08014EBC:
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08014E64
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_08014EE0:
+	CheckEntityInteractType 
+	JumpIfNot script_08014EE0
+	_0807E864 
+	_0807EB74 
+	TextboxNoOverlap 0x200d
+	_0807EA94 
+	_0807E878 
+	Jump script_08014EE0
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x000a
+	StopScript 
+script_08014F0C:
+	CheckEntityInteractType 
+	JumpIfNot script_08014F0C
+	_0807E864 
+	_0807EB74 
+	_0807EF80 0x0000
+	TextboxNoOverlap 0x200e
+	_0807EA94 
+	_0807E878 
+	_0807EB44 0x0004
+	_0807E930 0x000a
+	Jump script_08014F0C
+	.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EF80 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x000e
+	StopScript 
+	Call sub_08065914
+script_08014F4A:
+	CheckEntityInteractType 
+	JumpIfNot script_08014F4A
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB74 
+	_0807EF80 0x0000
+	StartScript 
+	TextboxNoOverlap 0x3b0b
+	CallWithArg sub_0807F854, 0x00010064
+	StopScript 
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08014FA6
+	HasRupees 0x0064
+	JumpIfNot script_08014F9A
+	_0807E48C 0x0020
+	JumpIfNot script_08014FA2
+	ModRupees 0xff9c
+	_0807F034 0x0022
+	WaitPlayerAction8 
+	TextboxNoOverlap 0x3b11
+	Jump script_08014FA6
+script_08014F9A:
+	TextboxNoOverlap 0x3b0e
+	Jump script_08014FA6
+script_08014FA2:
+	TextboxNoOverlap 0x3b0f
+script_08014FA6:
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+	_0807EB44 0x0004
+	_0807E930 0x000e
+	Jump script_08014F4A
+	StartScript 
+	SetEntityPositionRelative 0x00e001f8
+	Call sub_08054564
+	StopScript 
+script_08014FCC:
+	CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
+	JumpIfNot script_08014FCC
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	SoundReq0x80100000 
+	_0807F0B4 0x0001
+	CameraTargetEntity 
+	StartPlayerScript script_080152B4
+	WaitForSomething2 0x00000001
+	TextboxNoOverlapFollowPos 0x00021301
+	_0807EA94 
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	SoundReq2 0x000d
+	_0807EB28 0x1302
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x00021303
+	_0807EA94 
+	_0807EB28 0x1304
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x00021305
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000004
+	_0807EB28 0x1306
+	_0807EA94 
+	SoundReq0x80100000 
+	StartPlayerScript script_080152DC
+	CameraTargetEntity 
+	_0807F0B4 0x0003
+	SetEntityPositionRelative 0x014801f8
+	WaitForSomething2 0x00000001
+	Call sub_0804F6A8
+	Wait 0x0004
+	Call sub_0804F808
+	SoundReq 0x010b
+	StartPlayerScript script_08015304
+	Call sub_0804F6C8
+	Wait 0x0004
+	Call sub_0804F830
+	SoundReq 0x010b
+	Call sub_0804F6E8
+	Wait 0x0004
+	Call sub_0804F854
+	SoundReq 0x010b
+	Call sub_0804F724
+	Wait 0x0004
+	Call sub_0804F89C
+	SoundReq 0x010b
+	Call sub_0804F760
+	Wait 0x0004
+	Call sub_0804F8E0
+	SoundReq 0x010b
+	Wait 0x003c
+	WaitForSomething2 0x00000001
+	SoundReq 0x01b0
+	Call sub_0804F79C
+	Wait 0x000a
+	LoadRoomEntityList gUnk_080F7FC0
+	SoundReq2 0x002d
+	Call sub_0807DF50
+	_0807E878 
+script_08015104:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_08015104
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	SoundReq0x80100000 
+	StartPlayerScript script_08015338
+	WaitForSomething2 0x00000001
+	Wait 0x003c
+	Call sub_0804F6A8
+	Wait 0x0004
+	Call sub_0804F928
+	SoundReq 0x010b
+	Call sub_0804F6C8
+	Wait 0x0004
+	Call sub_0804F944
+	SoundReq 0x010b
+	Call sub_0804F6E8
+	Wait 0x0004
+	Call sub_0804F960
+	SoundReq 0x010b
+	Call sub_0804F724
+	Wait 0x0004
+	Call sub_0804F994
+	SoundReq 0x010b
+	Call sub_0804F760
+	Wait 0x0004
+	Call sub_0804F9C8
+	SoundReq 0x010b
+	Wait 0x003c
+	SoundReq 0x0072
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	SetLocalFlag 0x008c
+	_0807EB28 0x130c
+	_0807EA94 
+	CameraTargetPlayer 
+	_0807E778 0x0004
+	_0807E80C 0x00000000
+	WaitFor_2 
+	Call sub_08053B3C
+	StartScript 
+	_0807E864 
+	CallWithArg sub_0807F6E8, 0x00000008
+	MoveEntityToPlayer 
+	_0807F0B4 0x0004
+	CameraTargetEntity 
+	_0807E778 0x0100
+	DoFade4 
+	_0807E80C 0x00000000
+	StopScript 
+	StartPlayerScript script_08015360
+	WaitForSomething2 0x00000001
+	LoadRoomEntityList gUnk_080F7CB0
+	_0807E778 0x0004
+	_0807E800 0x00000000
+	WaitFor_2 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000010
+	StartScript 
+	_0807E8E4_2 
+	_0807EB28 0x1315
+	StopScript 
+	_0807EA94 
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	Call sub_08054570
+	SoundReq2 0xffff
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc
index 7f1a7109..aa9d41d0 100644
--- a/data/scripts/script_08015234.inc
+++ b/data/scripts/script_08015234.inc
@@ -1,30 +1,30 @@
 SCRIPT_START script_08015234
-StartScript 
-_0807EF80 0x0008
-_0807EB44 0x0004
-_0807EF80 0x0000
-Call sub_0807F354
-StopScript 
-WaitForSomething2 0x00000002
-Call sub_08066C94
-Wait 0x00e9
-_0807EF80 0x0007
-_0807EF80 0x001e
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-Wait 0x0014
-_0807EB44 0x0000
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000002
-SoundReq 0x00f5
-_0807EF80 0x001f
-SetEntityNonPlanarMovement 0x0200
-_0807EF80 0x000d
-_0807EF80 0x0000
-_0807ECC4 0x0030
-_0807E5F8 0x00000004
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Call sub_0807F354
+	StopScript 
+	WaitForSomething2 0x00000002
+	Call sub_08066C94
+	Wait 0x00e9
+	_0807EF80 0x0007
+	_0807EF80 0x001e
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	Wait 0x0014
+	_0807EB44 0x0000
+	_0807EF80 0x001c
+	Call sub_0807F2D4
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000002
+	SoundReq 0x00f5
+	_0807EF80 0x001f
+	SetEntityNonPlanarMovement 0x0200
+	_0807EF80 0x000d
+	_0807EF80 0x0000
+	_0807ECC4 0x0030
+	_0807E5F8 0x00000004
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc
index 9cff9737..0107c8c1 100644
--- a/data/scripts/script_080152B4.inc
+++ b/data/scripts/script_080152B4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_080152B4
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x00b8
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x00b8
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc
index f675a24c..2f474890 100644
--- a/data/scripts/script_080152DC.inc
+++ b/data/scripts/script_080152DC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_080152DC
-StartScript 
-SetEntityNonPlanarMovement 0x0200
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x0148
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0200
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x0148
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015304.inc b/data/scripts/script_08015304.inc
index a5e22bf5..6d8e17e3 100644
--- a/data/scripts/script_08015304.inc
+++ b/data/scripts/script_08015304.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_08015304
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0002
-Wait 0x000a
-_0807EB44 0x0006
-Wait 0x000a
-_0807EB44 0x0004
-_0807E5F8 0x00000001
-Call sub_080791BC
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0002
+	Wait 0x000a
+	_0807EB44 0x0006
+	Wait 0x000a
+	_0807EB44 0x0004
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc
index a6f16509..0c1407f2 100644
--- a/data/scripts/script_08015338.inc
+++ b/data/scripts/script_08015338.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08015338
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x01f8, 0x0148
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x01f8, 0x0148
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc
index f3e9bb38..fc63dc99 100644
--- a/data/scripts/script_08015360.inc
+++ b/data/scripts/script_08015360.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015360
-StartScript 
-SetEntityNonPlanarMovement 0x0100
-SetEntityPositionRelative 0x01480208
-StopScript 
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0100
+	SetEntityPositionRelative 0x01480208
+	StopScript 
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015384.inc b/data/scripts/script_08015384.inc
index 6d9b5581..01e78330 100644
--- a/data/scripts/script_08015384.inc
+++ b/data/scripts/script_08015384.inc
@@ -1,4 +1,4 @@
 SCRIPT_START script_08015384
-_0807EF80 0x0015
-Call sub_080791BC
+	_0807EF80 0x0015
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc
index f5e53115..7c9c4b3a 100644
--- a/data/scripts/script_08015390.inc
+++ b/data/scripts/script_08015390.inc
@@ -1,23 +1,24 @@
 SCRIPT_START script_08015390
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-StopScript 
-_0807E930 0x001f
-Call sub_0806D944
-WaitForSomething2 0x00000008
-_0807E930 0x0010
-TextboxNoOverlapFollowPos 0x000c1314
-_0807EA94 
-_0807E930 0x0018
-Call sub_0806D8A0
-_0807EE30 
-JumpIfNot 0xfffc
-_0807E930 0x001f
-StartPlayerScript script_08015384
-Call sub_0806D9A4
-_0807EF80 0x0008
-Wait 0x0078
-_0807E5F8 0x00000010
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	StopScript 
+	_0807E930 0x001f
+	Call sub_0806D944
+	WaitForSomething2 0x00000008
+	_0807E930 0x0010
+	TextboxNoOverlapFollowPos 0x000c1314
+	_0807EA94 
+	_0807E930 0x0018
+	Call sub_0806D8A0
+script_080153C2:
+	_0807EE30 
+	JumpIfNot script_080153C2
+	_0807E930 0x001f
+	StartPlayerScript script_08015384
+	Call sub_0806D9A4
+	_0807EF80 0x0008
+	Wait 0x0078
+	_0807E5F8 0x00000010
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc
index dfd7dfc5..56daf055 100644
--- a/data/scripts/script_080153EC.inc
+++ b/data/scripts/script_080153EC.inc
@@ -1,36 +1,36 @@
 SCRIPT_START script_080153EC
-StartScript 
-_0807F0B4 0x0007
-SetEntityPositionRelative 0x00680078
-CameraTargetEntity 
-StopScript 
-SoundReq2 0x002a
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-Wait 0x003c
-_0807E5F8 0x00000080
-WaitForSomething2 0x00000100
-_0807E5F8 0x00000800
-WaitForSomething2 0x00001000
-_0807E5F8 0x00000880
-WaitForSomething2 0x00001100
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x00900078
-TextboxNoOverlapFollowPos 0x00021330
-_0807EA94 
-_0807E5F8 0x00008000
-WaitForSomething2 0x00010000
-_0807E5F8 0x00000880
-WaitForSomething2 0x00001000
-Wait 0x003c
-TextboxNoOverlapFollowPos 0x0002130d
-_0807EA94 
-TextboxNoOverlapFollowPos 0x000c130e
-_0807EA94 
-TextboxNoOverlapFollowPos 0x0002130f
-_0807EA94 
-TextboxNoOverlapFollowPos 0x000c1310
-_0807EA94 
-CallWithArg sub_0805DDEC, 0x00000001
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	_0807F0B4 0x0007
+	SetEntityPositionRelative 0x00680078
+	CameraTargetEntity 
+	StopScript 
+	SoundReq2 0x002a
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+	Wait 0x003c
+	_0807E5F8 0x00000080
+	WaitForSomething2 0x00000100
+	_0807E5F8 0x00000800
+	WaitForSomething2 0x00001000
+	_0807E5F8 0x00000880
+	WaitForSomething2 0x00001100
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x00900078
+	TextboxNoOverlapFollowPos 0x00021330
+	_0807EA94 
+	_0807E5F8 0x00008000
+	WaitForSomething2 0x00010000
+	_0807E5F8 0x00000880
+	WaitForSomething2 0x00001000
+	Wait 0x003c
+	TextboxNoOverlapFollowPos 0x0002130d
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x000c130e
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x0002130f
+	_0807EA94 
+	TextboxNoOverlapFollowPos 0x000c1310
+	_0807EA94 
+	CallWithArg sub_0805DDEC, 0x00000001
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc
index 6d325462..69938c3a 100644
--- a/data/scripts/script_0801548E.inc
+++ b/data/scripts/script_0801548E.inc
@@ -1,26 +1,26 @@
 SCRIPT_START script_0801548E
-_0807E5F8 0x00000800
-WaitForSomething2 0x00001000
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-_0807E5F8 0x00048000
-WaitForSomething2 0x00090000
-TextboxNoOverlapFollowPos 0x00021311
-_0807EA94 
-_0807E5F8 0x00008000
-WaitForSomething2 0x00010000
-_0807E5F8 0x00048000
-WaitForSomething2 0x00010000
-CallWithArg sub_0805DE18, 0x00000001
-_0807F0C8 0x0000, 0x0000
-TextboxNoOverlapFollowPos 0x000c1312
-_0807EA94 
-_0807E5F8 0x00000800
-WaitForSomething2 0x00001000
-SoundReq0x80100000 
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-SetRoomFlag 0x0001
-_0807EF80 0x0006
+	_0807E5F8 0x00000800
+	WaitForSomething2 0x00001000
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	_0807E5F8 0x00048000
+	WaitForSomething2 0x00090000
+	TextboxNoOverlapFollowPos 0x00021311
+	_0807EA94 
+	_0807E5F8 0x00008000
+	WaitForSomething2 0x00010000
+	_0807E5F8 0x00048000
+	WaitForSomething2 0x00010000
+	CallWithArg sub_0805DE18, 0x00000001
+	_0807F0C8 0x0000, 0x0000
+	TextboxNoOverlapFollowPos 0x000c1312
+	_0807EA94 
+	_0807E5F8 0x00000800
+	WaitForSomething2 0x00001000
+	SoundReq0x80100000 
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	SetRoomFlag 0x0001
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc
index c2bf4230..e7cf2435 100644
--- a/data/scripts/script_0801550C.inc
+++ b/data/scripts/script_0801550C.inc
@@ -1,44 +1,45 @@
 SCRIPT_START script_0801550C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EF80 0x0007
-_0807EB44 0x0000
-Call sub_0807F338
-StopScript 
-CallWithArg sub_0806AF60, 0x00000000
-WaitForSomething2 0x00008000
-CallWithArg sub_0806AF60, 0x00000004
-_0807EDD4 0x0078, 0x00b8
-_0807EB44 0x0000
-CallWithArg sub_0806AF60, 0x00000000
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807EF80 0x000d
-_0807EB44 0x0000
-CallWithArg sub_0806AF60, 0x00000004
-_0807EDD4 0x0078, 0x00c8
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807EB44 0x0000
-CallWithArg sub_0806AF60, 0x00000000
-_0807EF80 0x0010
-Wait 0x0028
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-Wait 0x000a
-SoundReq 0x0125
-CallWithArg sub_0807FB28, 0x00000003
-Wait 0x000a
-_0807EF80 0x0010
-_0807E5F8 0x00010000
-WaitForSomething2 0x00008000
-_0807E930 0x000d
-Call sub_0807F2D4
-_0807E5F8 0x00010000
-Wait 0x003c
-_0807EF80 0x0005
-Wait 0x003c
-CheckRoomFlag 0x0001
-JumpIfNot 0xfffa
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EF80 0x0007
+	_0807EB44 0x0000
+	Call sub_0807F338
+	StopScript 
+	CallWithArg sub_0806AF60, 0x00000000
+	WaitForSomething2 0x00008000
+	CallWithArg sub_0806AF60, 0x00000004
+	_0807EDD4 0x0078, 0x00b8
+	_0807EB44 0x0000
+	CallWithArg sub_0806AF60, 0x00000000
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807EF80 0x000d
+	_0807EB44 0x0000
+	CallWithArg sub_0806AF60, 0x00000004
+	_0807EDD4 0x0078, 0x00c8
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807EB44 0x0000
+	CallWithArg sub_0806AF60, 0x00000000
+	_0807EF80 0x0010
+	Wait 0x0028
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	Wait 0x000a
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	Wait 0x000a
+	_0807EF80 0x0010
+	_0807E5F8 0x00010000
+	WaitForSomething2 0x00008000
+	_0807E930 0x000d
+	Call sub_0807F2D4
+	_0807E5F8 0x00010000
+	Wait 0x003c
+	_0807EF80 0x0005
+	Wait 0x003c
+script_080155E6:
+	CheckRoomFlag 0x0001
+	JumpIfNot script_080155E6
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080155F4.inc b/data/scripts/script_080155F4.inc
index 727f25de..62f56e9f 100644
--- a/data/scripts/script_080155F4.inc
+++ b/data/scripts/script_080155F4.inc
@@ -1,10 +1,11 @@
 SCRIPT_START script_080155F4
-WaitForSomething2 0x00000020
-_0807E930 0x0000
-Wait 0x0014
-_0807E5F8 0x00000040
-CheckRoomFlag 0x0001
-JumpIfNot 0xfffa
-_0807EF80 0x0006
+	WaitForSomething2 0x00000020
+	_0807E930 0x0000
+	Wait 0x0014
+	_0807E5F8 0x00000040
+script_08015608:
+	CheckRoomFlag 0x0001
+	JumpIfNot script_08015608
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc
index cc3d5d59..7338d9e1 100644
--- a/data/scripts/script_08015618.inc
+++ b/data/scripts/script_08015618.inc
@@ -1,22 +1,22 @@
 SCRIPT_START script_08015618
-StartScript 
-_0807EF80 0x0007
-SetEntityNonPlanarMovement 0x0040
-Call sub_08094B80
-StopScript 
-WaitForSomething2 0x00000080
-CallWithArg sub_0805DDEC, 0x00000003
-Call sub_08094B0C
-_0807EDD4 0x0078, 0x0068
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807EF3C 0xff80, 0x0000
-CallWithArg sub_0805DE18, 0x00000003
-Wait 0x003c
-_0807E5F8 0x00000100
-WaitForSomething2 0x00000080
-_0807E930 0x0001
-Call sub_0807F2D4
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	SetEntityNonPlanarMovement 0x0040
+	Call sub_08094B80
+	StopScript 
+	WaitForSomething2 0x00000080
+	CallWithArg sub_0805DDEC, 0x00000003
+	Call sub_08094B0C
+	_0807EDD4 0x0078, 0x0068
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807EF3C 0xff80, 0x0000
+	CallWithArg sub_0805DE18, 0x00000003
+	Wait 0x003c
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000080
+	_0807E930 0x0001
+	Call sub_0807F2D4
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc
index f56d6035..28a67405 100644
--- a/data/scripts/script_08015684.inc
+++ b/data/scripts/script_08015684.inc
@@ -1,46 +1,46 @@
 SCRIPT_START script_08015684
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000b
-_0807EB44 0x0000
-_0807EF80 0x0017
-Call sub_0807F180
-StopScript 
-WaitForSomething2 0x00000800
-_0807EB44 0x0002
-_0807EF80 0x0017
-Wait 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0017
-_0807EB44 0x0004
-_0807EF80 0x001b
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-Wait 0x0078
-_0807EF80 0x0004
-Wait 0x0014
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807EF80 0x0018
-Call sub_0807F2D4
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-_0807EB44 0x0004
-_0807EF80 0x0014
-CallWithArg sub_0809545C, 0x08015754
-SoundReq 0x01c4
-Wait 0x0078
-_0807EF80 0x0016
-WaitForSomething2 0x00020000
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00001000
-WaitForSomething2 0x00000800
-Call sub_08066CA4
-_0807EF80 0x0008
-Wait 0x0078
-_0807E5F8 0x00001000
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000b
+	_0807EB44 0x0000
+	_0807EF80 0x0017
+	Call sub_0807F180
+	StopScript 
+	WaitForSomething2 0x00000800
+	_0807EB44 0x0002
+	_0807EF80 0x0017
+	Wait 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0017
+	_0807EB44 0x0004
+	_0807EF80 0x001b
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	Wait 0x0078
+	_0807EF80 0x0004
+	Wait 0x0014
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	_0807EF80 0x0018
+	Call sub_0807F2D4
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	_0807EB44 0x0004
+	_0807EF80 0x0014
+	CallWithArg sub_0809545C, 0x08015754
+	SoundReq 0x01c4
+	Wait 0x0078
+	_0807EF80 0x0016
+	WaitForSomething2 0x00020000
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00001000
+	WaitForSomething2 0x00000800
+	Call sub_08066CA4
+	_0807EF80 0x0008
+	Wait 0x0078
+	_0807E5F8 0x00001000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc
index caa94f3d..f3b19d0a 100644
--- a/data/scripts/script_08015754.inc
+++ b/data/scripts/script_08015754.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_08015754
-StartScript 
-_0807E930 0x0000
-SetEntityNonPlanarMovement 0x0200
-Call sub_08094B80
-StopScript 
-Wait 0x0078
-SoundReq 0x01c5
-Call sub_08094B6C
-_0807EDD4 0x0078, 0x00b8
-SoundReq 0x01c6
-Call sub_08094B80
-_0807E5F8 0x00020000
-SetEntityNonPlanarMovement 0x0080
-WaitForSomething2 0x00040000
-_0807EDD4 0x0078, 0x00c8
-_0807E5F8 0x00080000
-WaitForSomething2 0x00040000
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0000
+	SetEntityNonPlanarMovement 0x0200
+	Call sub_08094B80
+	StopScript 
+	Wait 0x0078
+	SoundReq 0x01c5
+	Call sub_08094B6C
+	_0807EDD4 0x0078, 0x00b8
+	SoundReq 0x01c6
+	Call sub_08094B80
+	_0807E5F8 0x00020000
+	SetEntityNonPlanarMovement 0x0080
+	WaitForSomething2 0x00040000
+	_0807EDD4 0x0078, 0x00c8
+	_0807E5F8 0x00080000
+	WaitForSomething2 0x00040000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc
index 43f48112..a98e09f7 100644
--- a/data/scripts/script_080157AC.inc
+++ b/data/scripts/script_080157AC.inc
@@ -1,70 +1,74 @@
 SCRIPT_START script_080157AC
-CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Call sub_0807DF50
-_0807E878 
-CheckPlayerInRegion 0x0250, 0x0230, 0x3040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0807F3F8
-Wait 0x003c
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-StartPlayerScript script_080158F8
-_0807F0B4 0x0001
-SetEntityPositionRelative 0x02180248
-CameraTargetEntity 
-Call sub_0807F5C0
-WaitForSomething2 0x00000010
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000020
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-StartPlayerScript script_08015918
-WaitForSomething2 0x00000010
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-TextboxNoOverlapFollowPos 0x00021066
-_0807EA94 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-Call sub_0807DF50
-_0807E878 
-Call sub_08066F94
-_0807E5F8 0x00000008
-CheckRoomFlag 0x0000
-JumpIfNot 0xfffa
-_0807EA94 
-ComparePlayerAction 0x001c
-JumpIf 0xfff8
-_0807E864 
-Call sub_0807DF28
-_0807F0B4 0x0002
-SetEntityPositionRelative 0x02080248
-CameraTargetEntity 
-StartPlayerScript script_08015938
-WaitForSomething2 0x00000010
-TextboxNoOverlapFollowPos 0x000c106a
-_0807EA94 
-_0807E5F8 0x00000008
-Wait 0x0078
-_0807E8E4_2 
-TextboxNoOverlapFollowPos 0x00021068
-_0807EA94 
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-SetLocalFlag 0x008b
-Call sub_08066FB8
-Call sub_0807DF50
-_0807E878 
-_0807F0B4 0x0004
-CameraTargetPlayer 
-_0807EF80 0x0006
+script_080157AC:
+	CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
+	JumpIfNot script_080157AC
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+script_080157DA:
+	CheckPlayerInRegion 0x0250, 0x0230, 0x3040
+	JumpIfNot script_080157DA
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	Call sub_0807F3F8
+	Wait 0x003c
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	StartPlayerScript script_080158F8
+	_0807F0B4 0x0001
+	SetEntityPositionRelative 0x02180248
+	CameraTargetEntity 
+	Call sub_0807F5C0
+	WaitForSomething2 0x00000010
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000020
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	StartPlayerScript script_08015918
+	WaitForSomething2 0x00000010
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	TextboxNoOverlapFollowPos 0x00021066
+	_0807EA94 
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	Call sub_0807DF50
+	_0807E878 
+	Call sub_08066F94
+	_0807E5F8 0x00000008
+script_08015880:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_08015880
+script_08015888:
+	_0807EA94 
+	ComparePlayerAction 0x001c
+	JumpIf script_08015888
+	_0807E864 
+	Call sub_0807DF28
+	_0807F0B4 0x0002
+	SetEntityPositionRelative 0x02080248
+	CameraTargetEntity 
+	StartPlayerScript script_08015938
+	WaitForSomething2 0x00000010
+	TextboxNoOverlapFollowPos 0x000c106a
+	_0807EA94 
+	_0807E5F8 0x00000008
+	Wait 0x0078
+	_0807E8E4_2 
+	TextboxNoOverlapFollowPos 0x00021068
+	_0807EA94 
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	SetLocalFlag 0x008b
+	Call sub_08066FB8
+	Call sub_0807DF50
+	_0807E878 
+	_0807F0B4 0x0004
+	CameraTargetPlayer 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080158F8.inc b/data/scripts/script_080158F8.inc
index 24219a34..a339eeb9 100644
--- a/data/scripts/script_080158F8.inc
+++ b/data/scripts/script_080158F8.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080158F8
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0218, 0x0238
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000010
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0218, 0x0238
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000010
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015918.inc b/data/scripts/script_08015918.inc
index a038ba06..c39a541d 100644
--- a/data/scripts/script_08015918.inc
+++ b/data/scripts/script_08015918.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015918
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0238, 0x0228
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000010
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0238, 0x0228
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000010
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015938.inc b/data/scripts/script_08015938.inc
index ef7c6df3..4a24da0e 100644
--- a/data/scripts/script_08015938.inc
+++ b/data/scripts/script_08015938.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015938
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0248, 0x0208
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000010
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0248, 0x0208
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000010
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index c02f9c7b..72b34caf 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -1,71 +1,73 @@
 SCRIPT_START script_08015958
-StartScript 
-SetEntityNonPlanarMovement 0x0180
-_0807EF80 0x0008
-_0807EF80 0x000b
-Call sub_08066D04
-StopScript 
-WaitForSomething2 0x00000001
-StartScript 
-Call sub_08066D14
-MoveEntityToPlayer 
-StopScript 
-_0807EF80 0x0007
-_0807EB74 
-_0807EDD4 0x01f8, 0x02f8
-_0807EB44 0x0004
-_0807EF80 0x0000
-TextboxNoOverlapFollowPos 0x00021011
-_0807EA94 
-_0807EDD4 0x01f8, 0x0268
-SetEntityPositionRelative 0x02180248
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-Call sub_0807F3C8
-SoundReq 0x0096
-SetEntityNonPlanarMovement 0x0200
-_0807ECC4 0x0008
-_0807E930 0x0040
-Call sub_0807F2D4
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-_0807EB44 0x0006
-_0807EF80 0x0000
-_0807E5F8 0x00000002
-WaitForSomething2 0x00000001
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0238, 0x0238
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807EF80 0x000a
-_0807E9D4 
-_0807E5F8 0x00000002
-StopScript 
-StartScript 
-_0807EB74 
-CheckRoomFlag 0x0000
-JumpIf 0x0016
-CheckEntityInteractType 
-JumpIfNot 0xffee
-StopScript 
-TextboxNoOverlapFollowPos 0x00021067
-_0807EA94 
-Jump 0xffe0
-StopScript 
-_0807EF80 0x000b
-_0807EB44 0x0000
-_0807EF80 0x0000
-WaitForSomething2 0x00000001
-Call sub_08066D4C
-_0807E5F8 0x00000002
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0180
+	_0807EF80 0x0008
+	_0807EF80 0x000b
+	Call sub_08066D04
+	StopScript 
+	WaitForSomething2 0x00000001
+	StartScript 
+	Call sub_08066D14
+	MoveEntityToPlayer 
+	StopScript 
+	_0807EF80 0x0007
+	_0807EB74 
+	_0807EDD4 0x01f8, 0x02f8
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	TextboxNoOverlapFollowPos 0x00021011
+	_0807EA94 
+	_0807EDD4 0x01f8, 0x0268
+	SetEntityPositionRelative 0x02180248
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	Call sub_0807F3C8
+	SoundReq 0x0096
+	SetEntityNonPlanarMovement 0x0200
+	_0807ECC4 0x0008
+	_0807E930 0x0040
+	Call sub_0807F2D4
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807EB44 0x0006
+	_0807EF80 0x0000
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0238, 0x0238
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	_0807E9D4 
+	_0807E5F8 0x00000002
+script_08015A32:
+	StopScript 
+	StartScript 
+	_0807EB74 
+	CheckRoomFlag 0x0000
+	JumpIf script_08015A54
+	CheckEntityInteractType 
+	JumpIfNot script_08015A32
+	StopScript 
+	TextboxNoOverlapFollowPos 0x00021067
+	_0807EA94 
+	Jump script_08015A32
+script_08015A54:
+	StopScript 
+	_0807EF80 0x000b
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	WaitForSomething2 0x00000001
+	Call sub_08066D4C
+	_0807E5F8 0x00000002
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc
index f475a610..d63cabcf 100644
--- a/data/scripts/script_08015A7C.inc
+++ b/data/scripts/script_08015A7C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015A7C
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x0001
-_0807EC64 0x0010
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x0001
+	_0807EC64 0x0010
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc
index b69294ae..33a12392 100644
--- a/data/scripts/script_08015AA0.inc
+++ b/data/scripts/script_08015AA0.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015AA0
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x0001
-_0807EC94 0x0010
-_0807EB44 0x0002
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x0001
+	_0807EC94 0x0010
+	_0807EB44 0x0002
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc
index 8577a203..9e69d527 100644
--- a/data/scripts/script_08015AC4.inc
+++ b/data/scripts/script_08015AC4.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_08015AC4
-StartScript 
-_0807EF80 0x0007
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000008
-_0807E908 0x0007
-WaitForSomething2 0x00000008
-_0807E908 0x0006
-SetRoomFlag 0x0000
-_0807EB44 0x0004
-_0807EF80 0x0000
-WaitForSomething2 0x00000008
-Wait 0x003c
-SoundReq 0x0072
-Call sub_08046078
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0007
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000008
+	_0807E908 0x0007
+	WaitForSomething2 0x00000008
+	_0807E908 0x0006
+	SetRoomFlag 0x0000
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	WaitForSomething2 0x00000008
+	Wait 0x003c
+	SoundReq 0x0072
+	Call sub_08046078
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc
index cbf55e0a..911275e2 100644
--- a/data/scripts/script_08015B14.inc
+++ b/data/scripts/script_08015B14.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015B14
-StartScript 
-_0807E930 0x0018
-SetEntityNonPlanarMovement 0x0300
-StopScript 
-_0807EDD4 0x0248, 0x0218
-_0807E5F8 0x00000020
-_0807EF80 0x0006
+	StartScript 
+	_0807E930 0x0018
+	SetEntityNonPlanarMovement 0x0300
+	StopScript 
+	_0807EDD4 0x0248, 0x0218
+	_0807E5F8 0x00000020
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc
index 43be14a7..b23d4cc9 100644
--- a/data/scripts/script_08015B34.inc
+++ b/data/scripts/script_08015B34.inc
@@ -1,20 +1,22 @@
 SCRIPT_START script_08015B34
-StopScript 
-StartScript 
-CheckLocalFlag 0x008b
-JumpIf 0x0040
-CallWithArg sub_0807F6B4, 0x00000318
-JumpIfNot 0xffe8
-StopScript 
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-TextboxNoOverlapFollowPos 0x00022506
-_0807EA94 
-StartPlayerScript script_08015B84
-WaitForSomething2 0x00000004
-Call sub_0807DF50
-_0807E878 
-Jump 0xffb8
-_0807EF80 0x0006
+script_08015B34:
+	StopScript 
+	StartScript 
+	CheckLocalFlag 0x008b
+	JumpIf script_08015B7E
+	CallWithArg sub_0807F6B4, 0x00000318
+	JumpIfNot script_08015B34
+	StopScript 
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	TextboxNoOverlapFollowPos 0x00022506
+	_0807EA94 
+	StartPlayerScript script_08015B84
+	WaitForSomething2 0x00000004
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08015B34
+script_08015B7E:
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc
index 5dd4496b..b33385e4 100644
--- a/data/scripts/script_08015B84.inc
+++ b/data/scripts/script_08015B84.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015B84
-SetEntityNonPlanarMovement 0x0100
-_0807EF80 0x0001
-_0807EC64 0x0010
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000004
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EF80 0x0001
+	_0807EC64 0x0010
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000004
+	Call sub_080791BC
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc
index adfad7ff..e1984478 100644
--- a/data/scripts/script_08015BA8.inc
+++ b/data/scripts/script_08015BA8.inc
@@ -1,21 +1,21 @@
 SCRIPT_START script_08015BA8
-StartScript 
-SetLocalFlag 0x008e
-_0807E864 
-MoveEntityToPlayer 
-CameraTargetEntity 
-SetEntityNonPlanarMovement 0x0200
-StopScript 
-Wait 0x000f
-_0807E8E4_2 
-Call sub_0807F3F8
-Wait 0x001e
-_0807EDD4 0x00b8, 0x0258
-Wait 0x001e
-SetRoomFlag 0x0065
-Wait 0x0078
-_0807EEB4 
-CameraTargetPlayer 
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	SetLocalFlag 0x008e
+	_0807E864 
+	MoveEntityToPlayer 
+	CameraTargetEntity 
+	SetEntityNonPlanarMovement 0x0200
+	StopScript 
+	Wait 0x000f
+	_0807E8E4_2 
+	Call sub_0807F3F8
+	Wait 0x001e
+	_0807EDD4 0x00b8, 0x0258
+	Wait 0x001e
+	SetRoomFlag 0x0065
+	Wait 0x0078
+	_0807EEB4 
+	CameraTargetPlayer 
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc
index 9f40c115..c601091c 100644
--- a/data/scripts/script_08015BE8.inc
+++ b/data/scripts/script_08015BE8.inc
@@ -1,39 +1,40 @@
 SCRIPT_START script_08015BE8
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-CheckPlayerInRegion 0x0160, 0x0020, 0x3040
-JumpIfNot 0xfff6
-_0807E864 
-Call sub_0807F9A4
-Call sub_0807DF28
-Call sub_0807FBC4
-StartPlayerScript script_08015C7C
-WaitForSomething2 0x00000100
-CameraTargetPlayer 
-_0807E778 0x0004
-_0807E80C 0x00000000
-WaitFor_2 
-SoundReq0x80100000 
-Call sub_08053BE8
-StartScript 
-_0807E864 
-Call sub_0807FBC4
-CameraTargetPlayer 
-_0807E778 0x0100
-DoFade4 
-_0807E80C 0x00000000
-StopScript 
-_0807E778 0x0004
-_0807E800 0x00000000
-WaitFor_2 
-SoundReq2 0xffff
-_0807EB28 0x131f
-_0807EA94 
-SetLocalFlag 0x009c
-Call sub_0807FBCC
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+script_08015BF0:
+	CheckPlayerInRegion 0x0160, 0x0020, 0x3040
+	JumpIfNot script_08015BF0
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	Call sub_0807FBC4
+	StartPlayerScript script_08015C7C
+	WaitForSomething2 0x00000100
+	CameraTargetPlayer 
+	_0807E778 0x0004
+	_0807E80C 0x00000000
+	WaitFor_2 
+	SoundReq0x80100000 
+	Call sub_08053BE8
+	StartScript 
+	_0807E864 
+	Call sub_0807FBC4
+	CameraTargetPlayer 
+	_0807E778 0x0100
+	DoFade4 
+	_0807E80C 0x00000000
+	StopScript 
+	_0807E778 0x0004
+	_0807E800 0x00000000
+	WaitFor_2 
+	SoundReq2 0xffff
+	_0807EB28 0x131f
+	_0807EA94 
+	SetLocalFlag 0x009c
+	Call sub_0807FBCC
+	Call sub_0807DF50
+	_0807E878 
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc
index 69c8ec77..d2e59189 100644
--- a/data/scripts/script_08015C7C.inc
+++ b/data/scripts/script_08015C7C.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_08015C7C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-StopScript 
-_0807EF80 0x0001
-_0807EDD4 0x0168, 0x0058
-_0807EB44 0x0004
-_0807EF80 0x0000
-CallWithArg sub_0807F238, 0x000003c5
-Call sub_0807F304
-TextboxNoOverlapFollowPos 0x000c1318
-_0807EA94 
-CallWithArg sub_0807F238, 0x000003c9
-Call sub_0807F304
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807E5F8 0x00000100
-Call sub_080791BC
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	StopScript 
+	_0807EF80 0x0001
+	_0807EDD4 0x0168, 0x0058
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	CallWithArg sub_0807F238, 0x000003c5
+	Call sub_0807F304
+	TextboxNoOverlapFollowPos 0x000c1318
+	_0807EA94 
+	CallWithArg sub_0807F238, 0x000003c9
+	Call sub_0807F304
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807E5F8 0x00000100
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc
index 109adf0a..6ac01e07 100644
--- a/data/scripts/script_08015CD4.inc
+++ b/data/scripts/script_08015CD4.inc
@@ -1,67 +1,67 @@
 SCRIPT_START script_08015CD4
-StartScript 
-_0807F0B4 0x0007
-SetEntityPositionRelative 0x00680088
-CameraTargetEntity 
-StopScript 
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-Wait 0x003c
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x00e00088
-CameraTargetEntity 
-Wait 0x003c
-SoundReq2 0x000d
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x00700088
-CameraTargetEntity 
-Wait 0x003c
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x00e00088
-CameraTargetEntity 
-Wait 0x003c
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-_0807F0B4 0x0004
-SetEntityPositionRelative 0x00700088
-CameraTargetEntity 
-Wait 0x003c
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000010
-WaitForSomething2 0x00000020
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-_0807E5F8 0x00000010
-LoadRoomEntityList gUnk_080FCE30
-SoundReq0x80100000 
-Wait 0x0078
-_0807E778 0x0004
-DoFade4 
-WaitFor_2 
-SoundReq2 0x0034
-_0807E5F8 0x00000040
-WaitForSomething2 0x00000080
-_0807E5F8 0x00000001
-WaitForSomething2 0x00000002
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E5F8 0x00000200
-Wait 0x003c
-_0807E5F8 0x00000004
-WaitForSomething2 0x00000008
-_0807E778 0x0004
-DoFade5 
-WaitFor_2 
-SoundReq0x80100000 
-SetRoomFlag 0x0000
-_0807EF80 0x0006
+	StartScript 
+	_0807F0B4 0x0007
+	SetEntityPositionRelative 0x00680088
+	CameraTargetEntity 
+	StopScript 
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+	Wait 0x003c
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x00e00088
+	CameraTargetEntity 
+	Wait 0x003c
+	SoundReq2 0x000d
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x00700088
+	CameraTargetEntity 
+	Wait 0x003c
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x00e00088
+	CameraTargetEntity 
+	Wait 0x003c
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	_0807F0B4 0x0004
+	SetEntityPositionRelative 0x00700088
+	CameraTargetEntity 
+	Wait 0x003c
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	_0807E5F8 0x00000010
+	LoadRoomEntityList gUnk_080FCE30
+	SoundReq0x80100000 
+	Wait 0x0078
+	_0807E778 0x0004
+	DoFade4 
+	WaitFor_2 
+	SoundReq2 0x0034
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000080
+	_0807E5F8 0x00000001
+	WaitForSomething2 0x00000002
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000200
+	Wait 0x003c
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	SoundReq0x80100000 
+	SetRoomFlag 0x0000
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc
index 71973282..7be58e36 100644
--- a/data/scripts/script_08015DF0.inc
+++ b/data/scripts/script_08015DF0.inc
@@ -1,26 +1,26 @@
 SCRIPT_START script_08015DF0
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000004
-_0807EF80 0x0004
-Wait 0x003c
-TextboxNoOverlap 0x1319
-_0807EA94 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-TextboxNoOverlap 0x131a
-_0807EA94 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-TextboxNoOverlap 0x131d
-_0807EA94 
-_0807E5F8 0x00000008
-WaitForSomething2 0x00000004
-TextboxNoOverlap 0x131e
-_0807EA94 
-_0807E5F8 0x00000008
-WaitForSomething 0x00000400
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000004
+	_0807EF80 0x0004
+	Wait 0x003c
+	TextboxNoOverlap 0x1319
+	_0807EA94 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	TextboxNoOverlap 0x131a
+	_0807EA94 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	TextboxNoOverlap 0x131d
+	_0807EA94 
+	_0807E5F8 0x00000008
+	WaitForSomething2 0x00000004
+	TextboxNoOverlap 0x131e
+	_0807EA94 
+	_0807E5F8 0x00000008
+	WaitForSomething 0x00000400
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc
index fefb8c78..ee744730 100644
--- a/data/scripts/script_08015E58.inc
+++ b/data/scripts/script_08015E58.inc
@@ -1,40 +1,40 @@
 SCRIPT_START script_08015E58
-StartScript 
-_0807EF80 0x0008
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x001d
-StopScript 
-WaitForSomething2 0x00000010
-Call sub_08066C94
-Wait 0x00e9
-_0807EF80 0x0007
-_0807EF80 0x001e
-Wait 0x0014
-_0807EB44 0x0000
-_0807EF80 0x001c
-Call sub_0807F2D4
-_0807EF80 0x0000
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-Call sub_08066CA4
-_0807EF80 0x0008
-Wait 0x00bc
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-SetEntityPositionRelative 0x00680088
-Call sub_08066C94
-Wait 0x00e8
-_0807EF80 0x0007
-_0807EF80 0x001e
-Wait 0x0014
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-_0807EF80 0x0014
-Wait 0x001e
-TextboxNoOverlap 0x131b
-_0807EA94 
-_0807E5F8 0x00000020
-WaitForSomething2 0x00000010
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x0008
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x001d
+	StopScript 
+	WaitForSomething2 0x00000010
+	Call sub_08066C94
+	Wait 0x00e9
+	_0807EF80 0x0007
+	_0807EF80 0x001e
+	Wait 0x0014
+	_0807EB44 0x0000
+	_0807EF80 0x001c
+	Call sub_0807F2D4
+	_0807EF80 0x0000
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	Call sub_08066CA4
+	_0807EF80 0x0008
+	Wait 0x00bc
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	SetEntityPositionRelative 0x00680088
+	Call sub_08066C94
+	Wait 0x00e8
+	_0807EF80 0x0007
+	_0807EF80 0x001e
+	Wait 0x0014
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0014
+	Wait 0x001e
+	TextboxNoOverlap 0x131b
+	_0807EA94 
+	_0807E5F8 0x00000020
+	WaitForSomething2 0x00000010
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc
index 5a61abc2..fe23f8c9 100644
--- a/data/scripts/script_08015F08.inc
+++ b/data/scripts/script_08015F08.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_08015F08
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething2 0x00000001
-TextboxNoOverlap 0x131c
-_0807EA94 
-_0807E5F8 0x00000002
-WaitForSomething 0x00000200
-_0807EF80 0x0005
-WaitForSomething 0x00000400
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething2 0x00000001
+	TextboxNoOverlap 0x131c
+	_0807EA94 
+	_0807E5F8 0x00000002
+	WaitForSomething 0x00000200
+	_0807EF80 0x0005
+	WaitForSomething 0x00000400
+	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc
index 6c5969c1..9f9553a3 100644
--- a/data/scripts/script_08015F3C.inc
+++ b/data/scripts/script_08015F3C.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08015F3C
-StartScript 
-SetEntityNonPlanarMovement 0x0080
-_0807EB44 0x0000
-_0807E930 0x0000
-StopScript 
-WaitForSomething 0x00000040
-_0807E930 0x0004
-_0807EC64 0x00c0
-_0807E930 0x0000
-Wait 0x003c
-_0807E5F8 0x00000080
-WaitForSomething 0x00000200
-_0807EF80 0x0005
-WaitForSomething 0x00000400
-_0807EF80 0x0006
+	StartScript 
+	SetEntityNonPlanarMovement 0x0080
+	_0807EB44 0x0000
+	_0807E930 0x0000
+	StopScript 
+	WaitForSomething 0x00000040
+	_0807E930 0x0004
+	_0807EC64 0x00c0
+	_0807E930 0x0000
+	Wait 0x003c
+	_0807E5F8 0x00000080
+	WaitForSomething 0x00000200
+	_0807EF80 0x0005
+	WaitForSomething 0x00000400
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc
index d204d00e..f54a96d6 100644
--- a/data/scripts/script_08015F80.inc
+++ b/data/scripts/script_08015F80.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08015F80
-StartScript 
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-WaitForSomething 0x00000200
-_0807EF80 0x0005
-WaitForSomething 0x00000400
-_0807EF80 0x0006
+	StartScript 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+	WaitForSomething 0x00000200
+	_0807EF80 0x0005
+	WaitForSomething 0x00000400
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc
index ce99508c..169a9df3 100644
--- a/data/scripts/script_08015FA4.inc
+++ b/data/scripts/script_08015FA4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08015FA4
-StartScript 
-_0807EF80 0x000a
-Call sub_08066E38
-StopScript 
-WaitForSomething 0x00000400
-_0807EF80 0x0006
+	StartScript 
+	_0807EF80 0x000a
+	Call sub_08066E38
+	StopScript 
+	WaitForSomething 0x00000400
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc
index 0052b733..fd04d0dd 100644
--- a/data/scripts/script_08015FC0.inc
+++ b/data/scripts/script_08015FC0.inc
@@ -1,18 +1,20 @@
 SCRIPT_START script_08015FC0
-StartScript 
-Call sub_0806DB84
-CheckKinstoneFused 0x0009
-JumpIf 0x005a
-_0807EA88 0x0009
-CallWithArg sub_0806DA04, 0x00000007
-_0807EF80 0x000a
-StopScript 
-_0807EA4C 
-_0807E9F0 
-_0807E864 
-CheckKinstoneFused 0x0009
-JumpIf 0x000e
-Call sub_0807DF50
-_0807E878 
-Jump 0xffe8
-_0807F0C8 0xffff, 0x0000
+	StartScript 
+	Call sub_0806DB84
+	CheckKinstoneFused 0x0009
+	JumpIf script_08016028
+	_0807EA88 0x0009
+	CallWithArg sub_0806DA04, 0x00000007
+	_0807EF80 0x000a
+	StopScript 
+script_08015FE4:
+	_0807EA4C 
+	_0807E9F0 
+	_0807E864 
+	CheckKinstoneFused 0x0009
+	JumpIf script_08015FFE
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_08015FE4
+script_08015FFE:
+	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc
index a1552d3b..dc04c09c 100644
--- a/data/scripts/script_08016004.inc
+++ b/data/scripts/script_08016004.inc
@@ -1,12 +1,13 @@
 SCRIPT_START script_08016004
-_0807E5F8 0x00000003
-WaitForSomething2 0x0000000c
-_0807F0C8 0x0000, 0x0000
-SoundReq 0x0072
-_0807EB28 0x0b1f
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EF80 0x0006
+	_0807E5F8 0x00000003
+	WaitForSomething2 0x0000000c
+	_0807F0C8 0x0000, 0x0000
+	SoundReq 0x0072
+	_0807EB28 0x0b1f
+	_0807EA94 
+	Call sub_0807DF50
+	_0807E878 
+script_08016028:
+	_0807EF80 0x0006
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc
index 7d5ebc10..58668a32 100644
--- a/data/scripts/script_08016030.inc
+++ b/data/scripts/script_08016030.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_08016030
-StartScript 
-CheckKinstoneFused 0x0009
-JumpIf 0x002a
-StopScript 
-WaitForSomething2 0x00000001
-_0807EF80 0x0010
-Wait 0x003c
-SetEntityNonPlanarMovement 0x0020
-_0807ECF4 0x0080
-Wait 0x001e
-_0807EF80 0x0010
-_0807E5F8 0x00000008
+	StartScript 
+	CheckKinstoneFused 0x0009
+	JumpIf script_08016062
+	StopScript 
+	WaitForSomething2 0x00000001
+	_0807EF80 0x0010
+	Wait 0x003c
+	SetEntityNonPlanarMovement 0x0020
+	_0807ECF4 0x0080
+	Wait 0x001e
+	_0807EF80 0x0010
+	_0807E5F8 0x00000008
 SCRIPT_END
diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc
index 05bedd70..54f9b00f 100644
--- a/data/scripts/script_08016062.inc
+++ b/data/scripts/script_08016062.inc
@@ -1,4 +1,5 @@
 SCRIPT_START script_08016062
-SetEntityPosition 0xfff0, 0x0000
+script_08016062:
+	SetEntityPosition 0xfff0, 0x0000
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc
index 38573c40..f1af3170 100644
--- a/data/scripts/script_0801606C.inc
+++ b/data/scripts/script_0801606C.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0801606C
-StartScript 
-CheckKinstoneFused 0x0009
-JumpIf 0x002a
-StopScript 
-WaitForSomething2 0x00000002
-_0807EF80 0x0010
-Wait 0x003c
-SetEntityNonPlanarMovement 0x0020
-_0807EC94 0x0080
-Wait 0x001e
-_0807EF80 0x0010
-_0807E5F8 0x00000004
+	StartScript 
+	CheckKinstoneFused 0x0009
+	JumpIf script_0801609E
+	StopScript 
+	WaitForSomething2 0x00000002
+	_0807EF80 0x0010
+	Wait 0x003c
+	SetEntityNonPlanarMovement 0x0020
+	_0807EC94 0x0080
+	Wait 0x001e
+	_0807EF80 0x0010
+	_0807E5F8 0x00000004
 SCRIPT_END
diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc
index 24376252..3c481171 100644
--- a/data/scripts/script_0801609E.inc
+++ b/data/scripts/script_0801609E.inc
@@ -1,4 +1,5 @@
 SCRIPT_START script_0801609E
-SetEntityPosition 0x0010, 0x0000
+script_0801609E:
+	SetEntityPosition 0x0010, 0x0000
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index 1bab6404..45482726 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -1,182 +1,207 @@
 SCRIPT_START script_080160A8
-StartScript 
-_0807E9D4 
-_0807E930 0x0008
-StopScript 
-StartScript 
-CheckEntityInteractType 
-JumpIf 0x0028
-TestBit 0x00000008
-JumpIf 0x0010
-TestBit 0x00000010
-JumpIf 0x0006
-Jump 0xffe0
-StopScript 
-_0807EB74 
-WaitForSomething2 0x00000004
-Jump 0xffd2
-_0807E864 
-_0807EB74 
-StopScript 
-HasRoomItemForSale 
-JumpIfNot 0x0030
-TextboxNoOverlapFollow 0x2d07
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x003c
-BuyItem 0x0000, 0x0000
-JumpIf 0x000c
-TextboxNoOverlapFollow 0x2d0b
-_0807EA94 
-Jump 0x0028
-WaitPlayerAction8 
-_0807EB8C 
-TextboxNoOverlapFollow 0x2d0d
-_0807EA94 
-Jump 0x001a
-CheckKinstoneFused 0x0014
-JumpIfNot 0x000c
-TextboxNoOverlapFollow 0x2d09
-_0807EA94 
-Jump 0x0008
-TextboxNoOverlapFollow 0x2d01
-_0807EA94 
-_0807E878 
-_0807EB44 0x0004
-Jump 0xff76
-StartScript 
-Call sub_080787B4
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-GetInventoryValue 0x0025
-_0807EAF0_ssss 0x2d03, 0x2d02, 0x2d02, 0x2d02
-_0807E3E8 
-JumpIfNot 0x002a
-_0807E48C 0x0020
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x2d0c
-Jump 0x001a
-BuyItem 0x0025, 0x0000
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x2d0b
-Jump 0x0008
-WaitPlayerAction8 
-TextboxNoOverlapFollow 0x2d06
-_0807E878 
-Jump 0xffb8
-StartScript 
-Call sub_080787B4
-StopScript 
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-GetInventoryValue 0x0024
-_0807EAF0_ssss 0x2d05, 0x2d04, 0x2d04, 0x2d04
-_0807E3E8 
-JumpIfNot 0x002e
-_0807E48C 0x0020
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x2d0c
-Jump 0x001e
-BuyItem 0x0024, 0x0000
-JumpIf 0x000a
-TextboxNoOverlapFollow 0x2d0b
-Jump 0x000c
-WaitPlayerAction8 
-_0807EA94 
-_0807EB8C 
-TextboxNoOverlap 0x2d06
-_0807E878 
-Jump 0xffb4
-StartScript 
-Call sub_0807F348
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807EF80 0x0000
-StopScript 
-Call sub_08068C28
-CheckEntityInteractType 
-JumpIfNot 0xfffc
-_0807E864 
-Call sub_0807DF28
-_0807EB74 
-Call sub_08068CA0
-JumpIf 0x0122
-Call sub_08068CFC
-JumpIfNot 0x010c
-Call sub_08068DB8
-_0807EA94 
-Call sub_08068DD0
-_0807EA94 
-_0807E3E8 
-JumpIfNot 0x010a
-StartPlayerScript script_0801635C
-WaitForSomething2 0x00000001
-_0807EB74 
-Call sub_08068C8C
-JumpIf 0x000e
-Call sub_08068DE8
-_0807EA94 
-Wait 0x001e
-Call sub_08068E00
-_0807EA94 
-_0807EF80 0x0001
-Call sub_0807F2D4
-Call sub_08068E90
-Call sub_08068C8C
-JumpIf 0x009a
-Call sub_08068F00
-Call sub_08068F14
-Call sub_08068BB4
-CallWithArg sub_0807F244, 0x00010001
-Call sub_08068B84
-Call sub_0807F2A8
-Call sub_08068BD0
-Wait 0x001e
-Call sub_08068E18
-_0807EA94 
-Call sub_08068EB4
-Call sub_0807DF50
-_0807E878 
-StopScript 
-StartScript 
-Call sub_08068EC4
-JumpIf 0x001e
-CheckEntityInteractType 
-JumpIf 0x0006
-Jump 0xffea
-StopScript 
-_0807E864 
-Call sub_08068E78
-_0807EA94 
-_0807E878 
-Jump 0xffd8
-StopScript 
-_0807E888 
-Call sub_0807F594
-Call sub_0807DF28
-_0807E864 
-SoundReq0x80100000 
-SoundReq 0x00cd
-Wait 0x003c
-SoundReq2 0x005e
-Call sub_08068F3C
-Call sub_08068E30
-_0807EA94 
-Call sub_08068C6C
-WaitPlayerAction8 
-_0807EA94 
-Jump 0x0016
-Call sub_08068E60
-_0807EA94 
-Jump 0x000a
-Call sub_08068E48
-_0807EA94 
-Call sub_0807DF50
-_0807E878 
-_0807EB44 0x0004
-_0807EF80 0x0000
-Jump 0xfea6
-.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807E930 0x0008
+script_080160B0:
+	StopScript 
+	StartScript 
+	CheckEntityInteractType 
+	JumpIf script_080160E0
+	TestBit 0x00000008
+	JumpIf script_080160D2
+	TestBit 0x00000010
+	JumpIf script_080160D2
+	Jump script_080160B0
+script_080160D2:
+	StopScript 
+	_0807EB74 
+	WaitForSomething2 0x00000004
+	Jump script_080160B0
+script_080160E0:
+	_0807E864 
+	_0807EB74 
+	StopScript 
+	HasRoomItemForSale 
+	JumpIfNot script_0801611A
+	TextboxNoOverlapFollow 0x2d07
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08016132
+	BuyItem 0x0000, 0x0000
+	JumpIf script_0801610C
+	TextboxNoOverlapFollow 0x2d0b
+	_0807EA94 
+	Jump script_08016132
+script_0801610C:
+	WaitPlayerAction8 
+	_0807EB8C 
+	TextboxNoOverlapFollow 0x2d0d
+	_0807EA94 
+	Jump script_08016132
+script_0801611A:
+	CheckKinstoneFused 0x0014
+	JumpIfNot script_0801612C
+	TextboxNoOverlapFollow 0x2d09
+	_0807EA94 
+	Jump script_08016132
+script_0801612C:
+	TextboxNoOverlapFollow 0x2d01
+	_0807EA94 
+script_08016132:
+	_0807E878 
+	_0807EB44 0x0004
+	Jump script_080160B0
+	StartScript 
+	Call sub_080787B4
+	StopScript 
+script_08016146:
+	CheckEntityInteractType 
+	JumpIfNot script_08016146
+	_0807E864 
+	GetInventoryValue 0x0025
+	_0807EAF0_4 0x2d03, 0x2d02, 0x2d02, 0x2d02
+	_0807E3E8 
+	JumpIfNot script_0801618A
+	_0807E48C 0x0020
+	JumpIf script_08016172
+	TextboxNoOverlapFollow 0x2d0c
+	Jump script_0801618A
+script_08016172:
+	BuyItem 0x0025, 0x0000
+	JumpIf script_08016184
+	TextboxNoOverlapFollow 0x2d0b
+	Jump script_0801618A
+script_08016184:
+	WaitPlayerAction8 
+	TextboxNoOverlapFollow 0x2d06
+script_0801618A:
+	_0807E878 
+	Jump script_08016146
+	StartScript 
+	Call sub_080787B4
+	StopScript 
+script_0801619A:
+	CheckEntityInteractType 
+	JumpIfNot script_0801619A
+	_0807E864 
+	GetInventoryValue 0x0024
+	_0807EAF0_4 0x2d05, 0x2d04, 0x2d04, 0x2d04
+	_0807E3E8 
+	JumpIfNot script_080161E2
+	_0807E48C 0x0020
+	JumpIf script_080161C6
+	TextboxNoOverlapFollow 0x2d0c
+	Jump script_080161E2
+script_080161C6:
+	BuyItem 0x0024, 0x0000
+	JumpIf script_080161D8
+	TextboxNoOverlapFollow 0x2d0b
+	Jump script_080161E2
+script_080161D8:
+	WaitPlayerAction8 
+	_0807EA94 
+	_0807EB8C 
+	TextboxNoOverlap 0x2d06
+script_080161E2:
+	_0807E878 
+	Jump script_0801619A
+	StartScript 
+	Call sub_0807F348
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	StopScript 
+script_080161FE:
+	Call sub_08068C28
+script_08016204:
+	CheckEntityInteractType 
+	JumpIfNot script_08016204
+	_0807E864 
+	Call sub_0807DF28
+	_0807EB74 
+	Call sub_08068CA0
+	JumpIf script_0801633E
+	Call sub_08068CFC
+	JumpIfNot script_08016332
+	Call sub_08068DB8
+	_0807EA94 
+	Call sub_08068DD0
+	_0807EA94 
+	_0807E3E8 
+	JumpIfNot script_08016346
+	StartPlayerScript script_0801635C
+	WaitForSomething2 0x00000001
+	_0807EB74 
+	Call sub_08068C8C
+	JumpIf script_08016262
+	Call sub_08068DE8
+	_0807EA94 
+	Wait 0x001e
+script_08016262:
+	Call sub_08068E00
+	_0807EA94 
+	_0807EF80 0x0001
+	Call sub_0807F2D4
+	Call sub_08068E90
+	Call sub_08068C8C
+	JumpIf script_0801631C
+	Call sub_08068F00
+	Call sub_08068F14
+	Call sub_08068BB4
+	CallWithArg sub_0807F244, 0x00010001
+	Call sub_08068B84
+	Call sub_0807F2A8
+	Call sub_08068BD0
+	Wait 0x001e
+	Call sub_08068E18
+	_0807EA94 
+	Call sub_08068EB4
+	Call sub_0807DF50
+	_0807E878 
+script_080162CC:
+	StopScript 
+	StartScript 
+	Call sub_08068EC4
+	JumpIf script_080162F6
+	CheckEntityInteractType 
+	JumpIf script_080162E4
+	Jump script_080162CC
+script_080162E4:
+	StopScript 
+	_0807E864 
+	Call sub_08068E78
+	_0807EA94 
+	_0807E878 
+	Jump script_080162CC
+script_080162F6:
+	StopScript 
+	_0807E888 
+	Call sub_0807F594
+	Call sub_0807DF28
+	_0807E864 
+	SoundReq0x80100000 
+	SoundReq 0x00cd
+	Wait 0x003c
+	SoundReq2 0x005e
+	Call sub_08068F3C
+script_0801631C:
+	Call sub_08068E30
+	_0807EA94 
+	Call sub_08068C6C
+	WaitPlayerAction8 
+	_0807EA94 
+	Jump script_08016346
+script_08016332:
+	Call sub_08068E60
+	_0807EA94 
+	Jump script_08016346
+script_0801633E:
+	Call sub_08068E48
+	_0807EA94 
+script_08016346:
+	Call sub_0807DF50
+	_0807E878 
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	Jump script_080161FE
+	.short 0x0000
diff --git a/data/scripts/script_0801635C.inc b/data/scripts/script_0801635C.inc
index ae7cba03..2f32c7fe 100644
--- a/data/scripts/script_0801635C.inc
+++ b/data/scripts/script_0801635C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0801635C
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0078, 0x0050
-_0807EB44 0x0000
-_0807EF80 0x0000
-_0807E5F8 0x00000001
-Call sub_080791BC
+	SetEntityNonPlanarMovement 0x0100
+	_0807EDD4 0x0078, 0x0050
+	_0807EB44 0x0000
+	_0807EF80 0x0000
+	_0807E5F8 0x00000001
+	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0801637C.inc b/data/scripts/script_0801637C.inc
index 4f3d7a3b..0f1c6a03 100644
--- a/data/scripts/script_0801637C.inc
+++ b/data/scripts/script_0801637C.inc
@@ -1,5 +1,5 @@
-SCRIPT_START script_0801637C
-.short 0xb500
-.short 0xf08c
-.short 0xfb1d
-.short 0xbd00
+thumb_func_start script_0801637C
+script_0801637C:
+    push {lr}
+    bl CreateDust
+    pop {pc}
diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc
index 91df7477..98cb9a21 100644
--- a/data/scripts/script_08016384.inc
+++ b/data/scripts/script_08016384.inc
@@ -1,57 +1,58 @@
 SCRIPT_START script_08016384
-StartScript 
-StopScript 
-Jump 0xfffa
-JumpIf 0xfff6
-JumpIfNot 0xfff2
-_0807E078 0xffee, 0xffec
-JumpAbsolute script_08016384
-JumpAbsoluteIf script_08016384
-JumpAbsoluteIfNot script_08016384
-_0807E0E0 script_08016384, script_08016384
-Call script_08016384
-CallWithArg script_08016384, 0x12345678
-LoadRoomEntityList script_08016384
-TestBit 0x00000001
-CheckInventory1 0x0001
-CheckInventory2 0x0001
-HasRoomItemForSale 
-CheckLocalFlag 0x0067
-CheckLocalFlagByOffset 0x0100, 0x006b
-CheckGlobalFlag 0x0013
-CheckRoomFlag 0x0000
-CheckPlayerInRegion 0x0000, 0x0000, 0x0000
-CheckPlayerInRegion2 0x0000
-CheckEntityInteractType 
-_0807E30C 
-HasRupees 0x00c8
-_0807E3E8 
-CheckKinstoneFused 0x0001
-BuyItem 0x006c, 0x0000
-_0807E48C 0x0020
-_0807E4CC 0x00000000
-_0807E4EC 0x00000000
-_0807E514 0x00000000
-CheckPlayerFlags 0x00000080
-_0807E564 
-EntityHasHeight 
-ComparePlayerAction 0x0001
-ComparePlayerAnimationState 0x0004
-_0807E5F8 0x00000001
-_0807E610 0x00000002
-SetLocalFlag 0x0067
-SetLocalFlagByOffset 0x0100, 0x0001
-ClearLocalFlag 0x0067
-SetGlobalFlag 0x0013
-ClearGlobalFlag 0x0013
-SetRoomFlag 0x0000
-ClearRoomFlag 0x0000
-Wait 0x001e
-WaitForSomething 0x00000001
-WaitForSomething2 0x00000002
-WaitPlayerAction8 
-WaitForPlayerAction0x17 
-WaitFor_1 
-WaitFor_2 
-_0807E778 0x0004
-_0807E788 0x0000ffff
+script_08016384:
+	StartScript 
+	StopScript 
+	Jump script_08016384
+	JumpIf script_08016384
+	JumpIfNot script_08016384
+	JumpSwitch script_08016384, script_08016384
+	JumpAbsolute script_08016384
+	JumpAbsoluteIf script_08016384
+	JumpAbsoluteIfNot script_08016384
+	JumpAbsoluteSwitch script_08016384, script_08016384
+	Call script_08016384
+	CallWithArg script_08016384, 0x12345678
+	LoadRoomEntityList script_08016384
+	TestBit 0x00000001
+	CheckInventory1 0x0001
+	CheckInventory2 0x0001
+	HasRoomItemForSale 
+	CheckLocalFlag 0x0067
+	CheckLocalFlagByOffset 0x0100, 0x006b
+	CheckGlobalFlag 0x0013
+	CheckRoomFlag 0x0000
+	CheckPlayerInRegion 0x0000, 0x0000, 0x0000
+	CheckPlayerInRegion2 0x0000
+	CheckEntityInteractType 
+	_0807E30C 
+	HasRupees 0x00c8
+	_0807E3E8 
+	CheckKinstoneFused 0x0001
+	BuyItem 0x006c, 0x0000
+	_0807E48C 0x0020
+	_0807E4CC 0x00000000
+	_0807E4EC 0x00000000
+	_0807E514 0x00000000
+	CheckPlayerFlags 0x00000080
+	_0807E564 
+	EntityHasHeight 
+	ComparePlayerAction 0x0001
+	ComparePlayerAnimationState 0x0004
+	_0807E5F8 0x00000001
+	_0807E610 0x00000002
+	SetLocalFlag 0x0067
+	SetLocalFlagByOffset 0x0100, 0x0001
+	ClearLocalFlag 0x0067
+	SetGlobalFlag 0x0013
+	ClearGlobalFlag 0x0013
+	SetRoomFlag 0x0000
+	ClearRoomFlag 0x0000
+	Wait 0x001e
+	WaitForSomething 0x00000001
+	WaitForSomething2 0x00000002
+	WaitPlayerAction8 
+	WaitForPlayerAction0x17 
+	WaitFor_1 
+	WaitFor_2 
+	_0807E778 0x0004
+	_0807E788 0x0000ffff
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index 6469cbd2..f983b93c 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -1,80 +1,80 @@
 SCRIPT_START script_08016482
-_0807E79C 
-ScriptCommandNop2 0x0080
-DoFade4 
-DoFade5 
-DoFade6 
-DoFade7 
-_0807E800 0x00000000
-_0807E80C 0x00000000
-_0807E858_ 
-_0807E864 
-_0807E878 
-_0807E888 
-SetPlayerAction 0x00005408
-StartPlayerScript script_08016384
-_0807E8D4 0x03a0
-_0807E8E4_0 
-_0807E8E4_1 
-_0807E8E4_2 
-_0807E8E4_3 
-_0807E908 0x0004
-_0807E914 0x00000000
-_0807E924 
-_0807E930 0x0000
-_0807E944 
-_0807E974 0x0600
-_0807E9D4 
-_0807E9DC 
-_0807E9E4 0x0000
-_0807EA88 0x0001
-_0807EA94 
-TextboxNoOverlapFollow 0x0601
-TextboxNoOverlap 0x0601
-TextboxNoOverlapFollowPos_s 0x0601
-_0807EAF0_sss 0x0601, 0x0602, 0x0603
-TextboxNoOverlapVar 
-_0807EB28 0x0602
-_0807EB38 
-_0807EB44 0x0000
-_0807EB4C 0x0000, 0x0000
-_0807EB74 
-_0807EB8C 
-SetEntityDirection 0x0000
-SetEntityDirectionWithAnimationState 0x0000
-SetEntityNonPlanarMovement 0x0100
-SetEntity0x20 0x00018000
-SetEntityPositionRelative 0x00000000
-MoveEntityToPlayer 
-ScriptCommandNop3 
-_0807EC1C 0x0010
-_0807EC64 0x0020
-_0807EC94 0x0030
-_0807ECC4 0x0040
-_0807ECF4 0x0050
-_0807ED24 0x0000, 0x0000, 0x0000
-_0807EDD4 0x0000, 0x0000
-_0807EE04 0x0000, 0x0000
-_0807EE30 
-_0807EEB4 
-_0807EEF4 0xfff0, 0x0014
-_0807EF80 0x0000
-_0807EF90 0x0001
-SoundReq 0x0074
-SoundReq2 0x001d
-SoundReq3 0x00000074
-SoundReq0x80100000 
-ModRupees 0xff38
-ModHealth 0x0010
-IncreaseMaxHealth 0x0008
-_0807F050 0x0001
-_0807F034 0x0001
-GetInventoryValue 0x0001
-_0807F078 0x0001, 0x0002
-_0807F088 0x0001
-CameraTargetEntity 
-CameraTargetPlayer 
-_0807F0B4 0x0007
-_0807F0C8 0x003c, 0x0003
+	_0807E79C 
+	ScriptCommandNop2 0x0080
+	DoFade4 
+	DoFade5 
+	DoFade6 
+	DoFade7 
+	_0807E800 0x00000000
+	_0807E80C 0x00000000
+	_0807E858_0 
+	_0807E864 
+	_0807E878 
+	_0807E888 
+	SetPlayerAction 0x00005408
+	StartPlayerScript script_08016384
+	_0807E8D4 0x03a0
+	_0807E8E4_0 
+	_0807E8E4_1 
+	_0807E8E4_2 
+	_0807E8E4_3 
+	_0807E908 0x0004
+	_0807E914 0x00000000
+	_0807E924 
+	_0807E930 0x0000
+	_0807E944 
+	_0807E974 0x0600
+	_0807E9D4 
+	_0807E9DC 
+	_0807E9E4 0x0000
+	_0807EA88 0x0001
+	_0807EA94 
+	TextboxNoOverlapFollow 0x0601
+	TextboxNoOverlap 0x0601
+	TextboxNoOverlapFollowPos_1 0x0601
+	_0807EAF0_3 0x0601, 0x0602, 0x0603
+	TextboxNoOverlapVar 
+	_0807EB28 0x0602
+	_0807EB38 
+	_0807EB44 0x0000
+	_0807EB4C 0x0000, 0x0000
+	_0807EB74 
+	_0807EB8C 
+	SetEntityDirection 0x0000
+	SetEntityDirectionWithAnimationState 0x0000
+	SetEntityNonPlanarMovement 0x0100
+	SetEntity0x20 0x00018000
+	SetEntityPositionRelative 0x00000000
+	MoveEntityToPlayer 
+	ScriptCommandNop3 
+	_0807EC1C 0x0010
+	_0807EC64 0x0020
+	_0807EC94 0x0030
+	_0807ECC4 0x0040
+	_0807ECF4 0x0050
+	_0807ED24 0x0000, 0x0000, 0x0000
+	_0807EDD4 0x0000, 0x0000
+	_0807EE04 0x0000, 0x0000
+	_0807EE30 
+	_0807EEB4 
+	_0807EEF4 0xfff0, 0x0014
+	_0807EF80 0x0000
+	_0807EF90 0x0001
+	SoundReq 0x0074
+	SoundReq2 0x001d
+	SoundReq3 0x00000074
+	SoundReq0x80100000 
+	ModRupees 0xff38
+	ModHealth 0x0010
+	IncreaseMaxHealth 0x0008
+	_0807F050 0x0001
+	_0807F034 0x0001
+	GetInventoryValue 0x0001
+	_0807F078 0x0001, 0x0002
+	_0807F088 0x0001
+	CameraTargetEntity 
+	CameraTargetPlayer 
+	_0807F0B4 0x0007
+	_0807F0C8 0x003c, 0x0003
 SCRIPT_END
-.short 0x0000
+	.short 0x0000
diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc
index 510a3c75..888efad8 100644
--- a/data/scripts/script_080165A4.inc
+++ b/data/scripts/script_080165A4.inc
@@ -1,16 +1,18 @@
 SCRIPT_START script_080165A4
-StartScript 
-_0807EF80 0x000a
-_0807EB44 0x0004
-_0807E9D4 
-StopScript 
-_0807E974 0x0601
-Jump 0xfffa
-.short 0x0000
-Wait 0x001e
-CheckPlayerInRegion2 0x2020
-JumpIfNot 0xfff6
-_0807EF80 0x0003
-Call script_0801637C+1
-Jump 0xffe8
-.short 0x0000
+	StartScript 
+	_0807EF80 0x000a
+	_0807EB44 0x0004
+	_0807E9D4 
+	StopScript 
+script_080165B2:
+	_0807E974 0x0601
+	Jump script_080165B2
+	.short 0x0000
+script_080165BC:
+	Wait 0x001e
+	CheckPlayerInRegion2 0x2020
+	JumpIfNot script_080165BC
+	_0807EF80 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 6e52616b..c774fcfa 100644
--- a/data/scripts/script_080165D8.inc
+++ b/data/scripts/script_080165D8.inc
@@ -1,239 +1,253 @@
 SCRIPT_START script_080165D8
-Wait 0x001e
-CheckPlayerInRegion2 0x2020
-JumpAbsoluteIfNot script_080165D8
-_0807EF80 0x0003
-Call script_0801637C+1
-JumpAbsolute script_080165D8
-.short 0x0000
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-TextboxNoOverlapFollow 0x0601
-Jump 0xfff4
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-TextboxNoOverlapFollow 0x0602
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-_0807EB28 0x0603
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffee
-.short 0x0000
-SetEntityNonPlanarMovement 0x0100
-_0807ECF4 0x0030
-Wait 0x0008
-_0807ECC4 0x0030
-Wait 0x0008
-_0807EC94 0x0030
-Wait 0x0008
-_0807EC64 0x0030
-Wait 0x0008
-Jump 0xffde
-_0807ED24 0x0055, 0x0039, 0x00b4
-Wait 0x0008
-_0807ED24 0x0075, 0x0076, 0x003c
-Wait 0x0008
-_0807ED24 0x0105, 0x006c, 0x0078
-Wait 0x0008
-_0807ED24 0x018e, 0x007a, 0x0078
-Wait 0x0008
-_0807ED24 0x0173, 0x0023, 0x003c
-Wait 0x0008
-_0807ED24 0x00d8, 0x003f, 0x003c
-Wait 0x0008
-Jump 0xffb6
-SetEntityNonPlanarMovement 0x0100
-_0807EDD4 0x0055, 0x0039
-Wait 0x0008
-_0807EDD4 0x0075, 0x0076
-Wait 0x0008
-_0807EDD4 0x0105, 0x006c
-Wait 0x0008
-_0807EDD4 0x018e, 0x007a
-Wait 0x0008
-_0807EDD4 0x0173, 0x0023
-Wait 0x0008
-_0807EDD4 0x00d8, 0x003f
-Wait 0x0008
-Jump 0xffc2
-SetEntityNonPlanarMovement 0x0100
-_0807EC94 0x0030
-_0807E5F8 0x00000002
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000001
-_0807E610 0x00000001
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-WaitForSomething 0x00000001
-_0807E610 0x00000001
-_0807ECF4 0x0030
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-Wait 0x001e
-_0807E5F8 0x00000006
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Wait 0x003c
-Jump 0xff6a
-SetEntityNonPlanarMovement 0x0100
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EC94 0x0030
-_0807E5F8 0x00000004
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807ECF4 0x0030
-_0807E5F8 0x00000001
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000002
-_0807E610 0x00000002
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Jump 0xff5a
-SetEntityNonPlanarMovement 0x0100
-WaitForSomething 0x00000004
-_0807E610 0x00000004
-_0807EC94 0x0030
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-Wait 0x001e
-_0807E5F8 0x00000003
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Wait 0x003c
-_0807ECF4 0x0030
-_0807E5F8 0x00000002
-Wait 0x000f
-_0807EF80 0x0000
-_0807EB44 0x0004
-WaitForSomething 0x00000004
-_0807E610 0x00000004
-_0807EF80 0x0003
-Wait 0x0002
-_0807EB44 0x0006
-Wait 0x0002
-_0807EB44 0x0000
-Wait 0x0002
-_0807EB44 0x0002
-Wait 0x0002
-_0807EB44 0x0004
-Jump 0xff6a
-StartScript 
-_0807E9D4 
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x000f
-_0807E878 
-Jump 0xfff4
-StartScript 
-Call sub_08064EA4
-_0807EB44 0x0004
-_0807EF80 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E30C 
-JumpIfNot 0xfffc
-_0807E864 
-_0807EB74 
-Call sub_08064F28
-_0807EA94 
-JumpIfNot 0x0008
-_0807F034 0x003d
-WaitPlayerAction8 
-_0807E878 
-SetGlobalFlag 0x005c
-Jump 0xffdc
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x0018
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
-StartScript 
-_0807E9D4 
-_0807EB44 0x0000
-_0807EF80 0x000a
-_0807E930 0x0000
-StopScript 
-_0807E944 
-_0807E864 
-Wait 0x0018
-TextboxNoOverlapFollow 0x0a01
-_0807EA94 
-Wait 0x000f
-_0807E878 
-Jump 0xffea
-.short 0x0000
+	Wait 0x001e
+	CheckPlayerInRegion2 0x2020
+	JumpAbsoluteIfNot script_080165D8
+	_0807EF80 0x0003
+	Call script_0801637C+1
+	JumpAbsolute script_080165D8
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	StopScript 
+script_080165FE:
+	_0807E30C 
+	JumpIfNot script_080165FE
+	TextboxNoOverlapFollow 0x0601
+	Jump script_080165FE
+	StartScript 
+	_0807E9D4 
+	StopScript 
+script_08016612:
+	_0807E944 
+	_0807E864 
+	TextboxNoOverlapFollow 0x0602
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_08016612
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	StopScript 
+script_0801662E:
+	_0807E944 
+	_0807E864 
+	_0807EB28 0x0603
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0801662E
+	.short 0x0000
+	SetEntityNonPlanarMovement 0x0100
+script_08016648:
+	_0807ECF4 0x0030
+	Wait 0x0008
+	_0807ECC4 0x0030
+	Wait 0x0008
+	_0807EC94 0x0030
+	Wait 0x0008
+	_0807EC64 0x0030
+	Wait 0x0008
+	Jump script_08016648
+script_0801666C:
+	_0807ED24 0x0055, 0x0039, 0x00b4
+	Wait 0x0008
+	_0807ED24 0x0075, 0x0076, 0x003c
+	Wait 0x0008
+	_0807ED24 0x0105, 0x006c, 0x0078
+	Wait 0x0008
+	_0807ED24 0x018e, 0x007a, 0x0078
+	Wait 0x0008
+	_0807ED24 0x0173, 0x0023, 0x003c
+	Wait 0x0008
+	_0807ED24 0x00d8, 0x003f, 0x003c
+	Wait 0x0008
+	Jump script_0801666C
+	SetEntityNonPlanarMovement 0x0100
+script_080166BC:
+	_0807EDD4 0x0055, 0x0039
+	Wait 0x0008
+	_0807EDD4 0x0075, 0x0076
+	Wait 0x0008
+	_0807EDD4 0x0105, 0x006c
+	Wait 0x0008
+	_0807EDD4 0x018e, 0x007a
+	Wait 0x0008
+	_0807EDD4 0x0173, 0x0023
+	Wait 0x0008
+	_0807EDD4 0x00d8, 0x003f
+	Wait 0x0008
+	Jump script_080166BC
+	SetEntityNonPlanarMovement 0x0100
+script_08016700:
+	_0807EC94 0x0030
+	_0807E5F8 0x00000002
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807EB44 0x0004
+	WaitForSomething 0x00000001
+	_0807E610 0x00000001
+	_0807EF80 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	WaitForSomething 0x00000001
+	_0807E610 0x00000001
+	_0807ECF4 0x0030
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807EB44 0x0004
+	Wait 0x001e
+	_0807E5F8 0x00000006
+	_0807EF80 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Wait 0x003c
+	Jump script_08016700
+	SetEntityNonPlanarMovement 0x0100
+script_0801679C:
+	WaitForSomething 0x00000002
+	_0807E610 0x00000002
+	_0807EC94 0x0030
+	_0807E5F8 0x00000004
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807EB44 0x0004
+	WaitForSomething 0x00000002
+	_0807E610 0x00000002
+	_0807EF80 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	WaitForSomething 0x00000002
+	_0807E610 0x00000002
+	_0807ECF4 0x0030
+	_0807E5F8 0x00000001
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807EB44 0x0004
+	WaitForSomething 0x00000002
+	_0807E610 0x00000002
+	_0807EF80 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Jump script_0801679C
+	SetEntityNonPlanarMovement 0x0100
+script_08016848:
+	WaitForSomething 0x00000004
+	_0807E610 0x00000004
+	_0807EC94 0x0030
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807EB44 0x0004
+	Wait 0x001e
+	_0807E5F8 0x00000003
+	_0807EF80 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Wait 0x003c
+	_0807ECF4 0x0030
+	_0807E5F8 0x00000002
+	Wait 0x000f
+	_0807EF80 0x0000
+	_0807EB44 0x0004
+	WaitForSomething 0x00000004
+	_0807E610 0x00000004
+	_0807EF80 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Jump script_08016848
+	StartScript 
+	_0807E9D4 
+	StopScript 
+script_080168E6:
+	_0807E944 
+	_0807E864 
+	Wait 0x000f
+	_0807E878 
+	Jump script_080168E6
+	StartScript 
+	Call sub_08064EA4
+	_0807EB44 0x0004
+	_0807EF80 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0801690A:
+	_0807E30C 
+	JumpIfNot script_0801690A
+	_0807E864 
+	_0807EB74 
+	Call sub_08064F28
+	_0807EA94 
+	JumpIfNot script_08016926
+	_0807F034 0x003d
+	WaitPlayerAction8 
+script_08016926:
+	_0807E878 
+	SetGlobalFlag 0x005c
+	Jump script_0801690A
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0000
+	_0807EF80 0x000a
+	StopScript 
+script_0801693E:
+	_0807E944 
+	_0807E864 
+	Wait 0x0018
+	TextboxNoOverlapFollow 0x0a01
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0801693E
+	.short 0x0000
+	StartScript 
+	_0807E9D4 
+	_0807EB44 0x0000
+	_0807EF80 0x000a
+	_0807E930 0x0000
+	StopScript 
+script_0801696A:
+	_0807E944 
+	_0807E864 
+	Wait 0x0018
+	TextboxNoOverlapFollow 0x0a01
+	_0807EA94 
+	Wait 0x000f
+	_0807E878 
+	Jump script_0801696A
+	.short 0x0000
diff --git a/src/script.c b/src/script.c
index 9ee2d8ca..251359b7 100644
--- a/src/script.c
+++ b/src/script.c
@@ -18,11 +18,11 @@ void ScriptCommand_StopScript(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_Jump(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpIf(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpSwitch(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpAbsolute(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpAbsoluteIf(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpAbsoluteSwitch(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context);
@@ -163,11 +163,11 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_Jump,
                                           ScriptCommand_JumpIf,
                                           ScriptCommand_JumpIfNot,
-                                          ScriptCommand_0807E078,
+                                          ScriptCommand_JumpSwitch,
                                           ScriptCommand_JumpAbsolute,
                                           ScriptCommand_JumpAbsoluteIf,
                                           ScriptCommand_JumpAbsoluteIfNot,
-                                          ScriptCommand_0807E0E0,
+                                          ScriptCommand_JumpAbsoluteSwitch,
                                           ScriptCommand_Call,
                                           ScriptCommand_CallWithArg,
                                           ScriptCommand_LoadRoomEntityList,
@@ -657,7 +657,7 @@ void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_JumpSwitch(Entity* entity, ScriptExecutionContext* context) {
     if (gActiveScriptInfo.commandSize > context->unk_04) {
         context->scriptInstructionPointer += context->unk_04;
         ScriptCommand_Jump(entity, context);
@@ -682,7 +682,7 @@ void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* con
     }
 }
 
-void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_JumpAbsoluteSwitch(Entity* entity, ScriptExecutionContext* context) {
     if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) {
         context->scriptInstructionPointer += context->unk_04 << 1;
         ScriptCommand_JumpAbsolute(entity, context);
diff --git a/tools/script_disassembler/.gitignore b/tools/script_disassembler/.gitignore
new file mode 100644
index 00000000..9289883f
--- /dev/null
+++ b/tools/script_disassembler/.gitignore
@@ -0,0 +1 @@
+labels.txt
\ No newline at end of file
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
new file mode 100644
index 00000000..f12ce493
--- /dev/null
+++ b/tools/script_disassembler/definitions.py
@@ -0,0 +1,326 @@
+from utils import barray_to_u16_hex, barray_to_u32_hex, barray_to_s16
+import struct
+
+commands = [
+    {'fun': 'ScriptCommandNop', 'params': ''},
+    {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'},
+    {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'},
+    {'fun': 'ScriptCommand_Jump', 'params': 'j', 'name': 'jump by offset'},
+    {'fun': 'ScriptCommand_JumpIf', 'params': 'j', 'name': 'jump if'},
+    {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j', 'name': 'jump if not'},
+    {'fun': 'ScriptCommand_JumpSwitch', 'params': ['jj', 'jjj', 'jjjj', 'jjjjjjj', 'jjjjjjjjj']},
+    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x','name': 'abs jump' },
+    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x', 'name': 'abs jump if'},
+    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x', 'name': 'abs jump if not'},
+    {'fun': 'ScriptCommand_JumpAbsoluteSwitch', 'params': 'xx'},
+    {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
+    {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']},
+    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
+    {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
+    {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
+    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''},
+    {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
+    {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckRoomFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckPlayerInRegion', 'params': 'sss'},
+    {'fun': 'ScriptCommand_CheckPlayerInRegion2', 'params': 's'},
+    {'fun': 'ScriptCommand_CheckEntityInteractType', 'params': ''},
+    {'fun': 'ScriptCommand_0807E30C', 'params': ''},
+    {'fun': 'ScriptCommand_HasRupees', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E3BC', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E3E8', 'params': ''},
+    {'fun': 'ScriptCommand_CheckKinstoneFused', 'params': 's'},
+    {'fun': 'ScriptCommand_BuyItem', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807E48C', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E514', 'params': 'w'},
+    {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'},
+    {'fun': 'ScriptCommand_0807E564', 'params': ''},
+    {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''},
+    {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'},
+    {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},# 'exec': ScriptCommand_0807E5F8},
+    {'fun': 'ScriptCommand_0807E610', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'},
+    {'fun': 'ScriptCommand_ClearLocalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_SetGlobalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_ClearGlobalFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_SetRoomFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_ClearRoomFlag', 'params': 's'},
+    {'fun': 'ScriptCommand_Wait', 'params': 's'},
+    {'fun': 'ScriptCommand_WaitForSomething', 'params': 'w'},
+    {'fun': 'ScriptCommand_WaitForSomething2', 'params': 'w'},
+    {'fun': 'ScriptCommand_WaitPlayerAction8', 'params': ''},
+    {'fun': 'ScriptCommand_WaitForPlayerAction0x17', 'params': ''},
+    {'fun': 'ScriptCommand_WaitFor_1', 'params': ''},
+    {'fun': 'ScriptCommand_WaitFor_2', 'params': ''},
+    {'fun': 'ScriptCommand_0807E778', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E788', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E79C', 'params': ''},
+    {'fun': 'ScriptCommandNop2', 'params': 's'},
+    {'fun': 'ScriptCommand_DoFade4', 'params': ''},
+    {'fun': 'ScriptCommand_DoFade5', 'params': ''},
+    {'fun': 'ScriptCommand_DoFade6', 'params': ''},
+    {'fun': 'ScriptCommand_DoFade7', 'params': ''},
+    {'fun': 'ScriptCommand_0807E800', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E80C', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E858', 'params': ['s', '']},
+    {'fun': 'ScriptCommand_0807E864', 'params': ''},
+    {'fun': 'ScriptCommand_0807E878', 'params': ''},
+    {'fun': 'ScriptCommand_0807E888', 'params': ''},
+    {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'},
+    {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'},
+    {'fun': 'ScriptCommand_0807E8D4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E908', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E914', 'params': 'w'},
+    {'fun': 'ScriptCommand_0807E924', 'params': ''},
+    {'fun': 'ScriptCommand_0807E930', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E944', 'params': ''},
+    {'fun': 'ScriptCommand_0807E974', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E9D4', 'params': ''},
+    {'fun': 'ScriptCommand_0807E9DC', 'params': ''},
+    {'fun': 'ScriptCommand_0807E9E4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807E9F0', 'params': ''},
+    {'fun': 'ScriptCommand_0807EA4C', 'params': ''},
+    {'fun': 'ScriptCommand_0807EA88', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EA94', 'params': ''},
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
+    {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['w', 's']}, # TODO w or ss?
+    {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']},
+    {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
+    {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EB38', 'params': ''},
+    {'fun': 'ScriptCommand_0807EB44', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EB4C', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EB74', 'params': ''},
+    {'fun': 'ScriptCommand_0807EB8C', 'params': ''},
+    {'fun': 'ScriptCommand_SetEntityDirection', 'params': 's'},
+    {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'},
+    {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'},
+    {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'},
+    {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''},
+    {'fun': 'ScriptCommandNop3', 'params': ''},
+    {'fun': 'ScriptCommand_0807EC1C', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EC64', 'params': 's'},
+    {'fun': 'ScriptCommand_0807EC94', 'params': 's'},
+    {'fun': 'ScriptCommand_0807ECC4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807ECF4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807ED24', 'params': 'sss'},
+    {'fun': 'ScriptCommand_0807EDD4', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EE04', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807EE30', 'params': ''},
+    {'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': 'ScriptCommand_SoundReq', 'params': 's'},
+    {'fun': 'ScriptCommand_SoundReq2', 'params': 's'},
+    {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'},
+    {'fun': 'ScriptCommand_SoundReq0x80100000', 'params': ''},
+    {'fun': 'ScriptCommand_ModRupees', 'params': 's'},
+    {'fun': 'ScriptCommand_ModHealth', 'params': 's'},
+    {'fun': 'ScriptCommand_IncreaseMaxHealth', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F034', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F050', 'params': 's'},
+    {'fun': 'ScriptCommand_GetInventoryValue', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F078', 'params': 'ss'},
+    {'fun': 'ScriptCommand_0807F088', 'params': 's'},
+    {'fun': 'ScriptCommand_CameraTargetEntity', 'params': ''},
+    {'fun': 'ScriptCommand_CameraTargetPlayer', 'params': ''},
+    {'fun': 'ScriptCommand_0807F0B4', 'params': 's'},
+    {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'}
+]
+
+
+
+
+# Functions that have already been renamed
+POINTER_MAP = {
+    'sub_08095458': 'nullsub_527',
+    'sub_0805EBCC': 'DeleteAllEnemies',
+    'sub_0806C23C': 'Simon_CreateChest',
+    'sub_0801637C': 'script_0801637C+1',
+    'sub_08016383': 'script_08016384',
+    'sub_0806C598': 'FUN_0806c598',
+    'sub_080A2138': 'Windcrest_Unlock',
+    'sub_080A29BC': 'CreateDust'
+}
+# tries to directly reference the function this is pointing to
+def get_pointer(barray):
+    integers = struct.unpack('I', barray)
+    pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
+    if pointer in POINTER_MAP:
+        return POINTER_MAP[pointer]
+    return pointer
+
+# Data pointers that actually point to a script location
+DATA_MAP = {
+    'gUnk_08016384': 'script_08016384'
+}
+def get_data_pointer(barray):
+    integers = struct.unpack('I', barray)
+    pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper()
+    if pointer in DATA_MAP:
+        return DATA_MAP[pointer]
+    return pointer
+
+def get_script_pointer(barray):
+    integers = struct.unpack('I', barray)
+    return 'script_' + (struct.pack('>I', integers[0]).hex()).upper()
+
+
+def get_script_label(u32):
+    return hex(u32).upper().replace('0X', 'script_0')
+
+
+used_labels = set()
+def use_script_label(u32):
+    global used_labels
+    used_labels.add(u32)
+    label = get_script_label(u32)
+    return label
+
+
+
+
+# definitions for parameter types
+parameters = {
+    '': {
+        'length':0,
+        'param': '',
+        'expr': '',
+        'read': lambda ctx: ''
+    },
+    's': { 
+        'length': 1,
+        'param': 's',
+        'expr': '	.short \s',
+        'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0]
+    },
+    'ss': {
+        'length': 2,
+        'param': 'a,b',
+        'expr': '	.short \\a\n	.short \\b',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+    },
+    'sss': {
+        'length': 3,
+        'param': 'a,b,c',
+        'expr': '	.short \\a\n	.short \\b\n	.short \\c',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8]))
+    },
+    'ssss': {
+        'length': 4,
+        'param': 'a,b,c,d',
+        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d',
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
+    },
+
+    'w': {
+        'length': 2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
+    },
+    'ww': {
+        'length': 4,
+        'param': 'a,b',
+        'expr': '	.word \\a\n	.word \\b',
+        'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
+    },
+
+
+    'j': { # Relative jump target
+        'length': 1,
+        'param': 's',
+        'expr': '1:	.short \s - 1b',
+        'read': lambda ctx: use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+2:ctx.ptr+4]))
+        # hex(ctx.script_addr + barray_to_s16(ctx.data[ctx.ptr+2:ctx.ptr+4])).upper().replace('0X', 'script_0')
+    },
+    'jj': {
+        'length': 2,
+        'param': 'a,b',
+        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2',
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,2)])
+    },  
+    'jjj': {
+        'length': 3,
+        'param': 'a,b,c',
+        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4',
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,3)])
+    },
+    'jjjj': {
+        'length': 4,
+        'param': 'a,b,c,d',
+        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6',
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,4)])
+    },
+    'jjjjjjj': {
+        'length': 7,
+        'param': 'a,b,c,d,e,f,g',
+        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6\n	.short \\e - 1b - 8\n	.short \\f - 1b - 10\n	.short \\g - 1b - 12',
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,7)])
+    },  
+    'jjjjjjjjj': {
+        'length': 9,
+        'param': 'a,b,c,d,e,f,g,h,i',
+        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6\n	.short \\e - 1b - 8\n	.short \\f - 1b - 10\n	.short \\g - 1b - 12\n	.short \\h - 1b - 14\n	.short \\i - 1b - 16',
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,9)])
+    }, 
+    'p': {
+        'length': 2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+    },
+
+    'pw': {
+        'length': 4,
+        'param': 'a,b',
+        'expr': '	.word \\a\n	.word \\b',
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+14])[0]
+    },
+    'd': { # Data pointer
+        'length': 2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+    },
+    'x': { # Script pointer
+        'length': 2,
+        'param': 'w',
+        'expr': '	.word \w',
+        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+    },
+    'xx': {
+        'length': 4,
+        'param': 'a, b',
+        'expr': '	.word \\a\n	.word \\b',
+        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10])
+    },
+    # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations
+    # 'v': { 
+    #     'length': -1,
+    #     'param': '',
+    #     'expr': '',
+    #     'read': lambda ctx: ''
+    # },
+    # 'pv': {
+    #     'length': -2,
+    #     'param': 'w',
+    #     'expr': '	.word \w',
+    #     'read': lambda ctx: ''
+    # },
+}
\ No newline at end of file
diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py
index 0416892e..70fe3da9 100644
--- a/tools/script_disassembler/incbin_parser.py
+++ b/tools/script_disassembler/incbin_parser.py
@@ -14,8 +14,8 @@ SCRIPTS_END=0x08016984
 # Currently done by splitting the script at that point
 LABEL_BREAKS=[0x0800A088, 0x0800ACE0, 0x0800AD54, 0x0800B41C, 0x0800B7C4, 0x0800C8C8, 0x0800D190, 0x800D3EC, 0x0800E9F4, 0x0800FD80, 0x08012AC8, 0x08012F0C, 0x080130E4, 0x08013B70, 0x080142B0, 0x080147DC, 0x08014A80, 0x08014B10,0x0801635C,  0x08016384, 0x080165D8]
 
-# Generate a version of the script that is annotated with the byte offset to the beginning of the script
-GENERATE_REF=False
+# Whether to output a label for every line
+PRINT_ALL_LABELS=False
 
 def read_baserom():
     # read baserom data
@@ -25,9 +25,8 @@ def read_baserom():
 def get_label(addr):
     return hex(addr).upper().replace('0X', 'script_0')
 
-def main():
-    baserom_data = read_baserom()
 
+def disassemble_scripts(baserom_data):
     script_start = SCRIPTS_START-ROM_OFFSET
 
     scripts = '''	.include "asm/macros.inc"
@@ -40,11 +39,11 @@ def main():
 	.text
     
 '''
+    label_break = 0
 
     while script_start < SCRIPTS_END-ROM_OFFSET:
-        if len(LABEL_BREAKS) > 0 and script_start+ROM_OFFSET >=LABEL_BREAKS[0]:
-            print(f'{hex(script_start+ROM_OFFSET)} > {LABEL_BREAKS[0]}')
-            LABEL_BREAKS.pop(0)
+        if label_break < len(LABEL_BREAKS) and script_start+ROM_OFFSET >=LABEL_BREAKS[label_break]:
+            label_break += 1
 
         label = get_label(script_start+ROM_OFFSET)
         print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...")
@@ -54,41 +53,62 @@ def main():
         if script_end > SCRIPTS_END-ROM_OFFSET:
             script_end = SCRIPTS_END-ROM_OFFSET
 
-        if len(LABEL_BREAKS) > 0 and script_end+ROM_OFFSET > LABEL_BREAKS[0]:
-            print(f'break at {hex(LABEL_BREAKS[0])} instead of {hex(script_end)}')
-            script_end = LABEL_BREAKS[0]-ROM_OFFSET
+        if label_break < len(LABEL_BREAKS) and script_end+ROM_OFFSET > LABEL_BREAKS[label_break]:
+            #print(f'break at {hex(LABEL_BREAKS[label_break])} instead of {hex(script_end)}')
+            script_end = LABEL_BREAKS[label_break]-ROM_OFFSET
 
         # read data from rom
         data = baserom_data[script_start:script_end]
 
 
+
         scripts += f'	.include "data/scripts/{label}.inc"\n'
         stdout = sys.stdout
 
-        with open(f'{TMC_FOLDER}/data/scripts/{label}.ref' if GENERATE_REF else f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
+        with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
             sys.stdout = out
+
+            if script_start == 0x1637C: # This function is actually assembly
+                print ('''thumb_func_start script_0801637C
+script_0801637C:
+    push {lr}
+    bl CreateDust
+    pop {pc}''')
+                sys.stdout = stdout
+                script_start = script_end 
+                continue
+
             print(f'SCRIPT_START {label}')
-            if GENERATE_REF:
-                res = disassemble_script(data, True)
-            else:
-                res = disassemble_script(data)
+            res = disassemble_script(data, script_start+ROM_OFFSET, PRINT_ALL_LABELS)
             if res != 0:
                 # Script ended in the middle, need to create a new file
                 script_end = script_start + res
         sys.stdout = stdout
 
         script_start = script_end 
+    return scripts
+
+def main():
+    baserom_data = read_baserom()
+
+    # Do two passes, in the first pass not all labels that are jumped to are known, so those labels are recorded in the first pass
+    # This is not necessary when all labels are printed
+    if not PRINT_ALL_LABELS:
+        print('Collecting labels...')
+        disassemble_scripts(baserom_data)
+    print('Writing scripts with labels...')
+    scripts = disassemble_scripts(baserom_data)
+
+    print('Writing scripts.s file...')
+    with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out:
+        out.write(scripts)
+    print('Generating asm macros...')
+    stdout = sys.stdout
+    with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out:
+        sys.stdout = out
+        generate_macros()
+    sys.stdout = stdout
 
-    if not GENERATE_REF:
-        print('Writing scripts.s file...')
-        with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out:
-            out.write(scripts)
-        print('Generating asm macros...')
-        stdout = sys.stdout
-        with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out:
-            sys.stdout = out
-            generate_macros()
-        sys.stdout = stdout
     print('\033[1;92mDone\033[0m\n')
 
 if __name__ == '__main__':
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 2cf3524d..fe35bcd1 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -1,5 +1,8 @@
 from dataclasses import dataclass
 import struct
+from utils import barray_to_u16_hex, barray_to_u32_hex, u16_to_hex, u32_to_hex
+from definitions import get_pointer, get_data_pointer, get_script_pointer, commands, parameters, get_script_label, used_labels
+
 
 # Disassembler for tmc scripts
 # Input 'macros' to generate the macros for the script commands
@@ -11,302 +14,8 @@ import struct
 class Context:
     ptr: int
     data: bytes
+    script_addr: int
 
-def u16_to_hex(value):
-    return '0x' + (struct.pack('>H', value).hex())
-
-def barray_to_u16_hex(barray):
-    count = len(barray)//2
-    integers = struct.unpack('H'*count, barray)
-    return [u16_to_hex(x) for x in integers]
-
-def u32_to_hex(value):
-    return '0x' + (struct.pack('>I', value).hex())
-
-def barray_to_u32_hex(barray):
-    count = len(barray)//4
-    integers = struct.unpack('I'*count, barray)
-    return [u32_to_hex(x) for x in integers]
-
-
-# Functions that have already been renamed
-POINTER_MAP = {
-    'sub_08095458': 'nullsub_527',
-    'sub_0805EBCC': 'DeleteAllEnemies',
-    'sub_0806C23C': 'Simon_CreateChest',
-    'sub_0801637C': 'script_0801637C+1',
-    'sub_08016383': 'script_08016384',
-    'sub_0806C598': 'FUN_0806c598',
-    'sub_080A2138': 'Windcrest_Unlock',
-    'sub_080A29BC': 'CreateDust'
-}
-# tries to directly reference the function this is pointing to
-def get_pointer(barray):
-    integers = struct.unpack('I', barray)
-    pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
-    if pointer in POINTER_MAP:
-        return POINTER_MAP[pointer]
-    return pointer
-
-# Data pointers that actually point to a script location
-DATA_MAP = {
-    'gUnk_08016384': 'script_08016384'
-}
-def get_data_pointer(barray):
-    integers = struct.unpack('I', barray)
-    pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper()
-    if pointer in DATA_MAP:
-        return DATA_MAP[pointer]
-    return pointer
-
-def get_script_pointer(barray):
-    integers = struct.unpack('I', barray)
-    return 'script_' + (struct.pack('>I', integers[0]).hex()).upper()
-
-
-commands = [
-    {'fun': 'ScriptCommandNop', 'params': ''},
-    {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'},
-    {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'},
-    {'fun': 'ScriptCommand_Jump', 'params': 's', 'name': 'jump by offset'},
-    {'fun': 'ScriptCommand_JumpIf', 'params': 's', 'name': 'jump if'},
-    {'fun': 'ScriptCommand_JumpIfNot', 'params': 's', 'name': 'jump if not'},
-    {'fun': 'ScriptCommand_0807E078', 'params': ['ss', 'sss', 'ssss', 'sssssss', 'sssssssss']},
-    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x','name': 'abs jump' },
-    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x', 'name': 'abs jump if'},
-    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x', 'name': 'abs jump if not'},
-    {'fun': 'ScriptCommand_0807E0E0', 'params': 'xx'},
-    {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
-    {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']},
-    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
-    {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
-    {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
-    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''},
-    {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
-    {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckRoomFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckPlayerInRegion', 'params': 'sss'},
-    {'fun': 'ScriptCommand_CheckPlayerInRegion2', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckEntityInteractType', 'params': ''},
-    {'fun': 'ScriptCommand_0807E30C', 'params': ''},
-    {'fun': 'ScriptCommand_HasRupees', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E3BC', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E3E8', 'params': ''},
-    {'fun': 'ScriptCommand_CheckKinstoneFused', 'params': 's'},
-    {'fun': 'ScriptCommand_BuyItem', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807E48C', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E514', 'params': 'w'},
-    {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'},
-    {'fun': 'ScriptCommand_0807E564', 'params': ''},
-    {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''},
-    {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'},
-    {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},# 'exec': ScriptCommand_0807E5F8},
-    {'fun': 'ScriptCommand_0807E610', 'params': 'w'},
-    {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'},
-    {'fun': 'ScriptCommand_ClearLocalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_SetGlobalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_ClearGlobalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_SetRoomFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_ClearRoomFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_Wait', 'params': 's'},
-    {'fun': 'ScriptCommand_WaitForSomething', 'params': 'w'},
-    {'fun': 'ScriptCommand_WaitForSomething2', 'params': 'w'},
-    {'fun': 'ScriptCommand_WaitPlayerAction8', 'params': ''},
-    {'fun': 'ScriptCommand_WaitForPlayerAction0x17', 'params': ''},
-    {'fun': 'ScriptCommand_WaitFor_1', 'params': ''},
-    {'fun': 'ScriptCommand_WaitFor_2', 'params': ''},
-    {'fun': 'ScriptCommand_0807E778', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E788', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E79C', 'params': ''},
-    {'fun': 'ScriptCommandNop2', 'params': 's'},
-    {'fun': 'ScriptCommand_DoFade4', 'params': ''},
-    {'fun': 'ScriptCommand_DoFade5', 'params': ''},
-    {'fun': 'ScriptCommand_DoFade6', 'params': ''},
-    {'fun': 'ScriptCommand_DoFade7', 'params': ''},
-    {'fun': 'ScriptCommand_0807E800', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E80C', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E858', 'params': ['s', '']},
-    {'fun': 'ScriptCommand_0807E864', 'params': ''},
-    {'fun': 'ScriptCommand_0807E878', 'params': ''},
-    {'fun': 'ScriptCommand_0807E888', 'params': ''},
-    {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'},
-    {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'},
-    {'fun': 'ScriptCommand_0807E8D4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E908', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E914', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E924', 'params': ''},
-    {'fun': 'ScriptCommand_0807E930', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E944', 'params': ''},
-    {'fun': 'ScriptCommand_0807E974', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E9D4', 'params': ''},
-    {'fun': 'ScriptCommand_0807E9DC', 'params': ''},
-    {'fun': 'ScriptCommand_0807E9E4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E9F0', 'params': ''},
-    {'fun': 'ScriptCommand_0807EA4C', 'params': ''},
-    {'fun': 'ScriptCommand_0807EA88', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EA94', 'params': ''},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['w', 's']}, # TODO w or ss?
-    {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']},
-    {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
-    {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EB38', 'params': ''},
-    {'fun': 'ScriptCommand_0807EB44', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EB4C', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EB74', 'params': ''},
-    {'fun': 'ScriptCommand_0807EB8C', 'params': ''},
-    {'fun': 'ScriptCommand_SetEntityDirection', 'params': 's'},
-    {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'},
-    {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'},
-    {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'},
-    {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'w'},
-    {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'},
-    {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''},
-    {'fun': 'ScriptCommandNop3', 'params': ''},
-    {'fun': 'ScriptCommand_0807EC1C', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EC64', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EC94', 'params': 's'},
-    {'fun': 'ScriptCommand_0807ECC4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807ECF4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807ED24', 'params': 'sss'},
-    {'fun': 'ScriptCommand_0807EDD4', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EE04', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EE30', 'params': ''},
-    {'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': 'ScriptCommand_SoundReq', 'params': 's'},
-    {'fun': 'ScriptCommand_SoundReq2', 'params': 's'},
-    {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'},
-    {'fun': 'ScriptCommand_SoundReq0x80100000', 'params': ''},
-    {'fun': 'ScriptCommand_ModRupees', 'params': 's'},
-    {'fun': 'ScriptCommand_ModHealth', 'params': 's'},
-    {'fun': 'ScriptCommand_IncreaseMaxHealth', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F034', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F050', 'params': 's'},
-    {'fun': 'ScriptCommand_GetInventoryValue', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F078', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807F088', 'params': 's'},
-    {'fun': 'ScriptCommand_CameraTargetEntity', 'params': ''},
-    {'fun': 'ScriptCommand_CameraTargetPlayer', 'params': ''},
-    {'fun': 'ScriptCommand_0807F0B4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'}
-]
-
-# definitions for parameters
-parameters = {
-    '': {
-        'length':0,
-        'param': '',
-        'expr': '',
-        'read': lambda ctx: ''
-    },
-    's': {
-        'length': 1,
-        'param': 's',
-        'expr': '	.short \s',
-        'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0]
-    },
-    'w': {
-        'length': 2,
-        'param': 'w',
-        'expr': '	.word \w',
-        'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
-    },
-    'ss': {
-        'length': 2,
-        'param': 'a,b',
-        'expr': '	.short \\a\n	.short \\b',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
-    },
-    'ww': {
-        'length': 4,
-        'param': 'a,b',
-        'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
-    },
-    'sss': {
-        'length': 3,
-        'param': 'a,b,c',
-        'expr': '	.short \\a\n	.short \\b\n	.short \\c',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8]))
-    },
-    'ssss': {
-        'length': 4,
-        'param': 'a,b,c,d',
-        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
-    },    
-    'sssssss': {
-        'length': 7,
-        'param': 'a,b,c,d,e,f,g',
-        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d\n	.short \\e\n	.short \\f\n	.short \\g',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+16]))
-    },  
-    'sssssssss': {
-        'length': 9,
-        'param': 'a,b,c,d,e,f,g,h,i',
-        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d\n	.short \\e\n	.short \\f\n	.short \\g\n	.short \\h\n	.short \\i',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+20]))
-    }, 
-    'p': {
-        'length': 2,
-        'param': 'w',
-        'expr': '	.word \w',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
-    },
-    'd': { # Data pointer
-        'length': 2,
-        'param': 'w',
-        'expr': '	.word \w',
-        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
-    },
-    'x': { # Script pointer
-        'length': 2,
-        'param': 'w',
-        'expr': '	.word \w',
-        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
-    },
-
-    'pw': {
-        'length': 4,
-        'param': 'a,b',
-        'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+14])[0]
-    },
-    'xx': {
-        'length': 4,
-        'param': 'a, b',
-        'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10])
-    },
-    # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations
-    # 'v': { 
-    #     'length': -1,
-    #     'param': '',
-    #     'expr': '',
-    #     'read': lambda ctx: ''
-    # },
-    # 'pv': {
-    #     'length': -2,
-    #     'param': 'w',
-    #     'expr': '	.word \w',
-    #     'read': lambda ctx: ''
-    # },
-}
 
 # Remove the ScriptCommand_ prefix for the asm macros
 def build_script_command(name: str): 
@@ -318,13 +27,14 @@ def build_script_command(name: str):
 def print_rest_bytes(ctx):
      print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
 
-def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
-    if add_annotations:
-        print(f'@{ctx.ptr}') # print offsets to debug when manually inserting labels
+def disassemble_command(ctx: Context, add_all_annotations=False):
+    global used_labels
+    if add_all_annotations or ctx.script_addr + ctx.ptr in used_labels:
+        print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:') # print offsets to debug when manually inserting labels
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
     if cmd == 0:
         # this does not need to be the end of the script
-        print('.short 0x0000')
+        print('\t.short 0x0000')
         ctx.ptr += 2
         return 1
 
@@ -334,7 +44,7 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
         cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
         if cmd == 0x0000:
             # This is actually the end of the script
-            print('.short 0x0000')
+            print('\t.short 0x0000')
             ctx.ptr += 2
             return 2
         return 3 # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please
@@ -347,7 +57,7 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
     commandId = cmd & 0x3FF
     if commandId >= len(commands):
         #print_rest_bytes(ctx)
-        print(f'.short {u16_to_hex(cmd)}')
+        print(f'\t.short {u16_to_hex(cmd)}')
         ctx.ptr += 2
         #raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}')
         # TODO error
@@ -377,7 +87,7 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
             if candidate['length'] == commandSize -1:
                 params = candidate
                 if i != 0:
-                    suffix = f'_{param}'# We need to add a suffix to distinguish the correct parameter variant
+                    suffix = f'_{params["length"]}'# We need to add a suffix to distinguish the correct parameter variant
                 break
         if params is None:
             raise Exception(f'No suitable parameter configuration with length {commandSize-1} found for {command["fun"]}')
@@ -389,18 +99,18 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
     command_name = f'{command["fun"]}{suffix}'
 
     if params['length'] == -1: # variable parameter length
-        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
+        print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
         if commandSize > 1:
-            print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])]))
+            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])]))
             print(f'@ End of parameters')
         ctx.ptr += commandSize*2
         return 1
     elif params['length'] == -2: # point and var
-        print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
+        print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
 
-        print('.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        print('\t.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
         if commandSize > 3:
-            print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])]))
+            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])]))
             print(f'@ End of parameters')
         ctx.ptr += commandSize*2
         return 1
@@ -408,28 +118,24 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False):
     if commandSize-1 != params['length']:
         raise Exception(f'Call {command_name} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined')
 
-    print(build_script_command(command_name) + ' ' + params['read'](ctx))
+    print(f'\t{build_script_command(command_name)} {params["read"](ctx)}')
 
     # Execute script
     ctx.ptr += commandSize*2
     return 1
 
 
-# TODO
-# JumpAbsolute 0x08016384
-# JumpAbsoluteIf 0x08016384
-# JumpAbsoluteIfNot 0x08016384
 
-def disassemble_script(input_bytes, add_annotations=False):
+def disassemble_script(input_bytes, script_addr, add_all_annotations=False):
 
-    ctx = Context(0, input_bytes)
+    ctx = Context(0, input_bytes, script_addr)
 
 
     foundEnd = False
     while True:
         if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id)
             break
-        res = ExecuteScriptCommandSet(ctx, add_annotations)
+        res = disassemble_command(ctx, add_all_annotations)
         if res == 0:
             break
         elif res == 2:
@@ -495,7 +201,7 @@ def generate_macros():
                 id = ((params['length']+1) << 0xA) + num    
                 suffix = ''
                 if i != 0:
-                    suffix = f'_{variant}'
+                    suffix = f'_{params["length"]}'
                 emit_macro(f'{build_script_command(command["fun"])}{suffix}', id, params)
         else:
             if not command['params'] in parameters:
diff --git a/tools/script_disassembler/utils.py b/tools/script_disassembler/utils.py
new file mode 100644
index 00000000..b0501e5a
--- /dev/null
+++ b/tools/script_disassembler/utils.py
@@ -0,0 +1,21 @@
+import struct
+
+def barray_to_s16(barray):
+    integers = struct.unpack('h', barray)
+    return integers[0]
+
+def u16_to_hex(value):
+    return '0x' + (struct.pack('>H', value).hex())
+
+def barray_to_u16_hex(barray):
+    count = len(barray)//2
+    integers = struct.unpack('H'*count, barray)
+    return [u16_to_hex(x) for x in integers]
+
+def u32_to_hex(value):
+    return '0x' + (struct.pack('>I', value).hex())
+
+def barray_to_u32_hex(barray):
+    count = len(barray)//4
+    integers = struct.unpack('I'*count, barray)
+    return [u32_to_hex(x) for x in integers]
\ No newline at end of file

From 2bcea72f4982efbcacf5af162b1a8af4f6c27ca3 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 18:32:11 +0100
Subject: [PATCH 22/46] Clean up script files

---
 asm/macros/scripts.inc                        |   5 +-
 data/scripts/script_08008D8C.inc              |   2 +-
 data/scripts/script_08008FC0.inc              |   2 +-
 data/scripts/script_0800903C.inc              |  22 ++--
 data/scripts/script_08009B78.inc              |   6 +-
 data/scripts/script_08009C68.inc              |   4 +-
 data/scripts/script_08009F14.inc              |   2 +-
 data/scripts/script_0800A1D8.inc              |  10 +-
 data/scripts/script_0800AB08.inc              |   4 +-
 data/scripts/script_0800AB6E.inc              |  12 +-
 data/scripts/script_0800CD7C.inc              |  10 +-
 data/scripts/script_0800DA60.inc              |   4 +-
 data/scripts/script_0800DB78.inc              |   2 +-
 data/scripts/script_0800DF24.inc              |   2 +-
 data/scripts/script_0800DFE4.inc              |   4 +-
 data/scripts/script_0800EFC0.inc              |   6 +-
 data/scripts/script_0800F184.inc              |  10 +-
 data/scripts/script_0800F724.inc              |  32 ++---
 data/scripts/script_0800FD0C.inc              |   4 +-
 data/scripts/script_080100C8.inc              |   4 +-
 data/scripts/script_08010BB4.inc              |  14 +--
 data/scripts/script_08010E5A.inc              |   4 +-
 data/scripts/script_08010F84.inc              |   6 +-
 data/scripts/script_0801194C.inc              |   2 +-
 data/scripts/script_08011B20.inc              |   2 +-
 data/scripts/script_08012430.inc              |   2 +-
 data/scripts/script_080126FC.inc              |  38 +++---
 data/scripts/script_0801319A.inc              |   6 +-
 data/scripts/script_080134DC.inc              |   2 +-
 data/scripts/script_08013720.inc              |   2 +-
 data/scripts/script_080138B4.inc              |   2 +-
 data/scripts/script_08014248.inc              |   2 +-
 data/scripts/script_080145B0.inc              |   2 +-
 data/scripts/script_080145E8.inc              |  14 +--
 data/scripts/script_08014804.inc              |   6 +-
 data/scripts/script_08014CDC.inc              |   2 +-
 data/scripts/script_08014E14.inc              |   6 +-
 data/scripts/script_08015390.inc              |   2 +-
 data/scripts/script_080153EC.inc              |  10 +-
 data/scripts/script_0801548E.inc              |   4 +-
 data/scripts/script_080157AC.inc              |   6 +-
 data/scripts/script_08015958.inc              |   4 +-
 data/scripts/script_08015B34.inc              |   2 +-
 data/scripts/script_08015C7C.inc              |   2 +-
 tools/script_disassembler/definitions.py      | 103 ++++++++-------
 .../script_disassembler.py                    | 118 ++++++++----------
 ...{incbin_parser.py => split_script_data.py} |  51 ++++----
 47 files changed, 276 insertions(+), 285 deletions(-)
 rename tools/script_disassembler/{incbin_parser.py => split_script_data.py} (67%)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 77f497a2..da8555bf 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -493,9 +493,10 @@
 	.short \s
 .endm
 
-.macro TextboxNoOverlapFollowPos w
+.macro TextboxNoOverlapFollowPos a,b
 	.short 0x0c5c
-	.word \w
+	.short \a
+	.short \b
 .endm
 
 .macro TextboxNoOverlapFollowPos_1 s
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index 8b59708e..d640ce56 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -62,7 +62,7 @@ script_08008E12:
 	WaitForSomething2 0x00000100
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x000e1053
+	TextboxNoOverlapFollowPos 0x1053, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000100
diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc
index ec4888e8..ec7f9ecf 100644
--- a/data/scripts/script_08008FC0.inc
+++ b/data/scripts/script_08008FC0.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_08008FC0
 	SoundReq 0x0109
 	CallWithArg sub_0807F238, 0x0000045f
 	Call sub_0807F304
-	TextboxNoOverlapFollowPos 0x000e0501
+	TextboxNoOverlapFollowPos 0x0501, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000020
 	Call sub_080791BC
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index dec7d6b5..15e7cb66 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -28,20 +28,20 @@ SCRIPT_START script_0800903C
 	_0807EB44 0x0004
 	_0807ECC4 0x0008
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1050
+	TextboxNoOverlapFollowPos 0x1050, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1052
+	TextboxNoOverlapFollowPos 0x1052, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807EB44 0x0006
 	_0807E930 0x0005
-	TextboxNoOverlapFollowPos 0x000e1054
+	TextboxNoOverlapFollowPos 0x1054, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
@@ -50,25 +50,25 @@ SCRIPT_START script_0800903C
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1056
+	TextboxNoOverlapFollowPos 0x1056, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1057
+	TextboxNoOverlapFollowPos 0x1057, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1058
+	TextboxNoOverlapFollowPos 0x1058, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e105c
+	TextboxNoOverlapFollowPos 0x105c, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
@@ -90,7 +90,7 @@ script_0800917C:
 	WaitForSomething2 0x00000001
 	_0807EB74 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000105b
+	TextboxNoOverlapFollowPos 0x105b, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -102,7 +102,7 @@ script_0800917C:
 	_0807EF80 0x0005
 	Wait 0x003c
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001051
+	TextboxNoOverlapFollowPos 0x1051, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -112,7 +112,7 @@ script_0800917C:
 	_0807EB74 
 	_0807EB8C 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001055
+	TextboxNoOverlapFollowPos 0x1055, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -126,7 +126,7 @@ script_0800917C:
 	_0807EB74 
 	_0807EF80 0x0000
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001059
+	TextboxNoOverlapFollowPos 0x1059, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc
index 9bd9569a..2f5b2061 100644
--- a/data/scripts/script_08009B78.inc
+++ b/data/scripts/script_08009B78.inc
@@ -18,7 +18,7 @@ SCRIPT_START script_08009B78
 	_0807EF80 0x0000
 	Wait 0x000f
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001009
+	TextboxNoOverlapFollowPos 0x1009, 0x0000
 	_0807E8E4_1 
 	_0807EA94 
 	_0807EF80 0x0000
@@ -26,7 +26,7 @@ SCRIPT_START script_08009B78
 	WaitForSomething2 0x00000008
 	_0807EB8C 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000100b
+	TextboxNoOverlapFollowPos 0x100b, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -45,7 +45,7 @@ SCRIPT_START script_08009B78
 	WaitPlayerAction8 
 	_0807E8E4_1 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000100c
+	TextboxNoOverlapFollowPos 0x100c, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc
index fece2a6f..d81f699f 100644
--- a/data/scripts/script_08009C68.inc
+++ b/data/scripts/script_08009C68.inc
@@ -13,7 +13,7 @@ SCRIPT_START script_08009C68
 	_0807EB74 
 	_0807EB8C 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000100a
+	TextboxNoOverlapFollowPos 0x100a, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000008
@@ -22,7 +22,7 @@ SCRIPT_START script_08009C68
 	_0807EF80 0x0001
 	_0807EB8C 
 	_0807EB44 0x0002
-	TextboxNoOverlapFollowPos 0x0000100d
+	TextboxNoOverlapFollowPos 0x100d, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807EDD4 0x0028, 0x0060
diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc
index 706d06c5..c6a52566 100644
--- a/data/scripts/script_08009F14.inc
+++ b/data/scripts/script_08009F14.inc
@@ -21,7 +21,7 @@ script_08009F36:
 	StartPlayerScript script_0800A088
 	WaitForSomething2 0x00000002
 	Call sub_0806014C
-	TextboxNoOverlapFollowPos 0x00001f01
+	TextboxNoOverlapFollowPos 0x1f01, 0x0000
 	_0807EA94 
 	Wait 0x001e
 	_0807F034 0x0065
diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc
index 5ee10dbb..1de72713 100644
--- a/data/scripts/script_0800A1D8.inc
+++ b/data/scripts/script_0800A1D8.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_0800A1D8
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000080
-	TextboxNoOverlapFollowPos 0x00001659
+	TextboxNoOverlapFollowPos 0x1659, 0x0000
 	_0807EA94 
 	Wait 0x003c
 	_0807E5F8 0x00000010
@@ -27,10 +27,10 @@ SCRIPT_START script_0800A1D8
 	_0807E5F8 0x00000004
 	Call sub_0807F3F8
 	WaitForSomething2 0x00000080
-	TextboxNoOverlapFollowPos 0x000e165a
+	TextboxNoOverlapFollowPos 0x165a, 0x000e
 	_0807EA94 
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e165b
+	TextboxNoOverlapFollowPos 0x165b, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000040
@@ -45,10 +45,10 @@ SCRIPT_START script_0800A1D8
 	WaitForSomething2 0x00000100
 	_0807E5F8 0x00000006
 	WaitForSomething2 0x000000c0
-	TextboxNoOverlapFollowPos 0x000e165c
+	TextboxNoOverlapFollowPos 0x165c, 0x000e
 	_0807EA94 
 	SoundReq0x80100000 
-	TextboxNoOverlapFollowPos 0x000e165d
+	TextboxNoOverlapFollowPos 0x165d, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000006
 	WaitForSomething2 0x000000c0
diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc
index 0c012046..c019f528 100644
--- a/data/scripts/script_0800AB08.inc
+++ b/data/scripts/script_0800AB08.inc
@@ -13,9 +13,9 @@ SCRIPT_START script_0800AB08
 	_0807F0B4 0x0001
 	SetEntityPositionRelative 0x00780088
 	Call sub_0807F5C0
-	TextboxNoOverlapFollowPos 0x00001664
+	TextboxNoOverlapFollowPos 0x1664, 0x0000
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000e165e
+	TextboxNoOverlapFollowPos 0x165e, 0x000e
 	_0807EA94 
 	CallWithArg sub_0805DDEC, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc
index cbab020d..6f816d96 100644
--- a/data/scripts/script_0800AB6E.inc
+++ b/data/scripts/script_0800AB6E.inc
@@ -13,15 +13,15 @@ SCRIPT_START script_0800AB6E
 	Wait 0x003c
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e165f
+	TextboxNoOverlapFollowPos 0x165f, 0x000e
 	_0807EA94 
 	StartPlayerScript script_0800ACBC
 	WaitForSomething2 0x00000001
-	TextboxNoOverlapFollowPos 0x000e1660
+	TextboxNoOverlapFollowPos 0x1660, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e1661
+	TextboxNoOverlapFollowPos 0x1661, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000008
 	_0807E5F8 0x00000002
@@ -32,9 +32,9 @@ SCRIPT_START script_0800AB6E
 	StartPlayerScript script_0800ACE0
 	WaitForSomething2 0x00000001
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e1662
+	TextboxNoOverlapFollowPos 0x1662, 0x000e
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000e1663
+	TextboxNoOverlapFollowPos 0x1663, 0x000e
 	_0807EA94 
 	SetEntityPosition 0x0000, 0xffe0
 	Call sub_0807F5C0
@@ -45,7 +45,7 @@ SCRIPT_START script_0800AB6E
 	StartPlayerScript script_0800AD54
 	WaitForSomething2 0x00000001
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e1665
+	TextboxNoOverlapFollowPos 0x1665, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index 9f05e3e9..b0222105 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -222,7 +222,7 @@ script_0800D032:
 	_0807EB74 
 	_0807E914 0x00000000
 	Call sub_0806C028
-	TextboxNoOverlapFollowPos 0x0002125c
+	TextboxNoOverlapFollowPos 0x125c, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
@@ -233,7 +233,7 @@ script_0800D032:
 	_0807E5F8 0x00000020
 	StartPlayerScript script_0800D1E0
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x0002125d
+	TextboxNoOverlapFollowPos 0x125d, 0x0002
 	Jump script_0800D17C
 script_0800D098:
 	CheckLocalFlag 0x007e
@@ -250,7 +250,7 @@ script_0800D0A8:
 	_0807EB74 
 	_0807E914 0x00000000
 	Call sub_0806C028
-	TextboxNoOverlapFollowPos 0x0002123d
+	TextboxNoOverlapFollowPos 0x123d, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
@@ -265,7 +265,7 @@ script_0800D108:
 	SoundReq 0x00f8
 	_0807E5F8 0x00000010
 	SetLocalFlag 0x007e
-	TextboxNoOverlapFollowPos 0x0002123e
+	TextboxNoOverlapFollowPos 0x123e, 0x0002
 	_0807EA94 
 	Wait 0x000f
 	_0807E930 0x0009
@@ -274,7 +274,7 @@ script_0800D108:
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x0002123f
+	TextboxNoOverlapFollowPos 0x123f, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc
index 7fbe0073..d5314e56 100644
--- a/data/scripts/script_0800DA60.inc
+++ b/data/scripts/script_0800DA60.inc
@@ -16,11 +16,11 @@ script_0800DA64:
 	Call sub_0807F5C0
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
-	TextboxNoOverlapFollowPos 0x0002162d
+	TextboxNoOverlapFollowPos 0x162d, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x0002162e
+	TextboxNoOverlapFollowPos 0x162e, 0x0002
 	_0807EA94 
 	_0807E8E4_0 
 	CallWithArg sub_0807F75C, 0x00780138
diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc
index cede39e2..73eb3d1e 100644
--- a/data/scripts/script_0800DB78.inc
+++ b/data/scripts/script_0800DB78.inc
@@ -34,7 +34,7 @@ script_0800DBCA:
 	_0807E5F8 0x00000001
 	StartPlayerScript script_0800DE00
 	WaitForSomething2 0x00000006
-	TextboxNoOverlapFollowPos 0x00021643
+	TextboxNoOverlapFollowPos 0x1643, 0x0002
 	_0807EA94 
 	_0807EB28 0x1645
 	_0807EA94 
diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc
index 4e8fa449..8d67bf90 100644
--- a/data/scripts/script_0800DF24.inc
+++ b/data/scripts/script_0800DF24.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_0800DF24
 	Call sub_08066C94
 	Wait 0x00e9
 	_0807EF80 0x0007
-	TextboxNoOverlapFollowPos 0x0002162f
+	TextboxNoOverlapFollowPos 0x162f, 0x0002
 	_0807EA94 
 	SoundReq2 0x002f
 	_0807EF80 0x0019
diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc
index 8a0ba9e4..7ecaa728 100644
--- a/data/scripts/script_0800DFE4.inc
+++ b/data/scripts/script_0800DFE4.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800DFE4
 	_0807E864 
 	StopScript 
 	SoundReq0x80100000 
-	TextboxNoOverlapFollowPos 0x00021632
+	TextboxNoOverlapFollowPos 0x1632, 0x0002
 	_0807EA94 
 	SetRoomFlag 0x0003
 script_0800DFFE:
@@ -19,7 +19,7 @@ script_0800E012:
 	_0807E864 
 	Call sub_0807DF28
 	SetLocalFlag 0x007b
-	TextboxNoOverlapFollowPos 0x000c1639
+	TextboxNoOverlapFollowPos 0x1639, 0x000c
 	_0807EA94 
 	Wait 0x0096
 	SoundReq 0x00f6
diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc
index d6e86144..e387487b 100644
--- a/data/scripts/script_0800EFC0.inc
+++ b/data/scripts/script_0800EFC0.inc
@@ -58,18 +58,18 @@ script_0800F09A:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x0000001e
 	WaitForSomething2 0x00000040
-	TextboxNoOverlapFollowPos 0x000c1201
+	TextboxNoOverlapFollowPos 0x1201, 0x000c
 	_0807EA94 
 	WaitForSomething2 0x000003c0
 	_0807E8E4_0 
-	TextboxNoOverlapFollowPos 0x000c1202
+	TextboxNoOverlapFollowPos 0x1202, 0x000c
 	_0807EA94 
 	_0807F034 0x0067
 	WaitPlayerAction8 
 	_0807E8E4_0 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000040
-	TextboxNoOverlapFollowPos 0x000c1203
+	TextboxNoOverlapFollowPos 0x1203, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000002
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc
index 0970d0a9..c1d99864 100644
--- a/data/scripts/script_0800F184.inc
+++ b/data/scripts/script_0800F184.inc
@@ -32,7 +32,7 @@ script_0800F1E6:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F33C
 	WaitForSomething2 0x00000400
@@ -48,7 +48,7 @@ script_0800F22A:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F354
 	WaitForSomething2 0x00000400
@@ -64,7 +64,7 @@ script_0800F26A:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F36C
 	WaitForSomething2 0x00000400
@@ -80,7 +80,7 @@ script_0800F2AA:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F384
 	WaitForSomething2 0x00000400
@@ -97,7 +97,7 @@ script_0800F2EA:
 	_0807E864 
 	_0807EB74 
 	_0807E930 0x0008
-	TextboxNoOverlapFollowPos 0x000c1208
+	TextboxNoOverlapFollowPos 0x1208, 0x000c
 	_0807EA94 
 	_0807E878 
 	Jump script_0800F1E6
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 2420d650..bcf3f800 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -27,7 +27,7 @@ script_0800F72C:
 	Call sub_0807F5C0
 	WaitForSomething2 0x00000001
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x00002501
+	TextboxNoOverlapFollowPos 0x2501, 0x0000
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -43,7 +43,7 @@ script_0800F72C:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e2503
+	TextboxNoOverlapFollowPos 0x2503, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -56,7 +56,7 @@ script_0800F72C:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e2504
+	TextboxNoOverlapFollowPos 0x2504, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -69,7 +69,7 @@ script_0800F72C:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e2505
+	TextboxNoOverlapFollowPos 0x2505, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -84,7 +84,7 @@ script_0800F72C:
 	_0807E8E4_0 
 	Call sub_0807F3F8
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e1021
+	TextboxNoOverlapFollowPos 0x1021, 0x000e
 	_0807EA94 
 	StartPlayerScript script_0800FAE4
 	SetEntityPositionRelative 0x025800f0
@@ -93,44 +93,44 @@ script_0800F72C:
 	Wait 0x001e
 	Call sub_08063C2C
 	WaitForSomething2 0x00000001
-	TextboxNoOverlapFollowPos 0x000e1022
+	TextboxNoOverlapFollowPos 0x1022, 0x000e
 	_0807EA94 
 	_0807E8E4_0 
 	Call sub_08063C14
 	Call sub_08094CDC
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x000e1023
+	TextboxNoOverlapFollowPos 0x1023, 0x000e
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094DD8
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x000e1024
+	TextboxNoOverlapFollowPos 0x1024, 0x000e
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094D34
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x000e1025
+	TextboxNoOverlapFollowPos 0x1025, 0x000e
 	_0807EA94 
 	Call sub_08063C5C
-	TextboxNoOverlapFollowPos 0x000e1026
+	TextboxNoOverlapFollowPos 0x1026, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
 	_0807E8E4_1 
 	Call sub_08063C2C
-	TextboxNoOverlapFollowPos 0x00001027
+	TextboxNoOverlapFollowPos 0x1027, 0x0000
 	_0807EA94 
 	Call sub_08063C74
 	Wait 0x003c
 	Call sub_08063C14
 	_0807E8E4_0 
-	TextboxNoOverlapFollowPos 0x000e1028
+	TextboxNoOverlapFollowPos 0x1028, 0x000e
 	_0807EA94 
 	_0807E8E4_1 
-	TextboxNoOverlapFollowPos 0x00001029
+	TextboxNoOverlapFollowPos 0x1029, 0x0000
 	_0807EA94 
 	_0807E8E4_0 
-	TextboxNoOverlapFollowPos 0x000e102a
+	TextboxNoOverlapFollowPos 0x102a, 0x000e
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094D70
@@ -145,7 +145,7 @@ script_0800F72C:
 	_0807E8E4_1 
 	Call sub_0807F3F8
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x0000102b
+	TextboxNoOverlapFollowPos 0x102b, 0x0000
 	_0807EA94 
 	_0807F034 0x000d
 	WaitPlayerAction8 
@@ -158,7 +158,7 @@ script_0800F72C:
 	Wait 0x00b7
 	_0807E914 0x00000000
 	Call sub_0807F5B0
-	TextboxNoOverlapFollowPos 0x0000102c
+	TextboxNoOverlapFollowPos 0x102c, 0x0000
 	_0807EA94 
 	CallWithArg sub_0807F29C, 0x00000000
 	Call sub_0806DC58
diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc
index e3f8b423..cdb8328b 100644
--- a/data/scripts/script_0800FD0C.inc
+++ b/data/scripts/script_0800FD0C.inc
@@ -9,7 +9,7 @@ script_0800FD1A:
 	JumpIf script_0800FD5C
 	_0807E864 
 	Call sub_0807F9A4
-	TextboxNoOverlapFollowPos 0x00002506
+	TextboxNoOverlapFollowPos 0x2506, 0x0000
 	_0807EA94 
 	StartPlayerScript script_0800FD80
 	WaitForSomething2 0x00000008
@@ -21,7 +21,7 @@ script_0800FD50:
 script_0800FD5C:
 	_0807E864 
 	Call sub_0807F9A4
-	TextboxNoOverlapFollowPos 0x0000106c
+	TextboxNoOverlapFollowPos 0x106c, 0x0000
 	_0807EA94 
 	StartPlayerScript script_0800FD80
 	WaitForSomething2 0x00000008
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index 462aa194..809f6ca7 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -52,7 +52,7 @@ script_0801015A:
 	_0807EB74 
 	CheckRoomFlag 0x0001
 	JumpIf script_0801019E
-	TextboxNoOverlapFollowPos 0x00003001
+	TextboxNoOverlapFollowPos 0x3001, 0x0000
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_080101A6
@@ -77,7 +77,7 @@ script_080101A6:
 	Call sub_080A1270
 	_0807E864 
 	Call sub_0807DF28
-	TextboxNoOverlapFollowPos 0x00073004
+	TextboxNoOverlapFollowPos 0x3004, 0x0007
 	_0807EA94 
 	SoundReq0x80100000 
 	_0807E778 0x0004
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index 58da62e2..fdf4640c 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -23,15 +23,15 @@ script_08010BCA:
 	StartPlayerScript script_08011074
 	WaitForSomething2 0x00000400
 	_0807F078 0x0034, 0x0002
-	TextboxNoOverlapFollowPos 0x000c1036
+	TextboxNoOverlapFollowPos 0x1036, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
-	TextboxNoOverlapFollowPos 0x00021037
+	TextboxNoOverlapFollowPos 0x1037, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
-	TextboxNoOverlapFollowPos 0x000c1038
+	TextboxNoOverlapFollowPos 0x1038, 0x000c
 	_0807EA94 
 	SoundReq0x80100000 
 	_0807E778 0x0004
@@ -68,7 +68,7 @@ script_08010BCA:
 	_0807E8E4_1 
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x000c1039
+	TextboxNoOverlapFollowPos 0x1039, 0x000c
 	_0807EA94 
 	SoundReq2 0x0001
 	_0807E8E4_2 
@@ -81,7 +81,7 @@ script_08010BCA:
 	Wait 0x012c
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x000c103a
+	TextboxNoOverlapFollowPos 0x103a, 0x000c
 	_0807EA94 
 	SetEntityPositionRelative 0x01c001f8
 	_0807F0B4 0x0004
@@ -99,7 +99,7 @@ script_08010BCA:
 	SoundReq 0x009b
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
-	TextboxNoOverlapFollowPos 0x00001043
+	TextboxNoOverlapFollowPos 0x1043, 0x0000
 	_0807EA94 
 	SoundReq2 0x000d
 	_0807E5F8 0x00000100
@@ -115,7 +115,7 @@ script_08010BCA:
 	WaitForSomething2 0x00005000
 	_0807E5F8 0x00028000
 	WaitForSomething2 0x00050000
-	TextboxNoOverlapFollowPos 0x00001044
+	TextboxNoOverlapFollowPos 0x1044, 0x0000
 	_0807EA94 
 	SetEntityPositionRelative 0x009801f8
 	SoundReq0x80100000 
diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc
index 46021b6a..ced5503b 100644
--- a/data/scripts/script_08010E5A.inc
+++ b/data/scripts/script_08010E5A.inc
@@ -47,9 +47,9 @@ SCRIPT_START script_08010E5A
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000020
 	WaitForSomething2 0x00000200
-	TextboxNoOverlapFollowPos 0x000c1045
+	TextboxNoOverlapFollowPos 0x1045, 0x000c
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x00001046
+	TextboxNoOverlapFollowPos 0x1046, 0x0000
 	_0807EA94 
 	CallWithArg sub_0805DDEC, 0x00000002
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index bb24aa9d..59a442f0 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_08010F84
 	WaitForSomething2 0x00000200
 	StartPlayerScript script_080110BC
 	WaitForSomething2 0x00000400
-	TextboxNoOverlapFollowPos 0x00001047
+	TextboxNoOverlapFollowPos 0x1047, 0x0000
 	_0807EA94 
 	Call sub_0806DC3C
 	Call sub_080791BC
@@ -28,11 +28,11 @@ SCRIPT_START script_08010F84
 	WaitForSomething2 0x00000020
 	SoundReq0x80100000 
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x0000104a
+	TextboxNoOverlapFollowPos 0x104a, 0x0000
 	_0807EA94 
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
-	TextboxNoOverlapFollowPos 0x00001049
+	TextboxNoOverlapFollowPos 0x1049, 0x0000
 	_0807EA94 
 	SetEntityPositionRelative 0x009801f8
 	Wait 0x0078
diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc
index 29618db8..d452f8c9 100644
--- a/data/scripts/script_0801194C.inc
+++ b/data/scripts/script_0801194C.inc
@@ -126,7 +126,7 @@ script_08011AE4:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 script_08011AFA:
-	TextboxNoOverlapFollowPos 0x00071321
+	TextboxNoOverlapFollowPos 0x1321, 0x0007
 	_0807EA94 
 	SetLocalFlag 0x0010
 	CallWithArg sub_0806DA1C, 0x00000003
diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc
index c568336a..1712c9e9 100644
--- a/data/scripts/script_08011B20.inc
+++ b/data/scripts/script_08011B20.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08011B20
 	_0807E864 
 	Call sub_0807DF28
-	TextboxNoOverlapFollowPos 0x000c1320
+	TextboxNoOverlapFollowPos 0x1320, 0x000c
 	_0807EA94 
 	_0807E878 
 	Call sub_0807DF50
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index ed7b71f5..fc868d72 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -35,7 +35,7 @@ script_0801248A:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StartPlayerScript script_08012AB0
-	TextboxNoOverlapFollowPos 0x00071101
+	TextboxNoOverlapFollowPos 0x1101, 0x0007
 	_0807EA94 
 	CameraTargetPlayer 
 	_0807E778 0x0004
diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc
index c700ebed..58b2de20 100644
--- a/data/scripts/script_080126FC.inc
+++ b/data/scripts/script_080126FC.inc
@@ -7,14 +7,14 @@ SCRIPT_START script_080126FC
 	WaitForSomething2 0x00000004
 	_0807E930 0x0022
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1102
+	TextboxNoOverlapFollowPos 0x1102, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0021
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1103
+	TextboxNoOverlapFollowPos 0x1103, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
@@ -25,29 +25,29 @@ SCRIPT_START script_080126FC
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0011
 	_0807E930 0x001c
-	TextboxNoOverlapFollowPos 0x000c1105
+	TextboxNoOverlapFollowPos 0x1105, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0022
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1106
+	TextboxNoOverlapFollowPos 0x1106, 0x000c
 	_0807EA94 
 	_0807E930 0x001c
 	Call sub_0806D96C
-	TextboxNoOverlapFollowPos 0x000c1107
+	TextboxNoOverlapFollowPos 0x1107, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0021
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1108
+	TextboxNoOverlapFollowPos 0x1108, 0x000c
 	_0807EA94 
 	_0807E930 0x001c
 	Call sub_0806D96C
-	TextboxNoOverlapFollowPos 0x000c1109
+	TextboxNoOverlapFollowPos 0x1109, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807EF80 0x000a
@@ -64,7 +64,7 @@ script_080127F2:
 	_0807E864 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1114
+	TextboxNoOverlapFollowPos 0x1114, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E878 
@@ -82,13 +82,13 @@ script_08012824:
 	WaitForSomething2 0x00000004
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110a
+	TextboxNoOverlapFollowPos 0x110a, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110b
+	TextboxNoOverlapFollowPos 0x110b, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
@@ -96,19 +96,19 @@ script_08012824:
 	_0807EF80 0x0004
 	Wait 0x003c
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110c
+	TextboxNoOverlapFollowPos 0x110c, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110d
+	TextboxNoOverlapFollowPos 0x110d, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110e
+	TextboxNoOverlapFollowPos 0x110e, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
@@ -131,7 +131,7 @@ script_08012920:
 	_0807E864 
 	_0807E930 0x0010
 	StopScript 
-	TextboxNoOverlapFollowPos 0x000c1115
+	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
@@ -144,7 +144,7 @@ script_0801293A:
 	_0807EB8C 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110f
+	TextboxNoOverlapFollowPos 0x110f, 0x000c
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806D908
@@ -167,7 +167,7 @@ script_080129A0:
 	_0807E864 
 	_0807E930 0x0010
 	StopScript 
-	TextboxNoOverlapFollowPos 0x000c1115
+	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
@@ -180,7 +180,7 @@ script_080129BA:
 	_0807EB8C 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1110
+	TextboxNoOverlapFollowPos 0x1110, 0x000c
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806D908
@@ -204,7 +204,7 @@ script_08012A24:
 	_0807E864 
 	_0807E930 0x0010
 	StopScript 
-	TextboxNoOverlapFollowPos 0x000c1115
+	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
@@ -219,7 +219,7 @@ script_08012A3E:
 	_0807EB8C 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1111
+	TextboxNoOverlapFollowPos 0x1111, 0x000c
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806D8A0
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index a73ca71a..6e61a26f 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -32,7 +32,7 @@ script_080131AC:
 	_0807E864 
 	Call sub_0807DF28
 	WaitFor_2 
-	TextboxNoOverlapFollowPos 0x000c1602
+	TextboxNoOverlapFollowPos 0x1602, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000010
@@ -46,7 +46,7 @@ script_080131AC:
 	StartPlayerScript script_08013378
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000042
-	TextboxNoOverlapFollowPos 0x000c1603
+	TextboxNoOverlapFollowPos 0x1603, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000040
@@ -59,7 +59,7 @@ script_080131AC:
 	Wait 0x003c
 	CameraTargetPlayer 
 	Call sub_0807F5C0
-	TextboxNoOverlapFollowPos 0x00071604
+	TextboxNoOverlapFollowPos 0x1604, 0x0007
 	_0807EA94 
 	_0807E788 0xffffffff
 	_0807E778 0x0004
diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc
index 08d464a2..1a121f7a 100644
--- a/data/scripts/script_080134DC.inc
+++ b/data/scripts/script_080134DC.inc
@@ -66,7 +66,7 @@ script_080134F8:
 	DoFade6 
 	WaitFor_2 
 	SoundReq 0x0109
-	TextboxNoOverlapFollowPos 0x000c0503
+	TextboxNoOverlapFollowPos 0x0503, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
 	CallWithArg sub_0805DDEC, 0x00000001
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index bda54165..cf3426f9 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -69,7 +69,7 @@ script_0801373C:
 	DoFade6 
 	WaitFor_2 
 	SoundReq 0x0109
-	TextboxNoOverlapFollowPos 0x000c0504
+	TextboxNoOverlapFollowPos 0x0504, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
 	SetLocalFlag 0x007b
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index 101916b3..065e960e 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -74,7 +74,7 @@ script_080138D0:
 	DoFade6 
 	WaitFor_2 
 	SoundReq 0x0109
-	TextboxNoOverlapFollowPos 0x000c0505
+	TextboxNoOverlapFollowPos 0x0505, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
 	_0807F0B4 0x0002
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index ab60a23f..8fee8151 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -23,7 +23,7 @@ script_08014298:
 	CheckEntityInteractType 
 	JumpIfNot script_08014298
 	_0807E864 
-	TextboxNoOverlapFollowPos 0x000c0647
+	TextboxNoOverlapFollowPos 0x0647, 0x000c
 	_0807EA94 
 	_0807E878 
 	Jump script_08014298
diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc
index 3344387e..e15261ce 100644
--- a/data/scripts/script_080145B0.inc
+++ b/data/scripts/script_080145B0.inc
@@ -11,7 +11,7 @@ script_080145C2:
 	ClearRoomFlag 0x0005
 	Wait 0x000c
 	_0807EB8C 
-	TextboxNoOverlapFollowPos 0x000c432e
+	TextboxNoOverlapFollowPos 0x432e, 0x000c
 	_0807EA94 
 	_0807E878 
 	Jump script_080145C2
diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc
index 0cab3269..86add4f9 100644
--- a/data/scripts/script_080145E8.inc
+++ b/data/scripts/script_080145E8.inc
@@ -36,7 +36,7 @@ script_0801463A:
 	JumpIf script_080146A0
 	_0807E864 
 	_0807EB8C 
-	TextboxNoOverlapFollowPos 0x000c432b
+	TextboxNoOverlapFollowPos 0x432b, 0x000c
 	Jump script_080147CE
 script_08014672:
 	Call sub_08088658
@@ -59,7 +59,7 @@ script_080146A0:
 	_0807E930 0x0002
 	CheckGlobalFlag 0x0059
 	JumpIfNot script_080146C6
-	TextboxNoOverlapFollowPos 0x000c432f
+	TextboxNoOverlapFollowPos 0x432f, 0x000c
 	Jump script_080147CE
 script_080146C6:
 	CheckRoomFlag 0x0004
@@ -74,16 +74,16 @@ script_080146C6:
 	SetRoomFlag 0x0009
 	Jump script_0801473C
 script_080146F4:
-	TextboxNoOverlapFollowPos 0x000c431e
+	TextboxNoOverlapFollowPos 0x431e, 0x000c
 	Jump script_080147CE
 script_080146FE:
 	SetRoomFlag 0x0009
 	SetLocalFlag 0x005c
-	TextboxNoOverlapFollowPos 0x000c4305
+	TextboxNoOverlapFollowPos 0x4305, 0x000c
 	_0807EA94 
 	_0807E3BC 0x0001
 	JumpIfNot script_080147C4
-	TextboxNoOverlapFollowPos 0x000c4306
+	TextboxNoOverlapFollowPos 0x4306, 0x000c
 	Jump script_0801473C
 script_08014720:
 	SetRoomFlag 0x0009
@@ -107,7 +107,7 @@ script_08014754:
 	ClearRoomFlag 0x0003
 	_0807EA94 
 	SetRoomFlag 0x0004
-	TextboxNoOverlapFollowPos 0x000c431e
+	TextboxNoOverlapFollowPos 0x431e, 0x000c
 	Jump script_080147CE
 script_08014770:
 	SetRoomFlag 0x0009
@@ -137,7 +137,7 @@ script_080147B4:
 	Jump script_0801478A
 script_080147C4:
 	SetRoomFlag 0x0009
-	TextboxNoOverlapFollowPos 0x000c4307
+	TextboxNoOverlapFollowPos 0x4307, 0x000c
 script_080147CE:
 	_0807EA94 
 	Wait 0x0004
diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc
index 605bc6cf..47613e6e 100644
--- a/data/scripts/script_08014804.inc
+++ b/data/scripts/script_08014804.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_08014804
 	Wait 0x0010
 	CheckLocalFlag 0x0093
 	JumpIf script_080148B6
-	TextboxNoOverlapFollowPos 0x000c4215
+	TextboxNoOverlapFollowPos 0x4215, 0x000c
 	_0807E878 
 script_0801482E:
 	TestBit 0x00000001
@@ -22,7 +22,7 @@ script_0801482E:
 	_0807E930 0x0008
 	Wait 0x0020
 	_0807E930 0x0002
-	TextboxNoOverlapFollowPos 0x000c4215
+	TextboxNoOverlapFollowPos 0x4215, 0x000c
 	_0807E878 
 	Jump script_0801482E
 script_08014862:
@@ -49,7 +49,7 @@ script_0801488E:
 	Wait 0x0020
 	_0807E930 0x0002
 script_080148B6:
-	TextboxNoOverlapFollowPos 0x000c4216
+	TextboxNoOverlapFollowPos 0x4216, 0x000c
 	_0807E878 
 	Jump script_0801488E
 script_080148C2:
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc
index 41a3ab83..e077f2ee 100644
--- a/data/scripts/script_08014CDC.inc
+++ b/data/scripts/script_08014CDC.inc
@@ -11,7 +11,7 @@ SCRIPT_START script_08014CDC
 	WaitForSomething2 0x00000001
 	Call sub_08066E08
 	_0807E864 
-	TextboxNoOverlapFollowPos 0x000c1010
+	TextboxNoOverlapFollowPos 0x1010, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000002
 script_08014D1E:
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index 798e9cc8..f306f83d 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -143,7 +143,7 @@ script_08014FCC:
 	CameraTargetEntity 
 	StartPlayerScript script_080152B4
 	WaitForSomething2 0x00000001
-	TextboxNoOverlapFollowPos 0x00021301
+	TextboxNoOverlapFollowPos 0x1301, 0x0002
 	_0807EA94 
 	Call sub_0807F3F8
 	Wait 0x003c
@@ -154,11 +154,11 @@ script_08014FCC:
 	SoundReq2 0x000d
 	_0807EB28 0x1302
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x00021303
+	TextboxNoOverlapFollowPos 0x1303, 0x0002
 	_0807EA94 
 	_0807EB28 0x1304
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x00021305
+	TextboxNoOverlapFollowPos 0x1305, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc
index 7c9c4b3a..d9d9aa3f 100644
--- a/data/scripts/script_08015390.inc
+++ b/data/scripts/script_08015390.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_08015390
 	Call sub_0806D944
 	WaitForSomething2 0x00000008
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1314
+	TextboxNoOverlapFollowPos 0x1314, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	Call sub_0806D8A0
diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc
index 56daf055..32586f5c 100644
--- a/data/scripts/script_080153EC.inc
+++ b/data/scripts/script_080153EC.inc
@@ -17,20 +17,20 @@ SCRIPT_START script_080153EC
 	WaitForSomething2 0x00001100
 	_0807F0B4 0x0004
 	SetEntityPositionRelative 0x00900078
-	TextboxNoOverlapFollowPos 0x00021330
+	TextboxNoOverlapFollowPos 0x1330, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00008000
 	WaitForSomething2 0x00010000
 	_0807E5F8 0x00000880
 	WaitForSomething2 0x00001000
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x0002130d
+	TextboxNoOverlapFollowPos 0x130d, 0x0002
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000c130e
+	TextboxNoOverlapFollowPos 0x130e, 0x000c
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x0002130f
+	TextboxNoOverlapFollowPos 0x130f, 0x0002
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000c1310
+	TextboxNoOverlapFollowPos 0x1310, 0x000c
 	_0807EA94 
 	CallWithArg sub_0805DDEC, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc
index 69938c3a..b43f09ea 100644
--- a/data/scripts/script_0801548E.inc
+++ b/data/scripts/script_0801548E.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0801548E
 	CallWithArg sub_0807FB28, 0x00000003
 	_0807E5F8 0x00048000
 	WaitForSomething2 0x00090000
-	TextboxNoOverlapFollowPos 0x00021311
+	TextboxNoOverlapFollowPos 0x1311, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00008000
 	WaitForSomething2 0x00010000
@@ -13,7 +13,7 @@ SCRIPT_START script_0801548E
 	WaitForSomething2 0x00010000
 	CallWithArg sub_0805DE18, 0x00000001
 	_0807F0C8 0x0000, 0x0000
-	TextboxNoOverlapFollowPos 0x000c1312
+	TextboxNoOverlapFollowPos 0x1312, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000800
 	WaitForSomething2 0x00001000
diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc
index a98e09f7..52110428 100644
--- a/data/scripts/script_080157AC.inc
+++ b/data/scripts/script_080157AC.inc
@@ -33,7 +33,7 @@ script_080157DA:
 	WaitForSomething2 0x00000010
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
-	TextboxNoOverlapFollowPos 0x00021066
+	TextboxNoOverlapFollowPos 0x1066, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
@@ -55,12 +55,12 @@ script_08015888:
 	CameraTargetEntity 
 	StartPlayerScript script_08015938
 	WaitForSomething2 0x00000010
-	TextboxNoOverlapFollowPos 0x000c106a
+	TextboxNoOverlapFollowPos 0x106a, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000008
 	Wait 0x0078
 	_0807E8E4_2 
-	TextboxNoOverlapFollowPos 0x00021068
+	TextboxNoOverlapFollowPos 0x1068, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index 72b34caf..908c7e24 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_08015958
 	_0807EDD4 0x01f8, 0x02f8
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	TextboxNoOverlapFollowPos 0x00021011
+	TextboxNoOverlapFollowPos 0x1011, 0x0002
 	_0807EA94 
 	_0807EDD4 0x01f8, 0x0268
 	SetEntityPositionRelative 0x02180248
@@ -57,7 +57,7 @@ script_08015A32:
 	CheckEntityInteractType 
 	JumpIfNot script_08015A32
 	StopScript 
-	TextboxNoOverlapFollowPos 0x00021067
+	TextboxNoOverlapFollowPos 0x1067, 0x0002
 	_0807EA94 
 	Jump script_08015A32
 script_08015A54:
diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc
index b23d4cc9..c81f01b7 100644
--- a/data/scripts/script_08015B34.inc
+++ b/data/scripts/script_08015B34.inc
@@ -10,7 +10,7 @@ script_08015B34:
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
-	TextboxNoOverlapFollowPos 0x00022506
+	TextboxNoOverlapFollowPos 0x2506, 0x0002
 	_0807EA94 
 	StartPlayerScript script_08015B84
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc
index d2e59189..b7b116b1 100644
--- a/data/scripts/script_08015C7C.inc
+++ b/data/scripts/script_08015C7C.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_08015C7C
 	_0807EF80 0x0000
 	CallWithArg sub_0807F238, 0x000003c5
 	Call sub_0807F304
-	TextboxNoOverlapFollowPos 0x000c1318
+	TextboxNoOverlapFollowPos 0x1318, 0x000c
 	_0807EA94 
 	CallWithArg sub_0807F238, 0x000003c9
 	Call sub_0807F304
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index f12ce493..5c6ce7d5 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -1,19 +1,20 @@
 from utils import barray_to_u16_hex, barray_to_u32_hex, barray_to_s16
 import struct
 
+# A list of all the commands, their correspondingScriptCommand_  functions and what kind of parameters they take
 commands = [
     {'fun': 'ScriptCommandNop', 'params': ''},
-    {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'},
-    {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'},
-    {'fun': 'ScriptCommand_Jump', 'params': 'j', 'name': 'jump by offset'},
-    {'fun': 'ScriptCommand_JumpIf', 'params': 'j', 'name': 'jump if'},
-    {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j', 'name': 'jump if not'},
+    {'fun': 'ScriptCommand_StartScript', 'params': ''},
+    {'fun': 'ScriptCommand_StopScript', 'params': ''},
+    {'fun': 'ScriptCommand_Jump', 'params': 'j'},
+    {'fun': 'ScriptCommand_JumpIf', 'params': 'j'},
+    {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j'},
     {'fun': 'ScriptCommand_JumpSwitch', 'params': ['jj', 'jjj', 'jjjj', 'jjjjjjj', 'jjjjjjjjj']},
-    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x','name': 'abs jump' },
-    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x', 'name': 'abs jump if'},
-    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x', 'name': 'abs jump if not'},
+    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x'},
+    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x'},
+    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x'},
     {'fun': 'ScriptCommand_JumpAbsoluteSwitch', 'params': 'xx'},
-    {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call},
+    {'fun': 'ScriptCommand_Call', 'params': 'p'},
     {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']},
     {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
@@ -37,12 +38,12 @@ commands = [
     {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E514', 'params': 'w'},
-    {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'},
+    {'fun': 'ScriptCommand_CheckPlayerFlags', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E564', 'params': ''},
     {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''},
     {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'},
     {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},# 'exec': ScriptCommand_0807E5F8},
+    {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E610', 'params': 'w'},
     {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'},
     {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'},
@@ -75,10 +76,10 @@ commands = [
     {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'},
     {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'},
     {'fun': 'ScriptCommand_0807E8D4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''},  # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''},  # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''},  # duplicate
+    {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E908', 'params': 's'},
     {'fun': 'ScriptCommand_0807E914', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E924', 'params': ''},
@@ -94,7 +95,7 @@ commands = [
     {'fun': 'ScriptCommand_0807EA94', 'params': ''},
     {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['w', 's']}, # TODO w or ss?
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['ss', 's']},
     {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']},
     {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
     {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
@@ -143,9 +144,6 @@ commands = [
     {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'}
 ]
 
-
-
-
 # Functions that have already been renamed
 POINTER_MAP = {
     'sub_08095458': 'nullsub_527',
@@ -157,18 +155,22 @@ POINTER_MAP = {
     'sub_080A2138': 'Windcrest_Unlock',
     'sub_080A29BC': 'CreateDust'
 }
-# tries to directly reference the function this is pointing to
+
+
 def get_pointer(barray):
+    # tries to directly reference the function this is pointing to
     integers = struct.unpack('I', barray)
     pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
     if pointer in POINTER_MAP:
         return POINTER_MAP[pointer]
     return pointer
 
+
 # Data pointers that actually point to a script location
 DATA_MAP = {
     'gUnk_08016384': 'script_08016384'
 }
+
 def get_data_pointer(barray):
     integers = struct.unpack('I', barray)
     pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper()
@@ -176,6 +178,7 @@ def get_data_pointer(barray):
         return DATA_MAP[pointer]
     return pointer
 
+
 def get_script_pointer(barray):
     integers = struct.unpack('I', barray)
     return 'script_' + (struct.pack('>I', integers[0]).hex()).upper()
@@ -184,7 +187,7 @@ def get_script_pointer(barray):
 def get_script_label(u32):
     return hex(u32).upper().replace('0X', 'script_0')
 
-
+# Collects a set of all the labels that were jumped to
 used_labels = set()
 def use_script_label(u32):
     global used_labels
@@ -193,125 +196,121 @@ def use_script_label(u32):
     return label
 
 
-
-
 # definitions for parameter types
 parameters = {
     '': {
-        'length':0,
+        'length': 0,
         'param': '',
         'expr': '',
         'read': lambda ctx: ''
     },
-    's': { 
+    's': {
         'length': 1,
         'param': 's',
         'expr': '	.short \s',
-        'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0]
+        'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 4])[0]
     },
     'ss': {
         'length': 2,
         'param': 'a,b',
         'expr': '	.short \\a\n	.short \\b',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
     },
     'sss': {
         'length': 3,
         'param': 'a,b,c',
         'expr': '	.short \\a\n	.short \\b\n	.short \\c',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8]))
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 8]))
     },
     'ssss': {
         'length': 4,
         'param': 'a,b,c,d',
         'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
+        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10]))
     },
 
     'w': {
         'length': 2,
         'param': 'w',
         'expr': '	.word \w',
-        'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0]
+        'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6])[0]
     },
     'ww': {
         'length': 4,
         'param': 'a,b',
         'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
+        'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10]))
     },
 
-
-    'j': { # Relative jump target
+    'j': {  # Relative jump target
         'length': 1,
         'param': 's',
         'expr': '1:	.short \s - 1b',
-        'read': lambda ctx: use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+2:ctx.ptr+4]))
-        # hex(ctx.script_addr + barray_to_s16(ctx.data[ctx.ptr+2:ctx.ptr+4])).upper().replace('0X', 'script_0')
+        'read': lambda ctx: use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + 2:ctx.ptr + 4]))
     },
     'jj': {
         'length': 2,
         'param': 'a,b',
         'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,2)])
-    },  
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x * 2) for x in range(0, 2)])
+    },
     'jjj': {
         'length': 3,
         'param': 'a,b,c',
         'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,3)])
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 3)])
     },
     'jjjj': {
         'length': 4,
         'param': 'a,b,c,d',
         'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,4)])
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 4)])
     },
     'jjjjjjj': {
         'length': 7,
         'param': 'a,b,c,d,e,f,g',
         'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6\n	.short \\e - 1b - 8\n	.short \\f - 1b - 10\n	.short \\g - 1b - 12',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,7)])
-    },  
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 7)])
+    },
     'jjjjjjjjj': {
         'length': 9,
         'param': 'a,b,c,d,e,f,g,h,i',
         'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6\n	.short \\e - 1b - 8\n	.short \\f - 1b - 10\n	.short \\g - 1b - 12\n	.short \\h - 1b - 14\n	.short \\i - 1b - 16',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,9)])
-    }, 
+        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 9)])
+    },
     'p': {
         'length': 2,
         'param': 'w',
         'expr': '	.word \w',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
 
     'pw': {
         'length': 4,
         'param': 'a,b',
         'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+14])[0]
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr + 6:ctx.ptr + 14])[0]
     },
-    'd': { # Data pointer
+    'd': {  # Data pointer
         'length': 2,
         'param': 'w',
         'expr': '	.word \w',
-        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
-    'x': { # Script pointer
+    'x': {  # Script pointer
         'length': 2,
         'param': 'w',
         'expr': '	.word \w',
-        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])
+        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
     'xx': {
         'length': 4,
         'param': 'a, b',
         'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10])
+        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10])
     },
     # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations
-    # 'v': { 
+    # 'v': {
     #     'length': -1,
     #     'param': '',
     #     'expr': '',
@@ -323,4 +322,4 @@ parameters = {
     #     'expr': '	.word \w',
     #     'read': lambda ctx: ''
     # },
-}
\ No newline at end of file
+}
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index fe35bcd1..19b171c8 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -1,14 +1,14 @@
 from dataclasses import dataclass
 import struct
-from utils import barray_to_u16_hex, barray_to_u32_hex, u16_to_hex, u32_to_hex
-from definitions import get_pointer, get_data_pointer, get_script_pointer, commands, parameters, get_script_label, used_labels
+from utils import barray_to_u16_hex, u16_to_hex
+from definitions import get_pointer, commands, parameters, get_script_label, used_labels
 
 
 # Disassembler for tmc scripts
 # Input 'macros' to generate the macros for the script commands
 # Input the script bytes as hex to disassemble the script
 
-# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/scripts.inc 
+# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/scripts.inc
 
 @dataclass
 class Context:
@@ -18,20 +18,23 @@ class Context:
 
 
 # Remove the ScriptCommand_ prefix for the asm macros
-def build_script_command(name: str): 
+def build_script_command(name: str):
     name = name.replace("ScriptCommand_", "")
-    if name[0].isdigit(): # asm macros cannot start with an _
-        return '_' + name
+    if name[0].isdigit():  # asm macros cannot start with an _
+        return f'_{name}'
     return name
 
+
 def print_rest_bytes(ctx):
-     print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
+    print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
+
 
 def disassemble_command(ctx: Context, add_all_annotations=False):
     global used_labels
     if add_all_annotations or ctx.script_addr + ctx.ptr in used_labels:
-        print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:') # print offsets to debug when manually inserting labels
-    cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
+        # print offsets to debug when manually inserting labels
+        print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:')
+    cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]
     if cmd == 0:
         # this does not need to be the end of the script
         print('\t.short 0x0000')
@@ -41,99 +44,88 @@ def disassemble_command(ctx: Context, add_all_annotations=False):
     if cmd == 0xffff:
         ctx.ptr += 2
         print('SCRIPT_END')
-        cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0]
+        cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]
         if cmd == 0x0000:
             # This is actually the end of the script
             print('\t.short 0x0000')
             ctx.ptr += 2
             return 2
-        return 3 # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please
+        return 3  # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please
 
     commandSize = cmd >> 0xA
     if commandSize == 0:
-        raise Exception(f'Zero commandSize')
-        # TODO error
-        return 0
+        raise Exception(f'Zero commandSize not allowed')
     commandId = cmd & 0x3FF
     if commandId >= len(commands):
-        #print_rest_bytes(ctx)
-        print(f'\t.short {u16_to_hex(cmd)}')
-        ctx.ptr += 2
-        #raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}')
-        # TODO error
-        return 1
+        raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}')
     command = commands[commandId]
-    param_length = commandSize - 1 
+    param_length = commandSize - 1
     if commandSize > 1:
-        if ctx.ptr+2*commandSize > len(ctx.data):
+        if ctx.ptr + 2 * commandSize > len(ctx.data):
             raise Exception(f'Not enough data to fetch {commandSize-1} params')
-            return 0
-        #meta = struct.unpack(
-        #    'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06])
-        #print('meta', meta)
 
     # Handle parameters
     if not 'params' in command:
-        raise Exception('Parameters not defined for ' + command['fun'] + '   Should be of length ' + str(param_length))
+        raise Exception(f'Parameters not defined for {command["fun"]}. Should be of length {str(param_length)}')
 
     params = None
-    suffix = '' 
+    suffix = ''
     # When there are multiple variants of parameters, choose the one with the correct count for this
     if isinstance(command['params'], list):
-        for i,param in enumerate(command['params']):
+        for i, param in enumerate(command['params']):
             if not param in parameters:
                 raise Exception(f'Parameter configuration {param} not defined')
             candidate = parameters[param]
-            if candidate['length'] == commandSize -1:
+            if candidate['length'] == commandSize - 1:
                 params = candidate
                 if i != 0:
-                    suffix = f'_{params["length"]}'# We need to add a suffix to distinguish the correct parameter variant
+                    # We need to add a suffix to distinguish the correct parameter variant
+                    suffix = f'_{params["length"]}'
                 break
         if params is None:
-            raise Exception(f'No suitable parameter configuration with length {commandSize-1} found for {command["fun"]}')
+            raise Exception(
+                f'No suitable parameter configuration with length {commandSize-1} found for {command["fun"]}')
     else:
         if not command['params'] in parameters:
-            raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+            raise Exception(f'Parameter configuration {command["params"]} not defined')
         params = parameters[command['params']]
 
     command_name = f'{command["fun"]}{suffix}'
 
-    if params['length'] == -1: # variable parameter length
+    if params['length'] == -1:  # variable parameter length
         print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
         if commandSize > 1:
-            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])]))
+            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + commandSize * 2])]))
             print(f'@ End of parameters')
-        ctx.ptr += commandSize*2
+        ctx.ptr += commandSize * 2
         return 1
-    elif params['length'] == -2: # point and var
+    elif params['length'] == -2:  # point and var
         print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
 
-        print('\t.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]))
+        print('\t.word ' + get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
         if commandSize > 3:
-            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])]))
+            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 6:ctx.ptr + commandSize * 2])]))
             print(f'@ End of parameters')
-        ctx.ptr += commandSize*2
+        ctx.ptr += commandSize * 2
         return 1
 
     if commandSize-1 != params['length']:
-        raise Exception(f'Call {command_name} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined')
+        raise Exception(f'Call {command_name} with {commandSize-1} length, while length of {params["length"]} defined')
 
     print(f'\t{build_script_command(command_name)} {params["read"](ctx)}')
 
     # Execute script
-    ctx.ptr += commandSize*2
+    ctx.ptr += commandSize * 2
     return 1
 
 
-
 def disassemble_script(input_bytes, script_addr, add_all_annotations=False):
-
     ctx = Context(0, input_bytes, script_addr)
 
-
     foundEnd = False
     while True:
-        if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id)
+        # End of file (there need to be at least two bytes remaining for the next operation id)
+        if ctx.ptr >= len(ctx.data) - 1:
             break
         res = disassemble_command(ctx, add_all_annotations)
         if res == 0:
@@ -145,26 +137,21 @@ def disassemble_script(input_bytes, script_addr, add_all_annotations=False):
             # End in the middle of the script, please create a new file
             return ctx.ptr
 
-    
-
-
     # Print rest (did not manage to get there)
     if ctx.ptr < len(ctx.data):
         if (len(ctx.data) - ctx.ptr) % 2 != 0:
             print_rest_bytes(ctx)
-            # TODO error
-            raise Exception('DONT WANT EXTRA after '+ str(ctx.ptr) + ' / ' + str(len(ctx.data)))
-            return
+            raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}')
         print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
-        raise Exception('DONT WANT EXTRA after '+ str(ctx.ptr) + ' / ' + str(len(ctx.data)))
+        raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}')
 
     if not foundEnd:
-        # Seems to happen, sadly
+        # Sadly, there are script files without and end?
         return 0
         #print('\033[93mNo end found\033[0m')
-        #raise Exception('No end found')
     return 0
 
+
 def generate_macros():
     print('@ All the macro functions for scripts')
     print('@ Generated by disassemble_script.py')
@@ -182,7 +169,7 @@ def generate_macros():
     print('')
     for num, command in enumerate(commands):
         if not 'params' in command:
-            raise Exception('Parameters not defined for ' + command['fun'] + '!')
+            raise Exception(f'Parameters not defined for {command["fun"]}')
 
         def emit_macro(command_name, id, params):
             print(f'.macro {command_name} {params["param"]}')
@@ -194,29 +181,29 @@ def generate_macros():
 
         if isinstance(command['params'], list):
             # emit macros for all variants
-            for i,variant in enumerate(command['params']):
+            for i, variant in enumerate(command['params']):
                 if not variant in parameters:
-                    raise Exception('Parameter configuration ' + variant + ' not defined')
+                    raise Exception(f'Parameter configuration {variant} not defined')
                 params = parameters[variant]
-                id = ((params['length']+1) << 0xA) + num    
+                id = ((params['length'] + 1) << 0xA) + num
                 suffix = ''
                 if i != 0:
                     suffix = f'_{params["length"]}'
                 emit_macro(f'{build_script_command(command["fun"])}{suffix}', id, params)
         else:
             if not command['params'] in parameters:
-                raise Exception('Parameter configuration ' + command['params'] + ' not defined')
+                raise Exception(f'Parameter configuration {command["params"]} not defined')
             params = parameters[command['params']]
-            id = ((params['length']+1) << 0xA) + num
+            id = ((params['length'] + 1) << 0xA) + num
 
-            if params['length'] < 0: # Don't emit anything for variable parameters
+            if params['length'] < 0:  # Don't emit anything for variable parameters
                 continue
 
             emit_macro(build_script_command(command['fun']), id, params)
 
-        #print('#define ' + command['fun'] + '(' + params['param'] + ') asm(".short '+u16_to_hex(id)+'");' + params['expr'])
     print('')
 
+
 def main():
 
     # Read input
@@ -226,6 +213,7 @@ def main():
         generate_macros()
         return
     disassemble_script(bytearray.fromhex(input_data))
-    
+
+
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/split_script_data.py
similarity index 67%
rename from tools/script_disassembler/incbin_parser.py
rename to tools/script_disassembler/split_script_data.py
index 70fe3da9..58ffa5a0 100644
--- a/tools/script_disassembler/incbin_parser.py
+++ b/tools/script_disassembler/split_script_data.py
@@ -1,27 +1,30 @@
-# This python script reads the script.s file which contains all the .incbin macros
-# Then it fetches the corresponding data of the baserom, o
-TMC_FOLDER='../..'
-
-import subprocess
-import sys
 from script_disassembler import disassemble_script, generate_macros
+import sys
 
-ROM_OFFSET=0x08000000
-SCRIPTS_START=0x08008B5C
-SCRIPTS_END=0x08016984
+# Reads a section from the baserom, splits the residing scripts into seperate files and disassembles them
+# Should only be run before any manual changes to the script files are done!
+
+TMC_FOLDER = '../..'
+
+ROM_OFFSET = 0x08000000
+SCRIPTS_START = 0x08008B5C
+SCRIPTS_END = 0x08016984
 
 # Create labels for these additional script instructions
 # Currently done by splitting the script at that point
-LABEL_BREAKS=[0x0800A088, 0x0800ACE0, 0x0800AD54, 0x0800B41C, 0x0800B7C4, 0x0800C8C8, 0x0800D190, 0x800D3EC, 0x0800E9F4, 0x0800FD80, 0x08012AC8, 0x08012F0C, 0x080130E4, 0x08013B70, 0x080142B0, 0x080147DC, 0x08014A80, 0x08014B10,0x0801635C,  0x08016384, 0x080165D8]
+LABEL_BREAKS = [0x0800A088, 0x0800ACE0, 0x0800AD54, 0x0800B41C, 0x0800B7C4, 0x0800C8C8, 0x0800D190, 0x800D3EC, 0x0800E9F4, 0x0800FD80,
+                0x08012AC8, 0x08012F0C, 0x080130E4, 0x08013B70, 0x080142B0, 0x080147DC, 0x08014A80, 0x08014B10, 0x0801635C,  0x08016384, 0x080165D8]
 
 # Whether to output a label for every line
-PRINT_ALL_LABELS=False
+PRINT_ALL_LABELS = False
+
 
 def read_baserom():
     # read baserom data
     with open(f'{TMC_FOLDER}/baserom.gba', 'rb') as baserom:
         return bytearray(baserom.read())
 
+
 def get_label(addr):
     return hex(addr).upper().replace('0X', 'script_0')
 
@@ -42,10 +45,10 @@ def disassemble_scripts(baserom_data):
     label_break = 0
 
     while script_start < SCRIPTS_END-ROM_OFFSET:
-        if label_break < len(LABEL_BREAKS) and script_start+ROM_OFFSET >=LABEL_BREAKS[label_break]:
+        if label_break < len(LABEL_BREAKS) and script_start + ROM_OFFSET >= LABEL_BREAKS[label_break]:
             label_break += 1
 
-        label = get_label(script_start+ROM_OFFSET)
+        label = get_label(script_start + ROM_OFFSET)
         print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...")
         # find end of the script signified by 0xffff0000
         script_end = baserom_data.index(b'\xff\xff\x00\x00', script_start) + 4
@@ -53,41 +56,40 @@ def disassemble_scripts(baserom_data):
         if script_end > SCRIPTS_END-ROM_OFFSET:
             script_end = SCRIPTS_END-ROM_OFFSET
 
-        if label_break < len(LABEL_BREAKS) and script_end+ROM_OFFSET > LABEL_BREAKS[label_break]:
-            #print(f'break at {hex(LABEL_BREAKS[label_break])} instead of {hex(script_end)}')
+        # break at a predefined label into a new file
+        if label_break < len(LABEL_BREAKS) and script_end + ROM_OFFSET > LABEL_BREAKS[label_break]:
             script_end = LABEL_BREAKS[label_break]-ROM_OFFSET
 
         # read data from rom
         data = baserom_data[script_start:script_end]
 
-
-
         scripts += f'	.include "data/scripts/{label}.inc"\n'
         stdout = sys.stdout
 
-        with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out:
+        with open(f'{TMC_FOLDER}/data/scripts/{label}.inc', 'w') as out:
             sys.stdout = out
 
-            if script_start == 0x1637C: # This function is actually assembly
-                print ('''thumb_func_start script_0801637C
+            if script_start == 0x1637C:  # This function is actually assembly
+                print('''thumb_func_start script_0801637C
 script_0801637C:
     push {lr}
     bl CreateDust
     pop {pc}''')
                 sys.stdout = stdout
-                script_start = script_end 
+                script_start = script_end
                 continue
 
             print(f'SCRIPT_START {label}')
-            res = disassemble_script(data, script_start+ROM_OFFSET, PRINT_ALL_LABELS)
+            res = disassemble_script(data, script_start + ROM_OFFSET, PRINT_ALL_LABELS)
             if res != 0:
                 # Script ended in the middle, need to create a new file
                 script_end = script_start + res
         sys.stdout = stdout
 
-        script_start = script_end 
+        script_start = script_end
     return scripts
 
+
 def main():
     baserom_data = read_baserom()
 
@@ -111,5 +113,6 @@ def main():
 
     print('\033[1;92mDone\033[0m\n')
 
+
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

From 74e48d98b0edef729d90e070b65df748ecf3206f Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 22:44:09 +0100
Subject: [PATCH 23/46] Rename to Begin/EndBlock

---
 asm/macros/scripts.inc                   |   9 +-
 data/scripts/script_08008B5C.inc         |  18 ++--
 data/scripts/script_08008D50.inc         |   6 +-
 data/scripts/script_08008D8C.inc         |  14 +--
 data/scripts/script_08008F74.inc         |   4 +-
 data/scripts/script_08008FFC.inc         |   4 +-
 data/scripts/script_0800903C.inc         |  36 +++----
 data/scripts/script_08009320.inc         |   4 +-
 data/scripts/script_08009340.inc         |   4 +-
 data/scripts/script_08009348.inc         |   4 +-
 data/scripts/script_08009464.inc         |   4 +-
 data/scripts/script_080094CC.inc         |   4 +-
 data/scripts/script_080094FC.inc         |  16 +--
 data/scripts/script_080095F2.inc         |  16 +--
 data/scripts/script_08009740.inc         |   4 +-
 data/scripts/script_080097F0.inc         |  10 +-
 data/scripts/script_08009838.inc         |   4 +-
 data/scripts/script_080098D4.inc         |   4 +-
 data/scripts/script_08009918.inc         |   4 +-
 data/scripts/script_08009950.inc         |   4 +-
 data/scripts/script_080099DC.inc         |   4 +-
 data/scripts/script_08009A34.inc         |   2 +-
 data/scripts/script_08009A84.inc         |   6 +-
 data/scripts/script_08009AF8.inc         |   4 +-
 data/scripts/script_08009B30.inc         |   4 +-
 data/scripts/script_08009B78.inc         |   4 +-
 data/scripts/script_08009C68.inc         |   8 +-
 data/scripts/script_08009CFC.inc         |   4 +-
 data/scripts/script_08009D6C.inc         |   4 +-
 data/scripts/script_08009DB0.inc         |   8 +-
 data/scripts/script_08009E58.inc         |   4 +-
 data/scripts/script_08009E80.inc         |   4 +-
 data/scripts/script_08009E88.inc         |   4 +-
 data/scripts/script_08009ECC.inc         |   8 +-
 data/scripts/script_08009EF0.inc         |   8 +-
 data/scripts/script_08009F14.inc         |  32 +++---
 data/scripts/script_0800A088.inc         |   4 +-
 data/scripts/script_0800A0B4.inc         |   4 +-
 data/scripts/script_0800A0FC.inc         |   8 +-
 data/scripts/script_0800A160.inc         |   6 +-
 data/scripts/script_0800A1B4.inc         |   4 +-
 data/scripts/script_0800A1D8.inc         |   6 +-
 data/scripts/script_0800A310.inc         |   6 +-
 data/scripts/script_0800A3D8.inc         |   8 +-
 data/scripts/script_0800A500.inc         |   4 +-
 data/scripts/script_0800A590.inc         |   4 +-
 data/scripts/script_0800A638.inc         |   4 +-
 data/scripts/script_0800A65C.inc         |   4 +-
 data/scripts/script_0800A680.inc         |   4 +-
 data/scripts/script_0800A6A4.inc         |   6 +-
 data/scripts/script_0800A6D4.inc         |   6 +-
 data/scripts/script_0800A704.inc         |   6 +-
 data/scripts/script_0800A734.inc         |   6 +-
 data/scripts/script_0800A764.inc         |   6 +-
 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         |   6 +-
 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         |   6 +-
 data/scripts/script_0800AB08.inc         |   8 +-
 data/scripts/script_0800ACBC.inc         |   4 +-
 data/scripts/script_0800ACE0.inc         |   8 +-
 data/scripts/script_0800AD54.inc         |   8 +-
 data/scripts/script_0800AEA4.inc         |   4 +-
 data/scripts/script_0800AEDC.inc         |   4 +-
 data/scripts/script_0800AF18.inc         |   4 +-
 data/scripts/script_0800AFB0.inc         |   6 +-
 data/scripts/script_0800B00C.inc         |   4 +-
 data/scripts/script_0800B0AC.inc         |   2 +-
 data/scripts/script_0800B0D0.inc         |   8 +-
 data/scripts/script_0800B1C0.inc         |   4 +-
 data/scripts/script_0800B200.inc         |   4 +-
 data/scripts/script_0800B254.inc         |  14 +--
 data/scripts/script_0800B308.inc         |  10 +-
 data/scripts/script_0800B3A4.inc         |   4 +-
 data/scripts/script_0800B41C.inc         |   4 +-
 data/scripts/script_0800B4AC.inc         |  10 +-
 data/scripts/script_0800B54C.inc         |   4 +-
 data/scripts/script_0800B574.inc         |   4 +-
 data/scripts/script_0800B5C4.inc         |   4 +-
 data/scripts/script_0800B5EC.inc         |   8 +-
 data/scripts/script_0800B6C8.inc         |   8 +-
 data/scripts/script_0800B7C4.inc         |   4 +-
 data/scripts/script_0800B7FC.inc         |   4 +-
 data/scripts/script_0800B828.inc         |  32 +++---
 data/scripts/script_0800B9B4.inc         |  12 +--
 data/scripts/script_0800BACC.inc         |   4 +-
 data/scripts/script_0800BB00.inc         |   4 +-
 data/scripts/script_0800BB30.inc         |   4 +-
 data/scripts/script_0800BB64.inc         |   4 +-
 data/scripts/script_0800BBA4.inc         |   4 +-
 data/scripts/script_0800BBDC.inc         |   4 +-
 data/scripts/script_0800BC08.inc         |   8 +-
 data/scripts/script_0800BC50.inc         |   4 +-
 data/scripts/script_0800BCE8.inc         |   4 +-
 data/scripts/script_0800BD78.inc         |   4 +-
 data/scripts/script_0800BE1C.inc         |   8 +-
 data/scripts/script_0800BECC.inc         |   4 +-
 data/scripts/script_0800BF38.inc         |   8 +-
 data/scripts/script_0800C004.inc         |   4 +-
 data/scripts/script_0800C0B0.inc         |   8 +-
 data/scripts/script_0800C160.inc         |   4 +-
 data/scripts/script_0800C1D8.inc         |   8 +-
 data/scripts/script_0800C2A4.inc         |   4 +-
 data/scripts/script_0800C350.inc         |   4 +-
 data/scripts/script_0800C3CC.inc         |   4 +-
 data/scripts/script_0800C410.inc         |   4 +-
 data/scripts/script_0800C45C.inc         |   4 +-
 data/scripts/script_0800C494.inc         |   4 +-
 data/scripts/script_0800C4D0.inc         |   4 +-
 data/scripts/script_0800C50C.inc         |   4 +-
 data/scripts/script_0800C550.inc         |  48 ++++-----
 data/scripts/script_0800C8C8.inc         |   4 +-
 data/scripts/script_0800C8F0.inc         |   4 +-
 data/scripts/script_0800C91C.inc         |   4 +-
 data/scripts/script_0800CA8C.inc         |   4 +-
 data/scripts/script_0800CABC.inc         |   4 +-
 data/scripts/script_0800CB54.inc         |   4 +-
 data/scripts/script_0800CBD4.inc         |   4 +-
 data/scripts/script_0800CC6C.inc         |   4 +-
 data/scripts/script_0800CD04.inc         |   4 +-
 data/scripts/script_0800CD7C.inc         |  40 ++++----
 data/scripts/script_0800D190.inc         |   4 +-
 data/scripts/script_0800D1B4.inc         |   4 +-
 data/scripts/script_0800D218.inc         |   4 +-
 data/scripts/script_0800D254.inc         |   4 +-
 data/scripts/script_0800D278.inc         |  32 +++---
 data/scripts/script_0800D3EC.inc         |   4 +-
 data/scripts/script_0800D414.inc         |  26 ++---
 data/scripts/script_0800D6B4.inc         |   4 +-
 data/scripts/script_0800D6D0.inc         |   4 +-
 data/scripts/script_0800D6F0.inc         |   4 +-
 data/scripts/script_0800D710.inc         |   4 +-
 data/scripts/script_0800D76C.inc         |  10 +-
 data/scripts/script_0800D84C.inc         |   4 +-
 data/scripts/script_0800D874.inc         |   8 +-
 data/scripts/script_0800D92C.inc         |   4 +-
 data/scripts/script_0800D954.inc         |   4 +-
 data/scripts/script_0800DA00.inc         |   4 +-
 data/scripts/script_0800DA28.inc         |   4 +-
 data/scripts/script_0800DA60.inc         |   6 +-
 data/scripts/script_0800DB18.inc         |   4 +-
 data/scripts/script_0800DB28.inc         |   4 +-
 data/scripts/script_0800DB78.inc         |   6 +-
 data/scripts/script_0800DCAC.inc         |   6 +-
 data/scripts/script_0800DDD0.inc         |   4 +-
 data/scripts/script_0800DE00.inc         |   4 +-
 data/scripts/script_0800DE2C.inc         |   4 +-
 data/scripts/script_0800DE50.inc         |   2 +-
 data/scripts/script_0800DEB0.inc         |   4 +-
 data/scripts/script_0800DED4.inc         |  10 +-
 data/scripts/script_0800DF24.inc         |   4 +-
 data/scripts/script_0800DFB4.inc         |   2 +-
 data/scripts/script_0800DFE4.inc         |   4 +-
 data/scripts/script_0800E050.inc         |   4 +-
 data/scripts/script_0800E094.inc         |   4 +-
 data/scripts/script_0800E0BC.inc         |  62 ++++++------
 data/scripts/script_0800E504.inc         |   4 +-
 data/scripts/script_0800E544.inc         |   4 +-
 data/scripts/script_0800E58C.inc         |   4 +-
 data/scripts/script_0800E5C4.inc         |   4 +-
 data/scripts/script_0800E5D6.inc         |   2 +-
 data/scripts/script_0800E600.inc         |   4 +-
 data/scripts/script_0800E62C.inc         |   4 +-
 data/scripts/script_0800E658.inc         |   4 +-
 data/scripts/script_0800E684.inc         |   4 +-
 data/scripts/script_0800E6B0.inc         |  56 +++++------
 data/scripts/script_0800E8A4.inc         |   4 +-
 data/scripts/script_0800E8D6.inc         |   4 +-
 data/scripts/script_0800E908.inc         |   8 +-
 data/scripts/script_0800E9F4.inc         |   4 +-
 data/scripts/script_0800EA54.inc         |  80 +++++++--------
 data/scripts/script_0800EF40.inc         |   4 +-
 data/scripts/script_0800EF9C.inc         |   4 +-
 data/scripts/script_0800EFC0.inc         |  10 +-
 data/scripts/script_0800F14C.inc         |   4 +-
 data/scripts/script_0800F184.inc         |  24 ++---
 data/scripts/script_0800F39C.inc         |  12 +--
 data/scripts/script_0800F430.inc         |  12 +--
 data/scripts/script_0800F4C4.inc         |  12 +--
 data/scripts/script_0800F554.inc         |  32 +++---
 data/scripts/script_0800F724.inc         |  12 +--
 data/scripts/script_0800FA54.inc         |   6 +-
 data/scripts/script_0800FA78.inc         |   4 +-
 data/scripts/script_0800FA9C.inc         |   4 +-
 data/scripts/script_0800FAC0.inc         |   4 +-
 data/scripts/script_0800FAE4.inc         |   4 +-
 data/scripts/script_0800FB44.inc         |  14 +--
 data/scripts/script_0800FDA0.inc         |  34 +++----
 data/scripts/script_0800FF18.inc         |  10 +-
 data/scripts/script_0800FF74.inc         |  16 +--
 data/scripts/script_080100C8.inc         |  24 ++---
 data/scripts/script_08010264.inc         | 108 ++++++++++----------
 data/scripts/script_08010964.inc         |   6 +-
 data/scripts/script_080109F0.inc         |   4 +-
 data/scripts/script_08010A14.inc         |   4 +-
 data/scripts/script_08010A38.inc         |   4 +-
 data/scripts/script_08010A5C.inc         |   4 +-
 data/scripts/script_08010A98.inc         |  22 ++---
 data/scripts/script_08010B68.inc         |  10 +-
 data/scripts/script_08010BB4.inc         |  14 +--
 data/scripts/script_08010E5A.inc         |   2 +-
 data/scripts/script_08010F84.inc         |   2 +-
 data/scripts/script_08011074.inc         |   4 +-
 data/scripts/script_08011098.inc         |   4 +-
 data/scripts/script_080110BC.inc         |   4 +-
 data/scripts/script_080110E8.inc         |   4 +-
 data/scripts/script_08011128.inc         |   6 +-
 data/scripts/script_080111CC.inc         |   6 +-
 data/scripts/script_080112C4.inc         |   4 +-
 data/scripts/script_080115D0.inc         |   4 +-
 data/scripts/script_08011608.inc         |   4 +-
 data/scripts/script_08011640.inc         |   4 +-
 data/scripts/script_080116A8.inc         |   4 +-
 data/scripts/script_0801183C.inc         |   4 +-
 data/scripts/script_08011890.inc         |   4 +-
 data/scripts/script_080118D4.inc         |   4 +-
 data/scripts/script_0801194C.inc         |  32 +++---
 data/scripts/script_08011B40.inc         |   8 +-
 data/scripts/script_08011C50.inc         |   4 +-
 data/scripts/script_08011C7C.inc         | 120 +++++++++++------------
 data/scripts/script_0801232C.inc         |  16 +--
 data/scripts/script_08012410.inc         |   4 +-
 data/scripts/script_08012430.inc         |  12 +--
 data/scripts/script_080126FC.inc         |  40 ++++----
 data/scripts/script_08012AB0.inc         |   2 +-
 data/scripts/script_08012AC8.inc         |   4 +-
 data/scripts/script_08012AF0.inc         |   4 +-
 data/scripts/script_08012B24.inc         |   4 +-
 data/scripts/script_08012B50.inc         |   4 +-
 data/scripts/script_08012B7C.inc         |   4 +-
 data/scripts/script_08012BA8.inc         |   4 +-
 data/scripts/script_08012BF8.inc         |   4 +-
 data/scripts/script_08012C48.inc         |   4 +-
 data/scripts/script_08012C68.inc         |  10 +-
 data/scripts/script_08012CD8.inc         |   6 +-
 data/scripts/script_08012D18.inc         |   6 +-
 data/scripts/script_08012DB0.inc         |   4 +-
 data/scripts/script_08012DD8.inc         |   4 +-
 data/scripts/script_08012DF8.inc         |   4 +-
 data/scripts/script_08012E20.inc         |   4 +-
 data/scripts/script_08012E44.inc         |   4 +-
 data/scripts/script_08012E88.inc         |   8 +-
 data/scripts/script_08012F0C.inc         |   4 +-
 data/scripts/script_08012F86.inc         |  14 +--
 data/scripts/script_080130E4.inc         |   4 +-
 data/scripts/script_08013114.inc         |  14 +--
 data/scripts/script_0801319A.inc         |   4 +-
 data/scripts/script_080132E4.inc         |   4 +-
 data/scripts/script_0801330C.inc         |   4 +-
 data/scripts/script_08013330.inc         |   6 +-
 data/scripts/script_0801334C.inc         |   4 +-
 data/scripts/script_080133C4.inc         |   4 +-
 data/scripts/script_080133F8.inc         |   6 +-
 data/scripts/script_08013494.inc         |   8 +-
 data/scripts/script_080134DC.inc         |  20 ++--
 data/scripts/script_08013650.inc         |   2 +-
 data/scripts/script_080136B4.inc         |   4 +-
 data/scripts/script_080136D8.inc         |   4 +-
 data/scripts/script_08013720.inc         |  20 ++--
 data/scripts/script_080138B4.inc         |  22 ++---
 data/scripts/script_08013AA6.inc         |   2 +-
 data/scripts/script_08013B18.inc         |   8 +-
 data/scripts/script_08013BE8.inc         |  16 +--
 data/scripts/script_08013CA4.inc         |   4 +-
 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         |   4 +-
 data/scripts/script_08013E28.inc         |   4 +-
 data/scripts/script_08013E4C.inc         |   4 +-
 data/scripts/script_08013E70.inc         |   4 +-
 data/scripts/script_08013E94.inc         |   6 +-
 data/scripts/script_08013EB0.inc         |   6 +-
 data/scripts/script_08013ECC.inc         |   6 +-
 data/scripts/script_08013EE8.inc         |   6 +-
 data/scripts/script_08013F04.inc         |   4 +-
 data/scripts/script_08013F34.inc         |   4 +-
 data/scripts/script_08013F64.inc         |   4 +-
 data/scripts/script_08013F94.inc         |  10 +-
 data/scripts/script_08013FE8.inc         |  14 +--
 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         |   8 +-
 data/scripts/script_080142B0.inc         |  16 +--
 data/scripts/script_08014384.inc         |   2 +-
 data/scripts/script_080143C0.inc         |   2 +-
 data/scripts/script_08014450.inc         |   4 +-
 data/scripts/script_0801450C.inc         |   8 +-
 data/scripts/script_08014588.inc         |   2 +-
 data/scripts/script_080145B0.inc         |   8 +-
 data/scripts/script_080145E8.inc         |   8 +-
 data/scripts/script_080147DC.inc         |   2 +-
 data/scripts/script_08014804.inc         |   8 +-
 data/scripts/script_08014958.inc         |  10 +-
 data/scripts/script_080149CC.inc         |  12 +--
 data/scripts/script_08014A80.inc         |   8 +-
 data/scripts/script_08014B10.inc         |   4 +-
 data/scripts/script_08014B34.inc         |  26 ++---
 data/scripts/script_08014CDC.inc         |  16 +--
 data/scripts/script_08014DCC.inc         |   6 +-
 data/scripts/script_08014E14.inc         |  40 ++++----
 data/scripts/script_08015234.inc         |   4 +-
 data/scripts/script_080152B4.inc         |   4 +-
 data/scripts/script_080152DC.inc         |   4 +-
 data/scripts/script_08015338.inc         |   4 +-
 data/scripts/script_08015360.inc         |   6 +-
 data/scripts/script_08015390.inc         |   4 +-
 data/scripts/script_080153EC.inc         |   8 +-
 data/scripts/script_0801550C.inc         |   4 +-
 data/scripts/script_08015618.inc         |   4 +-
 data/scripts/script_08015684.inc         |   4 +-
 data/scripts/script_08015754.inc         |   4 +-
 data/scripts/script_080157AC.inc         |   4 +-
 data/scripts/script_08015958.inc         |  18 ++--
 data/scripts/script_08015AC4.inc         |   4 +-
 data/scripts/script_08015B14.inc         |   4 +-
 data/scripts/script_08015B34.inc         |   6 +-
 data/scripts/script_08015BA8.inc         |   4 +-
 data/scripts/script_08015BE8.inc         |   8 +-
 data/scripts/script_08015C7C.inc         |   4 +-
 data/scripts/script_08015CD4.inc         |  14 +--
 data/scripts/script_08015DF0.inc         |   4 +-
 data/scripts/script_08015E58.inc         |   6 +-
 data/scripts/script_08015F08.inc         |   4 +-
 data/scripts/script_08015F3C.inc         |   4 +-
 data/scripts/script_08015F80.inc         |   4 +-
 data/scripts/script_08015FA4.inc         |   4 +-
 data/scripts/script_08015FC0.inc         |   4 +-
 data/scripts/script_08016030.inc         |   4 +-
 data/scripts/script_0801606C.inc         |   4 +-
 data/scripts/script_080160A8.inc         |  30 +++---
 data/scripts/script_08016384.inc         |   4 +-
 data/scripts/script_08016482.inc         |   2 +-
 data/scripts/script_080165A4.inc         |   4 +-
 data/scripts/script_080165D8.inc         |  28 +++---
 src/script.c                             |  12 +--
 tools/script_disassembler/definitions.py |   6 +-
 353 files changed, 1442 insertions(+), 1441 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index da8555bf..e05e2271 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -13,11 +13,11 @@
 	.short 0x0400
 .endm
 
-.macro StartScript 
+.macro BeginBlock 
 	.short 0x0401
 .endm
 
-.macro StopScript 
+.macro EndBlock 
 	.short 0x0402
 .endm
 
@@ -577,9 +577,10 @@
 	.word \w
 .endm
 
-.macro SetEntityPositionRelative w
+.macro SetEntityPositionRelative a,b
 	.short 0x0c69
-	.word \w
+	.short \a
+	.short \b
 .endm
 
 .macro SetEntityPosition a,b
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc
index 72121fe0..373c731b 100644
--- a/data/scripts/script_08008B5C.inc
+++ b/data/scripts/script_08008B5C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08008B5C
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08008B6E:
 	_0807E944 
 	_0807E864 
@@ -16,12 +16,12 @@ script_08008B6E:
 	_0807E878 
 	Jump script_08008B6E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_08008BA2:
 	_0807E944 
 	_0807E864 
@@ -32,12 +32,12 @@ script_08008BA2:
 	_0807E930 0x0008
 	_0807E878 
 	Jump script_08008BA2
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_08008BD2:
 	_0807E944 
 	_0807E864 
@@ -74,14 +74,14 @@ script_08008C5C:
 	_0807EA94 
 	_0807E878 
 	Jump script_08008BD2
-	StartScript 
-	SetEntityPositionRelative 0x00180068
+	BeginBlock 
+	SetEntityPositionRelative 0x0068, 0x0018
 	_0807EF80 0x000f
 	_0807EB44 0x0004
 	_0807E930 0x0004
 	SetEntityNonPlanarMovement 0x0300
 	SoundReq 0x0121
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000002
 	TextboxNoOverlap 0x490d
 	_0807EA94 
diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc
index 208c1630..3ed61266 100644
--- a/data/scripts/script_08008D50.inc
+++ b/data/scripts/script_08008D50.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08008D50
-	StartScript 
-	SetEntityPositionRelative 0x00680068
+	BeginBlock 
+	SetEntityPositionRelative 0x0068, 0x0068
 	_0807F0B4 0x0004
 	CameraTargetEntity 
-	StopScript 
+	EndBlock 
 	Wait 0x001e
 	_0807E5F8 0x00000002
 	WaitForSomething 0x00000001
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index d640ce56..23aeca90 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08008D8C
-	StartScript 
+	BeginBlock 
 	Call sub_08061FD8
 	Call sub_08061E70
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08008DA0:
 	CheckEntityInteractType 
 	JumpIfNot script_08008DA0
@@ -15,12 +15,12 @@ script_08008DA0:
 	_0807E878 
 	Jump script_08008DA0
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08008DD8:
 	CheckEntityInteractType 
 	JumpIfNot script_08008DD8
@@ -33,9 +33,9 @@ script_08008DD8:
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
 	Jump script_08008DD8
-	StartScript 
-	SetEntityPositionRelative 0x00780088
-	StopScript 
+	BeginBlock 
+	SetEntityPositionRelative 0x0088, 0x0078
+	EndBlock 
 script_08008E12:
 	CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
 	JumpIfNot script_08008E12
diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc
index e77c1d10..d9007ba2 100644
--- a/data/scripts/script_08008F74.inc
+++ b/data/scripts/script_08008F74.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08008F74
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x00b8, 0x0090
 	_0807EB44 0x0006
diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc
index 2f52e90e..b77dea3b 100644
--- a/data/scripts/script_08008FFC.inc
+++ b/data/scripts/script_08008FFC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08008FFC
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000010
 	SoundReq 0x011c
 	_0807E930 0x0001
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index 15e7cb66..97ec4042 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800903C
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	SoundReq 0x007c
 	_0807EF3C 0x0180, 0x0030
@@ -11,19 +11,19 @@ SCRIPT_START script_0800903C
 	WaitForSomething2 0x00000004
 	_0807EB44 0x0004
 	_0807E5F8 0x00000008
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	Jump script_0800927E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_0807F348
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000080
 	_0807EB44 0x0004
 	_0807ECC4 0x0008
@@ -82,11 +82,11 @@ script_0800917C:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800917C
-	StartScript 
+	BeginBlock 
 	Call sub_0807F348
 	_0807EB44 0x0006
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	_0807EB74 
 	_0807EF80 0x0001
@@ -130,18 +130,18 @@ script_0800917C:
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	Jump script_080092B2
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 script_0800927E:
 	Call sub_080668F0
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800928A:
 	CheckEntityInteractType 
 	JumpIfNot script_0800928A
@@ -153,13 +153,13 @@ script_0800928A:
 	_0807E878 
 	Jump script_0800928A
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	_0807EF80 0x0000
 script_080092B2:
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080092BA:
 	CheckEntityInteractType 
 	JumpIfNot script_080092BA
@@ -170,19 +170,19 @@ script_080092BA:
 	Wait 0x000f
 	_0807E878 
 	Jump script_080092BA
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	Call sub_0806672C
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	Jump script_0800917C
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_08066E38
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_08009300:
 	CheckEntityInteractType 
 	JumpIfNot script_08009300
@@ -193,7 +193,7 @@ script_08009300:
 	_0807E878 
 	Jump script_08009300
 	.short 0x0000
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc
index f136823f..77b00bff 100644
--- a/data/scripts/script_08009320.inc
+++ b/data/scripts/script_08009320.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08009320
-	StartScript 
+	BeginBlock 
 	Call sub_0806D650
 	SetEntityNonPlanarMovement 0x0010
-	StopScript 
+	EndBlock 
 script_0800932E:
 	_0807EEF4 0xfff8, 0x0000
 	_0807EEF4 0x0008, 0x0000
diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc
index 99204711..6385266f 100644
--- a/data/scripts/script_08009340.inc
+++ b/data/scripts/script_08009340.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08009340
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc
index ee4e8ac4..9cddae5f 100644
--- a/data/scripts/script_08009348.inc
+++ b/data/scripts/script_08009348.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009348
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0800934E:
 	CheckEntityInteractType 
 	JumpIfNot script_0800934E
diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc
index 74aaae79..553923bd 100644
--- a/data/scripts/script_08009464.inc
+++ b/data/scripts/script_08009464.inc
@@ -15,10 +15,10 @@ SCRIPT_START script_08009464
 	Wait 0x000a
 	Jump script_08009376
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_0806D7C4
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SetEntity0x20 0x00018000
 script_080094BC:
diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc
index a2d19eb9..3822f0b7 100644
--- a/data/scripts/script_080094CC.inc
+++ b/data/scripts/script_080094CC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080094CC
-	StartScript 
+	BeginBlock 
 	Call sub_0806D804
 	SetEntityNonPlanarMovement 0x0180
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SetEntity0x20 0x00018000
 	Call sub_0806D858
diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc
index 9bf9b1a4..6ed41ece 100644
--- a/data/scripts/script_080094FC.inc
+++ b/data/scripts/script_080094FC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080094FC
-	StartScript 
+	BeginBlock 
 	Call sub_08067100
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08009512:
 	CheckEntityInteractType 
 	JumpIfNot script_08009512
@@ -18,12 +18,12 @@ script_08009512:
 	_0807EF80 0x0000
 	Jump script_08009512
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08067100
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_0800954E:
 	CheckEntityInteractType 
 	JumpIfNot script_0800954E
@@ -37,13 +37,13 @@ script_0800954E:
 	_0807EF80 0x0000
 	Jump script_0800954E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08067314
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E914 0x00000000
 	Call sub_080672B0
-	StopScript 
+	EndBlock 
 script_08009592:
 	CheckEntityInteractType 
 	JumpIfNot script_08009592
@@ -60,11 +60,11 @@ script_08009592:
 	Call sub_080672B0
 	Jump script_08009592
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_0806BE3C
 	_0807EF80 0x000a
 	_0807EF80 0x0007
-	StopScript 
+	EndBlock 
 script_080095DE:
 	Call sub_0806BF44
 	JumpIf script_080095F2
diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc
index 1cadb7ab..0c6dda78 100644
--- a/data/scripts/script_080095F2.inc
+++ b/data/scripts/script_080095F2.inc
@@ -18,20 +18,20 @@ script_08009622:
 	_0807E878 
 	_0807EF80 0x0000
 	Jump script_080095DE
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000b
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_08009638:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x0020
 	JumpIfNot script_08009638
-	StopScript 
+	EndBlock 
 script_08009646:
 	Call sub_0806BF44
 	JumpIf script_08009646
-	StopScript 
+	EndBlock 
 	Call sub_0806BE3C
 	_0807EF80 0x000a
 	_0807EF80 0x0007
@@ -52,12 +52,12 @@ script_0800968E:
 	_0807E878 
 	_0807EF80 0x0000
 	Jump script_08009660
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	Jump script_080096FC
 	CheckGlobalFlag 0x0020
 	JumpIf script_080096FC
-	StopScript 
+	EndBlock 
 script_080096AC:
 	CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
 	JumpIfNot script_080096AC
diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc
index e921a864..1cd49c67 100644
--- a/data/scripts/script_08009740.inc
+++ b/data/scripts/script_08009740.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009740
-	StartScript 
+	BeginBlock 
 	Call sub_08065D00
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	_0807EF80 0x0007
-	StopScript 
+	EndBlock 
 script_0800975A:
 	CheckEntityInteractType 
 	JumpIfNot script_0800975A
diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc
index 0e6e195b..d2b7de31 100644
--- a/data/scripts/script_080097F0.inc
+++ b/data/scripts/script_080097F0.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_080097F0
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0003
 	_0807EF80 0x0007
 	SetEntityNonPlanarMovement 0x0300
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	SoundReq 0x0123
 	Call sub_0807F1A0
 script_08009816:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807EE30 
 	JumpIfNot script_08009816
-	StopScript 
+	EndBlock 
 	_0807E5F8 0x00000004
 	Call sub_0807FBD4
 	SoundReq 0x01f3
diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc
index 54f4a5dc..1371f551 100644
--- a/data/scripts/script_08009838.inc
+++ b/data/scripts/script_08009838.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08009838
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0003
 	_0807EF80 0x0007
 	SetEntityNonPlanarMovement 0x0300
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	Call sub_0809E0A0
 	Call sub_0809E0D4
diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc
index 78e235cc..7f1277be 100644
--- a/data/scripts/script_080098D4.inc
+++ b/data/scripts/script_080098D4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080098D4
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_080098D8:
 	CheckGlobalFlag 0x0020
 	JumpIfNot script_080098D8
diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc
index 263a4da6..79d4cbd7 100644
--- a/data/scripts/script_08009918.inc
+++ b/data/scripts/script_08009918.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08009918
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
 	_0807E5F8 0x00000000
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x0078
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc
index 2de6f57f..a83cd628 100644
--- a/data/scripts/script_08009950.inc
+++ b/data/scripts/script_08009950.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009950
-	StartScript 
+	BeginBlock 
 	Call sub_0807F348
 	SetEntityNonPlanarMovement 0x0040
 	_0807EB44 0x0004
 	_0807E930 0x000c
 	_0807E908 0x0003
-	StopScript 
+	EndBlock 
 	Wait 0x001e
 	CameraTargetEntity 
 	_0807E778 0x0004
diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc
index 5682be55..71648ce7 100644
--- a/data/scripts/script_080099DC.inc
+++ b/data/scripts/script_080099DC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080099DC
-	StartScript 
+	BeginBlock 
 	Call sub_0807F348
 	SetEntityNonPlanarMovement 0x00c0
 	_0807EB44 0x0002
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0007
 	_0807EDD4 0x0068, 0x0060
diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc
index f0d821e2..3527bb00 100644
--- a/data/scripts/script_08009A34.inc
+++ b/data/scripts/script_08009A34.inc
@@ -6,7 +6,7 @@ script_08009A38:
 	Call sub_08066258
 	Wait 0x005a
 	Jump script_08009A38
-	SetEntityPositionRelative 0x01780240
+	SetEntityPositionRelative 0x0240, 0x0178
 	CameraTargetEntity 
 	SetEntityNonPlanarMovement 0x0080
 	Wait 0x0078
diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc
index b48e74e6..ee6102b7 100644
--- a/data/scripts/script_08009A84.inc
+++ b/data/scripts/script_08009A84.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08009A84
-	StartScript 
-	SetEntityPositionRelative 0x011001e8
+	BeginBlock 
+	SetEntityPositionRelative 0x01e8, 0x0110
 	SetEntityNonPlanarMovement 0x00c0
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0007
 	_0807EDD4 0x01e8, 0x0200
diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc
index 9ba7e216..3ba22264 100644
--- a/data/scripts/script_08009AF8.inc
+++ b/data/scripts/script_08009AF8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08009AF8
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 	WaitForSomething2 0x00000010
 	SoundReq 0x00f0
 	_0807EF80 0x0008
diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc
index 685f2e66..5181c91f 100644
--- a/data/scripts/script_08009B30.inc
+++ b/data/scripts/script_08009B30.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08009B30
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
 	SetLocalFlag 0x0046
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x001e
 	TextboxNoOverlapFollow 0x1005
diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc
index 2f5b2061..b340c2fb 100644
--- a/data/scripts/script_08009B78.inc
+++ b/data/scripts/script_08009B78.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08009B78
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	SetEntityNonPlanarMovement 0x0080
 	_0807E9D4 
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	CheckGlobalFlag 0x0013
 	JumpIf script_08009C4C
 	_0807E888 
diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc
index d81f699f..5584030d 100644
--- a/data/scripts/script_08009C68.inc
+++ b/data/scripts/script_08009C68.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08009C68
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	SetEntityNonPlanarMovement 0x0100
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0004
 	_0807EB74 
@@ -29,11 +29,11 @@ SCRIPT_START script_08009C68
 	_0807EDD4 0x0000, 0x0060
 	Call sub_080536A8
 	Wait 0x001e
-	StartScript 
+	BeginBlock 
 	SetGlobalFlag 0x0013
 	Call sub_0807DF50
 	Call sub_080791D0
 	_0807E878 
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc
index 39e00046..5b0fe695 100644
--- a/data/scripts/script_08009CFC.inc
+++ b/data/scripts/script_08009CFC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08009CFC
-	StartScript 
+	BeginBlock 
 	_0807E8E4_1 
 	SetEntityNonPlanarMovement 0x00c0
-	StopScript 
+	EndBlock 
 	_0807E5F8 0x00000004
 	_0807EF80 0x0004
 	Wait 0x003c
diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc
index e20bc108..2a302362 100644
--- a/data/scripts/script_08009D6C.inc
+++ b/data/scripts/script_08009D6C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08009D6C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0006
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0078, 0x0060
 	_0807EDD4 0x0078, 0x007c
 	Wait 0x001e
diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc
index fe3be26d..eb4c471d 100644
--- a/data/scripts/script_08009DB0.inc
+++ b/data/scripts/script_08009DB0.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08009DB0
-	StartScript 
+	BeginBlock 
 	Call sub_0807F348
 	Call sub_08066288
 	Call sub_08066274
 	_0807EF80 0x000a
 	_0807E930 0x000c
 	_0807E908 0x0003
-	StopScript 
+	EndBlock 
 script_08009DD2:
 	_0807E944 
 	_0807E908 0x0002
@@ -15,8 +15,8 @@ script_08009DD2:
 	_0807E908 0x0003
 	_0807E930 0x000c
 	Jump script_08009DD2
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_08009DF0:
 	CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
 	JumpIfNot script_08009DF0
diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc
index a6106130..86a566ec 100644
--- a/data/scripts/script_08009E58.inc
+++ b/data/scripts/script_08009E58.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009E58
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807E778 0x0002
 	DoFade4 
diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc
index 66e11e42..a7a249dd 100644
--- a/data/scripts/script_08009E80.inc
+++ b/data/scripts/script_08009E80.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08009E80
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc
index e5cba4a5..c080230a 100644
--- a/data/scripts/script_08009E88.inc
+++ b/data/scripts/script_08009E88.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08009E88
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
 	SetLocalFlag 0x009f
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	_0807E778 0x0004
 	DoFade4 
diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc
index 6a7dd099..025d3bd5 100644
--- a/data/scripts/script_08009ECC.inc
+++ b/data/scripts/script_08009ECC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009ECC
-	StartScript 
+	BeginBlock 
 	_0807E914 0x00000002
 	_0807EF80 0x0001
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
-	StartScript 
+	BeginBlock 
 	_0807E914 0x00000003
 	_0807EF80 0x0001
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc
index 31f60a6b..2af8003f 100644
--- a/data/scripts/script_08009EF0.inc
+++ b/data/scripts/script_08009EF0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009EF0
-	StartScript 
+	BeginBlock 
 	_0807E914 0x00000000
 	_0807EF80 0x0001
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
-	StartScript 
+	BeginBlock 
 	_0807E914 0x00000001
 	_0807EF80 0x0001
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc
index c6a52566..27e3b581 100644
--- a/data/scripts/script_08009F14.inc
+++ b/data/scripts/script_08009F14.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08009F14
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	Call sub_08060090
 	_0807EF80 0x000a
@@ -7,14 +7,14 @@ SCRIPT_START script_08009F14
 	JumpIf script_08009FD2
 	CheckInventory1 0x0007
 	JumpIf script_08009F84
-	StopScript 
+	EndBlock 
 script_08009F36:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08060158
 	CheckEntityInteractType 
 	JumpIfNot script_08009F36
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	_0807EF80 0x000b
@@ -30,14 +30,14 @@ script_08009F36:
 	Call sub_0807DF50
 	_0807E878 
 script_08009F84:
-	StopScript 
+	EndBlock 
 script_08009F86:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08060158
 	CheckEntityInteractType 
 	JumpIfNot script_08009F86
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_080602BC
 	_0807EA94 
@@ -53,16 +53,16 @@ script_08009FB6:
 	_0807E878 
 	Jump script_08009F86
 script_08009FD2:
-	StopScript 
+	EndBlock 
 	CheckLocalFlag 0x00b0
 	JumpIf script_0800A024
 script_08009FDC:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08060158
 	CheckEntityInteractType 
 	JumpIfNot script_08009FDC
-	StopScript 
+	EndBlock 
 	_0807E864 
 	TextboxNoOverlap 0x1f0e
 	_0807EA94 
@@ -82,12 +82,12 @@ script_0800A002:
 	SetLocalFlag 0x00b0
 	_0807E878 
 script_0800A024:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08060158
 	CheckEntityInteractType 
 	JumpIfNot script_0800A024
-	StopScript 
+	EndBlock 
 	_0807E864 
 	CheckInventory1 0x0008
 	JumpIf script_0800A052
diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc
index 25189df6..ea40d645 100644
--- a/data/scripts/script_0800A088.inc
+++ b/data/scripts/script_0800A088.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800A088
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807ECC4 0x0010
 	_0807EDD4 0x0078, 0x0060
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc
index 88e85d50..db5885c1 100644
--- a/data/scripts/script_0800A0B4.inc
+++ b/data/scripts/script_0800A0B4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A0B4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0140
 	_0807E864 
 	Call sub_0807DF28
-	StopScript 
+	EndBlock 
 	Wait 0x0078
 	SoundReq2 0x0018
 	Call sub_080A0464
diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc
index d89a6ae7..774a075d 100644
--- a/data/scripts/script_0800A0FC.inc
+++ b/data/scripts/script_0800A0FC.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800A0FC
-	StopScript 
+	EndBlock 
 script_0800A0FE:
 	CheckGlobalFlag 0x0051
 	JumpIfNot script_0800A0FE
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
 	SoundReq0x80100000 
 	Call sub_0807FBFC
-	SetEntityPositionRelative 0x005800b0
+	SetEntityPositionRelative 0x00b0, 0x0058
 	Call sub_0807F844
 	_0807E8E4_3 
 	CallWithArg sub_0807F75C, 0x00d00060
@@ -16,7 +16,7 @@ script_0800A0FE:
 	SoundReq 0x00f7
 	_0807E778 0x0002
 	DoFade6 
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	WaitForSomething2 0x00000004
 	CallWithArg sub_0806DA1C, 0x00000006
diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc
index 60aa3b19..6dda1842 100644
--- a/data/scripts/script_0800A160.inc
+++ b/data/scripts/script_0800A160.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_0800A160
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807E930 0x0002
-	SetEntityPositionRelative 0x008000b0
+	SetEntityPositionRelative 0x00b0, 0x0080
 	CallWithArg sub_0807F98C, 0xff800000
 	CallWithArg sub_080960C4, 0x0800a1b4
-	StopScript 
+	EndBlock 
 	SoundReq 0x0142
 	_0807EF3C 0xff80, 0x0000
 	SoundReq 0x0143
diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc
index 6a5b0e52..a50269c7 100644
--- a/data/scripts/script_0800A1B4.inc
+++ b/data/scripts/script_0800A1B4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A1B4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000002
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc
index 1de72713..c66714f6 100644
--- a/data/scripts/script_0800A1D8.inc
+++ b/data/scripts/script_0800A1D8.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A1D8
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x00800088
+	SetEntityPositionRelative 0x0088, 0x0080
 	Call sub_0807F844
 	_0807E8E4_3 
 	CallWithArg sub_0807F75C, 0x00a80088
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	StartPlayerScript script_0800A310
 	WaitForSomething2 0x00000001
diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc
index 13e28e4c..3ddd8246 100644
--- a/data/scripts/script_0800A310.inc
+++ b/data/scripts/script_0800A310.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800A310
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0002
 	Wait 0x000a
 	_0807EB44 0x0006
@@ -11,13 +11,13 @@ SCRIPT_START script_0800A310
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x000b
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807E930 0x000e
 	_0807EF80 0x0007
diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc
index 13202ee2..4e69732f 100644
--- a/data/scripts/script_0800A3D8.inc
+++ b/data/scripts/script_0800A3D8.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_0800A3D8
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807EB44 0x0002
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0004
 	Call sub_0807F3F8
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	_0807EC94 0x0010
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc
index 9b15189e..4503d7b4 100644
--- a/data/scripts/script_0800A500.inc
+++ b/data/scripts/script_0800A500.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A500
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807E930 0x0005
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	SoundReq 0x0142
 	_0807E610 0x00000800
diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc
index 0e52c71c..d55b6cad 100644
--- a/data/scripts/script_0800A590.inc
+++ b/data/scripts/script_0800A590.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800A590
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	SetEntity0x20 0x00000000
 	_0807EF80 0x0008
@@ -7,7 +7,7 @@ SCRIPT_START script_0800A590
 	Call sub_0807F714
 	MoveEntityToPlayer 
 	CallWithArg sub_0807F98C, 0xfff00000
-	StopScript 
+	EndBlock 
 	_0807E930 0x0023
 	WaitForSomething2 0x00000010
 	CallWithArg sub_0807F6E8, 0x00000008
diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc
index db394caf..9b58af14 100644
--- a/data/scripts/script_0800A638.inc
+++ b/data/scripts/script_0800A638.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A638
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00001000
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc
index e1065b79..2ea49e9e 100644
--- a/data/scripts/script_0800A65C.inc
+++ b/data/scripts/script_0800A65C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A65C
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000800
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc
index 2c2211ae..da8c4144 100644
--- a/data/scripts/script_0800A680.inc
+++ b/data/scripts/script_0800A680.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A680
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000020
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc
index 82316f18..19933d36 100644
--- a/data/scripts/script_0800A6A4.inc
+++ b/data/scripts/script_0800A6A4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A6A4
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x00680088
+	SetEntityPositionRelative 0x0088, 0x0068
 	Call sub_0807F844
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SoundReq 0x00f6
 	CallWithArg sub_0806DA1C, 0x00000008
diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc
index f1396ad1..86b321d6 100644
--- a/data/scripts/script_0800A6D4.inc
+++ b/data/scripts/script_0800A6D4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A6D4
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x00700088
+	SetEntityPositionRelative 0x0088, 0x0070
 	Call sub_0807F844
 	SoundReq 0x00f7
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0806DA1C, 0x00000009
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc
index 34836f30..5d8bd4e8 100644
--- a/data/scripts/script_0800A704.inc
+++ b/data/scripts/script_0800A704.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A704
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x01c80198
+	SetEntityPositionRelative 0x0198, 0x01c8
 	Call sub_0807F844
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SoundReq 0x00f6
 	CallWithArg sub_0806DA1C, 0x0000000a
diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc
index 2f5ea451..bd94a8d3 100644
--- a/data/scripts/script_0800A734.inc
+++ b/data/scripts/script_0800A734.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A734
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x01c800d8
+	SetEntityPositionRelative 0x00d8, 0x01c8
 	Call sub_0807F844
 	SoundReq 0x00f7
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0806DA1C, 0x0000000b
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc
index bc1620b5..adf69a41 100644
--- a/data/scripts/script_0800A764.inc
+++ b/data/scripts/script_0800A764.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A764
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x01b800f8
+	SetEntityPositionRelative 0x00f8, 0x01b8
 	Call sub_0807F844
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SoundReq 0x00f6
 	_0807E778 0x0004
diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc
index 9155e29a..f92b1e92 100644
--- a/data/scripts/script_0800A7E4.inc
+++ b/data/scripts/script_0800A7E4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A7E4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0010
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000001
 	_0807E930 0x0002
 	WaitForSomething2 0x00000002
@@ -15,11 +15,11 @@ script_0800A80C:
 	_0807E930 0x0003
 	Wait 0x001e
 	Jump script_0800A80C
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0010
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000001
 	_0807E930 0x0002
 	WaitForSomething2 0x00000004
@@ -31,11 +31,11 @@ script_0800A848:
 	_0807E930 0x0003
 	Wait 0x0014
 	Jump script_0800A848
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0010
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000001
 	_0807E930 0x0002
 	WaitForSomething2 0x00000008
@@ -47,11 +47,11 @@ script_0800A884:
 	_0807E930 0x0003
 	Wait 0x000a
 	Jump script_0800A884
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000001
 	_0807EF80 0x0000
 	WaitForSomething2 0x00000010
@@ -63,11 +63,11 @@ script_0800A8C0:
 	_0807EB44 0x0006
 	Wait 0x0019
 	Jump script_0800A8C0
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000001
 	_0807EF80 0x0000
 	WaitForSomething2 0x00000020
@@ -79,12 +79,12 @@ script_0800A8FC:
 	_0807EB44 0x0006
 	Wait 0x000f
 	Jump script_0800A8FC
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x01780378
+	SetEntityPositionRelative 0x0378, 0x0178
 	Call sub_0807F844
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	_0807E5F8 0x00000001
 	Wait 0x001e
diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc
index ca526a2c..fe9cce56 100644
--- a/data/scripts/script_0800A964.inc
+++ b/data/scripts/script_0800A964.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A964
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	_0807EF80 0x0007
 	_0807E930 0x0001
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc
index d9cb36b6..2b55cd98 100644
--- a/data/scripts/script_0800A988.inc
+++ b/data/scripts/script_0800A988.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A988
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0007
 	_0807E930 0x0002
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc
index be230b67..b98bf6c4 100644
--- a/data/scripts/script_0800A9AC.inc
+++ b/data/scripts/script_0800A9AC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A9AC
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807EF80 0x0007
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc
index 115da3fb..73e16655 100644
--- a/data/scripts/script_0800A9D0.inc
+++ b/data/scripts/script_0800A9D0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A9D0
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	_0807EF80 0x0007
 	_0807E930 0x0003
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc
index c2e89b42..0eef461d 100644
--- a/data/scripts/script_0800A9F4.inc
+++ b/data/scripts/script_0800A9F4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A9F4
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x00580128
+	SetEntityPositionRelative 0x0128, 0x0058
 	Call sub_0807F844
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	_0807E5F8 0x00000001
 	Wait 0x000a
diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc
index e7b7408e..fa37eafb 100644
--- a/data/scripts/script_0800AA48.inc
+++ b/data/scripts/script_0800AA48.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AA48
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	_0807EF80 0x0007
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc
index 82bcf68a..e4418cc6 100644
--- a/data/scripts/script_0800AA6C.inc
+++ b/data/scripts/script_0800AA6C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AA6C
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0007
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc
index 975efbf8..35e554fc 100644
--- a/data/scripts/script_0800AA90.inc
+++ b/data/scripts/script_0800AA90.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AA90
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807EF80 0x0007
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc
index dbd05c71..a5d82d5d 100644
--- a/data/scripts/script_0800AAB4.inc
+++ b/data/scripts/script_0800AAB4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AAB4
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	_0807EF80 0x0007
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	Call CreateDust
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc
index d7f59883..ee03ea94 100644
--- a/data/scripts/script_0800AAD8.inc
+++ b/data/scripts/script_0800AAD8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800AAD8
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x01480088
+	SetEntityPositionRelative 0x0088, 0x0148
 	Call sub_0807F844
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SoundReq 0x00f6
 	CallWithArg sub_0806DA1C, 0x0000000f
diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc
index c019f528..2c38aa99 100644
--- a/data/scripts/script_0800AB08.inc
+++ b/data/scripts/script_0800AB08.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_0800AB08
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x01480088
+	SetEntityPositionRelative 0x0088, 0x0148
 	Call sub_0807F844
 	_0807E8E4_3 
 	CallWithArg sub_0807F6E8, 0x00000008
 	CallWithArg sub_0807F75C, 0x00a80088
 	SoundReq 0x00f7
-	StopScript 
+	EndBlock 
 	Wait 0x0078
 	_0807F0B4 0x0001
-	SetEntityPositionRelative 0x00780088
+	SetEntityPositionRelative 0x0088, 0x0078
 	Call sub_0807F5C0
 	TextboxNoOverlapFollowPos 0x1664, 0x0000
 	_0807EA94 
diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc
index becd20d0..8d3e1eca 100644
--- a/data/scripts/script_0800ACBC.inc
+++ b/data/scripts/script_0800ACBC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800ACBC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0088, 0x0080
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc
index 205ba767..a8a8d990 100644
--- a/data/scripts/script_0800ACE0.inc
+++ b/data/scripts/script_0800ACE0.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_0800ACE0
-	StartScript 
+	BeginBlock 
 	Call sub_08094BE0
 	CallWithArg sub_0807F238, 0x0000045b
 	SoundReq 0x0109
-	StopScript 
+	EndBlock 
 	Call sub_0807F304
 	Wait 0x005a
 	_0807E5F8 0x00000008
-	StartScript 
+	BeginBlock 
 	CallWithArg sub_0807F6F8, 0x00000008
 	CallWithArg sub_0807F238, 0x000008e4
-	StopScript 
+	EndBlock 
 	Call sub_0807F304
 	_0807EB44 0x0004
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc
index f29b0aea..c999af5c 100644
--- a/data/scripts/script_0800AD54.inc
+++ b/data/scripts/script_0800AD54.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0800AD54
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EC64 0x0020
 	_0807EB44 0x0000
 	_0807EF80 0x0000
 	_0807E5F8 0x00000001
 	Call sub_080791BC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0004
 	Wait 0x001e
diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc
index 43e75217..4dd2942b 100644
--- a/data/scripts/script_0800AEA4.inc
+++ b/data/scripts/script_0800AEA4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AEA4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807EB44 0x0002
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000040
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc
index b0cb89b6..b2eab374 100644
--- a/data/scripts/script_0800AEDC.inc
+++ b/data/scripts/script_0800AEDC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800AEDC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	Call sub_08094B80
 	_0807EF3C 0x0000, 0x0001
diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc
index f22ee38e..789396ce 100644
--- a/data/scripts/script_0800AF18.inc
+++ b/data/scripts/script_0800AF18.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800AF18
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
 	SoundReq 0x0142
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000020
 	SoundReq 0x0143
 	_0807EF80 0x0006
diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc
index 255c71f2..e79c08d9 100644
--- a/data/scripts/script_0800AFB0.inc
+++ b/data/scripts/script_0800AFB0.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800AFB0
 	_0807E864 
 script_0800AFB2:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0807FBB4
 	ComparePlayerAction 0x0001
 	JumpIfNot script_0800AFB2
-	StopScript 
+	EndBlock 
 	Call sub_0807DF28
 	_0807EB28 0x1c04
 	_0807EA94 
diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc
index 02fad519..9e01e5ea 100644
--- a/data/scripts/script_0800B00C.inc
+++ b/data/scripts/script_0800B00C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800B00C
-	StartScript 
+	BeginBlock 
 	Call sub_0807F934
 	Call sub_080A2124
 	_0807EF80 0x000a
 	_0807EF80 0x0007
-	StopScript 
+	EndBlock 
 script_0800B024:
 	CheckEntityInteractType 
 	JumpIfNot script_0800B024
diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc
index acd761d1..24d9dcd8 100644
--- a/data/scripts/script_0800B0AC.inc
+++ b/data/scripts/script_0800B0AC.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800B0AC
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807FA40
 	Call sub_0807DF28
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index f72fc30e..b5fccb39 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800B0D0
-	StartScript 
+	BeginBlock 
 	Call sub_0806BCD4
 	_0807EF80 0x000a
 	CallWithArg sub_0806BC94, 0x00000000
-	StopScript 
+	EndBlock 
 script_0800B0E8:
 	Call sub_0807F434
 	JumpSwitch_3 script_0800B0E8, script_0800B0F6, script_0800B134
@@ -36,11 +36,11 @@ script_0800B160:
 	Call sub_0806BCB8
 	CallWithArg sub_0806BC94, 0x00000000
 	Jump script_0800B0E8
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	SetLocalFlag 0x0039
 	_0807E864 
-	StopScript 
+	EndBlock 
 	WaitForPlayerAction0x17 
 	StartPlayerScript script_0800B1C0
 	Wait 0x0018
diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc
index 8c2683e9..6310ff69 100644
--- a/data/scripts/script_0800B1C0.inc
+++ b/data/scripts/script_0800B1C0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800B1C0
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	SetEntityNonPlanarMovement 0x00e0
 	_0807EDD4 0x0088, 0x0090
diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc
index a1a25e7d..10efa475 100644
--- a/data/scripts/script_0800B200.inc
+++ b/data/scripts/script_0800B200.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800B200
-	StartScript 
+	BeginBlock 
 	_0807E5F8 0x00000000
 	CheckLocalFlag 0x001d
 	JumpIf script_0800B252
 	SetEntityNonPlanarMovement 0x00c0
-	StopScript 
+	EndBlock 
 script_0800B216:
 	WaitForSomething2 0x00000001
 	Call sub_0807DF28
diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc
index e6ffe461..a57bf6e8 100644
--- a/data/scripts/script_0800B254.inc
+++ b/data/scripts/script_0800B254.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800B254
-	StartScript 
+	BeginBlock 
 	CheckKinstoneFused 0x0006
 	JumpIf script_0800B302
 	_0807EA88 0x0006
 	_0807EB44 0x0002
-	StopScript 
+	EndBlock 
 script_0800B268:
 	_0807EA4C 
 	_0807E9F0 
@@ -15,12 +15,12 @@ script_0800B268:
 	_0807E878 
 	Jump script_0800B268
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	CheckKinstoneFused 0x0007
 	JumpIf script_0800B302
 	_0807EA88 0x0007
 	_0807EB44 0x0002
-	StopScript 
+	EndBlock 
 script_0800B298:
 	_0807EA4C 
 	_0807E9F0 
@@ -31,12 +31,12 @@ script_0800B298:
 	_0807E878 
 	Jump script_0800B298
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	CheckKinstoneFused 0x0008
 	JumpIf script_0800B302
 	_0807EA88 0x0008
 	_0807EB44 0x0002
-	StopScript 
+	EndBlock 
 script_0800B2C8:
 	_0807EA4C 
 	_0807E9F0 
@@ -55,6 +55,6 @@ script_0800B2E2:
 	_0807EF80 0x0012
 	_0807E5F8 0x00000001
 script_0800B302:
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc
index 7b0e2e4a..870fe39e 100644
--- a/data/scripts/script_0800B308.inc
+++ b/data/scripts/script_0800B308.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800B308
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x001d
 	JumpIf script_0800B39C
 	_0807EF80 0x0001
@@ -17,17 +17,17 @@ script_0800B33A:
 	JumpIfNot script_0800B348
 	Call sub_080676D8
 script_0800B348:
-	StopScript 
+	EndBlock 
 	Call sub_0806757C
 script_0800B350:
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	SoundReq 0x00fd
 	Call sub_080676D8
 	Call sub_0806757C
 	Call sub_080675D4
 	Wait 0x0014
-	StartScript 
+	BeginBlock 
 	_0807E5F8 0x00000001
 	CheckKinstoneFused 0x0006
 	JumpIfNot script_0800B350
@@ -35,7 +35,7 @@ script_0800B350:
 	JumpIfNot script_0800B350
 	CheckKinstoneFused 0x0008
 	JumpIfNot script_0800B350
-	StopScript 
+	EndBlock 
 	SetLocalFlag 0x001d
 	SoundReq 0x0072
 script_0800B39C:
diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc
index db2c7930..d485f31e 100644
--- a/data/scripts/script_0800B3A4.inc
+++ b/data/scripts/script_0800B3A4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800B3A4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_0807F158
 	SetEntityNonPlanarMovement 0x0120
 	_0807EB44 0x0004
 	_0807E908 0x0002
 	_0807E914 0x0000200a
-	StopScript 
+	EndBlock 
 script_0800B3C4:
 	_0807EDD4 0x0158, 0x0290
 	Call sub_08065780
diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc
index d498b4bd..e384808d 100644
--- a/data/scripts/script_0800B41C.inc
+++ b/data/scripts/script_0800B41C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800B41C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x00c0
 	_0807E908 0x0001
 	_0807EF80 0x000b
 	_0807E864 
 	Call sub_0807FBC4
-	StopScript 
+	EndBlock 
 	Wait 0x000a
 	_0807EF80 0x0004
 	_0807E5F8 0x00000008
diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc
index 5df7564c..78ce2000 100644
--- a/data/scripts/script_0800B4AC.inc
+++ b/data/scripts/script_0800B4AC.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800B4AC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EF80 0x0001
 	SetEntityNonPlanarMovement 0x00c0
 	_0807E9D4 
 script_0800B4BC:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800B4D4
 	TestBit 0x00000008
@@ -17,13 +17,13 @@ script_0800B4D4:
 	_0807EB74 
 	_0807EF80 0x0000
 	TextboxNoOverlapFollow 0x200b
-	StopScript 
+	EndBlock 
 	_0807E878 
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_0800B4BC
 script_0800B4F0:
-	StopScript 
+	EndBlock 
 	_0807E610 0x00000008
 	_0807EDD4 0x0134, 0x0288
 	_0807EB44 0x0004
diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc
index a0934d6f..fdf9b629 100644
--- a/data/scripts/script_0800B54C.inc
+++ b/data/scripts/script_0800B54C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800B54C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0128, 0x0298
 	Wait 0x000a
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc
index 6181966e..27bf8bf6 100644
--- a/data/scripts/script_0800B574.inc
+++ b/data/scripts/script_0800B574.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800B574
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	CheckGlobalFlag 0x001d
 	JumpIf script_0800B5BC
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000010
 	_0807EF80 0x0008
 	SoundReq 0x0111
diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc
index b264a34e..3d18214c 100644
--- a/data/scripts/script_0800B5C4.inc
+++ b/data/scripts/script_0800B5C4.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800B5C4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0004
-	StopScript 
+	EndBlock 
 	Wait 0x001e
 	SoundReq 0x00d1
 	_0807EDD4 0x008a, 0x005a
diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc
index 22ee139e..aca848f1 100644
--- a/data/scripts/script_0800B5EC.inc
+++ b/data/scripts/script_0800B5EC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800B5EC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EF80 0x0001
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0800B5FA:
 	CheckEntityInteractType 
 	JumpIfNot script_0800B5FA
@@ -14,8 +14,8 @@ script_0800B5FA:
 	_0807E878 
 	_0807EB44 0x0004
 	Jump script_0800B5FA
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800B618:
 	CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
 	JumpIfNot script_0800B618
diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc
index 44d64afa..4168693b 100644
--- a/data/scripts/script_0800B6C8.inc
+++ b/data/scripts/script_0800B6C8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800B6C8
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800B6CC:
 	HasRupees 0x0001
 	JumpIfNot script_0800B6CC
@@ -25,8 +25,8 @@ script_0800B6D4:
 	_0807F034 0x0064
 	Jump script_0800B698
 	.short 0x0000
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800B734:
 	Call sub_0808747C
 	JumpIfNot script_0800B734
diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc
index d3f15385..fa1ca762 100644
--- a/data/scripts/script_0800B7C4.inc
+++ b/data/scripts/script_0800B7C4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800B7C4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	CallWithArg sub_0807F6B4, 0x00000090
 	JumpIfNot script_0800B7FC
 	CallWithArg sub_0807F464, 0x00000078
diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc
index 900e005e..4985e36b 100644
--- a/data/scripts/script_0800B7FC.inc
+++ b/data/scripts/script_0800B7FC.inc
@@ -3,10 +3,10 @@ script_0800B7FC:
 	CallWithArg sub_0807F4F8, 0x00000090
 	CallWithArg sub_0807F464, 0x00000078
 	Jump script_0800B7EE
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc
index 7b4b5591..b6c5ed0f 100644
--- a/data/scripts/script_0800B828.inc
+++ b/data/scripts/script_0800B828.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800B828
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800B836:
 	_0807E944 
 	_0807E864 
@@ -13,32 +13,32 @@ script_0800B836:
 	_0807E878 
 	Jump script_0800B836
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800B85E:
 	Wait 0x003c
 	Call sub_080646A4
 	Jump script_0800B85E
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800B87E:
 	Wait 0x003c
 	Call sub_0806407C
 	Jump script_0800B87E
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800B89E:
 	CheckEntityInteractType 
 	JumpIfNot script_0800B89E
@@ -49,24 +49,24 @@ script_0800B89E:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800B89E
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	CallWithArg sub_08064644, 0x0806464d
-	StopScript 
+	EndBlock 
 script_0800B8D4:
 	Wait 0x003c
 	Call sub_080646A4
 	Jump script_0800B8D4
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 script_0800B8FC:
 	CheckEntityInteractType 
 	JumpIfNot script_0800B8FC
@@ -78,11 +78,11 @@ script_0800B8FC:
 	_0807E878 
 	Jump script_0800B8FC
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	CheckLocalFlag 0x005f
 	JumpIf script_0800B94E
 script_0800B934:
@@ -104,14 +104,14 @@ script_0800B94E:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800B94E
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000b
 	_0807EF80 0x0008
 	Call sub_0806DAAC
 	JumpIf script_0800B9AC
 	Call sub_0806DAD0
 	CallWithArg sub_0806DA04, 0x00000005
-	StopScript 
+	EndBlock 
 script_0800B98A:
 	_0807EA4C 
 	_0807E9F0 
diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc
index 3211a53b..133ef817 100644
--- a/data/scripts/script_0800B9B4.inc
+++ b/data/scripts/script_0800B9B4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800B9B4
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	Call sub_080694EC
 	_0807EF80 0x000a
 	Call sub_080694B0
-	StopScript 
+	EndBlock 
 script_0800B9CA:
 	Call sub_0807F434
 	JumpSwitch_3 script_0800B9CA, script_0800B9D8, script_0800B9F4
@@ -39,9 +39,9 @@ script_0800BA24:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800B9CA
-	StartScript 
+	BeginBlock 
 	Call sub_0807F934
-	StopScript 
+	EndBlock 
 script_0800BA46:
 	CheckEntityInteractType 
 	JumpIfNot script_0800BA46
@@ -58,12 +58,12 @@ script_0800BA6C:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800BA46
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	SetEntityNonPlanarMovement 0x0040
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800BA8E:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BA8E
diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc
index 5a4d8e56..133a026c 100644
--- a/data/scripts/script_0800BACC.inc
+++ b/data/scripts/script_0800BACC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BACC
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800BADE:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BADE
diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc
index 71885490..10bfcea7 100644
--- a/data/scripts/script_0800BB00.inc
+++ b/data/scripts/script_0800BB00.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800BB00
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800BB04:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BB04
diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc
index 22531885..0c4829d7 100644
--- a/data/scripts/script_0800BB30.inc
+++ b/data/scripts/script_0800BB30.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BB30
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800BB42:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BB42
diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc
index bd88b9c9..ad84165e 100644
--- a/data/scripts/script_0800BB64.inc
+++ b/data/scripts/script_0800BB64.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800BB64
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	_0807EF80 0x0000
 	SetEntityNonPlanarMovement 0x0040
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800BB7A:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BB7A
diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc
index 85355bf4..b7948c1a 100644
--- a/data/scripts/script_0800BBA4.inc
+++ b/data/scripts/script_0800BBA4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800BBA4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800BBBA:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BBBA
diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc
index 917322b3..d575f774 100644
--- a/data/scripts/script_0800BBDC.inc
+++ b/data/scripts/script_0800BBDC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800BBDC
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_0800BBE4:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BBE4
diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc
index 67633e0e..aa156173 100644
--- a/data/scripts/script_0800BC08.inc
+++ b/data/scripts/script_0800BC08.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BC08
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_0800BC18:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BC18
@@ -11,10 +11,10 @@ script_0800BC18:
 	Wait 0x003c
 	TextboxNoOverlap 0x0e07
 	_0807EA94 
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0004
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	Call sub_08065CCC
 	Wait 0x0078
diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc
index 1341fcc8..1d5647e0 100644
--- a/data/scripts/script_0800BC50.inc
+++ b/data/scripts/script_0800BC50.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BC50
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_08054EB8
-	StopScript 
+	EndBlock 
 script_0800BC62:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800BC62
diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc
index e19635f9..3203c912 100644
--- a/data/scripts/script_0800BCE8.inc
+++ b/data/scripts/script_0800BCE8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BCE8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc
index 6e4bf7ee..22170a6f 100644
--- a/data/scripts/script_0800BD78.inc
+++ b/data/scripts/script_0800BD78.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800BD78
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0007
 	CallWithArg sub_0807F4F8, 0x00000270
diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc
index 6b68a09c..f2f58345 100644
--- a/data/scripts/script_0800BE1C.inc
+++ b/data/scripts/script_0800BE1C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BE1C
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
@@ -15,11 +15,11 @@ SCRIPT_START script_0800BE1C
 	Wait 0x003c
 	Jump script_0800BE88
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc
index c4559547..e1f86753 100644
--- a/data/scripts/script_0800BECC.inc
+++ b/data/scripts/script_0800BECC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800BECC
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0007
 	CallWithArg sub_0807F4F8, 0x000001b8
diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc
index f4a9d017..991b6ba8 100644
--- a/data/scripts/script_0800BF38.inc
+++ b/data/scripts/script_0800BF38.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800BF38
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
@@ -15,11 +15,11 @@ SCRIPT_START script_0800BF38
 	Wait 0x003c
 	Jump script_0800BFA4
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc
index 635b8068..b9b431f3 100644
--- a/data/scripts/script_0800C004.inc
+++ b/data/scripts/script_0800C004.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800C004
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0007
 	CallWithArg sub_0807F4F8, 0x000001b8
diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc
index 37dfcb17..741f5256 100644
--- a/data/scripts/script_0800C0B0.inc
+++ b/data/scripts/script_0800C0B0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800C0B0
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
@@ -15,11 +15,11 @@ SCRIPT_START script_0800C0B0
 	Wait 0x003c
 	Jump script_0800C11C
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc
index 58c62453..89f66c7b 100644
--- a/data/scripts/script_0800C160.inc
+++ b/data/scripts/script_0800C160.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800C160
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0007
 	CallWithArg sub_0807F4F8, 0x00000128
diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc
index 9cbeb6f1..e8669b83 100644
--- a/data/scripts/script_0800C1D8.inc
+++ b/data/scripts/script_0800C1D8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800C1D8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
@@ -15,11 +15,11 @@ SCRIPT_START script_0800C1D8
 	Wait 0x003c
 	Jump script_0800C244
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	Wait 0x00f0
 	_0807E930 0x0000
diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc
index 4a873345..efe7ad5e 100644
--- a/data/scripts/script_0800C2A4.inc
+++ b/data/scripts/script_0800C2A4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800C2A4
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0007
 	CallWithArg sub_0807F4F8, 0x00000128
diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc
index 7d8ef911..e9df34fd 100644
--- a/data/scripts/script_0800C350.inc
+++ b/data/scripts/script_0800C350.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800C350
-	StartScript 
+	BeginBlock 
 	CallWithArg sub_0806D658, 0x00000003
 	SetEntityNonPlanarMovement 0x0200
-	StopScript 
+	EndBlock 
 script_0800C362:
 	CheckRoomFlag 0x00ff
 	JumpIfNot script_0800C362
diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc
index 7d60617c..4c20b2fa 100644
--- a/data/scripts/script_0800C3CC.inc
+++ b/data/scripts/script_0800C3CC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800C3CC
-	StartScript 
+	BeginBlock 
 	Call sub_0806D660
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	CallWithArg sub_0807F4F8, 0x00000048
 	Call sub_0806D66C
diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc
index 5db4ce83..eb91cfce 100644
--- a/data/scripts/script_0800C410.inc
+++ b/data/scripts/script_0800C410.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800C410
-	StartScript 
+	BeginBlock 
 	Call sub_0806D660
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	CallWithArg sub_0807F4F8, 0x00000048
 	Call sub_0806D66C
diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc
index f13cd822..3e5fcded 100644
--- a/data/scripts/script_0800C45C.inc
+++ b/data/scripts/script_0800C45C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800C45C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0180
 	_0807E930 0x0004
 	Call sub_080A0B28
-	StopScript 
+	EndBlock 
 	Wait 0x000a
 	_0807EF80 0x0007
 	SoundReq 0x0136
diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc
index 0c3f544c..f4f87e6c 100644
--- a/data/scripts/script_0800C494.inc
+++ b/data/scripts/script_0800C494.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800C494
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0120
 	_0807E930 0x0004
-	StopScript 
+	EndBlock 
 	Wait 0x000a
 	_0807EF80 0x0007
 	SoundReq 0x0136
diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc
index fc78cae8..b4393ca1 100644
--- a/data/scripts/script_0800C4D0.inc
+++ b/data/scripts/script_0800C4D0.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800C4D0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0180
 	_0807E930 0x0004
-	StopScript 
+	EndBlock 
 	Wait 0x000a
 	_0807EF80 0x0007
 	SoundReq 0x0136
diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc
index cb7731f8..07445982 100644
--- a/data/scripts/script_0800C50C.inc
+++ b/data/scripts/script_0800C50C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800C50C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807E930 0x0004
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	Wait 0x000a
 	_0807EF80 0x0007
diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc
index f4d2ca1c..c52d06ce 100644
--- a/data/scripts/script_0800C550.inc
+++ b/data/scripts/script_0800C550.inc
@@ -1,35 +1,35 @@
 SCRIPT_START script_0800C550
-	StartScript 
+	BeginBlock 
 	Call sub_08060090
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800C55E:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800C572
 	Call sub_08060158
-	StopScript 
+	EndBlock 
 	Jump script_0800C55E
 script_0800C572:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_08060208
 	_0807EA94 
 	_0807E878 
 	Jump script_0800C55E
-	StartScript 
+	BeginBlock 
 	Call sub_08060090
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800C592:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800C5A6
 	Call sub_08060158
-	StopScript 
+	EndBlock 
 	Jump script_0800C592
 script_0800C5A6:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	CheckInventory1 0x0067
 	JumpIfNot script_0800C5BC
@@ -41,45 +41,45 @@ script_0800C5C0:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800C592
-	StartScript 
+	BeginBlock 
 	Call sub_08060090
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800C5D6:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800C5EA
 	Call sub_08060158
-	StopScript 
+	EndBlock 
 	Jump script_0800C5D6
 script_0800C5EA:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_08060270
 	_0807EA94 
 	_0807E878 
 	Jump script_0800C5D6
-	StartScript 
+	BeginBlock 
 script_0800C5FE:
 	Call sub_08060090
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800C60A:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800C61E
 	Call sub_08060158
-	StopScript 
+	EndBlock 
 	Jump script_0800C60A
 script_0800C61E:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0806021C
 	_0807EA94 
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800C60A
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	SetEntityNonPlanarMovement 0x0080
 	_0807EB44 0x0004
@@ -87,7 +87,7 @@ script_0800C61E:
 	JumpIfNot script_0800C650
 	SetEntityPosition 0x0010, 0x0000
 script_0800C650:
-	StopScript 
+	EndBlock 
 script_0800C652:
 	_0807E944 
 	_0807E864 
@@ -170,10 +170,10 @@ script_0800C756:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800C652
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
-	StopScript 
+	EndBlock 
 script_0800C780:
 	_0807E944 
 	_0807E864 
diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc
index 26a6b405..94925a3f 100644
--- a/data/scripts/script_0800C8C8.inc
+++ b/data/scripts/script_0800C8C8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C8C8
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x00e8, 0x0068
 	_0807EB44 0x0000
 	Wait 0x000f
diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc
index 2e809c16..6fd43f22 100644
--- a/data/scripts/script_0800C8F0.inc
+++ b/data/scripts/script_0800C8F0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C8F0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807ECC4 0x0010
 	_0807EDD4 0x0078, 0x0058
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc
index aa5b10a9..40415799 100644
--- a/data/scripts/script_0800C91C.inc
+++ b/data/scripts/script_0800C91C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800C91C
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	SetEntityNonPlanarMovement 0x0300
-	StopScript 
+	EndBlock 
 script_0800C928:
 	CheckPlayerInRegion 0x0208, 0x0360, 0x2040
 	JumpIfNot script_0800C928
diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc
index c769676b..3136b4a9 100644
--- a/data/scripts/script_0800CA8C.inc
+++ b/data/scripts/script_0800CA8C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800CA8C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x0208, 0x0358
 	SetEntityNonPlanarMovement 0x0080
diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc
index 55c914fd..d6f1ffe0 100644
--- a/data/scripts/script_0800CABC.inc
+++ b/data/scripts/script_0800CABC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800CABC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x000f
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000200
 	_0807EF80 0x0007
 	_0807EDD4 0x0208, 0x0308
diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc
index c27c42af..c72b75cf 100644
--- a/data/scripts/script_0800CB54.inc
+++ b/data/scripts/script_0800CB54.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800CB54
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x000f
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000800
 	_0807EF80 0x0007
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc
index 474c6c95..c0589c83 100644
--- a/data/scripts/script_0800CBD4.inc
+++ b/data/scripts/script_0800CBD4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800CBD4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x000f
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00002000
 	_0807EF80 0x0007
 	_0807EDD4 0x0258, 0x0330
diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc
index 319b7d51..414479f7 100644
--- a/data/scripts/script_0800CC6C.inc
+++ b/data/scripts/script_0800CC6C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800CC6C
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EF80 0x0000
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x000f
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00008000
 	_0807EF80 0x0007
 	_0807EDD4 0x01b8, 0x0320
diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc
index e5e1a880..d820e6ac 100644
--- a/data/scripts/script_0800CD04.inc
+++ b/data/scripts/script_0800CD04.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800CD04
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x000f
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00020000
 	_0807EF80 0x0007
 	_0807EDD4 0x0268, 0x0338
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index b0222105..4076c0d2 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0800CD7C
-	StartScript 
+	BeginBlock 
 	CheckInventory1 0x005b
 	JumpIfNot script_0800C5FE
 	Call sub_08060090
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800CD92:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800CDA6
 	Call sub_08060158
 	Jump script_0800CD92
 script_0800CDA6:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	CheckLocalFlag 0x009d
@@ -121,14 +121,14 @@ script_0800CF02:
 	Call sub_0807DF50
 	_0807E878 
 script_0800CF0C:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800CF20
 	Call sub_08060158
 	Jump script_0800CF0C
 script_0800CF20:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 script_0800CF2A:
@@ -145,29 +145,29 @@ script_0800CF40:
 	_0807E878 
 	Jump script_0800CD92
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08068104
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800CF5E:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800CF72
 	Call sub_0806811C
-	StopScript 
+	EndBlock 
 	Jump script_0800CF5E
 script_0800CF72:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_08068190
 	_0807EA94 
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800CF5E
-	StartScript 
+	BeginBlock 
 	Call sub_08068104
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800CF96:
 	_0807E944 
 	_0807E864 
@@ -176,12 +176,12 @@ script_0800CF96:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800CF96
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	CheckInventory1 0x0041
 	JumpIf script_0800CFD2
 	CheckLocalFlag 0x007e
@@ -199,12 +199,12 @@ script_0800CFEC:
 	JumpIfNot script_0800CFFA
 	_0807E5F8 0x00000010
 script_0800CFFA:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08068910
 	CheckEntityInteractType 
 	JumpIfNot script_0800CFFA
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	CheckInventory1 0x0002
diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc
index 5732aec5..b052bb90 100644
--- a/data/scripts/script_0800D190.inc
+++ b/data/scripts/script_0800D190.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D190
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0170, 0x0140
 	_0807EB44 0x0002
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc
index 6cdc8b0a..4c6444ad 100644
--- a/data/scripts/script_0800D1B4.inc
+++ b/data/scripts/script_0800D1B4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D1B4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0170, 0x0120
 	_0807EDD4 0x01a8, 0x0120
 	_0807EB44 0x0004
diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc
index eff7f8f0..85b3aa5d 100644
--- a/data/scripts/script_0800D218.inc
+++ b/data/scripts/script_0800D218.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800D218
-	StartScript 
+	BeginBlock 
 	CheckInventory1 0x0041
 	JumpIf script_0800D24C
 	CheckLocalFlag 0x007e
 	JumpIf script_0800D242
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000010
 	_0807EF80 0x0007
 	WaitForSomething2 0x00000010
diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc
index a10af6f6..6d9ff822 100644
--- a/data/scripts/script_0800D254.inc
+++ b/data/scripts/script_0800D254.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D254
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000020
 	_0807EF80 0x0007
 	WaitForSomething2 0x00000020
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index d72f4220..edd39c9c 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -1,24 +1,24 @@
 SCRIPT_START script_0800D278
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800D282:
 	CheckInventory1 0x0041
 	JumpIf script_0800D292
 	CheckLocalFlag 0x007e
 	JumpIf script_0800D2EA
 script_0800D292:
-	StartScript 
+	BeginBlock 
 	TestBit 0x00000001
 	JumpIf script_0800D2C6
 	CheckEntityInteractType 
 	JumpIf script_0800D2B0
 	Call sub_0806811C
-	StopScript 
+	EndBlock 
 	Jump script_0800D282
 script_0800D2B0:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_08068190
 	_0807EA94 
@@ -26,7 +26,7 @@ script_0800D2B0:
 	_0807E878 
 	Jump script_0800D282
 script_0800D2C6:
-	StopScript 
+	EndBlock 
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
 	_0807E5F8 0x00000004
@@ -44,19 +44,19 @@ script_0800D2EE:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800D2EE
-	StartScript 
+	BeginBlock 
 	Call sub_08068884
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_0800D31E:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08068910
 	CheckEntityInteractType 
 	JumpIfNot script_0800D31E
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807E914 0x00000000
@@ -66,19 +66,19 @@ script_0800D31E:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800D31E
-	StartScript 
+	BeginBlock 
 	Call sub_08068104
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800D35E:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800D372
 	Call sub_0806811C
-	StopScript 
+	EndBlock 
 	Jump script_0800D35E
 script_0800D372:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_08068190
 	_0807EA94 
diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc
index 4977889d..42cf8c15 100644
--- a/data/scripts/script_0800D3EC.inc
+++ b/data/scripts/script_0800D3EC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D3EC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0000
 	_0807EF80 0x0000
 	_0807EF80 0x000d
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index 00327d2a..90dabc5d 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800D414
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	Call sub_08068104
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800D426:
 	_0807EB44 0x0002
 	_0807E914 0x00000000
@@ -39,13 +39,13 @@ script_0800D426:
 	_0807EDD4 0x0228, 0x01e8
 	Jump script_0800D426
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_08062A48
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 script_0800D4E4:
-	StopScript 
+	EndBlock 
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000009
@@ -77,8 +77,8 @@ script_0800D556:
 script_0800D560:
 	_0807EE04 0x00b8, 0x00b8
 script_0800D566:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_080626C0
 	JumpIf script_0800D4E4
 	CheckEntityInteractType 
@@ -87,7 +87,7 @@ script_0800D566:
 	JumpIfNot script_0800D566
 	Jump script_0800D4E4
 script_0800D584:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	Call sub_0806265C
@@ -95,12 +95,12 @@ script_0800D584:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800D4E4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_08062A48
 	_0807EF80 0x0000
 script_0800D5AC:
-	StopScript 
+	EndBlock 
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000004
@@ -117,15 +117,15 @@ script_0800D5E2:
 script_0800D5EC:
 	_0807EE04 0x0058, 0x00c8
 script_0800D5F2:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_080626C0
 	JumpIf script_0800D5AC
 	_0807EE30 
 	JumpIfNot script_0800D5F2
 	Jump script_0800D5AC
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x000b
 	_0807EF80 0x0008
@@ -133,7 +133,7 @@ script_0800D5F2:
 	JumpIf script_0800D6AE
 	Call sub_0806DAD0
 	CallWithArg sub_0806DA04, 0x00000002
-	StopScript 
+	EndBlock 
 script_0800D636:
 	_0807EA4C 
 	_0807E9F0 
diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc
index d34c14ff..09e80f0c 100644
--- a/data/scripts/script_0800D6B4.inc
+++ b/data/scripts/script_0800D6B4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800D6B4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x0011
 	Call sub_0807F158
 	Call sub_0807F738
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc
index 03706d7b..70ce4312 100644
--- a/data/scripts/script_0800D6D0.inc
+++ b/data/scripts/script_0800D6D0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800D6D0
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x00f3
 	JumpIf script_0800D6E8
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_0800D6E0:
 	CheckLocalFlag 0x00f3
 	JumpIfNot script_0800D6E0
diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc
index 796f0c6c..20742cca 100644
--- a/data/scripts/script_0800D6F0.inc
+++ b/data/scripts/script_0800D6F0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800D6F0
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x00f5
 	JumpIf script_0800D6E8
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_0800D700:
 	CheckLocalFlag 0x00f5
 	JumpIfNot script_0800D700
diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc
index 657cb9b1..99cb9e11 100644
--- a/data/scripts/script_0800D710.inc
+++ b/data/scripts/script_0800D710.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800D710
-	StartScript 
+	BeginBlock 
 	Call sub_0807F360
 	SetEntityNonPlanarMovement 0x0700
 	_0807F0B4 0x0007
 	CameraTargetEntity 
 	Call sub_0807FBC4
-	StopScript 
+	EndBlock 
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000010
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc
index b7eb9079..f22917cf 100644
--- a/data/scripts/script_0800D76C.inc
+++ b/data/scripts/script_0800D76C.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800D76C
-	StartScript 
+	BeginBlock 
 	Call sub_0807F360
 	_0807EF80 0x000b
 	SetEntityNonPlanarMovement 0x0200
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	_0807EF80 0x0004
 	Wait 0x003c
@@ -23,12 +23,12 @@ SCRIPT_START script_0800D76C
 	_0807EF80 0x0001
 	WaitForSomething2 0x00000008
 	Jump script_0800D80C
-	StartScript 
+	BeginBlock 
 	Call sub_0807F360
 	_0807EF80 0x000b
-	SetEntityPositionRelative 0x01d80268
+	SetEntityPositionRelative 0x0268, 0x01d8
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EDD4 0x01f0, 0x01d8
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc
index b4f2becc..964c646c 100644
--- a/data/scripts/script_0800D84C.inc
+++ b/data/scripts/script_0800D84C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800D84C
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800D850:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_0800D850
diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc
index 0de3e444..44537ee1 100644
--- a/data/scripts/script_0800D874.inc
+++ b/data/scripts/script_0800D874.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800D874
-	StartScript 
+	BeginBlock 
 	Call sub_0807F934
 	_0807EF80 0x0008
 	_0807E914 0x00000001
 	Call sub_0806DA04
-	StopScript 
+	EndBlock 
 script_0800D88E:
 	CheckEntityInteractType 
 	JumpIfNot script_0800D88E
@@ -31,11 +31,11 @@ script_0800D8D6:
 	_0807E878 
 	Jump script_0800D88E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	CheckInventory1 0x0017
 	JumpIf script_0800D924
-	StopScript 
+	EndBlock 
 script_0800D8F4:
 	CheckInventory1 0x0017
 	JumpIfNot script_0800D8F4
diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc
index e87da7d3..f8b49843 100644
--- a/data/scripts/script_0800D92C.inc
+++ b/data/scripts/script_0800D92C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D92C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x00a0, 0x0078
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc
index 40de08ce..3ba0cb1c 100644
--- a/data/scripts/script_0800D954.inc
+++ b/data/scripts/script_0800D954.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800D954
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	Call sub_0807F180
-	StopScript 
+	EndBlock 
 script_0800D962:
 	CheckPlayerInRegion 0x0118, 0x0038, 0x3050
 	JumpIfNot script_0800D962
diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc
index 33601801..11619bda 100644
--- a/data/scripts/script_0800DA00.inc
+++ b/data/scripts/script_0800DA00.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800DA00
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x0118, 0x0060
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc
index 8c30c6b2..93fb7c76 100644
--- a/data/scripts/script_0800DA28.inc
+++ b/data/scripts/script_0800DA28.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800DA28
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0007
 	Wait 0x003c
diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc
index d5314e56..309c74fd 100644
--- a/data/scripts/script_0800DA60.inc
+++ b/data/scripts/script_0800DA60.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DA60
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800DA64:
 	CheckPlayerInRegion 0x0078, 0x0148, 0x4040
 	JumpIfNot script_0800DA64
@@ -11,7 +11,7 @@ script_0800DA64:
 	Call sub_0807F3F8
 	Wait 0x003c
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x00800078
+	SetEntityPositionRelative 0x0078, 0x0080
 	CameraTargetEntity 
 	Call sub_0807F5C0
 	_0807E5F8 0x00000001
diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc
index 28eb65ea..0690c1db 100644
--- a/data/scripts/script_0800DB18.inc
+++ b/data/scripts/script_0800DB18.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DB18
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_08066E38
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc
index c633b659..b51c50a7 100644
--- a/data/scripts/script_0800DB28.inc
+++ b/data/scripts/script_0800DB28.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800DB28
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0000
 	_0807EF80 0x0014
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	Wait 0x003c
 	_0807EF80 0x0004
diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc
index 73eb3d1e..c810df2f 100644
--- a/data/scripts/script_0800DB78.inc
+++ b/data/scripts/script_0800DB78.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DB78
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0800DB7C:
 	CallWithArg sub_0807F6B4, 0x000000a0
 	JumpIf script_0800DB7C
@@ -8,7 +8,7 @@ script_0800DB7C:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	_0807F0B4 0x0001
-	SetEntityPositionRelative 0x00780078
+	SetEntityPositionRelative 0x0078, 0x0078
 	CameraTargetEntity 
 	Call sub_0807F5C0
 	_0807EB28 0x1648
diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc
index fda1cc9e..a4e0fee5 100644
--- a/data/scripts/script_0800DCAC.inc
+++ b/data/scripts/script_0800DCAC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800DCAC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_08066E38
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	CallWithArg sub_0807F8E8, 0x00000000
 	_0807E5F8 0x00000002
@@ -12,7 +12,7 @@ script_0800DCD0:
 	_0807EF80 0x0010
 	Wait 0x003c
 	_0807EF80 0x0010
-	SetEntityPositionRelative 0x00680078
+	SetEntityPositionRelative 0x0078, 0x0068
 	WaitForSomething2 0x00000001
 	SoundReq0x80100000 
 	Call sub_08066E50
diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc
index 11cac803..318e60e8 100644
--- a/data/scripts/script_0800DDD0.inc
+++ b/data/scripts/script_0800DDD0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800DDD0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	CallWithArg sub_0807F4F8, 0x000000a0
 	_0807EDD4 0x0078, 0x00a0
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc
index 7d76102c..a5ed1fc5 100644
--- a/data/scripts/script_0800DE00.inc
+++ b/data/scripts/script_0800DE00.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800DE00
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0000
 	_0807EF80 0x000d
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc
index dabfc445..2a9997cb 100644
--- a/data/scripts/script_0800DE2C.inc
+++ b/data/scripts/script_0800DE2C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800DE2C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EEF4 0x0000, 0x0080
diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc
index 3ace4f33..56e71bbe 100644
--- a/data/scripts/script_0800DE50.inc
+++ b/data/scripts/script_0800DE50.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800DE50
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	CallWithArg sub_0807F238, 0x000003c5
diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc
index e6184c8a..fe8eb6e9 100644
--- a/data/scripts/script_0800DEB0.inc
+++ b/data/scripts/script_0800DEB0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800DEB0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0198, 0x01c8
 	_0807EB44 0x0004
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc
index 657180ad..410e9296 100644
--- a/data/scripts/script_0800DED4.inc
+++ b/data/scripts/script_0800DED4.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_0800DED4
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	SetEntityNonPlanarMovement 0x0100
 	_0807EF80 0x000b
 	Call sub_08066D04
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08066D14
-	SetEntityPositionRelative 0x01480198
+	SetEntityPositionRelative 0x0198, 0x0148
 	_0807EF80 0x0007
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0198, 0x01a8
 	_0807EB44 0x0004
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc
index 8d67bf90..465aeb71 100644
--- a/data/scripts/script_0800DF24.inc
+++ b/data/scripts/script_0800DF24.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800DF24
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc
index c253847f..a8525746 100644
--- a/data/scripts/script_0800DFB4.inc
+++ b/data/scripts/script_0800DFB4.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800DFB4
-	StopScript 
+	EndBlock 
 script_0800DFB6:
 	CheckRoomFlag 0x0001
 	JumpIfNot script_0800DFB6
diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc
index 7ecaa728..533f67f8 100644
--- a/data/scripts/script_0800DFE4.inc
+++ b/data/scripts/script_0800DFE4.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800DFE4
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
-	StopScript 
+	EndBlock 
 	SoundReq0x80100000 
 	TextboxNoOverlapFollowPos 0x1632, 0x0002
 	_0807EA94 
diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc
index 1b8c6edb..f06ea0ba 100644
--- a/data/scripts/script_0800E050.inc
+++ b/data/scripts/script_0800E050.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800E050
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
-	StopScript 
+	EndBlock 
 	SoundReq0x80100000 
 	SoundReq0x80100000 
 	Wait 0x0078
diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc
index 35daad29..23bfe931 100644
--- a/data/scripts/script_0800E094.inc
+++ b/data/scripts/script_0800E094.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800E094
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x00c0
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	_0807EF80 0x0001
 	_0807EDD4 0x00a8, 0x002c
diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc
index 3770edbc..51d48b48 100644
--- a/data/scripts/script_0800E0BC.inc
+++ b/data/scripts/script_0800E0BC.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800E0BC
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CheckLocalFlag 0x0093
 	JumpIf script_0800E12E
 	_0807E930 0x0008
 	CallWithArg sub_0807F8E8, 0x00000000
-	StopScript 
+	EndBlock 
 script_0800E0DE:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_0800E0DE
@@ -33,7 +33,7 @@ script_0800E0DE:
 script_0800E12E:
 	Call sub_080668F0
 	_0807E878 
-	StopScript 
+	EndBlock 
 script_0800E138:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E138
@@ -45,14 +45,14 @@ script_0800E138:
 	_0807E878 
 	Jump script_0800E138
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CheckLocalFlag 0x0094
 	JumpIf script_0800E1D0
 	_0807E930 0x0010
 	CallWithArg sub_0807F8E8, 0x00000001
-	StopScript 
+	EndBlock 
 script_0800E176:
 	CheckRoomFlag 0x0001
 	JumpIfNot script_0800E176
@@ -81,7 +81,7 @@ script_0800E1D0:
 	CallWithArg sub_0807F3D8, 0x00000000
 	_0807E9D4 
 	_0807E878 
-	StopScript 
+	EndBlock 
 script_0800E1E0:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E1E0
@@ -92,24 +92,24 @@ script_0800E1E0:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E1E0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CheckLocalFlag 0x0073
 	JumpIfNot script_0800E232
 	_0807E9D4 
-	SetEntityPositionRelative 0x01680070
+	SetEntityPositionRelative 0x0070, 0x0168
 	_0807EB44 0x0002
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 	Jump script_0800E32E
 script_0800E232:
 	CheckLocalFlag 0x0095
 	JumpIf script_0800E29A
 	_0807E930 0x0010
 	CallWithArg sub_0807F8E8, 0x00000002
-	StopScript 
+	EndBlock 
 script_0800E24A:
 	CheckRoomFlag 0x0002
 	JumpIfNot script_0800E24A
@@ -136,10 +136,10 @@ script_0800E29A:
 	CallWithArg sub_0807F3D8, 0x00000000
 	_0807E9D4 
 	_0807E878 
-	StopScript 
+	EndBlock 
 script_0800E2AE:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800E312
 	CheckLocalFlag 0x0093
@@ -150,7 +150,7 @@ script_0800E2AE:
 	JumpIfNot script_0800E2AE
 	_0807E9DC 
 	SetLocalFlag 0x0073
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0000
 	CallWithArg sub_0807F3D8, 0x00000004
 	_0807EDD4 0x0088, 0x0168
@@ -165,7 +165,7 @@ script_0800E312:
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 	TextboxNoOverlap 0x2404
 	_0807EA94 
 	_0807E878 
@@ -181,7 +181,7 @@ script_0800E32E:
 	_0807E878 
 	Jump script_0800E32E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CheckLocalFlag 0x0071
@@ -190,7 +190,7 @@ script_0800E32E:
 	JumpIf script_0800E3BE
 	_0807E930 0x000c
 	CallWithArg sub_0807F8E8, 0x00000000
-	StopScript 
+	EndBlock 
 script_0800E37A:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_0800E37A
@@ -214,7 +214,7 @@ script_0800E3BE:
 	_0807EF80 0x0000
 	_0807E9D4 
 	_0807E878 
-	StopScript 
+	EndBlock 
 script_0800E3C8:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E3C8
@@ -230,7 +230,7 @@ script_0800E3C8:
 script_0800E3E8:
 	_0807E9D4 
 	_0807E878 
-	StopScript 
+	EndBlock 
 script_0800E3EE:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E3EE
@@ -241,11 +241,11 @@ script_0800E3EE:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800E3EE
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	_0807EF80 0x000a
 	Call sub_080668F0
-	StopScript 
+	EndBlock 
 script_0800E41A:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E41A
@@ -256,12 +256,12 @@ script_0800E41A:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800E41A
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	CallWithArg sub_0807F3D8, 0x00000000
 	_0807EF80 0x000a
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0800E44C:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E44C
@@ -272,12 +272,12 @@ script_0800E44C:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E44C
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
 	_0807EF80 0x000a
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0800E484:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E484
@@ -288,17 +288,17 @@ script_0800E484:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E484
-	StartScript 
+	BeginBlock 
 	Call sub_0807F354
-	StopScript 
+	EndBlock 
 	CheckLocalFlag 0x007c
 	JumpIf script_0800E4FA
 script_0800E4B6:
 	CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
 	JumpIfNot script_0800E4B6
-	StartScript 
+	BeginBlock 
 	_0807E864 
-	StopScript 
+	EndBlock 
 	Call sub_0807F3F8
 	Wait 0x003c
 	TextboxNoOverlapFollow 0x160c
@@ -310,11 +310,11 @@ script_0800E4B6:
 	_0807EB28 0x160e
 	Wait 0x003c
 	_0807EA94 
-	StartScript 
+	BeginBlock 
 	SoundReq2 0x0033
 	SetLocalFlag 0x007c
 script_0800E4FA:
 	_0807E878 
 	_0807EF80 0x0006
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc
index 1b63855a..c0332ba7 100644
--- a/data/scripts/script_0800E504.inc
+++ b/data/scripts/script_0800E504.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E504
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 	CheckLocalFlag 0x007d
 	JumpIf script_0800E53C
 script_0800E510:
diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc
index b0a31238..f46e30bb 100644
--- a/data/scripts/script_0800E544.inc
+++ b/data/scripts/script_0800E544.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E544
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 	CheckLocalFlag 0x007e
 	JumpIf script_0800E582
 script_0800E550:
diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc
index 8fdde827..cdcde694 100644
--- a/data/scripts/script_0800E58C.inc
+++ b/data/scripts/script_0800E58C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800E58C
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EB44 0x0000
 	_0807EF80 0x0014
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	SoundReq 0x0105
 	Wait 0x003c
diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc
index 59366432..65098577 100644
--- a/data/scripts/script_0800E5C4.inc
+++ b/data/scripts/script_0800E5C4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800E5C4
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x0086
 	JumpIfNot script_0800E5D6
 	_0807EF80 0x0006
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc
index f4fb76ae..79bb47dc 100644
--- a/data/scripts/script_0800E5D6.inc
+++ b/data/scripts/script_0800E5D6.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E5D6
 script_0800E5D6:
-	StopScript 
+	EndBlock 
 script_0800E5D8:
 	CheckLocalFlag 0x0086
 	JumpIfNot script_0800E5D8
diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc
index 36445e10..1f41c8bb 100644
--- a/data/scripts/script_0800E600.inc
+++ b/data/scripts/script_0800E600.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800E600
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0140
 	SetEntityDirection 0x0000
 	_0807E864 
 	Call sub_0807F354
-	StopScript 
+	EndBlock 
 	WaitForPlayerAction0x17 
 	_0807E8E4_0 
 	_0807EF80 0x0001
diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc
index 96b1273e..51379a5e 100644
--- a/data/scripts/script_0800E62C.inc
+++ b/data/scripts/script_0800E62C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800E62C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0140
 	SetEntityDirection 0x0008
 	_0807E864 
 	Call sub_0807F354
-	StopScript 
+	EndBlock 
 	WaitForPlayerAction0x17 
 	_0807E8E4_1 
 	_0807EF80 0x0001
diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc
index 54d3c254..79adc65b 100644
--- a/data/scripts/script_0800E658.inc
+++ b/data/scripts/script_0800E658.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800E658
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0140
 	SetEntityDirection 0x0010
 	_0807E864 
 	Call sub_0807F354
-	StopScript 
+	EndBlock 
 	WaitForPlayerAction0x17 
 	_0807E8E4_2 
 	_0807EF80 0x0001
diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc
index 569e8ad8..cfddbd91 100644
--- a/data/scripts/script_0800E684.inc
+++ b/data/scripts/script_0800E684.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800E684
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0140
 	SetEntityDirection 0x0018
 	_0807E864 
 	Call sub_0807F354
-	StopScript 
+	EndBlock 
 	WaitForPlayerAction0x17 
 	_0807E8E4_3 
 	_0807EF80 0x0001
diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc
index c1ff4dcb..b540d51a 100644
--- a/data/scripts/script_0800E6B0.inc
+++ b/data/scripts/script_0800E6B0.inc
@@ -1,35 +1,35 @@
 SCRIPT_START script_0800E6B0
-	StartScript 
+	BeginBlock 
 	Call sub_08060090
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800E6BE:
-	StartScript 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800E6D2
 	Call sub_08060158
-	StopScript 
+	EndBlock 
 	Jump script_0800E6BE
 script_0800E6D2:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0806025C
 	_0807EA94 
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800E6BE
-	StartScript 
+	BeginBlock 
 	Call sub_0806ADFC
 	_0807EF80 0x000a
 script_0800E6F4:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800E708
 	Call sub_0806AEE4
 	Jump script_0800E6F4
 script_0800E708:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0806AFE8
 	JumpIf script_0800E722
@@ -45,10 +45,10 @@ script_0800E722:
 	_0807E878 
 	Jump script_0800E6F4
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800E73E:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E73E
@@ -59,7 +59,7 @@ script_0800E73E:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E73E
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	SetEntityNonPlanarMovement 0x0200
@@ -68,21 +68,21 @@ script_0800E73E:
 	CheckGlobalFlag 0x002a
 	JumpIfNot script_0800E786
 script_0800E77C:
-	SetEntityPositionRelative 0x00980188
+	SetEntityPositionRelative 0x0188, 0x0098
 	Jump script_0800E6F4
 script_0800E786:
-	StopScript 
+	EndBlock 
 script_0800E788:
-	StartScript 
+	BeginBlock 
 	CheckGlobalFlag 0x002a
 	JumpIf script_0800E7BA
 	CheckEntityInteractType 
 	JumpIf script_0800E7A4
 	Call sub_0806AEE4
-	StopScript 
+	EndBlock 
 	Jump script_0800E788
 script_0800E7A4:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0806AFE8
 	_0807EA94 
@@ -96,20 +96,20 @@ script_0800E7BA:
 	Call sub_0806AF70
 	_0807EE04 0x0188, 0x0058
 script_0800E7D8:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0806AF78
 	_0807EE30 
 	JumpIfNot script_0800E7D8
 	EntityHasHeight 
 	JumpIf script_0800E7D8
-	StopScript 
+	EndBlock 
 	Jump script_0800E6F4
-	StartScript 
+	BeginBlock 
 	Call sub_0806C674
 	_0807EF80 0x000a
 	_0807EB44 0x0004
-	StopScript 
+	EndBlock 
 script_0800E806:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E806
@@ -121,30 +121,30 @@ script_0800E806:
 	_0807EB44 0x0004
 	Jump script_0800E806
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0000
-	StopScript 
+	EndBlock 
 script_0800E832:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E832
 	_0807E864 
 	_0807EB44 0x0004
-	StartScript 
+	BeginBlock 
 	TextboxNoOverlapFollow 0x4501
 	CallWithArg sub_0807F854, 0x00010032
 	CallWithArg sub_0807F854, 0x000200c8
 	CallWithArg sub_0807F854, 0x00030190
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	_0807EB38 
 	JumpSwitch_4 script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872
 script_0800E872:
-	StartScript 
+	BeginBlock 
 	TextboxNoOverlapFollow 0x4505
 	CallWithArg sub_0807F854, 0x00010190
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	HasRupees 0x0190
 	JumpIfNot script_0800E908
diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc
index 321568d2..9a857695 100644
--- a/data/scripts/script_0800E8A4.inc
+++ b/data/scripts/script_0800E8A4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800E8A4
 script_0800E8A4:
-	StartScript 
+	BeginBlock 
 	TextboxNoOverlapFollow 0x4504
 	CallWithArg sub_0807F854, 0x000100c8
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	HasRupees 0x00c8
 	JumpIfNot script_0800E908
diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc
index 77873d81..47f4bfa7 100644
--- a/data/scripts/script_0800E8D6.inc
+++ b/data/scripts/script_0800E8D6.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800E8D6
 script_0800E8D6:
-	StartScript 
+	BeginBlock 
 	TextboxNoOverlapFollow 0x4503
 	CallWithArg sub_0807F854, 0x00010032
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	HasRupees 0x0032
 	JumpIfNot script_0800E908
diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc
index ccee015f..6c558ea9 100644
--- a/data/scripts/script_0800E908.inc
+++ b/data/scripts/script_0800E908.inc
@@ -9,11 +9,11 @@ script_0800E914:
 	_0807E878 
 	_0807EB44 0x0000
 	Jump script_0800E832
-	StartScript 
+	BeginBlock 
 	Call sub_0806C4F8
 	_0807EF80 0x000a
 	_0807EB44 0x0000
-	StopScript 
+	EndBlock 
 script_0800E932:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E932
@@ -30,11 +30,11 @@ script_0800E942:
 	_0807E930 0x0000
 	Jump script_0800E932
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_0800E974:
 	CheckEntityInteractType 
 	JumpIfNot script_0800E974
diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc
index f31ca4d3..0a268ef1 100644
--- a/data/scripts/script_0800E9F4.inc
+++ b/data/scripts/script_0800E9F4.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800E9F4
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x0078, 0x0080
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc
index 4177a721..d415dcea 100644
--- a/data/scripts/script_0800EA54.inc
+++ b/data/scripts/script_0800EA54.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800EA54
-	StartScript 
+	BeginBlock 
 	Call sub_0806CE5C
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0008
-	StopScript 
+	EndBlock 
 script_0800EA6A:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EA6A
@@ -20,21 +20,21 @@ script_0800EA6A:
 	Call sub_0807F2D4
 	_0807E930 0x0008
 	Jump script_0800EA6A
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	Call sub_0806C09C
 	_0807EF80 0x000a
 	_0807E930 0x0000
 	_0807EB44 0x0004
-	StopScript 
+	EndBlock 
 script_0800EABC:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EABC
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0806C028, 0x00000004
-	StopScript 
+	EndBlock 
 script_0800EAD4:
 	Call sub_0806C00C
 	JumpIfNot script_0800EAD4
@@ -45,12 +45,12 @@ script_0800EAD4:
 	_0807E878 
 	_0807E930 0x0000
 	Jump script_0800EABC
-	StartScript 
+	BeginBlock 
 	Call sub_0806C870
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_0800EB0E:
 	_0807E30C 
 	JumpIfNot script_0800EB0E
@@ -62,12 +62,12 @@ script_0800EB0E:
 	_0807E878 
 	Jump script_0800EB0E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 script_0800EB44:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EB44
@@ -79,12 +79,12 @@ script_0800EB44:
 	_0807E878 
 	Jump script_0800EB44
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0006
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 script_0800EB7C:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EB7C
@@ -97,26 +97,26 @@ script_0800EB7C:
 	_0807EB44 0x0006
 	Call sub_08061FD8
 	Jump script_0800EB7C
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0002
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 	Jump script_0800EBF4
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 	Jump script_0800EBF4
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0006
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 script_0800EBF4:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EBF4
@@ -128,12 +128,12 @@ script_0800EBF4:
 	_0807E878 
 	Jump script_0800EBF4
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0002
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 script_0800EC2C:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EC2C
@@ -146,12 +146,12 @@ script_0800EC2C:
 	_0807EB44 0x0002
 	Call sub_08061FD8
 	Jump script_0800EC2C
-	StartScript 
+	BeginBlock 
 	Call sub_08061E70
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	Call sub_08061FD8
-	StopScript 
+	EndBlock 
 script_0800EC6C:
 	CheckEntityInteractType 
 	JumpIfNot script_0800EC6C
@@ -163,14 +163,14 @@ script_0800EC6C:
 	_0807E878 
 	Jump script_0800EC6C
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	CallWithArg sub_08061FB8, 0x00000001
 	SetEntityNonPlanarMovement 0x0040
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0002
-	StopScript 
+	EndBlock 
 script_0800ECAC:
 	_0807EB44 0x0006
 	_0807E930 0x0007
@@ -193,13 +193,13 @@ script_0800ECAC:
 	_0807E930 0x0003
 	Wait 0x001e
 	Jump script_0800ECAC
-	StartScript 
+	BeginBlock 
 	Call sub_080639D0
 	_0807EF80 0x000a
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CallWithArg sub_08063850, 0x00000000
-	StopScript 
+	EndBlock 
 script_0800ED20:
 	CheckEntityInteractType 
 	JumpIfNot script_0800ED20
@@ -216,13 +216,13 @@ script_0800ED46:
 	Call sub_08063874
 	CallWithArg sub_08063850, 0x00000000
 	Jump script_0800ED20
-	StartScript 
+	BeginBlock 
 	Call sub_08064CC0
 	_0807EF80 0x000a
 	_0807EF80 0x0007
 	_0807EB44 0x0002
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_0800ED76:
 	_0807E944 
 	_0807E864 
@@ -233,12 +233,12 @@ script_0800ED76:
 	_0807E878 
 	Jump script_0800ED76
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 script_0800ED98:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800EDB6
 	TestBit 0x00000001
@@ -246,7 +246,7 @@ script_0800ED98:
 	Call sub_0806AEE4
 	Jump script_0800ED98
 script_0800EDB6:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	CheckLocalFlag 0x00ae
@@ -269,7 +269,7 @@ script_0800EDB6:
 	SetLocalFlag 0x00ae
 	Jump script_0800ED98
 script_0800EE12:
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EB44 0x0002
 	CallWithArg sub_0806AF60, 0x00000008
@@ -283,12 +283,12 @@ script_0800EE3E:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800ED98
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 script_0800EE58:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0800EE76
 	TestBit 0x00000001
@@ -296,7 +296,7 @@ script_0800EE58:
 	Call sub_0806AEE4
 	Jump script_0800EE58
 script_0800EE76:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	CheckLocalFlag 0x00ae
@@ -319,7 +319,7 @@ script_0800EE76:
 	SetLocalFlag 0x00ae
 	Jump script_0800EE58
 script_0800EED2:
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000010
 	_0807EB44 0x0006
 	CallWithArg sub_0806AF60, 0x00000008
diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc
index ac9171e9..793fb4de 100644
--- a/data/scripts/script_0800EF40.inc
+++ b/data/scripts/script_0800EF40.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800EF40
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	CheckGlobalFlag 0x001f
 	JumpIf script_0800EF92
-	StopScript 
+	EndBlock 
 script_0800EF50:
 	Call sub_080869A4
 	JumpIfNot script_0800EF50
diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc
index 3b34ef6f..21f358bb 100644
--- a/data/scripts/script_0800EF9C.inc
+++ b/data/scripts/script_0800EF9C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800EF9C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807ECC4 0x0008
diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc
index e387487b..4a9dc22c 100644
--- a/data/scripts/script_0800EFC0.inc
+++ b/data/scripts/script_0800EFC0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_0800EFC0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807E9D4 
 	_0807EF80 0x000a
 	CheckLocalFlag 0x007b
 	JumpIf script_0800F082
-	StopScript 
+	EndBlock 
 	Jump script_0800EFFE
 script_0800EFDA:
 	_0807EB44 0x0006
@@ -39,14 +39,14 @@ script_0800EFFE:
 	JumpIf script_0800F082
 	Jump script_0800EFDA
 script_0800F082:
-	StopScript 
+	EndBlock 
 	Call sub_0806AEE4
 	Jump script_0800F082
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807F0B4 0x0001
 	CameraTargetPlayer 
-	StopScript 
+	EndBlock 
 script_0800F09A:
 	CheckPlayerInRegion 0x01f8, 0x0338, 0x1030
 	JumpIfNot script_0800F09A
diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc
index caf956b4..424a5b99 100644
--- a/data/scripts/script_0800F14C.inc
+++ b/data/scripts/script_0800F14C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800F14C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0000
 	_0807EB44 0x0006
 	_0807EF80 0x0004
diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc
index c1d99864..a11ddc09 100644
--- a/data/scripts/script_0800F184.inc
+++ b/data/scripts/script_0800F184.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800F184
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0008
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	Call sub_0807F348
 	_0807EB44 0x0002
 	WaitForSomething2 0x00000002
@@ -21,11 +21,11 @@ SCRIPT_START script_0800F184
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000002
 script_0800F1E6:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CallWithArg sub_0807F680, 0x000001c0
 	JumpIf script_0800F22A
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	_0807EB74 
@@ -41,7 +41,7 @@ script_0800F1E6:
 script_0800F22A:
 	CallWithArg sub_0807F680, 0x00000230
 	JumpIfNot script_0800F26A
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	_0807EB74 
@@ -57,7 +57,7 @@ script_0800F22A:
 script_0800F26A:
 	CallWithArg sub_0807F6B4, 0x00000310
 	JumpIf script_0800F2AA
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	_0807EB74 
@@ -73,7 +73,7 @@ script_0800F26A:
 script_0800F2AA:
 	CallWithArg sub_0807F6B4, 0x00000340
 	JumpIfNot script_0800F2EA
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	_0807EB74 
@@ -87,13 +87,13 @@ script_0800F2AA:
 	_0807E878 
 	Jump script_0800F1E6
 script_0800F2EA:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckKinstoneFused 0x0032
 	JumpIf script_0800F314
 	CheckEntityInteractType 
 	JumpIfNot script_0800F2EA
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807E930 0x0008
@@ -102,7 +102,7 @@ script_0800F2EA:
 	_0807E878 
 	Jump script_0800F1E6
 script_0800F314:
-	StopScript 
+	EndBlock 
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000002
 	SetEntityNonPlanarMovement 0x0100
diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc
index 2bd4c895..bcc37575 100644
--- a/data/scripts/script_0800F39C.inc
+++ b/data/scripts/script_0800F39C.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800F39C
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0002
 	_0807EF80 0x0001
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x000b
-	StopScript 
+	EndBlock 
 	Call sub_0807F348
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0007
@@ -18,11 +18,11 @@ SCRIPT_START script_0800F39C
 	_0807EF80 0x000a
 	_0807E5F8 0x00000080
 script_0800F3EA:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIfNot script_0800F402
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	TextboxNoOverlap 0x1237
@@ -31,7 +31,7 @@ script_0800F3EA:
 script_0800F402:
 	TestBit 0x00000004
 	JumpIfNot script_0800F3EA
-	StopScript 
+	EndBlock 
 	_0807EF80 0x000b
 	Wait 0x0010
 	SetEntityNonPlanarMovement 0x0100
diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc
index 1eb6f57c..a8fdfe28 100644
--- a/data/scripts/script_0800F430.inc
+++ b/data/scripts/script_0800F430.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800F430
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0002
 	_0807EF80 0x0001
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x000b
-	StopScript 
+	EndBlock 
 	Call sub_0807F348
 	WaitForSomething2 0x00000008
 	_0807EF80 0x0007
@@ -17,11 +17,11 @@ SCRIPT_START script_0800F430
 	_0807EF80 0x000a
 	_0807E5F8 0x00000100
 script_0800F478:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIfNot script_0800F490
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	TextboxNoOverlap 0x1238
@@ -30,7 +30,7 @@ script_0800F478:
 script_0800F490:
 	TestBit 0x00000008
 	JumpIfNot script_0800F478
-	StopScript 
+	EndBlock 
 	_0807EF80 0x000b
 	Wait 0x0018
 	SetEntityNonPlanarMovement 0x0100
diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc
index f3fe6d92..2e0a260f 100644
--- a/data/scripts/script_0800F4C4.inc
+++ b/data/scripts/script_0800F4C4.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_0800F4C4
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0002
 	_0807EF80 0x0001
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x000b
-	StopScript 
+	EndBlock 
 	Call sub_0807F348
 	WaitForSomething2 0x00000010
 	_0807EF80 0x0007
@@ -17,11 +17,11 @@ SCRIPT_START script_0800F4C4
 	_0807EF80 0x000a
 	_0807E5F8 0x00000200
 script_0800F50C:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIfNot script_0800F524
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	TextboxNoOverlap 0x1239
@@ -30,7 +30,7 @@ script_0800F50C:
 script_0800F524:
 	TestBit 0x00000010
 	JumpIfNot script_0800F50C
-	StopScript 
+	EndBlock 
 	_0807EF80 0x000b
 	Wait 0x0028
 	SetEntityNonPlanarMovement 0x0100
diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc
index e67e84b7..e0320f22 100644
--- a/data/scripts/script_0800F554.inc
+++ b/data/scripts/script_0800F554.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0800F554
-	StartScript 
+	BeginBlock 
 	Call sub_08061FE4
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800F564:
 	CheckEntityInteractType 
 	JumpIfNot script_0800F564
@@ -16,11 +16,11 @@ script_0800F564:
 	Jump script_0800F564
 	.short 0x0000
 script_0800F584:
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0001
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0800F592:
 	CheckEntityInteractType 
 	JumpIfNot script_0800F592
@@ -32,12 +32,12 @@ script_0800F592:
 	_0807EF80 0x0001
 	Jump script_0800F592
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000008
-	StopScript 
+	EndBlock 
 script_0800F5C8:
 	CheckEntityInteractType 
 	JumpIfNot script_0800F5C8
@@ -49,13 +49,13 @@ script_0800F5C8:
 	_0807E878 
 	Jump script_0800F5C8
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	_0807E9D4 
 	_0807EF80 0x000a
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800F604:
 	CheckEntityInteractType 
 	JumpIfNot script_0800F604
@@ -67,11 +67,11 @@ script_0800F604:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800F604
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EF80 0x0001
-	StopScript 
+	EndBlock 
 script_0800F636:
 	_0807E30C 
 	JumpIfNot script_0800F636
@@ -82,12 +82,12 @@ script_0800F636:
 	_0807E878 
 	Jump script_0800F636
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0800F662:
 	CheckEntityInteractType 
 	JumpIfNot script_0800F662
@@ -101,13 +101,13 @@ script_0800F662:
 	_0807EF80 0x0000
 	Jump script_0800F662
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	_0807E9D4 
 	_0807EF80 0x000a
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_0800F6A0:
 	CheckEntityInteractType 
 	JumpIfNot script_0800F6A0
@@ -127,12 +127,12 @@ script_0800F6C8:
 	CallWithArg sub_0807F3D8, 0x00000000
 	Jump script_0800F6A0
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0001
 	_0807E9D4 
 	_0807EF80 0x000a
 	Call sub_08062788
-	StopScript 
+	EndBlock 
 script_0800F6F4:
 	CheckLocalFlag 0x00cd
 	JumpIf script_0800F718
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index bcf3f800..3f530de8 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800F724
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_0800F72C:
 	CheckLocalFlag 0x00cd
 	JumpIfNot script_0800F72C
@@ -11,7 +11,7 @@ script_0800F72C:
 	JumpIf script_0800FA4C
 	_0807E864 
 	Call sub_0807DF28
-	SetEntityPositionRelative 0x014800c8
+	SetEntityPositionRelative 0x00c8, 0x0148
 	Call sub_0807F844
 	_0807E778 0x0002
 	DoFade6 
@@ -19,11 +19,11 @@ script_0800F72C:
 	StartPlayerScript script_0800FA54
 	_0807E5F8 0x00000002
 	_0807F0B4 0x0001
-	SetEntityPositionRelative 0x021800c8
+	SetEntityPositionRelative 0x00c8, 0x0218
 	Call sub_0807F5C0
 	Wait 0x0064
 	_0807F0B4 0x0002
-	SetEntityPositionRelative 0x036800c8
+	SetEntityPositionRelative 0x00c8, 0x0368
 	Call sub_0807F5C0
 	WaitForSomething2 0x00000001
 	WaitForSomething2 0x00000004
@@ -87,7 +87,7 @@ script_0800F72C:
 	TextboxNoOverlapFollowPos 0x1021, 0x000e
 	_0807EA94 
 	StartPlayerScript script_0800FAE4
-	SetEntityPositionRelative 0x025800f0
+	SetEntityPositionRelative 0x00f0, 0x0258
 	_0807F0B4 0x0001
 	CameraTargetEntity 
 	Wait 0x001e
diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc
index f81e8316..593a4b3e 100644
--- a/data/scripts/script_0800FA54.inc
+++ b/data/scripts/script_0800FA54.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0800FA54
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
-	SetEntityPositionRelative 0x039800d8
+	EndBlock 
+	SetEntityPositionRelative 0x00d8, 0x0398
 	_0807EB44 0x0006
 	_0807EF80 0x0000
 	_0807E5F8 0x00000001
diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc
index 70a38166..b93f0644 100644
--- a/data/scripts/script_0800FA78.inc
+++ b/data/scripts/script_0800FA78.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800FA78
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x00a0, 0x0278
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc
index ae3e58e0..2d2128af 100644
--- a/data/scripts/script_0800FA9C.inc
+++ b/data/scripts/script_0800FA9C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800FA9C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0078, 0x01c0
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc
index bfd30c11..f3571b1b 100644
--- a/data/scripts/script_0800FAC0.inc
+++ b/data/scripts/script_0800FAC0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800FAC0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0108, 0x01c8
 	_0807EB44 0x0002
 	_0807EF80 0x0000
diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc
index 6dc86894..ebab7689 100644
--- a/data/scripts/script_0800FAE4.inc
+++ b/data/scripts/script_0800FAE4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800FAE4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	Call sub_0807F584
 	JumpSwitch_4 script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
 script_0800FAFC:
diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc
index b741e922..fb92befb 100644
--- a/data/scripts/script_0800FB44.inc
+++ b/data/scripts/script_0800FB44.inc
@@ -1,24 +1,24 @@
 SCRIPT_START script_0800FB44
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EF80 0x000b
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_08066D04
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	Call sub_08066D14
 	JumpIf script_0800FB6C
 	MoveEntityToPlayer 
 script_0800FB6C:
 	_0807EF80 0x0007
-	SetEntityPositionRelative 0x039800b8
+	SetEntityPositionRelative 0x00b8, 0x0398
 	_0807EB44 0x0002
 	_0807EF80 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
 	SetEntityNonPlanarMovement 0x0200
 	_0807EDD4 0x00b8, 0x0318
-	SetEntityPositionRelative 0x026000a0
+	SetEntityPositionRelative 0x00a0, 0x0260
 	_0807EB44 0x0000
 	_0807EF80 0x0001
 	_0807E5F8 0x00000004
@@ -38,7 +38,7 @@ script_0800FBAE:
 	_0807EDD4 0x00a0, 0x0268
 	_0807EDD4 0x0070, 0x0268
 	_0807EDD4 0x0070, 0x0208
-	SetEntityPositionRelative 0x01a80078
+	SetEntityPositionRelative 0x0078, 0x01a8
 	_0807EB44 0x0000
 	_0807EF80 0x0001
 	_0807E5F8 0x00000004
@@ -55,7 +55,7 @@ script_0800FC06:
 	WaitForSomething2 0x00000002
 	SetEntityNonPlanarMovement 0x0200
 	_0807EDD4 0x00f8, 0x01a8
-	SetEntityPositionRelative 0x01c80118
+	SetEntityPositionRelative 0x0118, 0x01c8
 	_0807EB44 0x0002
 	_0807EF80 0x0001
 	_0807E5F8 0x00000004
@@ -72,7 +72,7 @@ script_0800FC52:
 	WaitForSomething2 0x00000002
 	SetEntityNonPlanarMovement 0x0200
 	_0807EDD4 0x0118, 0x0260
-	SetEntityPositionRelative 0x027000f8
+	SetEntityPositionRelative 0x00f8, 0x0270
 	_0807EB44 0x0000
 	_0807EF80 0x0001
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc
index fcbc78bd..dc10ff58 100644
--- a/data/scripts/script_0800FDA0.inc
+++ b/data/scripts/script_0800FDA0.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800FDA0
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0800FDB2:
 	CheckEntityInteractType 
 	JumpIfNot script_0800FDB2
@@ -15,27 +15,27 @@ script_0800FDB2:
 	_0807E878 
 	Jump script_0800FDB2
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	_0807E9D4 
 	SetEntityNonPlanarMovement 0x0040
-	StopScript 
+	EndBlock 
 script_0800FDE2:
 	Call sub_08069A60
 script_0800FDE8:
 	Call sub_0806991C
 script_0800FDEE:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08069ACC
 	JumpIf script_0800FE06
 	_0807EE30 
 	JumpIfNot script_0800FDEE
 	Jump script_0800FDE2
 script_0800FE06:
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0002
 	_0807EF80 0x0000
 	Wait 0x001e
@@ -51,27 +51,27 @@ script_0800FE06:
 	Call sub_08069A3C
 	Jump script_0800FDE8
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	_0807E9D4 
 	SetEntityNonPlanarMovement 0x0040
-	StopScript 
+	EndBlock 
 script_0800FE5A:
 	Call sub_08069AA8
 script_0800FE60:
 	Call sub_080699AC
 script_0800FE66:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08069ACC
 	JumpIf script_0800FE7E
 	_0807EE30 
 	JumpIfNot script_0800FE66
 	Jump script_0800FE5A
 script_0800FE7E:
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0002
 	_0807EF80 0x0000
 	Wait 0x001e
@@ -87,21 +87,21 @@ script_0800FE7E:
 	Call sub_08069A84
 	Jump script_0800FE60
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	CheckInventory1 0x0012
 	JumpIf script_0800FF0E
 	_0807EB44 0x0006
 	_0807E9D4 
 	CallWithArg sub_0807F3D8, 0x00000008
-	StopScript 
+	EndBlock 
 script_0800FED8:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807EF80 0x000b
 	Call sub_080642B8
 	CheckEntityInteractType 
 	JumpIfNot script_0800FED8
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0807F3D8, 0x00000008
diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc
index 2f212a83..d659f684 100644
--- a/data/scripts/script_0800FF18.inc
+++ b/data/scripts/script_0800FF18.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0800FF18
-	StartScript 
+	BeginBlock 
 	CheckInventory1 0x0012
 	JumpIf script_0800FF6A
 	_0807EB44 0x0006
 	_0807E9D4 
 	CallWithArg sub_0807F3D8, 0x00000008
-	StopScript 
+	EndBlock 
 script_0800FF34:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807EF80 0x000b
 	Call sub_08064198
 	CheckEntityInteractType 
 	JumpIfNot script_0800FF34
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0807F3D8, 0x00000008
diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc
index 58b01a6e..18283eb4 100644
--- a/data/scripts/script_0800FF74.inc
+++ b/data/scripts/script_0800FF74.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_0800FF74
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	_0807E9D4 
 	CallWithArg sub_0807F3D8, 0x00000008
 	Call sub_080644A4
 	ClearLocalFlag 0x00c7
-	StopScript 
+	EndBlock 
 script_0800FF92:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807EF80 0x000a
 	CheckLocalFlag 0x00ce
 	JumpIf script_0800FFCC
@@ -24,7 +24,7 @@ script_0800FF92:
 script_0800FFCC:
 	CheckEntityInteractType 
 	JumpIfNot script_0800FF92
-	StopScript 
+	EndBlock 
 	SetLocalFlag 0x00c7
 	_0807E864 
 	_0807EB74 
@@ -45,7 +45,7 @@ script_0801000A:
 	_0807EA94 
 	Jump script_08010060
 script_08010014:
-	StopScript 
+	EndBlock 
 	_0807E888 
 	Call sub_0807F594
 	_0807E864 
@@ -67,12 +67,12 @@ script_08010060:
 	_0807E878 
 	Jump script_0800FF92
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	CallWithArg sub_080672B0, 0x00000000
-	StopScript 
+	EndBlock 
 script_08010090:
 	CheckEntityInteractType 
 	JumpIfNot script_08010090
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index 809f6ca7..9c1b8c94 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080100C8
-	StartScript 
+	BeginBlock 
 	Call sub_08061FE4
 	Call sub_08061E70
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080100DC:
 	CheckEntityInteractType 
 	JumpIfNot script_080100DC
@@ -15,22 +15,22 @@ script_080100DC:
 	_0807E878 
 	Jump script_080100DC
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08061FE4
 	Call sub_08061E70
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08010110:
 	Wait 0x003c
 	Call sub_08061E90
 	Jump script_08010110
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08010132:
 	CheckEntityInteractType 
 	JumpIfNot script_08010132
@@ -40,11 +40,11 @@ script_08010132:
 	_0807EA94 
 	_0807E878 
 	Jump script_08010132
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0001
 	Call sub_0806C354
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801015A:
 	CheckEntityInteractType 
 	JumpIfNot script_0801015A
@@ -70,10 +70,10 @@ script_0801019E:
 script_080101A6:
 	_0807E878 
 	Jump script_0801015A
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	Call sub_080A1648
-	StopScript 
+	EndBlock 
 	Call sub_080A1270
 	_0807E864 
 	Call sub_0807DF28
@@ -90,11 +90,11 @@ script_080101A6:
 	Call sub_0807F168
 	Call sub_080A1388
 	Call sub_0806EC38
-	StartScript 
+	BeginBlock 
 	MoveEntityToPlayer 
 	Call sub_0807F844
 	CameraTargetPlayer 
-	StopScript 
+	EndBlock 
 	_0807E778 0x0004
 	DoFade4 
 	WaitFor_2 
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index a2666a68..4f8f03de 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08010264
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0006
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_0801027A:
 	CheckEntityInteractType 
 	JumpIfNot script_0801027A
@@ -16,11 +16,11 @@ script_0801027A:
 	_0807E878 
 	Jump script_0801027A
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	Call sub_08062A48
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080102A6:
 	CheckEntityInteractType 
 	JumpIfNot script_080102A6
@@ -41,11 +41,11 @@ script_080102CC:
 	_0807E878 
 	Jump script_080102A6
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	Call sub_08062A48
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080102F2:
 	CheckEntityInteractType 
 	JumpIfNot script_080102F2
@@ -56,11 +56,11 @@ script_080102F2:
 	_0807E878 
 	Jump script_080102F2
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08010314:
-	StopScript 
+	EndBlock 
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000009
@@ -92,40 +92,40 @@ script_08010386:
 script_08010390:
 	_0807EE04 0x03c8, 0x00b8
 script_08010396:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_080626C0
 	JumpIf script_08010314
 	_0807EE30 
 	JumpIfNot script_08010396
 	Jump script_08010314
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0000
 	Call sub_08062A48
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080103C2:
 	Wait 0x001e
 	Call sub_08062948
 	Jump script_080103C2
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000004
-	StopScript 
+	EndBlock 
 script_080103E8:
 	Wait 0x003c
 	Call sub_0806407C
 	Jump script_080103E8
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08010410:
 	CheckEntityInteractType 
 	JumpIfNot script_08010410
@@ -135,25 +135,25 @@ script_08010410:
 	_0807EA94 
 	_0807E878 
 	Jump script_08010410
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	_0807E914 0x08064689
 	Call sub_08064644
-	StopScript 
+	EndBlock 
 script_08010446:
 	Wait 0x003c
 	Call sub_080646A4
 	Jump script_08010446
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	Call sub_080636F4
 	_0807EF80 0x000a
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_08010470:
 	CheckEntityInteractType 
 	JumpIfNot script_08010470
@@ -166,13 +166,13 @@ script_08010470:
 	_0807E878 
 	CallWithArg sub_0807F3D8, 0x00000000
 	Jump script_08010470
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	Call sub_08063CAC
 	_0807EF80 0x000a
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_080104BC:
 	CheckEntityInteractType 
 	JumpIfNot script_080104BC
@@ -185,12 +185,12 @@ script_080104BC:
 	_0807E878 
 	CallWithArg sub_0807F3D8, 0x00000000
 	Jump script_080104BC
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	_0807EF80 0x000a
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_08010502:
 	CheckEntityInteractType 
 	JumpIfNot script_08010502
@@ -257,12 +257,12 @@ script_080105E0:
 	_0807E878 
 	Jump script_08010502
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08010602:
 	CheckEntityInteractType 
 	JumpIfNot script_08010602
@@ -273,12 +273,12 @@ script_08010602:
 	_0807E878 
 	_0807EB44 0x0004
 	Jump script_08010602
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0008
 script_08010622:
 	Call sub_08062A48
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801062E:
 	CheckEntityInteractType 
 	JumpIfNot script_0801062E
@@ -287,28 +287,28 @@ script_0801062E:
 	_0807EA94 
 	_0807E878 
 	Jump script_0801062E
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0009
 	Jump script_08010622
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E930 0x000b
 	Jump script_08010622
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E930 0x000c
 	Jump script_08010622
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E930 0x000d
 	Jump script_08010622
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08010686:
 	CheckEntityInteractType 
 	JumpIfNot script_08010686
@@ -322,12 +322,12 @@ script_08010686:
 	_0807EB44 0x0004
 	Jump script_08010686
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_080106BE:
 	CheckEntityInteractType 
 	JumpIfNot script_080106BE
@@ -365,21 +365,21 @@ script_08010726:
 	_0807EF80 0x0001
 	Jump script_080106BE
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_08010746:
 	CheckEntityInteractType 
 	JumpIfNot script_08010746
 	_0807E864 
 	_0807E930 0x0004
-	StartScript 
+	BeginBlock 
 	Call sub_08062D18
 	JumpIfNot script_08010786
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_08010786
@@ -392,18 +392,18 @@ script_08010778:
 	Call sub_08062E14
 	TextboxNoOverlap 0x4007
 script_08010786:
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	_0807E878 
 	_0807E930 0x0008
 	Jump script_08010746
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_080107AA:
 	CheckEntityInteractType 
 	JumpIfNot script_080107AA
@@ -416,7 +416,7 @@ script_080107AA:
 	_0807EF80 0x0000
 	Jump script_080107AA
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
@@ -424,23 +424,23 @@ script_080107AA:
 	_0807E9D4 
 	Call sub_0807F348
 	Call sub_08069684
-	StopScript 
+	EndBlock 
 script_080107F2:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckPlayerInRegion2 0x3030
 	JumpIfNot script_080107F2
 	Call sub_080696B0
 script_08010804:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckPlayerInRegion2 0x3030
 	JumpIfNot script_080107F2
 	HasRoomItemForSale 
 	JumpIf script_08010860
 	CheckEntityInteractType 
 	JumpIfNot script_08010804
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	_0807EB74 
@@ -461,7 +461,7 @@ script_08010858:
 	TextboxNoOverlap 0x2c1a
 	Jump script_080108BA
 script_08010860:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF38
 	_0807EB74 
@@ -511,11 +511,11 @@ script_08010900:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_080108D0
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	CheckKinstoneFused 0x001b
 	JumpIf script_0800EF92
-	StopScript 
+	EndBlock 
 script_0801091C:
 	Call sub_080869A4
 	JumpIfNot script_0801091C
diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc
index d8a83f03..21fad75c 100644
--- a/data/scripts/script_08010964.inc
+++ b/data/scripts/script_08010964.inc
@@ -16,13 +16,13 @@ script_08010994:
 	_0807E878 
 	Jump script_08010964
 script_080109A0:
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 	CheckLocalFlag 0x00d1
 	JumpIf script_080109EA
 	CheckPlayerInRegion2 0x0808
 	JumpIfNot script_080109A0
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc
index 9bbf1e4f..3c55ca52 100644
--- a/data/scripts/script_080109F0.inc
+++ b/data/scripts/script_080109F0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080109F0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807ECC4 0x0010
 	_0807EB44 0x0004
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc
index 9d650196..020139cf 100644
--- a/data/scripts/script_08010A14.inc
+++ b/data/scripts/script_08010A14.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08010A14
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EC64 0x0010
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc
index 0089c3fa..5e924e89 100644
--- a/data/scripts/script_08010A38.inc
+++ b/data/scripts/script_08010A38.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08010A38
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EC94 0x0010
 	_0807EB44 0x0002
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc
index 22e1090b..22b8abef 100644
--- a/data/scripts/script_08010A5C.inc
+++ b/data/scripts/script_08010A5C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08010A5C
-	StartScript 
+	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
 	ModHealth 0x00a0
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	_0807E778 0x0004
 	DoFade4 
diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc
index 12cf866c..b9ba3821 100644
--- a/data/scripts/script_08010A98.inc
+++ b/data/scripts/script_08010A98.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08010A98
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	CallWithArg sub_080672B0, 0x00000000
 	_0807EF80 0x000a
 	Call sub_08067314
-	StopScript 
+	EndBlock 
 script_08010AB4:
 	CheckEntityInteractType 
 	JumpIfNot script_08010AB4
@@ -17,7 +17,7 @@ script_08010AB4:
 	_0807EB44 0x0004
 	CallWithArg sub_080672B0, 0x00000000
 	Jump script_08010AB4
-	StartScript 
+	BeginBlock 
 	CheckInventory1 0x0067
 	JumpIfNot script_08010B62
 	_0807EB44 0x0004
@@ -25,18 +25,18 @@ script_08010AB4:
 	SetEntityNonPlanarMovement 0x0180
 	CallWithArg_2 sub_0807F348
 	Call sub_0806075C
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	Call sub_080606C0
 script_08010B10:
-	StopScript 
+	EndBlock 
 	Call sub_0806076C
 	_0807EF80 0x0007
 script_08010B1C:
 	Call sub_08060700
 script_08010B22:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807E564 
 	JumpIf script_08010B3A
 	CallWithArg sub_080608E4, 0x00000000
@@ -46,14 +46,14 @@ script_08010B3A:
 	JumpIfNot script_08010B22
 	Jump script_08010B10
 script_08010B44:
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0000
 script_08010B4A:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CallWithArg sub_080608E4, 0x00000001
 	JumpIf script_08010B4A
-	StopScript 
+	EndBlock 
 	Jump script_08010B1C
 script_08010B62:
 	_0807EF80 0x0006
diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc
index 119ca37c..450e733f 100644
--- a/data/scripts/script_08010B68.inc
+++ b/data/scripts/script_08010B68.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08010B68
-	StartScript 
+	BeginBlock 
 	_0807E564 
 	JumpIfNot script_08010BAC
 	Call sub_0807F924
@@ -7,15 +7,15 @@ SCRIPT_START script_08010B68
 	_0807EF80 0x0000
 	_0807EF80 0x0007
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08010B88:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807E564 
 	JumpIfNot script_08010BAC
 	CheckEntityInteractType 
 	JumpIfNot script_08010B88
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	Call sub_0806E2DC
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index fdf4640c..c6b72220 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08010BB4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0008
 	Call sub_0806E440
-	StopScript 
+	EndBlock 
 script_08010BCA:
 	CheckEntityInteractType 
 	JumpIfNot script_08010BCA
@@ -50,7 +50,7 @@ script_08010BCA:
 	WaitForSomething2 0x00000008
 	StartPlayerScript script_08011098
 	WaitForSomething2 0x00000400
-	SetEntityPositionRelative 0x005001f8
+	SetEntityPositionRelative 0x01f8, 0x0050
 	_0807F0B4 0x0007
 	CameraTargetEntity 
 	Wait 0x000a
@@ -59,7 +59,7 @@ script_08010BCA:
 	DoFade4 
 	_0807E5F8 0x0002a800
 	WaitForSomething2 0x00055000
-	SetEntityPositionRelative 0x007801f8
+	SetEntityPositionRelative 0x01f8, 0x0078
 	Wait 0x003c
 	_0807E5F8 0x00800000
 	WaitForSomething2 0x01000000
@@ -83,13 +83,13 @@ script_08010BCA:
 	WaitForSomething2 0x00000008
 	TextboxNoOverlapFollowPos 0x103a, 0x000c
 	_0807EA94 
-	SetEntityPositionRelative 0x01c001f8
+	SetEntityPositionRelative 0x01f8, 0x01c0
 	_0807F0B4 0x0004
 	Wait 0x0078
 	_0807E5F8 0x00280000
 	WaitForSomething2 0x00500000
 	_0807E5F8 0x00000100
-	SetEntityPositionRelative 0x022001f8
+	SetEntityPositionRelative 0x01f8, 0x0220
 	SetEntityNonPlanarMovement 0x0100
 	_0807EDD4 0x01f8, 0x0098
 	Wait 0x003c
@@ -117,7 +117,7 @@ script_08010BCA:
 	WaitForSomething2 0x00050000
 	TextboxNoOverlapFollowPos 0x1044, 0x0000
 	_0807EA94 
-	SetEntityPositionRelative 0x009801f8
+	SetEntityPositionRelative 0x01f8, 0x0098
 	SoundReq0x80100000 
 	Wait 0x003c
 	SoundReq2 0x002f
diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc
index ced5503b..8785e391 100644
--- a/data/scripts/script_08010E5A.inc
+++ b/data/scripts/script_08010E5A.inc
@@ -31,7 +31,7 @@ SCRIPT_START script_08010E5A
 	CallWithArg sub_0807F244, 0x0000000d
 	CallWithArg sub_0807F29C, 0x080049f6
 	_0807F0B4 0x0001
-	SetEntityPositionRelative 0x006801f8
+	SetEntityPositionRelative 0x01f8, 0x0068
 	_0807E5F8 0x00000004
 	Wait 0x001e
 	_0807E5F8 0x00000040
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index 59a442f0..39454d09 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -34,7 +34,7 @@ SCRIPT_START script_08010F84
 	WaitForSomething2 0x00000200
 	TextboxNoOverlapFollowPos 0x1049, 0x0000
 	_0807EA94 
-	SetEntityPositionRelative 0x009801f8
+	SetEntityPositionRelative 0x01f8, 0x0098
 	Wait 0x0078
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc
index 65a2a6f0..9b71ddce 100644
--- a/data/scripts/script_08011074.inc
+++ b/data/scripts/script_08011074.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08011074
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x01e8, 0x0050
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc
index 2a7af781..99edfb68 100644
--- a/data/scripts/script_08011098.inc
+++ b/data/scripts/script_08011098.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08011098
-	SetEntityPositionRelative 0x005801a8
+	SetEntityPositionRelative 0x01a8, 0x0058
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807E5F8 0x00000400
 	_0807E610 0x00000002
-	StopScript 
+	EndBlock 
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc
index 1c93b869..631f5ca5 100644
--- a/data/scripts/script_080110BC.inc
+++ b/data/scripts/script_080110BC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080110BC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0040
-	StopScript 
+	EndBlock 
 	SetEntityNonPlanarMovement 0x0200
 	_0807EF80 0x0001
 	_0807EDD4 0x01d8, 0x0068
diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc
index 16dc59f0..a8e836b4 100644
--- a/data/scripts/script_080110E8.inc
+++ b/data/scripts/script_080110E8.inc
@@ -6,10 +6,10 @@ SCRIPT_START script_080110E8
 	Call sub_0807F36C
 	SetEntityNonPlanarMovement 0x0400
 	_0807ECF4 0x0008
-	StartScript 
+	BeginBlock 
 	Call sub_0807F1E8
 	_0807EF80 0x0011
-	StopScript 
+	EndBlock 
 	Call sub_0807F2D4
 	WaitForSomething 0x80000000
 	Call sub_080791BC
diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc
index 5427f0d9..a643786f 100644
--- a/data/scripts/script_08011128.inc
+++ b/data/scripts/script_08011128.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_08011128
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08011134:
 	CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
 	JumpIfNot script_08011134
 	LoadRoomEntityList gUnk_080F06B0
 	_0807EF80 0x000b
 	WaitForSomething2 0x00000004
-	SetEntityPositionRelative 0x005801b8
+	SetEntityPositionRelative 0x01b8, 0x0058
 	_0807EB44 0x0004
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc
index 1abef76f..50541810 100644
--- a/data/scripts/script_080111CC.inc
+++ b/data/scripts/script_080111CC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080111CC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0100
 	Call sub_08066D04
-	StopScript 
+	EndBlock 
 	Call sub_0807F338
 	WaitForSomething2 0x00000010
 	Call sub_08066D14
@@ -12,7 +12,7 @@ SCRIPT_START script_080111CC
 script_080111F6:
 	Call sub_0807F8BC
 	JumpIf script_08011206
-	SetEntityPositionRelative 0x00b801f8
+	SetEntityPositionRelative 0x01f8, 0x00b8
 script_08011206:
 	_0807EF80 0x0007
 	_0807EF80 0x0001
diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc
index fe2bc3f8..2e729ab4 100644
--- a/data/scripts/script_080112C4.inc
+++ b/data/scripts/script_080112C4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080112C4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	SetEntityNonPlanarMovement 0x0100
 	Call sub_08095244
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x0002a800
 	_0807EF80 0x0007
 	_0807E930 0x0006
diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc
index 17db073e..d28dc323 100644
--- a/data/scripts/script_080115D0.inc
+++ b/data/scripts/script_080115D0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080115D0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0002
 	_0807E930 0x0001
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00080000
 	_0807E930 0x0005
 	SoundReq 0x011c
diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc
index 7c1f94fe..ce79cf08 100644
--- a/data/scripts/script_08011608.inc
+++ b/data/scripts/script_08011608.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08011608
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0006
 	_0807E930 0x0003
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00200000
 	_0807E930 0x0007
 	SoundReq 0x011c
diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc
index 6a94cb85..504dd3c9 100644
--- a/data/scripts/script_08011640.inc
+++ b/data/scripts/script_08011640.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08011640
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EB44 0x0004
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	Call sub_0807F338
 	WaitForSomething2 0x00000040
 	_0807EF80 0x0007
diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc
index 034deb1b..dbfb12e9 100644
--- a/data/scripts/script_080116A8.inc
+++ b/data/scripts/script_080116A8.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080116A8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	Call sub_0807F338
 	WaitForSomething2 0x00000100
 	_0807EF80 0x0001
diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc
index a3ddcd66..4c95cf75 100644
--- a/data/scripts/script_0801183C.inc
+++ b/data/scripts/script_0801183C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0801183C
-	StartScript 
+	BeginBlock 
 	Call sub_08095330
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00800000
 	_0807EF3C 0x0000, 0x0020
 	_0807E5F8 0x01000000
diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc
index aa846e13..626b893c 100644
--- a/data/scripts/script_08011890.inc
+++ b/data/scripts/script_08011890.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08011890
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0000
 	SetEntityNonPlanarMovement 0x0200
 	Call nullsub_527
 	Call sub_08094B80
-	StopScript 
+	EndBlock 
 	Wait 0x00f0
 	Call sub_08094B6C
 	_0807EDD4 0x01f8, 0x0088
diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc
index 6c05e051..f4d24323 100644
--- a/data/scripts/script_080118D4.inc
+++ b/data/scripts/script_080118D4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080118D4
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0000
 	SetEntityNonPlanarMovement 0x0200
 	Call nullsub_527
 	Call sub_08094B80
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x08000000
 	Call sub_08094B6C
 	_0807EDD4 0x01d8, 0x0078
diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc
index d452f8c9..adfa48c9 100644
--- a/data/scripts/script_0801194C.inc
+++ b/data/scripts/script_0801194C.inc
@@ -1,19 +1,19 @@
 SCRIPT_START script_0801194C
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	Jump script_0801196A
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	Jump script_0801196A
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 script_0801196A:
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_0801197C:
 	CheckEntityInteractType 
 	JumpIfNot script_0801197C
@@ -31,32 +31,32 @@ script_080119A4:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0801197C
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x0000000c
-	StopScript 
+	EndBlock 
 script_080119C8:
 	Wait 0x003c
 	Call sub_0806407C
 	Jump script_080119C8
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	Jump script_080119F6
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	Jump script_080119F6
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 script_080119F6:
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08011A08:
 	CheckEntityInteractType 
 	JumpIfNot script_08011A08
@@ -68,12 +68,12 @@ script_08011A08:
 	_0807E878 
 	Jump script_08011A08
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08011A44:
 	CheckEntityInteractType 
 	JumpIfNot script_08011A44
@@ -84,12 +84,12 @@ script_08011A44:
 	_0807EA94 
 	_0807E878 
 	Jump script_08011A44
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08011A7C:
 	CheckEntityInteractType 
 	JumpIfNot script_08011A7C
@@ -103,12 +103,12 @@ script_08011A7C:
 	_0807E878 
 	Jump script_08011A7C
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08011AC4:
 	CheckEntityInteractType 
 	JumpIfNot script_08011AC4
diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc
index bc4f4c26..785af9f9 100644
--- a/data/scripts/script_08011B40.inc
+++ b/data/scripts/script_08011B40.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08011B40
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	CheckGlobalFlag 0x0050
 	JumpIfNot script_08011B84
 	WaitForSomething2 0x00000004
@@ -48,9 +48,9 @@ script_08011BBC:
 	Wait 0x003c
 	Call sub_0806C224
 	Jump script_08011B9A
-	StartScript 
+	BeginBlock 
 	_0807E888 
-	StopScript 
+	EndBlock 
 	CallWithArg sub_0806C2A0, 0x00000001
 	WaitFor_2 
 	Wait 0x003c
diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc
index fb147eb5..3e32c45d 100644
--- a/data/scripts/script_08011C50.inc
+++ b/data/scripts/script_08011C50.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08011C50
-	StartScript 
+	BeginBlock 
 	_0807E864 
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0806C2A0, 0x00000001
 	WaitFor_2 
diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc
index 3c70f88d..41e79e5b 100644
--- a/data/scripts/script_08011C7C.inc
+++ b/data/scripts/script_08011C7C.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08011C7C
-	StartScript 
+	BeginBlock 
 	Call sub_08064828
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
 	CheckGlobalFlag 0x0047
 	JumpIf script_08011CC2
-	StopScript 
+	EndBlock 
 script_08011C9A:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIfNot script_08011C9A
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -23,15 +23,15 @@ script_08011C9A:
 	_0807EF80 0x0001
 	Jump script_08011C9A
 script_08011CC2:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x002c
 	JumpIf script_08011C9A
 	CheckGlobalFlag 0x002d
 	JumpIf script_08011C9A
 	CheckEntityInteractType 
 	JumpIfNot script_08011CC2
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -58,20 +58,20 @@ script_08011D0E:
 	_0807EF80 0x0001
 	Jump script_08011D00
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08064928
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
 	CheckGlobalFlag 0x0047
 	JumpIf script_08011D6E
-	StopScript 
+	EndBlock 
 script_08011D46:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIfNot script_08011D46
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -82,15 +82,15 @@ script_08011D46:
 	_0807EF80 0x0001
 	Jump script_08011D46
 script_08011D6E:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x002b
 	JumpIf script_08011D46
 	CheckGlobalFlag 0x002d
 	JumpIf script_08011D46
 	CheckEntityInteractType 
 	JumpIfNot script_08011D6E
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -117,20 +117,20 @@ script_08011DBA:
 	_0807EF80 0x0001
 	Jump script_08011DAC
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08064A28
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
 	CheckGlobalFlag 0x0047
 	JumpIf script_08011E1A
-	StopScript 
+	EndBlock 
 script_08011DF2:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIfNot script_08011DF2
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -141,15 +141,15 @@ script_08011DF2:
 	_0807EF80 0x0001
 	Jump script_08011DF2
 script_08011E1A:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x002b
 	JumpIf script_08011DF2
 	CheckGlobalFlag 0x002c
 	JumpIf script_08011DF2
 	CheckEntityInteractType 
 	JumpIfNot script_08011E1A
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -176,22 +176,22 @@ script_08011E66:
 	_0807EF80 0x0001
 	Jump script_08011E58
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08064828
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08011E96:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x002f
 	JumpIf script_08011C9A
 	CheckGlobalFlag 0x0030
 	JumpIf script_08011C9A
 	CheckEntityInteractType 
 	JumpIfNot script_08011E96
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -224,22 +224,22 @@ script_08011EF4:
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_08011EE6
-	StartScript 
+	BeginBlock 
 	Call sub_08064928
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08011F22:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x002e
 	JumpIf script_08011D46
 	CheckGlobalFlag 0x0030
 	JumpIf script_08011D46
 	CheckEntityInteractType 
 	JumpIfNot script_08011F22
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -272,22 +272,22 @@ script_08011F80:
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_08011F72
-	StartScript 
+	BeginBlock 
 	Call sub_08064A28
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08011FAE:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x002e
 	JumpIf script_08011DF2
 	CheckGlobalFlag 0x002f
 	JumpIf script_08011DF2
 	CheckEntityInteractType 
 	JumpIfNot script_08011FAE
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	_0807EF80 0x0000
@@ -320,12 +320,12 @@ script_0801200C:
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_08011FFE
-	StartScript 
+	BeginBlock 
 	Call sub_08064828
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801203A:
 	CheckEntityInteractType 
 	JumpIfNot script_0801203A
@@ -366,12 +366,12 @@ script_0801209E:
 	_0807EF80 0x0001
 	Jump script_0801203A
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08064928
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080120C6:
 	CheckEntityInteractType 
 	JumpIfNot script_080120C6
@@ -412,12 +412,12 @@ script_0801212A:
 	_0807EF80 0x0001
 	Jump script_080120C6
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08064A28
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08012152:
 	CheckEntityInteractType 
 	JumpIfNot script_08012152
@@ -458,12 +458,12 @@ script_080121B6:
 	_0807EF80 0x0001
 	Jump script_08012152
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08064828
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080121DE:
 	CheckEntityInteractType 
 	JumpIfNot script_080121DE
@@ -476,12 +476,12 @@ script_080121DE:
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_080121DE
-	StartScript 
+	BeginBlock 
 	Call sub_08064928
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08012216:
 	CheckEntityInteractType 
 	JumpIfNot script_08012216
@@ -494,12 +494,12 @@ script_08012216:
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_08012216
-	StartScript 
+	BeginBlock 
 	Call sub_08064A28
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801224E:
 	CheckEntityInteractType 
 	JumpIfNot script_0801224E
@@ -512,15 +512,15 @@ script_0801224E:
 	_0807EB44 0x0004
 	_0807EF80 0x0001
 	Jump script_0801224E
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	Call sub_08061FD8
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08012284:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x001e
 	JumpIfNot script_08012298
 	CheckInventory1 0x0015
@@ -528,7 +528,7 @@ script_08012284:
 script_08012298:
 	CheckEntityInteractType 
 	JumpIfNot script_08012284
-	StopScript 
+	EndBlock 
 	_0807EB74 
 	_0807E864 
 	Call sub_08061FD8
@@ -538,8 +538,8 @@ script_08012298:
 	SetGlobalFlag 0x001e
 	Jump script_08012284
 script_080122BA:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckRoomFlag 0x0000
 	JumpIfNot script_080122CE
 	CheckRoomFlag 0x0001
@@ -547,7 +547,7 @@ script_080122BA:
 script_080122CE:
 	CheckEntityInteractType 
 	JumpIfNot script_080122BA
-	StopScript 
+	EndBlock 
 	_0807EB74 
 	_0807E864 
 	Call sub_08061FD8
@@ -556,7 +556,7 @@ script_080122CE:
 	_0807E878 
 	Jump script_080122BA
 script_080122EC:
-	StopScript 
+	EndBlock 
 	_0807EB74 
 	_0807E864 
 	Call sub_08061FD8
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc
index c434f93b..db355ae8 100644
--- a/data/scripts/script_0801232C.inc
+++ b/data/scripts/script_0801232C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_0801232C
-	StartScript 
+	BeginBlock 
 	_0807EB74 
 	_0807E9D4 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08012338:
 	CheckEntityInteractType 
 	JumpIfNot script_08012338
@@ -19,21 +19,21 @@ script_08012338:
 script_0801235A:
 	_0807E878 
 	Jump script_08012338
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_08012368:
 	CheckLocalFlag 0x0004
 	JumpIfNot script_08012368
 	Call sub_0807DF28
 	_0807E864 
 	SoundReq0x80100000 
-	StartScript 
+	BeginBlock 
 	_0807E778 0x0004
 	_0807E788 0x00007fff
 	DoFade5 
 	_0807E858 0x0080
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	SoundReq2 0x002c
 	_0807EB28 0x1401
@@ -52,12 +52,12 @@ script_08012368:
 	SoundReq0x80100000 
 	SetEntity0x20 0x00010000
 	Wait 0x003c
-	StartScript 
+	BeginBlock 
 	_0807E778 0x0004
 	_0807E788 0xffffffff
 	DoFade4 
 	_0807E858 0x0080
-	StopScript 
+	EndBlock 
 	WaitFor_2 
 	SoundReq2 0xffff
 	_0807EB28 0x1403
diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc
index ce244ad3..867eacda 100644
--- a/data/scripts/script_08012410.inc
+++ b/data/scripts/script_08012410.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012410
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0004
 	Wait 0x003c
 	_0807E5F8 0x00000001
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index fc868d72..eb4dfa12 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08012430
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_08012440:
 	CheckEntityInteractType 
 	JumpIfNot script_08012440
@@ -24,9 +24,9 @@ script_08012474:
 	_0807E930 0x0000
 	Jump script_08012440
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_08054564
-	StopScript 
+	EndBlock 
 script_0801248A:
 	CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
 	JumpIfNot script_0801248A
@@ -45,7 +45,7 @@ script_0801248A:
 	Call sub_080791BC
 	LoadRoomEntityList gUnk_080F4D70
 	Call DeleteAllEnemies
-	SetEntityPositionRelative 0x01680388
+	SetEntityPositionRelative 0x0388, 0x0168
 	Call sub_0807F844
 	_0807E778 0x0004
 	_0807E800 0x00000000
@@ -85,7 +85,7 @@ script_08012566:
 	SoundReq0x80100000 
 	StartPlayerScript script_08012AC8
 	WaitForSomething2 0x00000001
-	SetEntityPositionRelative 0x01680388
+	SetEntityPositionRelative 0x0388, 0x0168
 	_0807F0B4 0x0001
 	CameraTargetEntity 
 	Wait 0x005a
diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc
index 58b2de20..775b6340 100644
--- a/data/scripts/script_080126FC.inc
+++ b/data/scripts/script_080126FC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080126FC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0040
 	_0807EF80 0x0007
-	StopScript 
+	EndBlock 
 	_0807E930 0x0020
 	WaitForSomething2 0x00000004
 	_0807E930 0x0022
@@ -54,13 +54,13 @@ SCRIPT_START script_080126FC
 	_0807E9D4 
 	_0807E5F8 0x00000008
 script_080127F2:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckRoomFlag 0x0000
 	JumpIf script_08012824
 	CheckEntityInteractType 
 	JumpIfNot script_080127F2
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0806D944
 	_0807E930 0x0010
@@ -74,7 +74,7 @@ script_08012824:
 	_0807E9DC 
 	CallWithArg sub_0807F5B0, 0x0000003c
 	Call sub_080791D0
-	StopScript 
+	EndBlock 
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807EF80 0x000b
@@ -119,8 +119,8 @@ script_08012824:
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 script_08012904:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0806D944
 	CheckEntityInteractType 
 	JumpIf script_08012920
@@ -130,14 +130,14 @@ script_08012904:
 script_08012920:
 	_0807E864 
 	_0807E930 0x0010
-	StopScript 
+	EndBlock 
 	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
 	Jump script_08012904
 script_0801293A:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
@@ -155,8 +155,8 @@ script_0801293A:
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 script_08012984:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0806D944
 	CheckEntityInteractType 
 	JumpIf script_080129A0
@@ -166,14 +166,14 @@ script_08012984:
 script_080129A0:
 	_0807E864 
 	_0807E930 0x0010
-	StopScript 
+	EndBlock 
 	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
 	Jump script_08012984
 script_080129BA:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
@@ -192,8 +192,8 @@ script_080129BA:
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 script_08012A08:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0806D944
 	CheckEntityInteractType 
 	JumpIf script_08012A24
@@ -203,14 +203,14 @@ script_08012A08:
 script_08012A24:
 	_0807E864 
 	_0807E930 0x0010
-	StopScript 
+	EndBlock 
 	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
 	Jump script_08012A08
 script_08012A3E:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
@@ -233,10 +233,10 @@ script_08012A74:
 	_0807EF80 0x0008
 	Wait 0x0078
 	SoundReq2 0x000e
-	StartScript 
+	BeginBlock 
 	_0807E8E4_2 
 	_0807EB28 0x1112
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	_0807E5F8 0x00000008
 	_0807EF80 0x0006
diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc
index 8cc59657..bb737cda 100644
--- a/data/scripts/script_08012AB0.inc
+++ b/data/scripts/script_08012AB0.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08012AB0
-	StopScript 
+	EndBlock 
 script_08012AB2:
 	_0807EB44 0x0002
 	Wait 0x000a
diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc
index b50a637d..cefbed66 100644
--- a/data/scripts/script_08012AC8.inc
+++ b/data/scripts/script_08012AC8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012AC8
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EB44 0x0000
 	_0807EF80 0x0000
 	_0807EF80 0x0004
diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc
index 0b5cb168..eb7e88ac 100644
--- a/data/scripts/script_08012AF0.inc
+++ b/data/scripts/script_08012AF0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012AF0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x0388, 0x0180
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc
index 0bdf249c..66f6d97c 100644
--- a/data/scripts/script_08012B24.inc
+++ b/data/scripts/script_08012B24.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08012B24
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0004
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807ECC4 0x0008
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc
index 32a9f788..1cc013d5 100644
--- a/data/scripts/script_08012B50.inc
+++ b/data/scripts/script_08012B50.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08012B50
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0000
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EC64 0x0008
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc
index df1d2ec1..a7ce8981 100644
--- a/data/scripts/script_08012B7C.inc
+++ b/data/scripts/script_08012B7C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08012B7C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
 	_0807EB44 0x0002
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EC94 0x0008
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc
index e87df7ea..3aed7170 100644
--- a/data/scripts/script_08012BA8.inc
+++ b/data/scripts/script_08012BA8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08012BA8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0002
 	_0807EF80 0x0007
 	_0807E930 0x0001
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000040
 	_0807E930 0x0005
 	Wait 0x001e
diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc
index 643c7cdf..775c193c 100644
--- a/data/scripts/script_08012BF8.inc
+++ b/data/scripts/script_08012BF8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08012BF8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	_0807EF80 0x0007
 	_0807E930 0x0003
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000010
 	_0807E930 0x0007
 	Wait 0x001e
diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc
index 5d7ab8c6..de175629 100644
--- a/data/scripts/script_08012C48.inc
+++ b/data/scripts/script_08012C48.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08012C48
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	SetEntityNonPlanarMovement 0x0280
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0388, 0x0168
 	_0807E5F8 0x00000100
 	_0807EF80 0x0006
diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc
index de28d340..9be0127d 100644
--- a/data/scripts/script_08012C68.inc
+++ b/data/scripts/script_08012C68.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08012C68
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x0008
 	_0807E914 0x00000000
 	Call sub_0806DA04
-	StopScript 
+	EndBlock 
 script_08012C7E:
 	CheckEntityInteractType 
 	JumpIfNot script_08012C7E
@@ -19,13 +19,13 @@ script_08012C98:
 	CheckGlobalFlag 0x0014
 	JumpIfNot script_08012C98
 script_08012CA0:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckPlayerInRegion 0x0398, 0x03b0, 0x2040
 	JumpIfNot script_08012CA0
 	_0807E564 
 	JumpIf script_08012CD2
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	_0807EB28 0x2202
diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc
index 8d27c8c6..754bf33d 100644
--- a/data/scripts/script_08012CD8.inc
+++ b/data/scripts/script_08012CD8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012CD8
 script_08012CD8:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807E564 
 	JumpIfNot script_08012CD8
 	CheckPlayerInRegion 0x0380, 0x03b0, 0x4040
@@ -10,7 +10,7 @@ script_08012CD8:
 	JumpIf script_08012CD8
 	_0807E864 
 	Call sub_0807DF28
-	StopScript 
+	EndBlock 
 	_0807EB28 0x2203
 	_0807EA94 
 	SetLocalFlag 0x003e
diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc
index d3bcc14c..e0d086e1 100644
--- a/data/scripts/script_08012D18.inc
+++ b/data/scripts/script_08012D18.inc
@@ -1,14 +1,14 @@
 SCRIPT_START script_08012D18
 script_08012D18:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x0014
 	JumpIfNot script_08012D18
 	CheckLocalFlagByOffset 0x0200, 0x008d
 	JumpIf script_08012D68
 	CheckPlayerInRegion 0x0000, 0x01a8, 0x2010
 	JumpIfNot script_08012D18
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc
index 11d4783c..d4247f15 100644
--- a/data/scripts/script_08012DB0.inc
+++ b/data/scripts/script_08012DB0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012DB0
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0088, 0x0068
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc
index 44f9936e..02f50996 100644
--- a/data/scripts/script_08012DD8.inc
+++ b/data/scripts/script_08012DD8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012DD8
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 	_0807E888 
 	Wait 0x0018
 	_0807E864 
diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc
index 801db2c3..9a36403b 100644
--- a/data/scripts/script_08012DF8.inc
+++ b/data/scripts/script_08012DF8.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08012DF8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
 	SetEntityNonPlanarMovement 0x0140
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x00b8, 0x0094
 	Wait 0x0008
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc
index 5c9488c8..3bae5d40 100644
--- a/data/scripts/script_08012E20.inc
+++ b/data/scripts/script_08012E20.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012E20
-	StartScript 
+	BeginBlock 
 	_0807E864 
-	StopScript 
+	EndBlock 
 	Wait 0x0078
 	_0807E908 0x0004
 	StartPlayerScript script_08012E44
diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc
index 1ccebdf6..3f2b72df 100644
--- a/data/scripts/script_08012E44.inc
+++ b/data/scripts/script_08012E44.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012E44
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0140
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	_0807EB44 0x0004
 	Wait 0x000f
diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc
index a6b10e48..f1168887 100644
--- a/data/scripts/script_08012E88.inc
+++ b/data/scripts/script_08012E88.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08012E88
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
 	Call sub_0806B60C
-	StopScript 
+	EndBlock 
 script_08012E9E:
 	CheckEntityInteractType 
 	JumpIfNot script_08012E9E
@@ -17,12 +17,12 @@ script_08012E9E:
 	_0807EF80 0x0000
 	Jump script_08012E9E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000008
 	_0807EF80 0x000a
 	Call sub_0806B60C
-	StopScript 
+	EndBlock 
 script_08012EDC:
 	CheckEntityInteractType 
 	JumpIfNot script_08012EDC
diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc
index 47b3a5cc..1b76edf7 100644
--- a/data/scripts/script_08012F0C.inc
+++ b/data/scripts/script_08012F0C.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08012F0C
-	StartScript 
+	BeginBlock 
 	CallWithArg sub_0806A93C, 0x12345678
 	_0807EB44 0x0004
 	_0807E930 0x0002
@@ -9,7 +9,7 @@ SCRIPT_START script_08012F0C
 	JumpIf script_08012FD2
 	CheckGlobalFlag 0x001e
 	JumpIf script_08012F86
-	StopScript 
+	EndBlock 
 	CheckLocalFlag 0x0062
 	JumpIfNot script_08012F48
 	Call sub_0806A9B0
diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc
index 4b4ddb49..f97acf88 100644
--- a/data/scripts/script_08012F86.inc
+++ b/data/scripts/script_08012F86.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012F86
 script_08012F86:
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x0060
 	JumpIf script_08012FD2
 	_0807E864 
@@ -8,7 +8,7 @@ script_08012F86:
 	StartPlayerScript script_080130E4
 	SetLocalFlag 0x0060
 	ClearLocalFlag 0x0061
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	_0807E908 0x0004
 	Call sub_0806A958
@@ -18,13 +18,13 @@ script_08012F86:
 	SetLocalFlag 0x0062
 	Jump script_08012FFA
 script_08012FD2:
-	StartScript 
+	BeginBlock 
 	_0807E930 0x000d
 	_0807E908 0x0005
 	SetLocalFlag 0x0062
 	CallWithArg sub_0807F93C, 0x0000f2f4
 	Call sub_0806AA10
-	StopScript 
+	EndBlock 
 	CheckInventory1 0x0038
 	JumpIf script_08013006
 script_08012FFA:
@@ -34,10 +34,10 @@ script_08012FFA:
 	Jump script_08012FFA
 script_08013006:
 	_0807E944 
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	StopScript 
+	EndBlock 
 	SoundReq 0x00cd
 	_0807F088 0x0038
 	WaitPlayerAction8 
@@ -88,7 +88,7 @@ script_080130B6:
 	JumpIfNot script_080130C4
 	Call sub_0806A9B0
 script_080130C4:
-	StopScript 
+	EndBlock 
 script_080130C6:
 	Call sub_0806A96C
 	JumpIfNot script_080130C6
diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc
index 434cfb38..fed8e431 100644
--- a/data/scripts/script_080130E4.inc
+++ b/data/scripts/script_080130E4.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080130E4
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0006
 	SetEntityNonPlanarMovement 0x0140
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x00a8, 0x0060
 	Wait 0x0008
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc
index 1b916d14..dd53dbc3 100644
--- a/data/scripts/script_08013114.inc
+++ b/data/scripts/script_08013114.inc
@@ -1,20 +1,20 @@
 SCRIPT_START script_08013114
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x000a
 	_0807EF80 0x0012
 	Call sub_0807F348
-	StopScript 
+	EndBlock 
 script_08013128:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_0801313C
 	Call sub_0806AEE4
 	Jump script_08013128
 script_0801313C:
 	_0807E864 
-	StopScript 
+	EndBlock 
 	_0807EB74 
 	Call sub_0806AED8
 	CallWithArg sub_0806AA50, 0x00000000
@@ -31,9 +31,9 @@ script_08013176:
 	Call sub_0807F420
 	_0807E878 
 	Jump script_08013128
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x0062
 	JumpIfNot script_0801319A
 	_0807EF80 0x0006
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index 6e61a26f..b3e2a28c 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0801319A
 script_0801319A:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CameraTargetEntity 
 	MoveEntityToPlayer 
 	Call sub_0806AB74
diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc
index 8d723657..d76346d9 100644
--- a/data/scripts/script_080132E4.inc
+++ b/data/scripts/script_080132E4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080132E4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x0098, 0x0058
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc
index 6d58d535..e9c28cf6 100644
--- a/data/scripts/script_0801330C.inc
+++ b/data/scripts/script_0801330C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0801330C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EC64 0x0020
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08013330.inc b/data/scripts/script_08013330.inc
index 74b1c20f..082f3afb 100644
--- a/data/scripts/script_08013330.inc
+++ b/data/scripts/script_08013330.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013330
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0000
-	SetEntityPositionRelative 0x00700098
-	StopScript 
+	SetEntityPositionRelative 0x0098, 0x0070
+	EndBlock 
 	_0807E5F8 0x00000002
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc
index 5d92b476..c525ece7 100644
--- a/data/scripts/script_0801334C.inc
+++ b/data/scripts/script_0801334C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0801334C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x000d
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807ECC4 0x0020
 	_0807EF80 0x0000
diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc
index b4dad1da..b1c6656a 100644
--- a/data/scripts/script_080133C4.inc
+++ b/data/scripts/script_080133C4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080133C4
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	Call sub_08061F94
 	Wait 0x000a
diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc
index b863f4fa..ca760b2d 100644
--- a/data/scripts/script_080133F8.inc
+++ b/data/scripts/script_080133F8.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_080133F8
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0008
 	_0807EF80 0x000b
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000020
-	SetEntityPositionRelative 0x00480098
+	SetEntityPositionRelative 0x0098, 0x0048
 	Call sub_08066C94
 	Wait 0x00e9
 	_0807EF80 0x0007
diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc
index f8b3499b..043ebc9a 100644
--- a/data/scripts/script_08013494.inc
+++ b/data/scripts/script_08013494.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08013494
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0000
 	SetEntityNonPlanarMovement 0x0200
 	Call nullsub_527
 	Call sub_08094B80
-	StopScript 
+	EndBlock 
 	Wait 0x005a
 	Call sub_08094B6C
 	_0807EDD4 0x0098, 0x0080
-	StartScript 
+	BeginBlock 
 	Call sub_08094B80
 	SoundReq 0x01cc
 	Call sub_0807F36C
 	_0807E5F8 0x00000080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc
index 1a121f7a..38000013 100644
--- a/data/scripts/script_080134DC.inc
+++ b/data/scripts/script_080134DC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_080134DC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0807F92C
 	CallWithArg sub_0806DA04, 0x00000003
-	StopScript 
+	EndBlock 
 script_080134F8:
 	CheckEntityInteractType 
 	JumpIfNot script_080134F8
@@ -16,23 +16,23 @@ script_080134F8:
 	CallWithArg sub_08095A1C, 0x08013f04
 	SoundReq 0x01cd
 	Wait 0x005a
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01ce
 	CallWithArg sub_08095D54, 0x08013e04
 	CallWithArg sub_08095D54, 0x08013e28
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x18000000
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01cf
 	CallWithArg sub_08095D8C, 0x08014054
 	CallWithArg sub_08095D8C, 0x08014074
-	StopScript 
+	EndBlock 
 	Wait 0x001e
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01d0
 	CallWithArg sub_08095D8C, 0x080140dc
 	CallWithArg sub_08095D8C, 0x08014118
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc
index ee3a03ea..9661f4f6 100644
--- a/data/scripts/script_08013650.inc
+++ b/data/scripts/script_08013650.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_08013650
 	Call sub_0807F3F8
 	Wait 0x003c
 	_0807F0B4 0x0007
-	SetEntityPositionRelative 0x00a800e8
+	SetEntityPositionRelative 0x00e8, 0x00a8
 	CameraTargetEntity 
 	Wait 0x003c
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc
index 45522e05..b4063e78 100644
--- a/data/scripts/script_080136B4.inc
+++ b/data/scripts/script_080136B4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080136B4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x00e8, 0x00a8
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc
index a69e0b6e..33bbb792 100644
--- a/data/scripts/script_080136D8.inc
+++ b/data/scripts/script_080136D8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080136D8
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	Call sub_0807F584
 	JumpSwitch_4 script_080136F0, script_080136FA, script_08013704, script_080136FA
 script_080136F0:
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index cf3426f9..9de5c1f6 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08013720
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0807F92C
 	CallWithArg sub_0806DA04, 0x00000003
-	StopScript 
+	EndBlock 
 script_0801373C:
 	CheckEntityInteractType 
 	JumpIfNot script_0801373C
@@ -16,24 +16,24 @@ script_0801373C:
 	CallWithArg sub_08095A1C, 0x08013f34
 	SoundReq 0x01cd
 	Wait 0x005a
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01ce
 	CallWithArg sub_08095D54, 0x08013e4c
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x20000000
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01cf
 	CallWithArg sub_08095D8C, 0x08014054
 	CallWithArg sub_08095D8C, 0x08014074
 	CallWithArg sub_08095D8C, 0x08014094
-	StopScript 
+	EndBlock 
 	Wait 0x001e
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01d0
 	CallWithArg sub_08095D8C, 0x080140dc
 	CallWithArg sub_08095D8C, 0x08014118
 	CallWithArg sub_08095D8C, 0x08014154
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index 065e960e..f3521f49 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_080138B4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_0807F92C
 	CallWithArg sub_0806DA04, 0x00000003
-	StopScript 
+	EndBlock 
 script_080138D0:
 	CheckEntityInteractType 
 	JumpIfNot script_080138D0
@@ -16,26 +16,26 @@ script_080138D0:
 	CallWithArg sub_08095A1C, 0x08013f64
 	SoundReq 0x01cd
 	Wait 0x005a
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01ce
 	CallWithArg sub_08095D54, 0x08013e70
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x40000000
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01cf
 	CallWithArg sub_08095D8C, 0x08014054
 	CallWithArg sub_08095D8C, 0x08014074
 	CallWithArg sub_08095D8C, 0x08014094
 	CallWithArg sub_08095D8C, 0x080140b8
-	StopScript 
+	EndBlock 
 	Wait 0x001e
-	StartScript 
+	BeginBlock 
 	SoundReq 0x01d0
 	CallWithArg sub_08095D8C, 0x080140dc
 	CallWithArg sub_08095D8C, 0x08014118
 	CallWithArg sub_08095D8C, 0x08014154
 	CallWithArg sub_08095D8C, 0x08014198
-	StopScript 
+	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
@@ -78,7 +78,7 @@ script_080138D0:
 	_0807EA94 
 	_0807E5F8 0x00040000
 	_0807F0B4 0x0002
-	SetEntityPositionRelative 0x00d800e8
+	SetEntityPositionRelative 0x00e8, 0x00d8
 	CameraTargetEntity 
 	Call sub_0806DC3C
 	CallWithArg sub_0807F244, 0x00010001
diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc
index d078369c..7ff4f62e 100644
--- a/data/scripts/script_08013AA6.inc
+++ b/data/scripts/script_08013AA6.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_08013AA6
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x003c
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x005000e8
+	SetEntityPositionRelative 0x00e8, 0x0050
 	CameraTargetEntity 
 	Wait 0x003c
 	LoadRoomEntityList gUnk_080F55D8
diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc
index 75643d49..528cee4f 100644
--- a/data/scripts/script_08013B18.inc
+++ b/data/scripts/script_08013B18.inc
@@ -1,16 +1,16 @@
 SCRIPT_START script_08013B18
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 script_08013B1E:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CallWithArg sub_0807F6B4, 0x000001c8
 	JumpIfNot script_08013B1E
 	CheckInventory1 0x0006
 	JumpIfNot script_08013B1E
 	CheckLocalFlag 0x0078
 	JumpIf script_08013B1E
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc
index 3208a12e..032e80cf 100644
--- a/data/scripts/script_08013BE8.inc
+++ b/data/scripts/script_08013BE8.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08013BE8
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x007a
 	JumpIf script_08013C2A
 	CheckInventory1 0x0003
@@ -10,7 +10,7 @@ SCRIPT_START script_08013BE8
 	JumpIfNot script_08013C98
 	CheckInventory1 0x0041
 	JumpIfNot script_08013C98
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0008
 	WaitForSomething2 0x00000004
 	_0807E908 0x0002
@@ -20,21 +20,21 @@ script_08013C2A:
 	CheckLocalFlag 0x007c
 	JumpIf script_08013C98
 script_08013C32:
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	Call sub_0807F934
 	_0807EF80 0x000a
 	CallWithArg sub_080962F8, 0x00000000
 	CallWithArg sub_0807F8E8, 0x00000004
-	StopScript 
+	EndBlock 
 script_08013C58:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	TestBit 0x00000008
 	JumpIf script_08013C92
 	CheckEntityInteractType 
 	JumpIfNot script_08013C58
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	CheckLocalFlag 0x007d
@@ -49,7 +49,7 @@ script_08013C86:
 	_0807E878 
 	Jump script_08013C58
 script_08013C92:
-	StopScript 
+	EndBlock 
 	_0807E908 0x0004
 script_08013C98:
 	_0807EF80 0x0008
diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc
index e54c4494..5f0219a6 100644
--- a/data/scripts/script_08013CA4.inc
+++ b/data/scripts/script_08013CA4.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08013CA4
-	StopScript 
+	EndBlock 
 script_08013CA6:
 	CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080
 	JumpIfNot script_08013CA6
@@ -9,7 +9,7 @@ script_08013CA6:
 	Call sub_0807F3F8
 	Wait 0x003c
 	_0807F0B4 0x0001
-	SetEntityPositionRelative 0x013800e8
+	SetEntityPositionRelative 0x00e8, 0x0138
 	CameraTargetEntity 
 	Call sub_0807F5C0
 	Wait 0x0078
diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc
index 5bc69e89..2d14d794 100644
--- a/data/scripts/script_08013D04.inc
+++ b/data/scripts/script_08013D04.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013D04
-	StartScript 
+	BeginBlock 
 	Call sub_0807F92C
 	_0807EF80 0x0008
 	CallWithArg sub_0806DA04, 0x00000004
-	StopScript 
+	EndBlock 
 script_08013D1C:
 	CheckEntityInteractType 
 	JumpIfNot script_08013D1C
diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc
index e662df9c..e4ad6652 100644
--- a/data/scripts/script_08013D44.inc
+++ b/data/scripts/script_08013D44.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013D44
-	StartScript 
+	BeginBlock 
 	Call sub_0807F92C
 	_0807EF80 0x0008
 	CallWithArg sub_0806DA04, 0x00000004
-	StopScript 
+	EndBlock 
 script_08013D5C:
 	CheckEntityInteractType 
 	JumpIfNot script_08013D5C
diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc
index f4d79746..e4b43a10 100644
--- a/data/scripts/script_08013D84.inc
+++ b/data/scripts/script_08013D84.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013D84
-	StartScript 
+	BeginBlock 
 	Call sub_0807F92C
 	_0807EF80 0x0008
 	CallWithArg sub_0806DA04, 0x00000004
-	StopScript 
+	EndBlock 
 script_08013D9C:
 	CheckEntityInteractType 
 	JumpIfNot script_08013D9C
diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc
index ed233bf1..42e07201 100644
--- a/data/scripts/script_08013DC4.inc
+++ b/data/scripts/script_08013DC4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013DC4
-	StartScript 
+	BeginBlock 
 	Call sub_0807F92C
 	_0807EF80 0x0008
 	CallWithArg sub_0806DA04, 0x00000004
-	StopScript 
+	EndBlock 
 script_08013DDC:
 	CheckEntityInteractType 
 	JumpIfNot script_08013DDC
diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc
index a5ab5e98..d401ba90 100644
--- a/data/scripts/script_08013E04.inc
+++ b/data/scripts/script_08013E04.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013E04
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EDD4 0x00b0, 0x00f8
 	_0807E930 0x0001
diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc
index bf0f960f..b0477348 100644
--- a/data/scripts/script_08013E28.inc
+++ b/data/scripts/script_08013E28.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013E28
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0002
-	StopScript 
+	EndBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EDD4 0x0120, 0x00f8
 	_0807E930 0x0003
diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc
index 8b29d123..242f4f06 100644
--- a/data/scripts/script_08013E4C.inc
+++ b/data/scripts/script_08013E4C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013E4C
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0004
-	StopScript 
+	EndBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EDD4 0x0120, 0x0168
 	_0807E930 0x0005
diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc
index 1f2dee86..4fd09419 100644
--- a/data/scripts/script_08013E70.inc
+++ b/data/scripts/script_08013E70.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013E70
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0006
-	StopScript 
+	EndBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EDD4 0x00b0, 0x0168
 	_0807E930 0x0007
diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc
index bbaeb0af..e6bb7c0b 100644
--- a/data/scripts/script_08013E94.inc
+++ b/data/scripts/script_08013E94.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013E94
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	Call sub_0807F180
-	SetEntityPositionRelative 0x00f800b0
+	SetEntityPositionRelative 0x00b0, 0x00f8
 	_0807E930 0x0001
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc
index 07e14095..e0da07f3 100644
--- a/data/scripts/script_08013EB0.inc
+++ b/data/scripts/script_08013EB0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013EB0
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	Call sub_0807F180
-	SetEntityPositionRelative 0x00f80120
+	SetEntityPositionRelative 0x0120, 0x00f8
 	_0807E930 0x0003
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc
index 6798155b..23f48e40 100644
--- a/data/scripts/script_08013ECC.inc
+++ b/data/scripts/script_08013ECC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013ECC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	Call sub_0807F180
-	SetEntityPositionRelative 0x01680120
+	SetEntityPositionRelative 0x0120, 0x0168
 	_0807E930 0x0005
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc
index 9f5fe111..ead09cb8 100644
--- a/data/scripts/script_08013EE8.inc
+++ b/data/scripts/script_08013EE8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08013EE8
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	Call sub_0807F180
-	SetEntityPositionRelative 0x016800b0
+	SetEntityPositionRelative 0x00b0, 0x0168
 	_0807E930 0x0007
-	StopScript 
+	EndBlock 
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc
index 3f4d8395..757805a3 100644
--- a/data/scripts/script_08013F04.inc
+++ b/data/scripts/script_08013F04.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013F04
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0008
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000080
 	_0807E930 0x000b
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc
index 2ead57a2..c9d52cc3 100644
--- a/data/scripts/script_08013F34.inc
+++ b/data/scripts/script_08013F34.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013F34
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0009
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000080
 	_0807E930 0x000c
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc
index 6dded1b5..ab8809de 100644
--- a/data/scripts/script_08013F64.inc
+++ b/data/scripts/script_08013F64.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08013F64
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x000a
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000080
 	_0807E930 0x000d
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc
index 78f7d4a3..c3d2e778 100644
--- a/data/scripts/script_08013F94.inc
+++ b/data/scripts/script_08013F94.inc
@@ -1,17 +1,17 @@
 SCRIPT_START script_08013F94
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 	CheckLocalFlag 0x007d
 	JumpIf script_08013FE0
 script_08013FA4:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckInventory1 0x0003
 	JumpIfNot script_08013FA4
 	CheckPlayerFlags 0x00400000
 	JumpIfNot script_08013FA4
-	StopScript 
+	EndBlock 
 	Call sub_0807FA40
 	_0807E888 
 	Call sub_0807DF38
diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc
index 52526efd..ec00e1a9 100644
--- a/data/scripts/script_08013FE8.inc
+++ b/data/scripts/script_08013FE8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08013FE8
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_08013FF0:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckLocalFlag 0x007d
 	JumpIf script_0801404C
 	CheckLocalFlag 0x007a
@@ -13,12 +13,12 @@ script_08013FF0:
 	JumpIfNot script_08013FF0
 	CallWithArg sub_0807F6B4, 0x000000d0
 	JumpIfNot script_08013FF0
-	StopScript 
+	EndBlock 
 	Call sub_0807F9A4
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807DF28
-	StopScript 
+	EndBlock 
 	_0807EB28 0x1508
 	_0807EA94 
 	StartPlayerScript script_08010A14
diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc
index 9e5c3776..c7edd934 100644
--- a/data/scripts/script_08014054.inc
+++ b/data/scripts/script_08014054.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08014054
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0000
 	Call sub_0807F738
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000040
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc
index cec22a8a..82ec7f2e 100644
--- a/data/scripts/script_08014074.inc
+++ b/data/scripts/script_08014074.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08014074
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0001
 	Call sub_0807F738
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000040
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc
index de27e295..8ad5b706 100644
--- a/data/scripts/script_08014094.inc
+++ b/data/scripts/script_08014094.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014094
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0002
 	Call sub_0807F738
 	SetEntityPosition 0x0000, 0xfff0
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000040
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc
index 9586896b..e557ffcc 100644
--- a/data/scripts/script_080140B8.inc
+++ b/data/scripts/script_080140B8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080140B8
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0003
 	Call sub_0807F738
 	SetEntityPosition 0x0000, 0xfff0
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000040
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc
index 0dcfc894..86b594cb 100644
--- a/data/scripts/script_080140DC.inc
+++ b/data/scripts/script_080140DC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080140DC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0004
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000200
 	_0807E930 0x0008
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc
index 30148b13..58d8ec5f 100644
--- a/data/scripts/script_08014118.inc
+++ b/data/scripts/script_08014118.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08014118
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0005
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000400
 	_0807E930 0x0009
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc
index a8845394..3a36b36e 100644
--- a/data/scripts/script_08014154.inc
+++ b/data/scripts/script_08014154.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08014154
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0006
 	SetEntityPosition 0x0000, 0xfff0
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000800
 	_0807E930 0x000a
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc
index fcccb52d..d8f28858 100644
--- a/data/scripts/script_08014198.inc
+++ b/data/scripts/script_08014198.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08014198
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0007
 	SetEntityPosition 0x0000, 0xfff0
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00001000
 	_0807E930 0x000b
 	Call sub_0807F2D4
diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc
index bec09d97..1b744211 100644
--- a/data/scripts/script_080141DC.inc
+++ b/data/scripts/script_080141DC.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080141DC
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0014
 	Call sub_0807F714
 	CallWithArg sub_0807F994, 0x0000fffc
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000020
 	Wait 0x0078
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc
index 912c58e2..b3f78c2e 100644
--- a/data/scripts/script_08014210.inc
+++ b/data/scripts/script_08014210.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08014210
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807E930 0x0015
 	Call sub_0807F714
 	Call sub_0807F714
 	CallWithArg sub_0807F994, 0x0000fffc
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000020
 	Wait 0x0078
 	Call sub_0807F2D4
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index 8fee8151..2d48d1f8 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -9,16 +9,16 @@ script_08014264:
 	CallWithArg sub_08095EAC, 0x00000001
 	Jump script_08014264
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
-	StopScript 
+	EndBlock 
 script_0801427C:
 	CheckLocalFlag 0x0078
 	JumpIfNot script_0801427C
-	StartScript 
+	BeginBlock 
 	Call sub_0807F934
 	CallWithArg sub_0806DA04, 0x00000008
-	StopScript 
+	EndBlock 
 script_08014298:
 	CheckEntityInteractType 
 	JumpIfNot script_08014298
diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc
index 53bd4bf9..44a7709f 100644
--- a/data/scripts/script_080142B0.inc
+++ b/data/scripts/script_080142B0.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_080142B0
-	StartScript 
+	BeginBlock 
 	CheckLocalFlag 0x0054
 	JumpIf script_08014382
 	CheckLocalFlag 0x0053
 	JumpIf script_08014330
-	StopScript 
+	EndBlock 
 script_080142C4:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807E564 
 	JumpIfNot script_080142C4
 	CheckPlayerInRegion 0x0098, 0x0058, 0x1818
 	JumpIfNot script_080142C4
-	StopScript 
+	EndBlock 
 	_0807E864 
 	SetLocalFlag 0x0053
 	Wait 0x0014
@@ -36,15 +36,15 @@ script_080142C4:
 	_0807E878 
 	_0807E908 0x0001
 script_08014330:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807E564 
 	JumpIf script_08014330
 	EntityHasHeight 
 	JumpIf script_08014330
 	CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
 	JumpIfNot script_08014330
-	StopScript 
+	EndBlock 
 	_0807E864 
 	SetLocalFlag 0x0054
 	Wait 0x005a
diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc
index 6fb0f6f0..3d215c0e 100644
--- a/data/scripts/script_08014384.inc
+++ b/data/scripts/script_08014384.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08014384
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EA94 
 	_0807E3E8 
diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc
index 0ca9df4c..1d6fe9f3 100644
--- a/data/scripts/script_080143C0.inc
+++ b/data/scripts/script_080143C0.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_080143C0
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	Call sub_080654FC
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index 8a8db693..828eaf5b 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014450
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
 	SetEntityNonPlanarMovement 0x01c0
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08014462:
 	_0807E30C 
 	JumpIfNot script_08014462
diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc
index 9b0cb2ac..ecbad4ab 100644
--- a/data/scripts/script_0801450C.inc
+++ b/data/scripts/script_0801450C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0801450C
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
 	SetEntityNonPlanarMovement 0x01c0
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	Call sub_0806E20C
@@ -15,8 +15,8 @@ SCRIPT_START script_0801450C
 	Call sub_0807DF50
 	Jump script_080144FC
 	.short 0x0000
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_0801454C:
 	CheckPlayerInRegion 0x0078, 0x0088, 0x0810
 	JumpIfNot script_0801454C
diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc
index 07ce3e88..212980d9 100644
--- a/data/scripts/script_08014588.inc
+++ b/data/scripts/script_08014588.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08014588
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	SetEntityNonPlanarMovement 0x00e0
 	_0807EDD4 0x0078, 0x0078
diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc
index e15261ce..8cc995b4 100644
--- a/data/scripts/script_080145B0.inc
+++ b/data/scripts/script_080145B0.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080145B0
-	StartScript 
-	SetEntityPositionRelative 0x00e001f8
+	BeginBlock 
+	SetEntityPositionRelative 0x01f8, 0x00e0
 	CheckLocalFlag 0x005e
 	JumpIf script_080145E4
-	StopScript 
+	EndBlock 
 script_080145C2:
 	CheckRoomFlag 0x0005
 	JumpIfNot script_080145C2
@@ -16,5 +16,5 @@ script_080145C2:
 	_0807E878 
 	Jump script_080145C2
 script_080145E4:
-	StopScript 
+	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc
index 86add4f9..122ff8c1 100644
--- a/data/scripts/script_080145E8.inc
+++ b/data/scripts/script_080145E8.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080145E8
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_080145F8:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_080145F8
@@ -17,12 +17,12 @@ script_08014608:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_080145F8
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
 	SetEntityDirection 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801463A:
 	_0807E30C 
 	JumpIf script_080146A0
diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc
index 554da330..68f82c4c 100644
--- a/data/scripts/script_080147DC.inc
+++ b/data/scripts/script_080147DC.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_080147DC
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	SetEntityNonPlanarMovement 0x00e0
 	_0807EDD4 0x0078, 0x0068
diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc
index 47613e6e..c6fbfaa7 100644
--- a/data/scripts/script_08014804.inc
+++ b/data/scripts/script_08014804.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08014804
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF38
 	Wait 0x0010
@@ -65,8 +65,8 @@ script_080148D8:
 	_0807E5F8 0x00000008
 	Jump script_0801488E
 	.short 0x0000
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 script_080148F4:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_080148F4
diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc
index e175c1b4..1360301f 100644
--- a/data/scripts/script_08014958.inc
+++ b/data/scripts/script_08014958.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08014958
-	StartScript 
+	BeginBlock 
 	Call sub_0806C870
 	_0807EF80 0x000a
 	CheckGlobalFlag 0x0058
 	JumpIf script_08014976
 	_0807EB44 0x0004
-	SetEntityPositionRelative 0x01280078
+	SetEntityPositionRelative 0x0078, 0x0128
 script_08014976:
-	StopScript 
+	EndBlock 
 script_08014978:
 	_0807E30C 
 	JumpIfNot script_08014978
@@ -18,12 +18,12 @@ script_08014978:
 	Wait 0x000f
 	_0807E878 
 	Jump script_08014978
-	StartScript 
+	BeginBlock 
 	Call sub_0806C870
 	_0807EF80 0x000a
 	CheckGlobalFlag 0x0058
 	JumpIfNot script_080149C6
-	StopScript 
+	EndBlock 
 script_080149AA:
 	_0807E30C 
 	JumpIfNot script_080149AA
diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc
index 7d4d8505..cbe83bdc 100644
--- a/data/scripts/script_080149CC.inc
+++ b/data/scripts/script_080149CC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080149CC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806C870
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_080149DE:
 	_0807E30C 
 	JumpIfNot script_080149DE
@@ -27,10 +27,10 @@ script_08014A20:
 	_0807E878 
 	Jump script_080149DE
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_0806C870
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08014A36:
 	_0807E30C 
 	JumpIfNot script_08014A36
@@ -42,10 +42,10 @@ script_08014A36:
 	_0807E878 
 	Jump script_08014A36
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_0806C870
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08014A62:
 	_0807E30C 
 	JumpIfNot script_08014A62
diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc
index ff644ca7..4f88f247 100644
--- a/data/scripts/script_08014A80.inc
+++ b/data/scripts/script_08014A80.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08014A80
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	_0807EB74 
 	_0807EF80 0x0004
@@ -20,10 +20,10 @@ script_08014AAC:
 	_0807E878 
 	Jump script_08014AAC
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	Call sub_0806C870
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08014AD2:
 	_0807E30C 
 	JumpIfNot script_08014AD2
diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc
index 381bb6fb..d961acfe 100644
--- a/data/scripts/script_08014B10.inc
+++ b/data/scripts/script_08014B10.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08014B10
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0078, 0x0040
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc
index 974af618..bfa75dec 100644
--- a/data/scripts/script_08014B34.inc
+++ b/data/scripts/script_08014B34.inc
@@ -1,18 +1,18 @@
 SCRIPT_START script_08014B34
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	CheckLocalFlag 0x0063
 	JumpIf script_08014BE8
 script_08014B48:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckRoomFlag 0x0000
 	JumpIf script_08014B70
 	CheckEntityInteractType 
 	JumpIfNot script_08014B48
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	TextboxNoOverlap 0x2f01
@@ -21,7 +21,7 @@ script_08014B48:
 	_0807E878 
 	Jump script_08014B48
 script_08014B70:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807DF28
 	_0807E5F8 0x00000001
@@ -69,12 +69,12 @@ script_08014C22:
 	Wait 0x000f
 	_0807E878 
 	Jump script_08014BF2
-	StartScript 
+	BeginBlock 
 	Call sub_0806CD58
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0006
-	StopScript 
+	EndBlock 
 script_08014C42:
 	CheckEntityInteractType 
 	JumpIfNot script_08014C42
@@ -103,21 +103,21 @@ script_08014C82:
 	_0807EB44 0x0004
 	_0807E930 0x0006
 	Jump script_08014C42
-	StartScript 
+	BeginBlock 
 	CheckGlobalFlag 0x0024
 	JumpIf script_08014CD4
 	Call sub_0806C870
 	_0807EF80 0x000a
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08014CAE:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckGlobalFlag 0x0024
 	JumpIf script_08014CD4
 	_0807E30C 
 	JumpIfNot script_08014CAE
-	StopScript 
+	EndBlock 
 	_0807E864 
 	_0807EB74 
 	Call sub_0806C90C
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc
index e077f2ee..8ea91ea5 100644
--- a/data/scripts/script_08014CDC.inc
+++ b/data/scripts/script_08014CDC.inc
@@ -1,13 +1,13 @@
 SCRIPT_START script_08014CDC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0180
 	_0807EF80 0x000a
 	Call sub_08066D04
 	Call sub_08066D14
-	SetEntityPositionRelative 0x018001e8
+	SetEntityPositionRelative 0x01e8, 0x0180
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	Call sub_08066E08
 	_0807E864 
@@ -15,11 +15,11 @@ SCRIPT_START script_08014CDC
 	_0807EA94 
 	_0807E5F8 0x00000002
 script_08014D1E:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
 	JumpIfNot script_08014D1E
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
@@ -28,7 +28,7 @@ script_08014D1E:
 	_0807EC64 0x0040
 	_0807EB44 0x0004
 	Call sub_08066E08
-	SetEntityPositionRelative 0x00c801f8
+	SetEntityPositionRelative 0x01f8, 0x00c8
 	Call sub_0807DF50
 	_0807E878 
 script_08014D60:
@@ -41,7 +41,7 @@ script_08014D60:
 	_0807EC64 0x0040
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	SetEntityPositionRelative 0x002801e8
+	SetEntityPositionRelative 0x01e8, 0x0028
 	Call sub_0807DF50
 	_0807E878 
 script_08014D96:
diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc
index a84cdb1b..be6b4d4a 100644
--- a/data/scripts/script_08014DCC.inc
+++ b/data/scripts/script_08014DCC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08014DCC
-	StartScript 
-	SetEntityPositionRelative 0x01a80238
+	BeginBlock 
+	SetEntityPositionRelative 0x0238, 0x01a8
 	Call sub_0807F844
 	Call sub_0807F348
 	_0807E864 
 	Call sub_0807DF28
-	StopScript 
+	EndBlock 
 	_0807E778 0x0010
 	DoFade6 
 	WaitFor_2 
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index f306f83d..0785f772 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08014E14
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807E9D4 
 	_0807EF80 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	StopScript 
+	EndBlock 
 script_08014E2C:
 	CheckEntityInteractType 
 	JumpIfNot script_08014E2C
@@ -16,12 +16,12 @@ script_08014E2C:
 	_0807E878 
 	Jump script_08014E2C
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08014E64:
 	CheckEntityInteractType 
 	JumpIfNot script_08014E64
@@ -51,12 +51,12 @@ script_08014EBC:
 	_0807E878 
 	Jump script_08014E64
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_08014EE0:
 	CheckEntityInteractType 
 	JumpIfNot script_08014EE0
@@ -67,12 +67,12 @@ script_08014EE0:
 	_0807E878 
 	Jump script_08014EE0
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x000a
-	StopScript 
+	EndBlock 
 script_08014F0C:
 	CheckEntityInteractType 
 	JumpIfNot script_08014F0C
@@ -86,12 +86,12 @@ script_08014F0C:
 	_0807E930 0x000a
 	Jump script_08014F0C
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EF80 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x000e
-	StopScript 
+	EndBlock 
 	Call sub_08065914
 script_08014F4A:
 	CheckEntityInteractType 
@@ -100,10 +100,10 @@ script_08014F4A:
 	Call sub_0807DF28
 	_0807EB74 
 	_0807EF80 0x0000
-	StartScript 
+	BeginBlock 
 	TextboxNoOverlap 0x3b0b
 	CallWithArg sub_0807F854, 0x00010064
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_08014FA6
@@ -128,10 +128,10 @@ script_08014FA6:
 	_0807EB44 0x0004
 	_0807E930 0x000e
 	Jump script_08014F4A
-	StartScript 
-	SetEntityPositionRelative 0x00e001f8
+	BeginBlock 
+	SetEntityPositionRelative 0x01f8, 0x00e0
 	Call sub_08054564
-	StopScript 
+	EndBlock 
 script_08014FCC:
 	CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
 	JumpIfNot script_08014FCC
@@ -168,7 +168,7 @@ script_08014FCC:
 	StartPlayerScript script_080152DC
 	CameraTargetEntity 
 	_0807F0B4 0x0003
-	SetEntityPositionRelative 0x014801f8
+	SetEntityPositionRelative 0x01f8, 0x0148
 	WaitForSomething2 0x00000001
 	Call sub_0804F6A8
 	Wait 0x0004
@@ -242,7 +242,7 @@ script_08015104:
 	_0807E80C 0x00000000
 	WaitFor_2 
 	Call sub_08053B3C
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	CallWithArg sub_0807F6E8, 0x00000008
 	MoveEntityToPlayer 
@@ -251,7 +251,7 @@ script_08015104:
 	_0807E778 0x0100
 	DoFade4 
 	_0807E80C 0x00000000
-	StopScript 
+	EndBlock 
 	StartPlayerScript script_08015360
 	WaitForSomething2 0x00000001
 	LoadRoomEntityList gUnk_080F7CB0
@@ -260,10 +260,10 @@ script_08015104:
 	WaitFor_2 
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000010
-	StartScript 
+	BeginBlock 
 	_0807E8E4_2 
 	_0807EB28 0x1315
-	StopScript 
+	EndBlock 
 	_0807EA94 
 	_0807F0B4 0x0004
 	CameraTargetPlayer 
diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc
index aa9d41d0..22b00245 100644
--- a/data/scripts/script_08015234.inc
+++ b/data/scripts/script_08015234.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015234
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	Call sub_0807F354
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	Call sub_08066C94
 	Wait 0x00e9
diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc
index 0107c8c1..5d81c0e8 100644
--- a/data/scripts/script_080152B4.inc
+++ b/data/scripts/script_080152B4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080152B4
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x01f8, 0x00b8
 	_0807EB44 0x0004
diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc
index 2f474890..963e9473 100644
--- a/data/scripts/script_080152DC.inc
+++ b/data/scripts/script_080152DC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080152DC
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0200
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x01f8, 0x0148
 	_0807EB44 0x0004
diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc
index 0c1407f2..7675dc35 100644
--- a/data/scripts/script_08015338.inc
+++ b/data/scripts/script_08015338.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08015338
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x01f8, 0x0148
 	_0807EB44 0x0004
diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc
index fc63dc99..0d162f83 100644
--- a/data/scripts/script_08015360.inc
+++ b/data/scripts/script_08015360.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015360
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0100
-	SetEntityPositionRelative 0x01480208
-	StopScript 
+	SetEntityPositionRelative 0x0208, 0x0148
+	EndBlock 
 	_0807EB44 0x0006
 	_0807EF80 0x0000
 	_0807E5F8 0x00000001
diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc
index d9d9aa3f..1832e1b9 100644
--- a/data/scripts/script_08015390.inc
+++ b/data/scripts/script_08015390.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015390
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
-	StopScript 
+	EndBlock 
 	_0807E930 0x001f
 	Call sub_0806D944
 	WaitForSomething2 0x00000008
diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc
index 32586f5c..4d1bc1ee 100644
--- a/data/scripts/script_080153EC.inc
+++ b/data/scripts/script_080153EC.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080153EC
-	StartScript 
+	BeginBlock 
 	_0807F0B4 0x0007
-	SetEntityPositionRelative 0x00680078
+	SetEntityPositionRelative 0x0078, 0x0068
 	CameraTargetEntity 
-	StopScript 
+	EndBlock 
 	SoundReq2 0x002a
 	_0807E778 0x0004
 	DoFade4 
@@ -16,7 +16,7 @@ SCRIPT_START script_080153EC
 	_0807E5F8 0x00000880
 	WaitForSomething2 0x00001100
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x00900078
+	SetEntityPositionRelative 0x0078, 0x0090
 	TextboxNoOverlapFollowPos 0x1330, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00008000
diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc
index e7cf2435..678b91a9 100644
--- a/data/scripts/script_0801550C.inc
+++ b/data/scripts/script_0801550C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0801550C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EF80 0x0007
 	_0807EB44 0x0000
 	Call sub_0807F338
-	StopScript 
+	EndBlock 
 	CallWithArg sub_0806AF60, 0x00000000
 	WaitForSomething2 0x00008000
 	CallWithArg sub_0806AF60, 0x00000004
diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc
index 7338d9e1..49d79afe 100644
--- a/data/scripts/script_08015618.inc
+++ b/data/scripts/script_08015618.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08015618
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	SetEntityNonPlanarMovement 0x0040
 	Call sub_08094B80
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000080
 	CallWithArg sub_0805DDEC, 0x00000003
 	Call sub_08094B0C
diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc
index 28a67405..bb16a0f1 100644
--- a/data/scripts/script_08015684.inc
+++ b/data/scripts/script_08015684.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08015684
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000b
 	_0807EB44 0x0000
 	_0807EF80 0x0017
 	Call sub_0807F180
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000800
 	_0807EB44 0x0002
 	_0807EF80 0x0017
diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc
index f3b19d0a..38b4c33d 100644
--- a/data/scripts/script_08015754.inc
+++ b/data/scripts/script_08015754.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08015754
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0000
 	SetEntityNonPlanarMovement 0x0200
 	Call sub_08094B80
-	StopScript 
+	EndBlock 
 	Wait 0x0078
 	SoundReq 0x01c5
 	Call sub_08094B6C
diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc
index 52110428..8029861e 100644
--- a/data/scripts/script_080157AC.inc
+++ b/data/scripts/script_080157AC.inc
@@ -21,7 +21,7 @@ script_080157DA:
 	WaitForSomething2 0x00000002
 	StartPlayerScript script_080158F8
 	_0807F0B4 0x0001
-	SetEntityPositionRelative 0x02180248
+	SetEntityPositionRelative 0x0248, 0x0218
 	CameraTargetEntity 
 	Call sub_0807F5C0
 	WaitForSomething2 0x00000010
@@ -51,7 +51,7 @@ script_08015888:
 	_0807E864 
 	Call sub_0807DF28
 	_0807F0B4 0x0002
-	SetEntityPositionRelative 0x02080248
+	SetEntityPositionRelative 0x0248, 0x0208
 	CameraTargetEntity 
 	StartPlayerScript script_08015938
 	WaitForSomething2 0x00000010
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index 908c7e24..1ef2dc75 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -1,15 +1,15 @@
 SCRIPT_START script_08015958
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0180
 	_0807EF80 0x0008
 	_0807EF80 0x000b
 	Call sub_08066D04
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
-	StartScript 
+	BeginBlock 
 	Call sub_08066D14
 	MoveEntityToPlayer 
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0007
 	_0807EB74 
 	_0807EDD4 0x01f8, 0x02f8
@@ -18,7 +18,7 @@ SCRIPT_START script_08015958
 	TextboxNoOverlapFollowPos 0x1011, 0x0002
 	_0807EA94 
 	_0807EDD4 0x01f8, 0x0268
-	SetEntityPositionRelative 0x02180248
+	SetEntityPositionRelative 0x0248, 0x0218
 	_0807EB44 0x0006
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -49,19 +49,19 @@ SCRIPT_START script_08015958
 	_0807E9D4 
 	_0807E5F8 0x00000002
 script_08015A32:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	_0807EB74 
 	CheckRoomFlag 0x0000
 	JumpIf script_08015A54
 	CheckEntityInteractType 
 	JumpIfNot script_08015A32
-	StopScript 
+	EndBlock 
 	TextboxNoOverlapFollowPos 0x1067, 0x0002
 	_0807EA94 
 	Jump script_08015A32
 script_08015A54:
-	StopScript 
+	EndBlock 
 	_0807EF80 0x000b
 	_0807EB44 0x0000
 	_0807EF80 0x0000
diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc
index 9e69d527..63c27059 100644
--- a/data/scripts/script_08015AC4.inc
+++ b/data/scripts/script_08015AC4.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015AC4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0007
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000008
 	_0807E908 0x0007
 	WaitForSomething2 0x00000008
diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc
index 911275e2..8b0d85ba 100644
--- a/data/scripts/script_08015B14.inc
+++ b/data/scripts/script_08015B14.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015B14
-	StartScript 
+	BeginBlock 
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0300
-	StopScript 
+	EndBlock 
 	_0807EDD4 0x0248, 0x0218
 	_0807E5F8 0x00000020
 	_0807EF80 0x0006
diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc
index c81f01b7..4740736d 100644
--- a/data/scripts/script_08015B34.inc
+++ b/data/scripts/script_08015B34.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08015B34
 script_08015B34:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckLocalFlag 0x008b
 	JumpIf script_08015B7E
 	CallWithArg sub_0807F6B4, 0x00000318
 	JumpIfNot script_08015B34
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc
index e1984478..2169ce97 100644
--- a/data/scripts/script_08015BA8.inc
+++ b/data/scripts/script_08015BA8.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08015BA8
-	StartScript 
+	BeginBlock 
 	SetLocalFlag 0x008e
 	_0807E864 
 	MoveEntityToPlayer 
 	CameraTargetEntity 
 	SetEntityNonPlanarMovement 0x0200
-	StopScript 
+	EndBlock 
 	Wait 0x000f
 	_0807E8E4_2 
 	Call sub_0807F3F8
diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc
index c601091c..9367894c 100644
--- a/data/scripts/script_08015BE8.inc
+++ b/data/scripts/script_08015BE8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08015BE8
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 script_08015BF0:
 	CheckPlayerInRegion 0x0160, 0x0020, 0x3040
 	JumpIfNot script_08015BF0
@@ -17,14 +17,14 @@ script_08015BF0:
 	WaitFor_2 
 	SoundReq0x80100000 
 	Call sub_08053BE8
-	StartScript 
+	BeginBlock 
 	_0807E864 
 	Call sub_0807FBC4
 	CameraTargetPlayer 
 	_0807E778 0x0100
 	DoFade4 
 	_0807E80C 0x00000000
-	StopScript 
+	EndBlock 
 	_0807E778 0x0004
 	_0807E800 0x00000000
 	WaitFor_2 
diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc
index b7b116b1..c992078f 100644
--- a/data/scripts/script_08015C7C.inc
+++ b/data/scripts/script_08015C7C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08015C7C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
-	StopScript 
+	EndBlock 
 	_0807EF80 0x0001
 	_0807EDD4 0x0168, 0x0058
 	_0807EB44 0x0004
diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc
index 6ac01e07..2e0a49ca 100644
--- a/data/scripts/script_08015CD4.inc
+++ b/data/scripts/script_08015CD4.inc
@@ -1,34 +1,34 @@
 SCRIPT_START script_08015CD4
-	StartScript 
+	BeginBlock 
 	_0807F0B4 0x0007
-	SetEntityPositionRelative 0x00680088
+	SetEntityPositionRelative 0x0088, 0x0068
 	CameraTargetEntity 
-	StopScript 
+	EndBlock 
 	_0807E778 0x0004
 	DoFade4 
 	WaitFor_2 
 	Wait 0x003c
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x00e00088
+	SetEntityPositionRelative 0x0088, 0x00e0
 	CameraTargetEntity 
 	Wait 0x003c
 	SoundReq2 0x000d
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x00700088
+	SetEntityPositionRelative 0x0088, 0x0070
 	CameraTargetEntity 
 	Wait 0x003c
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x00e00088
+	SetEntityPositionRelative 0x0088, 0x00e0
 	CameraTargetEntity 
 	Wait 0x003c
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
 	_0807F0B4 0x0004
-	SetEntityPositionRelative 0x00700088
+	SetEntityPositionRelative 0x0088, 0x0070
 	CameraTargetEntity 
 	Wait 0x003c
 	_0807E5F8 0x00000010
diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc
index 7be58e36..e6525c72 100644
--- a/data/scripts/script_08015DF0.inc
+++ b/data/scripts/script_08015DF0.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015DF0
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0004
 	Wait 0x003c
diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc
index ee744730..207f81d0 100644
--- a/data/scripts/script_08015E58.inc
+++ b/data/scripts/script_08015E58.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_08015E58
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x0008
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x001d
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000010
 	Call sub_08066C94
 	Wait 0x00e9
@@ -22,7 +22,7 @@ SCRIPT_START script_08015E58
 	Wait 0x00bc
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000010
-	SetEntityPositionRelative 0x00680088
+	SetEntityPositionRelative 0x0088, 0x0068
 	Call sub_08066C94
 	Wait 0x00e8
 	_0807EF80 0x0007
diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc
index fe23f8c9..7dd91177 100644
--- a/data/scripts/script_08015F08.inc
+++ b/data/scripts/script_08015F08.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015F08
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	TextboxNoOverlap 0x131c
 	_0807EA94 
diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc
index 9f9553a3..b5dcb92d 100644
--- a/data/scripts/script_08015F3C.inc
+++ b/data/scripts/script_08015F3C.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_08015F3C
-	StartScript 
+	BeginBlock 
 	SetEntityNonPlanarMovement 0x0080
 	_0807EB44 0x0000
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000040
 	_0807E930 0x0004
 	_0807EC64 0x00c0
diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc
index f54a96d6..786f82f2 100644
--- a/data/scripts/script_08015F80.inc
+++ b/data/scripts/script_08015F80.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015F80
-	StartScript 
+	BeginBlock 
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000200
 	_0807EF80 0x0005
 	WaitForSomething 0x00000400
diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc
index 169a9df3..a51c761c 100644
--- a/data/scripts/script_08015FA4.inc
+++ b/data/scripts/script_08015FA4.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08015FA4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	Call sub_08066E38
-	StopScript 
+	EndBlock 
 	WaitForSomething 0x00000400
 	_0807EF80 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc
index fd04d0dd..7a2076ee 100644
--- a/data/scripts/script_08015FC0.inc
+++ b/data/scripts/script_08015FC0.inc
@@ -1,12 +1,12 @@
 SCRIPT_START script_08015FC0
-	StartScript 
+	BeginBlock 
 	Call sub_0806DB84
 	CheckKinstoneFused 0x0009
 	JumpIf script_08016028
 	_0807EA88 0x0009
 	CallWithArg sub_0806DA04, 0x00000007
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_08015FE4:
 	_0807EA4C 
 	_0807E9F0 
diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc
index 58668a32..9c15297f 100644
--- a/data/scripts/script_08016030.inc
+++ b/data/scripts/script_08016030.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_08016030
-	StartScript 
+	BeginBlock 
 	CheckKinstoneFused 0x0009
 	JumpIf script_08016062
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000001
 	_0807EF80 0x0010
 	Wait 0x003c
diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc
index f1af3170..c265fce4 100644
--- a/data/scripts/script_0801606C.inc
+++ b/data/scripts/script_0801606C.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_0801606C
-	StartScript 
+	BeginBlock 
 	CheckKinstoneFused 0x0009
 	JumpIf script_0801609E
-	StopScript 
+	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EF80 0x0010
 	Wait 0x003c
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index 45482726..972de427 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_080160A8
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807E930 0x0008
 script_080160B0:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	CheckEntityInteractType 
 	JumpIf script_080160E0
 	TestBit 0x00000008
@@ -13,14 +13,14 @@ script_080160B0:
 	JumpIf script_080160D2
 	Jump script_080160B0
 script_080160D2:
-	StopScript 
+	EndBlock 
 	_0807EB74 
 	WaitForSomething2 0x00000004
 	Jump script_080160B0
 script_080160E0:
 	_0807E864 
 	_0807EB74 
-	StopScript 
+	EndBlock 
 	HasRoomItemForSale 
 	JumpIfNot script_0801611A
 	TextboxNoOverlapFollow 0x2d07
@@ -51,9 +51,9 @@ script_08016132:
 	_0807E878 
 	_0807EB44 0x0004
 	Jump script_080160B0
-	StartScript 
+	BeginBlock 
 	Call sub_080787B4
-	StopScript 
+	EndBlock 
 script_08016146:
 	CheckEntityInteractType 
 	JumpIfNot script_08016146
@@ -77,9 +77,9 @@ script_08016184:
 script_0801618A:
 	_0807E878 
 	Jump script_08016146
-	StartScript 
+	BeginBlock 
 	Call sub_080787B4
-	StopScript 
+	EndBlock 
 script_0801619A:
 	CheckEntityInteractType 
 	JumpIfNot script_0801619A
@@ -105,12 +105,12 @@ script_080161D8:
 script_080161E2:
 	_0807E878 
 	Jump script_0801619A
-	StartScript 
+	BeginBlock 
 	Call sub_0807F348
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	StopScript 
+	EndBlock 
 script_080161FE:
 	Call sub_08068C28
 script_08016204:
@@ -159,22 +159,22 @@ script_08016262:
 	Call sub_0807DF50
 	_0807E878 
 script_080162CC:
-	StopScript 
-	StartScript 
+	EndBlock 
+	BeginBlock 
 	Call sub_08068EC4
 	JumpIf script_080162F6
 	CheckEntityInteractType 
 	JumpIf script_080162E4
 	Jump script_080162CC
 script_080162E4:
-	StopScript 
+	EndBlock 
 	_0807E864 
 	Call sub_08068E78
 	_0807EA94 
 	_0807E878 
 	Jump script_080162CC
 script_080162F6:
-	StopScript 
+	EndBlock 
 	_0807E888 
 	Call sub_0807F594
 	Call sub_0807DF28
diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc
index 98cb9a21..d74e5e1d 100644
--- a/data/scripts/script_08016384.inc
+++ b/data/scripts/script_08016384.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08016384
 script_08016384:
-	StartScript 
-	StopScript 
+	BeginBlock 
+	EndBlock 
 	Jump script_08016384
 	JumpIf script_08016384
 	JumpIfNot script_08016384
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index f983b93c..cc13f1bf 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -44,7 +44,7 @@ SCRIPT_START script_08016482
 	SetEntityDirectionWithAnimationState 0x0000
 	SetEntityNonPlanarMovement 0x0100
 	SetEntity0x20 0x00018000
-	SetEntityPositionRelative 0x00000000
+	SetEntityPositionRelative 0x0000, 0x0000
 	MoveEntityToPlayer 
 	ScriptCommandNop3 
 	_0807EC1C 0x0010
diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc
index 888efad8..287147df 100644
--- a/data/scripts/script_080165A4.inc
+++ b/data/scripts/script_080165A4.inc
@@ -1,9 +1,9 @@
 SCRIPT_START script_080165A4
-	StartScript 
+	BeginBlock 
 	_0807EF80 0x000a
 	_0807EB44 0x0004
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_080165B2:
 	_0807E974 0x0601
 	Jump script_080165B2
diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc
index c774fcfa..b217604e 100644
--- a/data/scripts/script_080165D8.inc
+++ b/data/scripts/script_080165D8.inc
@@ -6,17 +6,17 @@ SCRIPT_START script_080165D8
 	Call script_0801637C+1
 	JumpAbsolute script_080165D8
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_080165FE:
 	_0807E30C 
 	JumpIfNot script_080165FE
 	TextboxNoOverlapFollow 0x0601
 	Jump script_080165FE
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_08016612:
 	_0807E944 
 	_0807E864 
@@ -26,9 +26,9 @@ script_08016612:
 	_0807E878 
 	Jump script_08016612
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_0801662E:
 	_0807E944 
 	_0807E864 
@@ -191,21 +191,21 @@ script_08016848:
 	Wait 0x0002
 	_0807EB44 0x0004
 	Jump script_08016848
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
-	StopScript 
+	EndBlock 
 script_080168E6:
 	_0807E944 
 	_0807E864 
 	Wait 0x000f
 	_0807E878 
 	Jump script_080168E6
-	StartScript 
+	BeginBlock 
 	Call sub_08064EA4
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801690A:
 	_0807E30C 
 	JumpIfNot script_0801690A
@@ -220,11 +220,11 @@ script_08016926:
 	_0807E878 
 	SetGlobalFlag 0x005c
 	Jump script_0801690A
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
 	_0807EF80 0x000a
-	StopScript 
+	EndBlock 
 script_0801693E:
 	_0807E944 
 	_0807E864 
@@ -235,12 +235,12 @@ script_0801693E:
 	_0807E878 
 	Jump script_0801693E
 	.short 0x0000
-	StartScript 
+	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
 	_0807EF80 0x000a
 	_0807E930 0x0000
-	StopScript 
+	EndBlock 
 script_0801696A:
 	_0807E944 
 	_0807E864 
diff --git a/src/script.c b/src/script.c
index 251359b7..67f1a151 100644
--- a/src/script.c
+++ b/src/script.c
@@ -13,8 +13,8 @@ void sub_0807DB88(ScriptExecutionContext*, u16*);
 void sub_0807DE80(Entity*);
 void sub_0807DF38(void);
 void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_StartScript(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_StopScript(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_BeginBlock(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_EndBlock(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_Jump(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpIf(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context);
@@ -158,8 +158,8 @@ extern void sub_0801C4A0(u32);
 typedef void (*ScriptCommand)(Entity*, ScriptExecutionContext*);
 
 const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
-                                          ScriptCommand_StartScript,
-                                          ScriptCommand_StopScript,
+                                          ScriptCommand_BeginBlock,
+                                          ScriptCommand_EndBlock,
                                           ScriptCommand_Jump,
                                           ScriptCommand_JumpIf,
                                           ScriptCommand_JumpIfNot,
@@ -628,12 +628,12 @@ void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context) {
 }
 
 // not entirely sure this name is acurate
-void ScriptCommand_StartScript(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_BeginBlock(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.flags |= 2;
 }
 
 // not entirely sure this name is acurate
-void ScriptCommand_StopScript(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_EndBlock(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.flags &= ~2;
 }
 
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 5c6ce7d5..22e8584c 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -4,8 +4,8 @@ import struct
 # A list of all the commands, their correspondingScriptCommand_  functions and what kind of parameters they take
 commands = [
     {'fun': 'ScriptCommandNop', 'params': ''},
-    {'fun': 'ScriptCommand_StartScript', 'params': ''},
-    {'fun': 'ScriptCommand_StopScript', 'params': ''},
+    {'fun': 'ScriptCommand_BeginBlock', 'params': ''},
+    {'fun': 'ScriptCommand_EndBlock', 'params': ''},
     {'fun': 'ScriptCommand_Jump', 'params': 'j'},
     {'fun': 'ScriptCommand_JumpIf', 'params': 'j'},
     {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j'},
@@ -108,7 +108,7 @@ commands = [
     {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'},
     {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'},
     {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'},
-    {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'ss'},
     {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'},
     {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''},
     {'fun': 'ScriptCommandNop3', 'params': ''},

From 8f7ad0a35c740c32c5763baa2bac998e260b2da9 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 6 Mar 2021 23:13:26 +0100
Subject: [PATCH 24/46] Fix parameters for all functions called from scripts

---
 data/scripts/script_0800E8D6.inc         |   2 +-
 include/greatFairy.h                     |   5 -
 src/code_0805436C.c                      |   4 +-
 src/code_0805EC04.c                      |   2 +-
 src/enemy/smallPesto.c                   |   1 -
 src/entity.c                             |   1 -
 src/intro.c                              |   1 -
 src/npc/anju.c                           |   1 -
 src/npc/beedle.c                         |   8 +-
 src/npc/bladeBrothers.c                  |  44 +++----
 src/npc/carpenter.c                      |   6 +-
 src/npc/dampe.c                          |  27 ++--
 src/npc/emma.c                           |  30 ++---
 src/npc/ezloCap.c                        |  50 +++-----
 src/npc/forestMinish.c                   |  10 +-
 src/npc/goron.c                          |   4 +-
 src/npc/guard.c                          |  23 ++--
 src/npc/librari.c                        |   6 +-
 src/npc/simon.c                          |   8 +-
 src/npc/smith.c                          |  12 +-
 src/npc/stamp.c                          |   4 +-
 src/npc/syrup.c                          |   4 +-
 src/npc/talon.c                          |   4 +-
 src/npc/townMinish.c                     |  26 ++--
 src/npc/townsperson.c                    |  10 +-
 src/npc/windTribespeople.c               |   9 +-
 src/npc/zelda.c                          | 154 +++++++++++------------
 src/object/greatFairy.c                  |  15 +--
 src/object/houseDoorExterior.c           |  11 +-
 src/room.c                               |  71 +++++------
 src/script.c                             |   6 +-
 src/sub_0804AFF4.c                       |   1 -
 src/sub_08050008.c                       |   2 -
 src/sub_08050024.c                       |   1 -
 src/sub_0807B7D8.c                       |   5 +-
 src/sub_0807B820.c                       |   5 +-
 src/sub_0807B8A8.c                       |   5 +-
 src/sub_0807B930.c                       |   5 +-
 tools/script_disassembler/definitions.py |   2 +-
 39 files changed, 253 insertions(+), 332 deletions(-)

diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc
index 47f4bfa7..3e273e5c 100644
--- a/data/scripts/script_0800E8D6.inc
+++ b/data/scripts/script_0800E8D6.inc
@@ -11,5 +11,5 @@ script_0800E8D6:
 	SetLocalFlag 0x0091
 	TextboxNoOverlapFollow 0x4508
 	_0807EA94 
-	Call FUN_0806c598
+	Call sub_0806C598
 SCRIPT_END
diff --git a/include/greatFairy.h b/include/greatFairy.h
index ae78ffda..d5e4906b 100644
--- a/include/greatFairy.h
+++ b/include/greatFairy.h
@@ -46,9 +46,4 @@ extern u8 gUnk_0812079C[8];
 extern s16 gSineTable[];
 extern s8 gUnk_081207AC[];
 
-typedef struct {
-    s32 unk0;
-    s32 unk4;
-} struct_08087424;
-
 #endif
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index 76a9b18c..142eb474 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -168,11 +168,11 @@ void sub_08054524(void) {
 }
 #endif
 
-void sub_08054564(void) {
+void sub_08054564() {
     gRoomVars.filler[2] = 1;
 }
 
-void sub_08054570(void) {
+void sub_08054570() {
     gRoomVars.filler[2] = 0;
 }
 
diff --git a/src/code_0805EC04.c b/src/code_0805EC04.c
index 1981f507..6c847707 100644
--- a/src/code_0805EC04.c
+++ b/src/code_0805EC04.c
@@ -104,4 +104,4 @@ void sub_0805ED14(u32 param_1) {
     gPlayerState.field_0x9c = param_1;
     gPlayerState.field_0x98 = 0;
     gPlayerState.field_0x9a = 0;
-}
\ No newline at end of file
+}
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index f1b039f4..a3aebc73 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -101,7 +101,6 @@ void sub_08031770(Entity* this) {
             this->attachedEntity = NULL;
         }
     }
-    return;
 }
 
 void sub_080317B4(Entity* this) {
diff --git a/src/entity.c b/src/entity.c
index cb81ae21..2e99ed68 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -122,7 +122,6 @@ void ClearAllDeletedEntities(void) {
             ClearDeletedEntity(ent);
         }
     } while (ent++, ent < (&gPlayerEntity + 80));
-    return;
 }
 
 extern u8 gEntCount;
diff --git a/src/intro.c b/src/intro.c
index 9bc22124..891544d3 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -212,7 +212,6 @@ static void UpdatePressStartIcon(void) {
     gOamCmd.x = 120;
     gOamCmd.y = 152;
     sub_080ADA14(511, 1);
-    return;
 }
 
 static void UpdateSwordBgAffineData(void) {
diff --git a/src/npc/anju.c b/src/npc/anju.c
index b0b0ee91..f5cc69a0 100644
--- a/src/npc/anju.c
+++ b/src/npc/anju.c
@@ -38,7 +38,6 @@ void Anju(Entity* this) {
             if (UpdateFuseInteraction(this)) {
                 this->action = 1;
             }
-        default:
     }
 }
 
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 9e7a5755..0e9a95ff 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -148,17 +148,17 @@ void sub_0806346C(Entity* this) {
     }
 }
 
-void sub_080634E4(Entity* this, u32* param_1) {
-    param_1[1] = this->type2;
+void sub_080634E4(Entity* this, ScriptExecutionContext* context) {
+    context->unk_04 = this->type2;
 }
 
 void sub_080634EC(Entity* this) {
     gRoomVars.itemForSaleIndex = gUnk_0810C88C[this->type2];
 }
 
-void sub_08063504(Entity* this, u32* param_2) {
+void sub_08063504(Entity* this, ScriptExecutionContext* context) {
     u32 uVar1;
 
     uVar1 = sub_080544DC(gUnk_0810C88C[this->type2]);
-    param_2[5] = BOOLCAST(uVar1);
+    context->condition = BOOLCAST(uVar1);
 }
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 913f30cc..10bf8d4a 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -195,53 +195,50 @@ void sub_08068C6C(Entity* this) {
     sub_080A7C18(gUnk_0811162B[this->actionDelay] & 0xffffff7f, 0, 0);
 }
 
-void sub_08068C8C(Entity* param_1, Entity* param_2) {
+void sub_08068C8C(Entity* this, ScriptExecutionContext* context) {
     u8* arr = gUnk_0811162B + 0xd;
-
-    *(u32*)&param_2->animationState = *(u32*)(arr + param_1->actionDelay * 4);
+    context->condition = *(u32*)(arr + this->actionDelay * 4);
 }
 
-void sub_08068CA0(Entity* param_1, Entity* param_2) {
+void sub_08068CA0(Entity* this, ScriptExecutionContext* context) {
     u8 bVar1;
     u32 uVar2;
 
-    bVar1 = param_1->type;
+    bVar1 = this->type;
     if (bVar1 == 1) {
-        *(u32*)&param_2->animationState = bVar1;
+        context->condition = bVar1;
         uVar2 = GetInventoryValue(0x48); // spin attack
         if (uVar2 == 0) {
-            *(u32*)&param_2->animationState = 0;
+            context->condition = 0;
         }
         uVar2 = GetInventoryValue(0x4b); // rock breaker
         if (uVar2 == 0) {
-            *(u32*)&param_2->animationState = 0;
+            context->condition = 0;
         }
         uVar2 = GetInventoryValue(0x4a); // dash attack
         if (uVar2 == 0) {
-            *(u32*)&param_2->animationState = 0;
+            context->condition = 0;
         }
         uVar2 = GetInventoryValue(0x4e); // down thrust
         if (uVar2 != 0) {
             return;
         }
     } else {
-        uVar2 = GetInventoryValue(gUnk_0811162B[param_1->actionDelay] & -0x81);
+        uVar2 = GetInventoryValue(gUnk_0811162B[this->actionDelay] & -0x81);
         if (uVar2 != 0) {
             uVar2 = 1;
         }
     }
-    *(u32*)&param_2->animationState = uVar2;
+    context->condition = uVar2;
 }
 
-void sub_08068CFC(Entity* param_1, Entity* param_2, u32 param_3, u32 param_4)
-
-{
+void sub_08068CFC(Entity* this, ScriptExecutionContext* context) {
     u8 bVar1;
     u8 itemID;
     u32 uVar2;
 
-    *(u32*)&param_2->animationState = 0;
-    bVar1 = param_1->actionDelay;
+    context->condition = 0;
+    bVar1 = this->actionDelay;
     if (bVar1 > 10)
         return;
 
@@ -302,7 +299,7 @@ LABEL1:
         return;
     }
 switchD_08068d12_caseD_0:
-    *(u32*)&param_2->animationState = 1;
+    context->condition = 1;
 }
 
 // Introduction dialoague
@@ -350,16 +347,16 @@ void sub_08068E90(Entity* this) {
     *(u16*)&s->field_0xac = (1 << (gUnk_08111740[this->actionDelay] - 1)) | *(u16*)&s->field_0xac;
 }
 
-void sub_08068EB4(void) {
+void sub_08068EB4() {
     gPlayerState.field_0xab = 0;
 }
 
-void sub_08068EC4(Entity* param_1, Entity* param_2) {
-    if (gUnk_08111740[param_1->actionDelay] == gPlayerState.field_0xab) {
-        *(u16*)&param_2->flags = gUnk_0811172A[param_1->actionDelay];
-        *(u32*)&param_2->animationState = 1;
+void sub_08068EC4(Entity* this, ScriptExecutionContext* context) {
+    if (gUnk_08111740[this->actionDelay] == gPlayerState.field_0xab) {
+        context->wait = gUnk_0811172A[this->actionDelay];
+        context->condition = 1;
     } else {
-        *(u32*)&param_2->animationState = 0;
+        context->condition = 0;
     }
 }
 
@@ -386,7 +383,6 @@ void sub_08068F3C(Entity* this) {
 }
 
 void BladeBrothers_Fusion(Entity* this) {
-
     if (this->action == 0) {
         this->action += 1;
         this->spriteSettings.b.draw = 0;
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index 37585ed0..1c6392e4 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "sprite.h"
 #include "player.h"
+#include "script.h"
 
 extern void DeleteThisEntity();
 extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
@@ -10,7 +11,6 @@ extern void sub_0805E3A0(Entity*, u32);
 extern void sub_0807DD64(Entity*);
 extern u32 GetFacingDirection(Entity*, Entity*);
 extern void sub_0806F118(Entity*);
-extern void sub_0807DDAC(Entity*, u32);
 extern void sub_0807DDE4(Entity*);
 extern u32 UpdateFuseInteraction(Entity*);
 extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
@@ -69,6 +69,6 @@ void Carpenter_Head(Entity* this) {
     }
 }
 
-void sub_080672B0(Entity* this, u32 param_2) {
-    InitializeAnimation(this, *(u32*)(param_2 + 4) + (this->animationState >> 1) + this->type * 8);
+void sub_080672B0(Entity* this, ScriptExecutionContext* context) {
+    InitializeAnimation(this, context->unk_04 + (this->animationState >> 1) + this->type * 8);
 }
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index f424c1d8..c9ec14b1 100644
--- a/src/npc/dampe.c
+++ b/src/npc/dampe.c
@@ -6,25 +6,19 @@
 #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);
 
 extern u16 gUnk_08113344[];
 extern u16 gUnk_0811334A[];
 
-typedef struct {
-    u8 filler[18];
-    u32 unk;
-} struct_0806BE84;
-
 void Dampe(Entity* this) {
-
     switch (this->action) {
         case 0:
             this->action = 1;
@@ -47,7 +41,6 @@ void Dampe(Entity* this) {
             if (UpdateFuseInteraction(this)) {
                 this->action = 1;
             }
-        default:
     }
 }
 
@@ -66,15 +59,15 @@ void Dampe_Fusion(Entity* this) {
     }
 }
 
-void sub_0806BE84(Entity* this, struct_0806BE84* r1) {
+void sub_0806BE84(Entity* this, ScriptExecutionContext* context) {
     u32 msgIndex;
 
-    r1->unk = 0;
+    context->condition = 0;
     msgIndex = 1;
     if (!CheckLocalFlag(0x69)) {
         msgIndex = 0;
         SetLocalFlag(0x69);
-        r1->unk = 1;
+        context->condition = 1;
     }
     // Graveyard key
     if (GetInventoryValue(0x3C) >= 2) {
@@ -83,16 +76,16 @@ void sub_0806BE84(Entity* this, struct_0806BE84* r1) {
     TextboxNoOverlap(gUnk_08113344[msgIndex], this);
 }
 
-void sub_0806BEC8(Entity* this, struct_0806BE84* r1) {
+void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
     u32 hasGraveyardKey;
     u32 msgIndex;
 
     msgIndex = 0;
-    r1->unk = 0;
+    context->condition = 0;
     hasGraveyardKey = GetInventoryValue(0x3C);
     if (hasGraveyardKey == 1) {
         msgIndex = 1;
-        r1->unk = 1;
+        context->condition = 1;
     } else if (hasGraveyardKey >= 2) {
         msgIndex = 2;
     }
@@ -107,10 +100,10 @@ void sub_0806BEFC() {
     SetTileType(0x181, 0x5CF, 1);
 }
 
-void sub_0806BF44(Entity* this, struct_0806BE84* r1) {
-    r1->unk = 0;
+void sub_0806BF44(Entity* this, ScriptExecutionContext* context) {
+    context->condition = 0;
     if (((this->x.HALF.HI - gRoomControls.roomScrollX) + 0x10U < 0x110) &&
         ((this->y.HALF.HI - gRoomControls.roomScrollY) + 0x18U < 0xD0)) {
-        r1->unk = 1;
+        context->condition = 1;
     }
 }
diff --git a/src/npc/emma.c b/src/npc/emma.c
index c43b961c..7d4ac28d 100644
--- a/src/npc/emma.c
+++ b/src/npc/emma.c
@@ -10,36 +10,24 @@ extern void sub_0807DD50(Entity*);
 extern void sub_0807DD94(Entity*, u32);
 extern void DoExitTransition(u32*);
 
-void Emma(Entity* param_1)
-
-{
-    if (param_1->action == 0) {
-        param_1->action += 1;
-        sub_0805E3A0(param_1, 2);
-        sub_0807DD50(param_1);
+void Emma(Entity* this) {
+    if (this->action == 0) {
+        this->action += 1;
+        sub_0805E3A0(this, 2);
+        sub_0807DD50(this);
     } else {
-        sub_0807DD94(param_1, 0);
+        sub_0807DD94(this, 0);
     }
-    return;
 }
 
-void sub_0806C578(void)
-
-{
+void sub_0806C578() {
     DoExitTransition(&gUnk_0813AD10);
-    return;
 }
 
-void sub_0806C588(void)
-
-{
+void sub_0806C588() {
     DoExitTransition(&gUnk_0813AD24);
-    return;
 }
 
-void FUN_0806c598(void)
-
-{
+void sub_0806C598() {
     DoExitTransition(&gUnk_0813AD38);
-    return;
 }
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index ae684276..d4c59e30 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -39,35 +39,21 @@ void EzloCap(Entity* this) {
     UpdateAnimationSingleFrame(this);
 }
 
-typedef struct {
-    u8 unk_00[4];
-    u32 field_04;
-    u32 field_08;
-    u8 unk_0c[8];
-    u32 field_14;
-    u8 unk_18;
-    u8 field_19;
-    u8 unk_1a[3];
-    u16 field_1e;
-    u8 unk_20[2];
-    u16 field_22;
-} paramStruct;
-
-void sub_0806D8A0(Entity* this, paramStruct* param_2) {
+void sub_0806D8A0(Entity* this, ScriptExecutionContext* context) {
     s32 xOffset;
     s32 yOffset;
 
-    param_2->field_19 = 8;
-    param_2->field_08 |= 2;
-    param_2->field_14 = 0;
+    context->unk_19 = 8;
+    context->unk_08 |= 2;
+    context->condition = 0;
     xOffset = 16;
     if (this->spriteSettings.b.flipX) {
         xOffset = -xOffset;
     }
     xOffset += gPlayerEntity.x.HALF.HI;
     yOffset = gPlayerEntity.y.HALF.HI + 2;
-    param_2->field_1e = xOffset;
-    param_2->field_22 = yOffset;
+    context->unk_1C.HALF.HI = xOffset;
+    context->unk_20.HALF.HI = yOffset;
 
     xOffset -= this->x.HALF.HI;
     this->direction = sub_080045DA(xOffset, yOffset - this->y.HALF.HI);
@@ -119,15 +105,15 @@ void NPC4E(Entity* this) {
     }
 }
 
-void sub_0806DA04(Entity* this, u32* param_2) {
+void sub_0806DA04(Entity* this, ScriptExecutionContext* context) {
     // TODO gUnk_0811415C should be a gUnk_0810C89C_struct[], but then a lot of bytes everywhere are wrong?
     gUnk_0810C89C_struct* a = (gUnk_0810C89C_struct*)&(
-        (gUnk_0810C89C_struct*)gUnk_0811415C)[param_2[1]]; // cast necessary to no longer make it a const* ?
+        (gUnk_0810C89C_struct*)gUnk_0811415C)[context->unk_04]; // cast necessary to no longer make it a const* ?
     sub_08078850(this, 1, a->unk_04, a);
 }
 
-void sub_0806DA1C(Entity* this, u32* param_2) {
-    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[param_2[1]], (u32)(gUnk_081141E4[param_2[1]]));
+void sub_0806DA1C(Entity* this, ScriptExecutionContext* context) {
+    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->unk_04], (u32)(gUnk_081141E4[context->unk_04]));
 }
 
 // Returns the kinstone id?
@@ -168,10 +154,8 @@ u8 sub_0806DA3C(Entity* this) {
 }
 
 // Check whether a kinstone fusion is possible and store the result somewhere in param_2?
-void sub_0806DAAC(Entity* this, u32* param_2) {
-    u32 uVar1;
-    uVar1 = CheckKinstoneFused(sub_0806DA3C(this));
-    param_2[5] = uVar1;
+void sub_0806DAAC(Entity* this, ScriptExecutionContext* context) {
+    context->condition = CheckKinstoneFused(sub_0806DA3C(this));
     gActiveScriptInfo.flags |= 1;
 }
 
@@ -202,18 +186,16 @@ void sub_0806DAE8(Entity* this) {
     SoundReq(0xcd);
 }
 
-// Unknown param_2 struct
-void sub_0806DB44(Entity* this, u32* param_2) {
-    param_2[5] = 0;
+void sub_0806DB44(Entity* this, ScriptExecutionContext* context) {
+    context->condition = 0;
 
     if (CheckLocalFlag(0xee) != 0 && CheckLocalFlag(0xef) != 0 && CheckLocalFlag(0xf0) != 0 &&
         CheckLocalFlag(0xf1) != 0 && CheckLocalFlag(0xf2) != 0) {
-        param_2[5] = 1;
+        context->condition = 1;
     }
 }
 
-// The unused param just had to be added, so that a mov r1, #0 in NPC4E_Fusion is matching correctly
-void sub_0806DB84(Entity* this, u8 unused) {
+void sub_0806DB84(Entity* this, ScriptExecutionContext* context) {
     Entity* ent;
     this->hitbox = (Hitbox*)&gUnk_08114154;
     ent = CreateObject(0x3e, 4, 0);
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index ce829a81..5f1686c4 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -224,11 +224,11 @@ void sub_080602BC(Entity* this) {
     TextboxNoOverlap(gUnk_0810A362[index], this);
 }
 
-void sub_0806030C(Entity* this, u32* arg1) {
-    ModBombs(*(arg1 + 1));
+void sub_0806030C(Entity* this, ScriptExecutionContext* context) {
+    ModBombs(context->unk_04);
 }
 
-void sub_08060318(void) {
+void sub_08060318() {
     Entity* ent;
     int i;
 
@@ -241,11 +241,11 @@ void sub_08060318(void) {
     }
 }
 
-void sub_08060340(void) {
+void sub_08060340() {
     gSave.unk490 = gSave.unk50;
 }
 
-u32 sub_08060354(void) {
+u32 sub_08060354() {
     u32 iVar1;
     s32 iVar2;
 
diff --git a/src/npc/goron.c b/src/npc/goron.c
index b0b60222..46a6e940 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -97,8 +97,8 @@ u32 sub_08069480(Entity* this) {
     return (sub_0801E99C(this) << 24) >> 24;
 }
 
-void sub_0806948C(Entity* this, u32* param_1) {
-    param_1[5] = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
+void sub_0806948C(Entity* this, ScriptExecutionContext* context) {
+    context->condition = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
     gActiveScriptInfo.flags |= 1;
 }
 
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 782253ee..3a43c14c 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -4,6 +4,7 @@
 #include "flags.h"
 #include "textbox.h"
 #include "room.h"
+#include "script.h"
 
 typedef struct {
     u32 unk;
@@ -15,11 +16,6 @@ typedef struct {
     u8 unk;
 } ScreenTransition;
 
-typedef struct {
-    u32 unk;
-    u32 unk2;
-} struct_08064050;
-
 extern void sub_08063D24(Entity*);
 extern void sub_0806ED78(Entity*);
 extern u32 GetFacingDirection(Entity*, Entity*);
@@ -27,7 +23,6 @@ extern u32 sub_0806F5A4(u32);
 extern void sub_0806EE20(Entity*);
 extern void sub_08064428(Entity*);
 extern u32 sub_0805ACC0(Entity*);
-extern void sub_0807DDAC(Entity*, u32);
 extern void sub_0807DDE4(Entity*);
 extern void sub_0807000C(Entity*);
 extern void sub_0806EE04(Entity*, void*, u32);
@@ -219,22 +214,20 @@ void sub_08064030(Entity* arg0, Entity* arg1) {
     *(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f;
 }
 
-void sub_08064044(void) {
+void sub_08064044() {
     gScreenTransition.unk = 1;
 }
 
-void sub_08064050(Entity* arg0, struct_08064050* arg1) {
-    u32 unk;
-
-    arg1->unk2 = 0;
-    switch (arg0->type2) {
+void sub_08064050(Entity* this, ScriptExecutionContext* context) {
+    context->unk_04 = 0;
+    switch (this->type2) {
         case 0x11:
-            arg1->unk2 = 1;
+            context->unk_04 = 1;
             break;
         case 0x12:
-            arg1->unk2 = 2;
+            context->unk_04 = 2;
             break;
         case 0x13:
-            arg1->unk2 = 3;
+            context->unk_04 = 3;
     }
 }
diff --git a/src/npc/librari.c b/src/npc/librari.c
index 72b4dfbe..30c5ea99 100644
--- a/src/npc/librari.c
+++ b/src/npc/librari.c
@@ -37,15 +37,15 @@ void Librari(Entity* this) {
     }
 }
 
-void sub_0806B260(Entity* this, u32 arg1) {
+void sub_0806B260(Entity* this, ScriptExecutionContext* context) {
     u32 index;
 
-    *(u32*)(arg1 + 0x14) = 0;
+    context->condition = 0;
     // flippers
     if (!GetInventoryValue(0x46)) {
         if (CheckGlobalFlag(0x29)) {
             index = 2;
-            *(u32*)(arg1 + 0x14) = 1;
+            context->condition = 1;
         } else if (!CheckLocalFlag(0x7a)) {
             index = 0;
             SetLocalFlag(0x7a);
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 35397e80..2741f30a 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -27,7 +27,7 @@ void Simon(Entity* this) {
     }
 }
 
-void sub_0806C224(void) {
+void sub_0806C224() {
     DoExitTransition(&gUnk_0813AD60);
     gScreenTransition.transitionType = 6;
 }
@@ -38,14 +38,14 @@ void Simon_CreateChest(Entity* this) {
     SoundReq(0x73);
 }
 
-void sub_0806C280(void) {
+void sub_0806C280() {
     SetGlobalFlag(MAROYA_WAKEUP);
     DoExitTransition(&gUnk_0813AD74);
     gScreenTransition.transitionType = 6;
 }
 
-void sub_0806C2A0(u32* param_1, struct_0806C2A0* param_2) {
-    switch (param_2->unk) {
+void sub_0806C2A0(Entity* this, ScriptExecutionContext* context) {
+    switch (context->unk_04) {
         case 0:
             DoFade(0xd, 4);
             break;
diff --git a/src/npc/smith.c b/src/npc/smith.c
index 3502d8bf..2ae9e7f7 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -16,7 +16,7 @@ extern void sub_0807DD50(Entity*);
 extern void sub_0807DDE4(Entity*);
 extern u32 UpdateFuseInteraction(Entity*);
 extern u32 GetAnimationState(Entity*);
-extern void sub_08078850(u32, u32, u32, u32*);
+extern void sub_08078850(Entity*, u32, u32, u32*);
 extern void sub_08078784(Entity*, u32);
 
 extern void (*const gUnk_08110360[])(Entity*);
@@ -160,16 +160,16 @@ void sub_0806622C(Entity* this) {
 void nullsub_501(Entity* this) {
 }
 
-void sub_08066258(void) {
+void sub_08066258() {
     SoundReq(gUnk_081103D0[Random() & 7]);
 }
 
-void sub_08066274(u32 arg0) {
-    sub_08078850(arg0, 1, 0, &gUnk_081103E0);
+void sub_08066274(Entity* this) {
+    sub_08078850(this, 1, 0, &gUnk_081103E0);
 }
 
-void sub_08066288(Entity* arg0) {
-    sub_08078784(arg0, arg0->field_0x68.HALF.LO);
+void sub_08066288(Entity* this) {
+    sub_08078784(this, this->field_0x68.HALF.LO);
 }
 
 void Smith_Fusion(Entity* this) {
diff --git a/src/npc/stamp.c b/src/npc/stamp.c
index a30d31ad..870060ef 100644
--- a/src/npc/stamp.c
+++ b/src/npc/stamp.c
@@ -74,9 +74,7 @@ void sub_08062CA4(Entity* ent) {
 }
 
 void sub_08062CBC(Entity* ent) {
-    u32 uVar1;
-
-    uVar1 = CheckKinstoneFused(44);
+    u32 uVar1 = CheckKinstoneFused(44);
     ShowNPCDialogue(ent, &gUnk_0810C2E4[(-uVar1 | uVar1) >> 31]);
 }
 
diff --git a/src/npc/syrup.c b/src/npc/syrup.c
index 307c75bd..7ca47dc1 100644
--- a/src/npc/syrup.c
+++ b/src/npc/syrup.c
@@ -56,8 +56,8 @@ void sub_0806A26C(Entity* this) {
         if (uVar2 = Random(), uVar2) {
             unk = -unk; // wtf?!
         }
-        pEVar1->spriteOffsetX = gUnk_081121DC[uVar2 & 7];
-        pEVar1->spriteOffsetY = gUnk_081121DC[(uVar2 / 256) & 7] - 8;
+        pEVar1->spriteOffsetX = gUnk_081121D4[uVar2 & 7];
+        pEVar1->spriteOffsetY = gUnk_081121D4[(uVar2 / 256) & 7] - 8;
     }
 }
 #else
diff --git a/src/npc/talon.c b/src/npc/talon.c
index 45278133..c3a680a2 100644
--- a/src/npc/talon.c
+++ b/src/npc/talon.c
@@ -134,12 +134,12 @@ void sub_0806574C(Entity* this) {
     this->field_0x6a.HALF.LO = this->animIndex;
 }
 
-void sub_08065780(Entity* this, u16* param_2) {
+void sub_08065780(Entity* this, ScriptExecutionContext* context) {
     u32 rand;
 
     rand = Random();
     this->animationState = rand & 6;
-    param_2[8] = gUnk_0810FED8[rand >> 8 & 7];
+    context->wait = gUnk_0810FED8[rand >> 8 & 7];
 }
 
 void Talon_Head(Entity* this) {
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 3f97b540..1aeca5b2 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -14,7 +14,7 @@ extern u32 sub_080002C0();
 extern void sub_0806ACC4(Entity*);
 extern void sub_0806AEA8();
 extern void sub_0806AEE4(Entity*);
-extern void sub_0806AFE8(Entity*, s32*);
+extern void sub_0806AFE8(Entity*, ScriptExecutionContext*);
 extern s32 sub_0806EDD8(Entity*, u32, u32);
 extern u32 sub_0806F5B0(u32);
 extern void sub_08078784(Entity*, u32);
@@ -26,7 +26,7 @@ extern u32 gUnk_081126D4[4];
 extern u8 gUnk_081126E4[4];
 extern void (*gUnk_081126E8[])();
 extern Dialog gUnk_081126F0[0x10];
-extern void (*gUnk_08112BF0[])(Entity*, s32*);
+extern void (*gUnk_08112BF0[])(Entity*, ScriptExecutionContext*);
 extern u16 gUnk_08112C40[5];
 extern u16 gUnk_08112C4A[3];
 extern u16 gUnk_08112C50[6];
@@ -118,7 +118,7 @@ void sub_0806ACC4(Entity* this) {
                     this->action = 2;
                     this->interactType = 0;
                     InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 8);
-                    sub_0806AFE8(this, *(s32**)&this->cutsceneBeh);
+                    sub_0806AFE8(this, *(ScriptExecutionContext**)&this->cutsceneBeh);
                 }
                 if (this->type == 1) {
                     u8 idx = gPlayerEntity.animationState >> 1;
@@ -223,19 +223,19 @@ void sub_0806AEE4(Entity* this) {
     }
 }
 
-void sub_0806AF60(Entity* this, int* idx) {
-    InitializeAnimation(this, idx[1] + (this->animationState / 2));
+void sub_0806AF60(Entity* this, ScriptExecutionContext* context) {
+    InitializeAnimation(this, context->unk_04 + (this->animationState / 2));
 }
 
-void sub_0806AF70(Entity* this, u32 arg1) {
+void sub_0806AF70(Entity* this, ScriptExecutionContext* context) {
     this->field_0x20 = 0x24000;
 }
 
-void sub_0806AF78(Entity* this, u32 arg1) {
+void sub_0806AF78(Entity* this, ScriptExecutionContext* context) {
     sub_08003FC4(this, 0x1800);
     if (0 <= this->height.WORD && this->field_0x20 < 1) {
         this->height.WORD = 0;
-        sub_0806AF70(this, arg1);
+        sub_0806AF70(this, context);
     }
 }
 
@@ -253,12 +253,12 @@ void sub_0806AFBC(Entity* this) {
     ShowNPCDialogue(this, gUnk_081126F0 + this->type2 * 8 + idx);
 }
 
-void sub_0806AFE8(Entity* this, s32* unk) {
-    unk[5] = 0;
-    gUnk_08112BF0[this->type2](this, unk);
+void sub_0806AFE8(Entity* this, ScriptExecutionContext* context) {
+    context->condition = 0;
+    gUnk_08112BF0[this->type2](this, context);
 }
 
-void sub_0806B004(Entity* this, int* unk) {
+void sub_0806B004(Entity* this, ScriptExecutionContext* context) {
     int idx = 0;
 
     if (CheckGlobalFlag(0x29)) {
@@ -267,7 +267,7 @@ void sub_0806B004(Entity* this, int* unk) {
                 idx = 3;
                 if (CheckLocalFlag(0x78) == 0) {
                     idx = 2;
-                    unk[5] = 1;
+                    context->condition = 1;
                     SetLocalFlag(0x78);
                 }
             } else {
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index 26e063a2..9b097489 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -16,11 +16,6 @@ typedef struct {
     u8 unk3;
 } struct_0810B680;
 
-typedef struct {
-    u32 unk;
-    u32 unk2;
-} struct_08061FB8;
-
 extern void (*const gUnk_0810B774[])(Entity*);
 extern void (*const gUnk_0810B77C[])(Entity*);
 extern void sub_08061CB4(Entity*, u32);
@@ -183,6 +178,7 @@ void sub_08061E70(Entity* this) {
     }
 }
 
+// FIXME this is actually (Entity* this, ScriptExecutionContext* context)
 void sub_08061E90(Entity* this, Entity* arg1) {
     u32 animIndex;
     s32 iVar4;
@@ -258,10 +254,10 @@ void sub_08061FB0(Entity* this) {
     this->hitbox = NULL;
 }
 
-void sub_08061FB8(Entity* this, struct_08061FB8* arg1) {
+void sub_08061FB8(Entity* this, ScriptExecutionContext* context) {
     u8* temp = gUnk_0810B748;
 
-    sub_08078850(this, 1, temp[arg1->unk2], &gUnk_0810B740[arg1->unk2]);
+    sub_08078850(this, 1, temp[context->unk_04], &gUnk_0810B740[context->unk_04]);
 }
 
 void sub_08061FD8(Entity* this) {
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index 09a9b2cb..bbecda9b 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -21,7 +21,7 @@ extern void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
 extern void sub_0807000C(Entity*);
 
 extern void (*const gUnk_08113A7C[])(Entity*);
-extern void (*const gUnk_08113A8C[])(Entity*, Entity*);
+extern void (*const gUnk_08113A8C[])(Entity*, ScriptExecutionContext*);
 
 extern SpriteLoadData gUnk_08113A1C[];
 extern u32 script_08014A80;
@@ -111,10 +111,9 @@ void WindTribespeople_Head(Entity* this) {
     }
 }
 
-// body and head entities?
-void sub_0806C90C(Entity* param_1, Entity* param_2) {
-    *(u32*)&param_2->animationState = 0;
-    gUnk_08113A8C[param_1->type2](param_1, param_2);
+void sub_0806C90C(Entity* this, ScriptExecutionContext* context) {
+    context->condition = 0;
+    gUnk_08113A8C[this->type2](this, context);
 }
 
 void sub_0806C928(Entity* this) {
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index fad1be75..1eb8420f 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -24,59 +24,59 @@ extern RoomControls gRoomControls;
 extern void (*gUnk_08110BD8[])(Entity* ent);
 extern u16 gUnk_08110BE0[];
 
-void Zelda(Entity* ent) {
-    gUnk_08110BD8[ent->action](ent);
+void Zelda(Entity* this) {
+    gUnk_08110BD8[this->action](this);
 }
 
-void sub_08066CCC(Entity* ent) {
-    ent->action = 1;
-    ent->spriteSettings.b.draw = 1;
-    PrependEntityToList(ent, 7);
-    sub_0805E3A0(ent, 2);
-    sub_0807DD50(ent);
+void sub_08066CCC(Entity* this) {
+    this->action = 1;
+    this->spriteSettings.b.draw = 1;
+    PrependEntityToList(this, 7);
+    sub_0805E3A0(this, 2);
+    sub_0807DD50(this);
 }
 
-void sub_08066CF8(Entity* ent) {
-    sub_0807DD94(ent, NULL);
+void sub_08066CF8(Entity* this) {
+    sub_0807DD94(this, NULL);
 }
 
-void sub_08066D04(Entity* ent) {
-    ent->parent = FindEntityBySubtype(7, 0x2E);
+void sub_08066D04(Entity* this) {
+    this->parent = FindEntityBySubtype(7, 0x2E);
 }
 
-void sub_08066D14(Entity* ent, u32* param_2) {
+void sub_08066D14(Entity* this, ScriptExecutionContext* context) {
     Entity* parent;
 
-    parent = ent->parent;
+    parent = this->parent;
     if (parent != NULL) {
-        ent->animationState = parent->animationState;
-        ent->spriteSettings.b.draw = 1;
-        CopyPosition(parent, ent);
-        sub_08068680(ent, ent->parent);
-        param_2[5] = 1;
+        this->animationState = parent->animationState;
+        this->spriteSettings.b.draw = 1;
+        CopyPosition(parent, this);
+        sub_08068680(this, this->parent);
+        context->condition = 1;
     } else {
-        param_2[5] = 0;
+        context->condition = 0;
     }
 }
 
-void sub_08066D4C(Entity* ent, u32* param_2) {
+void sub_08066D4C(Entity* this, ScriptExecutionContext* context) {
     Entity* parent;
 
-    parent = ent->parent;
-    if (ent->parent != NULL) {
-        CopyPosition(ent, parent);
-        ent->parent->spriteSettings.b.draw = 1;
-        ent->parent->animationState = ent->animationState;
-        ent->spriteSettings.b.draw = 0;
-        ent->field_0x17 &= 0xFE;
-        sub_08068694(ent, ent->parent);
-        param_2[5] = 1;
+    parent = this->parent;
+    if (this->parent != NULL) {
+        CopyPosition(this, parent);
+        this->parent->spriteSettings.b.draw = 1;
+        this->parent->animationState = this->animationState;
+        this->spriteSettings.b.draw = 0;
+        this->field_0x17 &= 0xFE;
+        sub_08068694(this, this->parent);
+        context->condition = 1;
     } else {
-        param_2[5] = 0;
+        context->condition = 0;
     }
 }
 
-void sub_08066D94(Entity* ent) {
+void sub_08066D94(Entity* this) {
     u32 roomID;
     Entity* npc;
 
@@ -85,94 +85,94 @@ void sub_08066D94(Entity* ent) {
     if (npc != NULL) {
         npc->animationState = gPlayerEntity.animationState;
         npc->flags |= 0x20;
-        npc->animationState = GetAnimationState(ent);
+        npc->animationState = GetAnimationState(this);
         roomID = gRoomControls.roomID;
         npc->field_0x74.HWORD = roomID;
-        CopyPosition(ent, npc);
+        CopyPosition(this, npc);
     }
     DeleteThisEntity();
 }
 
-void sub_08066DE4(Entity* ent) {
+void sub_08066DE4(Entity* this) {
     Entity* pEVar1;
 
     pEVar1 = FindEntityBySubtype(7, 0x2E);
     if (pEVar1 != NULL) {
-        CopyPosition(ent, pEVar1);
-        sub_080686C4(ent, pEVar1);
+        CopyPosition(this, pEVar1);
+        sub_080686C4(this, pEVar1);
     }
 }
 
-void sub_08066E08(Entity* ent) {
-    InitAnimationForceUpdate(ent, 0x50);
-    ent->field_0x80.HWORD = ent->animIndex;
+void sub_08066E08(Entity* this) {
+    InitAnimationForceUpdate(this, 0x50);
+    this->field_0x80.HWORD = this->animIndex;
 }
 
-void sub_08066E20(Entity* ent) {
-    InitAnimationForceUpdate(ent, 0x44);
-    ent->field_0x80.HWORD = ent->animIndex;
+void sub_08066E20(Entity* this) {
+    InitAnimationForceUpdate(this, 0x44);
+    this->field_0x80.HWORD = this->animIndex;
 }
 
-void sub_08066E38(Entity* ent) {
-    InitAnimationForceUpdate(ent, 0x48);
-    ent->field_0x80.HWORD = ent->animIndex;
+void sub_08066E38(Entity* this) {
+    InitAnimationForceUpdate(this, 0x48);
+    this->field_0x80.HWORD = this->animIndex;
 }
 
-void sub_08066E50(Entity* ent) {
-    InitAnimationForceUpdate(ent, 0x4C);
-    ent->field_0x80.HWORD = ent->animIndex;
+void sub_08066E50(Entity* this) {
+    InitAnimationForceUpdate(this, 0x4C);
+    this->field_0x80.HWORD = this->animIndex;
 }
 
-void sub_08066E68(Entity* ent) {
-    InitAnimationForceUpdate(ent, 0x54);
-    ent->field_0x80.HWORD = ent->animIndex;
+void sub_08066E68(Entity* this) {
+    InitAnimationForceUpdate(this, 0x54);
+    this->field_0x80.HWORD = this->animIndex;
 }
 
-void sub_08066E80(Entity* ent, u8* param_2) {
-    switch (param_2[0x18]) {
+void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
+    switch (context->unk_18) {
         case 0:
-            param_2[0x18]++;
-            InitAnimationForceUpdate(ent, 0x16);
+            context->unk_18++;
+            InitAnimationForceUpdate(this, 0x16);
             break;
         case 1:
-            UpdateAnimationSingleFrame(ent);
-            if (ent->frames.all & 1) {
-                param_2[0x18]++;
-                ent->field_0x20 = 0x20000;
-                ent->frames.all &= 0xFE;
+            UpdateAnimationSingleFrame(this);
+            if (this->frames.all & 1) {
+                context->unk_18++;
+                this->field_0x20 = 0x20000;
+                this->frames.all &= 0xFE;
                 SoundReq(0x7C);
             }
             break;
         case 2:
-            sub_0806F62C(ent, 0x100, 0x80);
-            sub_08003FC4(ent, 0x2000);
-            if (!(ent->frames.all & 1)) {
-                UpdateAnimationSingleFrame(ent);
+            sub_0806F62C(this, 0x100, 0x80);
+            sub_08003FC4(this, 0x2000);
+            if (!(this->frames.all & 1)) {
+                UpdateAnimationSingleFrame(this);
             }
-            if (ent->field_0x20 < 0) {
-                param_2[0x18]++;
+            if (this->field_0x20 < 0) {
+                context->unk_18++;
             }
             break;
         case 3:
-            sub_0806F62C(ent, 0x100, 0x80);
-            UpdateAnimationSingleFrame(ent);
-            if (sub_08003FC4(ent, 0x2000) == 0) {
-                param_2[0x18]++;
-                InitAnimationForceUpdate(ent, 0x1E);
+            sub_0806F62C(this, 0x100, 0x80);
+            UpdateAnimationSingleFrame(this);
+            if (sub_08003FC4(this, 0x2000) == 0) {
+                context->unk_18++;
+                InitAnimationForceUpdate(this, 0x1E);
             }
             break;
         case 4:
-            UpdateAnimationSingleFrame(ent);
-            if (ent->frames.b.f3) {
+            UpdateAnimationSingleFrame(this);
+            if (this->frames.b.f3) {
                 gActiveScriptInfo.flags |= 1;
                 return;
             }
     }
-    ent->field_0x80.HWORD = ent->animIndex;
+    this->field_0x80.HWORD = this->animIndex;
     gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_08066F94(void) {
+void sub_08066F94() {
     u16 uVar1;
     u16* puVar2;
 
@@ -184,7 +184,7 @@ void sub_08066F94(void) {
     }
 }
 
-void sub_08066FB8(void) {
+void sub_08066FB8() {
     u16 uVar1;
     u16* puVar2;
 
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index b4c07923..c52456ab 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -6,6 +6,7 @@
 #include "greatFairy.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 enum {
     BEHAVIORS,
@@ -517,7 +518,7 @@ void sub_080873D0(Entity* this) {
     }
 }
 
-void sub_080873FC(void) {
+void sub_080873FC() {
     Entity* ent;
 
     SoundReq(0xf7);
@@ -528,7 +529,7 @@ void sub_080873FC(void) {
     }
 }
 
-void sub_08087424(Entity* arg0, struct_08087424* arg1) {
+void sub_08087424(Entity* this, ScriptExecutionContext* context) {
     Entity* ent;
 
     sub_080791D0();
@@ -539,9 +540,9 @@ void sub_08087424(Entity* arg0, struct_08087424* arg1) {
         sub_0805E3A0(ent, 2);
     }
 
-    switch (arg1->unk4) {
+    switch (context->unk_04) {
         case 0:
-            gSave.stats.arrowCount = arg1->unk4;
+            gSave.stats.arrowCount = 0;
             break;
         case 1:
             gSave.stats.bombCount = 0;
@@ -549,14 +550,14 @@ void sub_08087424(Entity* arg0, struct_08087424* arg1) {
     }
 }
 
-void sub_0808747C(u32 arg0, u32 arg1) {
-    u32 iVar1;
+void sub_0808747C(Entity* this, ScriptExecutionContext* context) {
+    u32 iVar1 = 0;
 
     iVar1 = (u32)FindEntityInListByForm(0x6, 0xf, 0x6, 0xb, 0x0);
     if (iVar1 != 0) {
         iVar1 = 1;
     }
-    *(u32*)(arg1 + 0x14) = iVar1;
+    context->condition = iVar1;
 }
 
 // clang-format off
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c
index d500686c..3dbca161 100644
--- a/src/object/houseDoorExterior.c
+++ b/src/object/houseDoorExterior.c
@@ -174,11 +174,10 @@ static u8 sub_08086954(Entity* this) {
     return this->actionDelay;
 }
 
-// TODO: Second arg is some unknown struct.
-void sub_080869A4(Entity* entityA, u32* entityB) {
-    entityB[5] = 0;
-    if (!sub_08086954(entityA)) {
-        entityA->actionDelay = 8;
-        entityB[5] = 1;
+void sub_080869A4(Entity* this, ScriptExecutionContext* context) {
+    context->condition = 0;
+    if (!sub_08086954(this)) {
+        this->actionDelay = 8;
+        context->condition = 1;
     }
 }
diff --git a/src/room.c b/src/room.c
index dd7e34f5..3b268657 100644
--- a/src/room.c
+++ b/src/room.c
@@ -10,6 +10,7 @@
 #include "main.h"
 #include "structures.h"
 #include "save.h"
+#include "script.h"
 
 void sub_0804B3C4(void* arg0) {
     sub_0804B29C(arg0);
@@ -981,7 +982,7 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1)
 }
 #else
 NAKED
-void sub_0804BF38(u32 arg0, void* arg1) {
+void sub_0804BF38(Entity* this, ScriptExecutionContext* context) {
     asm(".include \"asm/non_matching/sub_0804BF38.inc\"");
 }
 #endif
@@ -3568,7 +3569,7 @@ void sub_0804D780(void) {
 
 extern u16 gUnk_080EAE00;
 
-void sub_0804D7EC(void) {
+void sub_0804D7EC() {
     u16 temp;
     u16* tilePos;
 
@@ -3580,7 +3581,7 @@ void sub_0804D7EC(void) {
     }
 }
 
-void sub_0804D810(void) {
+void sub_0804D810() {
     u16 uVar1;
     u16* puVar2;
 
@@ -4795,7 +4796,7 @@ void sub_0804E7DC(void) {
 
 extern u32 script_08009E58;
 
-void sub_0804E864(void) {
+void sub_0804E864() {
     gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90;
     gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
     sub_080751E8(1, 6, &script_08009E58);
@@ -5680,35 +5681,35 @@ void sub_0804F680(Entity* parent, s32 x, s32 y) {
     }
 }
 
-void sub_0804F6A8(Entity* arg0) {
-    sub_0804F680(arg0, 0x1d8, 0x108);
-    sub_0804F680(arg0, 0x218, 0x188);
+void sub_0804F6A8(Entity* this) {
+    sub_0804F680(this, 0x1d8, 0x108);
+    sub_0804F680(this, 0x218, 0x188);
 }
 
-void sub_0804F6C8(Entity* arg0) {
-    sub_0804F680(arg0, 0x1e8, 0x108);
-    sub_0804F680(arg0, 0x208, 0x188);
+void sub_0804F6C8(Entity* this) {
+    sub_0804F680(this, 0x1e8, 0x108);
+    sub_0804F680(this, 0x208, 0x188);
 }
 
-void sub_0804F6E8(Entity* arg0) {
-    sub_0804F680(arg0, 0x1f8, 0x108);
-    sub_0804F680(arg0, 0x258, 0x138);
-    sub_0804F680(arg0, 0x1f8, 0x188);
-    sub_0804F680(arg0, 0x198, 0x158);
+void sub_0804F6E8(Entity* this) {
+    sub_0804F680(this, 0x1f8, 0x108);
+    sub_0804F680(this, 0x258, 0x138);
+    sub_0804F680(this, 0x1f8, 0x188);
+    sub_0804F680(this, 0x198, 0x158);
 }
 
-void sub_0804F724(Entity* arg0) {
-    sub_0804F680(arg0, 0x208, 0x108);
-    sub_0804F680(arg0, 0x258, 0x148);
-    sub_0804F680(arg0, 0x1e8, 0x188);
-    sub_0804F680(arg0, 0x198, 0x148);
+void sub_0804F724(Entity* this) {
+    sub_0804F680(this, 0x208, 0x108);
+    sub_0804F680(this, 0x258, 0x148);
+    sub_0804F680(this, 0x1e8, 0x188);
+    sub_0804F680(this, 0x198, 0x148);
 }
 
-void sub_0804F760(Entity* arg0) {
-    sub_0804F680(arg0, 0x218, 0x108);
-    sub_0804F680(arg0, 0x258, 0x158);
-    sub_0804F680(arg0, 0x1d8, 0x188);
-    sub_0804F680(arg0, 0x198, 0x138);
+void sub_0804F760(Entity* this) {
+    sub_0804F680(this, 0x218, 0x108);
+    sub_0804F680(this, 0x258, 0x158);
+    sub_0804F680(this, 0x1d8, 0x188);
+    sub_0804F680(this, 0x198, 0x138);
 }
 
 void sub_0804F79C(Entity* parent) {
@@ -5728,62 +5729,62 @@ void sub_0804F79C(Entity* parent) {
     }
 }
 
-void sub_0804F808(void) {
+void sub_0804F808() {
     SetTileType(0x1d3, 0x41d, 1);
     SetTileType(0x1d3, 0x621, 1);
 }
 
-void sub_0804F830(void) {
+void sub_0804F830() {
     SetTileType(0x1d4, 0x41e, 1);
     SetTileType(0x1d4, 0x620, 1);
 }
 
-void sub_0804F854(void) {
+void sub_0804F854() {
     SetTileType(0x1d5, 0x41f, 1);
     SetTileType(0x1d4, 0x4e5, 1);
     SetTileType(0x1d5, 0x61f, 1);
     SetTileType(0x1d4, 0x559, 1);
 }
 
-void sub_0804F89C(void) {
+void sub_0804F89C() {
     SetTileType(0x1d6, 0x420, 1);
     SetTileType(0x1d5, 0x525, 1);
     SetTileType(0x1d6, 0x61e, 1);
     SetTileType(0x1d5, 0x519, 1);
 }
 
-void sub_0804F8E0(void) {
+void sub_0804F8E0() {
     SetTileType(0x1d3, 0x421, 1);
     SetTileType(0x1d6, 0x565, 1);
     SetTileType(0x1d3, 0x61d, 1);
     SetTileType(0x1d6, 0x4d9, 1);
 }
 
-void sub_0804F928(void) {
+void sub_0804F928() {
     sub_0807BA8C(0x41d, 1);
     sub_0807BA8C(0x621, 1);
 }
 
-void sub_0804F944(void) {
+void sub_0804F944() {
     sub_0807BA8C(0x41e, 1);
     sub_0807BA8C(0x620, 1);
 }
 
-void sub_0804F960(void) {
+void sub_0804F960() {
     sub_0807BA8C(0x41f, 1);
     sub_0807BA8C(0x4e5, 1);
     sub_0807BA8C(0x61f, 1);
     sub_0807BA8C(0x559, 1);
 }
 
-void sub_0804F994(void) {
+void sub_0804F994() {
     sub_0807BA8C(0x420, 1);
     sub_0807BA8C(0x525, 1);
     sub_0807BA8C(0x61e, 1);
     sub_0807BA8C(0x519, 1);
 }
 
-void sub_0804F9C8(void) {
+void sub_0804F9C8() {
     sub_0807BA8C(0x421, 1);
     sub_0807BA8C(0x565, 1);
     sub_0807BA8C(0x61d, 1);
diff --git a/src/script.c b/src/script.c
index 67f1a151..741673f1 100644
--- a/src/script.c
+++ b/src/script.c
@@ -579,18 +579,18 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 arg2, u32
     entity->animationState = (entity->animationState & 0x80) | gUnk_0811E514[(u32)(temp << 0x18) >> 0x1c];
 }
 
-void sub_0807DF28(void) {
+void sub_0807DF28() {
     sub_0807DF38();
     sub_08079184();
     sub_08077B20();
 }
 
-void sub_0807DF38(void) {
+void sub_0807DF38() {
     gUnk_0200AF00.filler0[1] = 0xff;
     gUnk_02034490[0] = 0xff;
 }
 
-void sub_0807DF50(void) {
+void sub_0807DF50() {
     gUnk_02034490[0] = 0;
     gUnk_0200AF00.filler0[1] = 0;
     sub_0801C4A0(0);
diff --git a/src/sub_0804AFF4.c b/src/sub_0804AFF4.c
index a7108fd6..0d14ee1e 100644
--- a/src/sub_0804AFF4.c
+++ b/src/sub_0804AFF4.c
@@ -18,7 +18,6 @@ void sub_0804AFF4(void) {
         _call_via_r0(func);
     }
     sub_0804B16C();
-    return;
 }
 
 /*
diff --git a/src/sub_08050008.c b/src/sub_08050008.c
index 4fe0e197..6d8e5103 100644
--- a/src/sub_08050008.c
+++ b/src/sub_08050008.c
@@ -11,6 +11,4 @@ void sub_08050008(u32 param_1, u32 param_2, u32 param_3) {
 
     unk = &gFadeControl;
     *(unk + 1) = -1;
-
-    return;
 }
diff --git a/src/sub_08050024.c b/src/sub_08050024.c
index b6915ab9..f3868b4b 100644
--- a/src/sub_08050024.c
+++ b/src/sub_08050024.c
@@ -18,7 +18,6 @@ extern void DoFade(u32, u32);
 void sub_08050024() {
     sub_0801E104();
     DoFade(5, 0x80 << 1);
-    return;
 }
 
 void sub_08050038(u32 arg0) {
diff --git a/src/sub_0807B7D8.c b/src/sub_0807B7D8.c
index 7ef8b080..79892047 100644
--- a/src/sub_0807B7D8.c
+++ b/src/sub_0807B7D8.c
@@ -4,9 +4,7 @@ extern void sub_08000152(u32);
 extern void sub_0807B778(u32, u32);
 extern void SetTileType(u32, u32, u32);
 
-void sub_0807B7D8(u32 param_1, u32 param_2, u32 param_3)
-
-{
+void sub_0807B7D8(u32 param_1, u32 param_2, u32 param_3) {
     if (param_1 == 53) {
         sub_08000152(53);
         sub_0807B778(param_2, param_3);
@@ -17,5 +15,4 @@ void sub_0807B7D8(u32 param_1, u32 param_2, u32 param_3)
     } else {
         SetTileType(param_1, param_2, param_3);
     }
-    return;
 }
diff --git a/src/sub_0807B820.c b/src/sub_0807B820.c
index b8ae309d..0e8bde35 100644
--- a/src/sub_0807B820.c
+++ b/src/sub_0807B820.c
@@ -2,9 +2,7 @@
 
 extern void SetTileType(u32, u32, u32);
 
-void sub_0807B820(u32 param_1)
-
-{
+void sub_0807B820(u32 param_1) {
     SetTileType(620, param_1 + -65, 1);
     SetTileType(627, param_1 + -65, 2);
     SetTileType(621, param_1 + -64, 1);
@@ -14,5 +12,4 @@ void sub_0807B820(u32 param_1)
     SetTileType(623, param_1 + -1, 1);
     SetTileType(624, param_1, 1);
     SetTileType(626, param_1 + 1, 1);
-    return;
 }
diff --git a/src/sub_0807B8A8.c b/src/sub_0807B8A8.c
index 5c008ad2..c29c35d7 100644
--- a/src/sub_0807B8A8.c
+++ b/src/sub_0807B8A8.c
@@ -2,9 +2,7 @@
 
 extern void SetTileType(u32, u32, u32);
 
-void sub_0807B8A8(u32 param_1)
-
-{
+void sub_0807B8A8(u32 param_1) {
     SetTileType(636, param_1 + -65, 1);
     SetTileType(643, param_1 + -65, 2);
     SetTileType(637, param_1 + -64, 1);
@@ -14,5 +12,4 @@ void sub_0807B8A8(u32 param_1)
     SetTileType(639, param_1 + -1, 1);
     SetTileType(640, param_1, 1);
     SetTileType(642, param_1 + 1, 1);
-    return;
 }
diff --git a/src/sub_0807B930.c b/src/sub_0807B930.c
index aae0472c..fe373eff 100644
--- a/src/sub_0807B930.c
+++ b/src/sub_0807B930.c
@@ -2,9 +2,7 @@
 
 extern void SetTileType(u32, u32, u32);
 
-void sub_0807B930(int param_1)
-
-{
+void sub_0807B930(int param_1) {
     SetTileType(652, param_1 + -65, 1);
     SetTileType(659, param_1 + -65, 2);
     SetTileType(653, param_1 + -64, 1);
@@ -14,5 +12,4 @@ void sub_0807B930(int param_1)
     SetTileType(655, param_1 + -1, 1);
     SetTileType(656, param_1, 1);
     SetTileType(658, param_1 + 1, 1);
-    return;
 }
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 22e8584c..fac5ce83 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -151,7 +151,7 @@ POINTER_MAP = {
     'sub_0806C23C': 'Simon_CreateChest',
     'sub_0801637C': 'script_0801637C+1',
     'sub_08016383': 'script_08016384',
-    'sub_0806C598': 'FUN_0806c598',
+    'sub_0806C598': 'sub_0806C598',
     'sub_080A2138': 'Windcrest_Unlock',
     'sub_080A29BC': 'CreateDust'
 }

From 5304b4759f200759c0cdddec4eb0aaa6ae1b9aaa Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sun, 7 Mar 2021 01:50:27 +0100
Subject: [PATCH 25/46] Detect CallWithArg that pass a pointer to a script as
 an argument

---
 data/scripts/script_0800A0FC.inc              |  2 +-
 data/scripts/script_0800A160.inc              |  2 +-
 data/scripts/script_0800A310.inc              |  2 +-
 data/scripts/script_0800A3D8.inc              |  4 ++--
 data/scripts/script_0800A500.inc              |  2 +-
 data/scripts/script_0800A590.inc              |  2 +-
 data/scripts/script_0800AD54.inc              |  2 +-
 data/scripts/script_080100C8.inc              |  2 +-
 data/scripts/script_080116A8.inc              |  4 ++--
 data/scripts/script_080133F8.inc              |  2 +-
 data/scripts/script_080134DC.inc              | 18 +++++++-------
 data/scripts/script_08013720.inc              | 20 ++++++++--------
 data/scripts/script_080138B4.inc              | 24 +++++++++----------
 data/scripts/script_08013BA8.inc              |  2 +-
 data/scripts/script_08015684.inc              |  2 +-
 tools/script_disassembler/definitions.py      | 16 +++++++++----
 .../script_disassembler/split_script_data.py  |  5 ++--
 17 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc
index 774a075d..46bd1328 100644
--- a/data/scripts/script_0800A0FC.inc
+++ b/data/scripts/script_0800A0FC.inc
@@ -12,7 +12,7 @@ script_0800A0FE:
 	Call sub_0807F844
 	_0807E8E4_3 
 	CallWithArg sub_0807F75C, 0x00d00060
-	CallWithArg sub_08094AE8, 0x0800a160
+	CallWithArg sub_08094AE8, script_0800A160
 	SoundReq 0x00f7
 	_0807E778 0x0002
 	DoFade6 
diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc
index 6dda1842..28d242c0 100644
--- a/data/scripts/script_0800A160.inc
+++ b/data/scripts/script_0800A160.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800A160
 	_0807E930 0x0002
 	SetEntityPositionRelative 0x00b0, 0x0080
 	CallWithArg sub_0807F98C, 0xff800000
-	CallWithArg sub_080960C4, 0x0800a1b4
+	CallWithArg sub_080960C4, script_0800A1B4
 	EndBlock 
 	SoundReq 0x0142
 	_0807EF3C 0xff80, 0x0000
diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc
index 3ddd8246..e8d67562 100644
--- a/data/scripts/script_0800A310.inc
+++ b/data/scripts/script_0800A310.inc
@@ -37,7 +37,7 @@ SCRIPT_START script_0800A310
 	Call sub_0807F2D4
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000002
-	CallWithArg sub_080960C4, 0x0800a680
+	CallWithArg sub_080960C4, script_0800A680
 	_0807E5F8 0x00000040
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc
index 4e69732f..bd3a9564 100644
--- a/data/scripts/script_0800A3D8.inc
+++ b/data/scripts/script_0800A3D8.inc
@@ -28,7 +28,7 @@ SCRIPT_START script_0800A3D8
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	SoundReq 0x0142
-	CallWithArg sub_080960C4, 0x0800a638
+	CallWithArg sub_080960C4, script_0800A638
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000004
 	SoundReq 0x0143
@@ -39,7 +39,7 @@ SCRIPT_START script_0800A3D8
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000004
 	SoundReq 0x0142
-	CallWithArg sub_080960C4, 0x0800a680
+	CallWithArg sub_080960C4, script_0800A680
 	Wait 0x0078
 	SoundReq 0x0153
 	CallWithArg sub_0807FADC, 0x00000003
diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc
index 4503d7b4..5f94f54f 100644
--- a/data/scripts/script_0800A500.inc
+++ b/data/scripts/script_0800A500.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_0800A500
 	WaitForSomething2 0x00000008
 	SoundReq 0x0142
 	_0807E610 0x00000800
-	CallWithArg sub_080960C4, 0x0800a65c
+	CallWithArg sub_080960C4, script_0800A65C
 	_0807E930 0x0002
 	Call sub_08094B0C
 	_0807EDD4 0x0068, 0x0088
diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc
index d55b6cad..fa9442e2 100644
--- a/data/scripts/script_0800A590.inc
+++ b/data/scripts/script_0800A590.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_0800A590
 	_0807EF80 0x0007
 	SoundReq 0x0142
 	_0807E610 0x00000800
-	CallWithArg sub_080960C4, 0x0800a65c
+	CallWithArg sub_080960C4, script_0800A65C
 	Wait 0x003c
 	_0807EDD4 0x0088, 0x0068
 	Wait 0x0078
diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc
index c999af5c..584626aa 100644
--- a/data/scripts/script_0800AD54.inc
+++ b/data/scripts/script_0800AD54.inc
@@ -40,7 +40,7 @@ SCRIPT_START script_0800AD54
 	Call sub_0807F2D4
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	CallWithArg sub_080960C4, 0x0800af18
+	CallWithArg sub_080960C4, script_0800AF18
 	_0807E930 0x0012
 	Call sub_0807F2D4
 	Wait 0x001e
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index 9c1b8c94..f226288c 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -59,7 +59,7 @@ script_0801015A:
 	Call sub_080A1608
 	_0807EA94 
 	_0807E878 
-	CallWithArg sub_080A1550, 0x080101ac
+	CallWithArg sub_080A1550, script_080101AC
 	JumpIfNot script_0801015A
 	SoundReq2 0x0015
 	SetRoomFlag 0x0001
diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc
index dbfb12e9..f0cee9c2 100644
--- a/data/scripts/script_080116A8.inc
+++ b/data/scripts/script_080116A8.inc
@@ -33,7 +33,7 @@ SCRIPT_START script_080116A8
 	_0807EB44 0x0000
 	_0807EF80 0x0014
 	SoundReq 0x0120
-	CallWithArg sub_08095420, 0x08011890
+	CallWithArg sub_08095420, script_08011890
 	Wait 0x00f0
 	_0807EF80 0x0016
 	SoundReq 0x01cb
@@ -50,7 +50,7 @@ SCRIPT_START script_080116A8
 	WaitForSomething2 0x00000100
 	_0807EF80 0x0014
 	SoundReq 0x01c4
-	CallWithArg sub_0809545C, 0x080118d4
+	CallWithArg sub_0809545C, script_080118D4
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00000100
 	Wait 0x003c
diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc
index ca760b2d..2eafd8d1 100644
--- a/data/scripts/script_080133F8.inc
+++ b/data/scripts/script_080133F8.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_080133F8
 	Wait 0x003c
 	_0807EF80 0x0014
 	SoundReq 0x0120
-	CallWithArg sub_08095420, 0x08013494
+	CallWithArg sub_08095420, script_08013494
 	Wait 0x005a
 	_0807EF80 0x0016
 	WaitForSomething2 0x00000080
diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc
index 38000013..293a7179 100644
--- a/data/scripts/script_080134DC.inc
+++ b/data/scripts/script_080134DC.inc
@@ -13,33 +13,33 @@ script_080134F8:
 	Call sub_0807DF28
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
-	CallWithArg sub_08095A1C, 0x08013f04
+	CallWithArg sub_08095A1C, script_08013F04
 	SoundReq 0x01cd
 	Wait 0x005a
 	BeginBlock 
 	SoundReq 0x01ce
-	CallWithArg sub_08095D54, 0x08013e04
-	CallWithArg sub_08095D54, 0x08013e28
+	CallWithArg sub_08095D54, script_08013E04
+	CallWithArg sub_08095D54, script_08013E28
 	EndBlock 
 	WaitForSomething2 0x18000000
 	BeginBlock 
 	SoundReq 0x01cf
-	CallWithArg sub_08095D8C, 0x08014054
-	CallWithArg sub_08095D8C, 0x08014074
+	CallWithArg sub_08095D8C, script_08014054
+	CallWithArg sub_08095D8C, script_08014074
 	EndBlock 
 	Wait 0x001e
 	BeginBlock 
 	SoundReq 0x01d0
-	CallWithArg sub_08095D8C, 0x080140dc
-	CallWithArg sub_08095D8C, 0x08014118
+	CallWithArg sub_08095D8C, script_080140DC
+	CallWithArg sub_08095D8C, script_08014118
 	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00002000
 	SoundReq 0x01d2
-	CallWithArg sub_08095D8C, 0x080141dc
-	CallWithArg sub_08095D8C, 0x08014210
+	CallWithArg sub_08095D8C, script_080141DC
+	CallWithArg sub_08095D8C, script_08014210
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00004000
 	Wait 0x0078
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index 9de5c1f6..05a00285 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -13,34 +13,34 @@ script_0801373C:
 	Call sub_0807DF28
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
-	CallWithArg sub_08095A1C, 0x08013f34
+	CallWithArg sub_08095A1C, script_08013F34
 	SoundReq 0x01cd
 	Wait 0x005a
 	BeginBlock 
 	SoundReq 0x01ce
-	CallWithArg sub_08095D54, 0x08013e4c
+	CallWithArg sub_08095D54, script_08013E4C
 	EndBlock 
 	WaitForSomething2 0x20000000
 	BeginBlock 
 	SoundReq 0x01cf
-	CallWithArg sub_08095D8C, 0x08014054
-	CallWithArg sub_08095D8C, 0x08014074
-	CallWithArg sub_08095D8C, 0x08014094
+	CallWithArg sub_08095D8C, script_08014054
+	CallWithArg sub_08095D8C, script_08014074
+	CallWithArg sub_08095D8C, script_08014094
 	EndBlock 
 	Wait 0x001e
 	BeginBlock 
 	SoundReq 0x01d0
-	CallWithArg sub_08095D8C, 0x080140dc
-	CallWithArg sub_08095D8C, 0x08014118
-	CallWithArg sub_08095D8C, 0x08014154
+	CallWithArg sub_08095D8C, script_080140DC
+	CallWithArg sub_08095D8C, script_08014118
+	CallWithArg sub_08095D8C, script_08014154
 	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00002000
 	SoundReq 0x01d2
-	CallWithArg sub_08095D8C, 0x080141dc
-	CallWithArg sub_08095D8C, 0x08014210
+	CallWithArg sub_08095D8C, script_080141DC
+	CallWithArg sub_08095D8C, script_08014210
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00004000
 	_0807E5F8 0x00000800
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index f3521f49..9b260191 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -13,36 +13,36 @@ script_080138D0:
 	Call sub_0807DF28
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
-	CallWithArg sub_08095A1C, 0x08013f64
+	CallWithArg sub_08095A1C, script_08013F64
 	SoundReq 0x01cd
 	Wait 0x005a
 	BeginBlock 
 	SoundReq 0x01ce
-	CallWithArg sub_08095D54, 0x08013e70
+	CallWithArg sub_08095D54, script_08013E70
 	EndBlock 
 	WaitForSomething2 0x40000000
 	BeginBlock 
 	SoundReq 0x01cf
-	CallWithArg sub_08095D8C, 0x08014054
-	CallWithArg sub_08095D8C, 0x08014074
-	CallWithArg sub_08095D8C, 0x08014094
-	CallWithArg sub_08095D8C, 0x080140b8
+	CallWithArg sub_08095D8C, script_08014054
+	CallWithArg sub_08095D8C, script_08014074
+	CallWithArg sub_08095D8C, script_08014094
+	CallWithArg sub_08095D8C, script_080140B8
 	EndBlock 
 	Wait 0x001e
 	BeginBlock 
 	SoundReq 0x01d0
-	CallWithArg sub_08095D8C, 0x080140dc
-	CallWithArg sub_08095D8C, 0x08014118
-	CallWithArg sub_08095D8C, 0x08014154
-	CallWithArg sub_08095D8C, 0x08014198
+	CallWithArg sub_08095D8C, script_080140DC
+	CallWithArg sub_08095D8C, script_08014118
+	CallWithArg sub_08095D8C, script_08014154
+	CallWithArg sub_08095D8C, script_08014198
 	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00002000
 	SoundReq 0x01d2
-	CallWithArg sub_08095D8C, 0x080141dc
-	CallWithArg sub_08095D8C, 0x08014210
+	CallWithArg sub_08095D8C, script_080141DC
+	CallWithArg sub_08095D8C, script_08014210
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00004000
 	_0807E5F8 0x00000800
diff --git a/data/scripts/script_08013BA8.inc b/data/scripts/script_08013BA8.inc
index 42a8b552..d171c4fb 100644
--- a/data/scripts/script_08013BA8.inc
+++ b/data/scripts/script_08013BA8.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08013BA8
-	CallWithArg sub_08095E7C, 0x08014248
+	CallWithArg sub_08095E7C, script_08014248
 	SoundReq 0x01d3
 	CallWithArg sub_0807F238, 0x000008e3
 	Call sub_08096028
diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc
index bb16a0f1..6c040c2e 100644
--- a/data/scripts/script_08015684.inc
+++ b/data/scripts/script_08015684.inc
@@ -29,7 +29,7 @@ SCRIPT_START script_08015684
 	WaitForSomething2 0x00000800
 	_0807EB44 0x0004
 	_0807EF80 0x0014
-	CallWithArg sub_0809545C, 0x08015754
+	CallWithArg sub_0809545C, script_08015754
 	SoundReq 0x01c4
 	Wait 0x0078
 	_0807EF80 0x0016
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index fac5ce83..8ec704a4 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -1,6 +1,10 @@
 from utils import barray_to_u16_hex, barray_to_u32_hex, barray_to_s16
 import struct
 
+ROM_OFFSET = 0x08000000
+SCRIPTS_START = 0x08008B5C
+SCRIPTS_END = 0x08016984
+
 # A list of all the commands, their correspondingScriptCommand_  functions and what kind of parameters they take
 commands = [
     {'fun': 'ScriptCommandNop', 'params': ''},
@@ -15,7 +19,7 @@ commands = [
     {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x'},
     {'fun': 'ScriptCommand_JumpAbsoluteSwitch', 'params': 'xx'},
     {'fun': 'ScriptCommand_Call', 'params': 'p'},
-    {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']},
+    {'fun': 'ScriptCommand_CallWithArg', 'params': ['px', 'p']},
     {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
     {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
     {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
@@ -181,7 +185,11 @@ def get_data_pointer(barray):
 
 def get_script_pointer(barray):
     integers = struct.unpack('I', barray)
-    return 'script_' + (struct.pack('>I', integers[0]).hex()).upper()
+    val = integers[0]
+    if val >= SCRIPTS_START and val <= SCRIPTS_END:
+        return 'script_' + (struct.pack('>I', val).hex()).upper()
+    else:
+        return '0x'+struct.pack('>I', val).hex()
 
 
 def get_script_label(u32):
@@ -285,11 +293,11 @@ parameters = {
         'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
 
-    'pw': {
+    'px': {
         'length': 4,
         'param': 'a,b',
         'expr': '	.word \\a\n	.word \\b',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr + 6:ctx.ptr + 14])[0]
+        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10])
     },
     'd': {  # Data pointer
         'length': 2,
diff --git a/tools/script_disassembler/split_script_data.py b/tools/script_disassembler/split_script_data.py
index 58ffa5a0..8d99df3b 100644
--- a/tools/script_disassembler/split_script_data.py
+++ b/tools/script_disassembler/split_script_data.py
@@ -1,3 +1,4 @@
+from definitions import ROM_OFFSET, SCRIPTS_END, SCRIPTS_START
 from script_disassembler import disassemble_script, generate_macros
 import sys
 
@@ -6,9 +7,7 @@ import sys
 
 TMC_FOLDER = '../..'
 
-ROM_OFFSET = 0x08000000
-SCRIPTS_START = 0x08008B5C
-SCRIPTS_END = 0x08016984
+
 
 # Create labels for these additional script instructions
 # Currently done by splitting the script at that point

From 5d2173f931c189db5cb0c420ae9e639dc6c8ec33 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Sun, 7 Mar 2021 23:46:40 +0100
Subject: [PATCH 26/46] replaced JumpSwitch macros with variadic versions

---
 asm/macros/scripts.inc           | 80 ++++++++++++++++----------------
 data/scripts/script_0800B0D0.inc |  2 +-
 data/scripts/script_0800B9B4.inc |  2 +-
 data/scripts/script_0800D414.inc |  4 +-
 data/scripts/script_0800E6B0.inc |  2 +-
 data/scripts/script_0800FAE4.inc |  2 +-
 data/scripts/script_080100C8.inc |  1 +
 data/scripts/script_08010264.inc |  4 +-
 data/scripts/script_080112C4.inc |  2 +-
 data/scripts/script_080136D8.inc |  2 +-
 10 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index e05e2271..dea57c36 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -36,49 +36,29 @@
 1:	.short \s - 1b
 .endm
 
-.macro JumpSwitch a,b
-	.short 0x0c06
-1:	.short \a - 1b
-	.short \b - 1b - 2
+.macro JumpSwitchOpN n label labels:vararg
+    .ifnb \labels
+    JumpSwitchOpN \n + 1 \labels
+    .else
+    .short 0x400 * (\n) + 0x6
+    .endif
 .endm
 
-.macro JumpSwitch_3 a,b,c
-	.short 0x1006
-1:	.short \a - 1b
-	.short \b - 1b - 2
-	.short \c - 1b - 4
+.macro JumpSwitchOp labels:vararg
+    JumpSwitchOpN 2 \labels
 .endm
 
-.macro JumpSwitch_4 a,b,c,d
-	.short 0x1406
-1:	.short \a - 1b
-	.short \b - 1b - 2
-	.short \c - 1b - 4
-	.short \d - 1b - 6
+.macro JumpSwitchLabel temp label labels:vararg
+    .short \label - \temp
+    .ifnb \labels
+    JumpSwitchLabel \temp - 2 \labels
+    .endif
 .endm
 
-.macro JumpSwitch_7 a,b,c,d,e,f,g
-	.short 0x2006
-1:	.short \a - 1b
-	.short \b - 1b - 2
-	.short \c - 1b - 4
-	.short \d - 1b - 6
-	.short \e - 1b - 8
-	.short \f - 1b - 10
-	.short \g - 1b - 12
-.endm
-
-.macro JumpSwitch_9 a,b,c,d,e,f,g,h,i
-	.short 0x2806
-1:	.short \a - 1b
-	.short \b - 1b - 2
-	.short \c - 1b - 4
-	.short \d - 1b - 6
-	.short \e - 1b - 8
-	.short \f - 1b - 10
-	.short \g - 1b - 12
-	.short \h - 1b - 14
-	.short \i - 1b - 16
+.macro JumpSwitch labels:vararg
+    JumpSwitchOp \labels
+1:
+    JumpSwitchLabel 1b \labels
 .endm
 
 .macro JumpAbsolute w
@@ -96,10 +76,28 @@
 	.word \w
 .endm
 
-.macro JumpAbsoluteSwitch a, b
-	.short 0x140a
-	.word \a
-	.word \b
+.macro JumpAbsoluteSwitchOpN n label labels:vararg
+    .ifnb \labels
+    JumpAbsoluteSwitchOpN \n + 2 \labels
+    .else
+    .short 0x400 * (\n) + 0xa
+    .endif
+.endm
+
+.macro JumpAbsoluteSwitchOp labels:vararg
+    JumpAbsoluteSwitchOpN 3 \labels
+.endm
+
+.macro JumpAbsoluteSwitchLabel label labels:vararg
+    .word \label
+    .ifnb \labels
+    JumpAbsoluteSwitchLabel \labels
+    .endif
+.endm
+
+.macro JumpAbsoluteSwitch labels:vararg
+    JumpAbsoluteSwitchOp \labels
+    JumpAbsoluteSwitchLabel \labels
 .endm
 
 .macro Call w
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index b5fccb39..91851cb0 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800B0D0
 	EndBlock 
 script_0800B0E8:
 	Call sub_0807F434
-	JumpSwitch_3 script_0800B0E8, script_0800B0F6, script_0800B134
+	JumpSwitch script_0800B0E8, script_0800B0F6, script_0800B134
 script_0800B0F6:
 	_0807E864 
 	Call sub_0807DF28
diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc
index 133ef817..156d0dff 100644
--- a/data/scripts/script_0800B9B4.inc
+++ b/data/scripts/script_0800B9B4.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_0800B9B4
 	EndBlock 
 script_0800B9CA:
 	Call sub_0807F434
-	JumpSwitch_3 script_0800B9CA, script_0800B9D8, script_0800B9F4
+	JumpSwitch script_0800B9CA, script_0800B9D8, script_0800B9F4
 script_0800B9D8:
 	_0807E864 
 	_0807EB74 
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index 90dabc5d..2ace1fe6 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -49,7 +49,7 @@ script_0800D4E4:
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000009
-	JumpSwitch_9 script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560
+	JumpSwitch script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560
 script_0800D510:
 	_0807EE04 0x0038, 0x0068
 	Jump script_0800D566
@@ -104,7 +104,7 @@ script_0800D5AC:
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000004
-	JumpSwitch_4 script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC
+	JumpSwitch script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC
 script_0800D5CE:
 	_0807EE04 0x0038, 0x0098
 	Jump script_0800D5F2
diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc
index b540d51a..f735c036 100644
--- a/data/scripts/script_0800E6B0.inc
+++ b/data/scripts/script_0800E6B0.inc
@@ -139,7 +139,7 @@ script_0800E832:
 	EndBlock 
 	_0807EA94 
 	_0807EB38 
-	JumpSwitch_4 script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872
+	JumpSwitch script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872
 script_0800E872:
 	BeginBlock 
 	TextboxNoOverlapFollow 0x4505
diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc
index ebab7689..05d97d17 100644
--- a/data/scripts/script_0800FAE4.inc
+++ b/data/scripts/script_0800FAE4.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800FAE4
 	SetEntityNonPlanarMovement 0x0100
 	EndBlock 
 	Call sub_0807F584
-	JumpSwitch_4 script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
+	JumpSwitch script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
 script_0800FAFC:
 	CallWithArg sub_0807F4F8, 0x0000027c
 script_0800FB06:
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index f226288c..7c6f200e 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -70,6 +70,7 @@ script_0801019E:
 script_080101A6:
 	_0807E878 
 	Jump script_0801015A
+script_080101AC:
 	BeginBlock 
 	_0807EF80 0x0008
 	Call sub_080A1648
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index 4f8f03de..7d47f95d 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -64,7 +64,7 @@ script_08010314:
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000009
-	JumpSwitch_9 script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390
+	JumpSwitch script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390
 script_08010340:
 	_0807EE04 0x0358, 0x0078
 	Jump script_08010396
@@ -205,7 +205,7 @@ script_08010502:
 	_0807EA94 
 script_0801052E:
 	Call sub_080634E4
-	JumpSwitch_7 script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
+	JumpSwitch script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
 script_08010544:
 	TextboxNoOverlap 0x2b0d
 	Jump script_080105E0
diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc
index 2e729ab4..e6b671c9 100644
--- a/data/scripts/script_080112C4.inc
+++ b/data/scripts/script_080112C4.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_080112C4
 	_0807ECC4 0x0010
 	_0807E930 0x0002
 	Call sub_08064050
-	JumpSwitch_4 script_08011312, script_080113AA, script_08011442, script_08011508
+	JumpSwitch script_08011312, script_080113AA, script_08011442, script_08011508
 script_08011312:
 	_0807E610 0x00000800
 	_0807E5F8 0x00001000
diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc
index 33bbb792..2a7c0058 100644
--- a/data/scripts/script_080136D8.inc
+++ b/data/scripts/script_080136D8.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_080136D8
 	SetEntityNonPlanarMovement 0x0100
 	EndBlock 
 	Call sub_0807F584
-	JumpSwitch_4 script_080136F0, script_080136FA, script_08013704, script_080136FA
+	JumpSwitch script_080136F0, script_080136FA, script_08013704, script_080136FA
 script_080136F0:
 	CallWithArg sub_0807F464, 0x000000d0
 script_080136FA:

From 4764b34e3405c55f02bc52572583fb1a0d1880d6 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Sun, 7 Mar 2021 23:48:34 +0100
Subject: [PATCH 27/46] replaced .short/.word with .2byte/.4byte in script
 macros

---
 asm/macros/scripts.inc | 538 ++++++++++++++++++++---------------------
 1 file changed, 269 insertions(+), 269 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index dea57c36..82928d75 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -6,41 +6,41 @@
 \name:
 .endm
 .macro SCRIPT_END
-	.short 0xffff
+	.2byte 0xffff
 .endm
 
 .macro ScriptCommandNop 
-	.short 0x0400
+	.2byte 0x0400
 .endm
 
 .macro BeginBlock 
-	.short 0x0401
+	.2byte 0x0401
 .endm
 
 .macro EndBlock 
-	.short 0x0402
+	.2byte 0x0402
 .endm
 
 .macro Jump s
-	.short 0x0803
-1:	.short \s - 1b
+	.2byte 0x0803
+1:	.2byte \s - 1b
 .endm
 
 .macro JumpIf s
-	.short 0x0804
-1:	.short \s - 1b
+	.2byte 0x0804
+1:	.2byte \s - 1b
 .endm
 
 .macro JumpIfNot s
-	.short 0x0805
-1:	.short \s - 1b
+	.2byte 0x0805
+1:	.2byte \s - 1b
 .endm
 
 .macro JumpSwitchOpN n label labels:vararg
     .ifnb \labels
     JumpSwitchOpN \n + 1 \labels
     .else
-    .short 0x400 * (\n) + 0x6
+    .2byte 0x400 * (\n) + 0x6
     .endif
 .endm
 
@@ -49,7 +49,7 @@
 .endm
 
 .macro JumpSwitchLabel temp label labels:vararg
-    .short \label - \temp
+    .2byte \label - \temp
     .ifnb \labels
     JumpSwitchLabel \temp - 2 \labels
     .endif
@@ -62,25 +62,25 @@
 .endm
 
 .macro JumpAbsolute w
-	.short 0x0c07
-	.word \w
+	.2byte 0x0c07
+	.4byte \w
 .endm
 
 .macro JumpAbsoluteIf w
-	.short 0x0c08
-	.word \w
+	.2byte 0x0c08
+	.4byte \w
 .endm
 
 .macro JumpAbsoluteIfNot w
-	.short 0x0c09
-	.word \w
+	.2byte 0x0c09
+	.4byte \w
 .endm
 
 .macro JumpAbsoluteSwitchOpN n label labels:vararg
     .ifnb \labels
     JumpAbsoluteSwitchOpN \n + 2 \labels
     .else
-    .short 0x400 * (\n) + 0xa
+    .2byte 0x400 * (\n) + 0xa
     .endif
 .endm
 
@@ -89,7 +89,7 @@
 .endm
 
 .macro JumpAbsoluteSwitchLabel label labels:vararg
-    .word \label
+    .4byte \label
     .ifnb \labels
     JumpAbsoluteSwitchLabel \labels
     .endif
@@ -101,651 +101,651 @@
 .endm
 
 .macro Call w
-	.short 0x0c0b
-	.word \w
+	.2byte 0x0c0b
+	.4byte \w
 .endm
 
 .macro CallWithArg a,b
-	.short 0x140c
-	.word \a
-	.word \b
+	.2byte 0x140c
+	.4byte \a
+	.4byte \b
 .endm
 
 .macro CallWithArg_2 w
-	.short 0x0c0c
-	.word \w
+	.2byte 0x0c0c
+	.4byte \w
 .endm
 
 .macro LoadRoomEntityList w
-	.short 0x0c0d
-	.word \w
+	.2byte 0x0c0d
+	.4byte \w
 .endm
 
 .macro TestBit w
-	.short 0x0c0e
-	.word \w
+	.2byte 0x0c0e
+	.4byte \w
 .endm
 
 .macro CheckInventory1 s
-	.short 0x080f
-	.short \s
+	.2byte 0x080f
+	.2byte \s
 .endm
 
 .macro CheckInventory2 s
-	.short 0x0810
-	.short \s
+	.2byte 0x0810
+	.2byte \s
 .endm
 
 .macro HasRoomItemForSale 
-	.short 0x0411
+	.2byte 0x0411
 .endm
 
 .macro CheckLocalFlag s
-	.short 0x0812
-	.short \s
+	.2byte 0x0812
+	.2byte \s
 .endm
 
 .macro CheckLocalFlagByOffset a,b
-	.short 0x0c13
-	.short \a
-	.short \b
+	.2byte 0x0c13
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro CheckGlobalFlag s
-	.short 0x0814
-	.short \s
+	.2byte 0x0814
+	.2byte \s
 .endm
 
 .macro CheckRoomFlag s
-	.short 0x0815
-	.short \s
+	.2byte 0x0815
+	.2byte \s
 .endm
 
 .macro CheckPlayerInRegion a,b,c
-	.short 0x1016
-	.short \a
-	.short \b
-	.short \c
+	.2byte 0x1016
+	.2byte \a
+	.2byte \b
+	.2byte \c
 .endm
 
 .macro CheckPlayerInRegion2 s
-	.short 0x0817
-	.short \s
+	.2byte 0x0817
+	.2byte \s
 .endm
 
 .macro CheckEntityInteractType 
-	.short 0x0418
+	.2byte 0x0418
 .endm
 
 .macro _0807E30C 
-	.short 0x0419
+	.2byte 0x0419
 .endm
 
 .macro HasRupees s
-	.short 0x081a
-	.short \s
+	.2byte 0x081a
+	.2byte \s
 .endm
 
 .macro _0807E3BC s
-	.short 0x081b
-	.short \s
+	.2byte 0x081b
+	.2byte \s
 .endm
 
 .macro _0807E3E8 
-	.short 0x041c
+	.2byte 0x041c
 .endm
 
 .macro CheckKinstoneFused s
-	.short 0x081d
-	.short \s
+	.2byte 0x081d
+	.2byte \s
 .endm
 
 .macro BuyItem a,b
-	.short 0x0c1e
-	.short \a
-	.short \b
+	.2byte 0x0c1e
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807E48C s
-	.short 0x081f
-	.short \s
+	.2byte 0x081f
+	.2byte \s
 .endm
 
 .macro _0807E4CC w
-	.short 0x0c20
-	.word \w
+	.2byte 0x0c20
+	.4byte \w
 .endm
 
 .macro _0807E4EC w
-	.short 0x0c21
-	.word \w
+	.2byte 0x0c21
+	.4byte \w
 .endm
 
 .macro _0807E514 w
-	.short 0x0c22
-	.word \w
+	.2byte 0x0c22
+	.4byte \w
 .endm
 
 .macro CheckPlayerFlags w
-	.short 0x0c23
-	.word \w
+	.2byte 0x0c23
+	.4byte \w
 .endm
 
 .macro _0807E564 
-	.short 0x0424
+	.2byte 0x0424
 .endm
 
 .macro EntityHasHeight 
-	.short 0x0425
+	.2byte 0x0425
 .endm
 
 .macro ComparePlayerAction s
-	.short 0x0826
-	.short \s
+	.2byte 0x0826
+	.2byte \s
 .endm
 
 .macro ComparePlayerAnimationState s
-	.short 0x0827
-	.short \s
+	.2byte 0x0827
+	.2byte \s
 .endm
 
 .macro _0807E5F8 w
-	.short 0x0c28
-	.word \w
+	.2byte 0x0c28
+	.4byte \w
 .endm
 
 .macro _0807E610 w
-	.short 0x0c29
-	.word \w
+	.2byte 0x0c29
+	.4byte \w
 .endm
 
 .macro SetLocalFlag s
-	.short 0x082a
-	.short \s
+	.2byte 0x082a
+	.2byte \s
 .endm
 
 .macro SetLocalFlagByOffset a,b
-	.short 0x0c2b
-	.short \a
-	.short \b
+	.2byte 0x0c2b
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro ClearLocalFlag s
-	.short 0x082c
-	.short \s
+	.2byte 0x082c
+	.2byte \s
 .endm
 
 .macro SetGlobalFlag s
-	.short 0x082d
-	.short \s
+	.2byte 0x082d
+	.2byte \s
 .endm
 
 .macro ClearGlobalFlag s
-	.short 0x082e
-	.short \s
+	.2byte 0x082e
+	.2byte \s
 .endm
 
 .macro SetRoomFlag s
-	.short 0x082f
-	.short \s
+	.2byte 0x082f
+	.2byte \s
 .endm
 
 .macro ClearRoomFlag s
-	.short 0x0830
-	.short \s
+	.2byte 0x0830
+	.2byte \s
 .endm
 
 .macro Wait s
-	.short 0x0831
-	.short \s
+	.2byte 0x0831
+	.2byte \s
 .endm
 
 .macro WaitForSomething w
-	.short 0x0c32
-	.word \w
+	.2byte 0x0c32
+	.4byte \w
 .endm
 
 .macro WaitForSomething2 w
-	.short 0x0c33
-	.word \w
+	.2byte 0x0c33
+	.4byte \w
 .endm
 
 .macro WaitPlayerAction8 
-	.short 0x0434
+	.2byte 0x0434
 .endm
 
 .macro WaitForPlayerAction0x17 
-	.short 0x0435
+	.2byte 0x0435
 .endm
 
 .macro WaitFor_1 
-	.short 0x0436
+	.2byte 0x0436
 .endm
 
 .macro WaitFor_2 
-	.short 0x0437
+	.2byte 0x0437
 .endm
 
 .macro _0807E778 s
-	.short 0x0838
-	.short \s
+	.2byte 0x0838
+	.2byte \s
 .endm
 
 .macro _0807E788 w
-	.short 0x0c39
-	.word \w
+	.2byte 0x0c39
+	.4byte \w
 .endm
 
 .macro _0807E79C 
-	.short 0x043a
+	.2byte 0x043a
 .endm
 
 .macro ScriptCommandNop2 s
-	.short 0x083b
-	.short \s
+	.2byte 0x083b
+	.2byte \s
 .endm
 
 .macro DoFade4 
-	.short 0x043c
+	.2byte 0x043c
 .endm
 
 .macro DoFade5 
-	.short 0x043d
+	.2byte 0x043d
 .endm
 
 .macro DoFade6 
-	.short 0x043e
+	.2byte 0x043e
 .endm
 
 .macro DoFade7 
-	.short 0x043f
+	.2byte 0x043f
 .endm
 
 .macro _0807E800 w
-	.short 0x0c40
-	.word \w
+	.2byte 0x0c40
+	.4byte \w
 .endm
 
 .macro _0807E80C w
-	.short 0x0c41
-	.word \w
+	.2byte 0x0c41
+	.4byte \w
 .endm
 
 .macro _0807E858 s
-	.short 0x0842
-	.short \s
+	.2byte 0x0842
+	.2byte \s
 .endm
 
 .macro _0807E858_0 
-	.short 0x0442
+	.2byte 0x0442
 .endm
 
 .macro _0807E864 
-	.short 0x0443
+	.2byte 0x0443
 .endm
 
 .macro _0807E878 
-	.short 0x0444
+	.2byte 0x0444
 .endm
 
 .macro _0807E888 
-	.short 0x0445
+	.2byte 0x0445
 .endm
 
 .macro SetPlayerAction w
-	.short 0x0c46
-	.word \w
+	.2byte 0x0c46
+	.4byte \w
 .endm
 
 .macro StartPlayerScript w
-	.short 0x0c47
-	.word \w
+	.2byte 0x0c47
+	.4byte \w
 .endm
 
 .macro _0807E8D4 s
-	.short 0x0848
-	.short \s
+	.2byte 0x0848
+	.2byte \s
 .endm
 
 .macro _0807E8E4_0 
-	.short 0x0449
+	.2byte 0x0449
 .endm
 
 .macro _0807E8E4_1 
-	.short 0x044a
+	.2byte 0x044a
 .endm
 
 .macro _0807E8E4_2 
-	.short 0x044b
+	.2byte 0x044b
 .endm
 
 .macro _0807E8E4_3 
-	.short 0x044c
+	.2byte 0x044c
 .endm
 
 .macro _0807E908 s
-	.short 0x084d
-	.short \s
+	.2byte 0x084d
+	.2byte \s
 .endm
 
 .macro _0807E914 w
-	.short 0x0c4e
-	.word \w
+	.2byte 0x0c4e
+	.4byte \w
 .endm
 
 .macro _0807E924 
-	.short 0x044f
+	.2byte 0x044f
 .endm
 
 .macro _0807E930 s
-	.short 0x0850
-	.short \s
+	.2byte 0x0850
+	.2byte \s
 .endm
 
 .macro _0807E944 
-	.short 0x0451
+	.2byte 0x0451
 .endm
 
 .macro _0807E974 s
-	.short 0x0852
-	.short \s
+	.2byte 0x0852
+	.2byte \s
 .endm
 
 .macro _0807E9D4 
-	.short 0x0453
+	.2byte 0x0453
 .endm
 
 .macro _0807E9DC 
-	.short 0x0454
+	.2byte 0x0454
 .endm
 
 .macro _0807E9E4 s
-	.short 0x0855
-	.short \s
+	.2byte 0x0855
+	.2byte \s
 .endm
 
 .macro _0807E9F0 
-	.short 0x0456
+	.2byte 0x0456
 .endm
 
 .macro _0807EA4C 
-	.short 0x0457
+	.2byte 0x0457
 .endm
 
 .macro _0807EA88 s
-	.short 0x0858
-	.short \s
+	.2byte 0x0858
+	.2byte \s
 .endm
 
 .macro _0807EA94 
-	.short 0x0459
+	.2byte 0x0459
 .endm
 
 .macro TextboxNoOverlapFollow s
-	.short 0x085a
-	.short \s
+	.2byte 0x085a
+	.2byte \s
 .endm
 
 .macro TextboxNoOverlap s
-	.short 0x085b
-	.short \s
+	.2byte 0x085b
+	.2byte \s
 .endm
 
 .macro TextboxNoOverlapFollowPos a,b
-	.short 0x0c5c
-	.short \a
-	.short \b
+	.2byte 0x0c5c
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro TextboxNoOverlapFollowPos_1 s
-	.short 0x085c
-	.short \s
+	.2byte 0x085c
+	.2byte \s
 .endm
 
 .macro _0807EAF0 a,b
-	.short 0x0c5d
-	.short \a
-	.short \b
+	.2byte 0x0c5d
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807EAF0_3 a,b,c
-	.short 0x105d
-	.short \a
-	.short \b
-	.short \c
+	.2byte 0x105d
+	.2byte \a
+	.2byte \b
+	.2byte \c
 .endm
 
 .macro _0807EAF0_4 a,b,c,d
-	.short 0x145d
-	.short \a
-	.short \b
-	.short \c
-	.short \d
+	.2byte 0x145d
+	.2byte \a
+	.2byte \b
+	.2byte \c
+	.2byte \d
 .endm
 
 .macro TextboxNoOverlapVar 
-	.short 0x045e
+	.2byte 0x045e
 .endm
 
 .macro _0807EB28 s
-	.short 0x085f
-	.short \s
+	.2byte 0x085f
+	.2byte \s
 .endm
 
 .macro _0807EB38 
-	.short 0x0460
+	.2byte 0x0460
 .endm
 
 .macro _0807EB44 s
-	.short 0x0861
-	.short \s
+	.2byte 0x0861
+	.2byte \s
 .endm
 
 .macro _0807EB4C a,b
-	.short 0x0c62
-	.short \a
-	.short \b
+	.2byte 0x0c62
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807EB74 
-	.short 0x0463
+	.2byte 0x0463
 .endm
 
 .macro _0807EB8C 
-	.short 0x0464
+	.2byte 0x0464
 .endm
 
 .macro SetEntityDirection s
-	.short 0x0865
-	.short \s
+	.2byte 0x0865
+	.2byte \s
 .endm
 
 .macro SetEntityDirectionWithAnimationState s
-	.short 0x0866
-	.short \s
+	.2byte 0x0866
+	.2byte \s
 .endm
 
 .macro SetEntityNonPlanarMovement s
-	.short 0x0867
-	.short \s
+	.2byte 0x0867
+	.2byte \s
 .endm
 
 .macro SetEntity0x20 w
-	.short 0x0c68
-	.word \w
+	.2byte 0x0c68
+	.4byte \w
 .endm
 
 .macro SetEntityPositionRelative a,b
-	.short 0x0c69
-	.short \a
-	.short \b
+	.2byte 0x0c69
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro SetEntityPosition a,b
-	.short 0x0c6a
-	.short \a
-	.short \b
+	.2byte 0x0c6a
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro MoveEntityToPlayer 
-	.short 0x046b
+	.2byte 0x046b
 .endm
 
 .macro ScriptCommandNop3 
-	.short 0x046c
+	.2byte 0x046c
 .endm
 
 .macro _0807EC1C s
-	.short 0x086d
-	.short \s
+	.2byte 0x086d
+	.2byte \s
 .endm
 
 .macro _0807EC64 s
-	.short 0x086e
-	.short \s
+	.2byte 0x086e
+	.2byte \s
 .endm
 
 .macro _0807EC94 s
-	.short 0x086f
-	.short \s
+	.2byte 0x086f
+	.2byte \s
 .endm
 
 .macro _0807ECC4 s
-	.short 0x0870
-	.short \s
+	.2byte 0x0870
+	.2byte \s
 .endm
 
 .macro _0807ECF4 s
-	.short 0x0871
-	.short \s
+	.2byte 0x0871
+	.2byte \s
 .endm
 
 .macro _0807ED24 a,b,c
-	.short 0x1072
-	.short \a
-	.short \b
-	.short \c
+	.2byte 0x1072
+	.2byte \a
+	.2byte \b
+	.2byte \c
 .endm
 
 .macro _0807EDD4 a,b
-	.short 0x0c73
-	.short \a
-	.short \b
+	.2byte 0x0c73
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807EE04 a,b
-	.short 0x0c74
-	.short \a
-	.short \b
+	.2byte 0x0c74
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807EE30 
-	.short 0x0475
+	.2byte 0x0475
 .endm
 
 .macro _0807EEB4 
-	.short 0x0476
+	.2byte 0x0476
 .endm
 
 .macro _0807EEF4 a,b
-	.short 0x0c77
-	.short \a
-	.short \b
+	.2byte 0x0c77
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807EF3C a,b
-	.short 0x0c78
-	.short \a
-	.short \b
+	.2byte 0x0c78
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807EF80 s
-	.short 0x0879
-	.short \s
+	.2byte 0x0879
+	.2byte \s
 .endm
 
 .macro _0807EF90 s
-	.short 0x087a
-	.short \s
+	.2byte 0x087a
+	.2byte \s
 .endm
 
 .macro SoundReq s
-	.short 0x087b
-	.short \s
+	.2byte 0x087b
+	.2byte \s
 .endm
 
 .macro SoundReq2 s
-	.short 0x087c
-	.short \s
+	.2byte 0x087c
+	.2byte \s
 .endm
 
 .macro SoundReq3 w
-	.short 0x0c7d
-	.word \w
+	.2byte 0x0c7d
+	.4byte \w
 .endm
 
 .macro SoundReq0x80100000 
-	.short 0x047e
+	.2byte 0x047e
 .endm
 
 .macro ModRupees s
-	.short 0x087f
-	.short \s
+	.2byte 0x087f
+	.2byte \s
 .endm
 
 .macro ModHealth s
-	.short 0x0880
-	.short \s
+	.2byte 0x0880
+	.2byte \s
 .endm
 
 .macro IncreaseMaxHealth s
-	.short 0x0881
-	.short \s
+	.2byte 0x0881
+	.2byte \s
 .endm
 
 .macro _0807F034 s
-	.short 0x0882
-	.short \s
+	.2byte 0x0882
+	.2byte \s
 .endm
 
 .macro _0807F050 s
-	.short 0x0883
-	.short \s
+	.2byte 0x0883
+	.2byte \s
 .endm
 
 .macro GetInventoryValue s
-	.short 0x0884
-	.short \s
+	.2byte 0x0884
+	.2byte \s
 .endm
 
 .macro _0807F078 a,b
-	.short 0x0c85
-	.short \a
-	.short \b
+	.2byte 0x0c85
+	.2byte \a
+	.2byte \b
 .endm
 
 .macro _0807F088 s
-	.short 0x0886
-	.short \s
+	.2byte 0x0886
+	.2byte \s
 .endm
 
 .macro CameraTargetEntity 
-	.short 0x0487
+	.2byte 0x0487
 .endm
 
 .macro CameraTargetPlayer 
-	.short 0x0488
+	.2byte 0x0488
 .endm
 
 .macro _0807F0B4 s
-	.short 0x0889
-	.short \s
+	.2byte 0x0889
+	.2byte \s
 .endm
 
 .macro _0807F0C8 a,b
-	.short 0x0c8a
-	.short \a
-	.short \b
+	.2byte 0x0c8a
+	.2byte \a
+	.2byte \b
 .endm
 
 

From 3e71687184aa734806197f9363c352feb914ba3a Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Sun, 7 Mar 2021 23:52:13 +0100
Subject: [PATCH 28/46] renamed JumpSwitch to JumpTable

---
 asm/macros/scripts.inc                   | 36 ++++++++++++------------
 data/scripts/script_0800B0D0.inc         |  2 +-
 data/scripts/script_0800B9B4.inc         |  2 +-
 data/scripts/script_0800D414.inc         |  4 +--
 data/scripts/script_0800E6B0.inc         |  2 +-
 data/scripts/script_0800FAE4.inc         |  2 +-
 data/scripts/script_08010264.inc         |  4 +--
 data/scripts/script_080112C4.inc         |  2 +-
 data/scripts/script_080136D8.inc         |  2 +-
 data/scripts/script_08014450.inc         |  2 +-
 data/scripts/script_08016384.inc         |  4 +--
 src/script.c                             | 12 ++++----
 tools/script_disassembler/definitions.py |  4 +--
 13 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 82928d75..ea5bc570 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -36,29 +36,29 @@
 1:	.2byte \s - 1b
 .endm
 
-.macro JumpSwitchOpN n label labels:vararg
+.macro JumpTableOpN n label labels:vararg
     .ifnb \labels
-    JumpSwitchOpN \n + 1 \labels
+    JumpTableOpN \n + 1 \labels
     .else
     .2byte 0x400 * (\n) + 0x6
     .endif
 .endm
 
-.macro JumpSwitchOp labels:vararg
-    JumpSwitchOpN 2 \labels
+.macro JumpTableOp labels:vararg
+    JumpTableOpN 2 \labels
 .endm
 
-.macro JumpSwitchLabel temp label labels:vararg
+.macro JumpTableLabel temp label labels:vararg
     .2byte \label - \temp
     .ifnb \labels
-    JumpSwitchLabel \temp - 2 \labels
+    JumpTableLabel \temp - 2 \labels
     .endif
 .endm
 
-.macro JumpSwitch labels:vararg
-    JumpSwitchOp \labels
+.macro JumpTable labels:vararg
+    JumpTableOp \labels
 1:
-    JumpSwitchLabel 1b \labels
+    JumpTableLabel 1b \labels
 .endm
 
 .macro JumpAbsolute w
@@ -76,28 +76,28 @@
 	.4byte \w
 .endm
 
-.macro JumpAbsoluteSwitchOpN n label labels:vararg
+.macro JumpAbsoluteTableOpN n label labels:vararg
     .ifnb \labels
-    JumpAbsoluteSwitchOpN \n + 2 \labels
+    JumpAbsoluteTableOpN \n + 2 \labels
     .else
     .2byte 0x400 * (\n) + 0xa
     .endif
 .endm
 
-.macro JumpAbsoluteSwitchOp labels:vararg
-    JumpAbsoluteSwitchOpN 3 \labels
+.macro JumpAbsoluteTableOp labels:vararg
+    JumpAbsoluteTableOpN 3 \labels
 .endm
 
-.macro JumpAbsoluteSwitchLabel label labels:vararg
+.macro JumpAbsoluteTableLabel label labels:vararg
     .4byte \label
     .ifnb \labels
-    JumpAbsoluteSwitchLabel \labels
+    JumpAbsoluteTableLabel \labels
     .endif
 .endm
 
-.macro JumpAbsoluteSwitch labels:vararg
-    JumpAbsoluteSwitchOp \labels
-    JumpAbsoluteSwitchLabel \labels
+.macro JumpAbsoluteTable labels:vararg
+    JumpAbsoluteTableOp \labels
+    JumpAbsoluteTableLabel \labels
 .endm
 
 .macro Call w
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index 91851cb0..8081128e 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800B0D0
 	EndBlock 
 script_0800B0E8:
 	Call sub_0807F434
-	JumpSwitch script_0800B0E8, script_0800B0F6, script_0800B134
+	JumpTable script_0800B0E8, script_0800B0F6, script_0800B134
 script_0800B0F6:
 	_0807E864 
 	Call sub_0807DF28
diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc
index 156d0dff..c5954db4 100644
--- a/data/scripts/script_0800B9B4.inc
+++ b/data/scripts/script_0800B9B4.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_0800B9B4
 	EndBlock 
 script_0800B9CA:
 	Call sub_0807F434
-	JumpSwitch script_0800B9CA, script_0800B9D8, script_0800B9F4
+	JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4
 script_0800B9D8:
 	_0807E864 
 	_0807EB74 
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index 2ace1fe6..2af3e999 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -49,7 +49,7 @@ script_0800D4E4:
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000009
-	JumpSwitch script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560
+	JumpTable script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560
 script_0800D510:
 	_0807EE04 0x0038, 0x0068
 	Jump script_0800D566
@@ -104,7 +104,7 @@ script_0800D5AC:
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000004
-	JumpSwitch script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC
+	JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC
 script_0800D5CE:
 	_0807EE04 0x0038, 0x0098
 	Jump script_0800D5F2
diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc
index f735c036..f1abdc45 100644
--- a/data/scripts/script_0800E6B0.inc
+++ b/data/scripts/script_0800E6B0.inc
@@ -139,7 +139,7 @@ script_0800E832:
 	EndBlock 
 	_0807EA94 
 	_0807EB38 
-	JumpSwitch script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872
+	JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872
 script_0800E872:
 	BeginBlock 
 	TextboxNoOverlapFollow 0x4505
diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc
index 05d97d17..851e045d 100644
--- a/data/scripts/script_0800FAE4.inc
+++ b/data/scripts/script_0800FAE4.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800FAE4
 	SetEntityNonPlanarMovement 0x0100
 	EndBlock 
 	Call sub_0807F584
-	JumpSwitch script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
+	JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
 script_0800FAFC:
 	CallWithArg sub_0807F4F8, 0x0000027c
 script_0800FB06:
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index 7d47f95d..b698a16d 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -64,7 +64,7 @@ script_08010314:
 	Call sub_08062698
 	Call sub_080626AC
 	CallWithArg sub_0807F0EC, 0x00000009
-	JumpSwitch script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390
+	JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390
 script_08010340:
 	_0807EE04 0x0358, 0x0078
 	Jump script_08010396
@@ -205,7 +205,7 @@ script_08010502:
 	_0807EA94 
 script_0801052E:
 	Call sub_080634E4
-	JumpSwitch script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
+	JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
 script_08010544:
 	TextboxNoOverlap 0x2b0d
 	Jump script_080105E0
diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc
index e6b671c9..65ce1ed2 100644
--- a/data/scripts/script_080112C4.inc
+++ b/data/scripts/script_080112C4.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_080112C4
 	_0807ECC4 0x0010
 	_0807E930 0x0002
 	Call sub_08064050
-	JumpSwitch script_08011312, script_080113AA, script_08011442, script_08011508
+	JumpTable script_08011312, script_080113AA, script_08011442, script_08011508
 script_08011312:
 	_0807E610 0x00000800
 	_0807E5F8 0x00001000
diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc
index 2a7c0058..9287f00b 100644
--- a/data/scripts/script_080136D8.inc
+++ b/data/scripts/script_080136D8.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_080136D8
 	SetEntityNonPlanarMovement 0x0100
 	EndBlock 
 	Call sub_0807F584
-	JumpSwitch script_080136F0, script_080136FA, script_08013704, script_080136FA
+	JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA
 script_080136F0:
 	CallWithArg sub_0807F464, 0x000000d0
 script_080136FA:
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index 828eaf5b..e70bff48 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -29,7 +29,7 @@ script_080144A2:
 	JumpIfNot script_080144B8
 	TextboxNoOverlapFollow 0x420b
 	_0807EB38 
-	JumpSwitch script_080144B8, script_080144C0
+	JumpTable script_080144B8, script_080144C0
 script_080144B8:
 	ClearLocalFlag 0x0093
 	Jump script_080144C8
diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc
index d74e5e1d..00176665 100644
--- a/data/scripts/script_08016384.inc
+++ b/data/scripts/script_08016384.inc
@@ -5,11 +5,11 @@ script_08016384:
 	Jump script_08016384
 	JumpIf script_08016384
 	JumpIfNot script_08016384
-	JumpSwitch script_08016384, script_08016384
+	JumpTable script_08016384, script_08016384
 	JumpAbsolute script_08016384
 	JumpAbsoluteIf script_08016384
 	JumpAbsoluteIfNot script_08016384
-	JumpAbsoluteSwitch script_08016384, script_08016384
+	JumpAbsoluteTable script_08016384, script_08016384
 	Call script_08016384
 	CallWithArg script_08016384, 0x12345678
 	LoadRoomEntityList script_08016384
diff --git a/src/script.c b/src/script.c
index 741673f1..7e316da8 100644
--- a/src/script.c
+++ b/src/script.c
@@ -18,11 +18,11 @@ void ScriptCommand_EndBlock(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_Jump(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpIf(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_JumpSwitch(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpTable(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpAbsolute(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpAbsoluteIf(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_JumpAbsoluteSwitch(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_JumpAbsoluteTable(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context);
@@ -163,11 +163,11 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_Jump,
                                           ScriptCommand_JumpIf,
                                           ScriptCommand_JumpIfNot,
-                                          ScriptCommand_JumpSwitch,
+                                          ScriptCommand_JumpTable,
                                           ScriptCommand_JumpAbsolute,
                                           ScriptCommand_JumpAbsoluteIf,
                                           ScriptCommand_JumpAbsoluteIfNot,
-                                          ScriptCommand_JumpAbsoluteSwitch,
+                                          ScriptCommand_JumpAbsoluteTable,
                                           ScriptCommand_Call,
                                           ScriptCommand_CallWithArg,
                                           ScriptCommand_LoadRoomEntityList,
@@ -657,7 +657,7 @@ void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_JumpSwitch(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_JumpTable(Entity* entity, ScriptExecutionContext* context) {
     if (gActiveScriptInfo.commandSize > context->unk_04) {
         context->scriptInstructionPointer += context->unk_04;
         ScriptCommand_Jump(entity, context);
@@ -682,7 +682,7 @@ void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* con
     }
 }
 
-void ScriptCommand_JumpAbsoluteSwitch(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_JumpAbsoluteTable(Entity* entity, ScriptExecutionContext* context) {
     if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) {
         context->scriptInstructionPointer += context->unk_04 << 1;
         ScriptCommand_JumpAbsolute(entity, context);
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 8ec704a4..1a2e91d0 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -13,11 +13,11 @@ commands = [
     {'fun': 'ScriptCommand_Jump', 'params': 'j'},
     {'fun': 'ScriptCommand_JumpIf', 'params': 'j'},
     {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j'},
-    {'fun': 'ScriptCommand_JumpSwitch', 'params': ['jj', 'jjj', 'jjjj', 'jjjjjjj', 'jjjjjjjjj']},
+    {'fun': 'ScriptCommand_JumpTable', 'params': ['jj', 'jjj', 'jjjj', 'jjjjjjj', 'jjjjjjjjj']},
     {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x'},
     {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x'},
     {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x'},
-    {'fun': 'ScriptCommand_JumpAbsoluteSwitch', 'params': 'xx'},
+    {'fun': 'ScriptCommand_JumpAbsoluteTable', 'params': 'xx'},
     {'fun': 'ScriptCommand_Call', 'params': 'p'},
     {'fun': 'ScriptCommand_CallWithArg', 'params': ['px', 'p']},
     {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},

From 9bef8b068c7b59c2e1f71f5852bb671e41c48734 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Mon, 8 Mar 2021 00:52:06 +0100
Subject: [PATCH 29/46] naming stuff

---
 asm/macros/scripts.inc                   |  8 ++--
 data/scripts/script_08008D8C.inc         |  2 +-
 data/scripts/script_0800939A.inc         |  4 +-
 data/scripts/script_080094FC.inc         |  6 +--
 data/scripts/script_08009ECC.inc         |  4 +-
 data/scripts/script_08009EF0.inc         |  4 +-
 data/scripts/script_0800B3A4.inc         |  2 +-
 data/scripts/script_0800C550.inc         |  4 +-
 data/scripts/script_0800CD7C.inc         | 10 ++---
 data/scripts/script_0800D278.inc         |  4 +-
 data/scripts/script_0800D414.inc         | 16 ++++----
 data/scripts/script_0800D874.inc         |  4 +-
 data/scripts/script_0800D954.inc         |  2 +-
 data/scripts/script_0800E5D6.inc         |  2 +-
 data/scripts/script_0800EA54.inc         |  4 +-
 data/scripts/script_0800F724.inc         |  4 +-
 data/scripts/script_08010264.inc         |  4 +-
 data/scripts/script_0801232C.inc         |  2 +-
 data/scripts/script_08012C68.inc         |  2 +-
 data/scripts/script_08013114.inc         |  2 +-
 data/scripts/script_080143C0.inc         |  6 +--
 data/scripts/script_08014B34.inc         |  2 +-
 data/scripts/script_080160A8.inc         |  4 +-
 data/scripts/script_08016482.inc         |  4 +-
 include/script.h                         |  2 +-
 src/npc/beedle.c                         |  2 +-
 src/npc/carpenter.c                      |  2 +-
 src/npc/ezloCap.c                        |  4 +-
 src/npc/forestMinish.c                   |  2 +-
 src/npc/guard.c                          |  8 ++--
 src/npc/simon.c                          |  2 +-
 src/npc/townMinish.c                     |  2 +-
 src/npc/townsperson.c                    |  2 +-
 src/object/greatFairy.c                  |  2 +-
 src/script.c                             | 48 ++++++++++++------------
 tools/script_disassembler/definitions.py |  4 +-
 36 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index ea5bc570..fefd4eb1 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -428,7 +428,7 @@
 	.2byte \s
 .endm
 
-.macro _0807E914 w
+.macro SetIntVariable w
 	.2byte 0x0c4e
 	.4byte \w
 .endm
@@ -502,20 +502,20 @@
 	.2byte \s
 .endm
 
-.macro _0807EAF0 a,b
+.macro TextboxNoOverlapFollowTable a,b
 	.2byte 0x0c5d
 	.2byte \a
 	.2byte \b
 .endm
 
-.macro _0807EAF0_3 a,b,c
+.macro TextboxNoOverlapFollowTable_3 a,b,c
 	.2byte 0x105d
 	.2byte \a
 	.2byte \b
 	.2byte \c
 .endm
 
-.macro _0807EAF0_4 a,b,c,d
+.macro TextboxNoOverlapFollowTable_4 a,b,c,d
 	.2byte 0x145d
 	.2byte \a
 	.2byte \b
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index 23aeca90..4ac7bfc3 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -94,7 +94,7 @@ script_08008E12:
 	WaitForSomething2 0x00000002
 	_0807F034 0x0047
 	WaitPlayerAction8 
-	_0807E914 0x00000003
+	SetIntVariable 0x00000003
 	Call sub_0807F420
 	_0807E8E4_0 
 	_0807E5F8 0x00000080
diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc
index bc773cc5..42f99fd4 100644
--- a/data/scripts/script_0800939A.inc
+++ b/data/scripts/script_0800939A.inc
@@ -18,10 +18,10 @@ script_080093BC:
 	Call sub_0806D70C
 	Jump script_08009376
 script_080093DA:
-	_0807E914 0x00001d05
+	SetIntVariable 0x00001d05
 	CheckLocalFlag 0x00ad
 	JumpIf script_080093EE
-	_0807E914 0x00001d04
+	SetIntVariable 0x00001d04
 script_080093EE:
 	TextboxNoOverlapVar 
 	_0807EA94 
diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc
index 6ed41ece..1d6b8ba5 100644
--- a/data/scripts/script_080094FC.inc
+++ b/data/scripts/script_080094FC.inc
@@ -41,7 +41,7 @@ script_0800954E:
 	Call sub_08067314
 	_0807EF80 0x000a
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_080672B0
 	EndBlock 
 script_08009592:
@@ -49,14 +49,14 @@ script_08009592:
 	JumpIfNot script_08009592
 	_0807E864 
 	_0807EB74 
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_080672B0
 	Call sub_080672C8
 	_0807EA94 
 	Wait 0x000f
 	_0807E878 
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_080672B0
 	Jump script_08009592
 	.short 0x0000
diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc
index 025d3bd5..da218f10 100644
--- a/data/scripts/script_08009ECC.inc
+++ b/data/scripts/script_08009ECC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009ECC
 	BeginBlock 
-	_0807E914 0x00000002
+	SetIntVariable 0x00000002
 	_0807EF80 0x0001
 	EndBlock 
 	WaitForSomething2 0x00000004
 	BeginBlock 
-	_0807E914 0x00000003
+	SetIntVariable 0x00000003
 	_0807EF80 0x0001
 	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc
index 2af8003f..4e1b8076 100644
--- a/data/scripts/script_08009EF0.inc
+++ b/data/scripts/script_08009EF0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009EF0
 	BeginBlock 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	_0807EF80 0x0001
 	EndBlock 
 	WaitForSomething2 0x00000004
 	BeginBlock 
-	_0807E914 0x00000001
+	SetIntVariable 0x00000001
 	_0807EF80 0x0001
 	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc
index d485f31e..e76ae5d9 100644
--- a/data/scripts/script_0800B3A4.inc
+++ b/data/scripts/script_0800B3A4.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0800B3A4
 	SetEntityNonPlanarMovement 0x0120
 	_0807EB44 0x0004
 	_0807E908 0x0002
-	_0807E914 0x0000200a
+	SetIntVariable 0x0000200a
 	EndBlock 
 script_0800B3C4:
 	_0807EDD4 0x0158, 0x0290
diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc
index c52d06ce..0e57b91e 100644
--- a/data/scripts/script_0800C550.inc
+++ b/data/scripts/script_0800C550.inc
@@ -202,7 +202,7 @@ script_0800C7C0:
 	_0807EB8C 
 	TextboxNoOverlapFollow 0x1132
 	_0807EA94 
-	_0807E914 0x00000103
+	SetIntVariable 0x00000103
 	Call sub_0807F420
 	TextboxNoOverlapFollow 0x1133
 	_0807EA94 
@@ -250,7 +250,7 @@ script_0800C87C:
 	_0807E864 
 	Call sub_0807DF28
 	_0807EB74 
-	_0807E914 0x00000008
+	SetIntVariable 0x00000008
 	Call sub_0807F3D8
 	TextboxNoOverlapFollow 0x1136
 	_0807EA94 
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index 4076c0d2..85678ca9 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -210,7 +210,7 @@ script_0800CFFA:
 	CheckInventory1 0x0002
 	JumpIfNot script_0800D032
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlap 0x1219
 	Jump script_0800D17C
@@ -220,14 +220,14 @@ script_0800D032:
 	StartPlayerScript script_0800D190
 	WaitForSomething2 0x00000008
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlapFollowPos 0x125c, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	Wait 0x000f
 	_0807E5F8 0x00000020
@@ -248,14 +248,14 @@ script_0800D0A8:
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000004
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlapFollowPos 0x123d, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	SoundReq 0x00cd
 	Call sub_08068964
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index edd39c9c..ad48ee0b 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -59,7 +59,7 @@ script_0800D31E:
 	EndBlock 
 	_0807E864 
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlapFollow 0x1219
 	_0807EA94 
@@ -99,7 +99,7 @@ script_0800D3B2:
 	_0807EDD4 0x00a0, 0x0130
 	_0807EB44 0x0006
 	_0807E930 0x0003
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_080681D8
 	SoundReq 0x00cd
 	Wait 0x001e
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index 2af3e999..bb3fc93c 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -6,35 +6,35 @@ SCRIPT_START script_0800D414
 	EndBlock 
 script_0800D426:
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0006
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0006
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_0806AF60
 	_0807EDD4 0x00a8, 0x01e8
 	_0807EB44 0x0006
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0002
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_0806AF60
 	_0807EDD4 0x0228, 0x01e8
 	Jump script_0800D426
diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc
index 44537ee1..cd34dd5b 100644
--- a/data/scripts/script_0800D874.inc
+++ b/data/scripts/script_0800D874.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800D874
 	BeginBlock 
 	Call sub_0807F934
 	_0807EF80 0x0008
-	_0807E914 0x00000001
+	SetIntVariable 0x00000001
 	Call sub_0806DA04
 	EndBlock 
 script_0800D88E:
@@ -45,7 +45,7 @@ script_0800D8F4:
 	_0807EB28 0x1325
 	_0807EA94 
 	SoundReq 0x0113
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806DA1C
 	_0807E878 
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc
index 3ba0cb1c..d258b15d 100644
--- a/data/scripts/script_0800D954.inc
+++ b/data/scripts/script_0800D954.inc
@@ -33,7 +33,7 @@ script_0800D962:
 	Wait 0x003c
 	SetLocalFlag 0x0032
 	SoundReq 0x0113
-	_0807E914 0x00000001
+	SetIntVariable 0x00000001
 	Call sub_0806DA1C
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc
index 79bb47dc..54f82101 100644
--- a/data/scripts/script_0800E5D6.inc
+++ b/data/scripts/script_0800E5D6.inc
@@ -6,7 +6,7 @@ script_0800E5D8:
 	JumpIfNot script_0800E5D8
 	_0807E864 
 	Wait 0x003c
-	_0807E914 0x00000905
+	SetIntVariable 0x00000905
 	Call sub_0807F420
 	SetRoomFlag 0x0001
 	Wait 0x001e
diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc
index d415dcea..d5a38e14 100644
--- a/data/scripts/script_0800EA54.inc
+++ b/data/scripts/script_0800EA54.inc
@@ -261,7 +261,7 @@ script_0800EDB6:
 	_0807E5F8 0x00000020
 	TextboxNoOverlapFollow 0x4c09
 	_0807EA94 
-	_0807E914 0x00000503
+	SetIntVariable 0x00000503
 	Call sub_0807F420
 	_0807E5F8 0x00000040
 	Call sub_0807DF50
@@ -311,7 +311,7 @@ script_0800EE76:
 	_0807E5F8 0x00000004
 	TextboxNoOverlapFollow 0x4c09
 	_0807EA94 
-	_0807E914 0x00000503
+	SetIntVariable 0x00000503
 	Call sub_0807F420
 	_0807E5F8 0x00000008
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 3f530de8..5df1fae4 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -152,11 +152,11 @@ script_0800F72C:
 	Call sub_0806DC3C
 	Call sub_080791BC
 	CallWithArg sub_0807F244, 0x0000000d
-	_0807E914 0x000000ff
+	SetIntVariable 0x000000ff
 	Call sub_0807F5B0
 	CallWithArg sub_0807F29C, 0x080049d6
 	Wait 0x00b7
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0807F5B0
 	TextboxNoOverlapFollowPos 0x102c, 0x0000
 	_0807EA94 
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index b698a16d..2aa304fb 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -140,7 +140,7 @@ script_08010410:
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	_0807E914 0x08064689
+	SetIntVariable 0x08064689
 	Call sub_08064644
 	EndBlock 
 script_08010446:
@@ -316,7 +316,7 @@ script_08010686:
 	_0807EB74 
 	HasRoomItemForSale 
 	Call sub_0807F77C
-	_0807EAF0 0x3c08, 0x3c09
+	TextboxNoOverlapFollowTable 0x3c08, 0x3c09
 	_0807EA94 
 	_0807E878 
 	_0807EB44 0x0004
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc
index db355ae8..4ae5828a 100644
--- a/data/scripts/script_0801232C.inc
+++ b/data/scripts/script_0801232C.inc
@@ -62,7 +62,7 @@ script_08012368:
 	SoundReq2 0xffff
 	_0807EB28 0x1403
 	_0807EA94 
-	_0807E914 0x00000203
+	SetIntVariable 0x00000203
 	Call sub_0807F420
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc
index 9be0127d..f11a59ef 100644
--- a/data/scripts/script_08012C68.inc
+++ b/data/scripts/script_08012C68.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_08012C68
 	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x0008
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806DA04
 	EndBlock 
 script_08012C7E:
diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc
index dd53dbc3..962663af 100644
--- a/data/scripts/script_08013114.inc
+++ b/data/scripts/script_08013114.inc
@@ -27,7 +27,7 @@ script_0801313C:
 	_0807E878 
 	Jump script_08013128
 script_08013176:
-	_0807E914 0x00000403
+	SetIntVariable 0x00000403
 	Call sub_0807F420
 	_0807E878 
 	Jump script_08013128
diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc
index 1d6fe9f3..1f682585 100644
--- a/data/scripts/script_080143C0.inc
+++ b/data/scripts/script_080143C0.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_080143C0
 	_0807EA94 
 	_0807E3E8 
 	JumpIf script_080143FA
-	_0807E914 0x00000002
+	SetIntVariable 0x00000002
 	Call sub_08065528
 	Jump script_0801443E
 script_080143FA:
@@ -19,13 +19,13 @@ script_080143FA:
 	TextboxNoOverlap 0x2c18
 	_0807EA94 
 	Wait 0x000a
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_08065528
 	_0807F034 0x0036
 	WaitPlayerAction8 
 	TextboxNoOverlap 0x2c19
 	_0807EA94 
-	_0807E914 0x00000303
+	SetIntVariable 0x00000303
 	Call sub_0807F420
 	Wait 0x001e
 	_0807EB8C 
diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc
index bfa75dec..f19cefb0 100644
--- a/data/scripts/script_08014B34.inc
+++ b/data/scripts/script_08014B34.inc
@@ -58,7 +58,7 @@ script_08014BF2:
 	SetLocalFlag 0x0065
 	TextboxNoOverlap 0x2f07
 	_0807EA94 
-	_0807E914 0x00000064
+	SetIntVariable 0x00000064
 	_0807F034 0x003f
 	WaitPlayerAction8 
 	Jump script_08014C22
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index 972de427..d6bc68aa 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -59,7 +59,7 @@ script_08016146:
 	JumpIfNot script_08016146
 	_0807E864 
 	GetInventoryValue 0x0025
-	_0807EAF0_4 0x2d03, 0x2d02, 0x2d02, 0x2d02
+	TextboxNoOverlapFollowTable_4 0x2d03, 0x2d02, 0x2d02, 0x2d02
 	_0807E3E8 
 	JumpIfNot script_0801618A
 	_0807E48C 0x0020
@@ -85,7 +85,7 @@ script_0801619A:
 	JumpIfNot script_0801619A
 	_0807E864 
 	GetInventoryValue 0x0024
-	_0807EAF0_4 0x2d05, 0x2d04, 0x2d04, 0x2d04
+	TextboxNoOverlapFollowTable_4 0x2d05, 0x2d04, 0x2d04, 0x2d04
 	_0807E3E8 
 	JumpIfNot script_080161E2
 	_0807E48C 0x0020
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index cc13f1bf..b994262f 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_08016482
 	_0807E8E4_2 
 	_0807E8E4_3 
 	_0807E908 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	_0807E924 
 	_0807E930 0x0000
 	_0807E944 
@@ -32,7 +32,7 @@ SCRIPT_START script_08016482
 	TextboxNoOverlapFollow 0x0601
 	TextboxNoOverlap 0x0601
 	TextboxNoOverlapFollowPos_1 0x0601
-	_0807EAF0_3 0x0601, 0x0602, 0x0603
+	TextboxNoOverlapFollowTable_3 0x0601, 0x0602, 0x0603
 	TextboxNoOverlapVar 
 	_0807EB28 0x0602
 	_0807EB38 
diff --git a/include/script.h b/include/script.h
index aebc64dd..b1aeca73 100644
--- a/include/script.h
+++ b/include/script.h
@@ -5,7 +5,7 @@
 
 typedef struct ScriptExecutionContext {
     u16* scriptInstructionPointer;
-    u32 unk_04;
+    u32 intVariable;
     u32 unk_08;
     u8 unk_0C[0x4]; // unused
     u16 wait;
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 0e9a95ff..db962461 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -149,7 +149,7 @@ void sub_0806346C(Entity* this) {
 }
 
 void sub_080634E4(Entity* this, ScriptExecutionContext* context) {
-    context->unk_04 = this->type2;
+    context->intVariable = this->type2;
 }
 
 void sub_080634EC(Entity* this) {
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index 1c6392e4..b49e67d9 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -70,5 +70,5 @@ void Carpenter_Head(Entity* this) {
 }
 
 void sub_080672B0(Entity* this, ScriptExecutionContext* context) {
-    InitializeAnimation(this, context->unk_04 + (this->animationState >> 1) + this->type * 8);
+    InitializeAnimation(this, context->intVariable + (this->animationState >> 1) + this->type * 8);
 }
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index d4c59e30..ee4ef053 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -108,12 +108,12 @@ void NPC4E(Entity* this) {
 void sub_0806DA04(Entity* this, ScriptExecutionContext* context) {
     // TODO gUnk_0811415C should be a gUnk_0810C89C_struct[], but then a lot of bytes everywhere are wrong?
     gUnk_0810C89C_struct* a = (gUnk_0810C89C_struct*)&(
-        (gUnk_0810C89C_struct*)gUnk_0811415C)[context->unk_04]; // cast necessary to no longer make it a const* ?
+        (gUnk_0810C89C_struct*)gUnk_0811415C)[context->intVariable]; // cast necessary to no longer make it a const* ?
     sub_08078850(this, 1, a->unk_04, a);
 }
 
 void sub_0806DA1C(Entity* this, ScriptExecutionContext* context) {
-    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->unk_04], (u32)(gUnk_081141E4[context->unk_04]));
+    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable], (u32)(gUnk_081141E4[context->intVariable]));
 }
 
 // Returns the kinstone id?
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index 5f1686c4..b846d29e 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -225,7 +225,7 @@ void sub_080602BC(Entity* this) {
 }
 
 void sub_0806030C(Entity* this, ScriptExecutionContext* context) {
-    ModBombs(context->unk_04);
+    ModBombs(context->intVariable);
 }
 
 void sub_08060318() {
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 3a43c14c..1b3ba9b3 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -219,15 +219,15 @@ void sub_08064044() {
 }
 
 void sub_08064050(Entity* this, ScriptExecutionContext* context) {
-    context->unk_04 = 0;
+    context->intVariable = 0;
     switch (this->type2) {
         case 0x11:
-            context->unk_04 = 1;
+            context->intVariable = 1;
             break;
         case 0x12:
-            context->unk_04 = 2;
+            context->intVariable = 2;
             break;
         case 0x13:
-            context->unk_04 = 3;
+            context->intVariable = 3;
     }
 }
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 2741f30a..c94ec167 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -45,7 +45,7 @@ void sub_0806C280() {
 }
 
 void sub_0806C2A0(Entity* this, ScriptExecutionContext* context) {
-    switch (context->unk_04) {
+    switch (context->intVariable) {
         case 0:
             DoFade(0xd, 4);
             break;
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 1aeca5b2..ff96b1fb 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -224,7 +224,7 @@ void sub_0806AEE4(Entity* this) {
 }
 
 void sub_0806AF60(Entity* this, ScriptExecutionContext* context) {
-    InitializeAnimation(this, context->unk_04 + (this->animationState / 2));
+    InitializeAnimation(this, context->intVariable + (this->animationState / 2));
 }
 
 void sub_0806AF70(Entity* this, ScriptExecutionContext* context) {
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index 9b097489..76fea004 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -257,7 +257,7 @@ void sub_08061FB0(Entity* this) {
 void sub_08061FB8(Entity* this, ScriptExecutionContext* context) {
     u8* temp = gUnk_0810B748;
 
-    sub_08078850(this, 1, temp[context->unk_04], &gUnk_0810B740[context->unk_04]);
+    sub_08078850(this, 1, temp[context->intVariable], &gUnk_0810B740[context->intVariable]);
 }
 
 void sub_08061FD8(Entity* this) {
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index c52456ab..e3005ea2 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -540,7 +540,7 @@ void sub_08087424(Entity* this, ScriptExecutionContext* context) {
         sub_0805E3A0(ent, 2);
     }
 
-    switch (context->unk_04) {
+    switch (context->intVariable) {
         case 0:
             gSave.stats.arrowCount = 0;
             break;
diff --git a/src/script.c b/src/script.c
index 7e316da8..1f8e583e 100644
--- a/src/script.c
+++ b/src/script.c
@@ -88,7 +88,7 @@ void ScriptCommand_StartPlayerScript(Entity* entity, ScriptExecutionContext* con
 void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E914(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetIntVariable(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E930(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E944(Entity* entity, ScriptExecutionContext* context);
@@ -103,7 +103,7 @@ void ScriptCommand_0807EA94(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlapFollow(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlap(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TextboxNoOverlapFollowTable(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context);
@@ -235,7 +235,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_0807E8E4,
                                           ScriptCommand_0807E8E4,
                                           ScriptCommand_0807E908,
-                                          ScriptCommand_0807E914,
+                                          ScriptCommand_SetIntVariable,
                                           ScriptCommand_0807E924,
                                           ScriptCommand_0807E930,
                                           ScriptCommand_0807E944,
@@ -250,7 +250,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_TextboxNoOverlapFollow,
                                           ScriptCommand_TextboxNoOverlap,
                                           ScriptCommand_TextboxNoOverlapFollowPos,
-                                          ScriptCommand_0807EAF0,
+                                          ScriptCommand_TextboxNoOverlapFollowTable,
                                           ScriptCommand_TextboxNoOverlapVar,
                                           ScriptCommand_0807EB28,
                                           ScriptCommand_0807EB38,
@@ -658,8 +658,8 @@ void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_JumpTable(Entity* entity, ScriptExecutionContext* context) {
-    if (gActiveScriptInfo.commandSize > context->unk_04) {
-        context->scriptInstructionPointer += context->unk_04;
+    if (gActiveScriptInfo.commandSize > context->intVariable) {
+        context->scriptInstructionPointer += context->intVariable;
         ScriptCommand_Jump(entity, context);
     }
 }
@@ -683,8 +683,8 @@ void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* con
 }
 
 void ScriptCommand_JumpAbsoluteTable(Entity* entity, ScriptExecutionContext* context) {
-    if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) {
-        context->scriptInstructionPointer += context->unk_04 << 1;
+    if (gActiveScriptInfo.commandSize > (context->intVariable << 1) + 1) {
+        context->scriptInstructionPointer += context->intVariable << 1;
         ScriptCommand_JumpAbsolute(entity, context);
     }
 }
@@ -693,10 +693,10 @@ void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context) {
     ((ScriptCommand)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer))(entity, context);
 }
 
-// the called function can read an argument from context->unk_04
+// the called function can read an argument from context->intVariable
 void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context) {
     ScriptCommand tmp = (ScriptCommand)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
-    context->unk_04 = GetNextScriptCommandWord(context->scriptInstructionPointer + 3);
+    context->intVariable = GetNextScriptCommandWord(context->scriptInstructionPointer + 3);
     tmp(entity, context);
 }
 
@@ -863,19 +863,19 @@ void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* co
 }
 
 void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context) {
-    context->condition = !!(context->unk_04 & context->scriptInstructionPointer[1]);
+    context->condition = !!(context->intVariable & context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = context->scriptInstructionPointer[1];
-    context->condition = tmp == (tmp & context->unk_04);
+    context->condition = tmp == (tmp & context->intVariable);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = context->scriptInstructionPointer[1];
-    context->condition = tmp == context->unk_04;
+    context->condition = tmp == context->intVariable;
     gActiveScriptInfo.flags |= 1;
 }
 
@@ -1088,12 +1088,12 @@ void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context) {
     entity->previousActionFlag = 0;
 }
 
-void ScriptCommand_0807E914(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+void ScriptCommand_SetIntVariable(Entity* entity, ScriptExecutionContext* context) {
+    context->intVariable = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
 void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = entity->frames.all;
+    context->intVariable = entity->frames.all;
     entity->frames.all = 0;
 }
 
@@ -1205,9 +1205,9 @@ void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionCont
     gTextBox.textWindowPosY = context->scriptInstructionPointer[2];
 }
 
-void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context) {
-    if (gActiveScriptInfo.commandSize > context->unk_04) {
-        u16* tmp = context->scriptInstructionPointer + context->unk_04;
+void ScriptCommand_TextboxNoOverlapFollowTable(Entity* entity, ScriptExecutionContext* context) {
+    if (gActiveScriptInfo.commandSize > context->intVariable) {
+        u16* tmp = context->scriptInstructionPointer + context->intVariable;
         TextboxNoOverlapFollow(tmp[1]);
     } else {
         TextboxNoOverlapFollow(0);
@@ -1215,7 +1215,7 @@ void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context) {
-    TextboxNoOverlap(context->unk_04, entity);
+    TextboxNoOverlap(context->intVariable, entity);
 }
 
 void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) {
@@ -1223,7 +1223,7 @@ void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = gUnk_02000040.unk_01;
+    context->intVariable = gUnk_02000040.unk_01;
 }
 
 void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context) {
@@ -1483,7 +1483,7 @@ void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* con
 void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = 0;
     if (context->scriptInstructionPointer[1] == 0x3F) {
-        tmp = context->unk_04;
+        tmp = context->intVariable;
     }
     sub_080A7C18(context->scriptInstructionPointer[1], tmp, 0);
 }
@@ -1493,8 +1493,8 @@ void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = GetInventoryValue(context->scriptInstructionPointer[1]);
-    context->condition = context->unk_04 != 0;
+    context->intVariable = GetInventoryValue(context->scriptInstructionPointer[1]);
+    context->condition = context->intVariable != 0;
 }
 
 void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context) {
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 1a2e91d0..9bb1424b 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -85,7 +85,7 @@ commands = [
     {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E908', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E914', 'params': 'w'},
+    {'fun': 'ScriptCommandSetIntVariable', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E924', 'params': ''},
     {'fun': 'ScriptCommand_0807E930', 'params': 's'},
     {'fun': 'ScriptCommand_0807E944', 'params': ''},
@@ -100,7 +100,7 @@ commands = [
     {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['ss', 's']},
-    {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']},
+    {'fun': 'ScriptCommandTextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']},
     {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
     {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
     {'fun': 'ScriptCommand_0807EB38', 'params': ''},

From daec92fefc47412084178f2f85d7dec022ef4a5e Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Mon, 8 Mar 2021 01:04:24 +0100
Subject: [PATCH 30/46] another variadic macro

---
 asm/macros/scripts.inc           | 33 +++++++++++++++++---------------
 data/scripts/script_080160A8.inc |  4 ++--
 data/scripts/script_08016482.inc |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index fefd4eb1..a4b52da0 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -502,25 +502,28 @@
 	.2byte \s
 .endm
 
-.macro TextboxNoOverlapFollowTable a,b
-	.2byte 0x0c5d
-	.2byte \a
-	.2byte \b
+.macro TextboxNoOverlapFollowTableOpN n label labels:vararg
+    .ifnb \labels
+    TextboxNoOverlapFollowTableOpN \n + 1 \labels
+    .else
+    .2byte 0x400 * (\n) + 0x5d
+    .endif
 .endm
 
-.macro TextboxNoOverlapFollowTable_3 a,b,c
-	.2byte 0x105d
-	.2byte \a
-	.2byte \b
-	.2byte \c
+.macro TextboxNoOverlapFollowTableOp labels:vararg
+    TextboxNoOverlapFollowTableOpN 2 \labels
 .endm
 
-.macro TextboxNoOverlapFollowTable_4 a,b,c,d
-	.2byte 0x145d
-	.2byte \a
-	.2byte \b
-	.2byte \c
-	.2byte \d
+.macro TextboxNoOverlapFollowTableLabel label labels:vararg
+    .2byte \label
+    .ifnb \labels
+    TextboxNoOverlapFollowTableLabel \labels
+    .endif
+.endm
+
+.macro TextboxNoOverlapFollowTable labels:vararg
+    TextboxNoOverlapFollowTableOp \labels
+    TextboxNoOverlapFollowTableLabel \labels
 .endm
 
 .macro TextboxNoOverlapVar 
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index d6bc68aa..0bff4916 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -59,7 +59,7 @@ script_08016146:
 	JumpIfNot script_08016146
 	_0807E864 
 	GetInventoryValue 0x0025
-	TextboxNoOverlapFollowTable_4 0x2d03, 0x2d02, 0x2d02, 0x2d02
+	TextboxNoOverlapFollowTable 0x2d03, 0x2d02, 0x2d02, 0x2d02
 	_0807E3E8 
 	JumpIfNot script_0801618A
 	_0807E48C 0x0020
@@ -85,7 +85,7 @@ script_0801619A:
 	JumpIfNot script_0801619A
 	_0807E864 
 	GetInventoryValue 0x0024
-	TextboxNoOverlapFollowTable_4 0x2d05, 0x2d04, 0x2d04, 0x2d04
+	TextboxNoOverlapFollowTable 0x2d05, 0x2d04, 0x2d04, 0x2d04
 	_0807E3E8 
 	JumpIfNot script_080161E2
 	_0807E48C 0x0020
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index b994262f..01cb19f0 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -32,7 +32,7 @@ SCRIPT_START script_08016482
 	TextboxNoOverlapFollow 0x0601
 	TextboxNoOverlap 0x0601
 	TextboxNoOverlapFollowPos_1 0x0601
-	TextboxNoOverlapFollowTable_3 0x0601, 0x0602, 0x0603
+	TextboxNoOverlapFollowTable 0x0601, 0x0602, 0x0603
 	TextboxNoOverlapVar 
 	_0807EB28 0x0602
 	_0807EB38 

From 5e2af32bb11f35dee966343959d955147c660204 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Tue, 9 Mar 2021 01:28:13 +0100
Subject: [PATCH 31/46] 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'},

From a352ff972220ac5f8551a81cff4ed97d97cb164d Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Mon, 8 Mar 2021 19:48:38 +0100
Subject: [PATCH 32/46] Readd void parameters

---
 data/scripts/script_0800939A.inc              |  1 -
 data/scripts/script_080095F2.inc              |  1 -
 data/scripts/script_08009E4E.inc              |  1 -
 data/scripts/script_0800B7FC.inc              |  1 -
 data/scripts/script_0800D242.inc              |  1 -
 data/scripts/script_0800D24C.inc              |  1 -
 data/scripts/script_0800D698.inc              |  1 -
 data/scripts/script_0800E5D6.inc              |  1 -
 data/scripts/script_0800E8A4.inc              |  1 -
 data/scripts/script_0800E8D6.inc              |  1 -
 data/scripts/script_0800E908.inc              |  1 -
 data/scripts/script_08010964.inc              |  1 -
 data/scripts/script_080113AA.inc              |  1 -
 data/scripts/script_08011442.inc              |  1 -
 data/scripts/script_08011508.inc              |  1 -
 data/scripts/script_08012CD8.inc              |  1 -
 data/scripts/script_08012D18.inc              |  1 -
 data/scripts/script_08012D70.inc              |  1 -
 data/scripts/script_08012F86.inc              |  1 -
 data/scripts/script_0801319A.inc              |  1 -
 data/scripts/script_08014248.inc              |  1 -
 data/scripts/script_080157AC.inc              |  1 -
 data/scripts/script_08015B34.inc              |  1 -
 data/scripts/script_08016062.inc              |  1 -
 data/scripts/script_0801609E.inc              |  1 -
 data/scripts/script_08016384.inc              |  1 -
 src/code_0805436C.c                           |  4 +--
 src/npc/bladeBrothers.c                       |  2 +-
 src/npc/emma.c                                |  6 ++---
 src/npc/forestMinish.c                        |  6 ++---
 src/npc/guard.c                               |  2 +-
 src/npc/simon.c                               |  4 +--
 src/npc/smith.c                               |  2 +-
 src/npc/zelda.c                               |  4 +--
 src/object/greatFairy.c                       |  2 +-
 src/room.c                                    | 26 +++++++++----------
 src/script.c                                  |  6 ++---
 tools/script_disassembler/definitions.py      |  3 ++-
 .../script_disassembler.py                    |  2 +-
 39 files changed, 35 insertions(+), 60 deletions(-)

diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc
index 42f99fd4..060c412b 100644
--- a/data/scripts/script_0800939A.inc
+++ b/data/scripts/script_0800939A.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800939A
-script_0800939A:
 	CheckLocalFlag 0x00ae
 	JumpIf script_0800943E
 	CheckInventory1 0x000d
diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc
index cf491e2a..c16c4201 100644
--- a/data/scripts/script_080095F2.inc
+++ b/data/scripts/script_080095F2.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_080095F2
-script_080095F2:
 	CheckEntityInteractType 
 	JumpIfNot script_080095DE
 	_0807E864 
diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc
index 2c71ed55..6e239720 100644
--- a/data/scripts/script_08009E4E.inc
+++ b/data/scripts/script_08009E4E.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08009E4E
-script_08009E4E:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc
index 823e716d..3e2d3fa4 100644
--- a/data/scripts/script_0800B7FC.inc
+++ b/data/scripts/script_0800B7FC.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800B7FC
-script_0800B7FC:
 	CallWithArg sub_0807F4F8, 0x00000090
 	CallWithArg sub_0807F464, 0x00000078
 	Jump script_0800B7EE
diff --git a/data/scripts/script_0800D242.inc b/data/scripts/script_0800D242.inc
index 0d543eb1..c441c743 100644
--- a/data/scripts/script_0800D242.inc
+++ b/data/scripts/script_0800D242.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800D242
-script_0800D242:
 	DoPostScriptAction 0x0007
 	_0807E930 0x0003
 SCRIPT_END
diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc
index dd9a5e5a..0f9b2640 100644
--- a/data/scripts/script_0800D24C.inc
+++ b/data/scripts/script_0800D24C.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800D24C
-script_0800D24C:
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc
index 6e71e13b..297e34b2 100644
--- a/data/scripts/script_0800D698.inc
+++ b/data/scripts/script_0800D698.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800D698
-script_0800D698:
 	_0807EEB4 
 	_0807F0B4 0x0004
 	CameraTargetPlayer 
diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc
index 54f82101..6bc30b46 100644
--- a/data/scripts/script_0800E5D6.inc
+++ b/data/scripts/script_0800E5D6.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800E5D6
-script_0800E5D6:
 	EndBlock 
 script_0800E5D8:
 	CheckLocalFlag 0x0086
diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc
index 9a857695..c357c472 100644
--- a/data/scripts/script_0800E8A4.inc
+++ b/data/scripts/script_0800E8A4.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800E8A4
-script_0800E8A4:
 	BeginBlock 
 	TextboxNoOverlapFollow 0x4504
 	CallWithArg sub_0807F854, 0x000100c8
diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc
index 3e273e5c..a288f654 100644
--- a/data/scripts/script_0800E8D6.inc
+++ b/data/scripts/script_0800E8D6.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800E8D6
-script_0800E8D6:
 	BeginBlock 
 	TextboxNoOverlapFollow 0x4503
 	CallWithArg sub_0807F854, 0x00010032
diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc
index f2f46798..29579a3d 100644
--- a/data/scripts/script_0800E908.inc
+++ b/data/scripts/script_0800E908.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0800E908
-script_0800E908:
 	TextboxNoOverlapFollow 0x4507
 	Jump script_0800E914
 script_0800E910:
diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc
index 82db0677..46a97af4 100644
--- a/data/scripts/script_08010964.inc
+++ b/data/scripts/script_08010964.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08010964
-script_08010964:
 	CheckPlayerInRegion2 0x0808
 	JumpIfNot script_08010964
 	_0807E864 
diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc
index 94883932..2be66000 100644
--- a/data/scripts/script_080113AA.inc
+++ b/data/scripts/script_080113AA.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_080113AA
-script_080113AA:
 	_0807E610 0x00002000
 	_0807E5F8 0x00004000
 	WaitForSomething2 0x00002000
diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc
index 5511fd5e..3aaa70e7 100644
--- a/data/scripts/script_08011442.inc
+++ b/data/scripts/script_08011442.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08011442
-script_08011442:
 	_0807E610 0x00008000
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc
index c8c35491..8232437f 100644
--- a/data/scripts/script_08011508.inc
+++ b/data/scripts/script_08011508.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08011508
-script_08011508:
 	_0807E610 0x00020000
 	_0807E5F8 0x00040000
 	WaitForSomething2 0x00020000
diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc
index 420aa1ee..59f22008 100644
--- a/data/scripts/script_08012CD8.inc
+++ b/data/scripts/script_08012CD8.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08012CD8
-script_08012CD8:
 	EndBlock 
 	BeginBlock 
 	_0807E564 
diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc
index 092f737d..053ed2d2 100644
--- a/data/scripts/script_08012D18.inc
+++ b/data/scripts/script_08012D18.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08012D18
-script_08012D18:
 	EndBlock 
 	BeginBlock 
 	CheckGlobalFlag 0x0014
diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc
index dff75ef9..e290f964 100644
--- a/data/scripts/script_08012D70.inc
+++ b/data/scripts/script_08012D70.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08012D70
-script_08012D70:
 	CheckPlayerInRegion 0x0088, 0x0048, 0x3030
 	JumpIfNot script_08012D70
 	_0807E864 
diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc
index 038b7bad..2a5ea045 100644
--- a/data/scripts/script_08012F86.inc
+++ b/data/scripts/script_08012F86.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08012F86
-script_08012F86:
 	BeginBlock 
 	CheckLocalFlag 0x0060
 	JumpIf script_08012FD2
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index 361e94cd..cc3e52d6 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0801319A
-script_0801319A:
 	EndBlock 
 	BeginBlock 
 	CameraTargetEntity 
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index bbafbef3..30fb9e3d 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08014248
-script_08014248:
 	TestBit 0x00020000
 	JumpIf script_08014264
 	Wait 0x0008
diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc
index 982c9bdf..b4482406 100644
--- a/data/scripts/script_080157AC.inc
+++ b/data/scripts/script_080157AC.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_080157AC
-script_080157AC:
 	CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
 	JumpIfNot script_080157AC
 	_0807E864 
diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc
index 1da50cf7..3b383a11 100644
--- a/data/scripts/script_08015B34.inc
+++ b/data/scripts/script_08015B34.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08015B34
-script_08015B34:
 	EndBlock 
 	BeginBlock 
 	CheckLocalFlag 0x008b
diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc
index 54f9b00f..7f7886a1 100644
--- a/data/scripts/script_08016062.inc
+++ b/data/scripts/script_08016062.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08016062
-script_08016062:
 	SetEntityPosition 0xfff0, 0x0000
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc
index 3c481171..69e5c09b 100644
--- a/data/scripts/script_0801609E.inc
+++ b/data/scripts/script_0801609E.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_0801609E
-script_0801609E:
 	SetEntityPosition 0x0010, 0x0000
 SCRIPT_END
 	.short 0x0000
diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc
index 00176665..f1d84660 100644
--- a/data/scripts/script_08016384.inc
+++ b/data/scripts/script_08016384.inc
@@ -1,5 +1,4 @@
 SCRIPT_START script_08016384
-script_08016384:
 	BeginBlock 
 	EndBlock 
 	Jump script_08016384
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index 142eb474..76a9b18c 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -168,11 +168,11 @@ void sub_08054524(void) {
 }
 #endif
 
-void sub_08054564() {
+void sub_08054564(void) {
     gRoomVars.filler[2] = 1;
 }
 
-void sub_08054570() {
+void sub_08054570(void) {
     gRoomVars.filler[2] = 0;
 }
 
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 10bf8d4a..b08f2e48 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -347,7 +347,7 @@ void sub_08068E90(Entity* this) {
     *(u16*)&s->field_0xac = (1 << (gUnk_08111740[this->actionDelay] - 1)) | *(u16*)&s->field_0xac;
 }
 
-void sub_08068EB4() {
+void sub_08068EB4(void) {
     gPlayerState.field_0xab = 0;
 }
 
diff --git a/src/npc/emma.c b/src/npc/emma.c
index a10a5f03..3867cb87 100644
--- a/src/npc/emma.c
+++ b/src/npc/emma.c
@@ -19,14 +19,14 @@ void Emma(Entity* this) {
     }
 }
 
-void sub_0806C578() {
+void sub_0806C578(void) {
     DoExitTransition(&gUnk_0813AD10);
 }
 
-void sub_0806C588() {
+void sub_0806C588(void) {
     DoExitTransition(&gUnk_0813AD24);
 }
 
-void sub_0806C598() {
+void sub_0806C598(void) {
     DoExitTransition(&gUnk_0813AD38);
 }
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index 0ce3b893..7bcd03f3 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -226,7 +226,7 @@ void sub_0806030C(Entity* this, ScriptExecutionContext* context) {
     ModBombs(context->intVariable);
 }
 
-void sub_08060318() {
+void sub_08060318(void) {
     Entity* ent;
     int i;
 
@@ -239,11 +239,11 @@ void sub_08060318() {
     }
 }
 
-void sub_08060340() {
+void sub_08060340(void) {
     gSave.unk490 = gSave.unk50;
 }
 
-u32 sub_08060354() {
+u32 sub_08060354(void) {
     u32 iVar1;
     s32 iVar2;
 
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 2fad648d..081f9c10 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -212,7 +212,7 @@ void sub_08064030(Entity* arg0, Entity* arg1) {
     *(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f;
 }
 
-void sub_08064044() {
+void sub_08064044(void) {
     gScreenTransition.unk = 1;
 }
 
diff --git a/src/npc/simon.c b/src/npc/simon.c
index c94ec167..aad57a9f 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -27,7 +27,7 @@ void Simon(Entity* this) {
     }
 }
 
-void sub_0806C224() {
+void sub_0806C224(void) {
     DoExitTransition(&gUnk_0813AD60);
     gScreenTransition.transitionType = 6;
 }
@@ -38,7 +38,7 @@ void Simon_CreateChest(Entity* this) {
     SoundReq(0x73);
 }
 
-void sub_0806C280() {
+void sub_0806C280(void) {
     SetGlobalFlag(MAROYA_WAKEUP);
     DoExitTransition(&gUnk_0813AD74);
     gScreenTransition.transitionType = 6;
diff --git a/src/npc/smith.c b/src/npc/smith.c
index 432df784..d365b222 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -158,7 +158,7 @@ void sub_0806622C(Entity* this) {
 void nullsub_501(Entity* this) {
 }
 
-void sub_08066258() {
+void sub_08066258(void) {
     SoundReq(gUnk_081103D0[Random() & 7]);
 }
 
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index f8ad4324..af6ec1c7 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -171,7 +171,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
     gActiveScriptInfo.commandSize = 0;
 }
 
-void sub_08066F94() {
+void sub_08066F94(void) {
     u16 uVar1;
     u16* puVar2;
 
@@ -183,7 +183,7 @@ void sub_08066F94() {
     }
 }
 
-void sub_08066FB8() {
+void sub_08066FB8(void) {
     u16 uVar1;
     u16* puVar2;
 
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index e3005ea2..0ab2d710 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -518,7 +518,7 @@ void sub_080873D0(Entity* this) {
     }
 }
 
-void sub_080873FC() {
+void sub_080873FC(void) {
     Entity* ent;
 
     SoundReq(0xf7);
diff --git a/src/room.c b/src/room.c
index 3b268657..6a0e9fad 100644
--- a/src/room.c
+++ b/src/room.c
@@ -3569,7 +3569,7 @@ void sub_0804D780(void) {
 
 extern u16 gUnk_080EAE00;
 
-void sub_0804D7EC() {
+void sub_0804D7EC(void) {
     u16 temp;
     u16* tilePos;
 
@@ -3581,7 +3581,7 @@ void sub_0804D7EC() {
     }
 }
 
-void sub_0804D810() {
+void sub_0804D810(void) {
     u16 uVar1;
     u16* puVar2;
 
@@ -4796,7 +4796,7 @@ void sub_0804E7DC(void) {
 
 extern u32 script_08009E58;
 
-void sub_0804E864() {
+void sub_0804E864(void) {
     gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90;
     gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
     sub_080751E8(1, 6, &script_08009E58);
@@ -5729,62 +5729,62 @@ void sub_0804F79C(Entity* parent) {
     }
 }
 
-void sub_0804F808() {
+void sub_0804F808(void) {
     SetTileType(0x1d3, 0x41d, 1);
     SetTileType(0x1d3, 0x621, 1);
 }
 
-void sub_0804F830() {
+void sub_0804F830(void) {
     SetTileType(0x1d4, 0x41e, 1);
     SetTileType(0x1d4, 0x620, 1);
 }
 
-void sub_0804F854() {
+void sub_0804F854(void) {
     SetTileType(0x1d5, 0x41f, 1);
     SetTileType(0x1d4, 0x4e5, 1);
     SetTileType(0x1d5, 0x61f, 1);
     SetTileType(0x1d4, 0x559, 1);
 }
 
-void sub_0804F89C() {
+void sub_0804F89C(void) {
     SetTileType(0x1d6, 0x420, 1);
     SetTileType(0x1d5, 0x525, 1);
     SetTileType(0x1d6, 0x61e, 1);
     SetTileType(0x1d5, 0x519, 1);
 }
 
-void sub_0804F8E0() {
+void sub_0804F8E0(void) {
     SetTileType(0x1d3, 0x421, 1);
     SetTileType(0x1d6, 0x565, 1);
     SetTileType(0x1d3, 0x61d, 1);
     SetTileType(0x1d6, 0x4d9, 1);
 }
 
-void sub_0804F928() {
+void sub_0804F928(void) {
     sub_0807BA8C(0x41d, 1);
     sub_0807BA8C(0x621, 1);
 }
 
-void sub_0804F944() {
+void sub_0804F944(void) {
     sub_0807BA8C(0x41e, 1);
     sub_0807BA8C(0x620, 1);
 }
 
-void sub_0804F960() {
+void sub_0804F960(void) {
     sub_0807BA8C(0x41f, 1);
     sub_0807BA8C(0x4e5, 1);
     sub_0807BA8C(0x61f, 1);
     sub_0807BA8C(0x559, 1);
 }
 
-void sub_0804F994() {
+void sub_0804F994(void) {
     sub_0807BA8C(0x420, 1);
     sub_0807BA8C(0x525, 1);
     sub_0807BA8C(0x61e, 1);
     sub_0807BA8C(0x519, 1);
 }
 
-void sub_0804F9C8() {
+void sub_0804F9C8(void) {
     sub_0807BA8C(0x421, 1);
     sub_0807BA8C(0x565, 1);
     sub_0807BA8C(0x61d, 1);
diff --git a/src/script.c b/src/script.c
index 2bf9b6f0..cc9636b8 100644
--- a/src/script.c
+++ b/src/script.c
@@ -579,18 +579,18 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y)
     entity->animationState = (entity->animationState & 0x80) | gUnk_0811E514[(u32)(direction << 0x18) >> 0x1c];
 }
 
-void sub_0807DF28() {
+void sub_0807DF28(void) {
     sub_0807DF38();
     sub_08079184();
     sub_08077B20();
 }
 
-void sub_0807DF38() {
+void sub_0807DF38(void) {
     gUnk_0200AF00.filler0[1] = 0xff;
     gUnk_02034490[0] = 0xff;
 }
 
-void sub_0807DF50() {
+void sub_0807DF50(void) {
     gUnk_02034490[0] = 0;
     gUnk_0200AF00.filler0[1] = 0;
     sub_0801C4A0(0);
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 96104d05..0793db76 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -187,7 +187,8 @@ def get_script_pointer(barray):
     integers = struct.unpack('I', barray)
     val = integers[0]
     if val >= SCRIPTS_START and val <= SCRIPTS_END:
-        return 'script_' + (struct.pack('>I', val).hex()).upper()
+        return use_script_label(val)
+#        return 'script_' + (struct.pack('>I', val).hex()).upper()
     else:
         return '0x'+struct.pack('>I', val).hex()
 
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 19b171c8..3095533c 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -31,7 +31,7 @@ def print_rest_bytes(ctx):
 
 def disassemble_command(ctx: Context, add_all_annotations=False):
     global used_labels
-    if add_all_annotations or ctx.script_addr + ctx.ptr in used_labels:
+    if (add_all_annotations or ctx.script_addr + ctx.ptr in used_labels) and ctx.ptr != 0:
         # print offsets to debug when manually inserting labels
         print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:')
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]

From cb37ce24f3eee3a58a3fa7596ef654b2ddaac5da Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Mon, 8 Mar 2021 21:54:18 +0100
Subject: [PATCH 33/46] Use .2byte for zeros in scripts

---
 asm/macros/scripts.inc                        |  1 -
 data/scripts/script_08008B5C.inc              |  4 +-
 data/scripts/script_08008D50.inc              |  2 +-
 data/scripts/script_08008D8C.inc              |  4 +-
 data/scripts/script_08008F74.inc              |  2 +-
 data/scripts/script_08008FC0.inc              |  2 +-
 data/scripts/script_0800903C.inc              | 12 +++---
 data/scripts/script_08009340.inc              |  2 +-
 data/scripts/script_08009464.inc              |  2 +-
 data/scripts/script_080094CC.inc              |  2 +-
 data/scripts/script_080094FC.inc              |  6 +--
 data/scripts/script_08009740.inc              |  2 +-
 data/scripts/script_08009838.inc              |  2 +-
 data/scripts/script_0800987C.inc              |  2 +-
 data/scripts/script_080098D4.inc              |  2 +-
 data/scripts/script_080099DC.inc              |  2 +-
 data/scripts/script_08009A84.inc              |  2 +-
 data/scripts/script_08009AF8.inc              |  2 +-
 data/scripts/script_08009B78.inc              |  2 +-
 data/scripts/script_08009C68.inc              |  2 +-
 data/scripts/script_08009E4E.inc              |  2 +-
 data/scripts/script_08009E80.inc              |  2 +-
 data/scripts/script_08009F14.inc              |  2 +-
 data/scripts/script_0800A0FC.inc              |  2 +-
 data/scripts/script_0800A160.inc              |  2 +-
 data/scripts/script_0800A1B4.inc              |  2 +-
 data/scripts/script_0800A310.inc              |  4 +-
 data/scripts/script_0800A3D8.inc              |  2 +-
 data/scripts/script_0800A638.inc              |  2 +-
 data/scripts/script_0800A65C.inc              |  2 +-
 data/scripts/script_0800A680.inc              |  2 +-
 data/scripts/script_0800A964.inc              |  2 +-
 data/scripts/script_0800A988.inc              |  2 +-
 data/scripts/script_0800A9AC.inc              |  2 +-
 data/scripts/script_0800A9D0.inc              |  2 +-
 data/scripts/script_0800AA48.inc              |  2 +-
 data/scripts/script_0800AA6C.inc              |  2 +-
 data/scripts/script_0800AA90.inc              |  2 +-
 data/scripts/script_0800AAB4.inc              |  2 +-
 data/scripts/script_0800ACBC.inc              |  2 +-
 data/scripts/script_0800ACE0.inc              |  2 +-
 data/scripts/script_0800AF18.inc              |  2 +-
 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              |  2 +-
 data/scripts/script_0800B0D0.inc              |  2 +-
 data/scripts/script_0800B254.inc              |  6 +--
 data/scripts/script_0800B308.inc              |  2 +-
 data/scripts/script_0800B5C4.inc              |  2 +-
 data/scripts/script_0800B6C8.inc              |  4 +-
 data/scripts/script_0800B7FC.inc              |  2 +-
 data/scripts/script_0800B828.inc              |  8 ++--
 data/scripts/script_0800BB00.inc              |  2 +-
 data/scripts/script_0800BBDC.inc              |  2 +-
 data/scripts/script_0800BC50.inc              |  2 +-
 data/scripts/script_0800BE1C.inc              |  2 +-
 data/scripts/script_0800BF38.inc              |  2 +-
 data/scripts/script_0800C0B0.inc              |  2 +-
 data/scripts/script_0800C1D8.inc              |  2 +-
 data/scripts/script_0800C410.inc              |  2 +-
 data/scripts/script_0800C45C.inc              |  2 +-
 data/scripts/script_0800C494.inc              |  2 +-
 data/scripts/script_0800C4D0.inc              |  2 +-
 data/scripts/script_0800CA8C.inc              |  2 +-
 data/scripts/script_0800CABC.inc              |  2 +-
 data/scripts/script_0800CB54.inc              |  2 +-
 data/scripts/script_0800CBD4.inc              |  2 +-
 data/scripts/script_0800CC6C.inc              |  2 +-
 data/scripts/script_0800CD04.inc              |  2 +-
 data/scripts/script_0800CD7C.inc              |  4 +-
 data/scripts/script_0800D1B4.inc              |  2 +-
 data/scripts/script_0800D24C.inc              |  2 +-
 data/scripts/script_0800D254.inc              |  2 +-
 data/scripts/script_0800D278.inc              |  2 +-
 data/scripts/script_0800D3EC.inc              |  2 +-
 data/scripts/script_0800D414.inc              |  4 +-
 data/scripts/script_0800D6B4.inc              |  2 +-
 data/scripts/script_0800D6D0.inc              |  2 +-
 data/scripts/script_0800D6F0.inc              |  2 +-
 data/scripts/script_0800D710.inc              |  2 +-
 data/scripts/script_0800D76C.inc              |  2 +-
 data/scripts/script_0800D84C.inc              |  2 +-
 data/scripts/script_0800D874.inc              |  4 +-
 data/scripts/script_0800D954.inc              |  2 +-
 data/scripts/script_0800DA60.inc              |  2 +-
 data/scripts/script_0800DB28.inc              |  2 +-
 data/scripts/script_0800DCAC.inc              |  2 +-
 data/scripts/script_0800DDD0.inc              |  2 +-
 data/scripts/script_0800DE00.inc              |  2 +-
 data/scripts/script_0800DED4.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              |  4 +-
 data/scripts/script_0800E544.inc              |  2 +-
 data/scripts/script_0800E58C.inc              |  2 +-
 data/scripts/script_0800E5D6.inc              |  2 +-
 data/scripts/script_0800E6B0.inc              |  4 +-
 data/scripts/script_0800E908.inc              |  2 +-
 data/scripts/script_0800EA1C.inc              |  2 +-
 data/scripts/script_0800EA54.inc              | 10 ++---
 data/scripts/script_0800EF40.inc              |  2 +-
 data/scripts/script_0800EF9C.inc              |  2 +-
 data/scripts/script_0800EFC0.inc              |  4 +-
 data/scripts/script_0800F33C.inc              |  2 +-
 data/scripts/script_0800F354.inc              |  2 +-
 data/scripts/script_0800F36C.inc              |  2 +-
 data/scripts/script_0800F384.inc              |  2 +-
 data/scripts/script_0800F430.inc              |  2 +-
 data/scripts/script_0800F4C4.inc              |  2 +-
 data/scripts/script_0800F554.inc              | 12 +++---
 data/scripts/script_0800F724.inc              |  2 +-
 data/scripts/script_0800FB2C.inc              |  2 +-
 data/scripts/script_0800FD0C.inc              |  2 +-
 data/scripts/script_0800FD80.inc              |  2 +-
 data/scripts/script_0800FDA0.inc              |  6 +--
 data/scripts/script_0800FF74.inc              |  2 +-
 data/scripts/script_080100C8.inc              |  6 +--
 data/scripts/script_08010264.inc              | 28 ++++++-------
 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_08010B68.inc              |  2 +-
 data/scripts/script_08010BB4.inc              |  2 +-
 data/scripts/script_08010F84.inc              |  2 +-
 data/scripts/script_08011508.inc              |  2 +-
 data/scripts/script_080116A8.inc              |  2 +-
 data/scripts/script_0801183C.inc              |  2 +-
 data/scripts/script_080118D4.inc              |  2 +-
 data/scripts/script_08011930.inc              |  2 +-
 data/scripts/script_0801194C.inc              | 16 ++++----
 data/scripts/script_08011B20.inc              |  2 +-
 data/scripts/script_08011C50.inc              |  2 +-
 data/scripts/script_08011C7C.inc              | 14 +++----
 data/scripts/script_0801232C.inc              |  2 +-
 data/scripts/script_08012410.inc              |  2 +-
 data/scripts/script_08012430.inc              |  2 +-
 data/scripts/script_08012AB0.inc              |  2 +-
 data/scripts/script_08012AC8.inc              |  2 +-
 data/scripts/script_08012C48.inc              |  2 +-
 data/scripts/script_08012D18.inc              |  2 +-
 data/scripts/script_08012D70.inc              |  2 +-
 data/scripts/script_08012DD8.inc              |  2 +-
 data/scripts/script_08012DF8.inc              |  2 +-
 data/scripts/script_08012E44.inc              |  2 +-
 data/scripts/script_08012E88.inc              |  2 +-
 data/scripts/script_080130E4.inc              |  2 +-
 data/scripts/script_0801319A.inc              |  2 +-
 data/scripts/script_0801330C.inc              |  2 +-
 data/scripts/script_0801334C.inc              |  2 +-
 data/scripts/script_08013378.inc              |  2 +-
 data/scripts/script_080133C4.inc              |  2 +-
 data/scripts/script_080133F8.inc              |  2 +-
 data/scripts/script_08013720.inc              |  2 +-
 data/scripts/script_08013B18.inc              |  2 +-
 data/scripts/script_08013B70.inc              |  2 +-
 data/scripts/script_08013BE8.inc              |  2 +-
 data/scripts/script_08013D04.inc              |  2 +-
 data/scripts/script_08013D44.inc              |  2 +-
 data/scripts/script_08013D84.inc              |  2 +-
 data/scripts/script_08013DC4.inc              |  2 +-
 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              |  2 +-
 data/scripts/script_08013F34.inc              |  2 +-
 data/scripts/script_08013F64.inc              |  2 +-
 data/scripts/script_08013F94.inc              |  2 +-
 data/scripts/script_08013FE8.inc              |  2 +-
 data/scripts/script_08014054.inc              |  2 +-
 data/scripts/script_08014074.inc              |  2 +-
 data/scripts/script_08014154.inc              |  2 +-
 data/scripts/script_08014198.inc              |  2 +-
 data/scripts/script_080141DC.inc              |  2 +-
 data/scripts/script_08014248.inc              |  4 +-
 data/scripts/script_08014384.inc              |  2 +-
 data/scripts/script_08014450.inc              |  2 +-
 data/scripts/script_0801450C.inc              |  4 +-
 data/scripts/script_080145E8.inc              |  2 +-
 data/scripts/script_08014804.inc              |  4 +-
 data/scripts/script_080149CC.inc              |  6 +--
 data/scripts/script_08014A80.inc              |  4 +-
 data/scripts/script_08014B34.inc              |  2 +-
 data/scripts/script_08014DCC.inc              |  2 +-
 data/scripts/script_08014E14.inc              |  8 ++--
 data/scripts/script_08015304.inc              |  2 +-
 data/scripts/script_080155F4.inc              |  2 +-
 data/scripts/script_08015618.inc              |  2 +-
 data/scripts/script_08015958.inc              |  2 +-
 data/scripts/script_08015A7C.inc              |  2 +-
 data/scripts/script_08015AA0.inc              |  2 +-
 data/scripts/script_08015AC4.inc              |  2 +-
 data/scripts/script_08015B14.inc              |  2 +-
 data/scripts/script_08015B84.inc              |  2 +-
 data/scripts/script_08015BE8.inc              |  2 +-
 data/scripts/script_08015F3C.inc              |  2 +-
 data/scripts/script_08015F80.inc              |  2 +-
 data/scripts/script_08015FA4.inc              |  2 +-
 data/scripts/script_08016004.inc              |  2 +-
 data/scripts/script_08016062.inc              |  2 +-
 data/scripts/script_0801609E.inc              |  2 +-
 data/scripts/script_080160A8.inc              |  2 +-
 data/scripts/script_08016482.inc              |  2 +-
 data/scripts/script_080165A4.inc              |  4 +-
 data/scripts/script_080165D8.inc              | 10 ++---
 tools/script_disassembler/definitions.py      | 40 +++++++++----------
 .../script_disassembler.py                    | 20 +++++-----
 216 files changed, 318 insertions(+), 319 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 3363f3df..9d40b8d1 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -1,5 +1,4 @@
 @ All the macro functions for scripts
-@ Generated by disassemble_script.py
 
 @ helper macros
 
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc
index 0116c89c..3ae98443 100644
--- a/data/scripts/script_08008B5C.inc
+++ b/data/scripts/script_08008B5C.inc
@@ -15,7 +15,7 @@ script_08008B6E:
 	_0807E930 0x0008
 	_0807E878 
 	Jump script_08008B6E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
@@ -126,4 +126,4 @@ script_08008C5C:
 	_0807E5F8 0x00000001
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc
index 38305661..1b90b9f7 100644
--- a/data/scripts/script_08008D50.inc
+++ b/data/scripts/script_08008D50.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_08008D50
 	_0807E5F8 0x00000004
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index 4f31145b..6f419bac 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -14,7 +14,7 @@ script_08008DA0:
 	_0807EA94 
 	_0807E878 
 	Jump script_08008DA0
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
@@ -107,4 +107,4 @@ script_08008E12:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc
index f8f1f63c..087bb253 100644
--- a/data/scripts/script_08008F74.inc
+++ b/data/scripts/script_08008F74.inc
@@ -16,4 +16,4 @@ SCRIPT_START script_08008F74
 	_0807E5F8 0x00000020
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc
index ec7f9ecf..dd2791f8 100644
--- a/data/scripts/script_08008FC0.inc
+++ b/data/scripts/script_08008FC0.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_08008FC0
 	_0807E5F8 0x00000020
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index 43e1ad79..ac832c53 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_0800903C
 	_0807E9D4 
 	DoPostScriptAction 0x000a
 	Jump script_0800927E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_0807F348
 	SetEntityNonPlanarMovement 0x0100
@@ -134,7 +134,7 @@ script_0800917C:
 	_0807E9D4 
 	DoPostScriptAction 0x000a
 	Jump script_080092B2
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -152,7 +152,7 @@ script_0800928A:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800928A
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0000
@@ -177,7 +177,7 @@ script_080092BA:
 	DoPostScriptAction 0x000a
 	EndBlock 
 	Jump script_0800917C
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	Call sub_08066E38
@@ -192,8 +192,8 @@ script_08009300:
 	_0807EA94 
 	_0807E878 
 	Jump script_08009300
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc
index 6385266f..9f5907f4 100644
--- a/data/scripts/script_08009340.inc
+++ b/data/scripts/script_08009340.inc
@@ -2,4 +2,4 @@ SCRIPT_START script_08009340
 	BeginBlock 
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc
index e490d51f..b3865077 100644
--- a/data/scripts/script_08009464.inc
+++ b/data/scripts/script_08009464.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_08009464
 	_0807EA94 
 	Wait 0x000a
 	Jump script_08009376
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_0806D7C4
 	SetEntityNonPlanarMovement 0x0080
diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc
index 5422e60d..d9c26006 100644
--- a/data/scripts/script_080094CC.inc
+++ b/data/scripts/script_080094CC.inc
@@ -12,4 +12,4 @@ script_080094EA:
 	Wait 0x001e
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc
index aafd95f8..6c0e9858 100644
--- a/data/scripts/script_080094FC.inc
+++ b/data/scripts/script_080094FC.inc
@@ -17,7 +17,7 @@ script_08009512:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Jump script_08009512
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08067100
 	DoPostScriptAction 0x000a
@@ -36,7 +36,7 @@ script_0800954E:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Jump script_0800954E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08067314
 	DoPostScriptAction 0x000a
@@ -59,7 +59,7 @@ script_08009592:
 	SetIntVariable 0x00000000
 	Call sub_080672B0
 	Jump script_08009592
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_0806BE3C
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc
index 1418cfcf..707cc5e4 100644
--- a/data/scripts/script_08009740.inc
+++ b/data/scripts/script_08009740.inc
@@ -16,7 +16,7 @@ script_0800975A:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800975A
-	.short 0x0000
+	.2byte 0x0000
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc
index e1737518..2918b662 100644
--- a/data/scripts/script_08009838.inc
+++ b/data/scripts/script_08009838.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_08009838
 	_0807E5F8 0x00000010
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc
index 14a31e8f..1a1f41bd 100644
--- a/data/scripts/script_0800987C.inc
+++ b/data/scripts/script_0800987C.inc
@@ -17,4 +17,4 @@ SCRIPT_START script_0800987C
 	_0807E5F8 0x00000040
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc
index 105a4124..d87a79bd 100644
--- a/data/scripts/script_080098D4.inc
+++ b/data/scripts/script_080098D4.inc
@@ -20,4 +20,4 @@ script_080098E0:
 script_08009910:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc
index c983ca21..fef3b8bc 100644
--- a/data/scripts/script_080099DC.inc
+++ b/data/scripts/script_080099DC.inc
@@ -20,4 +20,4 @@ SCRIPT_START script_080099DC
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000008
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc
index 02fd4d8c..da26d106 100644
--- a/data/scripts/script_08009A84.inc
+++ b/data/scripts/script_08009A84.inc
@@ -23,4 +23,4 @@ SCRIPT_START script_08009A84
 	DoPostScriptAction 0x0008
 	_0807EDD4 0x0290, 0x0188
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc
index 4ef2891b..8e1ae84a 100644
--- a/data/scripts/script_08009AF8.inc
+++ b/data/scripts/script_08009AF8.inc
@@ -13,4 +13,4 @@ SCRIPT_START script_08009AF8
 	WaitFor_2 
 	Call sub_0805367C
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc
index c5204cb2..e0f83575 100644
--- a/data/scripts/script_08009B78.inc
+++ b/data/scripts/script_08009B78.inc
@@ -60,4 +60,4 @@ script_08009C50:
 	_0807E878 
 	Jump script_08009C50
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc
index 30dca264..f78beac8 100644
--- a/data/scripts/script_08009C68.inc
+++ b/data/scripts/script_08009C68.inc
@@ -36,4 +36,4 @@ SCRIPT_START script_08009C68
 	_0807E878 
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc
index 6e239720..8174277e 100644
--- a/data/scripts/script_08009E4E.inc
+++ b/data/scripts/script_08009E4E.inc
@@ -2,4 +2,4 @@ SCRIPT_START script_08009E4E
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc
index a7a249dd..bb82f0fd 100644
--- a/data/scripts/script_08009E80.inc
+++ b/data/scripts/script_08009E80.inc
@@ -2,4 +2,4 @@ SCRIPT_START script_08009E80
 	BeginBlock 
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc
index 16b7954c..828f4cf9 100644
--- a/data/scripts/script_08009F14.inc
+++ b/data/scripts/script_08009F14.inc
@@ -115,4 +115,4 @@ script_0800A064:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800A024
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc
index a83416b8..c7e7f59c 100644
--- a/data/scripts/script_0800A0FC.inc
+++ b/data/scripts/script_0800A0FC.inc
@@ -22,4 +22,4 @@ script_0800A0FE:
 	CallWithArg sub_0806DA1C, 0x00000006
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc
index 148b1209..ea5cf308 100644
--- a/data/scripts/script_0800A160.inc
+++ b/data/scripts/script_0800A160.inc
@@ -16,4 +16,4 @@ SCRIPT_START script_0800A160
 	Wait 0x003c
 	_0807E5F8 0x00000004
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc
index 933c0576..9ea82fa3 100644
--- a/data/scripts/script_0800A1B4.inc
+++ b/data/scripts/script_0800A1B4.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_0800A1B4
 	WaitForSomething 0x00000002
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc
index 2ac3adb5..1d8c805e 100644
--- a/data/scripts/script_0800A310.inc
+++ b/data/scripts/script_0800A310.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_0800A310
 	Wait 0x000a
 	_0807E5F8 0x00000001
 	Call sub_080791BC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0008
 	SetEntityNonPlanarMovement 0x0080
@@ -40,4 +40,4 @@ SCRIPT_START script_0800A310
 	CallWithArg sub_080960C4, script_0800A680
 	_0807E5F8 0x00000040
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc
index 9e2aa8ca..f4260f81 100644
--- a/data/scripts/script_0800A3D8.inc
+++ b/data/scripts/script_0800A3D8.inc
@@ -57,4 +57,4 @@ SCRIPT_START script_0800A3D8
 	WaitForSomething2 0x00000004
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc
index 40523784..1f099721 100644
--- a/data/scripts/script_0800A638.inc
+++ b/data/scripts/script_0800A638.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_0800A638
 	WaitForSomething 0x00001000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc
index e221b79a..78eb79bf 100644
--- a/data/scripts/script_0800A65C.inc
+++ b/data/scripts/script_0800A65C.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_0800A65C
 	WaitForSomething 0x00000800
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc
index 87bf2e8e..7112b6da 100644
--- a/data/scripts/script_0800A680.inc
+++ b/data/scripts/script_0800A680.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_0800A680
 	WaitForSomething 0x00000020
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc
index 393a57c4..d00269a5 100644
--- a/data/scripts/script_0800A964.inc
+++ b/data/scripts/script_0800A964.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800A964
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc
index aad9af72..f0b9135c 100644
--- a/data/scripts/script_0800A988.inc
+++ b/data/scripts/script_0800A988.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800A988
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc
index 2d8f3578..9a235bcf 100644
--- a/data/scripts/script_0800A9AC.inc
+++ b/data/scripts/script_0800A9AC.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800A9AC
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc
index c2d5e2b3..2f385317 100644
--- a/data/scripts/script_0800A9D0.inc
+++ b/data/scripts/script_0800A9D0.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800A9D0
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc
index 989a90a2..e992d04f 100644
--- a/data/scripts/script_0800AA48.inc
+++ b/data/scripts/script_0800AA48.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AA48
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc
index f46249d4..e9bbd201 100644
--- a/data/scripts/script_0800AA6C.inc
+++ b/data/scripts/script_0800AA6C.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AA6C
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc
index f5f4c96c..0a55246e 100644
--- a/data/scripts/script_0800AA90.inc
+++ b/data/scripts/script_0800AA90.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AA90
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc
index e7b8d6b9..bc7bf8ad 100644
--- a/data/scripts/script_0800AAB4.inc
+++ b/data/scripts/script_0800AAB4.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AAB4
 	Call CreateDust
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc
index 035a5e25..5fa1b6a4 100644
--- a/data/scripts/script_0800ACBC.inc
+++ b/data/scripts/script_0800ACBC.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_0800ACBC
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000001
 	Call sub_080791BC
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc
index 3ddf7d42..7f22b9cf 100644
--- a/data/scripts/script_0800ACE0.inc
+++ b/data/scripts/script_0800ACE0.inc
@@ -22,4 +22,4 @@ SCRIPT_START script_0800ACE0
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000001
 	Call sub_080791BC
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc
index 588860a3..71358dea 100644
--- a/data/scripts/script_0800AF18.inc
+++ b/data/scripts/script_0800AF18.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_0800AF18
 	SoundReq 0x0143
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc
index 600b6138..9a6fe0ff 100644
--- a/data/scripts/script_0800AF44.inc
+++ b/data/scripts/script_0800AF44.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AF44
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc
index c051e9d2..17d3b4c5 100644
--- a/data/scripts/script_0800AF68.inc
+++ b/data/scripts/script_0800AF68.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AF68
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc
index c413b752..2966dc38 100644
--- a/data/scripts/script_0800AF8C.inc
+++ b/data/scripts/script_0800AF8C.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AF8C
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc
index aec2c2e2..21e9510d 100644
--- a/data/scripts/script_0800AFB0.inc
+++ b/data/scripts/script_0800AFB0.inc
@@ -15,4 +15,4 @@ script_0800AFB2:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc
index 92f7317f..7cf12c3d 100644
--- a/data/scripts/script_0800AFE8.inc
+++ b/data/scripts/script_0800AFE8.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800AFE8
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc
index b7748277..0d1b013e 100644
--- a/data/scripts/script_0800B00C.inc
+++ b/data/scripts/script_0800B00C.inc
@@ -45,4 +45,4 @@ script_0800B09C:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index 4e167a77..c4687bdc 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -53,4 +53,4 @@ script_0800B160:
 	_0807E878 
 	Call sub_0807DF50
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc
index 872613b6..3686156d 100644
--- a/data/scripts/script_0800B254.inc
+++ b/data/scripts/script_0800B254.inc
@@ -14,7 +14,7 @@ script_0800B268:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800B268
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	CheckKinstoneFused 0x0007
 	JumpIf script_0800B302
@@ -30,7 +30,7 @@ script_0800B298:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800B298
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	CheckKinstoneFused 0x0008
 	JumpIf script_0800B302
@@ -57,4 +57,4 @@ script_0800B2E2:
 script_0800B302:
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc
index 6fa1ad9f..aa0f455a 100644
--- a/data/scripts/script_0800B308.inc
+++ b/data/scripts/script_0800B308.inc
@@ -41,4 +41,4 @@ script_0800B350:
 script_0800B39C:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc
index 3d18214c..45b307ad 100644
--- a/data/scripts/script_0800B5C4.inc
+++ b/data/scripts/script_0800B5C4.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_0800B5C4
 	Wait 0x000a
 	Call sub_08069EE8
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc
index 4168693b..18560a5c 100644
--- a/data/scripts/script_0800B6C8.inc
+++ b/data/scripts/script_0800B6C8.inc
@@ -24,7 +24,7 @@ script_0800B6D4:
 	SetLocalFlag 0x009f
 	_0807F034 0x0064
 	Jump script_0800B698
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	EndBlock 
 script_0800B734:
@@ -64,4 +64,4 @@ script_0800B7A2:
 	TextboxNoOverlap 0x057f
 	_0807EA94 
 	Jump script_0800B6A6
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc
index 3e2d3fa4..e2a45b4a 100644
--- a/data/scripts/script_0800B7FC.inc
+++ b/data/scripts/script_0800B7FC.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800B7FC
 	_0807E930 0x0000
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc
index ae2357f1..d3083099 100644
--- a/data/scripts/script_0800B828.inc
+++ b/data/scripts/script_0800B828.inc
@@ -12,7 +12,7 @@ script_0800B836:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800B836
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
@@ -60,7 +60,7 @@ script_0800B8D4:
 	Wait 0x003c
 	Call sub_080646A4
 	Jump script_0800B8D4
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08061E70
 	DoPostScriptAction 0x000a
@@ -77,7 +77,7 @@ script_0800B8FC:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800B8FC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -126,4 +126,4 @@ script_0800B99E:
 script_0800B9AC:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc
index e7e21cd9..3f992005 100644
--- a/data/scripts/script_0800BB00.inc
+++ b/data/scripts/script_0800BB00.inc
@@ -13,4 +13,4 @@ script_0800BB04:
 	Wait 0x00b4
 	Call sub_08054968
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc
index 61a8f18b..a9b2b676 100644
--- a/data/scripts/script_0800BBDC.inc
+++ b/data/scripts/script_0800BBDC.inc
@@ -12,4 +12,4 @@ script_0800BBE4:
 	Wait 0x0078
 	Call sub_08054968
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc
index baa24609..ec6f2a37 100644
--- a/data/scripts/script_0800BC50.inc
+++ b/data/scripts/script_0800BC50.inc
@@ -35,4 +35,4 @@ script_0800BC62:
 	Wait 0x0078
 	Call sub_08054968
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc
index 5df0ddf2..ef5f897c 100644
--- a/data/scripts/script_0800BE1C.inc
+++ b/data/scripts/script_0800BE1C.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_0800BE1C
 	_0807E930 0x0008
 	Wait 0x003c
 	Jump script_0800BE88
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc
index 0e16a8ad..7b131db4 100644
--- a/data/scripts/script_0800BF38.inc
+++ b/data/scripts/script_0800BF38.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_0800BF38
 	_0807E930 0x0008
 	Wait 0x003c
 	Jump script_0800BFA4
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc
index b5c2d224..04950467 100644
--- a/data/scripts/script_0800C0B0.inc
+++ b/data/scripts/script_0800C0B0.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_0800C0B0
 	_0807E930 0x0008
 	Wait 0x003c
 	Jump script_0800C11C
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc
index f4b62315..98163565 100644
--- a/data/scripts/script_0800C1D8.inc
+++ b/data/scripts/script_0800C1D8.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_0800C1D8
 	_0807E930 0x0008
 	Wait 0x003c
 	Jump script_0800C244
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0008
diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc
index eb91cfce..42903575 100644
--- a/data/scripts/script_0800C410.inc
+++ b/data/scripts/script_0800C410.inc
@@ -13,4 +13,4 @@ SCRIPT_START script_0800C410
 	SoundReq 0x010b
 	_0807E5F8 0x00000001
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc
index 99d16109..d1078766 100644
--- a/data/scripts/script_0800C45C.inc
+++ b/data/scripts/script_0800C45C.inc
@@ -15,4 +15,4 @@ script_0800C47A:
 	_0807E930 0x0005
 	Wait 0x000f
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc
index 375f4770..5aa15f03 100644
--- a/data/scripts/script_0800C494.inc
+++ b/data/scripts/script_0800C494.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_0800C494
 	_0807E930 0x0005
 	Wait 0x000f
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc
index 68d2a19f..5186a76a 100644
--- a/data/scripts/script_0800C4D0.inc
+++ b/data/scripts/script_0800C4D0.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_0800C4D0
 	_0807E930 0x0005
 	Wait 0x000f
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc
index fd9661ce..a2429daa 100644
--- a/data/scripts/script_0800CA8C.inc
+++ b/data/scripts/script_0800CA8C.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_0800CA8C
 	_0807E5F8 0x00000002
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc
index 465dc589..67cac527 100644
--- a/data/scripts/script_0800CABC.inc
+++ b/data/scripts/script_0800CABC.inc
@@ -31,4 +31,4 @@ SCRIPT_START script_0800CABC
 	_0807E5F8 0x00000400
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc
index 38f0687a..206ad5fb 100644
--- a/data/scripts/script_0800CB54.inc
+++ b/data/scripts/script_0800CB54.inc
@@ -27,4 +27,4 @@ SCRIPT_START script_0800CB54
 	_0807E5F8 0x00001000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc
index 0e6187bc..32847309 100644
--- a/data/scripts/script_0800CBD4.inc
+++ b/data/scripts/script_0800CBD4.inc
@@ -31,4 +31,4 @@ SCRIPT_START script_0800CBD4
 	_0807E5F8 0x00004000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc
index 523e3bf3..ffeff6d3 100644
--- a/data/scripts/script_0800CC6C.inc
+++ b/data/scripts/script_0800CC6C.inc
@@ -31,4 +31,4 @@ SCRIPT_START script_0800CC6C
 	_0807E5F8 0x00010000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc
index 9d75f438..c25ec6ca 100644
--- a/data/scripts/script_0800CD04.inc
+++ b/data/scripts/script_0800CD04.inc
@@ -25,4 +25,4 @@ SCRIPT_START script_0800CD04
 	_0807E5F8 0x00040000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index e225e56f..bac529fa 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -144,7 +144,7 @@ script_0800CF40:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800CD92
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08068104
 	DoPostScriptAction 0x000a
@@ -290,4 +290,4 @@ script_0800D17C:
 	_0807E878 
 	Call sub_0807DF50
 	Jump script_0800CFFA
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc
index 986fa584..855279ca 100644
--- a/data/scripts/script_0800D1B4.inc
+++ b/data/scripts/script_0800D1B4.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_0800D1B4
 	_0807E5F8 0x00000008
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc
index 0f9b2640..f56e72d8 100644
--- a/data/scripts/script_0800D24C.inc
+++ b/data/scripts/script_0800D24C.inc
@@ -1,4 +1,4 @@
 SCRIPT_START script_0800D24C
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc
index c0f99f30..27de55ab 100644
--- a/data/scripts/script_0800D254.inc
+++ b/data/scripts/script_0800D254.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800D254
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index a7c3a384..4f5fdc32 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -108,4 +108,4 @@ script_0800D3B2:
 script_0800D3E4:
 	_0807E878 
 	Jump script_0800D35E
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc
index 0300f2e7..95b38e48 100644
--- a/data/scripts/script_0800D3EC.inc
+++ b/data/scripts/script_0800D3EC.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_0800D3EC
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index 5f7545e1..fac4b733 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -38,7 +38,7 @@ script_0800D426:
 	Call sub_0806AF60
 	_0807EDD4 0x0228, 0x01e8
 	Jump script_0800D426
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	Call sub_08062A48
@@ -124,7 +124,7 @@ script_0800D5F2:
 	_0807EE30 
 	JumpIfNot script_0800D5F2
 	Jump script_0800D5AC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000b
diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc
index c994019e..5ecafb12 100644
--- a/data/scripts/script_0800D6B4.inc
+++ b/data/scripts/script_0800D6B4.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_0800D6B4
 	Call sub_0807F738
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc
index 65080eb4..40d9c3a4 100644
--- a/data/scripts/script_0800D6D0.inc
+++ b/data/scripts/script_0800D6D0.inc
@@ -10,4 +10,4 @@ script_0800D6E0:
 script_0800D6E8:
 	DoPostScriptAction 0x0007
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc
index a39a56f4..fb84a2c7 100644
--- a/data/scripts/script_0800D6F0.inc
+++ b/data/scripts/script_0800D6F0.inc
@@ -9,4 +9,4 @@ script_0800D700:
 	JumpIfNot script_0800D700
 	DoPostScriptAction 0x0007
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc
index e5130920..f5787251 100644
--- a/data/scripts/script_0800D710.inc
+++ b/data/scripts/script_0800D710.inc
@@ -20,4 +20,4 @@ SCRIPT_START script_0800D710
 	Call sub_0807DF50
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc
index 373f3f59..c676c9df 100644
--- a/data/scripts/script_0800D76C.inc
+++ b/data/scripts/script_0800D76C.inc
@@ -47,4 +47,4 @@ script_0800D82A:
 	_0807E5F8 0x00000004
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc
index 32cd7303..8b2968e9 100644
--- a/data/scripts/script_0800D84C.inc
+++ b/data/scripts/script_0800D84C.inc
@@ -11,4 +11,4 @@ script_0800D850:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc
index ef4b487b..f16e938f 100644
--- a/data/scripts/script_0800D874.inc
+++ b/data/scripts/script_0800D874.inc
@@ -30,7 +30,7 @@ script_0800D8D6:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_0800D88E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0008
 	CheckInventory1 0x0017
@@ -52,4 +52,4 @@ script_0800D8F4:
 script_0800D924:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc
index fa5755b5..b745268a 100644
--- a/data/scripts/script_0800D954.inc
+++ b/data/scripts/script_0800D954.inc
@@ -39,4 +39,4 @@ script_0800D962:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc
index 733bf33b..7b451f6c 100644
--- a/data/scripts/script_0800DA60.inc
+++ b/data/scripts/script_0800DA60.inc
@@ -43,4 +43,4 @@ script_0800DA64:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc
index 08038ccb..5dd5e987 100644
--- a/data/scripts/script_0800DB28.inc
+++ b/data/scripts/script_0800DB28.inc
@@ -18,4 +18,4 @@ SCRIPT_START script_0800DB28
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0014
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc
index a3c0f2e5..582e4f0d 100644
--- a/data/scripts/script_0800DCAC.inc
+++ b/data/scripts/script_0800DCAC.inc
@@ -65,4 +65,4 @@ script_0800DCD0:
 	SetEntityNonPlanarMovement 0x0100
 	_0807EEF4 0x0000, 0x0080
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc
index dd7e3a6a..8f6197ab 100644
--- a/data/scripts/script_0800DDD0.inc
+++ b/data/scripts/script_0800DDD0.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_0800DDD0
 	_0807E5F8 0x00000004
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc
index e1425d7e..cda0a5f9 100644
--- a/data/scripts/script_0800DE00.inc
+++ b/data/scripts/script_0800DE00.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_0800DE00
 	_0807E5F8 0x00000004
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc
index a88bfd5b..d3aa6911 100644
--- a/data/scripts/script_0800DED4.inc
+++ b/data/scripts/script_0800DED4.inc
@@ -18,4 +18,4 @@ SCRIPT_START script_0800DED4
 	Call sub_08066D4C
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc
index b628b130..d1de2e0b 100644
--- a/data/scripts/script_0800DFE4.inc
+++ b/data/scripts/script_0800DFE4.inc
@@ -28,4 +28,4 @@ script_0800E012:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc
index 008f8c98..f44b8f44 100644
--- a/data/scripts/script_0800E050.inc
+++ b/data/scripts/script_0800E050.inc
@@ -17,4 +17,4 @@ SCRIPT_START script_0800E050
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc
index 5b912f70..c3a946ef 100644
--- a/data/scripts/script_0800E094.inc
+++ b/data/scripts/script_0800E094.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800E094
 	_0807E5F8 0x00000002
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc
index 7bf1a3eb..5afb7a99 100644
--- a/data/scripts/script_0800E0BC.inc
+++ b/data/scripts/script_0800E0BC.inc
@@ -44,7 +44,7 @@ script_0800E138:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800E138
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000a
@@ -180,7 +180,7 @@ script_0800E32E:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E32E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc
index f8ea1fde..7b085256 100644
--- a/data/scripts/script_0800E544.inc
+++ b/data/scripts/script_0800E544.inc
@@ -19,4 +19,4 @@ script_0800E582:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc
index 03454897..54971859 100644
--- a/data/scripts/script_0800E58C.inc
+++ b/data/scripts/script_0800E58C.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_0800E58C
 	Wait 0x003c
 	Call sub_08053C84
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc
index 6bc30b46..c1219cee 100644
--- a/data/scripts/script_0800E5D6.inc
+++ b/data/scripts/script_0800E5D6.inc
@@ -11,4 +11,4 @@ script_0800E5D8:
 	Wait 0x001e
 	_0807E878 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc
index dd055f19..e7c074fe 100644
--- a/data/scripts/script_0800E6B0.inc
+++ b/data/scripts/script_0800E6B0.inc
@@ -44,7 +44,7 @@ script_0800E722:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E6F4
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
@@ -120,7 +120,7 @@ script_0800E806:
 	_0807E878 
 	_0807EB44 0x0004
 	Jump script_0800E806
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc
index 29579a3d..84d61ce1 100644
--- a/data/scripts/script_0800E908.inc
+++ b/data/scripts/script_0800E908.inc
@@ -28,7 +28,7 @@ script_0800E942:
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	Jump script_0800E932
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	_0807EB44 0x0004
diff --git a/data/scripts/script_0800EA1C.inc b/data/scripts/script_0800EA1C.inc
index 037d857f..57360433 100644
--- a/data/scripts/script_0800EA1C.inc
+++ b/data/scripts/script_0800EA1C.inc
@@ -12,4 +12,4 @@ SCRIPT_START script_0800EA1C
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc
index ae6cfc3d..87291df6 100644
--- a/data/scripts/script_0800EA54.inc
+++ b/data/scripts/script_0800EA54.inc
@@ -61,7 +61,7 @@ script_0800EB0E:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800EB0E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08061E70
 	DoPostScriptAction 0x000a
@@ -78,7 +78,7 @@ script_0800EB44:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800EB44
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08061E70
 	DoPostScriptAction 0x000a
@@ -127,7 +127,7 @@ script_0800EBF4:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800EBF4
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08061E70
 	DoPostScriptAction 0x000a
@@ -162,7 +162,7 @@ script_0800EC6C:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800EC6C
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	CallWithArg sub_08061FB8, 0x00000001
@@ -232,7 +232,7 @@ script_0800ED76:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0800ED76
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc
index fa2511c4..74e61575 100644
--- a/data/scripts/script_0800EF40.inc
+++ b/data/scripts/script_0800EF40.inc
@@ -26,4 +26,4 @@ script_0800EF82:
 script_0800EF92:
 	Call sub_0808692C
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc
index 61f94c12..a246d1fe 100644
--- a/data/scripts/script_0800EF9C.inc
+++ b/data/scripts/script_0800EF9C.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0800EF9C
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc
index e69fb191..ba645685 100644
--- a/data/scripts/script_0800EFC0.inc
+++ b/data/scripts/script_0800EFC0.inc
@@ -42,7 +42,7 @@ script_0800F082:
 	EndBlock 
 	Call sub_0806AEE4
 	Jump script_0800F082
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807F0B4 0x0001
 	CameraTargetPlayer 
@@ -88,4 +88,4 @@ script_0800F11A:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc
index 7fa6f67e..cf83ab8e 100644
--- a/data/scripts/script_0800F33C.inc
+++ b/data/scripts/script_0800F33C.inc
@@ -4,4 +4,4 @@ SCRIPT_START script_0800F33C
 	_0807E5F8 0x00000400
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc
index faa7609d..30e7f1ef 100644
--- a/data/scripts/script_0800F354.inc
+++ b/data/scripts/script_0800F354.inc
@@ -4,4 +4,4 @@ SCRIPT_START script_0800F354
 	_0807E5F8 0x00000400
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc
index 3f5d8959..e3192b28 100644
--- a/data/scripts/script_0800F36C.inc
+++ b/data/scripts/script_0800F36C.inc
@@ -4,4 +4,4 @@ SCRIPT_START script_0800F36C
 	_0807E5F8 0x00000400
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc
index 349b1715..38780c9b 100644
--- a/data/scripts/script_0800F384.inc
+++ b/data/scripts/script_0800F384.inc
@@ -4,4 +4,4 @@ SCRIPT_START script_0800F384
 	_0807E5F8 0x00000400
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc
index 45b67055..023bf67d 100644
--- a/data/scripts/script_0800F430.inc
+++ b/data/scripts/script_0800F430.inc
@@ -40,4 +40,4 @@ script_0800F490:
 	_0807E5F8 0x00000100
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc
index 86830725..4d285fdc 100644
--- a/data/scripts/script_0800F4C4.inc
+++ b/data/scripts/script_0800F4C4.inc
@@ -39,4 +39,4 @@ script_0800F524:
 	_0807E5F8 0x00000200
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc
index d362eb4b..e8de87fb 100644
--- a/data/scripts/script_0800F554.inc
+++ b/data/scripts/script_0800F554.inc
@@ -14,7 +14,7 @@ script_0800F564:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800F564
-	.short 0x0000
+	.2byte 0x0000
 script_0800F584:
 	BeginBlock 
 	DoPostScriptAction 0x0001
@@ -31,7 +31,7 @@ script_0800F592:
 	_0807E878 
 	DoPostScriptAction 0x0001
 	Jump script_0800F592
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0006
 	_0807E9D4 
@@ -48,7 +48,7 @@ script_0800F5C8:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800F5C8
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
@@ -81,7 +81,7 @@ script_0800F636:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800F636
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -100,7 +100,7 @@ script_0800F662:
 	_0807E878 
 	DoPostScriptAction 0x0000
 	Jump script_0800F662
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E930 0x0000
@@ -126,7 +126,7 @@ script_0800F6C8:
 	_0807E878 
 	CallWithArg sub_0807F3D8, 0x00000000
 	Jump script_0800F6A0
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0001
 	_0807E9D4 
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 0a5bab7d..3bddc5e9 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -173,4 +173,4 @@ script_0800F72C:
 script_0800FA4C:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800FB2C.inc b/data/scripts/script_0800FB2C.inc
index 8a92506b..6f074f03 100644
--- a/data/scripts/script_0800FB2C.inc
+++ b/data/scripts/script_0800FB2C.inc
@@ -4,4 +4,4 @@ SCRIPT_START script_0800FB2C
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc
index cdb8328b..0720943c 100644
--- a/data/scripts/script_0800FD0C.inc
+++ b/data/scripts/script_0800FD0C.inc
@@ -27,4 +27,4 @@ script_0800FD5C:
 	WaitForSomething2 0x00000008
 	_0807E878 
 	Jump script_0800FD50
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc
index 724039bc..69ac239e 100644
--- a/data/scripts/script_0800FD80.inc
+++ b/data/scripts/script_0800FD80.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_0800FD80
 	_0807E5F8 0x00000008
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc
index 192cfda5..15f53ddd 100644
--- a/data/scripts/script_0800FDA0.inc
+++ b/data/scripts/script_0800FDA0.inc
@@ -14,7 +14,7 @@ script_0800FDB2:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800FDB2
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -50,7 +50,7 @@ script_0800FE06:
 	Wait 0x003c
 	Call sub_08069A3C
 	Jump script_0800FDE8
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -86,7 +86,7 @@ script_0800FE7E:
 	Wait 0x003c
 	Call sub_08069A84
 	Jump script_0800FE60
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	CheckInventory1 0x0012
 	JumpIf script_0800FF0E
diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc
index 1b87d588..91997467 100644
--- a/data/scripts/script_0800FF74.inc
+++ b/data/scripts/script_0800FF74.inc
@@ -66,7 +66,7 @@ script_08010060:
 	CallWithArg sub_0807F5B0, 0x0000000a
 	_0807E878 
 	Jump script_0800FF92
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index ac42504d..fd50b2f9 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -14,7 +14,7 @@ script_080100DC:
 	_0807EA94 
 	_0807E878 
 	Jump script_080100DC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08061FE4
 	Call sub_08061E70
@@ -24,7 +24,7 @@ script_08010110:
 	Wait 0x003c
 	Call sub_08061E90
 	Jump script_08010110
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
@@ -116,4 +116,4 @@ script_08010240:
 	Call sub_080A169C
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index 3a0354d7..d45d6fda 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -15,7 +15,7 @@ script_0801027A:
 	_0807EA94 
 	_0807E878 
 	Jump script_0801027A
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	Call sub_08062A48
@@ -40,7 +40,7 @@ script_080102CC:
 	_0807EA94 
 	_0807E878 
 	Jump script_080102A6
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	Call sub_08062A48
@@ -55,7 +55,7 @@ script_080102F2:
 	_0807EA94 
 	_0807E878 
 	Jump script_080102F2
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	EndBlock 
@@ -99,7 +99,7 @@ script_08010396:
 	_0807EE30 
 	JumpIfNot script_08010396
 	Jump script_08010314
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	Call sub_08062A48
@@ -119,7 +119,7 @@ script_080103E8:
 	Wait 0x003c
 	Call sub_0806407C
 	Jump script_080103E8
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0004
@@ -256,7 +256,7 @@ script_080105E0:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_08010502
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
@@ -290,19 +290,19 @@ script_0801062E:
 	BeginBlock 
 	_0807E930 0x0009
 	Jump script_08010622
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E930 0x000b
 	Jump script_08010622
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E930 0x000c
 	Jump script_08010622
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E930 0x000d
 	Jump script_08010622
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
@@ -321,7 +321,7 @@ script_08010686:
 	_0807E878 
 	_0807EB44 0x0004
 	Jump script_08010686
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
@@ -364,7 +364,7 @@ script_08010726:
 	_0807E878 
 	DoPostScriptAction 0x0001
 	Jump script_080106BE
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0007
 	_0807E9D4 
@@ -415,7 +415,7 @@ script_080107AA:
 	_0807E878 
 	DoPostScriptAction 0x0000
 	Jump script_080107AA
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -534,4 +534,4 @@ script_08010942:
 	Jump script_0801091C
 	Call sub_0808692C
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc
index 04fe995f..99e7d042 100644
--- a/data/scripts/script_080109F0.inc
+++ b/data/scripts/script_080109F0.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_080109F0
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc
index 53105cf2..d3ecbef6 100644
--- a/data/scripts/script_08010A14.inc
+++ b/data/scripts/script_08010A14.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08010A14
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc
index 0f012078..2f5dcc02 100644
--- a/data/scripts/script_08010A38.inc
+++ b/data/scripts/script_08010A38.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08010A38
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc
index 0f9dcf76..2cdf5764 100644
--- a/data/scripts/script_08010A5C.inc
+++ b/data/scripts/script_08010A5C.inc
@@ -16,4 +16,4 @@ script_08010A78:
 	Call sub_0807DF50
 	Call sub_080791D0
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc
index 27dbc37f..44727354 100644
--- a/data/scripts/script_08010B68.inc
+++ b/data/scripts/script_08010B68.inc
@@ -25,4 +25,4 @@ script_08010B88:
 script_08010BAC:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index 8fee4cbf..b2c8633f 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -16,7 +16,7 @@ script_08010BCA:
 	_0807E878 
 	_0807E930 0x0008
 	Jump script_08010BCA
-	.short 0x0000
+	.2byte 0x0000
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index 0e59d2cd..730c4f02 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -41,4 +41,4 @@ SCRIPT_START script_08010F84
 	Call sub_0804BCDC
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc
index 8232437f..fa5574e6 100644
--- a/data/scripts/script_08011508.inc
+++ b/data/scripts/script_08011508.inc
@@ -41,4 +41,4 @@ SCRIPT_START script_08011508
 	_0807E5F8 0x00040000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc
index 2809f1cf..dd4be295 100644
--- a/data/scripts/script_080116A8.inc
+++ b/data/scripts/script_080116A8.inc
@@ -82,4 +82,4 @@ SCRIPT_START script_080116A8
 	_0807E5F8 0x00000200
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc
index 823a28a1..09d8d177 100644
--- a/data/scripts/script_0801183C.inc
+++ b/data/scripts/script_0801183C.inc
@@ -16,4 +16,4 @@ SCRIPT_START script_0801183C
 	WaitForSomething2 0x00800000
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc
index 9b8ec154..178ed17f 100644
--- a/data/scripts/script_080118D4.inc
+++ b/data/scripts/script_080118D4.inc
@@ -18,4 +18,4 @@ SCRIPT_START script_080118D4
 	SoundReq 0x011d
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08011930.inc b/data/scripts/script_08011930.inc
index 387c954c..2dcc1588 100644
--- a/data/scripts/script_08011930.inc
+++ b/data/scripts/script_08011930.inc
@@ -2,4 +2,4 @@ SCRIPT_START script_08011930
 	WaitForSomething 0x20000000
 	Call sub_0809567C
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc
index 03141c41..7d19a55f 100644
--- a/data/scripts/script_0801194C.inc
+++ b/data/scripts/script_0801194C.inc
@@ -2,11 +2,11 @@ SCRIPT_START script_0801194C
 	BeginBlock 
 	_0807EB44 0x0002
 	Jump script_0801196A
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0006
 	Jump script_0801196A
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 script_0801196A:
@@ -41,15 +41,15 @@ script_080119C8:
 	Wait 0x003c
 	Call sub_0806407C
 	Jump script_080119C8
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0002
 	Jump script_080119F6
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	Jump script_080119F6
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0006
 script_080119F6:
@@ -67,7 +67,7 @@ script_08011A08:
 	_0807EA94 
 	_0807E878 
 	Jump script_08011A08
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E9D4 
@@ -102,7 +102,7 @@ script_08011A7C:
 	_0807EA94 
 	_0807E878 
 	Jump script_08011A7C
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	_0807E9D4 
@@ -134,4 +134,4 @@ script_08011AFA:
 	Call sub_0807DF50
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc
index 8e19052d..0e870c50 100644
--- a/data/scripts/script_08011B20.inc
+++ b/data/scripts/script_08011B20.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08011B20
 	Call sub_0807DF50
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc
index a31ccbe5..c74be3e5 100644
--- a/data/scripts/script_08011C50.inc
+++ b/data/scripts/script_08011C50.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_08011C50
 	Wait 0x001e
 	_0807E5F8 0x00000004
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc
index 82e25509..bd6a73f6 100644
--- a/data/scripts/script_08011C7C.inc
+++ b/data/scripts/script_08011C7C.inc
@@ -57,7 +57,7 @@ script_08011D0E:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_08011D00
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08064928
 	_0807EB44 0x0004
@@ -116,7 +116,7 @@ script_08011DBA:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_08011DAC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08064A28
 	_0807EB44 0x0004
@@ -175,7 +175,7 @@ script_08011E66:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_08011E58
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08064828
 	_0807EB44 0x0004
@@ -365,7 +365,7 @@ script_0801209E:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_0801203A
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08064928
 	_0807EB44 0x0004
@@ -411,7 +411,7 @@ script_0801212A:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_080120C6
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08064A28
 	_0807EB44 0x0004
@@ -457,7 +457,7 @@ script_080121B6:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_08012152
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08064828
 	_0807EB44 0x0004
@@ -572,4 +572,4 @@ script_080122EC:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc
index d6a27b80..08b3dd09 100644
--- a/data/scripts/script_0801232C.inc
+++ b/data/scripts/script_0801232C.inc
@@ -68,4 +68,4 @@ script_08012368:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc
index 7eb8b910..1d89d4c4 100644
--- a/data/scripts/script_08012410.inc
+++ b/data/scripts/script_08012410.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08012410
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index 7032e0df..4827856a 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -23,7 +23,7 @@ script_08012474:
 	_0807E878 
 	_0807E930 0x0000
 	Jump script_08012440
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_08054564
 	EndBlock 
diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc
index bb737cda..d88f3c06 100644
--- a/data/scripts/script_08012AB0.inc
+++ b/data/scripts/script_08012AB0.inc
@@ -6,4 +6,4 @@ script_08012AB2:
 	_0807EB44 0x0006
 	Wait 0x000a
 	Jump script_08012AB2
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc
index a4e1e4c6..cdd07661 100644
--- a/data/scripts/script_08012AC8.inc
+++ b/data/scripts/script_08012AC8.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_08012AC8
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc
index bfeb243d..4c7cd730 100644
--- a/data/scripts/script_08012C48.inc
+++ b/data/scripts/script_08012C48.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08012C48
 	_0807E5F8 0x00000100
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc
index 053ed2d2..73cb0ac9 100644
--- a/data/scripts/script_08012D18.inc
+++ b/data/scripts/script_08012D18.inc
@@ -21,4 +21,4 @@ SCRIPT_START script_08012D18
 script_08012D68:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc
index e290f964..1f0dfcfe 100644
--- a/data/scripts/script_08012D70.inc
+++ b/data/scripts/script_08012D70.inc
@@ -13,4 +13,4 @@ SCRIPT_START script_08012D70
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc
index 02f50996..d7874822 100644
--- a/data/scripts/script_08012DD8.inc
+++ b/data/scripts/script_08012DD8.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08012DD8
 	WaitForSomething2 0x00000001
 	_0807E908 0x0002
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc
index 4fc67096..760a0faf 100644
--- a/data/scripts/script_08012DF8.inc
+++ b/data/scripts/script_08012DF8.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_08012DF8
 	Wait 0x0008
 	_0807E5F8 0x00000001
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc
index 3f2b72df..b58b20ab 100644
--- a/data/scripts/script_08012E44.inc
+++ b/data/scripts/script_08012E44.inc
@@ -16,4 +16,4 @@ SCRIPT_START script_08012E44
 	_0807E5F8 0x00000002
 	_0807EDD4 0x0088, 0x0158
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc
index 74f77908..bf393c4d 100644
--- a/data/scripts/script_08012E88.inc
+++ b/data/scripts/script_08012E88.inc
@@ -16,7 +16,7 @@ script_08012E9E:
 	_0807E878 
 	DoPostScriptAction 0x0000
 	Jump script_08012E9E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000008
diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc
index 7c273007..713ffc5d 100644
--- a/data/scripts/script_080130E4.inc
+++ b/data/scripts/script_080130E4.inc
@@ -11,4 +11,4 @@ SCRIPT_START script_080130E4
 	Wait 0x000f
 	_0807E5F8 0x00000004
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index cc3e52d6..5d272cf2 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -75,4 +75,4 @@ script_080131AC:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc
index 298ffe37..0463b892 100644
--- a/data/scripts/script_0801330C.inc
+++ b/data/scripts/script_0801330C.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_0801330C
 	_0807E5F8 0x00000002
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc
index e8edd9b8..c69a56b2 100644
--- a/data/scripts/script_0801334C.inc
+++ b/data/scripts/script_0801334C.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_0801334C
 	_0807E5F8 0x00000002
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc
index 8c8dbfbf..e6a8ec58 100644
--- a/data/scripts/script_08013378.inc
+++ b/data/scripts/script_08013378.inc
@@ -13,4 +13,4 @@ SCRIPT_START script_08013378
 	_0807E5F8 0x00000002
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc
index 6ce49d56..52231159 100644
--- a/data/scripts/script_080133C4.inc
+++ b/data/scripts/script_080133C4.inc
@@ -11,4 +11,4 @@ SCRIPT_START script_080133C4
 	_0807E5F8 0x00000010
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc
index 285ce1a5..1e720d3b 100644
--- a/data/scripts/script_080133F8.inc
+++ b/data/scripts/script_080133F8.inc
@@ -31,4 +31,4 @@ SCRIPT_START script_080133F8
 	_0807E5F8 0x00000040
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index 11cd6075..e3ef357e 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -78,4 +78,4 @@ script_0801373C:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc
index 43d1d8a9..e1b11b09 100644
--- a/data/scripts/script_08013B18.inc
+++ b/data/scripts/script_08013B18.inc
@@ -21,4 +21,4 @@ script_08013B1E:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_08013B1E
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013B70.inc b/data/scripts/script_08013B70.inc
index 485fb1df..76310119 100644
--- a/data/scripts/script_08013B70.inc
+++ b/data/scripts/script_08013B70.inc
@@ -9,4 +9,4 @@ SCRIPT_START script_08013B70
 	WaitForSomething2 0x00040000
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc
index 67891a1b..a49ba76f 100644
--- a/data/scripts/script_08013BE8.inc
+++ b/data/scripts/script_08013BE8.inc
@@ -55,4 +55,4 @@ script_08013C98:
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc
index 90cfccf5..025d0eb7 100644
--- a/data/scripts/script_08013D04.inc
+++ b/data/scripts/script_08013D04.inc
@@ -13,4 +13,4 @@ script_08013D1C:
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc
index bb4117f3..0dfb9d8c 100644
--- a/data/scripts/script_08013D44.inc
+++ b/data/scripts/script_08013D44.inc
@@ -13,4 +13,4 @@ script_08013D5C:
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc
index 4b637104..b61269d4 100644
--- a/data/scripts/script_08013D84.inc
+++ b/data/scripts/script_08013D84.inc
@@ -13,4 +13,4 @@ script_08013D9C:
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc
index edb69499..fa1c2572 100644
--- a/data/scripts/script_08013DC4.inc
+++ b/data/scripts/script_08013DC4.inc
@@ -13,4 +13,4 @@ script_08013DDC:
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc
index 71123815..f956f230 100644
--- a/data/scripts/script_08013E04.inc
+++ b/data/scripts/script_08013E04.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08013E04
 	_0807E930 0x0001
 	_0807E5F8 0x08000000
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc
index 424bed26..8f80fedd 100644
--- a/data/scripts/script_08013E28.inc
+++ b/data/scripts/script_08013E28.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08013E28
 	_0807E930 0x0003
 	_0807E5F8 0x10000000
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc
index e41a8b42..0e0bfde8 100644
--- a/data/scripts/script_08013E4C.inc
+++ b/data/scripts/script_08013E4C.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08013E4C
 	_0807E930 0x0005
 	_0807E5F8 0x20000000
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc
index 8207c91f..ef89297d 100644
--- a/data/scripts/script_08013E70.inc
+++ b/data/scripts/script_08013E70.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08013E70
 	_0807E930 0x0007
 	_0807E5F8 0x40000000
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc
index 4775f6f3..a01fcca2 100644
--- a/data/scripts/script_08013E94.inc
+++ b/data/scripts/script_08013E94.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_08013E94
 	_0807E930 0x0001
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc
index 094b17ce..777ce0e7 100644
--- a/data/scripts/script_08013EB0.inc
+++ b/data/scripts/script_08013EB0.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_08013EB0
 	_0807E930 0x0003
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc
index b3ce8ba1..daeb7eb8 100644
--- a/data/scripts/script_08013ECC.inc
+++ b/data/scripts/script_08013ECC.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_08013ECC
 	_0807E930 0x0005
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc
index e0b367c4..081cdfbb 100644
--- a/data/scripts/script_08013EE8.inc
+++ b/data/scripts/script_08013EE8.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_08013EE8
 	_0807E930 0x0007
 	EndBlock 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc
index 750253da..8e99a3ff 100644
--- a/data/scripts/script_08013F04.inc
+++ b/data/scripts/script_08013F04.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_08013F04
 	WaitForSomething2 0x00000080
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc
index 568b3d9e..18a770a5 100644
--- a/data/scripts/script_08013F34.inc
+++ b/data/scripts/script_08013F34.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_08013F34
 	WaitForSomething2 0x00000080
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc
index df02227b..5dbd9cdb 100644
--- a/data/scripts/script_08013F64.inc
+++ b/data/scripts/script_08013F64.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_08013F64
 	WaitForSomething2 0x00000080
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc
index 9f773d46..b34394a6 100644
--- a/data/scripts/script_08013F94.inc
+++ b/data/scripts/script_08013F94.inc
@@ -24,4 +24,4 @@ script_08013FA4:
 script_08013FE0:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc
index 29ae298f..605788ba 100644
--- a/data/scripts/script_08013FE8.inc
+++ b/data/scripts/script_08013FE8.inc
@@ -29,4 +29,4 @@ script_08013FF0:
 script_0801404C:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc
index c19c455e..b00a8e67 100644
--- a/data/scripts/script_08014054.inc
+++ b/data/scripts/script_08014054.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08014054
 	WaitForSomething 0x00000040
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc
index e8fe16a3..33a943f1 100644
--- a/data/scripts/script_08014074.inc
+++ b/data/scripts/script_08014074.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08014074
 	WaitForSomething 0x00000040
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc
index 834b28ca..898e3180 100644
--- a/data/scripts/script_08014154.inc
+++ b/data/scripts/script_08014154.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_08014154
 	Call sub_0807F2D4
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc
index 8934d70d..a7e84754 100644
--- a/data/scripts/script_08014198.inc
+++ b/data/scripts/script_08014198.inc
@@ -14,4 +14,4 @@ SCRIPT_START script_08014198
 	Call sub_0807F2D4
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc
index fab8a67a..e80ffd66 100644
--- a/data/scripts/script_080141DC.inc
+++ b/data/scripts/script_080141DC.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_080141DC
 	Call sub_0807F2D4
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index 30fb9e3d..c49a5bc0 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_08014248
 script_08014264:
 	CallWithArg sub_08095EAC, 0x00000001
 	Jump script_08014264
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0008
 	EndBlock 
@@ -26,4 +26,4 @@ script_08014298:
 	_0807EA94 
 	_0807E878 
 	Jump script_08014298
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc
index 3d215c0e..7689da1c 100644
--- a/data/scripts/script_08014384.inc
+++ b/data/scripts/script_08014384.inc
@@ -19,4 +19,4 @@ script_080143AC:
 	_0807E908 0x0001
 	_0807E878 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index f1a44fb0..e0eaae33 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -56,4 +56,4 @@ script_080144FC:
 	JumpIfNot script_08014462
 	_0807E9DC 
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc
index 06a34665..6ac1a03a 100644
--- a/data/scripts/script_0801450C.inc
+++ b/data/scripts/script_0801450C.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_0801450C
 	ClearLocalFlag 0x0092
 	Call sub_0807DF50
 	Jump script_080144FC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	EndBlock 
 script_0801454C:
@@ -32,4 +32,4 @@ script_0801454C:
 	_0807E878 
 	Jump script_0801454C
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc
index 01413c54..4bd860cd 100644
--- a/data/scripts/script_080145E8.inc
+++ b/data/scripts/script_080145E8.inc
@@ -143,4 +143,4 @@ script_080147CE:
 	Wait 0x0004
 	_0807E878 
 	Jump script_0801463A
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc
index d69ee530..26b288d3 100644
--- a/data/scripts/script_08014804.inc
+++ b/data/scripts/script_08014804.inc
@@ -64,7 +64,7 @@ script_080148D8:
 	_0807E930 0x0002
 	_0807E5F8 0x00000008
 	Jump script_0801488E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	EndBlock 
 script_080148F4:
@@ -94,4 +94,4 @@ script_08014938:
 	Wait 0x001e
 	Call sub_0807DF50
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc
index 44cd6af7..268787d0 100644
--- a/data/scripts/script_080149CC.inc
+++ b/data/scripts/script_080149CC.inc
@@ -26,7 +26,7 @@ script_080149DE:
 script_08014A20:
 	_0807E878 
 	Jump script_080149DE
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_0806C870
 	DoPostScriptAction 0x000a
@@ -41,7 +41,7 @@ script_08014A36:
 	Wait 0x000f
 	_0807E878 
 	Jump script_08014A36
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_0806C870
 	DoPostScriptAction 0x000a
@@ -56,4 +56,4 @@ script_08014A62:
 	Wait 0x000f
 	_0807E878 
 	Jump script_08014A62
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc
index 673f7fcc..ff503803 100644
--- a/data/scripts/script_08014A80.inc
+++ b/data/scripts/script_08014A80.inc
@@ -19,7 +19,7 @@ script_08014AAC:
 	_0807EA94 
 	_0807E878 
 	Jump script_08014AAC
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	Call sub_0806C870
 	DoPostScriptAction 0x000a
@@ -44,4 +44,4 @@ script_08014B02:
 	Wait 0x000f
 	_0807E878 
 	Jump script_08014AD2
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc
index cd5191b5..03c382c6 100644
--- a/data/scripts/script_08014B34.inc
+++ b/data/scripts/script_08014B34.inc
@@ -127,4 +127,4 @@ script_08014CAE:
 script_08014CD4:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc
index d71a64c0..f8df2393 100644
--- a/data/scripts/script_08014DCC.inc
+++ b/data/scripts/script_08014DCC.inc
@@ -17,4 +17,4 @@ SCRIPT_START script_08014DCC
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index 3f660b57..f6497d3c 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -15,7 +15,7 @@ script_08014E2C:
 	_0807EA94 
 	_0807E878 
 	Jump script_08014E2C
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
@@ -50,7 +50,7 @@ script_08014EBC:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_08014E64
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
@@ -66,7 +66,7 @@ script_08014EE0:
 	_0807EA94 
 	_0807E878 
 	Jump script_08014EE0
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
@@ -85,7 +85,7 @@ script_08014F0C:
 	_0807EB44 0x0004
 	_0807E930 0x000a
 	Jump script_08014F0C
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/script_08015304.inc b/data/scripts/script_08015304.inc
index 6d8e17e3..85133e67 100644
--- a/data/scripts/script_08015304.inc
+++ b/data/scripts/script_08015304.inc
@@ -11,4 +11,4 @@ SCRIPT_START script_08015304
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080155F4.inc b/data/scripts/script_080155F4.inc
index 0538498b..8d2bae15 100644
--- a/data/scripts/script_080155F4.inc
+++ b/data/scripts/script_080155F4.inc
@@ -8,4 +8,4 @@ script_08015608:
 	JumpIfNot script_08015608
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc
index ae9fb4d9..47e1488a 100644
--- a/data/scripts/script_08015618.inc
+++ b/data/scripts/script_08015618.inc
@@ -19,4 +19,4 @@ SCRIPT_START script_08015618
 	Call sub_0807F2D4
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index 9932c7a1..5bf2e8fa 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -70,4 +70,4 @@ script_08015A54:
 	_0807E5F8 0x00000002
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc
index 82ec4092..a5c8b58e 100644
--- a/data/scripts/script_08015A7C.inc
+++ b/data/scripts/script_08015A7C.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08015A7C
 	_0807E5F8 0x00000004
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc
index d1e1aa77..d009852f 100644
--- a/data/scripts/script_08015AA0.inc
+++ b/data/scripts/script_08015AA0.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08015AA0
 	_0807E5F8 0x00000004
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc
index 05f17a9e..f2de00b5 100644
--- a/data/scripts/script_08015AC4.inc
+++ b/data/scripts/script_08015AC4.inc
@@ -18,4 +18,4 @@ SCRIPT_START script_08015AC4
 	Call sub_08046078
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc
index b2c61214..859115b3 100644
--- a/data/scripts/script_08015B14.inc
+++ b/data/scripts/script_08015B14.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08015B14
 	_0807E5F8 0x00000020
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc
index a316c70a..b20e3589 100644
--- a/data/scripts/script_08015B84.inc
+++ b/data/scripts/script_08015B84.inc
@@ -7,4 +7,4 @@ SCRIPT_START script_08015B84
 	_0807E5F8 0x00000004
 	Call sub_080791BC
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc
index 9bed7be6..82ec46eb 100644
--- a/data/scripts/script_08015BE8.inc
+++ b/data/scripts/script_08015BE8.inc
@@ -37,4 +37,4 @@ script_08015BF0:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc
index 1845bd29..171e7ea6 100644
--- a/data/scripts/script_08015F3C.inc
+++ b/data/scripts/script_08015F3C.inc
@@ -15,4 +15,4 @@ SCRIPT_START script_08015F3C
 	WaitForSomething 0x00000400
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc
index 4b208e24..754f1236 100644
--- a/data/scripts/script_08015F80.inc
+++ b/data/scripts/script_08015F80.inc
@@ -8,4 +8,4 @@ SCRIPT_START script_08015F80
 	WaitForSomething 0x00000400
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc
index 2c4817d2..b33a121f 100644
--- a/data/scripts/script_08015FA4.inc
+++ b/data/scripts/script_08015FA4.inc
@@ -6,4 +6,4 @@ SCRIPT_START script_08015FA4
 	WaitForSomething 0x00000400
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc
index 86740a2a..7bcdb876 100644
--- a/data/scripts/script_08016004.inc
+++ b/data/scripts/script_08016004.inc
@@ -10,4 +10,4 @@ SCRIPT_START script_08016004
 script_08016028:
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc
index 7f7886a1..d3b89b6b 100644
--- a/data/scripts/script_08016062.inc
+++ b/data/scripts/script_08016062.inc
@@ -1,4 +1,4 @@
 SCRIPT_START script_08016062
 	SetEntityPosition 0xfff0, 0x0000
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc
index 69e5c09b..22853136 100644
--- a/data/scripts/script_0801609E.inc
+++ b/data/scripts/script_0801609E.inc
@@ -1,4 +1,4 @@
 SCRIPT_START script_0801609E
 	SetEntityPosition 0x0010, 0x0000
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index 9bf8bbdc..bcd54937 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -204,4 +204,4 @@ script_08016346:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Jump script_080161FE
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index 63c6e52b..5999bc0c 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -77,4 +77,4 @@ SCRIPT_START script_08016482
 	_0807F0B4 0x0007
 	_0807F0C8 0x003c, 0x0003
 SCRIPT_END
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc
index 4cd700ef..c8af0ba1 100644
--- a/data/scripts/script_080165A4.inc
+++ b/data/scripts/script_080165A4.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_080165A4
 script_080165B2:
 	_0807E974 0x0601
 	Jump script_080165B2
-	.short 0x0000
+	.2byte 0x0000
 script_080165BC:
 	Wait 0x001e
 	CheckPlayerInRegion2 0x2020
@@ -15,4 +15,4 @@ script_080165BC:
 	DoPostScriptAction 0x0003
 	Call script_0801637C+1
 	Jump script_080165BC
-	.short 0x0000
+	.2byte 0x0000
diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc
index 92c33414..cc22a1f0 100644
--- a/data/scripts/script_080165D8.inc
+++ b/data/scripts/script_080165D8.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_080165D8
 	DoPostScriptAction 0x0003
 	Call script_0801637C+1
 	JumpAbsolute script_080165D8
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	EndBlock 
@@ -25,7 +25,7 @@ script_08016612:
 	Wait 0x000f
 	_0807E878 
 	Jump script_08016612
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	EndBlock 
@@ -37,7 +37,7 @@ script_0801662E:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0801662E
-	.short 0x0000
+	.2byte 0x0000
 	SetEntityNonPlanarMovement 0x0100
 script_08016648:
 	_0807ECF4 0x0030
@@ -234,7 +234,7 @@ script_0801693E:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0801693E
-	.short 0x0000
+	.2byte 0x0000
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
@@ -250,4 +250,4 @@ script_0801696A:
 	Wait 0x000f
 	_0807E878 
 	Jump script_0801696A
-	.short 0x0000
+	.2byte 0x0000
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 0793db76..d71d5040 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -85,7 +85,7 @@ commands = [
     {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E908', 'params': 's'},
-    {'fun': 'ScriptCommandSetIntVariable', 'params': 'w'},
+    {'fun': 'ScriptCommand_SetIntVariable', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E924', 'params': ''},
     {'fun': 'ScriptCommand_0807E930', 'params': 's'},
     {'fun': 'ScriptCommand_0807E944', 'params': ''},
@@ -100,7 +100,7 @@ commands = [
     {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['ss', 's']},
-    {'fun': 'ScriptCommandTextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']},
+    {'fun': 'ScriptCommand_TextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']},
     {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
     {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
     {'fun': 'ScriptCommand_0807EB38', 'params': ''},
@@ -216,106 +216,106 @@ parameters = {
     's': {
         'length': 1,
         'param': 's',
-        'expr': '	.short \s',
+        'expr': '	.2byte \s',
         'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 4])[0]
     },
     'ss': {
         'length': 2,
         'param': 'a,b',
-        'expr': '	.short \\a\n	.short \\b',
+        'expr': '	.2byte \\a\n	.2byte \\b',
         'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
     },
     'sss': {
         'length': 3,
         'param': 'a,b,c',
-        'expr': '	.short \\a\n	.short \\b\n	.short \\c',
+        'expr': '	.2byte \\a\n	.2byte \\b\n	.2byte \\c',
         'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 8]))
     },
     'ssss': {
         'length': 4,
         'param': 'a,b,c,d',
-        'expr': '	.short \\a\n	.short \\b\n	.short \\c\n	.short \\d',
+        'expr': '	.2byte \\a\n	.2byte \\b\n	.2byte \\c\n	.2byte \\d',
         'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10]))
     },
 
     'w': {
         'length': 2,
         'param': 'w',
-        'expr': '	.word \w',
+        'expr': '	.4byte \w',
         'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6])[0]
     },
     'ww': {
         'length': 4,
         'param': 'a,b',
-        'expr': '	.word \\a\n	.word \\b',
+        'expr': '	.4byte \\a\n	.4byte \\b',
         'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10]))
     },
 
     'j': {  # Relative jump target
         'length': 1,
         'param': 's',
-        'expr': '1:	.short \s - 1b',
+        'expr': '1:	.2byte \s - 1b',
         'read': lambda ctx: use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + 2:ctx.ptr + 4]))
     },
     'jj': {
         'length': 2,
         'param': 'a,b',
-        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2',
+        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2',
         'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x * 2) for x in range(0, 2)])
     },
     'jjj': {
         'length': 3,
         'param': 'a,b,c',
-        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4',
+        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4',
         'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 3)])
     },
     'jjjj': {
         'length': 4,
         'param': 'a,b,c,d',
-        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6',
+        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4\n	.2byte \\d - 1b - 6',
         'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 4)])
     },
     'jjjjjjj': {
         'length': 7,
         'param': 'a,b,c,d,e,f,g',
-        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6\n	.short \\e - 1b - 8\n	.short \\f - 1b - 10\n	.short \\g - 1b - 12',
+        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4\n	.2byte \\d - 1b - 6\n	.2byte \\e - 1b - 8\n	.2byte \\f - 1b - 10\n	.2byte \\g - 1b - 12',
         'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 7)])
     },
     'jjjjjjjjj': {
         'length': 9,
         'param': 'a,b,c,d,e,f,g,h,i',
-        'expr': '1:	.short \\a - 1b\n	.short \\b - 1b - 2\n	.short \\c - 1b - 4\n	.short \\d - 1b - 6\n	.short \\e - 1b - 8\n	.short \\f - 1b - 10\n	.short \\g - 1b - 12\n	.short \\h - 1b - 14\n	.short \\i - 1b - 16',
+        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4\n	.2byte \\d - 1b - 6\n	.2byte \\e - 1b - 8\n	.2byte \\f - 1b - 10\n	.2byte \\g - 1b - 12\n	.2byte \\h - 1b - 14\n	.2byte \\i - 1b - 16',
         'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 9)])
     },
     'p': {
         'length': 2,
         'param': 'w',
-        'expr': '	.word \w',
+        'expr': '	.4byte \w',
         'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
 
     'px': {
         'length': 4,
         'param': 'a,b',
-        'expr': '	.word \\a\n	.word \\b',
+        'expr': '	.4byte \\a\n	.4byte \\b',
         'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10])
     },
     'd': {  # Data pointer
         'length': 2,
         'param': 'w',
-        'expr': '	.word \w',
+        'expr': '	.4byte \w',
         'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
     'x': {  # Script pointer
         'length': 2,
         'param': 'w',
-        'expr': '	.word \w',
+        'expr': '	.4byte \w',
         'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
     },
     'xx': {
         'length': 4,
         'param': 'a, b',
-        'expr': '	.word \\a\n	.word \\b',
+        'expr': '	.4byte \\a\n	.4byte \\b',
         'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10])
     },
     # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations
@@ -328,7 +328,7 @@ parameters = {
     # 'pv': {
     #     'length': -2,
     #     'param': 'w',
-    #     'expr': '	.word \w',
+    #     'expr': '	.4byte \w',
     #     'read': lambda ctx: ''
     # },
 }
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
index 3095533c..3b7094d8 100644
--- a/tools/script_disassembler/script_disassembler.py
+++ b/tools/script_disassembler/script_disassembler.py
@@ -37,7 +37,7 @@ def disassemble_command(ctx: Context, add_all_annotations=False):
     cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]
     if cmd == 0:
         # this does not need to be the end of the script
-        print('\t.short 0x0000')
+        print('\t.2byte 0x0000')
         ctx.ptr += 2
         return 1
 
@@ -47,7 +47,7 @@ def disassemble_command(ctx: Context, add_all_annotations=False):
         cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]
         if cmd == 0x0000:
             # This is actually the end of the script
-            print('\t.short 0x0000')
+            print('\t.2byte 0x0000')
             ctx.ptr += 2
             return 2
         return 3  # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please
@@ -93,18 +93,18 @@ def disassemble_command(ctx: Context, add_all_annotations=False):
     command_name = f'{command["fun"]}{suffix}'
 
     if params['length'] == -1:  # variable parameter length
-        print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
+        print(f'\t.2byte {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
         if commandSize > 1:
-            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + commandSize * 2])]))
+            print('\n'.join(['\t.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + commandSize * 2])]))
             print(f'@ End of parameters')
         ctx.ptr += commandSize * 2
         return 1
     elif params['length'] == -2:  # point and var
-        print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
+        print(f'\t.2byte {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
 
-        print('\t.word ' + get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
+        print('\t.4byte ' + get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
         if commandSize > 3:
-            print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 6:ctx.ptr + commandSize * 2])]))
+            print('\n'.join(['\t.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 6:ctx.ptr + commandSize * 2])]))
             print(f'@ End of parameters')
         ctx.ptr += commandSize * 2
         return 1
@@ -142,7 +142,7 @@ def disassemble_script(input_bytes, script_addr, add_all_annotations=False):
         if (len(ctx.data) - ctx.ptr) % 2 != 0:
             print_rest_bytes(ctx)
             raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}')
-        print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
+        print('\n'.join(['.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
         raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}')
 
     if not foundEnd:
@@ -163,7 +163,7 @@ def generate_macros():
     print('.endm')
 
     print('.macro SCRIPT_END')
-    print('	.short 0xffff')
+    print('	.2byte 0xffff')
     print('.endm')
 
     print('')
@@ -173,7 +173,7 @@ def generate_macros():
 
         def emit_macro(command_name, id, params):
             print(f'.macro {command_name} {params["param"]}')
-            print(f'	.short {u16_to_hex(id)}')
+            print(f'	.2byte {u16_to_hex(id)}')
             if params['expr'] != '':
                 print(params['expr'])
             print('.endm')

From 1488892c3ae89b8ea12546891f9df73c5f72423e Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Mon, 8 Mar 2021 22:08:51 +0100
Subject: [PATCH 34/46] Replace the remaining pointers in scripts

---
 asm/code_080043E8.s              | 10 ++++++++--
 data/scripts/script_0800B828.inc |  2 +-
 data/scripts/script_0800F724.inc |  2 +-
 data/scripts/script_08010264.inc |  2 +-
 data/scripts/script_08010E5A.inc |  2 +-
 data/scripts/script_08010F84.inc |  2 +-
 data/scripts/script_080138B4.inc |  2 +-
 src/npc/ezloCap.c                |  3 ++-
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s
index da9ba967..4fb457b0 100644
--- a/asm/code_080043E8.s
+++ b/asm/code_080043E8.s
@@ -378,10 +378,16 @@ gUnk_0800476A:: @ 0800476A
 	.incbin "baserom.gba", 0x00476A, 0x000008C
 
 gUnk_080047F6:: @ 080047F6
-	.incbin "baserom.gba", 0x0047F6, 0x0000200
+	.incbin "baserom.gba", 0x0047F6, 0x00001E0
+
+gUnk_080049D6:: @ 080049D6
+	.incbin "baserom.gba", 0x0049D6, 0x0000020
 
 gUnk_080049F6:: @ 080049F6
-	.incbin "baserom.gba", 0x0049F6, 0x000000A
+	.incbin "baserom.gba", 0x0049F6, 0x0000008
+
+gUnk_080049FE:: @ gUnk_080049FE
+	.incbin "baserom.gba", 0x0049FE, 0x0000002
 
 gUnk_08004A00:: @ 08004A00
 	.incbin "baserom.gba", 0x004A00, 0x000000C
diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc
index d3083099..4bf415cf 100644
--- a/data/scripts/script_0800B828.inc
+++ b/data/scripts/script_0800B828.inc
@@ -54,7 +54,7 @@ script_0800B89E:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
-	CallWithArg sub_08064644, 0x0806464d
+	CallWithArg sub_08064644, sub_0806464C
 	EndBlock 
 script_0800B8D4:
 	Wait 0x003c
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 3bddc5e9..6a89a421 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -154,7 +154,7 @@ script_0800F72C:
 	CallWithArg sub_0807F244, 0x0000000d
 	SetIntVariable 0x000000ff
 	Call sub_0807F5B0
-	CallWithArg sub_0807F29C, 0x080049d6
+	CallWithArg sub_0807F29C, gUnk_080049D6
 	Wait 0x00b7
 	SetIntVariable 0x00000000
 	Call sub_0807F5B0
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index d45d6fda..eac67e79 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -140,7 +140,7 @@ script_08010410:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
-	SetIntVariable 0x08064689
+	SetIntVariable sub_08064688
 	Call sub_08064644
 	EndBlock 
 script_08010446:
diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc
index 8785e391..7c9cb0f8 100644
--- a/data/scripts/script_08010E5A.inc
+++ b/data/scripts/script_08010E5A.inc
@@ -29,7 +29,7 @@ SCRIPT_START script_08010E5A
 	Call sub_0806DC3C
 	Call sub_080791BC
 	CallWithArg sub_0807F244, 0x0000000d
-	CallWithArg sub_0807F29C, 0x080049f6
+	CallWithArg sub_0807F29C, gUnk_080049F6
 	_0807F0B4 0x0001
 	SetEntityPositionRelative 0x01f8, 0x0068
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index 730c4f02..ef33d17d 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_08010F84
 	Call sub_0806DC3C
 	Call sub_080791BC
 	CallWithArg sub_0807F244, 0x0000000d
-	CallWithArg sub_0807F29C, 0x080049f6
+	CallWithArg sub_0807F29C, gUnk_080049F6
 	Wait 0x001e
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index 66b8d0d0..0d496673 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -82,7 +82,7 @@ script_080138D0:
 	CameraTargetEntity 
 	Call sub_0806DC3C
 	CallWithArg sub_0807F244, 0x00010001
-	CallWithArg sub_0807F29C, 0x080049fe
+	CallWithArg sub_0807F29C, gUnk_080049FE
 	Wait 0x00c8
 	CallWithArg sub_0807F29C, 0x00000000
 	Call sub_0806DC58
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index acf37ec5..d16c99f1 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -113,7 +113,8 @@ void sub_0806DA04(Entity* this, ScriptExecutionContext* context) {
 }
 
 void sub_0806DA1C(Entity* this, ScriptExecutionContext* context) {
-    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable], (u32)(gUnk_081141E4[context->intVariable]));
+    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable],
+                 (u32)(gUnk_081141E4[context->intVariable]));
 }
 
 // Returns the kinstone id?

From a2381ce957e4c4d54fe39540a2c635f12bb8851b Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Tue, 9 Mar 2021 09:21:17 +0100
Subject: [PATCH 35/46] Remove script_disassembler script

---
 .gitignore                                    |   1 +
 tools/script_disassembler/.gitignore          |   1 -
 tools/script_disassembler/definitions.py      | 334 ------------------
 .../script_disassembler.py                    | 219 ------------
 .../script_disassembler/split_script_data.py  | 117 ------
 tools/script_disassembler/utils.py            |  21 --
 6 files changed, 1 insertion(+), 692 deletions(-)
 delete mode 100644 tools/script_disassembler/.gitignore
 delete mode 100644 tools/script_disassembler/definitions.py
 delete mode 100644 tools/script_disassembler/script_disassembler.py
 delete mode 100644 tools/script_disassembler/split_script_data.py
 delete mode 100644 tools/script_disassembler/utils.py

diff --git a/.gitignore b/.gitignore
index a4960ad2..f7c4e9e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ types_*.taghl
 !calcrom.pl
 !sound/programmable_wave_samples/*.pcm
 _Deparsed_XSubs.pm
+*.py
 *.sna
 __pycache__
 .vscode/settings.json
diff --git a/tools/script_disassembler/.gitignore b/tools/script_disassembler/.gitignore
deleted file mode 100644
index 9289883f..00000000
--- a/tools/script_disassembler/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-labels.txt
\ No newline at end of file
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
deleted file mode 100644
index d71d5040..00000000
--- a/tools/script_disassembler/definitions.py
+++ /dev/null
@@ -1,334 +0,0 @@
-from utils import barray_to_u16_hex, barray_to_u32_hex, barray_to_s16
-import struct
-
-ROM_OFFSET = 0x08000000
-SCRIPTS_START = 0x08008B5C
-SCRIPTS_END = 0x08016984
-
-# A list of all the commands, their correspondingScriptCommand_  functions and what kind of parameters they take
-commands = [
-    {'fun': 'ScriptCommandNop', 'params': ''},
-    {'fun': 'ScriptCommand_BeginBlock', 'params': ''},
-    {'fun': 'ScriptCommand_EndBlock', 'params': ''},
-    {'fun': 'ScriptCommand_Jump', 'params': 'j'},
-    {'fun': 'ScriptCommand_JumpIf', 'params': 'j'},
-    {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j'},
-    {'fun': 'ScriptCommand_JumpTable', 'params': ['jj', 'jjj', 'jjjj', 'jjjjjjj', 'jjjjjjjjj']},
-    {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x'},
-    {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x'},
-    {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x'},
-    {'fun': 'ScriptCommand_JumpAbsoluteTable', 'params': 'xx'},
-    {'fun': 'ScriptCommand_Call', 'params': 'p'},
-    {'fun': 'ScriptCommand_CallWithArg', 'params': ['px', 'p']},
-    {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'},
-    {'fun': 'ScriptCommand_TestBit', 'params': 'w'},
-    {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'},
-    {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''},
-    {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'},
-    {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckRoomFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckPlayerInRegion', 'params': 'sss'},
-    {'fun': 'ScriptCommand_CheckPlayerInRegion2', 'params': 's'},
-    {'fun': 'ScriptCommand_CheckEntityInteractType', 'params': ''},
-    {'fun': 'ScriptCommand_0807E30C', 'params': ''},
-    {'fun': 'ScriptCommand_HasRupees', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E3BC', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E3E8', 'params': ''},
-    {'fun': 'ScriptCommand_CheckKinstoneFused', 'params': 's'},
-    {'fun': 'ScriptCommand_BuyItem', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807E48C', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E514', 'params': 'w'},
-    {'fun': 'ScriptCommand_CheckPlayerFlags', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E564', 'params': ''},
-    {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''},
-    {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'},
-    {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E610', 'params': 'w'},
-    {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'},
-    {'fun': 'ScriptCommand_ClearLocalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_SetGlobalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_ClearGlobalFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_SetRoomFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_ClearRoomFlag', 'params': 's'},
-    {'fun': 'ScriptCommand_Wait', 'params': 's'},
-    {'fun': 'ScriptCommand_WaitForSomething', 'params': 'w'},
-    {'fun': 'ScriptCommand_WaitForSomething2', 'params': 'w'},
-    {'fun': 'ScriptCommand_WaitPlayerAction8', 'params': ''},
-    {'fun': 'ScriptCommand_WaitForPlayerAction0x17', 'params': ''},
-    {'fun': 'ScriptCommand_WaitFor_1', 'params': ''},
-    {'fun': 'ScriptCommand_WaitFor_2', 'params': ''},
-    {'fun': 'ScriptCommand_0807E778', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E788', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E79C', 'params': ''},
-    {'fun': 'ScriptCommandNop2', 'params': 's'},
-    {'fun': 'ScriptCommand_DoFade4', 'params': ''},
-    {'fun': 'ScriptCommand_DoFade5', 'params': ''},
-    {'fun': 'ScriptCommand_DoFade6', 'params': ''},
-    {'fun': 'ScriptCommand_DoFade7', 'params': ''},
-    {'fun': 'ScriptCommand_0807E800', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E80C', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E858', 'params': ['s', '']},
-    {'fun': 'ScriptCommand_0807E864', 'params': ''},
-    {'fun': 'ScriptCommand_0807E878', 'params': ''},
-    {'fun': 'ScriptCommand_0807E888', 'params': ''},
-    {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'},
-    {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'},
-    {'fun': 'ScriptCommand_0807E8D4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''},  # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''},  # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''},  # duplicate
-    {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''},  # duplicate
-    {'fun': 'ScriptCommand_0807E908', 'params': 's'},
-    {'fun': 'ScriptCommand_SetIntVariable', 'params': 'w'},
-    {'fun': 'ScriptCommand_0807E924', 'params': ''},
-    {'fun': 'ScriptCommand_0807E930', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E944', 'params': ''},
-    {'fun': 'ScriptCommand_0807E974', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E9D4', 'params': ''},
-    {'fun': 'ScriptCommand_0807E9DC', 'params': ''},
-    {'fun': 'ScriptCommand_0807E9E4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E9F0', 'params': ''},
-    {'fun': 'ScriptCommand_0807EA4C', 'params': ''},
-    {'fun': 'ScriptCommand_0807EA88', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EA94', 'params': ''},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['ss', 's']},
-    {'fun': 'ScriptCommand_TextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']},
-    {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
-    {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EB38', 'params': ''},
-    {'fun': 'ScriptCommand_0807EB44', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EB4C', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EB74', 'params': ''},
-    {'fun': 'ScriptCommand_0807EB8C', 'params': ''},
-    {'fun': 'ScriptCommand_SetEntityDirection', 'params': 's'},
-    {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'},
-    {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'},
-    {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'},
-    {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'ss'},
-    {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'},
-    {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''},
-    {'fun': 'ScriptCommandNop3', 'params': ''},
-    {'fun': 'ScriptCommand_0807EC1C', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EC64', 'params': 's'},
-    {'fun': 'ScriptCommand_0807EC94', 'params': 's'},
-    {'fun': 'ScriptCommand_0807ECC4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807ECF4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807ED24', 'params': 'sss'},
-    {'fun': 'ScriptCommand_0807EDD4', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EE04', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EE30', 'params': ''},
-    {'fun': 'ScriptCommand_0807EEB4', 'params': ''},
-    {'fun': 'ScriptCommand_0807EEF4', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807EF3C', 'params': 'ss'},
-    {'fun': 'ScriptCommandDoPostScriptAction', 'params': 's'},
-    {'fun': 'ScriptCommandDoPostScriptAction2', 'params': 's'},
-    {'fun': 'ScriptCommand_SoundReq', 'params': 's'},
-    {'fun': 'ScriptCommand_SoundReq2', 'params': 's'},
-    {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'},
-    {'fun': 'ScriptCommand_SoundReq0x80100000', 'params': ''},
-    {'fun': 'ScriptCommand_ModRupees', 'params': 's'},
-    {'fun': 'ScriptCommand_ModHealth', 'params': 's'},
-    {'fun': 'ScriptCommand_IncreaseMaxHealth', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F034', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F050', 'params': 's'},
-    {'fun': 'ScriptCommand_GetInventoryValue', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F078', 'params': 'ss'},
-    {'fun': 'ScriptCommand_0807F088', 'params': 's'},
-    {'fun': 'ScriptCommand_CameraTargetEntity', 'params': ''},
-    {'fun': 'ScriptCommand_CameraTargetPlayer', 'params': ''},
-    {'fun': 'ScriptCommand_0807F0B4', 'params': 's'},
-    {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'}
-]
-
-# Functions that have already been renamed
-POINTER_MAP = {
-    'sub_08095458': 'nullsub_527',
-    'sub_0805EBCC': 'DeleteAllEnemies',
-    'sub_0806C23C': 'Simon_CreateChest',
-    'sub_0801637C': 'script_0801637C+1',
-    'sub_08016383': 'script_08016384',
-    'sub_0806C598': 'sub_0806C598',
-    'sub_080A2138': 'Windcrest_Unlock',
-    'sub_080A29BC': 'CreateDust'
-}
-
-
-def get_pointer(barray):
-    # tries to directly reference the function this is pointing to
-    integers = struct.unpack('I', barray)
-    pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper()
-    if pointer in POINTER_MAP:
-        return POINTER_MAP[pointer]
-    return pointer
-
-
-# Data pointers that actually point to a script location
-DATA_MAP = {
-    'gUnk_08016384': 'script_08016384'
-}
-
-def get_data_pointer(barray):
-    integers = struct.unpack('I', barray)
-    pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper()
-    if pointer in DATA_MAP:
-        return DATA_MAP[pointer]
-    return pointer
-
-
-def get_script_pointer(barray):
-    integers = struct.unpack('I', barray)
-    val = integers[0]
-    if val >= SCRIPTS_START and val <= SCRIPTS_END:
-        return use_script_label(val)
-#        return 'script_' + (struct.pack('>I', val).hex()).upper()
-    else:
-        return '0x'+struct.pack('>I', val).hex()
-
-
-def get_script_label(u32):
-    return hex(u32).upper().replace('0X', 'script_0')
-
-# Collects a set of all the labels that were jumped to
-used_labels = set()
-def use_script_label(u32):
-    global used_labels
-    used_labels.add(u32)
-    label = get_script_label(u32)
-    return label
-
-
-# definitions for parameter types
-parameters = {
-    '': {
-        'length': 0,
-        'param': '',
-        'expr': '',
-        'read': lambda ctx: ''
-    },
-    's': {
-        'length': 1,
-        'param': 's',
-        'expr': '	.2byte \s',
-        'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 4])[0]
-    },
-    'ss': {
-        'length': 2,
-        'param': 'a,b',
-        'expr': '	.2byte \\a\n	.2byte \\b',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
-    },
-    'sss': {
-        'length': 3,
-        'param': 'a,b,c',
-        'expr': '	.2byte \\a\n	.2byte \\b\n	.2byte \\c',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 8]))
-    },
-    'ssss': {
-        'length': 4,
-        'param': 'a,b,c,d',
-        'expr': '	.2byte \\a\n	.2byte \\b\n	.2byte \\c\n	.2byte \\d',
-        'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10]))
-    },
-
-    'w': {
-        'length': 2,
-        'param': 'w',
-        'expr': '	.4byte \w',
-        'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6])[0]
-    },
-    'ww': {
-        'length': 4,
-        'param': 'a,b',
-        'expr': '	.4byte \\a\n	.4byte \\b',
-        'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10]))
-    },
-
-    'j': {  # Relative jump target
-        'length': 1,
-        'param': 's',
-        'expr': '1:	.2byte \s - 1b',
-        'read': lambda ctx: use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + 2:ctx.ptr + 4]))
-    },
-    'jj': {
-        'length': 2,
-        'param': 'a,b',
-        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x * 2) for x in range(0, 2)])
-    },
-    'jjj': {
-        'length': 3,
-        'param': 'a,b,c',
-        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 3)])
-    },
-    'jjjj': {
-        'length': 4,
-        'param': 'a,b,c,d',
-        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4\n	.2byte \\d - 1b - 6',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 4)])
-    },
-    'jjjjjjj': {
-        'length': 7,
-        'param': 'a,b,c,d,e,f,g',
-        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4\n	.2byte \\d - 1b - 6\n	.2byte \\e - 1b - 8\n	.2byte \\f - 1b - 10\n	.2byte \\g - 1b - 12',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 7)])
-    },
-    'jjjjjjjjj': {
-        'length': 9,
-        'param': 'a,b,c,d,e,f,g,h,i',
-        'expr': '1:	.2byte \\a - 1b\n	.2byte \\b - 1b - 2\n	.2byte \\c - 1b - 4\n	.2byte \\d - 1b - 6\n	.2byte \\e - 1b - 8\n	.2byte \\f - 1b - 10\n	.2byte \\g - 1b - 12\n	.2byte \\h - 1b - 14\n	.2byte \\i - 1b - 16',
-        'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 9)])
-    },
-    'p': {
-        'length': 2,
-        'param': 'w',
-        'expr': '	.4byte \w',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
-    },
-
-    'px': {
-        'length': 4,
-        'param': 'a,b',
-        'expr': '	.4byte \\a\n	.4byte \\b',
-        'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10])
-    },
-    'd': {  # Data pointer
-        'length': 2,
-        'param': 'w',
-        'expr': '	.4byte \w',
-        'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
-    },
-    'x': {  # Script pointer
-        'length': 2,
-        'param': 'w',
-        'expr': '	.4byte \w',
-        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])
-    },
-    'xx': {
-        'length': 4,
-        'param': 'a, b',
-        'expr': '	.4byte \\a\n	.4byte \\b',
-        'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10])
-    },
-    # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations
-    # 'v': {
-    #     'length': -1,
-    #     'param': '',
-    #     'expr': '',
-    #     'read': lambda ctx: ''
-    # },
-    # 'pv': {
-    #     'length': -2,
-    #     'param': 'w',
-    #     'expr': '	.4byte \w',
-    #     'read': lambda ctx: ''
-    # },
-}
diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py
deleted file mode 100644
index 3b7094d8..00000000
--- a/tools/script_disassembler/script_disassembler.py
+++ /dev/null
@@ -1,219 +0,0 @@
-from dataclasses import dataclass
-import struct
-from utils import barray_to_u16_hex, u16_to_hex
-from definitions import get_pointer, commands, parameters, get_script_label, used_labels
-
-
-# Disassembler for tmc scripts
-# Input 'macros' to generate the macros for the script commands
-# Input the script bytes as hex to disassemble the script
-
-# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/scripts.inc
-
-@dataclass
-class Context:
-    ptr: int
-    data: bytes
-    script_addr: int
-
-
-# Remove the ScriptCommand_ prefix for the asm macros
-def build_script_command(name: str):
-    name = name.replace("ScriptCommand_", "")
-    if name[0].isdigit():  # asm macros cannot start with an _
-        return f'_{name}'
-    return name
-
-
-def print_rest_bytes(ctx):
-    print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]]))
-
-
-def disassemble_command(ctx: Context, add_all_annotations=False):
-    global used_labels
-    if (add_all_annotations or ctx.script_addr + ctx.ptr in used_labels) and ctx.ptr != 0:
-        # print offsets to debug when manually inserting labels
-        print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:')
-    cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]
-    if cmd == 0:
-        # this does not need to be the end of the script
-        print('\t.2byte 0x0000')
-        ctx.ptr += 2
-        return 1
-
-    if cmd == 0xffff:
-        ctx.ptr += 2
-        print('SCRIPT_END')
-        cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]
-        if cmd == 0x0000:
-            # This is actually the end of the script
-            print('\t.2byte 0x0000')
-            ctx.ptr += 2
-            return 2
-        return 3  # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please
-
-    commandSize = cmd >> 0xA
-    if commandSize == 0:
-        raise Exception(f'Zero commandSize not allowed')
-    commandId = cmd & 0x3FF
-    if commandId >= len(commands):
-        raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}')
-    command = commands[commandId]
-    param_length = commandSize - 1
-    if commandSize > 1:
-        if ctx.ptr + 2 * commandSize > len(ctx.data):
-            raise Exception(f'Not enough data to fetch {commandSize-1} params')
-
-    # Handle parameters
-    if not 'params' in command:
-        raise Exception(f'Parameters not defined for {command["fun"]}. Should be of length {str(param_length)}')
-
-    params = None
-    suffix = ''
-    # When there are multiple variants of parameters, choose the one with the correct count for this
-    if isinstance(command['params'], list):
-        for i, param in enumerate(command['params']):
-            if not param in parameters:
-                raise Exception(f'Parameter configuration {param} not defined')
-            candidate = parameters[param]
-            if candidate['length'] == commandSize - 1:
-                params = candidate
-                if i != 0:
-                    # We need to add a suffix to distinguish the correct parameter variant
-                    suffix = f'_{params["length"]}'
-                break
-        if params is None:
-            raise Exception(
-                f'No suitable parameter configuration with length {commandSize-1} found for {command["fun"]}')
-    else:
-        if not command['params'] in parameters:
-            raise Exception(f'Parameter configuration {command["params"]} not defined')
-        params = parameters[command['params']]
-
-    command_name = f'{command["fun"]}{suffix}'
-
-    if params['length'] == -1:  # variable parameter length
-        print(f'\t.2byte {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters')
-        if commandSize > 1:
-            print('\n'.join(['\t.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + commandSize * 2])]))
-            print(f'@ End of parameters')
-        ctx.ptr += commandSize * 2
-        return 1
-    elif params['length'] == -2:  # point and var
-        print(f'\t.2byte {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters')
-
-        print('\t.4byte ' + get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]))
-        if commandSize > 3:
-            print('\n'.join(['\t.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 6:ctx.ptr + commandSize * 2])]))
-            print(f'@ End of parameters')
-        ctx.ptr += commandSize * 2
-        return 1
-
-    if commandSize-1 != params['length']:
-        raise Exception(f'Call {command_name} with {commandSize-1} length, while length of {params["length"]} defined')
-
-    print(f'\t{build_script_command(command_name)} {params["read"](ctx)}')
-
-    # Execute script
-    ctx.ptr += commandSize * 2
-    return 1
-
-
-def disassemble_script(input_bytes, script_addr, add_all_annotations=False):
-    ctx = Context(0, input_bytes, script_addr)
-
-    foundEnd = False
-    while True:
-        # End of file (there need to be at least two bytes remaining for the next operation id)
-        if ctx.ptr >= len(ctx.data) - 1:
-            break
-        res = disassemble_command(ctx, add_all_annotations)
-        if res == 0:
-            break
-        elif res == 2:
-            foundEnd = True
-            break
-        elif res == 3:
-            # End in the middle of the script, please create a new file
-            return ctx.ptr
-
-    # Print rest (did not manage to get there)
-    if ctx.ptr < len(ctx.data):
-        if (len(ctx.data) - ctx.ptr) % 2 != 0:
-            print_rest_bytes(ctx)
-            raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}')
-        print('\n'.join(['.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
-        raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}')
-
-    if not foundEnd:
-        # Sadly, there are script files without and end?
-        return 0
-        #print('\033[93mNo end found\033[0m')
-    return 0
-
-
-def generate_macros():
-    print('@ All the macro functions for scripts')
-    print('@ Generated by disassemble_script.py')
-
-    print('.macro SCRIPT_START name')
-    print('	.globl \\name')
-    print('	.section .text')
-    print('\\name:')
-    print('.endm')
-
-    print('.macro SCRIPT_END')
-    print('	.2byte 0xffff')
-    print('.endm')
-
-    print('')
-    for num, command in enumerate(commands):
-        if not 'params' in command:
-            raise Exception(f'Parameters not defined for {command["fun"]}')
-
-        def emit_macro(command_name, id, params):
-            print(f'.macro {command_name} {params["param"]}')
-            print(f'	.2byte {u16_to_hex(id)}')
-            if params['expr'] != '':
-                print(params['expr'])
-            print('.endm')
-            print('')
-
-        if isinstance(command['params'], list):
-            # emit macros for all variants
-            for i, variant in enumerate(command['params']):
-                if not variant in parameters:
-                    raise Exception(f'Parameter configuration {variant} not defined')
-                params = parameters[variant]
-                id = ((params['length'] + 1) << 0xA) + num
-                suffix = ''
-                if i != 0:
-                    suffix = f'_{params["length"]}'
-                emit_macro(f'{build_script_command(command["fun"])}{suffix}', id, params)
-        else:
-            if not command['params'] in parameters:
-                raise Exception(f'Parameter configuration {command["params"]} not defined')
-            params = parameters[command['params']]
-            id = ((params['length'] + 1) << 0xA) + num
-
-            if params['length'] < 0:  # Don't emit anything for variable parameters
-                continue
-
-            emit_macro(build_script_command(command['fun']), id, params)
-
-    print('')
-
-
-def main():
-
-    # Read input
-    input_data = input()
-
-    if input_data.strip() == 'macros':
-        generate_macros()
-        return
-    disassemble_script(bytearray.fromhex(input_data))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/script_disassembler/split_script_data.py b/tools/script_disassembler/split_script_data.py
deleted file mode 100644
index 8d99df3b..00000000
--- a/tools/script_disassembler/split_script_data.py
+++ /dev/null
@@ -1,117 +0,0 @@
-from definitions import ROM_OFFSET, SCRIPTS_END, SCRIPTS_START
-from script_disassembler import disassemble_script, generate_macros
-import sys
-
-# Reads a section from the baserom, splits the residing scripts into seperate files and disassembles them
-# Should only be run before any manual changes to the script files are done!
-
-TMC_FOLDER = '../..'
-
-
-
-# Create labels for these additional script instructions
-# Currently done by splitting the script at that point
-LABEL_BREAKS = [0x0800A088, 0x0800ACE0, 0x0800AD54, 0x0800B41C, 0x0800B7C4, 0x0800C8C8, 0x0800D190, 0x800D3EC, 0x0800E9F4, 0x0800FD80,
-                0x08012AC8, 0x08012F0C, 0x080130E4, 0x08013B70, 0x080142B0, 0x080147DC, 0x08014A80, 0x08014B10, 0x0801635C,  0x08016384, 0x080165D8]
-
-# Whether to output a label for every line
-PRINT_ALL_LABELS = False
-
-
-def read_baserom():
-    # read baserom data
-    with open(f'{TMC_FOLDER}/baserom.gba', 'rb') as baserom:
-        return bytearray(baserom.read())
-
-
-def get_label(addr):
-    return hex(addr).upper().replace('0X', 'script_0')
-
-
-def disassemble_scripts(baserom_data):
-    script_start = SCRIPTS_START-ROM_OFFSET
-
-    scripts = '''	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.include "asm/macros/scripts.inc"
-
-	.syntax unified
-
-	.text
-    
-'''
-    label_break = 0
-
-    while script_start < SCRIPTS_END-ROM_OFFSET:
-        if label_break < len(LABEL_BREAKS) and script_start + ROM_OFFSET >= LABEL_BREAKS[label_break]:
-            label_break += 1
-
-        label = get_label(script_start + ROM_OFFSET)
-        print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...")
-        # find end of the script signified by 0xffff0000
-        script_end = baserom_data.index(b'\xff\xff\x00\x00', script_start) + 4
-
-        if script_end > SCRIPTS_END-ROM_OFFSET:
-            script_end = SCRIPTS_END-ROM_OFFSET
-
-        # break at a predefined label into a new file
-        if label_break < len(LABEL_BREAKS) and script_end + ROM_OFFSET > LABEL_BREAKS[label_break]:
-            script_end = LABEL_BREAKS[label_break]-ROM_OFFSET
-
-        # read data from rom
-        data = baserom_data[script_start:script_end]
-
-        scripts += f'	.include "data/scripts/{label}.inc"\n'
-        stdout = sys.stdout
-
-        with open(f'{TMC_FOLDER}/data/scripts/{label}.inc', 'w') as out:
-            sys.stdout = out
-
-            if script_start == 0x1637C:  # This function is actually assembly
-                print('''thumb_func_start script_0801637C
-script_0801637C:
-    push {lr}
-    bl CreateDust
-    pop {pc}''')
-                sys.stdout = stdout
-                script_start = script_end
-                continue
-
-            print(f'SCRIPT_START {label}')
-            res = disassemble_script(data, script_start + ROM_OFFSET, PRINT_ALL_LABELS)
-            if res != 0:
-                # Script ended in the middle, need to create a new file
-                script_end = script_start + res
-        sys.stdout = stdout
-
-        script_start = script_end
-    return scripts
-
-
-def main():
-    baserom_data = read_baserom()
-
-    # Do two passes, in the first pass not all labels that are jumped to are known, so those labels are recorded in the first pass
-    # This is not necessary when all labels are printed
-    if not PRINT_ALL_LABELS:
-        print('Collecting labels...')
-        disassemble_scripts(baserom_data)
-    print('Writing scripts with labels...')
-    scripts = disassemble_scripts(baserom_data)
-
-    print('Writing scripts.s file...')
-    with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out:
-        out.write(scripts)
-    print('Generating asm macros...')
-    stdout = sys.stdout
-    with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out:
-        sys.stdout = out
-        generate_macros()
-    sys.stdout = stdout
-
-    print('\033[1;92mDone\033[0m\n')
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/script_disassembler/utils.py b/tools/script_disassembler/utils.py
deleted file mode 100644
index b0501e5a..00000000
--- a/tools/script_disassembler/utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import struct
-
-def barray_to_s16(barray):
-    integers = struct.unpack('h', barray)
-    return integers[0]
-
-def u16_to_hex(value):
-    return '0x' + (struct.pack('>H', value).hex())
-
-def barray_to_u16_hex(barray):
-    count = len(barray)//2
-    integers = struct.unpack('H'*count, barray)
-    return [u16_to_hex(x) for x in integers]
-
-def u32_to_hex(value):
-    return '0x' + (struct.pack('>I', value).hex())
-
-def barray_to_u32_hex(barray):
-    count = len(barray)//4
-    integers = struct.unpack('I'*count, barray)
-    return [u32_to_hex(x) for x in integers]
\ No newline at end of file

From e251d79ffd4ee1c4b10def3ecb41f2d572c63664 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Sat, 13 Mar 2021 01:14:46 -0800
Subject: [PATCH 36/46] =?UTF-8?q?quick=20fix=20=F0=9F=99=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 asm/macros/scripts.inc           |  4 +-
 data/scripts/script_08008B5C.inc |  2 +-
 data/scripts/script_08008F74.inc |  2 +-
 data/scripts/script_08008FFC.inc |  2 +-
 data/scripts/script_0800903C.inc |  4 +-
 data/scripts/script_08009320.inc |  2 +-
 data/scripts/script_08009464.inc |  2 +-
 data/scripts/script_080094CC.inc |  2 +-
 data/scripts/script_08009704.inc |  4 +-
 data/scripts/script_080097F0.inc |  2 +-
 data/scripts/script_08009838.inc |  2 +-
 data/scripts/script_0800987C.inc |  2 +-
 data/scripts/script_08009950.inc |  2 +-
 data/scripts/script_080099DC.inc |  2 +-
 data/scripts/script_08009A34.inc |  2 +-
 data/scripts/script_08009A84.inc |  6 +--
 data/scripts/script_08009B78.inc |  2 +-
 data/scripts/script_08009C68.inc |  2 +-
 data/scripts/script_08009CFC.inc |  2 +-
 data/scripts/script_08009D6C.inc |  2 +-
 data/scripts/script_0800A088.inc |  2 +-
 data/scripts/script_0800A0B4.inc |  4 +-
 data/scripts/script_0800A160.inc |  2 +-
 data/scripts/script_0800A310.inc |  2 +-
 data/scripts/script_0800A3D8.inc |  2 +-
 data/scripts/script_0800A500.inc |  2 +-
 data/scripts/script_0800A590.inc |  2 +-
 data/scripts/script_0800ACBC.inc |  2 +-
 data/scripts/script_0800AD54.inc |  6 +--
 data/scripts/script_0800AEA4.inc |  2 +-
 data/scripts/script_0800AEDC.inc |  2 +-
 data/scripts/script_0800B1C0.inc |  2 +-
 data/scripts/script_0800B200.inc |  2 +-
 data/scripts/script_0800B308.inc |  2 +-
 data/scripts/script_0800B3A4.inc |  2 +-
 data/scripts/script_0800B41C.inc |  2 +-
 data/scripts/script_0800B4AC.inc |  2 +-
 data/scripts/script_0800B54C.inc |  2 +-
 data/scripts/script_0800B5C4.inc |  2 +-
 data/scripts/script_0800B7C4.inc |  2 +-
 data/scripts/script_0800B9B4.inc |  2 +-
 data/scripts/script_0800BB64.inc |  2 +-
 data/scripts/script_0800BC50.inc |  2 +-
 data/scripts/script_0800BCE8.inc |  2 +-
 data/scripts/script_0800BD78.inc |  6 +--
 data/scripts/script_0800BECC.inc |  4 +-
 data/scripts/script_0800BF38.inc |  2 +-
 data/scripts/script_0800C004.inc |  6 +--
 data/scripts/script_0800C160.inc |  4 +-
 data/scripts/script_0800C1D8.inc |  2 +-
 data/scripts/script_0800C2A4.inc |  6 +--
 data/scripts/script_0800C350.inc |  2 +-
 data/scripts/script_0800C3B0.inc |  2 +-
 data/scripts/script_0800C3CC.inc |  2 +-
 data/scripts/script_0800C410.inc |  2 +-
 data/scripts/script_0800C45C.inc |  2 +-
 data/scripts/script_0800C494.inc |  2 +-
 data/scripts/script_0800C4D0.inc |  2 +-
 data/scripts/script_0800C50C.inc |  2 +-
 data/scripts/script_0800C550.inc |  4 +-
 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 |  6 +--
 data/scripts/script_0800CB54.inc |  6 +--
 data/scripts/script_0800CBD4.inc |  6 +--
 data/scripts/script_0800CC6C.inc |  6 +--
 data/scripts/script_0800CD04.inc |  6 +--
 data/scripts/script_0800D190.inc |  2 +-
 data/scripts/script_0800D1B4.inc |  2 +-
 data/scripts/script_0800D278.inc |  2 +-
 data/scripts/script_0800D3EC.inc |  2 +-
 data/scripts/script_0800D414.inc |  4 +-
 data/scripts/script_0800D710.inc |  2 +-
 data/scripts/script_0800D76C.inc |  6 +--
 data/scripts/script_0800D92C.inc |  2 +-
 data/scripts/script_0800DA00.inc |  2 +-
 data/scripts/script_0800DA28.inc |  2 +-
 data/scripts/script_0800DCAC.inc |  4 +-
 data/scripts/script_0800DDD0.inc |  2 +-
 data/scripts/script_0800DE00.inc |  2 +-
 data/scripts/script_0800DE2C.inc |  2 +-
 data/scripts/script_0800DEB0.inc |  2 +-
 data/scripts/script_0800DED4.inc |  2 +-
 data/scripts/script_0800E094.inc |  2 +-
 data/scripts/script_0800E0BC.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 |  2 +-
 data/scripts/script_0800E9F4.inc |  2 +-
 data/scripts/script_0800EA54.inc |  2 +-
 data/scripts/script_0800EF9C.inc |  2 +-
 data/scripts/script_0800EFC0.inc |  2 +-
 data/scripts/script_0800F14C.inc |  2 +-
 data/scripts/script_0800F184.inc |  4 +-
 data/scripts/script_0800F33C.inc |  2 +-
 data/scripts/script_0800F354.inc |  2 +-
 data/scripts/script_0800F36C.inc |  2 +-
 data/scripts/script_0800F384.inc |  2 +-
 data/scripts/script_0800F39C.inc |  4 +-
 data/scripts/script_0800F430.inc |  4 +-
 data/scripts/script_0800F4C4.inc |  4 +-
 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_0800FB44.inc | 14 +++----
 data/scripts/script_0800FD80.inc |  2 +-
 data/scripts/script_0800FDA0.inc |  4 +-
 data/scripts/script_0800FF74.inc |  2 +-
 data/scripts/script_080109F0.inc |  2 +-
 data/scripts/script_08010A14.inc |  2 +-
 data/scripts/script_08010A38.inc |  2 +-
 data/scripts/script_08010A98.inc |  2 +-
 data/scripts/script_08010BB4.inc |  2 +-
 data/scripts/script_08011074.inc |  2 +-
 data/scripts/script_080110BC.inc |  4 +-
 data/scripts/script_080110E8.inc |  2 +-
 data/scripts/script_08011128.inc |  4 +-
 data/scripts/script_080111CC.inc |  4 +-
 data/scripts/script_080112C4.inc |  6 +--
 data/scripts/script_080113AA.inc |  4 +-
 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 |  6 +--
 data/scripts/script_080116A8.inc |  6 +--
 data/scripts/script_08011890.inc |  2 +-
 data/scripts/script_080118D4.inc |  2 +-
 data/scripts/script_08012410.inc |  2 +-
 data/scripts/script_080126FC.inc | 10 ++---
 data/scripts/script_08012AC8.inc |  2 +-
 data/scripts/script_08012AF0.inc |  2 +-
 data/scripts/script_08012B24.inc |  2 +-
 data/scripts/script_08012B50.inc |  2 +-
 data/scripts/script_08012B7C.inc |  2 +-
 data/scripts/script_08012C48.inc |  2 +-
 data/scripts/script_08012DB0.inc |  2 +-
 data/scripts/script_08012DF8.inc |  2 +-
 data/scripts/script_08012E44.inc |  2 +-
 data/scripts/script_080130E4.inc |  2 +-
 data/scripts/script_080132E4.inc |  2 +-
 data/scripts/script_0801330C.inc |  2 +-
 data/scripts/script_0801334C.inc |  2 +-
 data/scripts/script_08013494.inc |  2 +-
 data/scripts/script_080136B4.inc |  2 +-
 data/scripts/script_080136D8.inc |  2 +-
 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_08014450.inc |  2 +-
 data/scripts/script_0801450C.inc |  2 +-
 data/scripts/script_08014588.inc |  2 +-
 data/scripts/script_080147DC.inc |  2 +-
 data/scripts/script_080149CC.inc |  2 +-
 data/scripts/script_08014B10.inc |  2 +-
 data/scripts/script_08014CDC.inc |  2 +-
 data/scripts/script_08015234.inc |  2 +-
 data/scripts/script_080152B4.inc |  2 +-
 data/scripts/script_080152DC.inc |  2 +-
 data/scripts/script_08015338.inc |  2 +-
 data/scripts/script_08015360.inc |  2 +-
 data/scripts/script_08015390.inc |  2 +-
 data/scripts/script_0801550C.inc |  2 +-
 data/scripts/script_08015618.inc |  2 +-
 data/scripts/script_08015754.inc |  4 +-
 data/scripts/script_080158F8.inc |  2 +-
 data/scripts/script_08015918.inc |  2 +-
 data/scripts/script_08015938.inc |  2 +-
 data/scripts/script_08015958.inc |  6 +--
 data/scripts/script_08015A7C.inc |  2 +-
 data/scripts/script_08015AA0.inc |  2 +-
 data/scripts/script_08015B14.inc |  2 +-
 data/scripts/script_08015B84.inc |  2 +-
 data/scripts/script_08015BA8.inc |  2 +-
 data/scripts/script_08015BE8.inc |  2 +-
 data/scripts/script_08015C7C.inc |  2 +-
 data/scripts/script_08015F3C.inc |  2 +-
 data/scripts/script_08016030.inc |  2 +-
 data/scripts/script_0801606C.inc |  2 +-
 data/scripts/script_0801635C.inc |  2 +-
 data/scripts/script_08016482.inc |  2 +-
 data/scripts/script_080165D8.inc | 10 ++---
 include/entity.h                 |  2 +-
 src/code_0805436C.c              |  2 +-
 src/enemy/acroBandits.c          |  2 +-
 src/enemy/beetle.c               | 10 ++---
 src/enemy/bobomb.c               | 10 ++---
 src/enemy/bombPeahat.c           |  6 +--
 src/enemy/chaser.c               |  8 ++--
 src/enemy/chuchu.c               | 14 +++----
 src/enemy/cuccoChickAggr.c       |  4 +-
 src/enemy/darkNut.c              |  8 ++--
 src/enemy/fallingBoulder.c       |  8 ++--
 src/enemy/fireballGuy.c          |  2 +-
 src/enemy/gibdo.c                |  6 +--
 src/enemy/gyorgMale.c            | 70 ++++++++++++++++----------------
 src/enemy/helmasaur.c            | 12 +++---
 src/enemy/keaton.c               |  6 +--
 src/enemy/leever.c               |  4 +-
 src/enemy/madderpillar.c         |  6 +--
 src/enemy/miniFireballGuy.c      |  2 +-
 src/enemy/miniSlime.c            |  6 +--
 src/enemy/peahat.c               | 18 ++++----
 src/enemy/pesto.c                | 50 +++++++++++------------
 src/enemy/rollobite.c            |  4 +-
 src/enemy/rope.c                 |  8 ++--
 src/enemy/ropeGolden.c           |  4 +-
 src/enemy/rupeeLike.c            |  2 +-
 src/enemy/sensorBladeTrap.c      |  4 +-
 src/enemy/slime.c                |  6 +--
 src/enemy/smallPesto.c           |  2 +-
 src/enemy/spearMoblin.c          | 18 ++++----
 src/enemy/spikedBeetle.c         |  8 ++--
 src/enemy/spinyChuchu.c          |  6 +--
 src/enemy/vaatiBall.c            | 28 ++++++-------
 src/enemy/wallMaster2.c          |  4 +-
 src/enemy/waterDrop.c            |  2 +-
 src/game.c                       |  2 +-
 src/item11.c                     |  2 +-
 src/item14.c                     |  2 +-
 src/npc/cow.c                    |  2 +-
 src/npc/postman.c                |  2 +-
 src/npc/townMinish.c             |  2 +-
 src/npc/townsperson.c            |  2 +-
 src/object/backgroundCloud.c     |  2 +-
 src/object/bird.c                |  2 +-
 src/object/cloud.c               |  2 +-
 src/object/fileScreenObjects.c   |  4 +-
 src/object/greatFairy.c          | 14 +++----
 src/object/itemOnGround.c        |  6 +--
 src/object/metalDoor.c           |  2 +-
 src/object/minecart.c            |  8 ++--
 src/object/object1A.c            |  2 +-
 src/object/objectA2.c            |  2 +-
 src/object/objectB2.c            |  4 +-
 src/object/pot.c                 |  6 +--
 src/object/smoke.c               |  2 +-
 src/player.c                     |  6 +--
 src/room.c                       |  2 +-
 src/script.c                     | 10 ++---
 247 files changed, 479 insertions(+), 479 deletions(-)

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 9d40b8d1..f9206713 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -547,9 +547,9 @@
 	.2byte \direction
 .endm
 
-.macro SetEntityNonPlanarMovement nonPlanarMovement:req
+.macro SetEntitySpeed speed:req
 	.2byte 0x0867
-	.2byte \nonPlanarMovement
+	.2byte \speed
 .endm
 
 .macro SetEntity0x20 value:req
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc
index 3ae98443..4ba55575 100644
--- a/data/scripts/script_08008B5C.inc
+++ b/data/scripts/script_08008B5C.inc
@@ -79,7 +79,7 @@ script_08008C5C:
 	DoPostScriptAction 0x000f
 	_0807EB44 0x0004
 	_0807E930 0x0004
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	SoundReq 0x0121
 	EndBlock 
 	WaitForSomething 0x00000002
diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc
index 087bb253..959a01c1 100644
--- a/data/scripts/script_08008F74.inc
+++ b/data/scripts/script_08008F74.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08008F74
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x00b8, 0x0090
diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc
index d0fa9c93..318ebf1f 100644
--- a/data/scripts/script_08008FFC.inc
+++ b/data/scripts/script_08008FFC.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_08008FFC
 	_0807E930 0x0006
 	Wait 0x0010
 	DoPostScriptAction 0x000f
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807ECC4 0x1c20
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index ac832c53..ba813a3f 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -18,7 +18,7 @@ SCRIPT_START script_0800903C
 	.2byte 0x0000
 	BeginBlock 
 	Call sub_0807F348
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	_0807E9D4 
@@ -120,7 +120,7 @@ script_0800917C:
 	_0807EB74 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0098, 0x0078
 	_0807EB74 
diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc
index 77b00bff..6b99a817 100644
--- a/data/scripts/script_08009320.inc
+++ b/data/scripts/script_08009320.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009320
 	BeginBlock 
 	Call sub_0806D650
-	SetEntityNonPlanarMovement 0x0010
+	SetEntitySpeed 0x0010
 	EndBlock 
 script_0800932E:
 	_0807EEF4 0xfff8, 0x0000
diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc
index b3865077..25a70cb1 100644
--- a/data/scripts/script_08009464.inc
+++ b/data/scripts/script_08009464.inc
@@ -17,7 +17,7 @@ SCRIPT_START script_08009464
 	.2byte 0x0000
 	BeginBlock 
 	Call sub_0806D7C4
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	Wait 0x003c
 	SetEntity0x20 0x00018000
diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc
index d9c26006..8d269a34 100644
--- a/data/scripts/script_080094CC.inc
+++ b/data/scripts/script_080094CC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080094CC
 	BeginBlock 
 	Call sub_0806D804
-	SetEntityNonPlanarMovement 0x0180
+	SetEntitySpeed 0x0180
 	EndBlock 
 	Wait 0x003c
 	SetEntity0x20 0x00018000
diff --git a/data/scripts/script_08009704.inc b/data/scripts/script_08009704.inc
index e3de4497..a37836bb 100644
--- a/data/scripts/script_08009704.inc
+++ b/data/scripts/script_08009704.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08009704
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01a0, 0x01b0
 	_0807EB44 0x0000
@@ -9,7 +9,7 @@ SCRIPT_START script_08009704
 	Wait 0x003c
 	_0807E5F8 0x00000001
 	DoPostScriptAction 0x000d
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807ECC4 0x0010
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc
index 8f1f9439..85d253ee 100644
--- a/data/scripts/script_080097F0.inc
+++ b/data/scripts/script_080097F0.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_080097F0
 	BeginBlock 
 	_0807E930 0x0003
 	DoPostScriptAction 0x0007
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc
index 2918b662..144383f8 100644
--- a/data/scripts/script_08009838.inc
+++ b/data/scripts/script_08009838.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_08009838
 	BeginBlock 
 	_0807E930 0x0003
 	DoPostScriptAction 0x0007
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000008
diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc
index 1a1f41bd..d0cc3325 100644
--- a/data/scripts/script_0800987C.inc
+++ b/data/scripts/script_0800987C.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800987C
 	_0807EB44 0x0004
 	SoundReq 0x0086
 	Call sub_0807F36C
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	_0807ECF4 0x0004
 	Call sub_0807F1E8
 	Wait 0x001e
diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc
index e6d6e44e..9a01e6c3 100644
--- a/data/scripts/script_08009950.inc
+++ b/data/scripts/script_08009950.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009950
 	BeginBlock 
 	Call sub_0807F348
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EB44 0x0004
 	_0807E930 0x000c
 	_0807E908 0x0003
diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc
index fef3b8bc..5d6dcffb 100644
--- a/data/scripts/script_080099DC.inc
+++ b/data/scripts/script_080099DC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080099DC
 	BeginBlock 
 	Call sub_0807F348
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0008
 	EndBlock 
diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc
index 3527bb00..d70c103a 100644
--- a/data/scripts/script_08009A34.inc
+++ b/data/scripts/script_08009A34.inc
@@ -8,7 +8,7 @@ script_08009A38:
 	Jump script_08009A38
 	SetEntityPositionRelative 0x0240, 0x0178
 	CameraTargetEntity 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Wait 0x0078
 	SoundReq2 0x0036
 	_0807E778 0x0002
diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc
index da26d106..b6d926af 100644
--- a/data/scripts/script_08009A84.inc
+++ b/data/scripts/script_08009A84.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009A84
 	BeginBlock 
 	SetEntityPositionRelative 0x01e8, 0x0110
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	DoPostScriptAction 0x0008
 	EndBlock 
 	WaitForSomething2 0x00000004
@@ -13,9 +13,9 @@ SCRIPT_START script_08009A84
 	CameraTargetEntity 
 	_0807EDD4 0x0290, 0x0228
 	_0807EDD4 0x0290, 0x01f8
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EDD4 0x0290, 0x01c8
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	_0807EDD4 0x0290, 0x0198
 	Wait 0x001e
 	_0807E5F8 0x00000010
diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc
index e0f83575..8fd0b8b8 100644
--- a/data/scripts/script_08009B78.inc
+++ b/data/scripts/script_08009B78.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009B78
 	BeginBlock 
 	_0807EB44 0x0006
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807E9D4 
 	Call sub_0807F348
 	EndBlock 
diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc
index f78beac8..c9162bc6 100644
--- a/data/scripts/script_08009C68.inc
+++ b/data/scripts/script_08009C68.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009C68
 	BeginBlock 
 	_0807EB44 0x0002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc
index 7405c078..aa448258 100644
--- a/data/scripts/script_08009CFC.inc
+++ b/data/scripts/script_08009CFC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08009CFC
 	BeginBlock 
 	_0807E8E4_1 
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	EndBlock 
 	_0807E5F8 0x00000004
 	DoPostScriptAction 0x0004
diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc
index e66c5519..4b1a4832 100644
--- a/data/scripts/script_08009D6C.inc
+++ b/data/scripts/script_08009D6C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08009D6C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0006
 	EndBlock 
 	_0807EDD4 0x0078, 0x0060
diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc
index bc76a17f..d24fdd74 100644
--- a/data/scripts/script_0800A088.inc
+++ b/data/scripts/script_0800A088.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800A088
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807ECC4 0x0010
 	_0807EDD4 0x0078, 0x0060
diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc
index 3b011d92..5585c44b 100644
--- a/data/scripts/script_0800A0B4.inc
+++ b/data/scripts/script_0800A0B4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800A0B4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	_0807E864 
 	Call sub_0807DF28
 	EndBlock 
@@ -16,6 +16,6 @@ script_0800A0D2:
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
 	Wait 0x003c
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EC64 0x0030
 SCRIPT_END
diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc
index ea5cf308..52e561c8 100644
--- a/data/scripts/script_0800A160.inc
+++ b/data/scripts/script_0800A160.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800A160
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807E930 0x0002
diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc
index 1d8c805e..50a0bc11 100644
--- a/data/scripts/script_0800A310.inc
+++ b/data/scripts/script_0800A310.inc
@@ -13,7 +13,7 @@ SCRIPT_START script_0800A310
 	.2byte 0x0000
 	BeginBlock 
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc
index f4260f81..114943d5 100644
--- a/data/scripts/script_0800A3D8.inc
+++ b/data/scripts/script_0800A3D8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800A3D8
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc
index 332a734a..d9f29737 100644
--- a/data/scripts/script_0800A500.inc
+++ b/data/scripts/script_0800A500.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800A500
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807E930 0x0005
diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc
index 13e7d09e..4a6dd099 100644
--- a/data/scripts/script_0800A590.inc
+++ b/data/scripts/script_0800A590.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800A590
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	SetEntity0x20 0x00000000
 	DoPostScriptAction 0x0008
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc
index 5fa1b6a4..8b08a0c0 100644
--- a/data/scripts/script_0800ACBC.inc
+++ b/data/scripts/script_0800ACBC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800ACBC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0088, 0x0080
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc
index e191815b..03b12d66 100644
--- a/data/scripts/script_0800AD54.inc
+++ b/data/scripts/script_0800AD54.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800AD54
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	_0807EC64 0x0020
 	_0807EB44 0x0000
@@ -8,7 +8,7 @@ SCRIPT_START script_0800AD54
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0004
@@ -53,7 +53,7 @@ SCRIPT_START script_0800AD54
 	Wait 0x001e
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xfff0
 	Wait 0x003c
 	_0807EEF4 0x0000, 0xfff0
diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc
index 8dee61d5..07fc508d 100644
--- a/data/scripts/script_0800AEA4.inc
+++ b/data/scripts/script_0800AEA4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800AEA4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc
index 85c122f3..15b0a526 100644
--- a/data/scripts/script_0800AEDC.inc
+++ b/data/scripts/script_0800AEDC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800AEDC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807E930 0x0000
diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc
index 293b95d5..429afa66 100644
--- a/data/scripts/script_0800B1C0.inc
+++ b/data/scripts/script_0800B1C0.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800B1C0
 	DoPostScriptAction 0x0000
 	EndBlock 
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x00e0
+	SetEntitySpeed 0x00e0
 	_0807EDD4 0x0088, 0x0090
 	ClearLocalFlag 0x0039
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc
index 10efa475..3dfffa93 100644
--- a/data/scripts/script_0800B200.inc
+++ b/data/scripts/script_0800B200.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800B200
 	_0807E5F8 0x00000000
 	CheckLocalFlag 0x001d
 	JumpIf script_0800B252
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	EndBlock 
 script_0800B216:
 	WaitForSomething2 0x00000001
diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc
index aa0f455a..4163885a 100644
--- a/data/scripts/script_0800B308.inc
+++ b/data/scripts/script_0800B308.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800B308
 	CheckLocalFlag 0x001d
 	JumpIf script_0800B39C
 	DoPostScriptAction 0x0001
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	SetEntityDirection 0x0010
 	CheckKinstoneFused 0x0006
 	JumpIfNot script_0800B32C
diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc
index ff9dd344..29a0db43 100644
--- a/data/scripts/script_0800B3A4.inc
+++ b/data/scripts/script_0800B3A4.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800B3A4
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	Call sub_0807F158
-	SetEntityNonPlanarMovement 0x0120
+	SetEntitySpeed 0x0120
 	_0807EB44 0x0004
 	_0807E908 0x0002
 	SetIntVariable 0x0000200a
diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc
index 1abdb55f..6af14ec8 100644
--- a/data/scripts/script_0800B41C.inc
+++ b/data/scripts/script_0800B41C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800B41C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	_0807E908 0x0001
 	DoPostScriptAction 0x000b
 	_0807E864 
diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc
index 552c3aa0..26fc3d9a 100644
--- a/data/scripts/script_0800B4AC.inc
+++ b/data/scripts/script_0800B4AC.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800B4AC
 	BeginBlock 
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0001
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	_0807E9D4 
 script_0800B4BC:
 	EndBlock 
diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc
index 81c16ece..cb550b60 100644
--- a/data/scripts/script_0800B54C.inc
+++ b/data/scripts/script_0800B54C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800B54C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0128, 0x0298
 	Wait 0x000a
diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc
index 45b307ad..45c39e1e 100644
--- a/data/scripts/script_0800B5C4.inc
+++ b/data/scripts/script_0800B5C4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800B5C4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0004
 	EndBlock 
 	Wait 0x001e
diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc
index 6841ae66..b9f32d34 100644
--- a/data/scripts/script_0800B7C4.inc
+++ b/data/scripts/script_0800B7C4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800B7C4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	CallWithArg sub_0807F6B4, 0x00000090
 	JumpIfNot script_0800B7FC
diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc
index 16313d57..1a1519f2 100644
--- a/data/scripts/script_0800B9B4.inc
+++ b/data/scripts/script_0800B9B4.inc
@@ -61,7 +61,7 @@ script_0800BA6C:
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	Call sub_0807F348
 	EndBlock 
 script_0800BA8E:
diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc
index 60ce3a02..8bc8cba9 100644
--- a/data/scripts/script_0800BB64.inc
+++ b/data/scripts/script_0800BB64.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800BB64
 	BeginBlock 
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0000
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	Call sub_0807F348
 	EndBlock 
 script_0800BB7A:
diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc
index ec6f2a37..2cc1a6d6 100644
--- a/data/scripts/script_0800BC50.inc
+++ b/data/scripts/script_0800BC50.inc
@@ -19,7 +19,7 @@ script_0800BC62:
 	Call sub_08054EFC
 	_0807EB44 0x0000
 	_0807E930 0x0000
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	DoPostScriptAction 0x000d
 	CallWithArg sub_0807F4F8, 0x00000378
 	Wait 0x003c
diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc
index bf86bcf4..1d4a66b4 100644
--- a/data/scripts/script_0800BCE8.inc
+++ b/data/scripts/script_0800BCE8.inc
@@ -32,6 +32,6 @@ script_0800BD1C:
 	Wait 0x003c
 	_0807EB44 0x0002
 	WaitForSomething2 0x00000004
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc
index 7d668cc2..3b4f628f 100644
--- a/data/scripts/script_0800BD78.inc
+++ b/data/scripts/script_0800BD78.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800BD78
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
@@ -14,7 +14,7 @@ SCRIPT_START script_0800BD78
 	_0807EA94 
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0088, 0x0228
 	Wait 0x000f
 	_0807E5F8 0x00000004
@@ -29,7 +29,7 @@ SCRIPT_START script_0800BD78
 	Wait 0x003c
 	_0807EB44 0x0006
 	_0807E5F8 0x00000004
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xffe0
 	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc
index e620c95e..a57fbd89 100644
--- a/data/scripts/script_0800BECC.inc
+++ b/data/scripts/script_0800BECC.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800BECC
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
@@ -14,7 +14,7 @@ SCRIPT_START script_0800BECC
 	_0807EA94 
 	_0807E5F8 0x0000000c
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0088, 0x0178
 	Wait 0x000f
 	_0807E5F8 0x0000000c
diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc
index 7b131db4..c136745f 100644
--- a/data/scripts/script_0800BF38.inc
+++ b/data/scripts/script_0800BF38.inc
@@ -50,6 +50,6 @@ script_0800BFA8:
 	_0807E930 0x0000
 	Wait 0x003c
 	Call sub_08054F64
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc
index 990a55df..da82fbf0 100644
--- a/data/scripts/script_0800C004.inc
+++ b/data/scripts/script_0800C004.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800C004
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
@@ -14,7 +14,7 @@ SCRIPT_START script_0800C004
 	_0807EA94 
 	_0807E5F8 0x0000001c
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0088, 0x0188
 	_0807EDD4 0x00a8, 0x0188
 	_0807EDD4 0x00a8, 0x0178
@@ -30,7 +30,7 @@ SCRIPT_START script_0800C004
 	_0807E930 0x0000
 	Wait 0x003c
 	_0807E5F8 0x0000001c
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xffe0
 	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc
index 7fe378ae..3df5f2f1 100644
--- a/data/scripts/script_0800C160.inc
+++ b/data/scripts/script_0800C160.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800C160
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
@@ -14,7 +14,7 @@ SCRIPT_START script_0800C160
 	_0807EA94 
 	_0807E5F8 0x0000003c
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0098, 0x00e8
 	_0807EDD4 0x00a8, 0x00e8
 	_0807EDD4 0x00a8, 0x00d8
diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc
index 98163565..9eaf26a5 100644
--- a/data/scripts/script_0800C1D8.inc
+++ b/data/scripts/script_0800C1D8.inc
@@ -50,6 +50,6 @@ script_0800C248:
 	_0807E930 0x0000
 	Wait 0x003c
 	Call sub_08054F64
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xffe0
 SCRIPT_END
diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc
index 7853cf4b..02d68b9c 100644
--- a/data/scripts/script_0800C2A4.inc
+++ b/data/scripts/script_0800C2A4.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_0800C2A4
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
@@ -14,7 +14,7 @@ SCRIPT_START script_0800C2A4
 	_0807EA94 
 	_0807E5F8 0x0000007c
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0098, 0x00e8
 	_0807EDD4 0x00c8, 0x00e8
 	_0807EDD4 0x00c8, 0x00d8
@@ -30,7 +30,7 @@ SCRIPT_START script_0800C2A4
 	_0807E930 0x0000
 	Wait 0x003c
 	_0807E5F8 0x0000007c
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xffe0
 	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc
index e9df34fd..fd0d06d5 100644
--- a/data/scripts/script_0800C350.inc
+++ b/data/scripts/script_0800C350.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C350
 	BeginBlock 
 	CallWithArg sub_0806D658, 0x00000003
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	EndBlock 
 script_0800C362:
 	CheckRoomFlag 0x00ff
diff --git a/data/scripts/script_0800C3B0.inc b/data/scripts/script_0800C3B0.inc
index 95da6f56..7c2582f8 100644
--- a/data/scripts/script_0800C3B0.inc
+++ b/data/scripts/script_0800C3B0.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800C3B0
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EEF4 0x0000, 0xff30
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x00b4
diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc
index 4c20b2fa..54d6aa9b 100644
--- a/data/scripts/script_0800C3CC.inc
+++ b/data/scripts/script_0800C3CC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C3CC
 	BeginBlock 
 	Call sub_0806D660
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	WaitForSomething2 0x00000002
 	CallWithArg sub_0807F4F8, 0x00000048
diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc
index 42903575..4e3767b4 100644
--- a/data/scripts/script_0800C410.inc
+++ b/data/scripts/script_0800C410.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C410
 	BeginBlock 
 	Call sub_0806D660
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	WaitForSomething2 0x00000004
 	CallWithArg sub_0807F4F8, 0x00000048
diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc
index d1078766..5c8767cc 100644
--- a/data/scripts/script_0800C45C.inc
+++ b/data/scripts/script_0800C45C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800C45C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0180
+	SetEntitySpeed 0x0180
 	_0807E930 0x0004
 	Call sub_080A0B28
 	EndBlock 
diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc
index 5aa15f03..f35af231 100644
--- a/data/scripts/script_0800C494.inc
+++ b/data/scripts/script_0800C494.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800C494
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0120
+	SetEntitySpeed 0x0120
 	_0807E930 0x0004
 	EndBlock 
 	Wait 0x000a
diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc
index 5186a76a..6365aa7e 100644
--- a/data/scripts/script_0800C4D0.inc
+++ b/data/scripts/script_0800C4D0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800C4D0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0180
+	SetEntitySpeed 0x0180
 	_0807E930 0x0004
 	EndBlock 
 	Wait 0x000a
diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc
index 49086ad3..0c8bc2b1 100644
--- a/data/scripts/script_0800C50C.inc
+++ b/data/scripts/script_0800C50C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800C50C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807E930 0x0004
 	DoPostScriptAction 0x0008
 	EndBlock 
diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc
index 5e110933..bcd1f208 100644
--- a/data/scripts/script_0800C550.inc
+++ b/data/scripts/script_0800C550.inc
@@ -81,7 +81,7 @@ script_0800C61E:
 	Jump script_0800C60A
 	BeginBlock 
 	DoPostScriptAction 0x000a
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EB44 0x0004
 	CheckLocalFlag 0x0082
 	JumpIfNot script_0800C650
@@ -226,7 +226,7 @@ script_0800C824:
 	JumpIf script_0800C8AE
 	TextboxNoOverlapFollow 0x1135
 	_0807EA94 
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EDD4 0x0038, 0x0044
 	DoPostScriptAction 0x0000
 	Wait 0x000f
diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc
index 170a566c..b5a97320 100644
--- a/data/scripts/script_0800C8C8.inc
+++ b/data/scripts/script_0800C8C8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800C8C8
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x00e8, 0x0068
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc
index 609bddbd..4cfdb12b 100644
--- a/data/scripts/script_0800C8F0.inc
+++ b/data/scripts/script_0800C8F0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800C8F0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807ECC4 0x0010
 	_0807EDD4 0x0078, 0x0058
diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc
index 094b43f3..3c5d833e 100644
--- a/data/scripts/script_0800C91C.inc
+++ b/data/scripts/script_0800C91C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800C91C
 	BeginBlock 
 	_0807EB44 0x0004
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	EndBlock 
 script_0800C928:
 	CheckPlayerInRegion 0x0208, 0x0360, 0x2040
diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc
index a2429daa..bccf4699 100644
--- a/data/scripts/script_0800CA8C.inc
+++ b/data/scripts/script_0800CA8C.inc
@@ -1,10 +1,10 @@
 SCRIPT_START script_0800CA8C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0208, 0x0358
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EDD4 0x0208, 0x0340
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc
index 67cac527..0387d84e 100644
--- a/data/scripts/script_0800CABC.inc
+++ b/data/scripts/script_0800CABC.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800CABC
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x000f
 	Call sub_0807F338
 	EndBlock 
@@ -19,13 +19,13 @@ SCRIPT_START script_0800CABC
 	_0807EF3C 0x0180, 0x0030
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00000200
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0208, 0x0328
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00000200
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0208, 0x02b0
 	_0807E5F8 0x00000400
diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc
index 206ad5fb..b94d1c74 100644
--- a/data/scripts/script_0800CB54.inc
+++ b/data/scripts/script_0800CB54.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800CB54
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x000f
 	Call sub_0807F338
 	EndBlock 
@@ -15,13 +15,13 @@ SCRIPT_START script_0800CB54
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00001000
 	WaitForSomething2 0x00000800
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x01f8, 0x0348
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00001000
 	WaitForSomething2 0x00000800
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0178, 0x0328
 	_0807E5F8 0x00001000
diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc
index 32847309..1ba664af 100644
--- a/data/scripts/script_0800CBD4.inc
+++ b/data/scripts/script_0800CBD4.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800CBD4
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x000f
 	Call sub_0807F338
 	EndBlock 
@@ -13,7 +13,7 @@ SCRIPT_START script_0800CBD4
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00004000
 	WaitForSomething2 0x00002000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0218, 0x0340
 	DoPostScriptAction 0x0000
@@ -25,7 +25,7 @@ SCRIPT_START script_0800CBD4
 	_0807EF3C 0x0180, 0x0030
 	_0807E5F8 0x00004000
 	WaitForSomething2 0x00002000
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0288, 0x02d8
 	_0807E5F8 0x00004000
diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc
index ffeff6d3..81dde4c6 100644
--- a/data/scripts/script_0800CC6C.inc
+++ b/data/scripts/script_0800CC6C.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800CC6C
 	BeginBlock 
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x0000
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x000f
 	Call sub_0807F338
 	EndBlock 
@@ -13,7 +13,7 @@ SCRIPT_START script_0800CC6C
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x01f8, 0x0330
 	DoPostScriptAction 0x0000
@@ -25,7 +25,7 @@ SCRIPT_START script_0800CC6C
 	_0807EF3C 0x0180, 0x0030
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0188, 0x02d8
 	_0807E5F8 0x00010000
diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc
index c25ec6ca..78b981d4 100644
--- a/data/scripts/script_0800CD04.inc
+++ b/data/scripts/script_0800CD04.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800CD04
 	BeginBlock 
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x000f
 	Call sub_0807F338
 	EndBlock 
@@ -13,13 +13,13 @@ SCRIPT_START script_0800CD04
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00040000
 	WaitForSomething2 0x00020000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x0218, 0x0350
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00040000
 	WaitForSomething2 0x00020000
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	DoPostScriptAction 0x000f
 	_0807EDD4 0x02a8, 0x0328
 	_0807E5F8 0x00040000
diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc
index 69e087fe..e280400d 100644
--- a/data/scripts/script_0800D190.inc
+++ b/data/scripts/script_0800D190.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800D190
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0170, 0x0140
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc
index 855279ca..4a7bb3c8 100644
--- a/data/scripts/script_0800D1B4.inc
+++ b/data/scripts/script_0800D1B4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800D1B4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0170, 0x0120
 	_0807EDD4 0x01a8, 0x0120
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index 4f5fdc32..16ef4204 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -88,7 +88,7 @@ script_0800D372:
 	CheckLocalFlag 0x007e
 	JumpIfNot script_0800D3E4
 	DoPostScriptAction 0x000b
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	CheckPlayerInRegion 0x0090, 0x0130, 0x0810
 	JumpIfNot script_0800D3B2
 	StartPlayerScript script_0800D3EC
diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc
index 95b38e48..ed99e4a7 100644
--- a/data/scripts/script_0800D3EC.inc
+++ b/data/scripts/script_0800D3EC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800D3EC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index fac4b733..d1901242 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800D414
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	Call sub_08068104
 	DoPostScriptAction 0x000a
 	EndBlock 
@@ -147,7 +147,7 @@ script_0800D650:
 	Call sub_0807DF28
 	Call sub_0807FBC4
 	Call sub_0807FBA0
-	SetEntityNonPlanarMovement 0x0700
+	SetEntitySpeed 0x0700
 	_0807F0B4 0x0007
 	CameraTargetEntity 
 	_0807EDD4 0x01e8, 0x01b8
diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc
index f5787251..b2ce1c33 100644
--- a/data/scripts/script_0800D710.inc
+++ b/data/scripts/script_0800D710.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D710
 	BeginBlock 
 	Call sub_0807F360
-	SetEntityNonPlanarMovement 0x0700
+	SetEntitySpeed 0x0700
 	_0807F0B4 0x0007
 	CameraTargetEntity 
 	Call sub_0807FBC4
diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc
index c676c9df..e81cc3d9 100644
--- a/data/scripts/script_0800D76C.inc
+++ b/data/scripts/script_0800D76C.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800D76C
 	BeginBlock 
 	Call sub_0807F360
 	DoPostScriptAction 0x000b
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	EndBlock 
@@ -27,14 +27,14 @@ SCRIPT_START script_0800D76C
 	Call sub_0807F360
 	DoPostScriptAction 0x000b
 	SetEntityPositionRelative 0x0268, 0x01d8
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	WaitForSomething2 0x00000002
 	_0807EDD4 0x01f0, 0x01d8
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
 script_0800D80C:
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EEF4 0x0000, 0xffe0
 	DoPostScriptAction 0x000e
 	Call sub_0806CA5C
diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc
index ec1171f4..2ad1c0b1 100644
--- a/data/scripts/script_0800D92C.inc
+++ b/data/scripts/script_0800D92C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800D92C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x00a0, 0x0078
diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc
index fb8ca4a8..9f15202c 100644
--- a/data/scripts/script_0800DA00.inc
+++ b/data/scripts/script_0800DA00.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DA00
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0118, 0x0060
diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc
index cd2daa3f..042eae3c 100644
--- a/data/scripts/script_0800DA28.inc
+++ b/data/scripts/script_0800DA28.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800DA28
 	BeginBlock 
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	WaitForSomething2 0x00000004
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc
index 582e4f0d..c3bef3db 100644
--- a/data/scripts/script_0800DCAC.inc
+++ b/data/scripts/script_0800DCAC.inc
@@ -37,7 +37,7 @@ script_0800DCD0:
 	Wait 0x003c
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EEF4 0x0000, 0x0008
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -62,7 +62,7 @@ script_0800DCD0:
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EEF4 0x0000, 0x0080
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc
index 8f6197ab..c8ca954c 100644
--- a/data/scripts/script_0800DDD0.inc
+++ b/data/scripts/script_0800DDD0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DDD0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	CallWithArg sub_0807F4F8, 0x000000a0
 	_0807EDD4 0x0078, 0x00a0
diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc
index cda0a5f9..e8c74e5f 100644
--- a/data/scripts/script_0800DE00.inc
+++ b/data/scripts/script_0800DE00.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DE00
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EB44 0x0000
 	DoPostScriptAction 0x000d
diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc
index d637c711..125cf382 100644
--- a/data/scripts/script_0800DE2C.inc
+++ b/data/scripts/script_0800DE2C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DE2C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc
index 5ea6b35a..5ae10991 100644
--- a/data/scripts/script_0800DEB0.inc
+++ b/data/scripts/script_0800DEB0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DEB0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0198, 0x01c8
 	_0807EB44 0x0004
diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc
index d3aa6911..8a4dc2fd 100644
--- a/data/scripts/script_0800DED4.inc
+++ b/data/scripts/script_0800DED4.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800DED4
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x000b
 	Call sub_08066D04
 	EndBlock 
diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc
index c3a946ef..a3891eab 100644
--- a/data/scripts/script_0800E094.inc
+++ b/data/scripts/script_0800E094.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E094
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x00c0
+	SetEntitySpeed 0x00c0
 	EndBlock 
 	WaitForSomething2 0x00000001
 	DoPostScriptAction 0x0001
diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc
index 5afb7a99..8ca8ff20 100644
--- a/data/scripts/script_0800E0BC.inc
+++ b/data/scripts/script_0800E0BC.inc
@@ -93,7 +93,7 @@ script_0800E1E0:
 	_0807E878 
 	Jump script_0800E1E0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000a
 	CheckLocalFlag 0x0073
diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc
index 13ed8190..282b2a6d 100644
--- a/data/scripts/script_0800E600.inc
+++ b/data/scripts/script_0800E600.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E600
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	SetEntityDirection 0x0000
 	_0807E864 
 	Call sub_0807F354
diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc
index 3400590c..1e325aeb 100644
--- a/data/scripts/script_0800E62C.inc
+++ b/data/scripts/script_0800E62C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E62C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	SetEntityDirection 0x0008
 	_0807E864 
 	Call sub_0807F354
diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc
index d72f1ad6..3368222f 100644
--- a/data/scripts/script_0800E658.inc
+++ b/data/scripts/script_0800E658.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E658
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	SetEntityDirection 0x0010
 	_0807E864 
 	Call sub_0807F354
diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc
index bdb35605..1f12e319 100644
--- a/data/scripts/script_0800E684.inc
+++ b/data/scripts/script_0800E684.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800E684
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	SetEntityDirection 0x0018
 	_0807E864 
 	Call sub_0807F354
diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc
index e7c074fe..049dc195 100644
--- a/data/scripts/script_0800E6B0.inc
+++ b/data/scripts/script_0800E6B0.inc
@@ -62,7 +62,7 @@ script_0800E73E:
 	BeginBlock 
 	_0807E9D4 
 	DoPostScriptAction 0x000a
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	CheckGlobalFlag 0x0029
 	JumpIfNot script_0800E77C
 	CheckGlobalFlag 0x002a
diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc
index 69dc9e0b..1c1b1d22 100644
--- a/data/scripts/script_0800E9F4.inc
+++ b/data/scripts/script_0800E9F4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800E9F4
 	BeginBlock 
 	_0807EB44 0x0004
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0078, 0x0080
diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc
index 87291df6..f432b00a 100644
--- a/data/scripts/script_0800EA54.inc
+++ b/data/scripts/script_0800EA54.inc
@@ -166,7 +166,7 @@ script_0800EC6C:
 	BeginBlock 
 	_0807E9D4 
 	CallWithArg sub_08061FB8, 0x00000001
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	DoPostScriptAction 0x000a
 	_0807EB44 0x0004
 	_0807E930 0x0002
diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc
index a246d1fe..6e1be5e2 100644
--- a/data/scripts/script_0800EF9C.inc
+++ b/data/scripts/script_0800EF9C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800EF9C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc
index ba645685..bec9c5ec 100644
--- a/data/scripts/script_0800EFC0.inc
+++ b/data/scripts/script_0800EFC0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800EFC0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807E9D4 
 	DoPostScriptAction 0x000a
 	CheckLocalFlag 0x007b
diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc
index b13edcab..30be825a 100644
--- a/data/scripts/script_0800F14C.inc
+++ b/data/scripts/script_0800F14C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800F14C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0000
 	_0807EB44 0x0006
diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc
index 4e4cbb74..b9ef9e66 100644
--- a/data/scripts/script_0800F184.inc
+++ b/data/scripts/script_0800F184.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800F184
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x000a
 	EndBlock 
@@ -105,7 +105,7 @@ script_0800F314:
 	EndBlock 
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0002
 	_0807EEF4 0x00c0, 0x0000
 	_0807E5F8 0x00000040
diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc
index cf83ab8e..11c63b10 100644
--- a/data/scripts/script_0800F33C.inc
+++ b/data/scripts/script_0800F33C.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800F33C
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EC94 0x0008
 	_0807E5F8 0x00000400
 	Call sub_080791BC
diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc
index 30e7f1ef..4a43ec65 100644
--- a/data/scripts/script_0800F354.inc
+++ b/data/scripts/script_0800F354.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800F354
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807ECF4 0x0008
 	_0807E5F8 0x00000400
 	Call sub_080791BC
diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc
index e3192b28..7fb077c6 100644
--- a/data/scripts/script_0800F36C.inc
+++ b/data/scripts/script_0800F36C.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800F36C
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807ECC4 0x0008
 	_0807E5F8 0x00000400
 	Call sub_080791BC
diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc
index 38780c9b..488420ce 100644
--- a/data/scripts/script_0800F384.inc
+++ b/data/scripts/script_0800F384.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800F384
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EC64 0x0008
 	_0807E5F8 0x00000400
 	Call sub_080791BC
diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc
index 271e6083..d492c9ee 100644
--- a/data/scripts/script_0800F39C.inc
+++ b/data/scripts/script_0800F39C.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800F39C
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x000b
 	EndBlock 
 	Call sub_0807F348
@@ -34,7 +34,7 @@ script_0800F402:
 	EndBlock 
 	DoPostScriptAction 0x000b
 	Wait 0x0010
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EC64 0x0010
 	_0807EDD4 0x0288, 0x0328
 	_0807E5F8 0x00000080
diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc
index 023bf67d..3f822589 100644
--- a/data/scripts/script_0800F430.inc
+++ b/data/scripts/script_0800F430.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800F430
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x000b
 	EndBlock 
 	Call sub_0807F348
@@ -33,7 +33,7 @@ script_0800F490:
 	EndBlock 
 	DoPostScriptAction 0x000b
 	Wait 0x0018
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EC94 0x0010
 	_0807EC64 0x0020
 	_0807EDD4 0x0288, 0x0328
diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc
index 4d285fdc..958ffa77 100644
--- a/data/scripts/script_0800F4C4.inc
+++ b/data/scripts/script_0800F4C4.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800F4C4
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x000b
 	EndBlock 
 	Call sub_0807F348
@@ -33,7 +33,7 @@ script_0800F524:
 	EndBlock 
 	DoPostScriptAction 0x000b
 	Wait 0x0028
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EC64 0x0010
 	_0807EDD4 0x0288, 0x0328
 	_0807E5F8 0x00000200
diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc
index 076c3a6c..bb03b3ad 100644
--- a/data/scripts/script_0800FA54.inc
+++ b/data/scripts/script_0800FA54.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800FA54
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	SetEntityPositionRelative 0x00d8, 0x0398
 	_0807EB44 0x0006
diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc
index d9444222..6da1cdb1 100644
--- a/data/scripts/script_0800FA78.inc
+++ b/data/scripts/script_0800FA78.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800FA78
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x00a0, 0x0278
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc
index 4e9ffa05..32d80aea 100644
--- a/data/scripts/script_0800FA9C.inc
+++ b/data/scripts/script_0800FA9C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800FA9C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0078, 0x01c0
 	_0807EB44 0x0000
diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc
index bca6c339..9ca12a8a 100644
--- a/data/scripts/script_0800FAC0.inc
+++ b/data/scripts/script_0800FAC0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800FAC0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0108, 0x01c8
 	_0807EB44 0x0002
diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc
index 22643bc1..0db32cf2 100644
--- a/data/scripts/script_0800FAE4.inc
+++ b/data/scripts/script_0800FAE4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800FAE4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	Call sub_0807F584
 	JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC
diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc
index eb52579c..cfc3e949 100644
--- a/data/scripts/script_0800FB44.inc
+++ b/data/scripts/script_0800FB44.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800FB44
 	BeginBlock 
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x000b
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_08066D04
 	EndBlock 
 	WaitForSomething2 0x00000002
@@ -16,7 +16,7 @@ script_0800FB6C:
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807EDD4 0x00b8, 0x0318
 	SetEntityPositionRelative 0x00a0, 0x0260
 	_0807EB44 0x0000
@@ -34,7 +34,7 @@ script_0800FBAE:
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807EDD4 0x00a0, 0x0268
 	_0807EDD4 0x0070, 0x0268
 	_0807EDD4 0x0070, 0x0208
@@ -53,7 +53,7 @@ script_0800FC06:
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807EDD4 0x00f8, 0x01a8
 	SetEntityPositionRelative 0x0118, 0x01c8
 	_0807EB44 0x0002
@@ -70,7 +70,7 @@ script_0800FC52:
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807EDD4 0x0118, 0x0260
 	SetEntityPositionRelative 0x00f8, 0x0270
 	_0807EB44 0x0000
@@ -87,14 +87,14 @@ script_0800FC9E:
 	DoPostScriptAction 0x0004
 	WaitForSomething2 0x00000002
 	DoPostScriptAction 0x000d
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EC94 0x0020
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
 	DoPostScriptAction 0x000c
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807ECF4 0x0020
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc
index 69ac239e..2d707a67 100644
--- a/data/scripts/script_0800FD80.inc
+++ b/data/scripts/script_0800FD80.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0800FD80
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EC64 0x0020
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc
index 15f53ddd..fd161ece 100644
--- a/data/scripts/script_0800FDA0.inc
+++ b/data/scripts/script_0800FDA0.inc
@@ -20,7 +20,7 @@ script_0800FDB2:
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
 	_0807E9D4 
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	EndBlock 
 script_0800FDE2:
 	Call sub_08069A60
@@ -56,7 +56,7 @@ script_0800FE06:
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
 	_0807E9D4 
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	EndBlock 
 script_0800FE5A:
 	Call sub_08069AA8
diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc
index 91997467..c74dadee 100644
--- a/data/scripts/script_0800FF74.inc
+++ b/data/scripts/script_0800FF74.inc
@@ -56,7 +56,7 @@ script_08010014:
 	_0807EA94 
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x0000000c
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0018, 0x0108
 	_0807EB44 0x0002
 	CallWithArg sub_0807F3D8, 0x00000008
diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc
index 99e7d042..dd5e7093 100644
--- a/data/scripts/script_080109F0.inc
+++ b/data/scripts/script_080109F0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080109F0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807ECC4 0x0010
 	_0807EB44 0x0004
diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc
index d3ecbef6..6d0a7712 100644
--- a/data/scripts/script_08010A14.inc
+++ b/data/scripts/script_08010A14.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08010A14
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EC64 0x0010
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc
index 2f5dcc02..36c00b7c 100644
--- a/data/scripts/script_08010A38.inc
+++ b/data/scripts/script_08010A38.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08010A38
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EC94 0x0010
 	_0807EB44 0x0002
diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc
index 6201c14e..78022f8b 100644
--- a/data/scripts/script_08010A98.inc
+++ b/data/scripts/script_08010A98.inc
@@ -22,7 +22,7 @@ script_08010AB4:
 	JumpIfNot script_08010B62
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	SetEntityNonPlanarMovement 0x0180
+	SetEntitySpeed 0x0180
 	CallWithArg sub_0807F348
 	Call sub_0806075C
 	EndBlock 
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index b2c8633f..34745b7b 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -90,7 +90,7 @@ script_08010BCA:
 	WaitForSomething2 0x00500000
 	_0807E5F8 0x00000100
 	SetEntityPositionRelative 0x01f8, 0x0220
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x01f8, 0x0098
 	Wait 0x003c
 	WaitForSomething2 0x00000200
diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc
index a127e6c2..43df8c6b 100644
--- a/data/scripts/script_08011074.inc
+++ b/data/scripts/script_08011074.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08011074
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	_0807EDD4 0x01e8, 0x0050
 	_0807EB44 0x0000
diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc
index bf562d30..7ca7f0c1 100644
--- a/data/scripts/script_080110BC.inc
+++ b/data/scripts/script_080110BC.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080110BC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	EndBlock 
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01d8, 0x0068
 	_0807EB44 0x0004
diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc
index 11113c53..03f283c4 100644
--- a/data/scripts/script_080110E8.inc
+++ b/data/scripts/script_080110E8.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_080110E8
 	DoPostScriptAction 0x000d
 	SoundReq 0x0086
 	Call sub_0807F36C
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	_0807ECF4 0x0008
 	BeginBlock 
 	Call sub_0807F1E8
diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc
index 48c4f798..c8e34389 100644
--- a/data/scripts/script_08011128.inc
+++ b/data/scripts/script_08011128.inc
@@ -19,7 +19,7 @@ script_08011134:
 	_0807EB44 0x0004
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0001
 	_0807ECC4 0x0010
 	DoPostScriptAction 0x0000
@@ -29,7 +29,7 @@ script_08011134:
 	Wait 0x001e
 	DoPostScriptAction 0x0010
 	Call sub_0807F3C8
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	SetEntityDirection 0x001c
 	_0807EC1C 0x003c
 	_0807E5F8 0x00000008
diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc
index 3aa09161..8756d389 100644
--- a/data/scripts/script_080111CC.inc
+++ b/data/scripts/script_080111CC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080111CC
 	BeginBlock 
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	Call sub_08066D04
 	EndBlock 
 	Call sub_0807F338
@@ -28,7 +28,7 @@ script_08011206:
 	WaitForSomething2 0x00000010
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x0001
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EDD4 0x01e8, 0x0040
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000020
diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc
index 6f573aa7..2fa640e4 100644
--- a/data/scripts/script_080112C4.inc
+++ b/data/scripts/script_080112C4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080112C4
 	BeginBlock 
 	DoPostScriptAction 0x0008
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	Call sub_08095244
 	Call sub_0807F338
 	EndBlock 
@@ -33,7 +33,7 @@ script_08011312:
 	SoundReq 0x011e
 	Wait 0x003c
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x01f0, 0x0098
 	_0807EDD4 0x01f0, 0x00c8
 	_0807E930 0x0013
@@ -44,7 +44,7 @@ script_08011312:
 	DoPostScriptAction 0x0010
 	Call sub_0807F3C8
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	SetEntityDirection 0x001e
 	_0807EC1C 0x003c
 	_0807E5F8 0x00001000
diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc
index 2be66000..847d0cf9 100644
--- a/data/scripts/script_080113AA.inc
+++ b/data/scripts/script_080113AA.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_080113AA
 	SoundReq 0x011e
 	Wait 0x003c
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0200, 0x0098
 	_0807EDD4 0x0200, 0x00c8
 	_0807E930 0x0013
@@ -26,7 +26,7 @@ SCRIPT_START script_080113AA
 	DoPostScriptAction 0x0010
 	Call sub_0807F3C8
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	SetEntityDirection 0x0002
 	_0807EC1C 0x003c
 	_0807E5F8 0x00004000
diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc
index 3aaa70e7..f2eb4214 100644
--- a/data/scripts/script_08011442.inc
+++ b/data/scripts/script_08011442.inc
@@ -18,16 +18,16 @@ SCRIPT_START script_08011442
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x01e8, 0x0098
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EEF4 0x0000, 0x0010
 	_0807E930 0x0013
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
 	DoPostScriptAction 0x000d
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0020
+	SetEntitySpeed 0x0020
 	_0807EEF4 0x0000, 0xfff0
 	_0807E930 0x0013
 	DoPostScriptAction 0x0010
@@ -35,7 +35,7 @@ SCRIPT_START script_08011442
 	WaitForSomething2 0x00008000
 	Call sub_0807F3C8
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	SetEntityDirection 0x001e
 	_0807EC1C 0x003c
 	_0807E5F8 0x00010000
diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc
index fa5574e6..bc282731 100644
--- a/data/scripts/script_08011508.inc
+++ b/data/scripts/script_08011508.inc
@@ -18,16 +18,16 @@ SCRIPT_START script_08011508
 	_0807E5F8 0x00040000
 	WaitForSomething2 0x00020000
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0208, 0x0098
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EEF4 0x0000, 0x0010
 	_0807E930 0x0013
 	_0807E5F8 0x00040000
 	WaitForSomething2 0x00020000
 	DoPostScriptAction 0x000d
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0020
+	SetEntitySpeed 0x0020
 	_0807EEF4 0x0000, 0xfff0
 	_0807E930 0x0013
 	DoPostScriptAction 0x0010
@@ -35,7 +35,7 @@ SCRIPT_START script_08011508
 	WaitForSomething2 0x00020000
 	Call sub_0807F3C8
 	_0807E930 0x0014
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	SetEntityDirection 0x0002
 	_0807EC1C 0x003c
 	_0807E5F8 0x00040000
diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc
index aa1bdf6e..ee570b92 100644
--- a/data/scripts/script_080115D0.inc
+++ b/data/scripts/script_080115D0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080115D0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0002
 	_0807E930 0x0001
 	EndBlock 
diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc
index c879f4a3..957a381c 100644
--- a/data/scripts/script_08011608.inc
+++ b/data/scripts/script_08011608.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08011608
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0006
 	_0807E930 0x0003
 	EndBlock 
diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc
index 479e22ac..13deb024 100644
--- a/data/scripts/script_08011640.inc
+++ b/data/scripts/script_08011640.inc
@@ -2,13 +2,13 @@ SCRIPT_START script_08011640
 	BeginBlock 
 	DoPostScriptAction 0x0008
 	_0807EB44 0x0004
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	Call sub_0807F338
 	WaitForSomething2 0x00000040
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x0001
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	_0807EDD4 0x01f8, 0x0048
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000080
@@ -17,7 +17,7 @@ SCRIPT_START script_08011640
 	Wait 0x001e
 	DoPostScriptAction 0x0010
 	Call sub_0807F3C8
-	SetEntityNonPlanarMovement 0x0400
+	SetEntitySpeed 0x0400
 	SetEntityDirection 0x0008
 	_0807EC1C 0x003c
 	_0807E5F8 0x00000080
diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc
index dd4be295..f931651a 100644
--- a/data/scripts/script_080116A8.inc
+++ b/data/scripts/script_080116A8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080116A8
 	BeginBlock 
 	_0807EB44 0x0000
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	Call sub_0807F338
 	WaitForSomething2 0x00000100
@@ -41,7 +41,7 @@ SCRIPT_START script_080116A8
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00000100
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01d8, 0x00a8
 	_0807EB44 0x0000
@@ -61,7 +61,7 @@ SCRIPT_START script_080116A8
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00000100
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01f8, 0x0098
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc
index 44128a3c..3c6c2c90 100644
--- a/data/scripts/script_08011890.inc
+++ b/data/scripts/script_08011890.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08011890
 	BeginBlock 
 	_0807E930 0x0000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	Call nullsub_527
 	Call sub_08094B80
 	EndBlock 
diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc
index 178ed17f..5c14c403 100644
--- a/data/scripts/script_080118D4.inc
+++ b/data/scripts/script_080118D4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080118D4
 	BeginBlock 
 	_0807E930 0x0000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	Call nullsub_527
 	Call sub_08094B80
 	EndBlock 
diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc
index 1d89d4c4..089683a3 100644
--- a/data/scripts/script_08012410.inc
+++ b/data/scripts/script_08012410.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012410
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0004
 	Wait 0x003c
diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc
index ae7f743b..90957ad6 100644
--- a/data/scripts/script_080126FC.inc
+++ b/data/scripts/script_080126FC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080126FC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	DoPostScriptAction 0x0007
 	EndBlock 
 	_0807E930 0x0020
@@ -111,7 +111,7 @@ script_08012824:
 	TextboxNoOverlapFollowPos 0x110e, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0806D908
 	_0807EC1C 0x0010
 	DoPostScriptAction 0x000a
@@ -146,7 +146,7 @@ script_0801293A:
 	_0807E930 0x0010
 	TextboxNoOverlapFollowPos 0x110f, 0x000c
 	_0807E930 0x0018
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0806D908
 	_0807EC1C 0x0050
 	_0807EA94 
@@ -182,7 +182,7 @@ script_080129BA:
 	_0807E930 0x0010
 	TextboxNoOverlapFollowPos 0x1110, 0x000c
 	_0807E930 0x0018
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0806D908
 	_0807EC1C 0x0050
 	_0807E930 0x0018
@@ -221,7 +221,7 @@ script_08012A3E:
 	_0807E930 0x0010
 	TextboxNoOverlapFollowPos 0x1111, 0x000c
 	_0807E930 0x0018
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0806D8A0
 script_08012A74:
 	_0807EE30 
diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc
index cdd07661..9600c570 100644
--- a/data/scripts/script_08012AC8.inc
+++ b/data/scripts/script_08012AC8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012AC8
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc
index 5218b68d..3e4b36e6 100644
--- a/data/scripts/script_08012AF0.inc
+++ b/data/scripts/script_08012AF0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012AF0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0388, 0x0180
diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc
index a5adfb9a..4790ca98 100644
--- a/data/scripts/script_08012B24.inc
+++ b/data/scripts/script_08012B24.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012B24
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0004
 	EndBlock 
 	DoPostScriptAction 0x0001
diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc
index 8e0045ae..13cd72a9 100644
--- a/data/scripts/script_08012B50.inc
+++ b/data/scripts/script_08012B50.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012B50
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0000
 	EndBlock 
 	DoPostScriptAction 0x0001
diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc
index a013bbf7..015962e2 100644
--- a/data/scripts/script_08012B7C.inc
+++ b/data/scripts/script_08012B7C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012B7C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EB44 0x0002
 	EndBlock 
 	DoPostScriptAction 0x0001
diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc
index 4c7cd730..7d27437b 100644
--- a/data/scripts/script_08012C48.inc
+++ b/data/scripts/script_08012C48.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012C48
 	BeginBlock 
 	DoPostScriptAction 0x0007
-	SetEntityNonPlanarMovement 0x0280
+	SetEntitySpeed 0x0280
 	EndBlock 
 	_0807EDD4 0x0388, 0x0168
 	_0807E5F8 0x00000100
diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc
index d0888079..09eef4e2 100644
--- a/data/scripts/script_08012DB0.inc
+++ b/data/scripts/script_08012DB0.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012DB0
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0088, 0x0068
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc
index 760a0faf..21ed79e5 100644
--- a/data/scripts/script_08012DF8.inc
+++ b/data/scripts/script_08012DF8.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08012DF8
 	BeginBlock 
 	_0807EB44 0x0000
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	EndBlock 
 	_0807EDD4 0x00b8, 0x0094
 	Wait 0x0008
diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc
index b58b20ab..4d929371 100644
--- a/data/scripts/script_08012E44.inc
+++ b/data/scripts/script_08012E44.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08012E44
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	EndBlock 
 	Wait 0x003c
 	_0807EB44 0x0004
diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc
index 713ffc5d..154a90ed 100644
--- a/data/scripts/script_080130E4.inc
+++ b/data/scripts/script_080130E4.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080130E4
 	BeginBlock 
 	_0807EB44 0x0006
-	SetEntityNonPlanarMovement 0x0140
+	SetEntitySpeed 0x0140
 	EndBlock 
 	_0807EDD4 0x00a8, 0x0060
 	Wait 0x0008
diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc
index 752b9606..61f3f5ea 100644
--- a/data/scripts/script_080132E4.inc
+++ b/data/scripts/script_080132E4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080132E4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0098, 0x0058
diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc
index 0463b892..7963871e 100644
--- a/data/scripts/script_0801330C.inc
+++ b/data/scripts/script_0801330C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0801330C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EC64 0x0020
diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc
index c69a56b2..d210e38e 100644
--- a/data/scripts/script_0801334C.inc
+++ b/data/scripts/script_0801334C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0801334C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x000d
 	EndBlock 
 	DoPostScriptAction 0x0001
diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc
index 12714774..d0722887 100644
--- a/data/scripts/script_08013494.inc
+++ b/data/scripts/script_08013494.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08013494
 	BeginBlock 
 	_0807E930 0x0000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	Call nullsub_527
 	Call sub_08094B80
 	EndBlock 
diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc
index 4e10b00a..da761630 100644
--- a/data/scripts/script_080136B4.inc
+++ b/data/scripts/script_080136B4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080136B4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x00e8, 0x00a8
 	_0807EB44 0x0000
diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc
index 662b5c12..989c33ee 100644
--- a/data/scripts/script_080136D8.inc
+++ b/data/scripts/script_080136D8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080136D8
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	Call sub_0807F584
 	JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA
diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc
index f956f230..bc6bb9c4 100644
--- a/data/scripts/script_08013E04.inc
+++ b/data/scripts/script_08013E04.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013E04
 	DoPostScriptAction 0x0007
 	_0807E930 0x0000
 	EndBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EDD4 0x00b0, 0x00f8
 	_0807E930 0x0001
 	_0807E5F8 0x08000000
diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc
index 8f80fedd..ebdbe6ce 100644
--- a/data/scripts/script_08013E28.inc
+++ b/data/scripts/script_08013E28.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013E28
 	DoPostScriptAction 0x0007
 	_0807E930 0x0002
 	EndBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EDD4 0x0120, 0x00f8
 	_0807E930 0x0003
 	_0807E5F8 0x10000000
diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc
index 0e0bfde8..4cf5047d 100644
--- a/data/scripts/script_08013E4C.inc
+++ b/data/scripts/script_08013E4C.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013E4C
 	DoPostScriptAction 0x0007
 	_0807E930 0x0004
 	EndBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EDD4 0x0120, 0x0168
 	_0807E930 0x0005
 	_0807E5F8 0x20000000
diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc
index ef89297d..f74c3644 100644
--- a/data/scripts/script_08013E70.inc
+++ b/data/scripts/script_08013E70.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013E70
 	DoPostScriptAction 0x0007
 	_0807E930 0x0006
 	EndBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EDD4 0x00b0, 0x0168
 	_0807E930 0x0007
 	_0807E5F8 0x40000000
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index e0eaae33..ad470edd 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_08014450
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
-	SetEntityNonPlanarMovement 0x01c0
+	SetEntitySpeed 0x01c0
 	DoPostScriptAction 0x000a
 	EndBlock 
 script_08014462:
diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc
index 6ac1a03a..9965924d 100644
--- a/data/scripts/script_0801450C.inc
+++ b/data/scripts/script_0801450C.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0801450C
 	BeginBlock 
 	_0807E9D4 
 	_0807EB44 0x0000
-	SetEntityNonPlanarMovement 0x01c0
+	SetEntitySpeed 0x01c0
 	DoPostScriptAction 0x000a
 	EndBlock 
 	_0807E864 
diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc
index 0d0ed719..35e475e0 100644
--- a/data/scripts/script_08014588.inc
+++ b/data/scripts/script_08014588.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08014588
 	EndBlock 
 	WaitForSomething2 0x00000001
-	SetEntityNonPlanarMovement 0x00e0
+	SetEntitySpeed 0x00e0
 	_0807EDD4 0x0078, 0x0078
 	DoPostScriptAction 0x0000
 	Wait 0x0010
diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc
index da36490e..c6e83402 100644
--- a/data/scripts/script_080147DC.inc
+++ b/data/scripts/script_080147DC.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_080147DC
 	EndBlock 
 	WaitForSomething2 0x00000002
-	SetEntityNonPlanarMovement 0x00e0
+	SetEntitySpeed 0x00e0
 	_0807EDD4 0x0078, 0x0068
 	DoPostScriptAction 0x0000
 	Wait 0x0010
diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc
index 268787d0..46812d26 100644
--- a/data/scripts/script_080149CC.inc
+++ b/data/scripts/script_080149CC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080149CC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	Call sub_0806C870
 	DoPostScriptAction 0x000a
 	EndBlock 
diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc
index c06b6709..45c292eb 100644
--- a/data/scripts/script_08014B10.inc
+++ b/data/scripts/script_08014B10.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08014B10
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	_0807EDD4 0x0078, 0x0040
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc
index d0bbc238..4cb6b657 100644
--- a/data/scripts/script_08014CDC.inc
+++ b/data/scripts/script_08014CDC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08014CDC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0180
+	SetEntitySpeed 0x0180
 	DoPostScriptAction 0x000a
 	Call sub_08066D04
 	Call sub_08066D14
diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc
index ab814f8e..600e376d 100644
--- a/data/scripts/script_08015234.inc
+++ b/data/scripts/script_08015234.inc
@@ -21,7 +21,7 @@ SCRIPT_START script_08015234
 	WaitForSomething2 0x00000002
 	SoundReq 0x00f5
 	DoPostScriptAction 0x001f
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000d
 	DoPostScriptAction 0x0000
 	_0807ECC4 0x0030
diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc
index 6d1d581b..e29fae3e 100644
--- a/data/scripts/script_080152B4.inc
+++ b/data/scripts/script_080152B4.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080152B4
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01f8, 0x00b8
diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc
index 773a9c35..c16d1795 100644
--- a/data/scripts/script_080152DC.inc
+++ b/data/scripts/script_080152DC.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_080152DC
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01f8, 0x0148
diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc
index 722f838a..786e3cf2 100644
--- a/data/scripts/script_08015338.inc
+++ b/data/scripts/script_08015338.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015338
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01f8, 0x0148
diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc
index 5e999a0e..73b67bde 100644
--- a/data/scripts/script_08015360.inc
+++ b/data/scripts/script_08015360.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015360
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	SetEntityPositionRelative 0x0208, 0x0148
 	EndBlock 
 	_0807EB44 0x0006
diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc
index 054a574f..6f8a7d4f 100644
--- a/data/scripts/script_08015390.inc
+++ b/data/scripts/script_08015390.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015390
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	EndBlock 
 	_0807E930 0x001f
diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc
index 9ec275ae..60940bdc 100644
--- a/data/scripts/script_0801550C.inc
+++ b/data/scripts/script_0801550C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0801550C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0000
 	Call sub_0807F338
diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc
index 47e1488a..399b1b33 100644
--- a/data/scripts/script_08015618.inc
+++ b/data/scripts/script_08015618.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08015618
 	BeginBlock 
 	DoPostScriptAction 0x0007
-	SetEntityNonPlanarMovement 0x0040
+	SetEntitySpeed 0x0040
 	Call sub_08094B80
 	EndBlock 
 	WaitForSomething2 0x00000080
diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc
index f63f2e84..4dbe2747 100644
--- a/data/scripts/script_08015754.inc
+++ b/data/scripts/script_08015754.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08015754
 	BeginBlock 
 	_0807E930 0x0000
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	Call sub_08094B80
 	EndBlock 
 	Wait 0x0078
@@ -11,7 +11,7 @@ SCRIPT_START script_08015754
 	SoundReq 0x01c6
 	Call sub_08094B80
 	_0807E5F8 0x00020000
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	WaitForSomething2 0x00040000
 	_0807EDD4 0x0078, 0x00c8
 	_0807E5F8 0x00080000
diff --git a/data/scripts/script_080158F8.inc b/data/scripts/script_080158F8.inc
index cd1e1208..0c4d7f69 100644
--- a/data/scripts/script_080158F8.inc
+++ b/data/scripts/script_080158F8.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_080158F8
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0218, 0x0238
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_08015918.inc b/data/scripts/script_08015918.inc
index 355718a5..2c49a5c5 100644
--- a/data/scripts/script_08015918.inc
+++ b/data/scripts/script_08015918.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08015918
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0238, 0x0228
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_08015938.inc b/data/scripts/script_08015938.inc
index 17f2e6a2..df0c766b 100644
--- a/data/scripts/script_08015938.inc
+++ b/data/scripts/script_08015938.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08015938
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0248, 0x0208
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index 5bf2e8fa..362d76c9 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015958
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0180
+	SetEntitySpeed 0x0180
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x000b
 	Call sub_08066D04
@@ -29,7 +29,7 @@ SCRIPT_START script_08015958
 	WaitForSomething2 0x00000001
 	Call sub_0807F3C8
 	SoundReq 0x0096
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	_0807ECC4 0x0008
 	_0807E930 0x0040
 	Call sub_0807F2D4
@@ -41,7 +41,7 @@ SCRIPT_START script_08015958
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0238, 0x0238
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc
index a5c8b58e..ade0dcff 100644
--- a/data/scripts/script_08015A7C.inc
+++ b/data/scripts/script_08015A7C.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08015A7C
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0001
 	_0807EC64 0x0010
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc
index d009852f..24b46093 100644
--- a/data/scripts/script_08015AA0.inc
+++ b/data/scripts/script_08015AA0.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08015AA0
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0001
 	_0807EC94 0x0010
 	_0807EB44 0x0002
diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc
index 859115b3..fced2034 100644
--- a/data/scripts/script_08015B14.inc
+++ b/data/scripts/script_08015B14.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08015B14
 	BeginBlock 
 	_0807E930 0x0018
-	SetEntityNonPlanarMovement 0x0300
+	SetEntitySpeed 0x0300
 	EndBlock 
 	_0807EDD4 0x0248, 0x0218
 	_0807E5F8 0x00000020
diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc
index b20e3589..afe2682a 100644
--- a/data/scripts/script_08015B84.inc
+++ b/data/scripts/script_08015B84.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08015B84
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0001
 	_0807EC64 0x0010
 	_0807EB44 0x0000
diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc
index f5c9fcc5..0798902d 100644
--- a/data/scripts/script_08015BA8.inc
+++ b/data/scripts/script_08015BA8.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_08015BA8
 	_0807E864 
 	MoveEntityToPlayer 
 	CameraTargetEntity 
-	SetEntityNonPlanarMovement 0x0200
+	SetEntitySpeed 0x0200
 	EndBlock 
 	Wait 0x000f
 	_0807E8E4_2 
diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc
index 82ec46eb..afbdefbc 100644
--- a/data/scripts/script_08015BE8.inc
+++ b/data/scripts/script_08015BE8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015BE8
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 script_08015BF0:
 	CheckPlayerInRegion 0x0160, 0x0020, 0x3040
diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc
index ac412e51..966109fa 100644
--- a/data/scripts/script_08015C7C.inc
+++ b/data/scripts/script_08015C7C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015C7C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	EndBlock 
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0168, 0x0058
diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc
index 171e7ea6..6cb4e64b 100644
--- a/data/scripts/script_08015F3C.inc
+++ b/data/scripts/script_08015F3C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08015F3C
 	BeginBlock 
-	SetEntityNonPlanarMovement 0x0080
+	SetEntitySpeed 0x0080
 	_0807EB44 0x0000
 	_0807E930 0x0000
 	EndBlock 
diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc
index fd4ca990..91553bd0 100644
--- a/data/scripts/script_08016030.inc
+++ b/data/scripts/script_08016030.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_08016030
 	WaitForSomething2 0x00000001
 	DoPostScriptAction 0x0010
 	Wait 0x003c
-	SetEntityNonPlanarMovement 0x0020
+	SetEntitySpeed 0x0020
 	_0807ECF4 0x0080
 	Wait 0x001e
 	DoPostScriptAction 0x0010
diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc
index 1966d5cf..b700d7ba 100644
--- a/data/scripts/script_0801606C.inc
+++ b/data/scripts/script_0801606C.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0801606C
 	WaitForSomething2 0x00000002
 	DoPostScriptAction 0x0010
 	Wait 0x003c
-	SetEntityNonPlanarMovement 0x0020
+	SetEntitySpeed 0x0020
 	_0807EC94 0x0080
 	Wait 0x001e
 	DoPostScriptAction 0x0010
diff --git a/data/scripts/script_0801635C.inc b/data/scripts/script_0801635C.inc
index 12ddcd91..002227b9 100644
--- a/data/scripts/script_0801635C.inc
+++ b/data/scripts/script_0801635C.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_0801635C
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	_0807EDD4 0x0078, 0x0050
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index 5999bc0c..b55e1150 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -42,7 +42,7 @@ SCRIPT_START script_08016482
 	_0807EB8C 
 	SetEntityDirection 0x0000
 	SetEntityDirectionWithAnimationState 0x0000
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 	SetEntity0x20 0x00018000
 	SetEntityPositionRelative 0x0000, 0x0000
 	MoveEntityToPlayer 
diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc
index cc22a1f0..8577e4f6 100644
--- a/data/scripts/script_080165D8.inc
+++ b/data/scripts/script_080165D8.inc
@@ -38,7 +38,7 @@ script_0801662E:
 	_0807E878 
 	Jump script_0801662E
 	.2byte 0x0000
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 script_08016648:
 	_0807ECF4 0x0030
 	Wait 0x0008
@@ -63,7 +63,7 @@ script_0801666C:
 	_0807ED24 0x00d8, 0x003f, 0x003c
 	Wait 0x0008
 	Jump script_0801666C
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 script_080166BC:
 	_0807EDD4 0x0055, 0x0039
 	Wait 0x0008
@@ -78,7 +78,7 @@ script_080166BC:
 	_0807EDD4 0x00d8, 0x003f
 	Wait 0x0008
 	Jump script_080166BC
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 script_08016700:
 	_0807EC94 0x0030
 	_0807E5F8 0x00000002
@@ -115,7 +115,7 @@ script_08016700:
 	_0807EB44 0x0004
 	Wait 0x003c
 	Jump script_08016700
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 script_0801679C:
 	WaitForSomething 0x00000002
 	_0807E610 0x00000002
@@ -154,7 +154,7 @@ script_0801679C:
 	Wait 0x0002
 	_0807EB44 0x0004
 	Jump script_0801679C
-	SetEntityNonPlanarMovement 0x0100
+	SetEntitySpeed 0x0100
 script_08016848:
 	WaitForSomething 0x00000004
 	_0807E610 0x00000004
diff --git a/include/entity.h b/include/entity.h
index a1dd6d93..f3a76a68 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -92,7 +92,7 @@ typedef struct Entity {
     /*0x1e*/ u8 frameIndex;
     /*0x1f*/ u8 lastFrameIndex;
     /*0x20*/ s32 field_0x20;
-    /*0x24*/ s16 nonPlanarMovement;
+    /*0x24*/ s16 speed;
     /*0x26*/ u8 spriteAnimation[3];
     /*0x29*/ struct {
     /*    */     u8 b0 : 3; // 1-4
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index 76a9b18c..be879f99 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -255,7 +255,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) {
                         arg0->attachedEntity = itemEntity;
                     } else if (arg0->id == 0x1e) {
                         itemEntity->direction = arg0->animationState << 3 | 0x80;
-                        itemEntity->nonPlanarMovement = 0xc0;
+                        itemEntity->speed = 0xc0;
                         itemEntity->field_0x20 = 0x18000;
                     }
                 }
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index 3344b5b5..2825aed5 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -452,7 +452,7 @@ void sub_08032160(Entity* this) {
         } else {
             this->spriteSettings.b.flipX = 0;
         }
-        this->nonPlanarMovement = 0xf0;
+        this->speed = 0xf0;
         this->field_0x20 = 0x12000;
         this->spritePriority.b1 = 1;
         InitializeAnimation(this, 12);
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 61e54b6a..5ba78755 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -102,7 +102,7 @@ void sub_080218CC(Entity* this) {
         this->previousActionFlag = 1;
         this->spriteSettings.b.draw = 1;
         this->direction = ((sub_08049F84(this, 1) ^ 0x10) + gUnk_080CB5DC[Random() & 7]) & 0x1f;
-        this->nonPlanarMovement = 0x100;
+        this->speed = 0x100;
         this->field_0x20 = 0x12000;
     }
 
@@ -118,7 +118,7 @@ void sub_080218CC(Entity* this) {
         this->actionDelay = (Random() & 0x38) + 8;
         this->field_0xf = 1;
         this->flags |= 0x80;
-        this->nonPlanarMovement = 0x180;
+        this->speed = 0x180;
         InitializeAnimation(this, 0);
     }
 }
@@ -139,7 +139,7 @@ void sub_08021984(Entity* this) {
         this->actionDelay = 16;
         this->field_0xf = 1;
         this->spriteSettings.b.draw = 1;
-        this->nonPlanarMovement = 0x180;
+        this->speed = 0x180;
         ((u8*)&this->field_0x86)[0] = 60;
         InitializeAnimation(this, 0);
         UpdateSpriteForCollisionLayer(this);
@@ -309,9 +309,9 @@ void sub_08021D44(Entity* this, u32 direction) {
     direction = DirectionRoundUp(direction);
     this->direction = direction;
     if (DirectionIsHorizontal(direction)) {
-        this->nonPlanarMovement = 0x180;
+        this->speed = 0x180;
     } else {
-        this->nonPlanarMovement = 0xc0;
+        this->speed = 0xc0;
     }
 }
 
diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index bf4b4372..d9c1a2a8 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -53,7 +53,7 @@ void sub_0802C688(Entity* this) {
                 this->damageType = 0x6e;
                 this->field_0xf = 1;
                 this->field_0x20 = 0x18000;
-                this->nonPlanarMovement = 0;
+                this->speed = 0;
                 this->field_0x80.HALF.HI = 1;
                 InitializeAnimation(this, this->direction >> 4 | 6);
                 break;
@@ -68,7 +68,7 @@ void sub_0802C7AC(Entity* this) {
         this->field_0xf = 1;
         this->height.HALF.HI = 0;
         if (this->field_0x82.HALF.LO != 2) {
-            this->nonPlanarMovement = this->field_0x82.HALF.LO ? 0x200 : 0x80;
+            this->speed = this->field_0x82.HALF.LO ? 0x200 : 0x80;
         }
         this->field_0x20 = 0x18000;
         this->field_0x82.HALF.HI = 0;
@@ -224,7 +224,7 @@ void sub_0802CA94(Entity* this) {
     this->field_0xf = 1;
     this->spritePriority.b1 = 1;
     this->field_0x20 = 0x18000;
-    this->nonPlanarMovement = 0;
+    this->speed = 0;
     this->field_0x82.HALF.HI = 0;
     this->field_0x80.HALF.HI = 0;
     this->direction = ((gPlayerEntity.animationState << 2) | 4) & 0x1c;
@@ -261,11 +261,11 @@ void sub_0802CB68(Entity* this) {
     this->flags |= 0x80;
     if (this->field_0x82.HALF.LO) {
         this->actionDelay = 200;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         InitializeAnimation(this, (this->direction >> 4) | 2);
     } else {
         this->actionDelay = 0x3c;
-        this->nonPlanarMovement = 0x80;
+        this->speed = 0x80;
         InitializeAnimation(this, this->direction >> 4);
     }
 }
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index b8dc9575..228855be 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -174,7 +174,7 @@ void sub_0802AA40(Entity* this) {
                 }
                 if (this->direction == direction) {
                     this->action = 3;
-                    this->nonPlanarMovement = 0x180;
+                    this->speed = 0x180;
                     this->field_0x7a.HALF.HI = 0;
                     ent->field_0x80.HALF.LO = 1;
                     ent->actionDelay = 0x96;
@@ -244,7 +244,7 @@ void sub_0802AB40(Entity* this) {
                 }
             } else {
                 this->action = 5;
-                this->nonPlanarMovement = 0;
+                this->speed = 0;
                 InitializeAnimation(this, this->type + 1);
             }
             break;
@@ -256,7 +256,7 @@ void sub_0802AC08(Entity* this) {
         this->action = 2;
         this->previousActionFlag = 0;
         this->actionDelay = 0x40;
-        this->nonPlanarMovement = 0xc0;
+        this->speed = 0xc0;
         sub_0802ACDC(this, 8);
         sub_0802ADDC(this);
     }
diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c
index 00d99937..7e0ac960 100644
--- a/src/enemy/chaser.c
+++ b/src/enemy/chaser.c
@@ -36,7 +36,7 @@ void sub_0802B540(Entity* this) {
         u32 direction = sub_0804A024(this, 1, 0xc);
         if (direction != 0xff) {
             this->action = 2;
-            this->nonPlanarMovement = 0x40;
+            this->speed = 0x40;
             this->direction = direction;
         }
     }
@@ -45,15 +45,15 @@ void sub_0802B540(Entity* this) {
 void sub_0802B56C(Entity* this) {
     GetNextFrame(this);
     if (this->bitfield & 0x80) {
-        this->nonPlanarMovement = 0x40;
+        this->speed = 0x40;
     }
 
     if (sub_080AF038(this)) {
         if (this->animIndex != 1) {
             InitializeAnimation(this, 1);
         }
-        if (this->nonPlanarMovement < 0x220) {
-            this->nonPlanarMovement += 4;
+        if (this->speed < 0x220) {
+            this->speed += 4;
         }
     } else {
         this->action = 3;
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index 99a9160a..e8ee87d3 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -54,7 +54,7 @@ void Chuchu(Entity* this) {
                         if (this->flags & 0x80) {
                             this->action = 6;
                             this->flags &= ~0x80;
-                            this->nonPlanarMovement = 0x20;
+                            this->speed = 0x20;
                             this->damageType = 0x5c;
                             InitializeAnimation(this, 5);
                         }
@@ -293,7 +293,7 @@ void sub_0801F328(Entity* this) {
 void sub_0801F340(Entity* this) {
     this->action = 5;
     this->actionDelay = 60;
-    this->nonPlanarMovement = 0x20;
+    this->speed = 0x20;
     this->damageType = 92;
     InitializeAnimation(this, 2);
 }
@@ -417,7 +417,7 @@ void sub_0801F584(Entity* this) {
         } else {
             this->action = 6;
             this->field_0xf = 60;
-            this->nonPlanarMovement = 0x20;
+            this->speed = 0x20;
             this->damageType = 92;
             InitializeAnimation(this, 2);
         }
@@ -469,7 +469,7 @@ void sub_0801F6F8(Entity* this) {
     GetNextFrame(this);
     if (this->frames.all & 0x80) {
         this->action = 4;
-        this->nonPlanarMovement = 0x20;
+        this->speed = 0x20;
         sub_0804AA1C(this);
         InitializeAnimation(this, 2);
     }
@@ -592,7 +592,7 @@ void sub_0801F940(Entity* this) {
         } else {
             this->action = 6;
             this->field_0xf = 60;
-            this->nonPlanarMovement = 0x20;
+            this->speed = 0x20;
             InitializeAnimation(this, 2);
         }
     }
@@ -644,7 +644,7 @@ void sub_0801FAAC(Entity* this) {
     GetNextFrame(this);
     if (this->frames.all & 0x80) {
         sub_0801FB14(this);
-        this->nonPlanarMovement = 0x20;
+        this->speed = 0x20;
         sub_0804AA1C(this);
     }
 }
@@ -705,7 +705,7 @@ u32 sub_0801FBD0(Entity* this) {
 }
 
 void Chuchu_JumpAtPlayer(Entity* this) {
-    this->nonPlanarMovement = 0x180;
+    this->speed = 0x180;
     this->field_0x20 = 0x20000;
     this->direction = sub_08049F84(this, 1);
     InitializeAnimation(this, 3);
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index de87165a..e0f7a8f0 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -71,7 +71,7 @@ void sub_080229F8(Entity* this) {
             this->actionDelay = 6;
             this->field_0xf = 8;
             this->frameIndex = 0;
-            this->nonPlanarMovement = 0xc0;
+            this->speed = 0xc0;
             sub_08022B44(this);
         } else {
             this->field_0x20 = 0x10000;
@@ -110,7 +110,7 @@ void sub_08022AA4(Entity* this) {
     this->action = 2;
     this->actionDelay = (rand & 3) + 1;
     this->field_0xf = 1;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
 
     if (!sub_08049FA0(this) && (rand >> 8) & 3) {
         this->direction = sub_08049EE4(this);
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index 49acb71d..83fa7296 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -428,7 +428,7 @@ void sub_08021328(Entity* this) {
 void sub_0802134C(Entity* this) {
     this->action = 15;
     this->direction = DirectionFromAnimationState(this->animationState);
-    this->nonPlanarMovement = 0x200;
+    this->speed = 0x200;
     this->field_0x76.HWORD = 0x78;
     sub_08021218(this, 0xe, this->animationState);
 }
@@ -445,7 +445,7 @@ void sub_08021380(Entity* this) {
 
 void sub_08021390(Entity* this) {
     this->action = 7;
-    this->nonPlanarMovement = 0x200;
+    this->speed = 0x200;
     this->damageType = 0x56;
     sub_08021218(this, 6, this->animationState);
 }
@@ -453,7 +453,7 @@ void sub_08021390(Entity* this) {
 void sub_080213B0(Entity* this) {
     this->action = 3;
     this->actionDelay = 1;
-    this->nonPlanarMovement = 0xc0;
+    this->speed = 0xc0;
     this->field_0x76.HWORD = 0xf0;
     sub_08021218(this, 3, this->animationState);
 }
@@ -472,7 +472,7 @@ void sub_080213F0(Entity* this) {
 
 void sub_08021400(Entity* this) {
     this->action = 9;
-    this->nonPlanarMovement = 0x60;
+    this->speed = 0x60;
     sub_08021218(this, 10, this->animationState);
 }
 
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index 4b469258..798f4939 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -156,15 +156,15 @@ void sub_0802C4B0(Entity* this) {
     rand = Random() & 7;
     if (rand & 4) {
         if (rand & 3) {
-            this->nonPlanarMovement = gUnk_080CD568[offset | 2];
+            this->speed = gUnk_080CD568[offset | 2];
         } else {
-            this->nonPlanarMovement = gUnk_080CD568[offset | 0];
+            this->speed = gUnk_080CD568[offset | 0];
         }
     } else {
         if (rand & 3) {
-            this->nonPlanarMovement = gUnk_080CD568[offset | 1];
+            this->speed = gUnk_080CD568[offset | 1];
         } else {
-            this->nonPlanarMovement = gUnk_080CD568[offset | 3];
+            this->speed = gUnk_080CD568[offset | 3];
         }
     }
 
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index 3a4e4148..e2d8914d 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -39,7 +39,7 @@ void sub_080453E8(Entity* this) {
     this->action = 1;
     this->actionDelay = 0;
     this->spriteSettings.b.draw = 1;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     this->cutsceneBeh.HALF.LO = this->currentHealth;
     this->field_0x3c |= 0x10;
     sub_0804A720(this);
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index a1a9833d..f3228707 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -211,7 +211,7 @@ void sub_080377B0(Entity* this) {
     this->field_0xf = 8;
     r1 = Random();
     this->field_0x74.HWORD = (r1 & 0x38) + 0x78;
-    this->nonPlanarMovement = 0x40;
+    this->speed = 0x40;
     r2 = Random();
     if (!sub_08049FA0(this) && (r2 & 3)) {
         this->direction = DirectionRoundUp(sub_08049EE4(this));
@@ -233,7 +233,7 @@ NONMATCH("asm/non_matching/gibdo/sub_08037810.inc", u32 sub_08037810(Entity* thi
                     this->action = 3;
                     this->actionDelay = 0x18;
                     this->field_0xf = 0x8;
-                    this->nonPlanarMovement = 0xc0;
+                    this->speed = 0xc0;
                     y = DirectionRoundUp(GetFacingDirection(this, gUnk_020000B0));
                     this->direction = y;
                     this->animationState = y / 8;
@@ -258,7 +258,7 @@ u32 sub_080378B0(Entity* this) {
             if (sub_0804A044(this, gUnk_020000B0, 0xa) == this->direction)
                 if (sub_0806FCB8(this, gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI, 0x18) != 0) {
                     this->action = 5;
-                    this->nonPlanarMovement = 0x100;
+                    this->speed = 0x100;
                     InitAnimationForceUpdate(this, this->animationState + 8);
                     return 1;
                 }
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index 330e68b8..1edbf4f9 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -144,7 +144,7 @@ void sub_08046930(Entity* this) {
     if (this->type) {
         this->previousActionFlag = 5;
         this->direction = 0x20;
-        this->nonPlanarMovement = 0x280;
+        this->speed = 0x280;
     }
     sub_08047D88(this);
     if (this->field_0x7c.BYTES.byte0 == 0)
@@ -153,7 +153,7 @@ void sub_08046930(Entity* this) {
     this->actionDelay = 1;
     this->animationState = 0;
     this->direction = 0;
-    this->nonPlanarMovement = 0x280;
+    this->speed = 0x280;
 }
 
 void sub_0804696C(Entity* this) {
@@ -161,7 +161,7 @@ void sub_0804696C(Entity* this) {
     if (gRoomControls.roomOriginY + 0x130 > this->y.HALF.HI) {
         this->previousActionFlag = 2;
         this->direction = 0x80;
-        this->nonPlanarMovement = 0x100;
+        this->speed = 0x100;
         this->spriteOrientation.flipY = 3;
         this->spriteRendering.b3 = 3;
         SoundReq(0x2e);
@@ -232,7 +232,7 @@ void sub_08046A9C(Entity* this) {
 
 void sub_08046AE8(Entity* this) {
     this->previousActionFlag = 1;
-    this->nonPlanarMovement = 0x180;
+    this->speed = 0x180;
     sub_08048178(this, ((Entity*)this->myHeap)->next->animationState >> 5);
     this->field_0x76.HWORD = this->direction << 8;
     sub_08047D88(this);
@@ -310,7 +310,7 @@ void sub_08046CEC(Entity* this) {
     if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 2) {
         this->action = 2;
         this->previousActionFlag = 0;
-        this->animationState = this->nonPlanarMovement;
+        this->animationState = this->speed;
     }
 }
 
@@ -319,7 +319,7 @@ const u16 gUnk_080D1B60[8] = { 0x200, 0x184, 0x28C, 0x210, 0x200, 0x29C, 0x174,
 void sub_08046D44(Entity* this) {
     const u16* tmp;
     this->previousActionFlag = 1;
-    this->nonPlanarMovement = 0x200;
+    this->speed = 0x200;
     tmp = gUnk_080D1B60 + (((Entity*)this->myHeap)->next->animationState >> 5);
     this->field_0x80.HWORD = tmp[0] + gRoomControls.roomOriginX;
     this->field_0x82.HWORD = tmp[1] + gRoomControls.roomOriginY;
@@ -385,7 +385,7 @@ void sub_08046EF4(Entity* this) {
         this->actionDelay = 0x7F;
         this->direction ^= 0x80;
     }
-    this->nonPlanarMovement = gUnk_080D1B74[(this->actionDelay >> 3) & 0xF];
+    this->speed = gUnk_080D1B74[(this->actionDelay >> 3) & 0xF];
     if ((--this->field_0xf & 0xFF) == 0) {
         Entity* tmp;
         this->field_0xf = (Random() & 0x38) + 0x78;
@@ -428,7 +428,7 @@ void sub_08046F64(Entity* this) {
 
 void sub_08046FE8(Entity* this) {
     this->previousActionFlag = 1;
-    this->nonPlanarMovement = 0x1c0;
+    this->speed = 0x1c0;
     this->field_0x7c.HALF.HI = 0x1e;
     this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x290;
     this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x190;
@@ -445,10 +445,10 @@ void sub_0804702C(Entity* this) {
         }
     }
     sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
-    if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, (this->nonPlanarMovement >> 0x10) + 0x10)) {
+    if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, (this->speed >> 0x10) + 0x10)) {
         this->previousActionFlag = 2;
         this->field_0x76.HWORD = this->direction << 8;
-        this->nonPlanarMovement = 0x280;
+        this->speed = 0x280;
     }
 }
 
@@ -467,7 +467,7 @@ void sub_080470B4(Entity* this) {
         sub_08047EA4(this, ((0x100 - this->direction) & 0xFF) << 8);
     } else {
         this->previousActionFlag = 3;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->field_0x76.HWORD = this->direction << 8;
         this->field_0x74.HWORD = gUnk_080D1BBC[Random() & 1];
         sub_08047D88(this);
@@ -485,8 +485,8 @@ void sub_08047140(Entity* this) {
 }
 
 void sub_0804717C(Entity* this) {
-    if (this->nonPlanarMovement < 0x280) {
-        this->nonPlanarMovement += 8;
+    if (this->speed < 0x280) {
+        this->speed += 8;
     }
     sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
     if (gRoomControls.roomOriginX + 0x200 > this->x.HALF.HI) {
@@ -495,8 +495,8 @@ void sub_0804717C(Entity* this) {
 }
 
 void sub_080471C8(Entity* this) {
-    if (this->nonPlanarMovement > 0x180) {
-        this->nonPlanarMovement -= 0x10;
+    if (this->speed > 0x180) {
+        this->speed -= 0x10;
     }
     if (this->direction < 0xe0) {
         this->direction++;
@@ -519,7 +519,7 @@ void sub_0804723C(Entity* this) {
     this->direction -= 2;
     if (this->direction < 0xc0) {
         this->previousActionFlag = 7;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->direction = 0xc0;
         this->field_0x76.HWORD = 0xc000;
     }
@@ -538,8 +538,8 @@ void sub_08047284(Entity* this) {
 }
 
 void sub_080472BC(Entity* this) {
-    if (this->nonPlanarMovement < 0x300) {
-        this->nonPlanarMovement += 8;
+    if (this->speed < 0x300) {
+        this->speed += 8;
     }
     sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
     if (gRoomControls.roomOriginX + 0x2B0 >= this->x.HALF.HI)
@@ -549,8 +549,8 @@ void sub_080472BC(Entity* this) {
 }
 
 void sub_08047310(Entity* this) {
-    if (this->nonPlanarMovement < 0x180) {
-        this->nonPlanarMovement -= 0x10;
+    if (this->speed < 0x180) {
+        this->speed -= 0x10;
     }
     this->field_0x76.HWORD -= 0x1D0;
     this->direction = this->field_0x76.HWORD >> 8;
@@ -580,7 +580,7 @@ void sub_0804736C(Entity* this) {
 
 void sub_080473B8(Entity* this) {
     this->previousActionFlag = 1;
-    this->nonPlanarMovement = 0x120;
+    this->speed = 0x120;
     this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x200;
     this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x1D0;
     sub_08047D88(this);
@@ -608,7 +608,7 @@ void sub_080473F0(Entity* this) {
     if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, 8)) {
         this->previousActionFlag = 2;
         this->field_0x76.HWORD = this->direction << 8;
-        this->nonPlanarMovement = 0x180;
+        this->speed = 0x180;
     }
 }
 
@@ -625,7 +625,7 @@ void sub_08047484(Entity* this) {
         sub_08047EA4(this, ((0x100 - this->direction) & 0xFF) << 8);
     } else {
         this->previousActionFlag = 3;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->direction = 0x40;
         this->field_0x76.HWORD = 0x4000;
         this->field_0x74.HWORD = 0x180;
@@ -665,7 +665,7 @@ void sub_08047508(Entity* this) {
     sub_08047E48(this);
     if (gRoomControls.roomOriginX + 0x280 < this->x.HALF.HI) {
         this->previousActionFlag = 4;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->animationState = this->direction;
         this->field_0x76.HWORD = this->direction << 8;
     }
@@ -683,7 +683,7 @@ void sub_080475F4(Entity* this) {
     if (this->direction >= 0xc0) {
         this->direction = 0xc0;
         this->previousActionFlag = 5;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->field_0x7c.HALF.HI = 0x3c;
     }
     sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
@@ -720,7 +720,7 @@ void sub_0804763C(Entity* this) {
     sub_08047E48(this);
     if (gRoomControls.roomOriginX + 0x180 > this->x.HALF.HI) {
         this->previousActionFlag = 6;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->animationState = this->direction;
         this->field_0x76.HWORD = this->direction << 8;
     }
@@ -738,7 +738,7 @@ void sub_0804772C(Entity* this) {
     if (this->direction <= 0x40) {
         this->direction = 0x40;
         this->previousActionFlag = 3;
-        this->nonPlanarMovement = 0x200;
+        this->speed = 0x200;
         this->field_0x7c.HALF.HI = 0x1e;
     }
     sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
@@ -753,7 +753,7 @@ void sub_08047778(Entity* this) {
 
 void sub_08047798(Entity* this) {
     this->previousActionFlag = 1;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     if (this->x.HALF.HI - gRoomControls.roomOriginX < 0x1F8) {
         this->field_0x80.HWORD = 0xa8;
     } else {
@@ -767,8 +767,8 @@ void sub_08047798(Entity* this) {
 const s16 gUnk_080D1BF0[2] = { 0x80, -0x80 };
 
 void sub_080477F0(Entity* this) {
-    if (this->nonPlanarMovement < 0x300) {
-        this->nonPlanarMovement += 8;
+    if (this->speed < 0x300) {
+        this->speed += 8;
     }
     this->direction = sub_080045DA(this->field_0x80.HWORD - this->x.HALF.HI, this->field_0x82.HWORD - this->y.HALF.HI);
     sub_08047E48(this);
@@ -876,7 +876,7 @@ void sub_08047978(Entity* this) {
 void sub_08047B08(Entity* this) {
     sub_08047D88(this);
     this->direction = sub_080045DA(this->field_0x80.HWORD - this->x.HALF.HI, this->field_0x82.HWORD - this->y.HALF.HI);
-    this->nonPlanarMovement = 0x200;
+    this->speed = 0x200;
     sub_08047E58(this);
     if (!sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, 4))
         return;
@@ -918,7 +918,7 @@ const s8 gUnk_080D1C00[4] = { 0x40, -0x40, -0x40, 0x40 };
 void sub_08047BF0(Entity* this) {
     Entity* tmp;
     this->direction = gUnk_080D1C00[this->actionDelay & 3];
-    this->nonPlanarMovement = 0x100;
+    this->speed = 0x100;
     sub_08047E48(this);
     if (this->actionDelay == 0) {
         if ((this->field_0xf++ & 0xF) == 0) {
@@ -934,7 +934,7 @@ void sub_08047BF0(Entity* this) {
             }
         }
         this->direction = this->field_0x76.HWORD;
-        this->nonPlanarMovement = 0x140;
+        this->speed = 0x140;
         sub_08047E48(this);
         if (this->y.HALF.HI > gRoomControls.roomOriginY + 0x270) {
             this->previousActionFlag = 2;
@@ -1009,7 +1009,7 @@ void sub_08047DF0(Entity* this, u32 unk1) {
     sub_08047EA4(this, unk1);
     oldX = this->x.HALF.HI;
     oldY = this->y.HALF.HI;
-    sub_0806F62C(this, this->nonPlanarMovement, this->direction);
+    sub_0806F62C(this, this->speed, this->direction);
     if (this->field_0x7c.BYTES.byte0 & 1) {
         if (sub_08079F8C()) {
             gPlayerEntity.x.HALF.HI += this->x.HALF.HI - oldX;
@@ -1027,7 +1027,7 @@ void sub_08047E58(Entity* this) {
     u32 oldX, oldY;
     oldX = this->x.HALF.HI;
     oldY = this->y.HALF.HI;
-    sub_0806F62C(this, this->nonPlanarMovement, this->direction);
+    sub_0806F62C(this, this->speed, this->direction);
     if (this->field_0x7c.BYTES.byte0 & 1) {
         if (sub_08079F8C()) {
             gPlayerEntity.x.HALF.HI += this->x.HALF.HI - oldX;
diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c
index 64a97b39..723050a4 100644
--- a/src/enemy/helmasaur.c
+++ b/src/enemy/helmasaur.c
@@ -176,7 +176,7 @@ void sub_0802BE18(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 4;
         this->actionDelay = 0x1e;
-        this->nonPlanarMovement = 0x300;
+        this->speed = 0x300;
     } else {
         sub_0802C18C(this);
     }
@@ -196,12 +196,12 @@ void sub_0802BE48(Entity* this) {
 }
 
 void sub_0802BE80(Entity* this) {
-    this->nonPlanarMovement -= 0x20;
-    if (0xff < this->nonPlanarMovement) {
+    this->speed -= 0x20;
+    if (0xff < this->speed) {
         sub_0802C1CC(this);
     }
 
-    if (this->nonPlanarMovement > 0) {
+    if (this->speed > 0) {
         sub_080AEFE0(this);
         sub_0802C18C(this);
     } else {
@@ -229,7 +229,7 @@ void sub_0802BEEC(Entity* this) {
     } else if (!sub_08003FC4(this, 0x1c00)) {
         this->action = 8;
         this->actionDelay = 30;
-        this->nonPlanarMovement = 0x120;
+        this->speed = 0x120;
     }
 }
 
@@ -366,7 +366,7 @@ void sub_0802C1CC(Entity* this) {
 
 void sub_0802C218(Entity* this) {
     this->action = 6;
-    this->nonPlanarMovement = 0xe0;
+    this->speed = 0xe0;
     this->field_0x20 = 0x18000;
 }
 
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index 18b4f87e..453315d8 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -102,7 +102,7 @@ void sub_080324FC(Entity* this) {
     this->field_0xf--;
     if (this->field_0xf == 0) {
         this->action = 4;
-        this->nonPlanarMovement = 0x1E0;
+        this->speed = 0x1E0;
         this->field_0x76.HWORD = 0x46;
         this->field_0x78.HWORD = 0;
         *(((u8*)&this->field_0x7a) + 1) = 0;
@@ -197,7 +197,7 @@ u32 sub_0803271C(Entity* this) {
 
 void sub_08032740(Entity* this) {
     this->action = 1;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     InitializeAnimation(this, this->animationState);
     sub_08032650(this);
 }
@@ -205,7 +205,7 @@ void sub_08032740(Entity* this) {
 void sub_0803275C(Entity* this) {
     this->action = 5;
     this->actionDelay = 0x2D;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     InitAnimationForceUpdate(this, this->animationState);
     sub_0803269C(this, this->direction);
     sub_080327E0(this);
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index 5ce12ee5..b40c63ca 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -172,13 +172,13 @@ void Leever_Move(Entity* this) {
         this->field_0x74.HWORD = 1;
     }
 
-    this->nonPlanarMovement = (this->frames.all & 0xf) * 0x20;
+    this->speed = (this->frames.all & 0xf) * 0x20;
     if (this->type == LeeverForm_Red) {
         if ((this->field_0xf++ & 0xf) == 0) {
             sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
         }
     } else {
-        this->nonPlanarMovement += 0x40;
+        this->speed += 0x40;
         if ((this->field_0xf++ & 0x7) == 0) {
             sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
         }
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index cea511b4..9c2d526f 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -115,7 +115,7 @@ void sub_0802999C(Entity* this) {
         this->action = 1;
         this->flags |= 0x80;
         this->direction = DirectionRound(Random());
-        this->nonPlanarMovement = 0xa0;
+        this->speed = 0xa0;
         this->animationState = 0xff;
         this->y.WORD += 6;
         this->parent = this;
@@ -135,7 +135,7 @@ void sub_08029A94(Entity* this) {
 void sub_08029AA4(Entity* this) {
     if (this->field_0x76.HALF.HI != 0) {
         this->action = 3;
-        this->nonPlanarMovement = 0x108;
+        this->speed = 0x108;
         this->damageType = 0x6a;
         this->field_0x7a.HWORD = 0x168;
         this->field_0x74.HALF.HI = 4;
@@ -150,7 +150,7 @@ void sub_08029AE0(Entity* this) {
     sub_0802A098(this);
     if (--this->field_0x7a.HWORD == 0) {
         this->action = 1;
-        this->nonPlanarMovement = 0xa0;
+        this->speed = 0xa0;
         this->field_0x74.HALF.HI = 0;
         sub_08029EEC(this);
         sub_0801D2B4(this, 0x77);
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index d5d7b0e6..24f7e210 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -38,7 +38,7 @@ void nullsub_23(Entity* this) {
 void sub_08045618(Entity* this) {
     this->action = 1;
     this->spriteSettings.b.draw = 1;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     this->field_0x3c = this->field_0x3c | 0x10;
     sub_0804A720(this);
     InitializeAnimation(this, 1);
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 08c94fa7..96e7d615 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -49,7 +49,7 @@ void nullsub_22(void) {
 void sub_080452A4(Entity* this) {
     this->action = 1;
     this->spriteSettings.b.draw = 1;
-    this->nonPlanarMovement = 0x100;
+    this->speed = 0x100;
     sub_0804A720(this);
     InitializeAnimation(this, 6);
     if (this->type2) {
@@ -71,8 +71,8 @@ void sub_080452FC(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 3;
         this->actionDelay = 1;
-        if (0 < this->nonPlanarMovement)
-            this->actionDelay = sub_0806FA04(0x1000, this->nonPlanarMovement) >> 0x8;
+        if (0 < this->speed)
+            this->actionDelay = sub_0806FA04(0x1000, this->speed) >> 0x8;
 
         if (sub_08049FA0(this) == 0 && (Random() & 3)) {
             cVar2 = sub_08049EE4(this);
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index 165bf1eb..07fd3f5a 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -57,14 +57,14 @@ void sub_0801FFDC(Entity* this) {
             this->field_0x82.HALF.LO = 0;
             this->animationState = PeahatAnimation_SlicedPropeller;
             this->action = 5;
-            this->nonPlanarMovement = 0x80;
+            this->speed = 0x80;
             this->hurtBlinkTime = -30;
             this->field_0x80.HALF.HI = 0;
             InitializeAnimation(this, this->animationState);
         } else if (this->bitfield == 0x9b) {
             this->animationState = PeahatAnimation_BrokenPropeller;
             this->action = 5;
-            this->nonPlanarMovement = 0x80;
+            this->speed = 0x80;
             this->hurtBlinkTime = -30;
             this->field_0x80.HALF.HI = 0;
             InitializeAnimation(this, this->animationState);
@@ -72,7 +72,7 @@ void sub_0801FFDC(Entity* this) {
             if (this->animationState == PeahatAnimation_Flying) {
                 this->action = 1;
                 this->actionDelay = 30;
-                this->nonPlanarMovement = 0x80;
+                this->speed = 0x80;
                 this->direction = -1;
                 this->field_0x82.HALF.HI = 0x78;
                 GetNextFrame(this);
@@ -152,7 +152,7 @@ void Peahat_Fly(Entity* this) {
             this->action = 2;
             this->previousActionFlag = Random() & 3;
             this->actionDelay = 60;
-            this->nonPlanarMovement = 160;
+            this->speed = 160;
         }
     }
 
@@ -176,7 +176,7 @@ void Peahat_ChargeStart(Entity* this) {
         } else {
             this->action = 3;
             this->actionDelay = 120;
-            this->nonPlanarMovement = 192;
+            this->speed = 192;
             this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA5D4[Random() & 1]) & 0x1f;
         }
     } else {
@@ -193,7 +193,7 @@ void Peahat_ChargeTarget(Entity* this) {
         }
         if (60 < this->actionDelay) {
             if (this->actionDelay & 1)
-                this->nonPlanarMovement += 4;
+                this->speed += 4;
 
             if ((gScreenTransition.frameCount & 3) == 0)
                 sub_08004596(this, GetFacingDirection(this, gUnk_020000B0));
@@ -209,12 +209,12 @@ void Peahat_ChargeEnd(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 1;
         this->actionDelay = 1;
-        this->nonPlanarMovement = 128;
+        this->speed = 128;
         this->field_0x82.HALF.HI = 120;
         GetNextFrame(this);
     } else {
         if (this->actionDelay & 1)
-            this->nonPlanarMovement -= 8;
+            this->speed -= 8;
 
         sub_080AEFE0(this);
         UpdateAnimationVariableFrames(this, 4);
@@ -329,7 +329,7 @@ void PeahatPropeller_Initialize(Entity* this) {
     this->spriteRendering.b3 = 1;
     this->spriteOrientation.flipY = 1;
     this->spriteSettings.b.shadow = 0;
-    this->nonPlanarMovement = 0x20;
+    this->speed = 0x20;
     this->direction = (Random() & 0x10) + 8;
     InitializeAnimation(this, PeahatAnimation_Propeller);
 }
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index c3e67cc8..a8d24fa2 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -84,7 +84,7 @@ void sub_08023FF0(Entity* this) {
         this->flags |= 0x80;
         this->damageType = 0x77;
         this->actionDelay = 1;
-        this->nonPlanarMovement = 0x40;
+        this->speed = 0x40;
     } else {
         gUnk_080CBEF8[this->previousActionFlag](this);
     }
@@ -184,7 +184,7 @@ void sub_080241C0(Entity* this) {
             if (PlayerInRange(this, 3, (gPlayerState.hurtBlinkSpeed != 0) ? 0xa0 : 0x40) && sub_08049FDC(this, 3) &&
                 gPlayerEntity.action != 0x1e) {
                 this->field_0x80.HALF.LO++;
-                this->nonPlanarMovement = 0;
+                this->speed = 0;
                 sub_08024A14(this, 3, 10);
             } else if (--this->field_0xf == 0) {
                 sub_08024A14(this, 0, 0x20);
@@ -223,8 +223,8 @@ void sub_080242A0(Entity* this) {
         if (--this->actionDelay == 0) {
             this->direction = GetFacingDirection(this, gUnk_020000B0);
             sub_08024E00(this, 1);
-            if (this->nonPlanarMovement != 0) {
-                this->nonPlanarMovement = 0;
+            if (this->speed != 0) {
+                this->speed = 0;
             } else {
                 sub_08024E1C(this);
             }
@@ -236,7 +236,7 @@ void sub_080242A0(Entity* this) {
             this->action = 4;
             this->field_0x80.HALF.LO = 0;
             this->actionDelay = 0x10;
-            this->nonPlanarMovement = 0;
+            this->speed = 0;
         }
     }
 }
@@ -247,7 +247,7 @@ void sub_0802433C(Entity* this) {
         case 0:
             if (--this->actionDelay == 0) {
                 this->field_0x80.HALF.LO++;
-                this->nonPlanarMovement = 0x100;
+                this->speed = 0x100;
                 this->field_0xf = 8;
                 sub_08024E00(this, 1);
             }
@@ -256,7 +256,7 @@ void sub_0802433C(Entity* this) {
             if (--this->actionDelay == 0) {
                 this->action = 5;
                 this->field_0x80.HALF.LO = 0;
-                this->nonPlanarMovement = 0x140;
+                this->speed = 0x140;
                 this->actionDelay = 0xc0;
                 this->field_0xf = 8;
             } else {
@@ -275,12 +275,12 @@ void sub_080243B8(Entity* this) {
                 if (this->attachedEntity == NULL || this->attachedEntity->next == NULL) {
                     this->field_0x80.HALF.LO = 2;
                     this->actionDelay = 0x20;
-                    this->nonPlanarMovement = 0x80;
+                    this->speed = 0x80;
                     this->field_0x82.HALF.HI = 0x80;
                 } else if (sub_08049F1C(this, gUnk_020000B0, 0xe)) {
                     this->field_0x80.HALF.LO++;
                     this->actionDelay = 0x1e;
-                    this->nonPlanarMovement = 0x100;
+                    this->speed = 0x100;
                     this->field_0x82.HALF.HI = 0x80;
                     this->attachedEntity->action = 2;
                 } else if (--this->actionDelay) {
@@ -298,14 +298,14 @@ void sub_080243B8(Entity* this) {
             if (--this->actionDelay == 0) {
                 this->field_0x80.HALF.LO++;
                 this->actionDelay = 0x20;
-                this->nonPlanarMovement = 0x80;
+                this->speed = 0x80;
             }
             break;
         case 2:
             if (--this->actionDelay == 0) {
                 this->action = 6;
                 this->field_0x80.HALF.LO = 0;
-                this->nonPlanarMovement = 0x80;
+                this->speed = 0x80;
                 sub_08024B38(this);
 
                 if ((this->field_0x82.HALF.HI & 0x40) == 0) {
@@ -339,7 +339,7 @@ void sub_080244E8(Entity* this) {
                     this->field_0x80.HALF.LO += 1;
                     this->field_0x82.HALF.LO += 1;
                     this->field_0xf = 0;
-                    this->nonPlanarMovement = 0;
+                    this->speed = 0;
                 } else {
                     this->actionDelay = 0x30;
                     this->field_0xf = 4;
@@ -368,8 +368,8 @@ void sub_080244E8(Entity* this) {
                 u32 tmp;
 
                 if (--this->actionDelay == 0) {
-                    if (this->nonPlanarMovement) {
-                        this->nonPlanarMovement = 0;
+                    if (this->speed) {
+                        this->speed = 0;
                     } else {
                         sub_08024E1C(this);
                     }
@@ -387,7 +387,7 @@ void sub_080244E8(Entity* this) {
                             this->field_0x80.HALF.LO++;
                             this->actionDelay = 0xc;
                             this->direction = 0x10;
-                            this->nonPlanarMovement = tmp;
+                            this->speed = tmp;
                             this->cutsceneBeh.HALF.LO = 0;
                             this->flags2 &= 0xfc;
                             sub_080249DC(this);
@@ -453,7 +453,7 @@ void sub_080244E8(Entity* this) {
             if (--this->actionDelay == 0) {
                 this->field_0x80.HALF.LO++;
                 this->field_0xf = 0;
-                this->nonPlanarMovement = 0;
+                this->speed = 0;
                 this->field_0x82.HALF.LO++;
             }
             break;
@@ -482,7 +482,7 @@ void sub_080244E8(Entity* this) {
                         this->field_0x80.HALF.LO += 1;
                         this->actionDelay = 0xc0;
                         this->field_0xf = 8;
-                        this->nonPlanarMovement = 0x80;
+                        this->speed = 0x80;
                         sub_080249DC(this);
                         break;
                     default:
@@ -496,7 +496,7 @@ void sub_080244E8(Entity* this) {
                 if (this->field_0x82.HALF.HI & 0x80) {
                     this->field_0x82.HALF.HI = 0xc0;
                     this->field_0x80.HALF.LO = 0;
-                    this->nonPlanarMovement = 0x40;
+                    this->speed = 0x40;
                     this->actionDelay = 0x40;
                     this->field_0xf = 8;
                     sub_08024A14(this, 0, 8);
@@ -511,7 +511,7 @@ void sub_080244E8(Entity* this) {
         case 7:
             if (gPlayerEntity.height.HALF.HI == 0) {
                 this->field_0x80.HALF.LO = 0;
-                this->nonPlanarMovement = 0x80;
+                this->speed = 0x80;
                 sub_08024B38(this);
             }
     }
@@ -709,7 +709,7 @@ bool32 sub_08024C48(Entity* this, bool32 unk) {
 
 void sub_08024C7C(Entity* this) {
     this->action = 1;
-    this->nonPlanarMovement = 0x40;
+    this->speed = 0x40;
     this->actionDelay = 0;
     sub_08024A14(this, 0, 0x20);
 }
@@ -719,7 +719,7 @@ void sub_08024C94(Entity* this) {
     this->field_0x80.HALF.LO = 0;
     this->actionDelay = 0x40;
     this->field_0xf = 0;
-    this->nonPlanarMovement = 0xc0;
+    this->speed = 0xc0;
     this->field_0x82.HALF.HI = 0x80;
     sub_08024A14(this, 3, this->field_0xf);
 }
@@ -785,7 +785,7 @@ void sub_08024E00(Entity* this, u32 unk) {
 }
 
 void sub_08024E1C(Entity* this) {
-    this->nonPlanarMovement = gUnk_080CBF18[sub_08024E34()];
+    this->speed = gUnk_080CBF18[sub_08024E34()];
 }
 
 u32 sub_08024E34(void) {
@@ -809,7 +809,7 @@ void sub_08024E4C(Entity* this) {
             this->field_0x86.HALF.HI = 0;
             sub_08024F50(this);
             this->field_0x80.HALF.LO = 0;
-            this->nonPlanarMovement = 0x40;
+            this->speed = 0x40;
             this->actionDelay = 0x40;
             this->field_0xf = 8;
             sub_08024A14(this, 0, 8);
@@ -851,7 +851,7 @@ void sub_08024F50(Entity* this) {
     gPlayerEntity.flags |= 0x80;
     gPlayerEntity.hurtBlinkTime = -0x3c;
     gPlayerEntity.direction = gPlayerEntity.animationState << 2;
-    gPlayerEntity.nonPlanarMovement = 0;
+    gPlayerEntity.speed = 0;
     gPlayerEntity.spritePriority.b1 = this->cutsceneBeh.HALF.HI;
     gPlayerEntity.height.HALF.HI = gPlayerEntity.spriteOffsetY;
     gPlayerEntity.spriteOffsetY = 0;
@@ -859,7 +859,7 @@ void sub_08024F50(Entity* this) {
     this->field_0x82.HALF.HI = 0xc0;
     this->field_0x80.HALF.LO += 2;
     this->cutsceneBeh.HALF.LO = 0;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
 }
 
 // clang-format off
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index 7ef108b4..263b5625 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -101,7 +101,7 @@ void sub_080207A8(Entity* this) {
     this->field_0x3a &= 0xfb;
     this->direction ^= 0x10;
     this->field_0x20 = 0x18000;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     InitializeAnimation(this, this->animationState + 0x10);
 }
 
@@ -194,7 +194,7 @@ void Rollobite_Unroll(Entity* this) {
     GetNextFrame(this);
     if (this->frames.all & 0x80) {
         this->flags |= 0x80;
-        this->nonPlanarMovement = 0x100;
+        this->speed = 0x100;
         this->damageType = 34;
         sub_08020A30(this);
         this->direction = DirectionFromAnimationState(this->animationState);
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index e76f8ec1..d1d73723 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -60,7 +60,7 @@ void sub_08031434(Entity* this) {
     sub_0804A720(this);
     this->animationState = 0xff;
     this->field_0x1c = 1;
-    this->field_0x7a.HWORD = this->nonPlanarMovement;
+    this->field_0x7a.HWORD = this->speed;
     if (!(this->type)) {
         sub_08031600(this);
     } else {
@@ -112,7 +112,7 @@ void sub_080314FC(Entity* this) {
                     if (u != 0xff) {
                         this->action = 3;
                         this->actionDelay = 0x1e;
-                        this->field_0x7a.HWORD = this->nonPlanarMovement = 0x1a0;
+                        this->field_0x7a.HWORD = this->speed = 0x1a0;
                         this->direction = u;
                         this->animationState = this->direction >> 3;
                         InitializeAnimation(this, this->animationState + 4);
@@ -157,7 +157,7 @@ void sub_08031600(Entity* this) {
     u32 r;
     this->action = 2;
     this->actionDelay = (Random() & 0x30) + 0x3c;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     this->field_0x7a.HWORD = 0x80;
     r = Random() & 0x18;
     this->direction = r;
@@ -175,6 +175,6 @@ u32 sub_0803163C(Entity* this) {
     } else {
         h = this->field_0x7a.HWORD;
     }
-    this->nonPlanarMovement = h;
+    this->speed = h;
     return ProcessMovement(this);
 }
diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c
index b36b9635..606e2c9f 100644
--- a/src/enemy/ropeGolden.c
+++ b/src/enemy/ropeGolden.c
@@ -88,7 +88,7 @@ void sub_080383AC(Entity* this) {
     u32 v;
     this->action = 1;
     this->actionDelay = 0x8;
-    this->nonPlanarMovement = 0x100;
+    this->speed = 0x100;
     this->direction = DirectionRoundUp(GetFacingDirection(this, &gPlayerEntity));
     v = this->direction >> 3;
     if (v != this->animationState) {
@@ -101,7 +101,7 @@ void sub_080383E4(Entity* this) {
     u32 v;
     this->action = 2;
     this->actionDelay = 0x8;
-    this->nonPlanarMovement = 0x280;
+    this->speed = 0x280;
     v = DirectionRoundUp(GetFacingDirection(this, &gPlayerEntity));
     this->direction = v;
     this->field_0x78.HALF.LO = v;
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index 74775cab..64584892 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -239,7 +239,7 @@ void sub_080296D8(Entity* this) {
     gPlayerEntity.direction = gPlayerEntity.animationState << 2;
     gPlayerEntity.spritePriority.b1 = this->field_0x80.HALF.LO;
     gPlayerEntity.spriteOffsetY = 0;
-    gPlayerEntity.nonPlanarMovement = 0x140;
+    gPlayerEntity.speed = 0x140;
     this->action = 5;
     this->field_0xf = 0x3c;
     this->flags2 |= 3;
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c
index d1bfd125..0aae18f1 100644
--- a/src/enemy/sensorBladeTrap.c
+++ b/src/enemy/sensorBladeTrap.c
@@ -35,7 +35,7 @@ void sub_0802BA18(Entity* this) {
         return;
 
     this->action = 2;
-    this->nonPlanarMovement = this->field_0x78.HWORD;
+    this->speed = this->field_0x78.HWORD;
     this->direction = direction;
 
     switch (direction >> 3) {
@@ -87,7 +87,7 @@ void sub_0802BAFC(Entity* this) {
 
 void sub_0802BB10(Entity* this) {
     this->action = 3;
-    this->nonPlanarMovement = 0xc0;
+    this->speed = 0xc0;
     this->direction = this->direction ^ 0x10;
     EnqueueSFX(0x74);
 }
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 13782f7a..9609232d 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -58,7 +58,7 @@ void nullsub_171() {
 void sub_08044FC8(Entity* this) {
     this->action = 1;
     this->spriteSettings.b.draw = 1;
-    this->nonPlanarMovement = 128;
+    this->speed = 128;
     sub_0804A720(this);
     InitializeAnimation(this, 0);
     sub_08044FF8(this);
@@ -75,8 +75,8 @@ void sub_08045018(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 3;
         this->actionDelay = 1;
-        if (0 < this->nonPlanarMovement) {
-            this->actionDelay = sub_0806FA04(4096, this->nonPlanarMovement) >> 8;
+        if (0 < this->speed) {
+            this->actionDelay = sub_0806FA04(4096, this->speed) >> 8;
         }
         if (sub_08049FA0(this) == 0 && (Random() & 3)) {
             this->direction = (sub_08049EE4(this) + 0xfc + (Random() & 8)) & 24;
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index a3aebc73..7b6dbbfd 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -44,7 +44,7 @@ void sub_0803169C(Entity* this) {
         this->action = 1;
         this->previousActionFlag = 0;
         this->flags = this->flags | 0x80;
-        this->nonPlanarMovement = 0x40;
+        this->speed = 0x40;
         this->field_0xf = 1;
     } else {
         gUnk_080CE554[this->previousActionFlag](this);
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index 24009c34..68e0fef5 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -58,7 +58,7 @@ void sub_08028284(Entity* this) {
 
     this->attachedEntity->hurtBlinkTime = this->hurtBlinkTime;
     if (this->currentHealth == 0) {
-        this->nonPlanarMovement = 0;
+        this->speed = 0;
         this->field_0x82.HALF.LO = 0;
         sub_080287E0(this);
         DeleteEntity(this->attachedEntity);
@@ -86,7 +86,7 @@ void sub_08028314(Entity* this) {
     if (this->actionDelay) {
         this->animationState = this->type2 << 1;
         this->actionDelay = 0x1e;
-        this->nonPlanarMovement = 0x80;
+        this->speed = 0x80;
         this->direction = this->animationState << 2;
         sub_080287E0(this);
     } else {
@@ -164,13 +164,13 @@ void sub_08028488(Entity* this) {
         switch (this->field_0x82.HALF.LO) {
             case 3:
                 this->action = 4;
-                this->nonPlanarMovement = 0x180;
+                this->speed = 0x180;
                 this->direction = sub_08049F84(this, 1);
                 EnqueueSFX(0x11e);
                 break;
             case 2:
                 this->action = 2;
-                this->nonPlanarMovement = 0;
+                this->speed = 0;
                 this->actionDelay = (Random() & 7) * 3 + 0x40;
                 break;
             case 4:
@@ -180,7 +180,7 @@ void sub_08028488(Entity* this) {
             default:
                 this->action = 1;
                 this->field_0x82.HALF.LO = 1;
-                this->nonPlanarMovement = 0x80;
+                this->speed = 0x80;
                 this->actionDelay = (Random() & 7) * 3 + 0x22;
                 break;
         }
@@ -245,7 +245,7 @@ void sub_08028604(Entity* this) {
     this->field_0xf = 0;
     if (this->field_0x82.HALF.LO == 1) {
         this->actionDelay = gUnk_080CC7BC[Random() & 3];
-        this->nonPlanarMovement = 0x80;
+        this->speed = 0x80;
         if (sub_08049FA0(this) != 0) {
             this->direction = gUnk_080CC7D0[Random() & 7] + 0x18 + this->direction & 0x18;
         } else {
@@ -262,7 +262,7 @@ void sub_08028604(Entity* this) {
         }
     } else {
         this->actionDelay = 0xc;
-        this->nonPlanarMovement = 0;
+        this->speed = 0;
     }
 
     if (this->direction >> 2 != this->animationState) {
@@ -324,7 +324,7 @@ void sub_080287B4(Entity* this) {
     this->field_0xf = 0;
     this->field_0x80.HALF.LO = 0;
     this->field_0x7a.HALF.HI = 0;
-    this->nonPlanarMovement = 0;
+    this->speed = 0;
     this->field_0x82.HALF.LO = 0;
     sub_080287E0(this);
 }
@@ -371,7 +371,7 @@ void sub_08028858(Entity* this) {
     this->hitbox->height = box->height;
 
     if (this->field_0x82.HALF.LO == 0) {
-        this->nonPlanarMovement = 0;
+        this->speed = 0;
     }
 
     ProcessMovement(this);
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index e1c32ce0..503084e7 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -49,7 +49,7 @@ void sub_0802B628(Entity* this) {
             if (this->action < 6) {
                 this->action = 6;
                 this->field_0x20 = 0x18000;
-                this->nonPlanarMovement = 0xc0;
+                this->speed = 0xc0;
                 this->direction = this->field_0x3e;
                 this->field_0x42 = 0;
                 this->hurtBlinkTime = -8;
@@ -99,7 +99,7 @@ void sub_0802B7A4(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 1;
         this->actionDelay = gUnk_080CD314[Random() & 3];
-        this->nonPlanarMovement = 0x60;
+        this->speed = 0x60;
         sub_0802B960(this);
         if (this->direction != 0xff) {
             u32 animation = this->direction >> 3;
@@ -116,7 +116,7 @@ void sub_0802B7FC(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 4;
         this->actionDelay = 0x78;
-        this->nonPlanarMovement = 0x1c0;
+        this->speed = 0x1c0;
     }
 }
 
@@ -166,7 +166,7 @@ void sub_0802B8E0(Entity* this) {
     } else {
         this->action = 8;
         this->field_0x20 = 0x10000;
-        this->nonPlanarMovement = 0x60;
+        this->speed = 0x60;
         this->damageType = 99;
         InitializeAnimation(this, this->animationState);
         EnqueueSFX(299);
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 873962c9..7bf39713 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -158,7 +158,7 @@ void sub_080226EC(Entity* this) {
         if (sub_080228F0(this)) {
             this->action = 6;
             this->field_0x20 = 0x12000;
-            this->nonPlanarMovement = 0x140;
+            this->speed = 0x140;
             this->direction = GetFacingDirection(this, gUnk_020000B0);
             this->damageType = 0x5a;
             InitializeAnimation(this, 4);
@@ -209,7 +209,7 @@ void sub_0802281C(Entity* this) {
     GetNextFrame(this);
     if (this->frames.all & 0x80) {
         this->action = 2;
-        this->nonPlanarMovement = 0x20;
+        this->speed = 0x20;
         InitializeAnimation(this, 0);
         sub_0804AA1C(this);
     }
@@ -232,7 +232,7 @@ void sub_0802289C(Entity* this) {
     GetNextFrame(this);
     if (this->frames.all & 0x80) {
         this->action = 2;
-        this->nonPlanarMovement = 0x20;
+        this->speed = 0x20;
         this->field_0x80.HALF.HI = 0x78;
         InitializeAnimation(this, 0);
     }
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index 02bf4e39..bdccd10e 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -155,7 +155,7 @@ void sub_08044868(Entity* this) {
                         if (this->frames.all & 0x80) {
                             this->field_0x74.HALF.LO = 1;
                             this->direction = sub_080045B4(this, vaati->x.HALF.HI, vaati->y.HALF.HI - 0x10);
-                            this->nonPlanarMovement = 0x180;
+                            this->speed = 0x180;
                         }
                         break;
                     case 1:
@@ -230,7 +230,7 @@ void sub_080449F8(Entity* this) {
 
             if (this->field_0x78.HALF.LO == 0) {
                 this->field_0x78.HALF.LO++;
-                this->nonPlanarMovement = 640;
+                this->speed = 640;
             }
 
             this->actionDelay = 4;
@@ -321,7 +321,7 @@ void sub_08044B04(Entity* this) {
                                 this->field_0xf = 32;
                             }
 
-                            this->nonPlanarMovement = this->field_0x78.HALF.LO ? 640 : 1280;
+                            this->speed = this->field_0x78.HALF.LO ? 640 : 1280;
                         }
                     }
                     break;
@@ -331,7 +331,7 @@ void sub_08044B04(Entity* this) {
                         this->direction = (this->direction + 1) & 0x1f;
                         if (++this->field_0xf == 0x30) {
                             u32 direction = sub_080045B4(this, vaati->x.HALF.HI, vaati->y.HALF.HI - 0x10);
-                            this->nonPlanarMovement = 0;
+                            this->speed = 0;
                             this->direction = (direction + 16) & 0x1f;
                             this->actionDelay = 16;
                             this->field_0xf = 16;
@@ -343,32 +343,32 @@ void sub_08044B04(Entity* this) {
                     if (this->field_0xf == 0) {
                         switch (--this->actionDelay) {
                             case 12:
-                                this->nonPlanarMovement = 1280;
+                                this->speed = 1280;
                                 break;
                             case 0:
                                 this->field_0x74.HALF.LO++;
                                 this->direction = sub_080045B4(this, vaati->x.HALF.HI, vaati->y.HALF.HI - 0x10);
-                                this->nonPlanarMovement = 0;
+                                this->speed = 0;
                                 this->actionDelay = 4;
                                 this->field_0xf = 16;
                                 break;
                             case 4:
-                                this->nonPlanarMovement = 640;
+                                this->speed = 640;
                                 break;
                         }
                     } else {
                         if (--this->field_0xf == 0)
-                            this->nonPlanarMovement = 640;
+                            this->speed = 640;
                     }
                     break;
                 case 3:
                     if (this->field_0xf) {
                         if (--this->field_0xf == 0)
-                            this->nonPlanarMovement = 640;
+                            this->speed = 640;
                     } else {
                         if (this->actionDelay) {
                             if (--this->actionDelay == 0) {
-                                this->nonPlanarMovement = 1280;
+                                this->speed = 1280;
                                 SoundReq(0x14f);
                             }
                         }
@@ -450,7 +450,7 @@ void sub_08044DEC(Entity* this) {
     }
     this->flags &= 0x7f;
     this->field_0x78.HALF.LO = 0;
-    this->nonPlanarMovement = 0x300;
+    this->speed = 0x300;
     off = this->parent->field_0x80.HALF.LO - 1;
     this->direction = gUnk_080D1628[off][this->field_0x78.HALF.HI];
     PositionRelative(this->parent, this, 0, -0x100000);
@@ -466,11 +466,11 @@ void sub_08044E74(Entity* this, u32 state) {
             this->direction += 0x18;
             this->direction &= 0x1f;
             PositionRelative(this->parent, this, 0, -0x100000);
-            this->nonPlanarMovement = 12288;
+            this->speed = 12288;
             sub_0806F69C(this);
             this->direction += 0x8;
             this->direction &= 0x1f;
-            this->nonPlanarMovement = 1280;
+            this->speed = 1280;
             sub_0806F69C(this);
             break;
         case 1:
@@ -499,5 +499,5 @@ void sub_08044E74(Entity* this, u32 state) {
     }
     this->actionDelay = 1;
     this->field_0x78.HALF.LO = 0;
-    this->nonPlanarMovement = 1280;
+    this->speed = 1280;
 }
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index a788ad58..d0e5b1a3 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -83,7 +83,7 @@ void sub_0802CD54(Entity* this) {
             this->action = 2;
             tmp = Random() >> 0x10;
             this->actionDelay = tmp;
-            this->nonPlanarMovement = 0xc0;
+            this->speed = 0xc0;
             this->field_0x78.HWORD = gUnk_080CD728[Random() & 3];
             this->field_0x7a.HALF.HI = (tmp >> 8) & 0x60;
             return;
@@ -107,7 +107,7 @@ void sub_0802CDE8(Entity* this) {
     } else {
         this->action = 1;
         this->actionDelay = 60;
-        this->nonPlanarMovement = 0x60;
+        this->speed = 0x60;
         this->field_0x7c.HALF.LO = (Random() & 0x38) + 0x96;
     }
     GetNextFrame(this);
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index 87b80940..320fc03d 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -22,7 +22,7 @@ void sub_0802A250(Entity* this) {
     this->action = 1;
     this->actionDelay = 0;
     this->field_0x20 = -0x30000;
-    this->nonPlanarMovement = gUnk_080CD03C[Random() & 3];
+    this->speed = gUnk_080CD03C[Random() & 3];
     this->direction = gUnk_080CD040[Random() & 3] + 0x18;
     this->collisionLayer = 2;
     InitializeAnimation(this, 0);
diff --git a/src/game.c b/src/game.c
index db28c2ab..08d0198a 100644
--- a/src/game.c
+++ b/src/game.c
@@ -258,7 +258,7 @@ void InitializePlayer(void) {
             gPlayerState.field_0x34[4] = 0x10;
             pl->direction = gScreenTransition.playerState << 2;
         case 0x3:
-            pl->nonPlanarMovement = 0xe0;
+            pl->speed = 0xe0;
             break;
         case 0x7:
         case 0x8:
diff --git a/src/item11.c b/src/item11.c
index 5821d0b5..984d02e0 100644
--- a/src/item11.c
+++ b/src/item11.c
@@ -32,7 +32,7 @@ void sub_08018CBC(Entity* this) {
     *(u32*)&this->field_0x80 = this->y.WORD = gPlayerEntity.y.WORD;
     uVar2 = this->animationState = gPlayerEntity.animationState & 0xe;
     this->direction = (u8)(uVar2 << 2);
-    this->nonPlanarMovement = 0x400;
+    this->speed = 0x400;
     this->damageType = 0x96;
     this->field_0x3c = (gPlayerEntity.field_0x3c + 1) | 0x80;
     this->flags2 = gPlayerEntity.flags2;
diff --git a/src/item14.c b/src/item14.c
index 7ca56f53..d9537b8b 100644
--- a/src/item14.c
+++ b/src/item14.c
@@ -19,7 +19,7 @@ void sub_0805FBE8(Entity* this) {
     this->spriteSettings.b.draw = TRUE;
     this->field_0x3c = gPlayerEntity.field_0x3c + 1;
     this->hitbox = &gUnk_08109AD0;
-    this->nonPlanarMovement = 0x380;
+    this->speed = 0x380;
     this->animationState = this->animationState & 0x7f;
     if (this->collisionLayer == 2) {
         this->type2 = 1;
diff --git a/src/npc/cow.c b/src/npc/cow.c
index aeb62982..d5e7988d 100644
--- a/src/npc/cow.c
+++ b/src/npc/cow.c
@@ -29,7 +29,7 @@ void sub_08068FC0(Entity* ent) {
 
     ent->action = 1;
     ent->animationState = ent->type2;
-    ent->nonPlanarMovement = 0x40;
+    ent->speed = 0x40;
 
     ent->field_0x6c.HALF.HI = 0xFF;
 
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 2701efd1..0accf073 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -51,7 +51,7 @@ void sub_08060428(Entity* this) {
     void* data;
 
     this->actionDelay = 0x5a;
-    this->nonPlanarMovement = 0x180;
+    this->speed = 0x180;
     if (this->type2 != 0) {
         data = GetCurrentRoomProperty(this->type2);
     } else {
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 0785d87a..e50ef501 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -241,7 +241,7 @@ void sub_0806AF78(Entity* this, ScriptExecutionContext* context) {
 
 void sub_0806AFA0(Entity* this) {
     if (sub_0806ED78(this)) {
-        sub_0806F62C(this, -this->nonPlanarMovement, this->direction);
+        sub_0806F62C(this, -this->speed, this->direction);
     }
 }
 
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index cad4e29b..d8b70298 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -208,7 +208,7 @@ void sub_08061E90(Entity* this, Entity* arg1) {
         }
         this->direction = (u8)animIndex;
         this->animationState = sub_0806F5B0(animIndex);
-        this->nonPlanarMovement = gUnk_0810B74A[this->type];
+        this->speed = gUnk_0810B74A[this->type];
     }
     animIndex = (this->animationState >> 1) + 4;
     if (animIndex != this->animIndex) {
diff --git a/src/object/backgroundCloud.c b/src/object/backgroundCloud.c
index ceebf3d7..df2625a3 100644
--- a/src/object/backgroundCloud.c
+++ b/src/object/backgroundCloud.c
@@ -18,7 +18,7 @@ void sub_0808F658(Entity* this) {
     this->spritePriority.b0 = this->type;
     this->frameIndex = this->type;
     this->direction = 8;
-    this->nonPlanarMovement = gUnk_08121EB0[this->type];
+    this->speed = gUnk_08121EB0[this->type];
     this->field_0x78.HWORD = gRoomControls.roomOriginX - 0x60;
     this->field_0x7a.HWORD = gRoomControls.roomOriginX + gRoomControls.width + 0x60;
     this->animationState = 0;
diff --git a/src/object/bird.c b/src/object/bird.c
index 2b6f194b..6d126380 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -28,7 +28,7 @@ void sub_0809CF54(Entity* this) {
     this->field_0x20 = -0x18000;
     this->height.WORD = -0x38C000;
     this->field_0x68.HWORD = -0x800;
-    this->nonPlanarMovement = 0x280;
+    this->speed = 0x280;
     this->direction = 8;
     this->collisionLayer = 2;
     this->x.HALF.HI = gRoomControls.roomScrollX;
diff --git a/src/object/cloud.c b/src/object/cloud.c
index a2637b6b..6f10295a 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -180,7 +180,7 @@ void sub_0809F7BC(Entity* this) {
         cloud = sub_0809F770(this);
         if (cloud != NULL) {
             uVar1 = Random();
-            cloud->nonPlanarMovement = gUnk_081247C8[uVar1 & 3];
+            cloud->speed = gUnk_081247C8[uVar1 & 3];
             cloud->direction = (u8)(uVar1 >> 8) & 31;
         }
     }
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c
index 51403761..2b4914e1 100644
--- a/src/object/fileScreenObjects.c
+++ b/src/object/fileScreenObjects.c
@@ -506,7 +506,7 @@ static u32 sub_0808EF6C(Entity* this) {
     if (this->field_0x6c.HWORD < var7) {
         var7 = this->field_0x6c.HWORD;
     }
-    this->nonPlanarMovement = var7;
+    this->speed = var7;
     this->direction = sub_080045DA(var0, var2) >> 3;
     sub_0806F69C(this);
     return 1;
@@ -517,7 +517,7 @@ static void sub_0808EFF0(Entity* this) {
     u8 var1;
 
     this->spriteSettings.b.draw = 2;
-    this->nonPlanarMovement = 0x400;
+    this->speed = 0x400;
     this->currentHealth = 1;
     this->frameIndex = 0xFF;
     this->animIndex = 0xFF;
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 0ab2d710..3d511b25 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -159,21 +159,21 @@ void GreatFairy_WingsInit(Entity* this) {
     this->spriteRendering.alphaBlend = 1;
     gScreen.controls.layerFXControl = 0xF40;
     gScreen.controls.alphaBlend = BLDALPHA_BLEND(9, 8);
-    this->nonPlanarMovement = 1024;
+    this->speed = 1024;
     sub_0805EC9C(this, 1024, 256, 0);
 }
 
 void GreatFairy_WingsUpdate(Entity* this) {
     s32 iVar1;
 
-    iVar1 = this->nonPlanarMovement -= 32;
+    iVar1 = this->speed -= 32;
     if (iVar1 * 65536 >> 16 == 256) {
         this->action = 2;
         sub_0805EC60(this);
         gRoomVars.greatFairyState |= 32;
         gActiveScriptInfo.unk_00 |= 4;
     } else {
-        sub_0805EC9C(this, this->nonPlanarMovement, 256, 0);
+        sub_0805EC9C(this, this->speed, 256, 0);
     }
 }
 
@@ -260,7 +260,7 @@ void GreatFairy_MiniAffineInit2(Entity* this) {
     if (this->height.HALF.HI == -20) {
         this->action = 2;
         this->actionDelay = 90;
-        this->nonPlanarMovement = 4096;
+        this->speed = 4096;
         this->spriteRendering.b0 = 3;
         sub_0805EC9C(this, 256, 256, 0);
     }
@@ -275,7 +275,7 @@ void GreatFairy_MiniAffineUpdate(Entity* this) {
         this->action = 3;
         sub_0805EC60(this);
     } else {
-        iVar2 = this->nonPlanarMovement -= 24;
+        iVar2 = this->speed -= 24;
         sub_0805EC9C(this, 256, iVar2 * 0x10000 >> 20, 0);
     }
 }
@@ -386,7 +386,7 @@ void sub_08087150(Entity* this) {
     this->spriteOrientation.flipY = 0;
     this->spriteRendering.b0 = 0;
     this->spritePriority.b0 = 3;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     this->direction = 0x10;
     temp = gUnk_0812079C;
     this->palette.raw = ((temp & 0xf) << 4) | 0xf;
@@ -463,7 +463,7 @@ void sub_080872AC(Entity* this) {
     this->field_0x68.HWORD = this->x.HALF.HI;
     this->field_0x6a.HWORD = this->y.HALF.HI;
     this->direction = (u8)Random() & 0x1F;
-    this->nonPlanarMovement = 32;
+    this->speed = 32;
     GreatFairy_InitializeAnimation(this);
 }
 
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 409c1d04..b794b546 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -141,8 +141,8 @@ static void sub_080810A8(Entity* this) {
     sub_080814A4(this);
     if (this->direction & 0x80) {
         this->direction &= 0x1F;
-        if (this->nonPlanarMovement == 0) {
-            this->nonPlanarMovement = 0x100;
+        if (this->speed == 0) {
+            this->speed = 0x100;
         }
     } else {
         this->direction |= 0xFF;
@@ -259,7 +259,7 @@ void sub_080812A0(Entity* this) {
 void sub_080812A8(Entity* this) {
     if (sub_080002D0(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
         this->direction = 0;
-        this->nonPlanarMovement = 0;
+        this->speed = 0;
         this->spriteSettings.b.draw = 1;
         this->field_0x68.HALF.HI = 0;
         sub_080810A8(this);
diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c
index 55c8b261..88ab3308 100644
--- a/src/object/metalDoor.c
+++ b/src/object/metalDoor.c
@@ -25,7 +25,7 @@ void sub_080A0684(Entity* this) {
         DeleteThisEntity();
     }
     this->action = 1;
-    this->nonPlanarMovement = 0x300;
+    this->speed = 0x300;
     this->spriteSettings.b.draw = 0;
     this->frameIndex = 0;
     this->spriteSettings.b.flipY = 1;
diff --git a/src/object/minecart.c b/src/object/minecart.c
index 53d1ff82..1e239be3 100644
--- a/src/object/minecart.c
+++ b/src/object/minecart.c
@@ -51,7 +51,7 @@ void sub_080916EC(Entity* this) {
     this->field_0x40 = 0x44;
     this->flags2 = 0x80;
     this->direction = DirectionFromAnimationState(this->animationState);
-    this->nonPlanarMovement = 0x700;
+    this->speed = 0x700;
     this->spritePriority.b1 = 3;
     InitAnimationForceUpdate(this, this->type2 + 4 + this->animationState);
     SetTile(0x4022, COORD_TO_TILE(this), this->collisionLayer);
@@ -81,7 +81,7 @@ void sub_080917DC(Entity* this) {
                 gPlayerState.jumpStatus = 0x81;
                 gPlayerState.flags.all |= 0x4000000;
                 gPlayerEntity.field_0x20 = 0x20000;
-                gPlayerEntity.nonPlanarMovement = 0x100;
+                gPlayerEntity.speed = 0x100;
                 gPlayerEntity.flags &= 0x7f;
                 ResetPlayer();
                 sub_0807A108();
@@ -143,7 +143,7 @@ void sub_080919AC(Entity* this) {
         }
     } else {
         this->flags = this->flags | 0x80;
-        gPlayerEntity.nonPlanarMovement = 0;
+        gPlayerEntity.speed = 0;
         sub_0806F69C(this);
         CopyPosition(this, &gPlayerEntity);
         gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1;
@@ -176,7 +176,7 @@ void sub_080919AC(Entity* this) {
                         gPlayerState.jumpStatus = 0x41;
                         gPlayerState.flags.all = (gPlayerState.flags.all ^ 0x1000) | 0x4000000;
                         gPlayerEntity.field_0x20 = 0x20000;
-                        gPlayerEntity.nonPlanarMovement = 0x200;
+                        gPlayerEntity.speed = 0x200;
                         gPlayerEntity.animationState = this->animationState << 1;
                         gPlayerEntity.direction = this->direction;
                         gPlayerEntity.flags |= 0x80;
diff --git a/src/object/object1A.c b/src/object/object1A.c
index 26ece918..837884a9 100644
--- a/src/object/object1A.c
+++ b/src/object/object1A.c
@@ -54,5 +54,5 @@ void sub_08086A6C(Entity* ent) {
     uVar1 = Random();
     ent->field_0x20 = 163840;
     ent->direction = (uVar1 >> 16) & 31;
-    ent->nonPlanarMovement = uVar1 & 480;
+    ent->speed = uVar1 & 480;
 }
diff --git a/src/object/objectA2.c b/src/object/objectA2.c
index 01fd9fa6..e79c07f8 100644
--- a/src/object/objectA2.c
+++ b/src/object/objectA2.c
@@ -105,6 +105,6 @@ void sub_0809F448(Entity* this) {
             tmp += -0x80000 + (rand & 0xFFFFF);
             break;
     }
-    this->nonPlanarMovement = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8);
+    this->speed = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8);
     this->direction = sub_080045DA(tmp, 0) >> 3;
 }
diff --git a/src/object/objectB2.c b/src/object/objectB2.c
index 4722d2e9..c3eff1eb 100644
--- a/src/object/objectB2.c
+++ b/src/object/objectB2.c
@@ -22,12 +22,12 @@ void ObjectB2(Entity* this) {
         this->attachedEntity = pEVar3;
         InitializeAnimation(this, this->type);
     }
-    this->nonPlanarMovement = this->parent->nonPlanarMovement;
+    this->speed = this->parent->speed;
     sub_0806F69C(this);
     if (sub_080AE4CC(this->attachedEntity, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) {
         DeleteThisEntity();
     }
-    if (this->nonPlanarMovement < 0x41) {
+    if (this->speed < 0x41) {
         this->spriteSettings.b.draw ^= 1;
 
         if (--this->actionDelay == 0) {
diff --git a/src/object/pot.c b/src/object/pot.c
index cd73f9a8..f28fb9ee 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -34,7 +34,7 @@ void sub_0808222C(Entity* this) {
 
     this->action = 1;
     this->hitbox = &gUnk_080FD338;
-    this->nonPlanarMovement = 0x80;
+    this->speed = 0x80;
     this->y.HALF.HI += 3;
     this->field_0x16 = 0;
     this->flags |= 0x80;
@@ -86,7 +86,7 @@ void sub_08082310(Entity* this) {
                         this->actionDelay = 32;
                         this->action = 4;
                         if (gPlayerState.flags.all & 0x80) {
-                            this->nonPlanarMovement >>= 1;
+                            this->speed >>= 1;
                             this->actionDelay = 64;
                         }
                         SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer);
@@ -185,7 +185,7 @@ void sub_08082614(Entity* this) {
 
     this->action = 1;
     if (gPlayerState.flags.all & 0x80) {
-        this->nonPlanarMovement <<= 1;
+        this->speed <<= 1;
     }
 
     this->field_0x70.HALF.LO = sub_080001DA(COORD_TO_TILE(this), this->collisionLayer);
diff --git a/src/object/smoke.c b/src/object/smoke.c
index 5ec708b9..ade9d2cd 100644
--- a/src/object/smoke.c
+++ b/src/object/smoke.c
@@ -37,7 +37,7 @@ void sub_0808A46C(Entity* this) {
 void sub_0808A484(Entity* this) {
     this->action = 1;
     this->spriteSettings.b.draw = TRUE;
-    this->nonPlanarMovement = 0x40;
+    this->speed = 0x40;
     this->direction = 6;
     this->spriteRendering.b3 = 1;
     this->spritePriority.b0 = 0;
diff --git a/src/player.c b/src/player.c
index e3038077..7dfcbb93 100644
--- a/src/player.c
+++ b/src/player.c
@@ -143,7 +143,7 @@ void sub_08070D20(Entity* this) {
 void sub_08070D38(Entity* this) {
     this->flags &= ~0x80;
     this->direction = ((this->animationState & 0xe) << 2) ^ 0x10;
-    this->nonPlanarMovement = 0x100;
+    this->speed = 0x100;
     this->field_0x42 = 0;
     this->previousActionFlag++;
     this->actionDelay = gPlayerState.field_0x38;
@@ -353,7 +353,7 @@ void sub_080710A8(Entity* this) {
     asm("lsl r0, r0, #0x4");
     this->field_0x20 = (temp - 4) * 64 * 64;
 
-    this->nonPlanarMovement = 0x100;
+    this->speed = 0x100;
     sub_0807A108();
     SoundReq(0x7c);
     SoundReq(0x78);
@@ -522,7 +522,7 @@ void sub_08071400(Entity* this) {
 
     if ((this->x.HALF.HI != x) || (this->y.HALF.HI != y)) {
         this->direction = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gArea.field_0x12, gArea.field_0x14);
-        this->nonPlanarMovement = 0x100;
+        this->speed = 0x100;
         sub_08079E08();
     }
 
diff --git a/src/room.c b/src/room.c
index 6a0e9fad..bd520be3 100644
--- a/src/room.c
+++ b/src/room.c
@@ -972,7 +972,7 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1)
         fx->x.HALF.HI = gUnk_080D8E50[iVar3].x + gRoomControls.roomOriginX + xOff;
         fx->y.HALF.HI = gUnk_080D8E50[iVar3].y + gRoomControls.roomOriginY + -0xc + (entCnt & 1) * 8;
         fx->direction = 0;
-        fx->nonPlanarMovement = 0x100;
+        fx->speed = 0x100;
       }
     }
   }
diff --git a/src/script.c b/src/script.c
index cc9636b8..6e4d577a 100644
--- a/src/script.c
+++ b/src/script.c
@@ -113,7 +113,7 @@ void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SetEntityDirection(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_SetEntityNonPlanarMovement(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SetEntityPositionRelative(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SetEntityPosition(Entity* entity, ScriptExecutionContext* context);
@@ -260,7 +260,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_0807EB8C,
                                           ScriptCommand_SetEntityDirection,
                                           ScriptCommand_SetEntityDirectionWithAnimationState,
-                                          ScriptCommand_SetEntityNonPlanarMovement,
+                                          ScriptCommand_SetEntitySpeed,
                                           ScriptCommand_SetEntity0x20,
                                           ScriptCommand_SetEntityPositionRelative,
                                           ScriptCommand_SetEntityPosition,
@@ -1253,8 +1253,8 @@ void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptEx
     entity->animationState = entity->direction / 4;
 }
 
-void ScriptCommand_SetEntityNonPlanarMovement(Entity* entity, ScriptExecutionContext* context) {
-    entity->nonPlanarMovement = context->scriptInstructionPointer[1];
+void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* context) {
+    entity->speed = context->scriptInstructionPointer[1];
 }
 
 void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context) {
@@ -1391,7 +1391,7 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) {
     }
     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);
+    sub_0806F62C(entity, entity->speed, entity->direction);
     tmp *= entity->x.HALF.HI - context->x.HALF.HI;
     tmp2 *= entity->y.HALF.HI - context->y.HALF.HI;
     if (tmp <= 0 && tmp2 <= 0) {

From d207eaf8fac4fb65bf34b3c5a617b8df13fe772a Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Sun, 14 Mar 2021 22:52:10 -0700
Subject: [PATCH 37/46] Update Jenkinsfile

---
 Jenkinsfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d55b94e4..155fb875 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,11 +10,6 @@ pipeline {
             }
         }
         stage('Build') {
-            when {
-                not {
-                    branch 'master'
-                }
-            }
             steps {
                 sh 'make -j'
             }
@@ -34,4 +29,4 @@ pipeline {
             cleanWs()
         }
     }
-}
\ No newline at end of file
+}

From 9eee02fd7c8bf7ba79f9deaacb18b940e14a5dee Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 00:32:19 -0700
Subject: [PATCH 38/46] Update progress.py

---
 progress.py | 74 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 6 deletions(-)

diff --git a/progress.py b/progress.py
index e7a9956b..f2e83eb0 100644
--- a/progress.py
+++ b/progress.py
@@ -1,6 +1,6 @@
 
-import csv, git, re
-
+import csv, git, re, argparse, os
+from itertools import chain
 map = open("tmc.map", "r")
 
 src = 0
@@ -8,6 +8,63 @@ asm = 0
 srcData = 0
 data = 0
 
+parser = argparse.ArgumentParser()
+parser.add_argument("-m", "--matching", dest='matching', action='store_true', help="Output matching progress instead of decompilation progress")
+args = parser.parse_args()
+matching = args.matching
+
+NON_MATCHING_PATTERN = r'((?<=NONMATCH\(")asm/non_matching/.*\.inc)|((?<=NONMATCH\(")asm/non_matching/.*\.s)'
+NON_ASM_PATTERN = r'(^\w+:)|(^\s@)|(^\s*\.)|(^\s*thumb_func_start)'
+
+#def remInvalid(x):
+
+def GetNonMatchingFunctions(files):
+    functions = []
+
+    for file in files:
+        with open(file) as f:
+            functions += re.findall(NON_MATCHING_PATTERN, f.read())
+
+    #functions = map(lambda x: x != "", functions)
+    return functions
+
+def ReadAllLines(fileName):
+    lineList = list()
+    with open(fileName) as f:
+        lineList = f.readlines()
+
+    return lineList
+
+def GetFiles(path, ext):
+    files = []
+    for r, d, f in os.walk(path):
+        for file in f:
+            if file.endswith(ext):
+                files.append(os.path.join(r, file))
+
+    return files
+
+nonMatchingFunctions = GetNonMatchingFunctions(GetFiles("src", ".c")) if not args.matching else []
+
+# this is actually the size of all non matching asm, not (total - non matching)
+def GetNonMatchingSize(path):
+    size = 0
+
+    asmFiles = GetFiles(path, ".s") + GetFiles(path, ".inc")
+
+    for asmFilePath in asmFiles:
+        for x in nonMatchingFunctions: # stupid tuple
+            if asmFilePath in x:
+                asmLines = ReadAllLines(asmFilePath)
+
+                for asmLine in asmLines:
+                    if len(re.findall(NON_ASM_PATTERN, asmLine, re.DOTALL)) == 0:
+                        size += 4
+
+    return size
+
+nonMatchingASM = GetNonMatchingSize("asm/non_matching")
+
 for line in map:
     reg = re.compile(r"^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/(.+)\.o")
     matches = reg.split(line)
@@ -20,7 +77,7 @@ for line in map:
     direc = matches[3]
     basename = matches[4]
 
-    # From original script, not sure what this is doing...
+    # alignment? idk
     if (size & 3):
         size += 4 - (size % 3)
 
@@ -38,8 +95,13 @@ for line in map:
 total = src + asm
 dataTotal = srcData + data
 
-srcPct = "%.4f" % (100 * src / total)
-asmPct = "%.4f" % (100 * asm / total)
+if matching:
+    srcPct = "%.4f" % (100 * (src) / total)
+    asmPct = "%.4f" % (100 * (asm) / total)
+else:
+    srcPct = "%.4f" % (100 * (src + nonMatchingASM) / total)
+    asmPct = "%.4f" % (100 * (asm - nonMatchingASM) / total)
+
 
 srcDataPct = "%.4f" % (100 * srcData / dataTotal)
 dataPct = "%.4f" % (100 * data / dataTotal)
@@ -53,4 +115,4 @@ git_hash = git_object.hexsha
 
 csv_list = [str(version), timestamp, git_hash, str(srcPct), str(asmPct), str(srcDataPct), str(dataPct)]
 
-print(",".join(csv_list))
\ No newline at end of file
+print(",".join(csv_list))

From 78784ec28105c0ce2b77790d3fb5affd1224c464 Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 01:33:22 -0700
Subject: [PATCH 39/46] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 155fb875..166706c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,8 +19,8 @@ pipeline {
                 branch 'master'
             }
             steps {
-                sh 'python3 progress.py -c >> /var/www/html/reports/progress.csv'
-                sh 'python3 progress.py -mc >> /var/www/html/reports/progress_matching.csv'
+                sh 'python3 progress.py >> /var/www/html/reports/progress_tmc.csv'
+                sh 'python3 progress.py -m >> /var/www/html/reports/progress_tmc_matching.csv'
             }
         }
     }

From edbf14b80e460a8a5b866b5a21418cb2b7d12a01 Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 02:25:17 -0700
Subject: [PATCH 40/46] Update Jenkinsfile

---
 Jenkinsfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 166706c0..85204900 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,12 @@ pipeline {
                 echo 'Setting up...'
                 sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
                 sh 'make -j setup'
+                git clone https://github.com/zeldaret/tmc
+                git clone https://github.com/pret/agbcc
+
+                cd ./agbcc
+                sh build.sh
+                sh install.sh ../tmc
             }
         }
         stage('Build') {

From 5c773740f6044e3d74beee8b89821f4a0f96a570 Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 02:26:05 -0700
Subject: [PATCH 41/46] Update Jenkinsfile

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 85204900..17e7bec6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,13 +6,12 @@ pipeline {
             steps {
                 echo 'Setting up...'
                 sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
-                sh 'make -j setup'
                 git clone https://github.com/zeldaret/tmc
                 git clone https://github.com/pret/agbcc
-
                 cd ./agbcc
                 sh build.sh
                 sh install.sh ../tmc
+                sh 'make -j setup'
             }
         }
         stage('Build') {

From 1dd4abd3ed1ad1aab3c17dca8d9510f36413e811 Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 02:26:42 -0700
Subject: [PATCH 42/46] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 17e7bec6..8acebc12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,6 +11,7 @@ pipeline {
                 cd ./agbcc
                 sh build.sh
                 sh install.sh ../tmc
+                cd ../tmc
                 sh 'make -j setup'
             }
         }

From 1b6a427e1a036771d73e43f6bdbcf7c06a2b406b Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 02:31:43 -0700
Subject: [PATCH 43/46] Update Jenkinsfile

---
 Jenkinsfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8acebc12..123cd358 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,13 +5,10 @@ pipeline {
         stage('Setup') {
             steps {
                 echo 'Setting up...'
-                sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
                 git clone https://github.com/zeldaret/tmc
-                git clone https://github.com/pret/agbcc
-                cd ./agbcc
-                sh build.sh
-                sh install.sh ../tmc
-                cd ../tmc
+                cd ./tmc
+                sh /var/www/jenkins/agbcc/install.sh .
+                sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
                 sh 'make -j setup'
             }
         }

From 8d0610f44942aca7dd70a333ff6357be6a65a0c8 Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 02:34:54 -0700
Subject: [PATCH 44/46] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 123cd358..c7a3e502 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
                 echo 'Setting up...'
                 git clone https://github.com/zeldaret/tmc
                 cd ./tmc
-                sh /var/www/jenkins/agbcc/install.sh .
+                sh ${env.AGBCC}/install.sh .
                 sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
                 sh 'make -j setup'
             }

From 0d44e695a3fce1cd9625aa49de9857c1a4af031a Mon Sep 17 00:00:00 2001
From: notyourav <65437533+notyourav@users.noreply.github.com>
Date: Mon, 15 Mar 2021 02:45:30 -0700
Subject: [PATCH 45/46] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c7a3e502..0de49ce0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
                 git clone https://github.com/zeldaret/tmc
                 cd ./tmc
                 sh ${env.AGBCC}/install.sh .
-                sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
+                sh 'cp /usr/local/etc/roms/tmc.us.gba baserom.gba'
                 sh 'make -j setup'
             }
         }

From fc5401137a4cd8cb09a8fdc181f5e8e13c359486 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 15 Mar 2021 18:53:12 +0900
Subject: [PATCH 46/46] Testing jenkins

---
 Jenkinsfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0de49ce0..fbfe89ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,9 +5,7 @@ pipeline {
         stage('Setup') {
             steps {
                 echo 'Setting up...'
-                git clone https://github.com/zeldaret/tmc
-                cd ./tmc
-                sh ${env.AGBCC}/install.sh .
+                sh 'cd ${AGBCC} && ./install.sh ${WORKSPACE} && cd ${WORKSPACE}'
                 sh 'cp /usr/local/etc/roms/tmc.us.gba baserom.gba'
                 sh 'make -j setup'
             }