Various decomp, use of SCREEN_WIDTH and SCREEN_HEIGHT, etc (#340)

* Update symbol_addrs

* effects.h and cleanup

* effect code generation!

* func_80024A784

* state_step_demo

* meh

* work on gfx_task_main and cleanup

* state_step_intro

* set_custom_gfx

include/common_structs.h

@@ -528,7 +528,7 @@ typedef struct Camera {
     /* 0x002 */ s16 moveFlags;
     /* 0x004 */ s16 mode;
     /* 0x006 */ s16 unk_06;
-    /* 0x008 */ u16 unk_08;
+    /* 0x008 */ s16 unk_08;
     /* 0x00A */ s16 viewportW;
     /* 0x00C */ s16 viewportH;
     /* 0x00E */ s16 viewportStartX;
@@ -700,7 +700,7 @@ typedef struct BattleStatus {
     /* 0x0C0 */ ScriptID controlScriptID;
     /* 0x0C4 */ struct ScriptInstance* camMovementScript;
     /* 0x0C8 */ ScriptID camMovementScriptID;
-    /* 0x0CC */ char unk_CC[12];
+    /* 0x0CC */ Vec3f unk_CC;
     /* 0x0D8 */ struct Actor* playerActor;
     /* 0x0DC */ struct Actor* partnerActor;
     /* 0x0E0 */ struct Actor* enemyActors[24];
@@ -1246,7 +1246,7 @@ typedef struct GameStatus {
     /* 0x06C */ ScriptID mainScriptID;
     /* 0x070 */ s8 isBattle;
     /* 0x071 */ s8 demoState; /* (0 = not demo, 1 = map demo, 2 = demo map changing) */
-    /* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */
+    /* 0x072 */ s8 nextDemoScene; /* which part of the demo to play next */
     /* 0x073 */ u8 contBitPattern;
     /* 0x074 */ s8 debugEnemyContact;
     /* 0x075 */ s8 debugQuizmo;
@@ -1373,6 +1373,11 @@ typedef struct CustomModelGfxBuilder {
     /* 0x00 */ CustomModelGfxBuilderFunc post;
 } CustomModelGfxBuilder; // size = 0x8
 
+typedef struct CustomModelGfx {
+    /* 0x00 */ Gfx* pre;
+    /* 0x00 */ Gfx* post;
+} CustomModelGfx; // size = 0x8
+
 typedef struct SelectableTarget {
     /* 0x00 */ s16 actorID;
     /* 0x02 */ s16 partID; /* sometimes loaded as byte from 0x3 */

include/functions.h

@@ -37,6 +37,7 @@ s16 get_game_mode(void);
 
 f32 integrate_gravity(void);
 f32 get_clamped_angle_diff(f32, f32);
+s32 intro_logos_fade_out(s16 addAlpha);
 
 void _render_transition_stencil(s32, f32, s32);
 u32 get_entity_type(s32 arg0);
@@ -426,7 +427,7 @@ f32 phys_get_spin_history(s32 lag, s32* x, s32* y, s32* z);
 
 void sfx_get_spatialized_sound_params(f32 arg0, f32 arg1, f32 arg2, s16* arg3, s16* arg4, s32 arg5);
 void sfx_play_sound_with_params(s32 arg0, u8 arg1, u8 arg2, s16 arg3);
-void func_8004A784(Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5);
+s32 func_8004A784(Npc* npc, f32 arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5);
 void base_UnkNpcAIFunc1(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
 
 s32* spr_get_npc_palettes(u16 arg0);

include/macros.h

@@ -49,6 +49,9 @@
 #define MAX_TEX_PANNERS 16
 #define MAX_ITEM_ENTITIES 256
 
+#define SCREEN_WIDTH 320
+#define SCREEN_HEIGHT 240
+
 // Alternative to libultra's M_PI: non-float version; more digits cause issues
 #define PI      3.141592f
 #define PI_D    3.141592

include/si.h

@@ -117,8 +117,8 @@ typedef enum ScriptOpcode {
 #define SI_LIMIT        -250000000 // TODO better name
 #define MAKE_ENTITY_END 0x80000000
 
-#define STORY_PROGRESS SI_SAVE_VAR(0)
+#define SI_STORY_PROGRESS SI_SAVE_VAR(0)
-#define WORLD_LOCATION SI_SAVE_VAR(425)
+#define SI_WORLD_LOCATION SI_SAVE_VAR(425)
 
 /* Return type of si_execute_next_command */
 #define SI_CONTINUE 0   /* Continue to next command */

include/variables.h

@@ -58,7 +58,7 @@ extern ModelList* gCurrentModelListPtr;
 // TODO: potentially a display list, figure this out
 extern u32* gWorldModelSpecialDls[32];
 extern u32* gBattleModelSpecialDls[32];
-extern u32** gCurrentModelSpecialDlsPtr[32];
+extern CustomModelGfx* gCurrentModelSpecialDlsPtr;
 
 extern EntityList gWorldEntityList;
 extern EntityList gBattleEntityList;

src/1370_len_7d0.c

@@ -80,7 +80,81 @@ void gfxRetrace_Callback(s32 arg0) {
     }
 }
 
+//gfx stuff
+#ifdef NON_MATCHING
+void gfx_task_main(void) {
+    u16 t;
+    s32 temp_a0_3;
+    s32 temp_a1_3;
+    s32 temp_a2;
+    s32 temp_a3_2;
+    s32 temp_s0_3;
+    s32 temp_s1_2;
+    s32 temp_s3;
+    s32 temp_t7;
+    s16 i;
+    s16 j;
+    s32* temp;
+
+    gMatrixListPos = 0;
+    gDisplayContext = &D_80164000[gCurrentDisplayContextIndex];
+    gMasterGfxPos = gDisplayContext->mainGfx;
+    temp = D_80073E04;
+    gfx_init_state();
+
+    gDPSetDepthImage(gMasterGfxPos++, OS_K0_TO_PHYSICAL(nuGfxZBuffer));
+    gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(temp));
+    gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+    gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON);
+    gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
+    gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE);
+    gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE);
+    gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
+    gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT);
+    gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, 0, 0, 0, TEXEL0, 0, 0, 0, 0, 0, 0, 0, TEXEL0);
+    gDPSetAlphaCompare(gMasterGfxPos++, G_AC_THRESHOLD);
+    gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, 127);
+    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 64, &D_80073E10);
+    gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+               G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+    gDPLoadSync(gMasterGfxPos++);
+    gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 254, 28);
+    gDPPipeSync(gMasterGfxPos++);
+    gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_4b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+               G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+    gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 508, 28);
+
+    for (i = 0; i < 20; i++) {
+        temp_s3 = ((i * 8) + 168) * 4;
+        temp_s1_2 = ((i * 8) + 160) * 4;
+        temp_s0_3 = (160 - (i * 8)) * 4;
+        temp_t7 = (152 - (i * 8)) * 4;
+
+        for (j = 0; j < 15; j++) {
+            t = (33 - ((i + 14) - j)) / 2 - (D_80074010 - 15);
+            if (t < 16 && t >= 0) {
+                temp_a0_3 = ((j * 8) + 8) * 4;
+                temp_a3_2 = ((j * 8) - 8) * 4;
+                temp_a1_3 = (SCREEN_HEIGHT - (j * 8)) * 4;
+                temp_a2 = (232 - (j * 8)) * 4;
+
+                gSPTextureRectangle(gMasterGfxPos++, temp_s3, temp_a0_3, temp_s1_2, temp_a3_2, 4, -0x2000, t, 0x0400, 0x0400);
+                gSPTextureRectangle(gMasterGfxPos++, temp_s3, temp_a1_3, temp_s1_2, temp_a2, 4, -0x2000, t, 0x0400, -0x0400);
+                gSPTextureRectangle(gMasterGfxPos++, temp_s0_3, temp_a0_3, temp_t7, temp_a3_2, 4, -0x2000, t, -0x0400, 0x0400);
+                gSPTextureRectangle(gMasterGfxPos++, temp_s0_3, temp_a1_3, temp_t7, temp_a2, 4, -0x2000, t, -0x0400, -0x0400);
+            }
+        }
+    }
+
+    D_80074010++;
+    gDPFullSync(gMasterGfxPos++);
+    gSPEndDisplayList(gMasterGfxPos++);
+    nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMasterGfxPos - gDisplayContext->mainGfx) * 8, 0, 0x40000);
+    gCurrentDisplayContextIndex ^= 1;
+}
+#else
 INCLUDE_ASM(void, "1370_len_7d0", gfx_task_main);
+#endif
 
 void gfxPreNMI_Callback(void) {
     D_80073E00 = 1;

src/25AF0.c

@@ -19,4 +19,64 @@ void func_8004A73C(ScriptInstance* script) {
     }
 }
 
-INCLUDE_ASM(void, "25AF0", func_8004A784, Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5);
+s32 func_8004A784(Npc* npc, f32 arg1, f32* outYaw, f32* outDist1, f32* outDist2, f32* outDist3) {
+    f32 x1, y1, z1;
+    f32 x2, y2, z2;
+    f32 x3, y3, z3;
+    f32 dist1 = -1.0f;
+    f32 dist2 = -1.0f;
+    f32 dist3 = -1.0f;
+    f32 yaw;
+    s32 ret;
+
+    x1 = npc->pos.x;
+    y1 = npc->pos.y;
+    z1 = npc->pos.z;
+    yaw = *outYaw;
+
+    ret = npc_test_move_simple_with_slipping(npc->unk_80, &x1, &y1, &z1, npc->moveSpeed * arg1,
+                                             yaw, npc->collisionHeight, npc->collisionRadius);
+    if (ret != 0) {
+        dist1 = dist2D(npc->pos.x, npc->pos.z, x1, z1);
+
+        x2 = npc->pos.x;
+        y2 = npc->pos.y;
+        z2 = npc->pos.z;
+        if (npc_test_move_simple_with_slipping(npc->unk_80, &x2, &y2, &z2, npc->moveSpeed * arg1,
+                                               clamp_angle(yaw + 35.0f), npc->collisionHeight,
+                                                           npc->collisionRadius) != 0) {
+            dist2 = dist2D(npc->pos.x, npc->pos.z, x2, z2);
+        }
+
+        x3 = npc->pos.x;
+        y3 = npc->pos.y;
+        z3 = npc->pos.z;
+        if (npc_test_move_simple_with_slipping(npc->unk_80, &x3, &y3, &z3, npc->moveSpeed * arg1,
+                                               clamp_angle(yaw - 35.0f), npc->collisionHeight, npc->collisionRadius)
+                                               != 0) {
+            dist3 = dist2D(npc->pos.x, npc->pos.z, x3, z3);
+        }
+
+        if ((dist2 < dist1 && dist3 < dist2) || (dist3 < dist1 && dist2 < dist3)) {
+            yaw = npc->yaw;
+        } else if ((dist1 < dist2 && dist3 < dist1) || (dist3 < dist2 && dist1 < dist3)) {
+            yaw = npc->yaw + 35.0f;
+        } else if ((dist1 < dist3 && dist2 < dist1) || (dist2 < dist3 && dist1 < dist2)) {
+            yaw = npc->yaw - 35.0f;
+        }
+    }
+
+    if (outYaw != NULL) {
+        *outYaw = clamp_angle(yaw);
+    }
+    if (outDist1 != NULL) {
+        *outDist1 = dist1;
+    }
+    if (outDist2 != NULL) {
+        *outDist2 = dist2;
+    }
+    if (outDist3 != NULL) {
+        *outDist3 = dist3;
+    }
+    return ret;
+}

src/77480.c

@@ -687,7 +687,7 @@ block_9:
         guMtxCatF(sp20, spA0, sp20);
         guTranslateF(sp60, 0.0f, playerStatus->colliderHeight * 0.5f, 0.0f);
         guMtxCatF(sp20, sp60, sp20);
-        guScaleF(spE0, 0.71428573f, 0.71428573f, 0.71428573f);
+        guScaleF(spE0, SPRITE_WORLD_SCALE, SPRITE_WORLD_SCALE, SPRITE_WORLD_SCALE);
         guMtxCatF(sp20, spE0, sp20);
         guTranslateF(sp60, phi_f30, phi_f24, phi_f28);
         guMtxCatF(sp20, sp60, sp20);

src/7fd10_len_b40.c

@@ -65,7 +65,7 @@ void check_input_status_menu(void) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     s32 pressedButtons;
 
-    if (get_variable(NULL, STORY_PROGRESS) < STORY_EPILOGUE) {
+    if (get_variable(NULL, SI_STORY_PROGRESS) < STORY_EPILOGUE) {
         if (playerStatus->actionState != ACTION_STATE_RIDE) {
             pressedButtons = playerStatus->pressedButtons;
         } else {

src/EA6FD0.c

@@ -1,7 +1,7 @@
 #include "common.h"
 
 s32 func_80240000_EA6FD0(void) {
-    s32 temp = dead_get_variable(NULL, SI_SAVE_VAR(0));
+    s32 temp = dead_get_variable(NULL, SI_STORY_PROGRESS);
 
     if (temp <= 0x26) {
         return 0x19010F;

src/a5dd0_len_114e0.c

@@ -1220,7 +1220,10 @@ void set_aux_pan_v(s32 texPannerID, s32 value) {
 
 INCLUDE_ASM(s32, "a5dd0_len_114e0", set_mdl_custom_gfx_set);
 
-INCLUDE_ASM(s32, "a5dd0_len_114e0", set_custom_gfx);
+void set_custom_gfx(s32 customGfxIndex, Gfx* pre, Gfx* post) {
+    gCurrentModelSpecialDlsPtr[customGfxIndex].pre = pre;
+    gCurrentModelSpecialDlsPtr[customGfxIndex].post = post;
+}
 
 void set_custom_gfx_builders(s32 customGfxIndex, CustomModelGfxBuilderFunc pre, CustomModelGfxBuilderFunc post) {
     gCurrentCustomModelGfxBuilders[customGfxIndex].pre = pre;

src/ad90_len_2880.c

@@ -1,3 +1,79 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "ad90_len_2880", update_camera_mode_6);
+void update_camera_mode_6(Camera*);
+
+// types, floats, and other shtuff
+#ifdef NON_MATCHING
+void update_camera_mode_6(Camera* camera) {
+    f32 cosBoom;
+    f32 cosRotation;
+    f32 deltaX;
+    f32 temp_f24_2;
+    f32 deltaZ;
+    f32 boomYaw;
+    f32 rotation;
+    f32 sinBoom;
+    f32 sinRotation;
+    f32 temp_f30;
+    f32 deltaY;
+    s32 temp_lo;
+
+    if (camera->unk_06 != 0 || camera->unk_08 != 0) {
+        camera->unk_06 = 0;
+        camera->unk_08 = 0;
+        camera->unk_1C = 0;
+        camera->unk_1E = 100;
+        camera->unk_20 = 100;
+        camera->unk_22 = 0;
+        camera->unk_24 = 0;
+        camera->unk_26 = 0;
+        camera->targetPos.x = 0.0f;
+        camera->targetPos.y = 0.0f;
+        camera->targetPos.z = 0.0f;
+        camera->lookAt_obj.x = camera->unk_54;
+        camera->lookAt_obj.y = camera->unk_58;
+        camera->lookAt_obj.z = camera->unk_5C;
+    }
+
+    if (camera->unk_1C == 0) {
+        temp_lo = 10000 / camera->unk_20;
+        camera->trueRotation[0] = camera->unk_24;
+        camera->lookAt_obj.x = camera->unk_54 + camera->targetPos.x;
+        camera->currentBoomYaw = camera->unk_22;
+        camera->currentBoomLength = camera->unk_1E;
+        camera->lookAt_obj.z = camera->unk_5C + camera->targetPos.z;
+        camera->lookAt_obj.y = (camera->unk_58 + camera->targetPos.y) + (camera->unk_26 * 0.00390625);
+
+        if (temp_lo < 0) {
+            temp_lo += 3;
+        }
+        camera->vfov = (f32) (temp_lo >> 2);
+
+        boomYaw = (camera->currentBoomYaw * TAU) / 360.0f;
+        sinBoom = sin_rad(boomYaw);
+        cosBoom = cos_rad(boomYaw);
+        temp_f30 = (cosBoom * 0.0f) + (camera->currentBoomLength * sinBoom);
+        temp_f24_2 = (sinBoom * -0.0f) + (camera->currentBoomLength * cosBoom);
+
+        rotation = (camera->trueRotation[0] * TAU) / 360.0f;
+        sinRotation = sin_rad(rotation);
+        cosRotation = cos_rad(rotation);
+
+        camera->lookAt_eye.y = camera->lookAt_obj.y + temp_f30;
+        camera->lookAt_eye.x = camera->lookAt_obj.x + ((cosRotation * 0.0f) - (temp_f24_2 * sinRotation));
+        camera->lookAt_eye.z = camera->lookAt_obj.z + ((sinRotation * 0.0f) + (temp_f24_2 * cosRotation));
+    }
+
+    camera->currentYaw = atan2(camera->lookAt_eye.x, camera->lookAt_eye.z, camera->lookAt_obj.x, camera->lookAt_obj.z);
+    deltaX = camera->lookAt_obj.x - camera->lookAt_eye.x;
+    deltaZ = camera->lookAt_obj.z - camera->lookAt_eye.z;
+    deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y;
+    camera->currentBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ);
+    camera->currentPitch = atan2(0.0f, 0.0f, deltaY, -sqrtf((deltaX * deltaX) + (deltaZ * deltaZ)));
+    gBattleStatus.unk_CC.x = camera->lookAt_obj.x;
+    gBattleStatus.unk_CC.y = camera->lookAt_obj.y;
+    gBattleStatus.unk_CC.z = camera->lookAt_obj.z;
+}
+#else
+INCLUDE_ASM(void, "ad90_len_2880", update_camera_mode_6, Camera* camera);
+#endif

src/battle/move/mega_quake/756780.c

@@ -21,7 +21,7 @@ ApiStatus func_802A10A4_756824(ScriptInstance* script, s32 isInitialCall) {
     }
 
     set_screen_overlay_center(1, 0, 0, 0);
-    set_screen_overlay_center(1, 1, 320, 240);
+    set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT);
     set_screen_overlay_params_back(12, 160.0f);
 
     if (script->functionTemp[1] != 0) {
@@ -29,7 +29,7 @@ ApiStatus func_802A10A4_756824(ScriptInstance* script, s32 isInitialCall) {
         return ApiStatus_BLOCK;
     } else {
         set_screen_overlay_center(1, 0, 0, 0);
-        set_screen_overlay_center(1, 1, 320, 240);
+        set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT);
         set_screen_overlay_params_back(12, 0.0f);
         return ApiStatus_DONE2;
     }

src/curtains.c

@@ -66,7 +66,7 @@ void render_curtains(void) {
         s8 rgb;
 
         gDPPipeSync(gMasterGfxPos++);
-        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(D_8009A64C));
+        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C));
         gSPDisplayList(gMasterGfxPos++, &D_800760C0);
 
         guFrustumF(m.m[0], -80.0f, 80.0f, -60.0f, 60.0f, 160.0f, 640.0f, 1.0f);

src/dc470_len_14c0.c

@@ -12,7 +12,7 @@ void load_map_bg(char* optAssetName) {
         u32 assetSize;
         char* assetName = optAssetName;
 
-        if (get_variable(0, STORY_PROGRESS) >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        if (get_variable(0, SI_STORY_PROGRESS) >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
             // Use sunny Flower Fields bg rather than cloudy
             if (!strcmp(assetName, gCloudyFlowerFieldsBg)) {
                 assetName = gSunnyFlowerFieldsBg;

src/fio.c

@@ -1,11 +1,6 @@
 #include "common.h"
 
-u32 magicSaveString[] = {
+char magicSaveString[] = "Mario Story 006";
-    ASCII_TO_U32('M','a','r','i'),
-    ASCII_TO_U32('o',' ','S','t'),
-    ASCII_TO_U32('o','r','y',' '),
-    ASCII_TO_U32('0','0','6',0),
-}; // "Mario Story 006";
 
 extern s32 logicalSaveInfo[4][2]; // 0x8009BA30
 extern s32 physicalSaveInfo[6][2]; // 0x8009BA50
@@ -15,7 +10,7 @@ extern s32 D_800D95E8[];
 void fio_serialize_state(void);
 
 s32 get_spirits_rescued(void) {
-    s32 storyProgress = get_variable(NULL, STORY_PROGRESS);
+    s32 storyProgress = get_variable(NULL, SI_STORY_PROGRESS);
     s32 ret = 7;
 
     if (storyProgress < get_variable(NULL, STORY_CH1_STAR_SPIRIT_RESCUED)) {

src/input.c

@@ -1,4 +1,7 @@
 #include "common.h"
+#include "nu/nusys.h"
+
+extern OSContPad D_8009A5B8;
 
 void func_800287F0(void) {
     gGameStatusPtr->currentButtons = 0;

src/intro_logos.c

@@ -22,7 +22,7 @@ s16 intro_logos_fade_in(s16 subtractAlpha) {
     return 0;
 }
 
-s16 intro_logos_fade_out(s16 addAlpha) {
+s32 intro_logos_fade_out(s16 addAlpha) {
     if (gGameStatusPtr->bootAlpha != 255) {
         gGameStatusPtr->bootAlpha += addAlpha;
         if (gGameStatusPtr->bootAlpha > 255) {

src/main_loop.c

@@ -350,9 +350,6 @@ void gfx_init_state(void) {
     gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074210));
 }
 
-#define SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 240
-
 s32 func_800271FC(const u16* framebuf1, const u16* framebuf2, s32 x, s32 y, u8* out) {
     s32 pixel = (x * SCREEN_WIDTH) + y;
 
@@ -414,7 +411,7 @@ void func_80027BAC(s32 arg0, s32 arg1) {
 
     gDPPipeSync(gMasterGfxPos++);
     gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON);
-    gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, arg1);
+    gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, arg1);
     gDPSetCycleType(gMasterGfxPos++, G_CYC_COPY);
     gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE);
     gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE);
@@ -422,7 +419,7 @@ void func_80027BAC(s32 arg0, s32 arg1) {
     gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT);
 
     for (i = 0; i < 40; i++) {
-        gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, arg0 + (0xF00 * i));
+        gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, arg0 + (0xF00 * i));
         gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_LOADTILE, 0,
                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                    G_TX_NOLOD);
@@ -449,7 +446,7 @@ void gfx_draw_background(void) {
     s32 i;
     s32 a = 0x18;
 
-    gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 320, 240);
+    gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 
     camera = &gCameras[gCurrentCameraID];
     bgFlags = gGameStatusPtr->enableBackground & 0xF0;
@@ -457,13 +454,13 @@ void gfx_draw_background(void) {
     switch (bgFlags) {
         case 0x10:
             gDPPipeSync(gMasterGfxPos++);
-            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_8009A658[1]);
+            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_8009A658[1]);
             gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
             gDPSetBlendColor(gMasterGfxPos++, 0x80, 0x80, 0x80, 0xFF);
             gDPSetPrimDepth(gMasterGfxPos++, -1, -1);
             gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM);
             gDPSetRenderMode(gMasterGfxPos++, G_RM_VISCVG, G_RM_VISCVG2);
-            gDPFillRectangle(gMasterGfxPos++, 0, 0, 320, 240);
+            gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
             gDPPipeSync(gMasterGfxPos++);
             gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL);
             gGameStatusPtr->enableBackground &= ~0xF0;
@@ -481,10 +478,10 @@ void gfx_draw_background(void) {
             }
 
             gDPPipeSync(gMasterGfxPos++);
-            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 320, 240);
+            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
             gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
             gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
-            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_8009A64C);
+            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_8009A64C);
             gDPSetFillColor(gMasterGfxPos++, 0x00010001);
             gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, 239);
             gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
@@ -497,7 +494,7 @@ void gfx_draw_background(void) {
             gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT);
 
             for (i = 0; i < 40; i++) {
-                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, nuGfxZBuffer + (i * 0x780));
+                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer + (i * 0x780));
                 gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_LOADTILE, 0,
                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                            G_TX_NOLOD);
@@ -515,18 +512,18 @@ void gfx_draw_background(void) {
             break;
         default:
             if (gOverrideFlags & 8) {
-                gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(D_8009A64C));
+                gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C));
                 return;
             }
 
             gDPSetDepthImage(gMasterGfxPos++, OS_PHYSICAL_TO_K0(nuGfxZBuffer)); // TODO: or OS_K0_TO_PHYSICAL
             gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
             gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
-            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, OS_PHYSICAL_TO_K0(nuGfxZBuffer));
+            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, OS_PHYSICAL_TO_K0(nuGfxZBuffer));
             gDPSetFillColor(gMasterGfxPos++, 0xFFFCFFFC);
             gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, 239);
             gDPPipeSync(gMasterGfxPos++);
-            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(D_8009A64C));
+            gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C));
             gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(camera->bgColor[0], camera->bgColor[1], camera->bgColor[2], 1));
 
             backgroundMinW = gGameStatusPtr->backgroundMinW;
@@ -567,20 +564,20 @@ void gfx_draw_background(void) {
                 backgroundSumH = 1;
             }
 
-            if (backgroundMinW > 319) {
+            if (backgroundMinW > SCREEN_WIDTH - 1) {
-                backgroundMinW = 319;
+                backgroundMinW = SCREEN_WIDTH - 1;
             }
 
-            if (backgroundMinH > 239) {
+            if (backgroundMinH > SCREEN_HEIGHT - 1) {
-                backgroundMinH = 239;
+                backgroundMinH = SCREEN_HEIGHT - 1;
             }
 
-            if (backgroundSumW > 320) {
+            if (backgroundSumW > SCREEN_WIDTH) {
-                backgroundSumW = 320;
+                backgroundSumW = SCREEN_WIDTH;
             }
 
-            if (backgroundSumH > 240) {
+            if (backgroundSumH > SCREEN_HEIGHT) {
-                backgroundSumH = 240;
+                backgroundSumH = SCREEN_HEIGHT;
             }
 
             if (!(gGameStatusPtr->enableBackground & 1)) {

src/msg.c

@@ -777,8 +777,8 @@ void msg_printer_set_origin_pos(MessagePrintState* msgPrintState, s16 x, s16 y)
     if (msgPrintState->initOpenPos.x < 0) {
         msgPrintState->initOpenPos.x = 0;
     }
-    if (msgPrintState->initOpenPos.x > 320) {
+    if (msgPrintState->initOpenPos.x > SCREEN_WIDTH) {
-        msgPrintState->initOpenPos.x = 320;
+        msgPrintState->initOpenPos.x = SCREEN_WIDTH;
     }
     if (msgPrintState->initOpenPos.y < 0) {
         msgPrintState->initOpenPos.y = 0;
@@ -1050,7 +1050,8 @@ void draw_message_window(MessagePrintState* printer) {
             printer->windowBasePos.x = 160 - (printer->windowSize.x / 2);
             printer->windowBasePos.y = 56;
             draw_box(1, 0, printer->windowBasePos.x, 56, 0, printer->windowSize.x, printer->windowSize.y, 255, 0,
-                     scale, scale, 0.0f, 0.0f, rotZ, drawbox_message_delegate, printer, NULL, 320, 240, NULL);
+                     scale, scale, 0.0f, 0.0f, rotZ, drawbox_message_delegate, printer, NULL, SCREEN_WIDTH,
+                     SCREEN_HEIGHT, NULL);
             break;
         default:
             appendGfx_message(printer, printer->windowOffsetPos.x, printer->windowOffsetPos.y, printer->unk_46C,

src/state_demo.c

@@ -1,5 +1,46 @@
 #include "common.h"
 
+typedef struct DemoSceneData {
+    /* 0x0 */ s16 unk_0;
+    /* 0x2 */ u16 entryID;
+    /* 0x4 */ char unk_4;
+    /* 0x5 */ s8 partnerID;
+    /* 0x6 */ s8 unk_6;
+    /* 0x7 */ char unk_7;
+    /* 0x8 */ char* mapName;
+} DemoSceneData; // size = 0xC;
+
+// rodata for below map names
+// the compiler deduplicates the two identical map name strings, but it's removing the wrong one
+const char D_800983F8[] = {
+    "end\0kkj_26\0\0arn_08\0\0kkj_11\0\0nok_02\0\0mac_03\0\0kzn_02\0\0mac_00\0\0jan_04\0\0trd_09\0\0tik_03\0\0isk_04\0\0nok_12\0\0"
+};
+
+DemoSceneData D_80077AE0[20] = {
+    { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_GOOMBARIO, .unk_6 = 0x9D, .mapName = &D_800983F8[0x5C] },
+    { .unk_0 = 2, .entryID = 0, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0 },
+    { .unk_0 = 0, .entryID = 5, .unk_4 = 0, .partnerID = PARTNER_PARAKARRY, .unk_6 = 0x9D, .mapName = &D_800983F8[0x54] },
+    { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_KOOPER, .unk_6 = 0x9D, .mapName = &D_800983F8[0x4C] },
+    { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_PARAKARRY, .unk_6 = 0xB3, .mapName = &D_800983F8[0x44] },
+    { .unk_0 = 0, .entryID = 4, .unk_4 = 0, .partnerID = PARTNER_SUSHIE, .unk_6 = 0x9D, .mapName = &D_800983F8[0x3C] },
+    { .unk_0 = 2, .entryID = 1, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 },
+    { .unk_0 = 0, .entryID = 6, .unk_4 = 0, .partnerID = PARTNER_BOMBETTE, .unk_6 = 0x9D, .mapName = &D_800983F8[0x34] },
+    { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_KOOPER, .unk_6 = 0x1B, .mapName = &D_800983F8[0x2C] },
+    { .unk_0 = 2, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 },
+    { .unk_0 = 0, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_BOMBETTE, .unk_6 = 0x9D, .mapName = &D_800983F8[0x24] },
+    { .unk_0 = 0, .entryID = 4, .unk_4 = 0, .partnerID = PARTNER_GOOMBARIO, .unk_6 = 0x9D, .mapName = &D_800983F8[0x1C] },
+    { .unk_0 = 2, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 },
+    { .unk_0 = 1, .entryID = 8, .unk_4 = 0, .partnerID = PARTNER_TWINK, .unk_6 = 0x26, .mapName = &D_800983F8[0x14] },
+    { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_BOW, .unk_6 = 0xE8, .mapName = &D_800983F8[0xC] },
+    { .unk_0 = 2, .entryID = 4, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 },
+    { .unk_0 = 0, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_GOOMBARIO, .unk_6 = 0x9D, .mapName = &D_800983F8[0x5C] },
+    { .unk_0 = 1, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x9D, .mapName = &D_800983F8[4] },
+    { .unk_0 = 3, .entryID = 0, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00, .mapName = &D_800983F8[0] },
+    { .unk_0 = 0, .entryID = 0, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00, },
+};
+
+char versionString[] = "Prg Ver.00/12/05 16:54";
+
 void state_init_demo(void) {
     if (gGameStatusPtr->demoState == 0) {
         gGameStatusPtr->nextDemoScene = 0;
@@ -17,8 +58,121 @@ void state_init_demo(void) {
     clear_script_list();
 }
 
-INCLUDE_ASM(void, "state_demo", state_step_demo, void);
+void state_step_demo(void) {
+    PlayerData* playerData = &gPlayerData;
+    DemoSceneData* demoSceneData = &D_80077AE0[gGameStatusPtr->nextDemoScene];
+    s16 mode = demoSceneData->unk_0;
+    s16 mapID;
+    s16 areaID;
+
+    if (gGameStatusPtr->demoState == 4) {
+        mode = 3;
+    }
+    if (gGameStatusPtr->demoState == 5) {
+        mode = 4;
+    }
+
+    switch (mode) {
+        case 3:
+            intro_logos_set_fade_alpha(255);
+            intro_logos_set_fade_color(224);
+            gGameStatusPtr->loadMenuState = 3;
+            gOverrideFlags |= 8;
+            intro_logos_update_fade();
+            gGameStatusPtr->demoState = 5;
+            break;
+        case 4:
+            if (gGameStatusPtr->loadMenuState != 0) {
+                gGameStatusPtr->loadMenuState--;
+            }
+
+            if (gGameStatusPtr->loadMenuState == 0) {
+                gGameStatusPtr->nextDemoScene = 0;
+                gGameStatusPtr->demoState = 0;
+                gGameStatusPtr->peachFlags = 0;
+                func_80056204();
+                gGameStatusPtr->isBattle = 0;
+                gGameStatusPtr->unk_76 = 0;
+                gGameStatusPtr->disableScripts = 0;
+                gGameStatusPtr->unk_7D = 0;
+                gOverrideFlags &= -9;
+                general_heap_create(&gOverrideFlags);
+                clear_render_tasks();
+                clear_generic_entity_list();
+                clear_script_list();
+                create_cameras_a();
+                spr_init_sprites(0);
+                clear_entity_models();
+                clear_animator_list();
+                clear_model_data();
+                clear_sprite_shading_data();
+                reset_background_settings();
+                clear_hud_element_cache();
+                clear_trigger_data();
+                clear_printers();
+                clear_entity_data(0);
+                clear_screen_overlays();
+                clear_player_status();
+                clear_npcs();
+                clear_player_data();
+                reset_battle_status();
+                init_encounter_status();
+                clear_effect_data();
+                clear_item_entity_data();
+                clear_saved_variables();
+                initialize_collision();
+                set_game_mode(2);
+            }
+            return;
+        case 0:
+            get_map_IDs_by_name(demoSceneData->mapName, &areaID, &mapID);
+            gGameStatusPtr->areaID = areaID;
+            gGameStatusPtr->mapID = mapID;
+            gGameStatusPtr->entryID = demoSceneData->entryID;
+            gGameStatusPtr->peachFlags = 0;
+            playerData->currentPartner = demoSceneData->partnerID;
+            set_cam_viewport(0, 29, 20, -262, 177);
+            set_variable(NULL, SI_STORY_PROGRESS, demoSceneData->unk_6);
+
+            if (gGameStatusPtr->nextDemoScene == 0) {
+                set_map_transition_effect(3);
+            } else {
+                set_map_transition_effect(2);
+            }
+
+            set_game_mode(3);
+            break;
+        case 1:
+            get_map_IDs_by_name(demoSceneData->mapName, &areaID, &mapID);
+            gGameStatusPtr->areaID = areaID;
+            gGameStatusPtr->mapID = mapID;
+            gGameStatusPtr->entryID = demoSceneData->entryID;
+            gGameStatusPtr->peachFlags = 1;
+            playerData->currentPartner = demoSceneData->partnerID;
+            set_cam_viewport(0, 29, 20, -262, 177);
+            set_variable(NULL, SI_STORY_PROGRESS, demoSceneData->unk_6);
+
+            if (gGameStatusPtr->nextDemoScene == 0) {
+                set_map_transition_effect(3);
+            } else {
+                set_map_transition_effect(2);
+            }
+
+            set_game_mode(3);
+            break;
+        case 2:
+            load_demo_battle(demoSceneData->entryID);
+            break;
+    }
+
+    gGameStatusPtr->nextDemoScene += 1;
+    if (gGameStatusPtr->nextDemoScene > 0x12) {
+        gGameStatusPtr->nextDemoScene = 0x12;
+    }
+}
 
 void state_drawUI_demo(void) {
 
 }
+
+static const f32 pad[] = {0.0f, 0.0f};

src/state_intro.c

@@ -70,184 +70,161 @@ void state_init_intro(void) {
     intro_logos_update_fade();
 }
 
-// WIP
-#ifdef NON_MATCHING
 void state_step_intro(void) {
     PlayerData* playerData = &gPlayerData;
-    s32 loadMenuState;
+    u32 pressedButtons = gGameStatusPtr->pressedButtons;
-    s32 viewportMode;
     s32 i;
 
     if (gGameStatusPtr->creditsViewportMode != -1) {
-        if (D_800A0964 == 0 && gGameStatusPtr->pressedButtons & (BUTTON_A | BUTTON_B | BUTTON_START | BUTTON_Z)) {
+        if (D_800A0964 == 0 && pressedButtons & (BUTTON_A | BUTTON_B | BUTTON_START | BUTTON_Z)) {
             D_800A0964 = 1;
         }
 
-        if (D_800A0964 == 1) {
+        if (D_800A0964 == 1 && (gGameStatusPtr->loadMenuState == 0 || gGameStatusPtr->loadMenuState == 1 ||
-            viewportMode = 100;
+                                gGameStatusPtr->loadMenuState == 4)) {
-            if (gGameStatusPtr->loadMenuState >= 2U) {
+            gGameStatusPtr->creditsViewportMode = 100;
-                if (gGameStatusPtr->loadMenuState == 4) {
+            state_init_intro();
-block_13:
+            return;
-                    gGameStatusPtr->creditsViewportMode = viewportMode;
+        }
-                    state_init_intro();
+
-                    return;
+        if (D_800A0964 == 2 && (gGameStatusPtr->loadMenuState == 0 || gGameStatusPtr->loadMenuState == 1 ||
-                }
+                                gGameStatusPtr->loadMenuState == 4)) {
-block_9:
+            gGameStatusPtr->creditsViewportMode++;
-                if ((D_800A0964 == 2) && ((gGameStatusPtr->loadMenuState < 2U) || (gGameStatusPtr->loadMenuState == 4))) {
+            state_init_intro();
-                    viewportMode = gGameStatusPtr->creditsViewportMode + 1;
+            return;
-                    goto block_13;
-                }
-block_14:
-                loadMenuState = gGameStatusPtr->loadMenuState;
-
-                switch (gGameStatusPtr->loadMenuState) {
-
-                    case 0:
-                        update_effects();
-                        update_cameras();
-                        if (gGameStatusPtr->creditsViewportMode == -1) {
-                            set_curtain_fade_goal(0.0f);
-                            if (intro_logos_fade_out(D_800A0956) != 0) {
-                                gGameStatusPtr->loadMenuState = 1;
-                                set_curtain_draw_callback(NULL);
-                            }
-                        } else {
-                            D_800A0954 += D_800A0956;
-                            if (D_800A0954 >= 0xFF) {
-                                D_800A0954 = 0xFF;
-                                gGameStatusPtr->loadMenuState = 1;
-                                set_curtain_draw_callback(NULL);
-                            }
-                        }
-                        break;
-
-                    case 21:
-                        D_800A0950--;
-                        if (D_800A0950 <= 0) {
-                            gOverrideFlags &= -9;
-                            gGameStatusPtr->loadMenuState = 2;
-                        }
-                        goto block_39;
-
-                    case 1:
-                        D_800A0950 = 4;
-                        gOverrideFlags |= 8;
-                        if (D_800A0960 != 0xE) {
-                            gGameStatusPtr->loadMenuState = 2;
-                        }
-                        goto block_39;
-                    case 2:
-                        set_curtain_draw_callback(NULL);
-                        gGameStatusPtr->isBattle = 0;
-                        gGameStatusPtr->unk_76 = 0;
-                        gGameStatusPtr->disableScripts = 0;
-                        gGameStatusPtr->unk_7D = 0;
-                        if (gGameStatusPtr->creditsViewportMode == -1) {
-                            general_heap_create();
-                            clear_render_tasks();
-                            clear_generic_entity_list();
-                            clear_script_list();
-                            create_cameras_a();
-                            spr_init_sprites(0);
-                            clear_entity_models();
-                            clear_animator_list();
-                            clear_model_data();
-                            clear_sprite_shading_data();
-                            reset_background_settings();
-                            clear_hud_element_cache();
-                            clear_trigger_data();
-                            clear_printers();
-                            clear_entity_data(0);
-                            clear_screen_overlays();
-                            clear_player_status();
-                            clear_npcs();
-                            clear_player_data();
-                            reset_battle_status();
-                            init_encounter_status();
-                            clear_effect_data();
-                            clear_item_entity_data();
-                            clear_saved_variables();
-                            initialize_collision();
-                            set_game_mode(2);
-                            return;
-                        }
-                        playerData->curHP = 10;
-                        playerData->curMaxHP = 10;
-                        playerData->hardMaxHP = 10;
-                        playerData->curFP = 5;
-                        playerData->curMaxFP = 5;
-                        playerData->hardMaxFP = 5;
-                        playerData->maxBP = 2;
-                        playerData->bootsLevel = 0;
-                        playerData->hammerLevel = -1;
-                        playerData->fortressKeyCount = 0;
-                        playerData->level = 0;
-
-                        for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) {
-                            playerData->partners[i].enabled = 0;
-                        }
-
-                        playerData->currentPartner = 0;
-                        load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0);
-                        gGameStatusPtr->loadMenuState = 3;
-                        disable_player_input();
-                        goto block_39;
-                    case 3:
-                        if (D_800A0960 == 0xE) {
-                            D_800A0960 = 0xF;
-                        }
-                        D_800A0954 = 0xFF - D_800A0958;
-                        gOverrideFlags &= ~0x8;
-                        gCameras->flags &= ~0x2;
-                        gOverrideFlags &= ~0x2;
-                        update_player(&gOverrideFlags, -9, gCameras);
-                        update_encounters();
-                        update_npcs();
-                        update_effects();
-                        update_cameras();
-                        if (!does_script_exist(gGameStatusPtr->mainScriptID)) {
-                            gGameStatusPtr->loadMenuState = 4;
-                            gGameStatusPtr->prevArea = gGameStatusPtr->areaID;
-                            goto block_39;
-                        }
-                        // Duplicate return node #40. Try simplifying control flow for better match
-                        return;
-                    case 4:
-                        update_effects();
-                        update_cameras();
-                        update_npcs();
-                        if (D_800A0954 == 0) {
-                            set_screen_overlay_params_front(0xFF, -1.0f);
-                            set_screen_overlay_params_back(0xFF, -1.0f);
-                        } else {
-                            D_800A0954 -= D_800A0958;
-                            if (D_800A0954 & 0x8000) {
-                                D_800A0954 = 0;
-                            }
-                        }
-                        goto block_39;
-                    default:
-    block_39:
-                        set_screen_overlay_params_back(D_800A0963, D_800A0954);
-                        set_screen_overlay_color(1, D_800A095B, D_800A095D, D_800A095F);
-                        intro_logos_update_fade();
-                        return;
-                }
-
-
-            } else {
-                goto block_13;
-            }
-        } else {
-            goto block_9;
         }
-    } else {
-        goto block_14;
     }
+
+    switch (gGameStatusPtr->loadMenuState) {
+        case 0:
+            update_effects();
+            update_cameras();
+            if (gGameStatusPtr->creditsViewportMode == -1) {
+                set_curtain_fade_goal(0.0f);
+                if (intro_logos_fade_out(D_800A0956)) {
+                    gGameStatusPtr->loadMenuState = 1;
+                    set_curtain_draw_callback(NULL);
+                }
+            } else {
+                D_800A0954 += D_800A0956;
+                if (D_800A0954 >= 0xFF) {
+                    D_800A0954 = 0xFF;
+                    gGameStatusPtr->loadMenuState = 1;
+                    set_curtain_draw_callback(NULL);
+                }
+            }
+            break;
+        case 1:
+            D_800A0950 = 4;
+            gOverrideFlags |= 8;
+            if (D_800A0960 != 0xE) {
+                gGameStatusPtr->loadMenuState = 2;
+            }
+            break;
+        case 21:
+            D_800A0950--;
+            if (D_800A0950 <= 0) {
+                gOverrideFlags &= -9;
+                gGameStatusPtr->loadMenuState = 2;
+            }
+            break;
+        case 2:
+            set_curtain_draw_callback(NULL);
+            gGameStatusPtr->isBattle = 0;
+            gGameStatusPtr->unk_76 = 0;
+            gGameStatusPtr->disableScripts = 0;
+            gGameStatusPtr->unk_7D = 0;
+
+            if (gGameStatusPtr->creditsViewportMode == -1) {
+                general_heap_create();
+                clear_render_tasks();
+                clear_generic_entity_list();
+                clear_script_list();
+                create_cameras_a();
+                spr_init_sprites(0);
+                clear_entity_models();
+                clear_animator_list();
+                clear_model_data();
+                clear_sprite_shading_data();
+                reset_background_settings();
+                clear_hud_element_cache();
+                clear_trigger_data();
+                clear_printers();
+                clear_entity_data(0);
+                clear_screen_overlays();
+                clear_player_status();
+                clear_npcs();
+                clear_player_data();
+                reset_battle_status();
+                init_encounter_status();
+                clear_effect_data();
+                clear_item_entity_data();
+                clear_saved_variables();
+                initialize_collision();
+                set_game_mode(2);
+                return;
+            }
+
+            playerData->curHP = 10;
+            playerData->curMaxHP = 10;
+            playerData->hardMaxHP = 10;
+            playerData->curFP = 5;
+            playerData->curMaxFP = 5;
+            playerData->hardMaxFP = 5;
+            playerData->maxBP = 2;
+            playerData->bootsLevel = 0;
+            playerData->hammerLevel = -1;
+            playerData->fortressKeyCount = 0;
+            playerData->level = 0;
+
+            for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) {
+                playerData->partners[i].enabled = 0;
+            }
+
+            playerData->currentPartner = 0;
+            load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0);
+            gGameStatusPtr->loadMenuState = 3;
+            disable_player_input();
+            break;
+        case 3:
+            if (D_800A0960 == 0xE) {
+                D_800A0960 = 0xF;
+            }
+            D_800A0954 = 0xFF - D_800A0958;
+            gOverrideFlags &= ~0x8;
+            gCameras->flags &= ~0x2;
+            gOverrideFlags &= ~0x2;
+            update_player();
+            update_encounters();
+            update_npcs();
+            update_effects();
+            update_cameras();
+            if (!does_script_exist(gGameStatusPtr->mainScriptID)) {
+                gGameStatusPtr->prevArea = gGameStatusPtr->areaID;
+                gGameStatusPtr->loadMenuState = 4;
+                break;
+            }
+            return;
+        case 4:
+            update_effects();
+            update_cameras();
+            update_npcs();
+            if (D_800A0954 == 0) {
+                set_screen_overlay_params_front(0xFF, -1.0f);
+                set_screen_overlay_params_back(0xFF, -1.0f);
+            } else {
+                D_800A0954 -= D_800A0958;
+                if (D_800A0954 < 0) {
+                    D_800A0954 = 0;
+                }
+            }
+            break;
+    }
+
+    set_screen_overlay_params_back(D_800A0963, D_800A0954);
+    set_screen_overlay_color(1, D_800A095B, D_800A095D, D_800A095F);
+    intro_logos_update_fade();
 }
-#else
-INCLUDE_ASM(void, "state_intro", state_step_intro, void);
-#endif
 
 void state_drawUI_intro(void) {
 }

src/state_title_screen.c

@@ -38,7 +38,7 @@ Gfx D_80077A50[] = {
     gsDPSetCombineKey(G_CK_NONE),
     gsDPSetAlphaCompare(G_AC_NONE),
     gsDPNoOp(),
-    gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 320, 240),
+    gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
     gsSPEndDisplayList(),
 };
 

src/world/area_arn/arn_02/events.c

@@ -12,7 +12,7 @@ Script N(802411A8) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_arn/arn_02/header.c

@@ -15,7 +15,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241040) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
         }

src/world/area_arn/arn_03/events.c

@@ -20,7 +20,7 @@ Script N(enterWalk_80241930) = SCRIPT({
         spawn N(802418E8);
         return;
     }
-    if (STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
+    if (SI_STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
         SetPlayerPos(-175, 165, 160);
         InterpPlayerYaw(90, 0);
         SetNpcPos(NPC_PARTNER, -175, 165, 160);
@@ -35,7 +35,7 @@ Script N(enterWalk_80241930) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -43,7 +43,7 @@ Script N(main) = SCRIPT({
     SI_AREA_FLAG(3) = 0;
     SI_AREA_FLAG(4) = 0;
     SI_AREA_FLAG(5) = 0;
-    if (STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
+    if (SI_STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
         MakeNpcs(0, N(npcGroupList_80244740));
     } else {
         MakeNpcs(0, N(npcGroupList_80244788));
@@ -149,7 +149,7 @@ Script N(80241E68) = SCRIPT({
 });
 
 Script N(interact_80241EB0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(2) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,
@@ -235,7 +235,7 @@ Script N(idle_80242064) = SCRIPT({
     }
     func_802CF56C(2);
     sleep 15;
-    STORY_PROGRESS = STORY_CH3_ARRIVED_AT_GHOST_TOWN;
+    SI_STORY_PROGRESS = STORY_CH3_ARRIVED_AT_GHOST_TOWN;
     DisablePlayerInput(FALSE);
     GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
     UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
@@ -246,7 +246,7 @@ Script N(idle_80242064) = SCRIPT({
 });
 
 Script N(init_802424E0) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
+    if (SI_STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
         SetNpcPos(NPC_SELF, 175, 240, 145);
         BindNpcIdle(NPC_SELF, N(idle_80242064));
     }
@@ -272,7 +272,7 @@ Script N(interact_8024254C) = SCRIPT({
             return;
         }
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(3) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,
@@ -410,7 +410,7 @@ Script N(80242C60) = SCRIPT({
 });
 
 Script N(interact_80242DC4) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(4) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,
@@ -476,7 +476,7 @@ Script N(init_802431A4) = SCRIPT({
 });
 
 Script N(interact_802431C8) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(5) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,

src/world/area_arn/arn_03/header.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241780) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
         }

src/world/area_arn/arn_04/events.c

@@ -13,7 +13,7 @@ Script N(80243538) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_arn/arn_04/header.c

@@ -15,7 +15,7 @@ MapConfig N(config) = {
 };
 
 Script N(802433D0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
         }

src/world/area_arn/arn_05/events.c

@@ -38,12 +38,12 @@ Script N(enterWalk_80241530) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
+    if (SI_STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
         MakeNpcs(0, N(npcGroupList_80244FA4));
     } else {
         MakeNpcs(0, N(npcGroupList_80244FC8));
@@ -100,7 +100,7 @@ Script N(idle_80241784) = SCRIPT({
 });
 
 Script N(interact_80241794) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(6) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,
@@ -132,7 +132,7 @@ Script N(interact_802418F4) = SCRIPT({
 });
 
 Script N(interact_80241924) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(7) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,
@@ -164,7 +164,7 @@ Script N(interact_80241A84) = SCRIPT({
 });
 
 Script N(interact_80241AB4) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {}
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {}
         < STORY_CH3_BEGAN_PEACH_MISSION {}
@@ -214,7 +214,7 @@ Script N(interact_80241AB4) = SCRIPT({
 });
 
 Script N(interact_80241D88) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {}
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {}
         < STORY_CH3_BEGAN_PEACH_MISSION {}
@@ -228,7 +228,7 @@ Script N(interact_80241D88) = SCRIPT({
 });
 
 Script N(interact_80241E28) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             if (SI_AREA_FLAG(8) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E,
@@ -260,7 +260,7 @@ Script N(interact_80241F88) = SCRIPT({
 });
 
 Script N(init_80241FB8) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (SI_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
         BindNpcIdle(NPC_SELF, N(idle_80241784));
     }
     BindNpcInteract(NPC_SELF, N(interact_80241794));
@@ -272,7 +272,7 @@ Script N(init_80242008) = SCRIPT({
 
 Script N(init_8024202C) = SCRIPT({
     BindNpcInteract(NPC_SELF, N(interact_80241AB4));
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_SAW_TUBBA_EAT_BOO {
             SetNpcFlagBits(NPC_SELF, NPC_FLAG_100, TRUE);
         }
@@ -295,7 +295,7 @@ Script N(init_8024202C) = SCRIPT({
 
 Script N(init_8024212C) = SCRIPT({
     BindNpcInteract(NPC_SELF, N(interact_80241D88));
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_SAW_TUBBA_EAT_BOO {
             RemoveNpc(NPC_SELF);
         }
@@ -315,7 +315,7 @@ Script N(init_8024212C) = SCRIPT({
 });
 
 Script N(init_802421EC) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (SI_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
         BindNpcIdle(NPC_SELF, N(idle_80241784));
     }
     BindNpcInteract(NPC_SELF, N(interact_80241E28));
@@ -747,7 +747,7 @@ Script N(80242C50) = SCRIPT({
 });
 
 Script N(802441FC) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (SI_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
         SetNpcPos(NPC_BOO2, 330, 184, 240);
         loop {
             SI_VAR(10) = 0;
@@ -767,13 +767,13 @@ Script N(802441FC) = SCRIPT({
         BindNpcInteract(NPC_BOO0, N(interact_802418F4));
         BindNpcInteract(NPC_BOO1, N(interact_80241A84));
         BindNpcInteract(NPC_BOO4, N(interact_80241F88));
-        STORY_PROGRESS = STORY_CH3_SAW_TUBBA_EAT_BOO;
+        SI_STORY_PROGRESS = STORY_CH3_SAW_TUBBA_EAT_BOO;
         spawn N(80241360);
     }
 });
 
 Script N(init_80244358) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (SI_STORY_PROGRESS >= STORY_CH3_SAW_TUBBA_EAT_BOO) {
         RemoveNpc(NPC_SELF);
     }
 });

src/world/area_arn/arn_05/header.c

@@ -15,7 +15,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241360) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_SAW_TUBBA_EAT_BOO {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
         }

src/world/area_arn/arn_07/BECDF0.c

@@ -282,7 +282,7 @@ Script N(80242048) = SCRIPT({
     N(func_802405BC_BED3AC)(3);
     PlaySoundAtPlayer(312, 0);
     DisablePlayerInput(TRUE);
-    STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
+    SI_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
     GotoMapSpecial("kmr_23", 2, 14);
     sleep 100;
 });
@@ -348,7 +348,7 @@ Script N(80242498) = SCRIPT({
     N(func_802405BC_BED3AC)(3);
     PlaySoundAtPlayer(312, 0);
     DisablePlayerInput(TRUE);
-    STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
+    SI_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
     GotoMapSpecial("kmr_23", 2, 14);
     sleep 100;
 });
@@ -510,7 +510,7 @@ Script N(80242A30) = SCRIPT({
 Script N(802433C8) = SCRIPT({
     bind N(exitWalk_80242978) TRIGGER_FLOOR_ABOVE 5;
     bind N(exitWalk_802429D4) TRIGGER_FLOOR_ABOVE 1;
-    if (STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
         bind_padlock N(802439B0) TRIGGER_WALL_PRESS_A entity(0) N(itemList_80242040);
     } else {
         bind N(exitSingleDoor_802428D4) TRIGGER_WALL_PRESS_A 10;
@@ -521,7 +521,7 @@ Script N(enterWalk_8024346C) = SCRIPT({
     GetEntryID(SI_VAR(0));
     match SI_VAR(0) {
         == 0 {
-            if (STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+            if (SI_STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
                 await N(80242A30);
                 spawn N(802433C8);
             } else {
@@ -549,14 +549,14 @@ Script N(enterWalk_8024346C) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
     SI_SAVE_FLAG(1977) = 1;
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             MakeNpcs(0, N(npcGroupList_802478B8));
         }
@@ -570,7 +570,7 @@ Script N(main) = SCRIPT({
         }
     }
     await N(makeEntities);
-    if (STORY_PROGRESS == STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
+    if (SI_STORY_PROGRESS == STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
         spawn N(80242498);
     }
     spawn N(enterWalk_8024346C);

src/world/area_arn/arn_07/events.c

@@ -64,7 +64,7 @@ Script N(802439B0) = SCRIPT({
     FindKeyItem(31, SI_VAR(0));
     RemoveKeyItemAt(SI_VAR(0));
     CloseChoicePopup();
-    STORY_PROGRESS = STORY_CH3_UNLOCKED_WINDY_MILL;
+    SI_STORY_PROGRESS = STORY_CH3_UNLOCKED_WINDY_MILL;
     N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2));
     PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
     SI_VAR(0) = SI_MAP_VAR(0);
@@ -78,7 +78,7 @@ Script N(80243B28) = SCRIPT({
 });
 
 Script N(makeEntities) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
         MakeEntity(0x802BCD68, 10, 30, -155, 0, MAKE_ENTITY_END);
         AssignScript(N(80243B28));
         SI_MAP_VAR(0) = SI_VAR(0);
@@ -265,7 +265,7 @@ Script N(80243FE8) = SCRIPT({
     kill SI_VAR(10);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
     EnableNpcShadow(NPC_SELF, FALSE);
-    STORY_PROGRESS = STORY_CH3_DEFEATED_TUBBA_BLUBBA;
+    SI_STORY_PROGRESS = STORY_CH3_DEFEATED_TUBBA_BLUBBA;
     SetMusicTrack(0, SONG_CHEERFUL_BOOS_MANSION, 0, 8);
     GetCurrentPartnerID(SI_VAR(6));
     if (SI_VAR(6) == 9) {
@@ -466,7 +466,7 @@ Script N(defeat_80244FB8) = SCRIPT({
 });
 
 Script N(init_80245058) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -475,7 +475,7 @@ Script N(init_80245090) = SCRIPT({
     SetSelfVar(0, 0);
     BindNpcIdle(NPC_SELF, N(idle_80244C54));
     BindNpcDefeat(NPC_SELF, N(defeat_80244FB8));
-    if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -483,19 +483,19 @@ Script N(init_80245090) = SCRIPT({
 Script N(init_80245104) = SCRIPT({
     SetSelfVar(0, 0);
     BindNpcIdle(NPC_SELF, N(idle_80244CC8));
-    if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(init_80245164) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(init_8024519C) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -672,7 +672,7 @@ Script N(80245304) = SCRIPT({
     ResetCam(0, 3);
     sleep 20;
     SetPlayerAnimation(ANIM_10002);
-    STORY_PROGRESS = STORY_CH3_STAR_SPRIT_DEPARTED;
+    SI_STORY_PROGRESS = STORY_CH3_STAR_SPRIT_DEPARTED;
     spawn N(80241F10);
     EnablePartnerAI();
     DisablePlayerInput(FALSE);
@@ -995,8 +995,8 @@ StaticNpc N(npcGroup_80246E7C) = {
 };
 
 Script N(init_8024706C) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
+    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
-        if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+        if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
             RemoveNpc(NPC_SELF);
         }
     }

src/world/area_arn/arn_07/header.c

@@ -17,7 +17,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241F10) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
             PlayAmbientSounds(AMBIENT_WIND);

src/world/area_arn/arn_08/events.c

@@ -50,7 +50,7 @@ Script N(8024049C) = SCRIPT({
         == 1 {
             DisablePlayerInput(TRUE);
             DisablePlayerPhysics(TRUE);
-            if (STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WELL) {
+            if (SI_STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WELL) {
                 SetPlayerPos(1000, 1000, 0);
                 SetNpcPos(NPC_PARTNER, 1000, 1000, 0);
                 RotateModel(0, 80, 0, -1, 0);
@@ -85,7 +85,7 @@ Script N(8024049C) = SCRIPT({
                 sleep 20;
                 SetPlayerPos(0, 0, 0);
                 SetNpcPos(NPC_PARTNER, 0, 0, 0);
-                STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WINDY_MILL;
+                SI_STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WINDY_MILL;
             }
             DisablePlayerPhysics(FALSE);
             SetPlayerJumpscale(2.0);
@@ -97,14 +97,14 @@ Script N(8024049C) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_WINDY_MILL;
+    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
     SI_SAVE_FLAG(1979) = 1;
-    if (STORY_PROGRESS >= STORY_CH4_FRYING_PAN_STOLEN) {
+    if (SI_STORY_PROGRESS >= STORY_CH4_FRYING_PAN_STOLEN) {
         SI_SAVE_FLAG(1016) = 0;
         SI_SAVE_FLAG(1017) = 0;
         SI_SAVE_FLAG(1018) = 0;
@@ -128,7 +128,7 @@ static s32 N(pad_A6C) = {
 
 Script N(80240A70) = SCRIPT({
     loop {
-        if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
+        if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
             break loop;
         }
         sleep 1;
@@ -138,8 +138,8 @@ Script N(80240A70) = SCRIPT({
     DisablePlayerPhysics(TRUE);
     N(func_80240000_BF47A0)();
     SI_AREA_FLAG(1) = 1;
-    if (STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
+    if (SI_STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
-        STORY_PROGRESS = STORY_CH3_WENT_DOWN_THE_WELL;
+        SI_STORY_PROGRESS = STORY_CH3_WENT_DOWN_THE_WELL;
     }
     GotoMap("arn_09", 1);
     sleep 100;
@@ -305,7 +305,7 @@ Script N(idle_80241278) = SCRIPT({
 });
 
 Script N(init_80241288) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
     } else {
         BindNpcIdle(NPC_SELF, N(idle_80241278));
@@ -313,7 +313,7 @@ Script N(init_80241288) = SCRIPT({
 });
 
 Script N(interact_802412E8) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH5_WHALE_MOUTH_OPEN {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BA));
         }
@@ -333,7 +333,7 @@ Script N(interact_802412E8) = SCRIPT({
 });
 
 Script N(init_802413E8) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
     } else {
         BindNpcInteract(NPC_SELF, N(interact_802412E8));
@@ -412,7 +412,7 @@ static s32 N(pad_184C) = {
 };
 
 Script N(makeEntities) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
+    if (SI_STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
         MakeEntity(0x802BCE84, 0, 30, 0, 0, MAKE_ENTITY_END);
     }
 });

src/world/area_arn/arn_08/header.c

@@ -15,7 +15,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240300) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_HEART_FLED_FIRST_TUNNEL {
             SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8);
         }

src/world/area_arn/arn_09/events.c

@@ -38,7 +38,7 @@ Script N(80240220) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_WINDY_MILL;
+    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524288);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -130,11 +130,11 @@ Script N(idle_802405FC) = SCRIPT({
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
     NpcJump0(NPC_SELF, 0, 200, 0, 15);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WELL;
+    SI_STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WELL;
 });
 
 Script N(init_80240730) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH3_HEART_FLED_SECOND_TUNNEL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_FLED_SECOND_TUNNEL) {
         RemoveNpc(NPC_SELF);
     } else {
         BindNpcIdle(NPC_SELF, N(idle_802405FC));

src/world/area_arn/arn_09/header.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(802400A0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_HEART_FLED_FIRST_TUNNEL {
             SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8);
         }

src/world/area_arn/arn_10/events.c

@@ -52,7 +52,7 @@ Script N(enterSingleDoor_80240290) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_WINDY_MILL;
+    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524289);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -134,7 +134,7 @@ Script N(idle_802404F8) = SCRIPT({
     NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
     EnableNpcShadow(NPC_SELF, FALSE);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
+    SI_STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
 });
 
 Script N(defeat_802406F4) = SCRIPT({
@@ -144,13 +144,13 @@ Script N(defeat_802406F4) = SCRIPT({
 
 Script N(init_80240720) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_802404F8));
-    if (STORY_PROGRESS != STORY_UNUSED_FFFFFFEC) {
+    if (SI_STORY_PROGRESS != STORY_UNUSED_FFFFFFEC) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(init_8024076C) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
         if (SI_SAVE_FLAG(1016) == 1) {
             RemoveNpc(NPC_SELF);
             return;

src/world/area_arn/arn_10/header.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240060) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_HEART_FLED_FIRST_TUNNEL {
             SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8);
         }

src/world/area_arn/arn_11/events.c

@@ -74,7 +74,7 @@ Script N(enterSingleDoor_802404F8) = SCRIPT({
     SI_VAR(3) = -1;
     await EnterSingleDoor;
     spawn N(802404CC);
-    if (STORY_PROGRESS < STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
+    if (SI_STORY_PROGRESS < STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
         sleep 10;
         spawn N(802400F0);
         spawn N(802401BC);
@@ -84,7 +84,7 @@ Script N(enterSingleDoor_802404F8) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_WINDY_MILL;
+    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524290);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -234,11 +234,11 @@ Script N(defeat_802409DC) = SCRIPT({
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
-    STORY_PROGRESS = STORY_CH3_HEART_FLED_FIRST_TUNNEL;
+    SI_STORY_PROGRESS = STORY_CH3_HEART_FLED_FIRST_TUNNEL;
 });
 
 Script N(init_80240E70) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
+    if (SI_STORY_PROGRESS >= STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
         RemoveNpc(NPC_SELF);
     } else {
         SetSelfVar(0, 0);

src/world/area_arn/arn_11/header.c

@@ -13,7 +13,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240050) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_WENT_DOWN_THE_WELL {
             SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8);
         }

src/world/area_arn/arn_12/events.c

@@ -52,7 +52,7 @@ Script N(enterSingleDoor_80240290) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_WINDY_MILL;
+    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524291);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -133,7 +133,7 @@ Script N(idle_802404E8) = SCRIPT({
     NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
     EnableNpcShadow(NPC_SELF, FALSE);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    STORY_PROGRESS = STORY_UNUSED_FFFFFFEC;
+    SI_STORY_PROGRESS = STORY_UNUSED_FFFFFFEC;
 });
 
 Script N(defeat_802406E4) = SCRIPT({
@@ -143,13 +143,13 @@ Script N(defeat_802406E4) = SCRIPT({
 
 Script N(init_80240710) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_802404E8));
-    if (STORY_PROGRESS != STORY_UNUSED_FFFFFFEB) {
+    if (SI_STORY_PROGRESS != STORY_UNUSED_FFFFFFEB) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(init_8024075C) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
         if (SI_SAVE_FLAG(1017) == 1) {
             RemoveNpc(NPC_SELF);
             return;

src/world/area_arn/arn_12/header.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240060) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_HEART_FLED_FIRST_TUNNEL {
             SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8);
         }

src/world/area_arn/arn_13/events.c

@@ -52,7 +52,7 @@ Script N(enterSingleDoor_80240290) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_WINDY_MILL;
+    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524292);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -134,7 +134,7 @@ Script N(idle_802404F8) = SCRIPT({
     NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
     EnableNpcShadow(NPC_SELF, FALSE);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
+    SI_STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
 });
 
 Script N(defeat_802406F4) = SCRIPT({
@@ -144,13 +144,13 @@ Script N(defeat_802406F4) = SCRIPT({
 
 Script N(init_80240720) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_802404F8));
-    if (STORY_PROGRESS != STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
+    if (SI_STORY_PROGRESS != STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(init_8024076C) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
         if (SI_SAVE_FLAG(1018) == 1) {
             RemoveNpc(NPC_SELF);
             return;

src/world/area_arn/arn_13/header.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240060) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_HEART_FLED_FIRST_TUNNEL {
             SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8);
         }

src/world/area_dgb/dgb_00/BFA0A0.c

@@ -22,7 +22,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240110) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
         }
@@ -57,7 +57,7 @@ Script N(exitDoubleDoor_8024021C) = SCRIPT({
 
 Script N(802402D0) = SCRIPT({
     bind N(exitWalk_802401C0) TRIGGER_FLOOR_ABOVE 15;
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES {
             bind N(exitDoubleDoor_8024021C) TRIGGER_WALL_PRESS_A 18;
         }
@@ -86,8 +86,8 @@ Script N(enterDoubleDoor_8024038C) = SCRIPT({
             sleep 1;
         }
         == 1 {
-            if (STORY_PROGRESS >= STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) {
+            if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) {
-                if (STORY_PROGRESS < STORY_CH3_ESCAPED_TUBBAS_MANOR) {
+                if (SI_STORY_PROGRESS < STORY_CH3_ESCAPED_TUBBAS_MANOR) {
                     spawn N(802402D0);
                     spawn {
                         await N(8024103C);
@@ -110,7 +110,7 @@ Script N(enterDoubleDoor_8024038C) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SI_SAVE_FLAG(1978) = 1;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);

src/world/area_dgb/dgb_00/BFA100.c

@@ -319,7 +319,7 @@ Script N(802413F4) = SCRIPT({
     SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 5, MESSAGE_ID(0x0E, 0x00E8));
     SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6));
     spawn N(80240F50);
-    STORY_PROGRESS = STORY_CH3_ESCAPED_TUBBAS_MANOR;
+    SI_STORY_PROGRESS = STORY_CH3_ESCAPED_TUBBAS_MANOR;
     DisablePlayerInput(FALSE);
 });
 

src/world/area_dgb/dgb_01/BFD9A0.c

@@ -21,7 +21,7 @@ MapConfig N(config) = {
 };
 
 Script N(802434A0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -143,7 +143,7 @@ Script N(enterDoubleDoor_80243A3C) = SCRIPT({
         == 0 {
             if (SI_SAVE_FLAG(1041) == 0) {
                 SI_SAVE_FLAG(1041) = 1;
-                STORY_PROGRESS = STORY_CH3_ARRIVED_AT_TUBBAS_MANOR;
+                SI_STORY_PROGRESS = STORY_CH3_ARRIVED_AT_TUBBAS_MANOR;
             }
             SI_VAR(2) = 54;
             SI_VAR(3) = 57;
@@ -188,7 +188,7 @@ s32 N(itemList_80243C40)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -209,7 +209,7 @@ Script N(main) = SCRIPT({
     } else {
         bind N(exitDoubleDoor_802436B8) TRIGGER_WALL_PRESS_A 20;
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             MakeNpcs(1, N(npcGroupList_80246E50));
         }
@@ -376,7 +376,7 @@ Script N(80243EF0) = SCRIPT({
     SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
-    STORY_PROGRESS = STORY_CH3_TUBBA_SMASHED_THE_BRIDGES;
+    SI_STORY_PROGRESS = STORY_CH3_TUBBA_SMASHED_THE_BRIDGES;
     SetGroupEnabled(210, 1);
     DeleteAnimatedModel(0);
     spawn {
@@ -404,7 +404,7 @@ Script N(80243EF0) = SCRIPT({
 });
 
 Script N(802449C4) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetGroupEnabled(210, 0);
             ModifyColliderFlags(0, 50, 0x7FFFFE00);
@@ -1356,7 +1356,7 @@ Script N(init_80245814) = SCRIPT({
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE);
         return;
     }
-    if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) {
+    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE);
         return;
@@ -1377,7 +1377,7 @@ Script N(init_80245814) = SCRIPT({
 Script N(idle_8024598C) = SCRIPT({
     AwaitPlayerApproach(0, 420, 400);
     SI_SAVE_VAR(203) = 1;
-    STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER;
+    SI_STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER;
     PlaySoundAtCollider(20, 455, 0);
     MakeLerp(0, 80, 10, 0);
     loop {
@@ -1439,7 +1439,7 @@ Script N(init_80245CF0) = SCRIPT({
 });
 
 Script N(init_80245D80) = SCRIPT({
-    SI_VAR(0) = STORY_PROGRESS;
+    SI_VAR(0) = SI_STORY_PROGRESS;
     if (SI_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
@@ -1451,7 +1451,7 @@ Script N(init_80245D80) = SCRIPT({
 });
 
 Script N(init_80245E44) = SCRIPT({
-    SI_VAR(0) = STORY_PROGRESS;
+    SI_VAR(0) = SI_STORY_PROGRESS;
     if (SI_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
@@ -1463,7 +1463,7 @@ Script N(init_80245E44) = SCRIPT({
 });
 
 Script N(init_80245F08) = SCRIPT({
-    SI_VAR(0) = STORY_PROGRESS;
+    SI_VAR(0) = SI_STORY_PROGRESS;
     if (SI_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
@@ -1475,7 +1475,7 @@ Script N(init_80245F08) = SCRIPT({
 });
 
 Script N(init_80245FCC) = SCRIPT({
-    SI_VAR(0) = STORY_PROGRESS;
+    SI_VAR(0) = SI_STORY_PROGRESS;
     if (SI_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);

src/world/area_dgb/dgb_02/C2EBA0.c

@@ -27,7 +27,7 @@ MapConfig N(config) = {
 };
 
 Script N(802414B0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -130,12 +130,12 @@ Script N(enterSingleDoor_80241820) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_802425C8));
     }
     bind N(exitDoubleDoor_80241550) TRIGGER_WALL_PRESS_A 5;

src/world/area_dgb/dgb_03/C31730.c

@@ -31,7 +31,7 @@ MapConfig N(config) = {
 };
 
 Script N(80242870) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -175,12 +175,12 @@ s32 N(itemList_80242F28)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_80244988));
     }
     await N(makeEntities);

src/world/area_dgb/dgb_04/C36530.c

@@ -23,7 +23,7 @@ MapConfig N(config) = {
 };
 
 Script N(80243170) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -86,13 +86,13 @@ Script N(enterSingleDoor_80243378) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_80243D18));
     }
     await N(makeEntities);

src/world/area_dgb/dgb_05/C3AA10.c

@@ -24,7 +24,7 @@ MapConfig N(config) = {
 };
 
 Script N(802414E0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -67,13 +67,13 @@ Script N(enterSingleDoor_80241634) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_8024230C));
     }
     await N(makeEntities);

src/world/area_dgb/dgb_06/C3D080.c

@@ -19,7 +19,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240320) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -62,7 +62,7 @@ Script N(enterSingleDoor_80240474) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(589824);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -149,7 +149,7 @@ Script N(interact_8024086C) = SCRIPT({
 });
 
 Script N(init_802408FC) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
+    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
     }
     BindNpcInteract(NPC_SELF, N(interact_8024086C));

src/world/area_dgb/dgb_07/C3DBF0.c

@@ -23,7 +23,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241490) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -66,13 +66,13 @@ Script N(enterSingleDoor_802415E4) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_80241E5C));
     }
     await N(makeEntities);

src/world/area_dgb/dgb_08/C3FDB0.c

@@ -33,7 +33,7 @@ MapConfig N(config) = {
 };
 
 Script N(80243CF0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -99,12 +99,12 @@ Script N(enterDoubleDoor_80243EF8) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES {
             MakeNpcs(1, N(npcGroupList_80246958));
         }
@@ -382,7 +382,7 @@ Script N(idle_80244A54) = SCRIPT({
         sleep 1;
     }
     SI_SAVE_VAR(203) = 8;
-    STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL;
+    SI_STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL;
     PlaySoundAtCollider(18, 455, 0);
     MakeLerp(0, 80, 10, 0);
     loop {
@@ -451,12 +451,12 @@ Script N(defeat_80244E58) = SCRIPT({
 });
 
 Script N(init_80244E94) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) {
+    if (SI_STORY_PROGRESS < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE);
         return;
     }
-    if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
+    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE);
         return;

src/world/area_dgb/dgb_09/C46BE0.c

@@ -29,7 +29,7 @@ MapConfig N(config) = {
 };
 
 Script N(80243880) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -126,12 +126,12 @@ Script N(enterWalk_80243BC4) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_8024533C));
     }
     spawn N(80243F6C);

src/world/area_dgb/dgb_10/C4C390.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240250) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -65,7 +65,7 @@ Script N(enterWalk_80240378) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_dgb/dgb_11/C4D3E0.c

@@ -18,7 +18,7 @@ MapConfig N(config) = {
 };
 
 Script N(802400D0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -92,7 +92,7 @@ Script N(enterSingleDoor_80240224) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_dgb/dgb_12/C4DEF0.c

@@ -13,7 +13,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240310) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -56,7 +56,7 @@ Script N(enterSingleDoor_80240464) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_dgb/dgb_13/C4E960.c

@@ -13,7 +13,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240050) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -36,7 +36,7 @@ Script N(8024014C) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_dgb/dgb_14/C4F030.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240060) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -84,7 +84,7 @@ Script N(enterDoubleDoor_80240268) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_dgb/dgb_15/C4F510.c

@@ -22,7 +22,7 @@ MapConfig N(config) = {
 };
 
 Script N(802418E0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             if (SI_SAVE_VAR(203) == 15) {
                 SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8);
@@ -127,7 +127,7 @@ Script N(enterSingleDoor_80241C88) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SI_AREA_FLAG(1) = 0;
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -339,7 +339,7 @@ Script N(defeat_802427B0) = SCRIPT({
 });
 
 Script N(init_802427EC) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH3_ARRIVED_AT_TUBBAS_MANOR) {
+    if (SI_STORY_PROGRESS != STORY_CH3_ARRIVED_AT_TUBBAS_MANOR) {
         RemoveNpc(NPC_SELF);
         return;
     }

src/world/area_dgb/dgb_16/C52540.c

@@ -32,7 +32,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241480) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -81,12 +81,12 @@ Script N(enterSingleDoor_802415D4) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_8024318C));
     }
     await N(80241780);

src/world/area_dgb/dgb_17/C55A60.c

@@ -14,7 +14,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240060) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -88,7 +88,7 @@ Script N(enterDoubleDoor_802402B0) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_dgb/dgb_18/C55F40.c

@@ -25,7 +25,7 @@ MapConfig N(config) = {
 };
 
 Script N(802412C0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -68,7 +68,7 @@ Script N(enterDoubleDoor_80241414) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -338,7 +338,7 @@ Script N(idle_80241654) = SCRIPT({
     SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
-    STORY_PROGRESS = STORY_CH3_TUBBA_BEGAN_NAPPING;
+    SI_STORY_PROGRESS = STORY_CH3_TUBBA_BEGAN_NAPPING;
     DisablePlayerInput(FALSE);
 });
 
@@ -424,7 +424,7 @@ const char N(pad_XXX)[] = { 0, 0 };
 Script N(init_80242924) = SCRIPT({
     SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25);
     BindNpcDefeat(NPC_SELF, N(defeat_802428E8));
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH3_TUBBA_BEGAN_NAPPING {
             BindNpcIdle(NPC_SELF, N(idle_80241654));
         }
@@ -559,7 +559,7 @@ Script N(idle_80242A24) = SCRIPT({
     SI_VAR(1) -= 10;
     NpcJump0(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    STORY_PROGRESS = STORY_CH3_TUBBA_WOKE_UP;
+    SI_STORY_PROGRESS = STORY_CH3_TUBBA_WOKE_UP;
     DisablePlayerInput(FALSE);
 });
 

src/world/area_dro/dro_01/95B7E0.c

@@ -447,17 +447,17 @@ Script N(enterWalk_80244C14) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_DRY_DRY_OUTPOST;
+    SI_WORLD_LOCATION = LOCATION_DRY_DRY_OUTPOST;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
     SetCamLeadPlayer(0, 0);
     SI_SAVE_FLAG(1973) = 1;
-    if (STORY_PROGRESS < STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) {
+    if (SI_STORY_PROGRESS < STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) {
-        STORY_PROGRESS = STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST;
+        SI_STORY_PROGRESS = STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST;
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         -53 ... 6 {
             MakeNpcs(0, N(npcGroupList_8024B47C));
         } else {
@@ -1314,7 +1314,7 @@ Script N(80247D20) = SCRIPT({
 
 Script N(80247D90) = SCRIPT({
     SI_VAR(12) = 0;
-    if (STORY_PROGRESS < STORY_CH2_PARAKARRY_JOINED_PARTY) {
+    if (SI_STORY_PROGRESS < STORY_CH2_PARAKARRY_JOINED_PARTY) {
         return;
     }
     N(func_80243014_95E214)();
@@ -1373,7 +1373,7 @@ Script N(80248090) = SCRIPT({
 });
 
 Script N(interact_802480E0) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH2_STAR_SPRIT_DEPARTED) {
+    if (SI_STORY_PROGRESS >= STORY_CH2_STAR_SPRIT_DEPARTED) {
         SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D,
                       0x0062));
         return;
@@ -1399,9 +1399,9 @@ Script N(init_802481F8) = SCRIPT({
 });
 
 Script N(interact_8024821C) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
-            if (STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
+            if (SI_STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
                 if (SI_AREA_VAR(1) == 2) {
                     SI_AREA_VAR(1) = 0;
                 }
@@ -1522,7 +1522,7 @@ Script N(interact_80248864) = SCRIPT({
             }
         }
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_AREA_FLAG(1) == 0) {
                 SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0,
@@ -1616,7 +1616,7 @@ Script N(interact_80248D54) = SCRIPT({
             return;
         } else {
             if (SI_SAVE_FLAG(755) == 0) {
-                if (STORY_PROGRESS < STORY_CH7_BEGAN_PEACH_MISSION) {
+                if (SI_STORY_PROGRESS < STORY_CH7_BEGAN_PEACH_MISSION) {
                     SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0,
                                   MESSAGE_ID(0x0D, 0x0085));
                     SetPlayerAnimation(ANIM_NOD_YES);
@@ -1630,7 +1630,7 @@ Script N(interact_80248D54) = SCRIPT({
             }
         }
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_AREA_FLAG(2) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0,
@@ -1693,7 +1693,7 @@ Script N(init_80249168) = SCRIPT({
 });
 
 Script N(idle_8024918C) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_SHADY_MOUSE_LEFT_SHOP {
             N(func_80243350_95E550)(16, 190, -134, -131);
             DisablePlayerInput(TRUE);
@@ -1740,7 +1740,7 @@ Script N(idle_8024918C) = SCRIPT({
             WaitForCam(0, 1.0);
             PanToTarget(0, 0, 0);
             DisablePlayerInput(FALSE);
-            STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_LEFT_SHOP;
+            SI_STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_LEFT_SHOP;
         }
         < STORY_CH2_SPOKE_WITH_SHEEK {}
         < STORY_CH2_SHADY_MOUSE_ENTERED_SHOP {
@@ -1758,7 +1758,7 @@ Script N(idle_8024918C) = SCRIPT({
             SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1));
             await N(8024C4C8);
             EnableNpcBlur(-1, 0);
-            STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_ENTERED_SHOP;
+            SI_STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_ENTERED_SHOP;
         } else {
             SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1));
             SetNpcPos(NPC_SELF, 20, 0, -375);
@@ -2314,7 +2314,7 @@ Script N(8024B6B4) = SCRIPT({
     N(func_80243578_95E778)();
     func_802D2C14(1);
     await N(8024B614);
-    if (STORY_PROGRESS < STORY_CH2_BOUGHT_SECRET_ITEMS) {
+    if (SI_STORY_PROGRESS < STORY_CH2_BOUGHT_SECRET_ITEMS) {
         SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0087));
         SetPlayerAnimation(ANIM_10002);
         sleep 10;
@@ -2322,7 +2322,7 @@ Script N(8024B6B4) = SCRIPT({
         sleep 30;
     }
     SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0088));
-    STORY_PROGRESS = STORY_CH2_BOUGHT_SECRET_ITEMS;
+    SI_STORY_PROGRESS = STORY_CH2_BOUGHT_SECRET_ITEMS;
     func_802D2C14(0);
     await N(8024B664);
 });
@@ -2331,7 +2331,7 @@ Script N(8024B6B4) = {
     SI_CMD(ScriptOpcode_CALL, N(func_80243578_95E778)),
     SI_CMD(ScriptOpcode_CALL, func_802D2C14, 1),
     SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(8024B614)),
-    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), -64),
+    SI_CMD(ScriptOpcode_IF_LT, SI_STORY_PROGRESS, -64),
         SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, 6, 9699589, 9699585, 0, 852103),
         SI_CMD(ScriptOpcode_CALL, SetPlayerAnimation, 65538),
         SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
@@ -2339,7 +2339,7 @@ Script N(8024B6B4) = {
         SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
     SI_CMD(ScriptOpcode_END_IF),
     SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, 6, 9699589, 9699585, 0, 852104),
-    SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(0), -64),
+    SI_CMD(ScriptOpcode_SET, SI_STORY_PROGRESS, -64),
     SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
     SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(8024B664)),
 SI_CMD(ScriptOpcode_END_IF),
@@ -2391,7 +2391,7 @@ Script N(8024B894) = SCRIPT({
                 == 134 {
                     SI_AREA_VAR(4) = 2;
                     if (SI_VAR(2) == 1) {
-                        if (STORY_PROGRESS < STORY_CH2_GOT_PULSE_STONE) {
+                        if (SI_STORY_PROGRESS < STORY_CH2_GOT_PULSE_STONE) {
                             await N(8024B6B4);
                             SI_AREA_VAR(4) = 0;
                         }
@@ -2507,7 +2507,7 @@ Script N(toggleVis_8024BFDC) = SCRIPT({
 Script N(toggleVis_8024C040) = SCRIPT({
     match SI_VAR(0) {
         == 0 {
-            match STORY_PROGRESS {
+            match SI_STORY_PROGRESS {
                 < STORY_CH2_SPOKE_WITH_SHEEK {
                     ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x017B), 160, 40);
                     SI_VAR(0) = -1;
@@ -3032,7 +3032,7 @@ ApiStatus N(func_802415AC_95C7AC)(ScriptInstance* script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_dro/dro_02/9694C0.c

@@ -179,7 +179,7 @@ Script N(80243D10) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_DRY_DRY_OUTPOST;
+    SI_WORLD_LOCATION = LOCATION_DRY_DRY_OUTPOST;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -422,12 +422,12 @@ s32 N(npcList_80244C70)[] = {
 Script N(80244C78) = SCRIPT({
     spawn N(802441C0);
     ParentColliderToModel(8, 21);
-    if (STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
+    if (SI_STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
         RotateModel(21, 18, 0, 1, 0);
         UpdateColliderTransform(8);
     }
     MakeDoorAdvanced(4, N(openDoor_80244340), N(moveWalls_80244390), N(dropDoor_80244474), N(toggleVis_8024468C), 15, 16, 133, N(npcList_80244C64));
-    if (STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
+    if (SI_STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
         bind N(8024486C) TRIGGER_WALL_PRESS_A 8;
         bind N(80244A68) TRIGGER_WALL_PRESS_A 10;
     }
@@ -2137,7 +2137,7 @@ Script N(8024B530) = SCRIPT({
 
 Script N(8024B5A0) = SCRIPT({
     SI_VAR(12) = 0;
-    if (STORY_PROGRESS < STORY_CH2_PARAKARRY_JOINED_PARTY) {
+    if (SI_STORY_PROGRESS < STORY_CH2_PARAKARRY_JOINED_PARTY) {
         return;
     }
     N(func_802439FC_96CBBC)();
@@ -2195,7 +2195,7 @@ Script N(8024B8A0) = SCRIPT({
 });
 
 Script N(interact_8024B8F0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_SAVE_FLAG(787) == 1) {
                 SpeakToPlayer(NPC_SELF, 0xB80004, 0xB80001, 0, MESSAGE_ID(0x0D, 0x00B2));
@@ -2223,13 +2223,13 @@ Script N(interact_8024B8F0) = SCRIPT({
 
 Script N(init_8024BA50) = SCRIPT({
     BindNpcInteract(NPC_SELF, N(interact_8024B8F0));
-    if (STORY_PROGRESS >= STORY_UNUSED_FFFFFFCC) {
+    if (SI_STORY_PROGRESS >= STORY_UNUSED_FFFFFFCC) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(interact_8024BA9C) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_SAVE_FLAG(747) == 0) {
                 SpeakToPlayer(NPC_SELF, 0x930204, 0x930201, 0, MESSAGE_ID(0x0D, 0x0091));
@@ -2254,7 +2254,7 @@ Script N(init_8024BBAC) = SCRIPT({
 });
 
 Script N(interact_8024BBD0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_AREA_FLAG(3) == 0) {
                 SpeakToPlayer(NPC_SELF, 0x930004, 0x930001, 0, MESSAGE_ID(0x0D, 0x00A1));
@@ -2285,7 +2285,7 @@ Script N(init_8024BD28) = SCRIPT({
 });
 
 Script N(interact_8024BD4C) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_AREA_FLAG(4) == 0) {
                 SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00A5));
@@ -2320,7 +2320,7 @@ Script N(init_8024BF10) = SCRIPT({
 });
 
 Script N(interact_8024BF34) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_STAR_SPRIT_DEPARTED {
             if (SI_AREA_FLAG(5) == 0) {
                 SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00AB));
@@ -2405,7 +2405,7 @@ Script N(8024C248) = SCRIPT({
 });
 
 Script N(idle_8024C450) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_BOUGHT_SECRET_ITEMS {}
         < STORY_CH2_GOT_PULSE_STONE {
             SetNpcPos(NPC_SELF, -335, 163, -260);
@@ -2422,7 +2422,7 @@ Script N(interact_8024C4EC) = SCRIPT({
         SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CF));
         return;
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH2_BOUGHT_SECRET_ITEMS {
             SI_VAR(11) = 0;
             SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B4));
@@ -2565,18 +2565,18 @@ Script N(interact_8024C4EC) = SCRIPT({
             SI_VAR(1) = 1;
             await N(80244DE4);
             AddKeyItem(ITEM_PULSE_STONE);
-            STORY_PROGRESS = STORY_CH2_GOT_PULSE_STONE;
+            SI_STORY_PROGRESS = STORY_CH2_GOT_PULSE_STONE;
             SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CA));
             kill SI_VAR(10);
             spawn N(80243AF0);
         }
         >= -63 {
-            match STORY_PROGRESS {
+            match SI_STORY_PROGRESS {
                 < STORY_CH2_UNCOVERED_DRY_DRY_RUINS {
                     SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CB));
                 }
                 >= STORY_CH2_UNCOVERED_DRY_DRY_RUINS {
-                    if (STORY_PROGRESS >= STORY_CH2_DEFEATED_TUTANKOOPA) {
+                    if (SI_STORY_PROGRESS >= STORY_CH2_DEFEATED_TUTANKOOPA) {
                         if (SI_SAVE_FLAG(751) == 0) {
                             SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CD));
                             SetPlayerAnimation(ANIM_10002);
@@ -2651,12 +2651,12 @@ Script N(idle_8024D154) = SCRIPT({
     NpcMoveTo(NPC_SELF, -371, 5, 20);
     NpcMoveTo(NPC_SELF, -487, 5, 20);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    STORY_PROGRESS = STORY_CH2_SPOKE_WITH_SHEEK;
+    SI_STORY_PROGRESS = STORY_CH2_SPOKE_WITH_SHEEK;
 });
 
 Script N(init_8024D3E8) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_8024D154));
-    if (STORY_PROGRESS >= STORY_CH2_SPOKE_WITH_SHEEK) {
+    if (SI_STORY_PROGRESS >= STORY_CH2_SPOKE_WITH_SHEEK) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -3145,7 +3145,7 @@ ApiStatus N(func_8024043C_9695FC)(ScriptInstance* script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
@@ -3562,8 +3562,9 @@ void N(func_80242214_96B3D4)(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg
     Matrix4f sp60;
     Matrix4f spA0;
 
-    guPositionF(&spA0, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 0.71428573f, get_variable(*CC_ptr, SI_ARRAY(4)),
+    guPositionF(&spA0, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE,
-                get_variable(*CC_ptr, SI_ARRAY(5)), get_variable(*CC_ptr, SI_ARRAY(6)));
+                get_variable(*CC_ptr, SI_ARRAY(4)), get_variable(*CC_ptr, SI_ARRAY(5)),
+                get_variable(*CC_ptr, SI_ARRAY(6)));
 
     F010_ptr = ({ D_8024F010_Struct* a = &N(D_8024F010); &a[arg0]; });
     guTranslateF(&sp60, F010_ptr->unk_04, F010_ptr->unk_08, F010_ptr->unk_0C);
@@ -3898,8 +3899,9 @@ void N(func_80242EAC_96C06C)(ScriptInstance* script, s32 isInitialCall) {
     Matrix4f sp20;
     u32 temp_s1;
 
-    guPositionF(&sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 0.71428573f, get_variable(N(D_8024EFCC),
+    guPositionF(&sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE,
-                SI_ARRAY(4)), get_variable(N(D_8024EFCC), SI_ARRAY(5)), get_variable(N(D_8024EFCC), SI_ARRAY(6)));
+                get_variable(N(D_8024EFCC), SI_ARRAY(4)), get_variable(N(D_8024EFCC), SI_ARRAY(5)),
+                get_variable(N(D_8024EFCC), SI_ARRAY(6)));
 
     temp_s1 = N(func_8024190C_96AACC)(&N(D_8024F010)[0], &sp20);
     N(func_8024190C_96AACC)(&N(D_8024F010)[1], &sp20);

src/world/area_flo/flo_00/C9DF60.c

@@ -59,7 +59,7 @@ Script N(802414D0) = SCRIPT({
             spawn {
                 loop {
                     sleep 1;
-                    if (STORY_PROGRESS >= STORY_CH6_STAR_SPRIT_DEPARTED) {
+                    if (SI_STORY_PROGRESS >= STORY_CH6_STAR_SPRIT_DEPARTED) {
                         break loop;
                     }
                 }
@@ -69,7 +69,7 @@ Script N(802414D0) = SCRIPT({
         == 11 {
             FadeInMusic(0, 49, 0, 3000, 0, 127);
         } else {
-            match STORY_PROGRESS {
+            match SI_STORY_PROGRESS {
                 < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
                     SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
                 } else {
@@ -141,8 +141,8 @@ Script N(8024196C) = SCRIPT({
     func_802D2C14(1);
     PlayerMoveTo(0, -310, 30);
     func_802D2C14(0);
-    if (STORY_PROGRESS == STORY_CH6_STAR_SPRIT_DEPARTED) {
+    if (SI_STORY_PROGRESS == STORY_CH6_STAR_SPRIT_DEPARTED) {
-        STORY_PROGRESS = STORY_CH6_RETURNED_TO_TOAD_TOWN;
+        SI_STORY_PROGRESS = STORY_CH6_RETURNED_TO_TOAD_TOWN;
     }
     MakeLerp(-100, 0, 30, 1);
     loop {
@@ -262,14 +262,14 @@ Script N(enterWalk_8024205C) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
     SI_SAVE_FLAG(1984) = 1;
-    if (STORY_PROGRESS < STORY_CH6_GREW_MAGIC_BEANSTALK) {
+    if (SI_STORY_PROGRESS < STORY_CH6_GREW_MAGIC_BEANSTALK) {
         ModifyColliderFlags(0, 48, 0x7FFFFE00);
     }
     SI_SAVE_FLAG(263) = 0;
@@ -322,7 +322,7 @@ Script N(main) = SCRIPT({
         }
     }
     await N(802414D0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_C9DF20)();
     }
     spawn {
@@ -485,7 +485,7 @@ Script N(80242AF0) = SCRIPT({
     sleep 10;
     ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0005), 0, 70, -200);
     ResetCam(0, 90.0);
-    STORY_PROGRESS = STORY_CH6_ARRIVED_AT_FLOWER_FIELDS;
+    SI_STORY_PROGRESS = STORY_CH6_ARRIVED_AT_FLOWER_FIELDS;
     func_802D2C14(0);
     DisablePlayerInput(FALSE);
 });
@@ -508,19 +508,19 @@ Script N(80242FCC) = SCRIPT({
         DisablePlayerInput(FALSE);
         return;
     }
-    if (STORY_PROGRESS == STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS == STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0006), 0, 50, -200);
-        STORY_PROGRESS = STORY_CH6_WISTERWOOD_GAVE_HINT;
+        SI_STORY_PROGRESS = STORY_CH6_WISTERWOOD_GAVE_HINT;
         DisablePlayerInput(FALSE);
         return;
     }
-    if (STORY_PROGRESS < STORY_CH6_RETURNED_TO_TOAD_TOWN) {
+    if (SI_STORY_PROGRESS < STORY_CH6_RETURNED_TO_TOAD_TOWN) {
         ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x000D), 0, 50, -200);
         ShowChoice(MESSAGE_ID(0x1E, 0x001F));
         sleep 10;
         match SI_VAR(0) {
             == 0 {
-                match STORY_PROGRESS {
+                match SI_STORY_PROGRESS {
                     < STORY_CH6_GOT_MAGICAL_BEAN {
                         SwitchMessage(MESSAGE_ID(0x11, 0x000E));
                     }
@@ -594,13 +594,13 @@ Script N(init_80243474) = SCRIPT({
     SetNpcPos(NPC_SELF, 50, 70, -230);
     SetNpcFlagBits(NPC_SELF, ((0x00000002)), TRUE);
     EnableNpcShadow(NPC_SELF, FALSE);
-    if (STORY_PROGRESS < STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) {
         spawn N(80242AF0);
     }
 });
 
 Script N(interact_8024352C) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0016));
         }
@@ -632,7 +632,7 @@ Script N(interact_8024352C) = SCRIPT({
 });
 
 Script N(interact_802436C0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001D));
         }
@@ -664,7 +664,7 @@ Script N(interact_802436C0) = SCRIPT({
 });
 
 Script N(interact_80243854) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0024));
         }
@@ -696,7 +696,7 @@ Script N(interact_80243854) = SCRIPT({
 });
 
 Script N(interact_802439E8) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002B));
         }
@@ -752,7 +752,7 @@ Script N(interact_80243C4C) = SCRIPT({
         AdjustCam(0, 4.0, -30, 300, 20.0, -9.5);
         SI_SAVE_FLAG(1373) = 1;
     }
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             match SI_AREA_VAR(0) {
                 == 0 {
@@ -979,7 +979,7 @@ Script N(8024427C) = SCRIPT({
     SetPlayerAnimation(0x1002A);
     sleep 110;
     SetPlayerAnimation(ANIM_10002);
-    STORY_PROGRESS = STORY_CH6_STAR_SPRIT_DEPARTED;
+    SI_STORY_PROGRESS = STORY_CH6_STAR_SPRIT_DEPARTED;
     await N(80243368);
     EnablePartnerAI();
     DisablePlayerInput(FALSE);
@@ -999,7 +999,7 @@ Script N(init_80244BF4) = SCRIPT({
 });
 
 Script N(interact_80244C98) = SCRIPT({
-    if (STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0,
                       MESSAGE_ID(0x11, 0x0032));
     } else {
@@ -1022,7 +1022,7 @@ Script N(interact_80244C98) = SCRIPT({
 });
 
 Script N(init_80244DD0) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_BEGAN_PEACH_MISSION) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_BEGAN_PEACH_MISSION) {
         BindNpcInteract(NPC_SELF, N(interact_80244C98));
         SetNpcCollisionSize(-1, 36, 28);
         SetNpcPos(NPC_SELF, -200, 15, -300);
@@ -2017,10 +2017,10 @@ Script N(80248D3C) = SCRIPT({
 });
 
 Script N(80248E30) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_GREW_MAGIC_BEANSTALK) {
+    if (SI_STORY_PROGRESS < STORY_CH6_GREW_MAGIC_BEANSTALK) {
         loop {
             sleep 1;
-            if (STORY_PROGRESS == STORY_CH6_WISTERWOOD_GAVE_HINT) {
+            if (SI_STORY_PROGRESS == STORY_CH6_WISTERWOOD_GAVE_HINT) {
                 break;
             }
         }
@@ -2040,7 +2040,7 @@ Script N(80248F48) = SCRIPT({
     bind N(802477EC) TRIGGER_FLOOR_TOUCH 46;
     EnableGroup(121, 1);
     EnableGroup(80, 1);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         == STORY_CH6_WISTERWOOD_GAVE_HINT {
             SI_VAR(0) = -700;
             spawn N(80246850);
@@ -2076,7 +2076,7 @@ static s32 N(pad_9128)[] = {
 };
 
 Script N(makeEntities) = SCRIPT({
-    if (STORY_PROGRESS < STORY_EPILOGUE) {
+    if (SI_STORY_PROGRESS < STORY_EPILOGUE) {
         MakeEntity(0x802E9A18, 110, 60, -100, 0, MAKE_ENTITY_END);
     }
 });

src/world/area_flo/flo_03/CA72E0.c

@@ -32,7 +32,7 @@ Script N(802406A0) = SCRIPT({
     if (SI_VAR(0) == 2) {
         SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
     } else {
-        match STORY_PROGRESS {
+        match SI_STORY_PROGRESS {
             <= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
                 if (SI_SAVE_FLAG(1411) == 0) {
                     SetMusicTrack(0, SONG_MONTY_MOLE_ASSAULT, 0, 8);
@@ -50,7 +50,7 @@ Script N(802406A0) = SCRIPT({
 });
 
 Script N(802407C0) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
         if (SI_SAVE_FLAG(1411) == 1) {
             PushSong(137, 0);
         }
@@ -58,7 +58,7 @@ Script N(802407C0) = SCRIPT({
 });
 
 Script N(80240814) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
         if (SI_SAVE_FLAG(1411) == 1) {
             FadeOutMusic(0, 250);
             sleep 10;
@@ -116,7 +116,7 @@ Script N(80240BE4) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -152,7 +152,7 @@ Script N(main) = SCRIPT({
         spawn EnterWalk;
     }
     await N(802406A0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CA72A0)();
     }
 });
@@ -254,7 +254,7 @@ Script N(8024122C) = SCRIPT({
 
 Script N(interact_802412BC) = SCRIPT({
     await N(802407C0);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             SI_MAP_VAR(14) = 1;
             SI_VAR(4) = (int) 3.5;
@@ -348,7 +348,7 @@ Script N(interact_802412BC) = SCRIPT({
             BindNpcAI(NPC_DAYZEE, N(npcAI_8024119C));
             SI_MAP_VAR(14) = 0;
             SI_MAP_VAR(15) = 60;
-            STORY_PROGRESS = STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES;
+            SI_STORY_PROGRESS = STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES;
         }
         == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             if (SI_SAVE_FLAG(1411) == 0) {
@@ -372,7 +372,7 @@ Script N(interact_802412BC) = SCRIPT({
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0,
                               MESSAGE_ID(0x11, 0x005A));
                 EndSpeech(-1, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0);
-                STORY_PROGRESS = STORY_CH6_GOT_MAGICAL_BEAN;
+                SI_STORY_PROGRESS = STORY_CH6_GOT_MAGICAL_BEAN;
             }
         }
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
@@ -407,7 +407,7 @@ Script N(init_80241DA4) = SCRIPT({
 Script N(init_80241E10) = SCRIPT({
     BindNpcDefeat(NPC_SELF, N(defeat_802411B8));
     EnableNpcShadow(NPC_DAYZEE, FALSE);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             SetNpcPos(NPC_DAYZEE, 0, -1000, 0);
         } else {
@@ -473,7 +473,7 @@ Script N(defeat_80241F64) = SCRIPT({
 });
 
 Script N(hit_80242138) = SCRIPT({
-    if (STORY_PROGRESS == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+    if (SI_STORY_PROGRESS == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
         GetOwnerEncounterTrigger(SI_VAR(0));
         if (SI_VAR(0) != 1) {
             SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_5));
@@ -507,7 +507,7 @@ Script N(idle_8024219C) = SCRIPT({
                 sleep 1;
                 SI_AREA_FLAG(23) = 1;
                 if (SI_MAP_VAR(10) != 0) {
-                    if (STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+                    if (SI_STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
                         SI_VAR(1) = 4;
                     } else {
                         SI_VAR(1) = 10;
@@ -583,7 +583,7 @@ Script N(idle_80242618) = SCRIPT({
                 sleep 1;
                 SI_AREA_FLAG(24) = 1;
                 if (SI_MAP_VAR(11) != 0) {
-                    if (STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+                    if (SI_STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
                         SI_VAR(1) = 4;
                     } else {
                         SI_VAR(1) = 10;
@@ -659,7 +659,7 @@ Script N(idle_80242A94) = SCRIPT({
                 sleep 1;
                 SI_AREA_FLAG(25) = 1;
                 if (SI_MAP_VAR(12) != 0) {
-                    if (STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+                    if (SI_STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
                         SI_VAR(1) = 4;
                     } else {
                         SI_VAR(1) = 10;
@@ -735,7 +735,7 @@ Script N(idle_80242F10) = SCRIPT({
                 sleep 1;
                 SI_AREA_FLAG(26) = 1;
                 if (SI_MAP_VAR(13) != 0) {
-                    if (STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+                    if (SI_STORY_PROGRESS < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
                         SI_VAR(1) = 4;
                     } else {
                         SI_VAR(1) = 10;
@@ -789,7 +789,7 @@ Script N(init_8024338C) = SCRIPT({
     BindNpcHit(-1, N(hit_80242138));
     BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
     EnableNpcShadow(NPC_MONTY_MOLE0, FALSE);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             BindNpcIdle(NPC_SELF, N(idle_8024219C));
             SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_10));
@@ -812,7 +812,7 @@ Script N(init_802434CC) = SCRIPT({
     BindNpcHit(-1, N(hit_80242138));
     BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
     EnableNpcShadow(NPC_MONTY_MOLE1, FALSE);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             BindNpcIdle(NPC_SELF, N(idle_80242618));
             SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10));
@@ -835,7 +835,7 @@ Script N(init_8024360C) = SCRIPT({
     BindNpcHit(-1, N(hit_80242138));
     BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
     EnableNpcShadow(NPC_MONTY_MOLE2, FALSE);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             BindNpcIdle(NPC_SELF, N(idle_80242A94));
             SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_10));
@@ -858,7 +858,7 @@ Script N(init_8024374C) = SCRIPT({
     BindNpcHit(-1, N(hit_80242138));
     BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
     EnableNpcShadow(NPC_MONTY_MOLE3, FALSE);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
             BindNpcIdle(NPC_SELF, N(idle_80242F10));
             SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_10));

src/world/area_flo/flo_07/CAC5D0.c

@@ -24,7 +24,7 @@ Script N(802407A0) = SCRIPT({
     if (SI_VAR(0) == 1) {
         SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
     } else {
-        match STORY_PROGRESS {
+        match SI_STORY_PROGRESS {
             < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
                 SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
             } else {
@@ -110,7 +110,7 @@ Script N(80240C74) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -195,7 +195,7 @@ Script N(main) = SCRIPT({
         spawn N(802424F4);
     }
     await N(802407A0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(SpawnSunEffect)();
     }
     N(func_80240344_CAC534)();
@@ -285,13 +285,13 @@ Script N(80241DBC) = SCRIPT({
     SI_AREA_FLAG(6) = 1;
     sleep 20;
     SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006A));
-    STORY_PROGRESS = STORY_CH6_GOT_CRYSTAL_BERRY;
+    SI_STORY_PROGRESS = STORY_CH6_GOT_CRYSTAL_BERRY;
 });
 
 Script N(interact_80242044) = SCRIPT({
     await N(8024086C);
     NpcFacePlayer(NPC_SELF, 1);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             if (SI_AREA_FLAG(5) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11,
@@ -312,7 +312,7 @@ Script N(interact_80242044) = SCRIPT({
             SI_VAR(1) = 1;
             await N(80241BB4);
             AddKeyItem(ITEM_FERTILE_SOIL);
-            STORY_PROGRESS = STORY_CH6_GOT_FERTILE_SOIL;
+            SI_STORY_PROGRESS = STORY_CH6_GOT_FERTILE_SOIL;
             SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0066));
             if (SI_SAVE_FLAG(1379) == 1) {
                 await N(80241DBC);
@@ -339,7 +339,7 @@ Script N(interact_80242044) = SCRIPT({
                 SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11,
                               0x0072));
             } else {
-                if (STORY_PROGRESS < STORY_CH6_GOT_WATER_STONE) {
+                if (SI_STORY_PROGRESS < STORY_CH6_GOT_WATER_STONE) {
                     SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11,
                                   0x0073));
                 } else {
@@ -361,7 +361,7 @@ Script N(interact_80242044) = SCRIPT({
 });
 
 Script N(init_80242428) = SCRIPT({
-    if (STORY_PROGRESS == STORY_CH6_GOT_CRYSTAL_BERRY) {
+    if (SI_STORY_PROGRESS == STORY_CH6_GOT_CRYSTAL_BERRY) {
         if (SI_SAVE_FLAG(1374) == 0) {
             if (SI_SAVE_FLAG(1396) == 0) {
                 MakeItemEntity(ITEM_CRYSTAL_BERRY, -225, 0, -25, 17, SI_SAVE_FLAG(1374));
@@ -397,12 +397,12 @@ const char N(flo_25_name_hack)[];
 
 Script N(tree1_Callback) = SCRIPT({
     DisablePlayerInput(TRUE);
-    if (STORY_PROGRESS < STORY_CH6_GOT_CRYSTAL_BERRY) {
+    if (SI_STORY_PROGRESS < STORY_CH6_GOT_CRYSTAL_BERRY) {
         NpcFacePlayer(NPC_POSIE, 1);
         sleep 10;
         SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_4), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11,
                       0x0067));
-        if (STORY_PROGRESS == STORY_CH6_GOT_FERTILE_SOIL) {
+        if (SI_STORY_PROGRESS == STORY_CH6_GOT_FERTILE_SOIL) {
             if (SI_SAVE_FLAG(1379) == 1) {
                 UseSettingsFrom(0, -250, 0, 0);
                 SetPanTarget(0, -250, 0, 0);

src/world/area_flo/flo_08/CAFAC0.c

@@ -36,7 +36,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241F40) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -239,7 +239,7 @@ s32 N(lavaResetList_80242A2C)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -300,7 +300,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(802429E4);
     spawn EnterWalk;
     await N(80241F40);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240D40_CAFA80)();
     }
 });
@@ -545,7 +545,7 @@ Script N(interact_80243214) = SCRIPT({
         }
         sleep 10;
     } else {
-        if (STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
+        if (SI_STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0,
                           MESSAGE_ID(0x11, 0x0047));
         } else {

src/world/area_flo/flo_09/CB50E0.c

@@ -24,7 +24,7 @@ MapConfig N(config) = {
 };
 
 Script N(80241880) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -82,7 +82,7 @@ Script N(80241C54) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -132,7 +132,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80241C54);
     spawn EnterWalk;
     await N(80241880);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CB5000)();
     }
 });

src/world/area_flo/flo_10/CB9200.c

@@ -1,7 +1,7 @@
 #include "flo_10.h"
 
 s32 N(func_80240000_CB9200)(void) {
-    if (get_variable(NULL, SI_SAVE_VAR(0)) <= 0x30) {
+    if (get_variable(NULL, SI_STORY_PROGRESS) <= 0x30) {
         return MESSAGE_ID(0x19, 0x0119);
     }
     return MESSAGE_ID(0x19, 0x011A);

src/world/area_flo/flo_10/CB9280.c

@@ -25,7 +25,7 @@ Script N(802414E0) = SCRIPT({
     if (SI_VAR(0) == 1) {
         SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
     } else {
-        match STORY_PROGRESS {
+        match SI_STORY_PROGRESS {
             < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
                 SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
             } else {
@@ -33,7 +33,7 @@ Script N(802414E0) = SCRIPT({
             }
         }
     }
-    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
         PlaySound(0x80000022);
     }
 });
@@ -53,7 +53,7 @@ static s32 N(pad_1624)[] = {
 };
 
 Script N(80241630) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
         MakeItemEntity(ITEM_WATER_STONE, 0, -60, 6, 1, 0);
     }
 });
@@ -108,7 +108,7 @@ Script N(80241988) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -155,7 +155,7 @@ Script N(main) = SCRIPT({
         }
     }
     await N(802414E0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240040_CB9240)();
     }
 });
@@ -419,7 +419,7 @@ Script N(802427EC) = SCRIPT({
 });
 
 Script N(80242AE8) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) {
+    if (SI_STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) {
         EnableGroup(52, 0);
         EnableGroup(61, 0);
         ModifyColliderFlags(0, 21, 0x7FFFFE00);
@@ -534,7 +534,7 @@ Script N(80242AE8) = SCRIPT({
         SI_VAR(12) = 0;
         spawn N(updateTexturePan_80241D14);
     }
-    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
         spawn N(80241F20);
     }
 });
@@ -650,7 +650,7 @@ Script N(80243628) = SCRIPT({
 
 Script N(interact_802437C8) = SCRIPT({
     await N(802415C4);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_MAGICAL_BEAN {
             spawn N(80243628);
             GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
@@ -736,7 +736,7 @@ Script N(interact_802437C8) = SCRIPT({
 
 Script N(init_80243D78) = SCRIPT({
     BindNpcInteract(NPC_SELF, N(interact_802437C8));
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_WATER_STONE {
             if (SI_SAVE_FLAG(1375) == 0) {
                 SetNpcAnimation(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_8));

src/world/area_flo/flo_10/CB96B0.c

@@ -81,7 +81,7 @@ void N(func_802404B0_CB96B0)(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
                     }
 
                     gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, phi_a2);
-                    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(subroutine_arg6));
+                    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(subroutine_arg6));
 
                     gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, (phi_s4 - phi_s6) / 6, G_TX_LOADTILE, 0,
                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOLOD);
@@ -114,7 +114,7 @@ void N(func_802404B0_CB96B0)(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
                     }
 
                     gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, phi_a2);
-                    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(subroutine_arg6));
+                    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(subroutine_arg6));
                     gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, (phi_s4 - phi_s6) / 6, G_TX_LOADTILE, 0,
                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOLOD);
                     gDPLoadSync(gMasterGfxPos++);
@@ -292,7 +292,7 @@ void N(func_80240A98_CB9C98)(void) {
         gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
         gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS,
                          Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1));
-        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxZBuffer));
+        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer));
         gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0);
         gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 240, 0);
         gDPPipeSync(gMasterGfxPos++);
@@ -300,7 +300,7 @@ void N(func_80240A98_CB9C98)(void) {
         gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList);
         gDPPipeSync(gMasterGfxPos++);
 
-        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(D_8009A64C));
+        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C));
         gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM);
         gDPSetPrimDepth(gMasterGfxPos++, 32734, 0);
         gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2);

src/world/area_flo/flo_11/CBDCD0.c

@@ -27,7 +27,7 @@ MapConfig N(config) = {
 };
 
 Script N(802403E0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -379,7 +379,7 @@ Script N(80241698) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -402,7 +402,7 @@ Script N(main) = SCRIPT({
         sleep 1;
     }
     await N(802403E0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_802402E0_CBDFB0)();
     }
     ModifyColliderFlags(3, 9, 0x00000009);
@@ -578,7 +578,7 @@ Script N(80242240) = SCRIPT({
     if (SI_SAVE_FLAG(1377) == 1) {
         return;
     }
-    if (STORY_PROGRESS < STORY_CH6_GOT_MAGICAL_BEAN) {
+    if (SI_STORY_PROGRESS < STORY_CH6_GOT_MAGICAL_BEAN) {
         return;
     }
     if (SI_SAVE_FLAG(1375) == 0) {
@@ -718,7 +718,7 @@ Script N(defeat_80242AC4) = SCRIPT({
 Script N(init_80242B58) = SCRIPT({
     SetNpcPos(NPC_LAKITU0, 0, -1000, 0);
     if (SI_SAVE_FLAG(1377) == 0) {
-        if (STORY_PROGRESS >= STORY_CH6_GOT_MAGICAL_BEAN) {
+        if (SI_STORY_PROGRESS >= STORY_CH6_GOT_MAGICAL_BEAN) {
             if (SI_SAVE_FLAG(1375) == 1) {
                 SI_MAP_VAR(0) = 0;
                 BindNpcIdle(NPC_SELF, N(idle_80242810));
@@ -733,7 +733,7 @@ Script N(init_80242B58) = SCRIPT({
 Script N(init_80242C38) = SCRIPT({
     SetNpcPos(NPC_LAKITU1, 0, -1000, 0);
     if (SI_SAVE_FLAG(1377) == 0) {
-        if (STORY_PROGRESS >= STORY_CH6_GOT_MAGICAL_BEAN) {
+        if (SI_STORY_PROGRESS >= STORY_CH6_GOT_MAGICAL_BEAN) {
             if (SI_SAVE_FLAG(1375) == 1) {
                 BindNpcDefeat(NPC_SELF, N(defeat_80242AC4));
                 SetNpcPos(NPC_LAKITU1, 200, 110, 29);

src/world/area_flo/flo_12/CC0E70.c

@@ -27,7 +27,7 @@ Script N(80240750) = SCRIPT({
     if (SI_VAR(0) == 1) {
         SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
     } else {
-        match STORY_PROGRESS {
+        match SI_STORY_PROGRESS {
             < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
                 SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
             } else {
@@ -97,7 +97,7 @@ Script N(80240B78) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -133,7 +133,7 @@ Script N(main) = SCRIPT({
         spawn EnterWalk;
     }
     await N(80240750);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CC0E30)();
     }
 });
@@ -250,7 +250,7 @@ Script N(80241BE4) = SCRIPT({
 
 Script N(interact_80241C8C) = SCRIPT({
     await N(8024080C);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_CRYSTAL_BERRY {
             match SI_SAVE_FLAG(1378) {
                 == 0 {
@@ -349,7 +349,7 @@ Script N(interact_80241C8C) = SCRIPT({
                     SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11,
                                   0x0096));
                     SI_AREA_FLAG(22) = 1;
-                    STORY_PROGRESS = STORY_CH6_GOT_WATER_STONE;
+                    SI_STORY_PROGRESS = STORY_CH6_GOT_WATER_STONE;
                 }
             }
         }
@@ -381,7 +381,7 @@ Script N(init_802423D0) = SCRIPT({
     SetNpcPos(NPC_ROSIE1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
     SetNpcFlagBits(NPC_ROSIE1, ((0x00000002)), TRUE);
     SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_HAS_SHADOW)), TRUE);
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_GOT_CRYSTAL_BERRY {
             if (SI_SAVE_FLAG(1378) == 1) {
                 SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE);

src/world/area_flo/flo_13/CC3850.c

@@ -38,7 +38,7 @@ Script N(802436D0) = SCRIPT({
         goto 10;
     }
 0:
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -53,7 +53,7 @@ Script N(802436D0) = SCRIPT({
         sleep 1;
     }
 10:
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_SUN_TOWER_CLOUDY, 0, 8);
         } else {
@@ -156,7 +156,7 @@ Script N(80243DA4) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -200,7 +200,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80243DA4);
     spawn EnterWalk;
     await N(802438B0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CC3810)();
     }
 });
@@ -343,7 +343,7 @@ Script N(80244560) = SCRIPT({
     SI_VAR(2) = SI_VAR(5);
     GetAngleBetweenNPCs(-4, 1, SI_VAR(10));
     InterpNpcYaw(NPC_PARTNER, SI_VAR(10), 0);
-    if (STORY_PROGRESS < STORY_CH6_LAKILESTER_JOINED_PARTY) {
+    if (SI_STORY_PROGRESS < STORY_CH6_LAKILESTER_JOINED_PARTY) {
         GetAngleBetweenNPCs(0, 1, SI_VAR(11));
         InterpNpcYaw(NPC_WORLD_LAKILESTER, SI_VAR(11), 0);
     }
@@ -439,7 +439,7 @@ Script N(80244888) = SCRIPT({
 });
 
 Script N(idle_80244BF8) = SCRIPT({
-    if (STORY_PROGRESS != STORY_CH6_SPOKE_WITH_THE_SUN) {
+    if (SI_STORY_PROGRESS != STORY_CH6_SPOKE_WITH_THE_SUN) {
         return;
     }
     AwaitPlayerApproach(200, 20, 275);
@@ -716,7 +716,7 @@ Script N(80245444) = SCRIPT({
     spawn N(802438F8);
     sleep 10;
     PanToTarget(0, 0, 0);
-    STORY_PROGRESS = STORY_CH6_LAKILESTER_JOINED_PARTY;
+    SI_STORY_PROGRESS = STORY_CH6_LAKILESTER_JOINED_PARTY;
     EnablePartnerAI();
     DisablePlayerInput(FALSE);
     await N(80245014);
@@ -748,7 +748,7 @@ Script N(defeat_80246038) = SCRIPT({
 });
 
 Script N(interact_802461C0) = SCRIPT({
-    if (STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0,
                       MESSAGE_ID(0x11, 0x0032));
     } else {
@@ -764,17 +764,17 @@ Script N(interact_802461C0) = SCRIPT({
 });
 
 Script N(init_80246280) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_LAKILESTER_JOINED_PARTY) {
+    if (SI_STORY_PROGRESS < STORY_CH6_LAKILESTER_JOINED_PARTY) {
         BindNpcIdle(NPC_SELF, N(idle_80244BF8));
         BindNpcDefeat(NPC_SELF, N(defeat_80246038));
     }
 });
 
 Script N(init_802462D0) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_BEGAN_PEACH_MISSION) {
+    if (SI_STORY_PROGRESS < STORY_CH6_BEGAN_PEACH_MISSION) {
         BindNpcInteract(NPC_SELF, N(interact_802461C0));
         SetNpcCollisionSize(-1, 36, 28);
-        if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
             SetNpcPos(NPC_SELF, -50, 180, -50);
         }
     } else {
@@ -788,13 +788,13 @@ Script N(init_80246370) = SCRIPT({
 });
 
 Script N(init_802463B0) = SCRIPT({
-    if (STORY_PROGRESS == STORY_CH6_SPOKE_WITH_THE_SUN) {
+    if (SI_STORY_PROGRESS == STORY_CH6_SPOKE_WITH_THE_SUN) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 Script N(init_802463E8) = SCRIPT({
-    if (STORY_PROGRESS == STORY_CH6_SPOKE_WITH_THE_SUN) {
+    if (SI_STORY_PROGRESS == STORY_CH6_SPOKE_WITH_THE_SUN) {
         RemoveNpc(NPC_SELF);
     }
     SetSelfVar(13, 1);

src/world/area_flo/flo_14/CCB310.c

@@ -15,7 +15,7 @@ MapConfig N(config) = {
 };
 
 Script N(802423F0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -58,7 +58,7 @@ s32 N(lavaResetList_802425FC)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -133,7 +133,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(802425B4);
     spawn EnterWalk;
     await N(802423F0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_8024030C_CCB61C)();
     }
 });

src/world/area_flo/flo_15/CD06C0.c

@@ -25,7 +25,7 @@ Script N(80240060) = SCRIPT({
     if (SI_VAR(0) == 1) {
         SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
     } else {
-        match STORY_PROGRESS {
+        match SI_STORY_PROGRESS {
             < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
                 SetMusicTrack(0, SONG_SUN_TOWER_CLOUDY, 0, 8);
             } else {
@@ -46,7 +46,7 @@ Script N(8024017C) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -78,7 +78,7 @@ NpcSettings N(npcSettings_80240300) = {
 };
 
 Script N(8024032C) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         SI_VAR(3) = 7;
         SI_VAR(4) = 5;
     } else {
@@ -203,7 +203,7 @@ Script N(8024094C) = SCRIPT({
 });
 
 Script N(interact_80240B28) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_SPOKE_WITH_THE_SUN {
             SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009A));
             SetPlayerAnimation(ANIM_THINKING);
@@ -212,7 +212,7 @@ Script N(interact_80240B28) = SCRIPT({
             sleep 20;
             SetPlayerAnimation(ANIM_10002);
             SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009B));
-            STORY_PROGRESS = STORY_CH6_SPOKE_WITH_THE_SUN;
+            SI_STORY_PROGRESS = STORY_CH6_SPOKE_WITH_THE_SUN;
         }
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009C));
@@ -237,7 +237,7 @@ Script N(interact_80240B28) = SCRIPT({
 Script N(init_80240CD0) = SCRIPT({
     SetNpcCollisionSize(10, 64, 40);
     EnableNpcShadow(NPC_SUN0, FALSE);
-    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         SetNpcPos(NPC_SUN0, 0, 270, 0);
         BindNpcInteract(NPC_SELF, N(interact_80240B28));
         spawn N(8024032C);
@@ -256,7 +256,7 @@ Script N(init_80240DB4) = SCRIPT({
     SetNpcPaletteSwapMode(11, 3);
     SetNpcPaletteSwapping(10, 0, 1, 5, 5, 13, 5, 0, 0);
     SetNpcPaletteSwapping(11, 0, 1, 5, 5, 13, 5, 0, 0);
-    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         SetNpcPos(NPC_SUN1, 0, 270, -5);
     } else {
         SetNpcPos(NPC_SUN1, 0, 450, -5);

src/world/area_flo/flo_16/CD1F10.c

@@ -19,7 +19,7 @@ MapConfig N(config) = {
 };
 
 Script N(802429D0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -43,7 +43,7 @@ s32 N(lavaResetList_80242B40)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -88,7 +88,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80242AF8);
     spawn EnterWalk;
     await N(802429D0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CD1E30)();
     }
 });

src/world/area_flo/flo_17/CD7350.c

@@ -26,7 +26,7 @@ MapConfig N(config) = {
 };
 
 Script N(80243280) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -97,7 +97,7 @@ s32 N(lavaResetList_8024369C)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -209,7 +209,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80243654);
     spawn EnterWalk;
     await N(80243280);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CD72E0)();
     }
 });

src/world/area_flo/flo_18/CDC6A0.c

@@ -27,7 +27,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240830) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_PUFF_PUFF_MACHINE, 0, 8);
             PlaySoundAtCollider(20, 0x80000025, 0);
@@ -68,7 +68,7 @@ s32 N(lavaResetList_802409E4)[] = {
 };
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -135,7 +135,7 @@ Script N(main) = SCRIPT({
         spawn N(802409B8);
     }
     await N(80240830);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_8024030C_CDC9AC)();
     }
 });
@@ -691,7 +691,7 @@ Script N(80242E28) = SCRIPT({
     PlaySound(0x1E5);
     await N(802413F0);
     SI_VAR(0) = SI_VAR(10);
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         SI_MAP_FLAG(1) = 1;
         return;
     }
@@ -790,7 +790,7 @@ Script N(80242E28) = SCRIPT({
             DisablePlayerPhysics(TRUE);
             sleep 30;
             await N(80242B18);
-            STORY_PROGRESS = STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE;
+            SI_STORY_PROGRESS = STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE;
             GotoMap("flo_15", 1);
             sleep 70;
             return;
@@ -809,7 +809,7 @@ Vec4f N(triggerCoord_8024369C) = { 50.0f, 0.0f, -10.0, 0.0f };
 Vec4f N(triggerCoord_802436AC) = { 105.0f, 0.0f, -10.0, 0.0f };
 
 Script N(802436BC) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         EnableModel(49, 0);
         ModifyColliderFlags(0, 19, 0x7FFFFE00);
         EnableModel(31, 0);
@@ -1114,7 +1114,7 @@ Script N(80244774) = SCRIPT({
     sleep 20;
     PutPartnerAway();
     ResetCam(0, 4.0);
-    STORY_PROGRESS = STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS;
+    SI_STORY_PROGRESS = STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS;
     DisablePlayerInput(FALSE);
     AwaitPlayerApproach(-250, 0, 50);
     DisablePlayerInput(TRUE);
@@ -1245,7 +1245,7 @@ Script N(80245004) = SCRIPT({
 });
 
 Script N(80245108) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         return;
     }
     DisablePlayerInput(TRUE);
@@ -1300,7 +1300,7 @@ Script N(80245324) = SCRIPT({
 });
 
 Script N(80245378) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         return;
     }
     DisablePlayerInput(TRUE);
@@ -1430,7 +1430,7 @@ Script N(interact_802457D4) = SCRIPT({
 });
 
 Script N(init_80245AA8) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         BindNpcIdle(NPC_SELF, N(idle_80244B3C));
         BindNpcInteract(NPC_SELF, N(interact_802457D4));
         BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
@@ -1440,7 +1440,7 @@ Script N(init_80245AA8) = SCRIPT({
 });
 
 Script N(init_80245B30) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
     } else {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
@@ -1448,7 +1448,7 @@ Script N(init_80245B30) = SCRIPT({
 });
 
 Script N(init_80245B90) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         BindNpcInteract(NPC_SELF, N(interact_802457D4));
         BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
     } else {
@@ -1457,7 +1457,7 @@ Script N(init_80245B90) = SCRIPT({
 });
 
 Script N(init_80245C04) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         BindNpcInteract(NPC_SELF, N(interact_802457D4));
         BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
     } else {
@@ -1466,7 +1466,7 @@ Script N(init_80245C04) = SCRIPT({
 });
 
 Script N(init_80245C78) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
         BindNpcInteract(NPC_SELF, N(interact_802457D4));
         BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
     } else {

src/world/area_flo/flo_19/CE36F0.c

@@ -92,7 +92,7 @@ Script N(80240BF8) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_CLOUDY_CLIMB;
+    SI_WORLD_LOCATION = LOCATION_CLOUDY_CLIMB;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -162,7 +162,7 @@ Script N(main) = SCRIPT({
         }
     }
     await N(802409C0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_8024030C_CE39FC)();
     }
 });
@@ -650,7 +650,7 @@ Script N(80242A2C) = SCRIPT({
         sleep 1;
     }
     sleep 15;
-    STORY_PROGRESS = STORY_CH6_GREW_MAGIC_BEANSTALK;
+    SI_STORY_PROGRESS = STORY_CH6_GREW_MAGIC_BEANSTALK;
     GotoMap("flo_00", 7);
 });
 

src/world/area_flo/flo_21/CE6700.c

@@ -94,7 +94,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240D40) = SCRIPT({
-    if (STORY_PROGRESS == STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+    if (SI_STORY_PROGRESS == STORY_CH6_DEFEATED_HUFF_N_PUFF) {
         FadeOutMusic(0, 500);
     } else {
         SetMusicTrack(0, SONG_CLOUDY_CLIMB, 0, 8);
@@ -296,13 +296,13 @@ Script N(80240DA0) = SCRIPT({
 });
 
 Script N(80240E3C) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         == STORY_CH6_GREW_MAGIC_BEANSTALK {
             SI_VAR(0) = 0;
             if (SI_MAP_VAR(10) == 0) {
                 return;
             }
-            STORY_PROGRESS = STORY_CH6_DEFEATED_HUFF_N_PUFF;
+            SI_STORY_PROGRESS = STORY_CH6_DEFEATED_HUFF_N_PUFF;
         }
         == STORY_CH6_DEFEATED_HUFF_N_PUFF {
             SI_VAR(0) = 1;
@@ -369,7 +369,7 @@ Script N(80240E3C) = SCRIPT({
     N(func_802405BC_CE6CBC)(3);
     PlaySoundAtPlayer(312, 0);
     DisablePlayerInput(TRUE);
-    STORY_PROGRESS = STORY_CH6_STAR_SPIRIT_RESCUED;
+    SI_STORY_PROGRESS = STORY_CH6_STAR_SPIRIT_RESCUED;
     GotoMapSpecial("kmr_23", 5, 14);
     sleep 100;
 });
@@ -381,7 +381,7 @@ Script N(80241350) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_CLOUDY_CLIMB;
+    SI_WORLD_LOCATION = LOCATION_CLOUDY_CLIMB;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -398,7 +398,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80241350);
     spawn EnterWalk;
     await N(80240D40);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240B00_CE7200)();
     }
     spawn N(80240E3C);
@@ -544,7 +544,7 @@ Script N(80241920) = SCRIPT({
 });
 
 Script N(80241B98) = SCRIPT({
-    if (STORY_PROGRESS >= STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DEFEATED_HUFF_N_PUFF) {
         return;
     }
     AwaitPlayerApproach(650, 0, 30);
@@ -966,7 +966,7 @@ Script N(defeat_802435D4) = SCRIPT({
 });
 
 Script N(init_802435E4) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
         SetEnemyFlagBits(-1, 4194304, 1);
         BindNpcIdle(NPC_SELF, N(idle_80243428));
         BindNpcDefeat(NPC_SELF, N(defeat_802434D8));
@@ -977,7 +977,7 @@ Script N(init_802435E4) = SCRIPT({
 });
 
 Script N(init_80243684) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
         SetEnemyFlagBits(-1, 4194304, 1);
         BindNpcDefeat(NPC_SELF, N(defeat_802435D4));
         SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_1));
@@ -988,7 +988,7 @@ Script N(init_80243684) = SCRIPT({
 });
 
 Script N(init_8024371C) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
         SetEnemyFlagBits(-1, 4194304, 1);
         BindNpcDefeat(NPC_SELF, N(defeat_802435D4));
         SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_19));

src/world/area_flo/flo_22/CEC240.c

@@ -21,7 +21,7 @@ MapConfig N(config) = {
 };
 
 Script N(802402E0) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -37,7 +37,7 @@ Script N(802403AC) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -52,7 +52,7 @@ Script N(main) = SCRIPT({
     spawn EnterWalk;
     spawn N(80240E24);
     await N(802402E0);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CEC240)();
     }
 });

src/world/area_flo/flo_23/CEE2A0.c

@@ -28,7 +28,7 @@ MapConfig N(config) = {
 };
 
 Script N(80240D30) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -86,7 +86,7 @@ Script N(80241104) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -105,7 +105,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80241104);
     spawn EnterWalk;
     await N(80240D30);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CEE260)();
     }
 });
@@ -315,7 +315,7 @@ Script N(interact_80241564) = SCRIPT({
         }
         sleep 10;
     } else {
-        if (STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
+        if (SI_STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0,
                           MESSAGE_ID(0x11, 0x004E));
         } else {

src/world/area_flo/flo_24/CF0980.c

@@ -16,12 +16,12 @@ MapConfig N(config) = {
 };
 
 Script N(80240600) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
     } else {
         SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
     }
-    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
         PlaySound(0x80000022);
     }
 });
@@ -75,7 +75,7 @@ Script N(802409F4) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -116,7 +116,7 @@ Script N(main) = SCRIPT({
         spawn EnterWalk;
     }
     await N(80240600);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CF0940)();
     }
 });
@@ -223,7 +223,7 @@ Script N(8024183C) = SCRIPT({
                 }
             }
             sleep 30;
-            STORY_PROGRESS = STORY_CH6_FILLED_SPRING_WITH_WATER;
+            SI_STORY_PROGRESS = STORY_CH6_FILLED_SPRING_WITH_WATER;
             GotoMap("flo_10", 2);
             sleep 100;
         }
@@ -263,7 +263,7 @@ Script N(8024183C) = {
                 SI_CMD(ScriptOpcode_END_IF),
             SI_CMD(ScriptOpcode_END_LOOP),
             SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
-            SI_CMD(ScriptOpcode_SET, STORY_PROGRESS, STORY_CH6_FILLED_SPRING_WITH_WATER),
+            SI_CMD(ScriptOpcode_SET, SI_STORY_PROGRESS, STORY_CH6_FILLED_SPRING_WITH_WATER),
             SI_CMD(ScriptOpcode_CALL, GotoMap, N(flo_10_name_hack), 2),
             SI_CMD(ScriptOpcode_SLEEP_FRAMES, 100),
             SI_CMD(ScriptOpcode_RETURN),
@@ -272,7 +272,7 @@ Script N(8024183C) = {
 #endif
 
 Script N(80241ABC) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) {
+    if (SI_STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) {
         EnableGroup(94, 0);
         ModifyColliderFlags(0, 30, 0x7FFFFE00);
     } else {

src/world/area_flo/flo_25/CF2C10.c

@@ -29,7 +29,7 @@ MapConfig N(config) = {
 };
 
 Script N(80242330) = SCRIPT({
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
             SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
         } else {
@@ -87,7 +87,7 @@ Script N(80242704) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SI_WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
     SetSpriteShading(-1);
     SetCamLeadPlayer(0, 0);
     SetCamPerspective(0, 3, 25, 16, 4096);
@@ -108,7 +108,7 @@ Script N(main) = SCRIPT({
     SI_VAR(0) = N(80242704);
     spawn EnterWalk;
     await N(80242330);
-    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+    if (SI_STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
         N(func_80240000_CF2BD0)();
     }
 });
@@ -351,7 +351,7 @@ Script N(interact_80242C58) = SCRIPT({
         }
         sleep 10;
     } else {
-        if (STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
+        if (SI_STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
             SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0,
                           MESSAGE_ID(0x11, 0x0040));
         } else {

src/world/area_hos/hos_03/A1BDB0.c

@@ -178,7 +178,7 @@ ApiStatus N(func_802425E0_A1D6E0)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_jan/jan_02/B2C8A0.c

@@ -229,7 +229,7 @@ ApiStatus N(func_80241750_B2DBC0)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_jan/jan_03/B34BD0.c

@@ -296,7 +296,7 @@ ApiStatus N(func_80241CD8_B368A8)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_kmr/kmr_02/8B0070.c

@@ -85,7 +85,7 @@ ApiStatus N(func_802404CC_8B053C)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_kmr/kmr_03/8C8140.c

@@ -24,7 +24,7 @@ Script N(802407A8) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GOOMBA_VILLAGE;
+    SI_WORLD_LOCATION = LOCATION_GOOMBA_VILLAGE;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -89,7 +89,7 @@ Script N(8024097C) = SCRIPT({
 
 Script N(npcAI_80240B50) = SCRIPT({
 1:
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         == STORY_CH0_FELL_OFF_CLIFF {
 89:
             N(UnkPositionFunc)(-118, 86, -70, -15);
@@ -129,7 +129,7 @@ Script N(npcAI_80240B50) = SCRIPT({
             sleep 30;
             SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A8));
             N(UnkFunc41)(0, 5);
-            STORY_PROGRESS = STORY_CH0_GOOMPA_JOINED_PARTY;
+            SI_STORY_PROGRESS = STORY_CH0_GOOMPA_JOINED_PARTY;
             UseSettingsFrom(0, -220, 20, -72);
             GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
             SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
@@ -188,7 +188,7 @@ Script N(init_802411A8) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(npcAI_80240B50));
     BindNpcAux(-1, N(8024097C));
     BindNpcHit(-1, N(hit_80240F64));
-    match STORY_PROGRESS {
+    match SI_STORY_PROGRESS {
         >= STORY_CH0_GOOMPA_JOINED_PARTY {
             SetNpcFlagBits(NPC_SELF, NPC_FLAG_GRAVITY, FALSE);
             SetNpcFlagBits(NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE);
@@ -239,7 +239,7 @@ static s32 N(pad_1468)[] = {
 
 Script N(80241470) = SCRIPT({
     ModifyColliderFlags(0, 9, 0x7FFFFE00);
-    STORY_PROGRESS = STORY_CH0_LEFT_THE_PLAYGROUND;
+    SI_STORY_PROGRESS = STORY_CH0_LEFT_THE_PLAYGROUND;
 });
 
 Script N(802414A8) = SCRIPT({
@@ -255,7 +255,7 @@ Script N(802414C8) = SCRIPT({
 });
 
 Script N(makeEntities) = SCRIPT({
-    if (STORY_PROGRESS < STORY_CH0_LEFT_THE_PLAYGROUND) {
+    if (SI_STORY_PROGRESS < STORY_CH0_LEFT_THE_PLAYGROUND) {
         MakeEntity(0x802EA10C, 45, 0, 70, 15, MAKE_ENTITY_END);
         AssignScript(N(80241470));
     } else {

src/world/area_kmr/kmr_03/8C85E0.c

@@ -6,7 +6,7 @@ Script N(80242340) = SCRIPT({
     SetCamDistance(0, 700.0);
     SetCamSpeed(0, 90.0);
     PanToTarget(0, 0, 1);
-    if (STORY_PROGRESS >= STORY_CH0_FOUND_HAMMER) {
+    if (SI_STORY_PROGRESS >= STORY_CH0_FOUND_HAMMER) {
         SetPlayerPos(0, -1000, 0);
         DisablePlayerInput(TRUE);
         SetPlayerPos(-224, 20, -80);

src/world/area_kmr/kmr_12/events.c

@@ -11,7 +11,7 @@ Script N(BindExits) = SCRIPT({
 });
 
 Script N(main) = SCRIPT({
-    WORLD_LOCATION = LOCATION_GOOMBA_ROAD;
+    SI_WORLD_LOCATION = LOCATION_GOOMBA_ROAD;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);

src/world/area_mac/mac_00/7EB340.c

@@ -64,7 +64,7 @@ ApiStatus N(func_8024076C_7EB47C)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_mac/mac_01/8017D0.c

@@ -194,7 +194,7 @@ ApiStatus N(func_8024204C_8028CC)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {

src/world/area_mac/mac_02/823BF0.c

@@ -173,7 +173,7 @@ ApiStatus N(func_802418FC_824BBC)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
     set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
     temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
-    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
+    temp_v0 = get_variable(NULL, SI_STORY_PROGRESS);
 
     for (i = 0; i < 8; i++) {
         if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {