Name files and avoid use of X32 type for functionTemp (#314)

* name entity files

* name encounter_api

* abolish X32

include/common_structs.h

@@ -293,7 +293,7 @@ typedef struct ScriptInstance {
     /* 0x064 */ struct ScriptInstance* blockingParent; /* parent? */
     /* 0x068 */ struct ScriptInstance* childScript;
     /* 0x06C */ struct ScriptInstance* parentScript; /* brother? */
-    /* 0x070 */ X32 functionTemp[4];
+    /* 0x070 */ s32 functionTemp[4];
     /* 0x080 */ ApiFunc callFunction;
     /* 0x084 */ s32 varTable[16];
     /* 0x0C4 */ s32 varFlags[3];

src/107830_len_e70.c

@@ -1,28 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_ScriptSpring_idle);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_SimpleSpring_idle);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_SimpleSpring_set_jump_params);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_SimpleSpring_enable_player_input);
-
-void entity_ScriptSpring_init(void) {
-}
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_SimpleSpring_init);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_setupGfx);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_set_ispy_notification);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_hide);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_idle);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_flip_over);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_is_item_on_top);
-
-INCLUDE_ASM(s32, "107830_len_e70", entity_HiddenPanel_init);

src/1086a0_len_fc0.c

@@ -1,37 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_adjust_camera);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_reset_camera);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_setupGfx);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_check_opened);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_idle);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_begin_opening);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_open);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_close);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_GiantChest_hide_effect);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_GiantChest_open);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_GiantChest_give_equipment);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_start_bound_script);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_enable_player_input);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_GiantChest_await_got_item);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_clear_item_id);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_readargs);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_GiantChest_init);
-
-INCLUDE_ASM(s32, "1086a0_len_fc0", entity_Chest_init);

src/181810.c

@@ -58,7 +58,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) {
         }
         msg_printer_set_origin_pos(gSpeakingActorPrintCtx, screenX, screenY);
 
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         gOverrideFlags |= 0x10;
         if (gSpeakingActorTalkAnim >= 0) {
             func_80263E08(actor, part, gSpeakingActorTalkAnim);
@@ -66,7 +66,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) {
         increment_status_menu_disabled();
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         actor = gSpeakingActor;
         part = gSpeakingActorPart;
 
@@ -116,11 +116,11 @@ ApiStatus ShowBattleChoice(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
         s32 stringID = get_variable(script, *args);
 
-        script->functionTemp[1].s = 0;
-        D_8029FA64 = msg_get_printer_for_string(stringID, &script->functionTemp[1].s);
+        script->functionTemp[1] = 0;
+        D_8029FA64 = msg_get_printer_for_string(stringID, &script->functionTemp[1]);
     }
 
-    if (script->functionTemp[1].s == 1) {
+    if (script->functionTemp[1] == 1) {
         u8 currentOption = D_8029FA64->currentOption;
 
         gSpeakingActorPrintCtx->currentOption = D_8029FA64->currentOption;

src/18F340.c

@@ -157,26 +157,26 @@ ApiStatus func_802610CC(ScriptInstance* script, s32 isInitialCall) {
         mdl_set_all_fog_mode(1);
         *D_801512F0 = 1;
         set_background_color_blend(0, 0, 0, 0);
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, ((20 - script->functionTemp[0].s) * 12) & 0xFC);
+    set_background_color_blend(0, 0, 0, ((20 - script->functionTemp[0]) * 12) & 0xFC);
 
-    script->functionTemp[0].s -= 1;
+    script->functionTemp[0] -= 1;
     do {} while(0); // TODO required to match
-    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 0) * ApiStatus_DONE2;
 }
 
 ApiStatus func_80261164(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
         btl_cam_unfreeze();
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 12) & 0xFC);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 12) & 0xFC);
 
-    script->functionTemp[0].s -= 1;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0] -= 1;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }
@@ -267,25 +267,25 @@ ApiStatus func_80261530(ScriptInstance* script, s32 isInitialCall) {
         mdl_set_all_fog_mode(1);
         *D_801512F0 = 1;
         set_background_color_blend(0, 0, 0, 0);
-        script->functionTemp[0].s = 25;
+        script->functionTemp[0] = 25;
     }
 
-    set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0].s) * 10) & 0xFE);
+    set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 0xFE);
 
-    script->functionTemp[0].s--;
+    script->functionTemp[0]--;
     do {} while(0); // TODO required to match
-    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 0) * ApiStatus_DONE2;
 }
 
 ApiStatus func_802615C8(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 25;
+        script->functionTemp[0] = 25;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 0xFF);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFF);
 
-    script->functionTemp[0].s -= 5;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0] -= 5;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }
@@ -327,7 +327,7 @@ ApiStatus func_802616F4(ScriptInstance* script, s32 isInitialCall) {
     EffectInstanceData* effectInstanceData;
 
     if (isInitialCall) {
-        script->functionTemp[1].s = 0;
+        script->functionTemp[1] = 0;
         D_8029FB94 = merlee->pos.y;
         D_8029FB98 = playFX_52(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
         D_8029FB9C = playFX_52(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
@@ -335,10 +335,10 @@ ApiStatus func_802616F4(ScriptInstance* script, s32 isInitialCall) {
         D_8029FB90 = 12;
         sfx_play_sound(0x2074);
     }
-    merlee->pos.y = D_8029FB94 + (sin_rad((script->functionTemp[1].s * TAU) / 360.0f) * 3.0f);
+    merlee->pos.y = D_8029FB94 + (sin_rad((script->functionTemp[1] * TAU) / 360.0f) * 3.0f);
 
-    script->functionTemp[1].s += 10;
-    script->functionTemp[1].s = clamp_angle(script->functionTemp[1].s);
+    script->functionTemp[1] += 10;
+    script->functionTemp[1] = clamp_angle(script->functionTemp[1]);
 
     effectInstanceData = D_8029FB98->data;
     effectInstanceData->pos.x = merlee->pos.x;
@@ -497,13 +497,13 @@ ApiStatus func_80261FB4(ScriptInstance* script, s32 isInitialCall) {
     f32 deltaZ;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
-        script->functionTemp[1].s = 10;
+        script->functionTemp[0] = 0;
+        script->functionTemp[1] = 10;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
-            ft1 = script->functionTemp[1].s;
+            ft1 = script->functionTemp[1];
             deltaX = player->currentPos.x - item->position.x;
             deltaY = player->currentPos.y + 12.0f - item->position.y;
             deltaZ = player->currentPos.z - 5.0f - item->position.z;
@@ -515,11 +515,11 @@ ApiStatus func_80261FB4(ScriptInstance* script, s32 isInitialCall) {
             item->position.y += dist2D(item->position.x, item->position.y, player->currentPos.x,
                                        player->currentPos.y + 12.0f) / 5.0f;
 
-            if (script->functionTemp[1].s == 1) {
-                script->functionTemp[0].s = script->functionTemp[1].s;
+            if (script->functionTemp[1] == 1) {
+                script->functionTemp[0] = script->functionTemp[1];
             }
 
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
             break;
         case 1:
             return ApiStatus_DONE2;

src/19FAF0.c

@@ -120,14 +120,14 @@ ApiStatus PlayerLandJump(ScriptInstance *script, s32 isInitialCall) {
     ActorMovementWalk* walkMovement = &player->walk;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         walkMovement->currentPos.x = player->currentPos.x;
         walkMovement->currentPos.y = player->currentPos.y;
         walkMovement->currentPos.z = player->currentPos.z;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 
     if (walkMovement->velocity > 0.0f) {

src/1a1f0_len_5390.c

@@ -52,24 +52,24 @@ ApiStatus FadeBackgroundToBlack(ScriptInstance* script, s32 isInitialCall) {
         mdl_set_all_fog_mode(1);
         *D_801512F0 = 1;
         set_background_color_blend(0, 0, 0, 0);
-        script->functionTemp[0].s = 25;
+        script->functionTemp[0] = 25;
     }
 
-    set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0].s) * 10) & 254);
-    script->functionTemp[0].s--;
+    set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 254);
+    script->functionTemp[0]--;
     do {} while (0);
-    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 0) * ApiStatus_DONE2;
 }
 
 ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 25;
+        script->functionTemp[0] = 25;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 0xFE);
-    script->functionTemp[0].s -= 5;
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFE);
+    script->functionTemp[0] -= 5;
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     } else {
@@ -112,7 +112,7 @@ ApiStatus MerleeUpdateFX(ScriptInstance* script, s32 isInitialCall) {
     EffectInstanceData* effectInstanceData;
 
     if (isInitialCall) {
-        script->functionTemp[1].s = 0;
+        script->functionTemp[1] = 0;
         D_800A0BA4 = merlee->pos.y;
         D_800A0BA8 = playFX_52(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
         D_800A0BAC = playFX_52(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
@@ -121,10 +121,10 @@ ApiStatus MerleeUpdateFX(ScriptInstance* script, s32 isInitialCall) {
         sfx_play_sound(0x2074);
     }
 
-    merlee->pos.y = D_800A0BA4 + (sin_rad((script->functionTemp[1].s * TAU) / 360.0f) * 3.0f);
+    merlee->pos.y = D_800A0BA4 + (sin_rad((script->functionTemp[1] * TAU) / 360.0f) * 3.0f);
 
-    script->functionTemp[1].s += 10;
-    script->functionTemp[1].s = clamp_angle(script->functionTemp[1].s);
+    script->functionTemp[1] += 10;
+    script->functionTemp[1] = clamp_angle(script->functionTemp[1]);
 
     effectInstanceData = D_800A0BA8->data;
     effectInstanceData->pos.x = merlee->pos.x;
@@ -212,32 +212,32 @@ ApiStatus OnDefeatEnemy(ScriptInstance* script, s32 isInitialCall) {
     s32 temp1;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
-        script->functionTemp[1].s = 20;
+        script->functionTemp[0] = 0;
+        script->functionTemp[1] = 20;
     }
 
-    if (script->functionTemp[1].s & 1) {
+    if (script->functionTemp[1] & 1) {
         npc->flags &= ~2;
     } else {
         npc->flags |= 2;
     }
 
-    if (script->functionTemp[1].s == 15) {
+    if (script->functionTemp[1] == 15) {
         sfx_play_sound(SOUND_DEATH);
         playFX_18(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10);
     }
 
-    temp1 = script->functionTemp[1].s;
-    if (script->functionTemp[1].s == 10) {
+    temp1 = script->functionTemp[1];
+    if (script->functionTemp[1] == 10) {
         playFX_01(npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 10.0f);
-        if (script->functionTemp[1].s == temp1) { // what? (never can be false, seemingly)
+        if (script->functionTemp[1] == temp1) { // what? (never can be false, seemingly)
             spawn_drops(enemy);
         }
     }
 
-    script->functionTemp[1].s -= 1;
+    script->functionTemp[1] -= 1;
 
-    if (script->functionTemp[1].s == 0) {
+    if (script->functionTemp[1] == 0) {
         npc->flags |= 2;
         return ApiStatus_DONE1;
     }
@@ -250,13 +250,13 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
-        script->functionTemp[1].s = 40;
-        script->functionTemp[2].s = 0;
+        script->functionTemp[0] = 0;
+        script->functionTemp[1] = 40;
+        script->functionTemp[2] = 0;
     }
 
-    script->functionTemp[2].s++;
-    if (script->functionTemp[2].s >= 5) {
+    script->functionTemp[2]++;
+    if (script->functionTemp[2] >= 5) {
         if (rand_int(100) < 50) {
             if (playerData->coins != 0) {
                 playerData->coins--;
@@ -264,10 +264,10 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) {
                                          playerStatus->position.z, 3, 0, 0);
             }
         }
-        script->functionTemp[2].s = 0;
+        script->functionTemp[2] = 0;
     }
 
-    return --script->functionTemp[1].s == 0;
+    return --script->functionTemp[1] == 0;
 }
 
 /// Default/neutral state during world gameplay; checks for player-enemy collisions and initiates battles when they occur.

src/23680.c

@@ -148,7 +148,7 @@ void func_80049550(ScriptInstance* script, s32 arg1) {
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[0].s = arg1;
+        script->functionTemp[0] = arg1;
     }
 }
 
@@ -171,7 +171,7 @@ void func_80049E3C(ScriptInstance* script) {
     npc->jumpScale = 2.5f;
     npc->moveToPos.y = npc->pos.y;
     npc->flags |= 0x800;
-    script->functionTemp[0].s = 11;
+    script->functionTemp[0] = 11;
 }
 
 void func_80049ECC(ScriptInstance* script) {
@@ -191,7 +191,7 @@ void func_80049ECC(ScriptInstance* script) {
     } else {
         npc->jumpVelocity = 0.0f;
         npc->flags &= ~0x800;
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -207,7 +207,7 @@ void func_8004A3E8(ScriptInstance* script, s32 arg1) {
     if (npc->duration == 0) {
         npc->yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                                      enemy->territory->wander.point.z));
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 }
 

src/25AF0.c

@@ -6,7 +6,7 @@ void func_8004A6F0(ScriptInstance* script) {
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[0].s = script->functionTemp[1].s;
+        script->functionTemp[0] = script->functionTemp[1];
     }
 }
 
@@ -15,7 +15,7 @@ void func_8004A73C(ScriptInstance* script) {
 
     get_npc_unsafe(enemy->npcID);
     if (enemy->unk_B4 == 0) {
-        script->functionTemp[0].s = script->functionTemp[1].s;
+        script->functionTemp[0] = script->functionTemp[1];
     }
 }
 

src/battle/area_trd_part_3/4CF1B0.c

@@ -55,13 +55,13 @@ ApiStatus func_80218170_4CF320(ScriptInstance* script, s32 isInitialCall) {
     BattleStatus* battleStatus = &gBattleStatus;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 10;
+        script->functionTemp[0] = 10;
     }
 
     battleStatus->flags2 &= ~0x2;
 
-    if (script->functionTemp[0].s != 0) {
-        script->functionTemp[0].s--;
+    if (script->functionTemp[0] != 0) {
+        script->functionTemp[0]--;
         return ApiStatus_BLOCK;
     }
 
@@ -72,13 +72,13 @@ ApiStatus func_802181B4_4CF364(ScriptInstance* script, s32 isInitialCall) {
     BattleStatus* battleStatus = &gBattleStatus;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 10;
+        script->functionTemp[0] = 10;
     }
 
     battleStatus->flags2 &= ~0x4;
 
-    if (script->functionTemp[0].s != 0) {
-        script->functionTemp[0].s--;
+    if (script->functionTemp[0] != 0) {
+        script->functionTemp[0]--;
         return ApiStatus_BLOCK;
     }
 

src/battle/item/dizzy_dial.c

@@ -63,24 +63,24 @@ ApiStatus N(func_802A1270_727B80)(ScriptInstance* script, s32 isInitialCall) {
     f32 a;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
-            script->functionTemp[1].s = 0;
-            script->functionTemp[2].s = 0;
+            script->functionTemp[1] = 0;
+            script->functionTemp[2] = 0;
             sfx_play_sound(0x2033);
             camera->unk_1C = 0;
             D_802A1CD0 = create_generic_entity_frontUI(NULL, func_802A123C_727B4C);
-            script->functionTemp[0].s = 1;
+            script->functionTemp[0] = 1;
         case 1:
             camera->flags |= 8;
-            a = script->functionTemp[1].s;
+            a = script->functionTemp[1];
             guRotateF(camera->viewMtxShaking, a, 0.0f, 0.0f, 1.0f);
-            script->functionTemp[1].s = 2.0 * ((1.0 - sin_rad(((script->functionTemp[2].s + 90) * 6.28318f) / 360.0f)) * 360.0);
-            script->functionTemp[2].s++;
-            if (script->functionTemp[2].s <= 90) {
+            script->functionTemp[1] = 2.0 * ((1.0 - sin_rad(((script->functionTemp[2] + 90) * 6.28318f) / 360.0f)) * 360.0);
+            script->functionTemp[2]++;
+            if (script->functionTemp[2] <= 90) {
                 return ApiStatus_BLOCK;
             }
             camera->unk_1C = 0;

src/battle/item/fire_flower.c

@@ -68,13 +68,13 @@ ApiStatus N(func_802A123C_716E9C)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_802A1378_716FD8)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/battle/item/fright_jar.c

@@ -57,13 +57,13 @@ ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_802A12D4_72BBE4)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/battle/item/shooting_star.c

@@ -120,22 +120,22 @@ ApiStatus N(func_802A1444_71DBB4)(ScriptInstance* script, s32 isInitialCall) {
         mdl_set_all_fog_mode(1);
         *D_801512F0 = 1;
         set_background_color_blend(0, 0, 0, 0);
-        script->functionTemp[0].s = 10;
+        script->functionTemp[0] = 10;
     }
 
-    set_background_color_blend(0, 0, 0, ((10 - script->functionTemp[0].s) * 16) & 240);
-    script->functionTemp[0].s--;
+    set_background_color_blend(0, 0, 0, ((10 - script->functionTemp[0]) * 16) & 240);
+    script->functionTemp[0]--;
     do {} while (0);
-    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 0) * ApiStatus_DONE2;
 }
 
 ApiStatus N(func_802A14D4_71DC44)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 10;
+        script->functionTemp[0] = 10;
     }
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 16) & 240);
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 16) & 240);
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
 
         return ApiStatus_DONE2;

src/battle/item/sleepy_sheep.c

@@ -106,10 +106,10 @@ ApiStatus func_802A123C_71E88C(ScriptInstance* script, s32 isInitialCall) {
     s32* D_802A3F58_ptr;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0: {
             s32* D_802A3F28_721578_ptr = &N(D_802A3F28_721578);
             s32 loop1, loop2, loop3;
@@ -134,16 +134,16 @@ ApiStatus func_802A123C_71E88C(ScriptInstance* script, s32 isInitialCall) {
                 D_802A3E88_7214D8_ptr2 += i * 3 + 1;
                 D_802A3E88_7214D8_ptr3 += i * 3 + 2;
             }
-            script->functionTemp[0].s = 1;
-            script->functionTemp[1].s = gGameStatusPtr->frameCounter % 10;
+            script->functionTemp[0] = 1;
+            script->functionTemp[1] = gGameStatusPtr->frameCounter % 10;
         }
         break;
 
         case 1:
             D_802A3F88.x += 6.0f;
             if (gGameStatusPtr->frameCounter % 3 == 0) {
-                script->functionTemp[1].s++;
-                script->functionTemp[1].s %= 10;
+                script->functionTemp[1]++;
+                script->functionTemp[1] %= 10;
             }
 
             flag = 0;
@@ -164,7 +164,7 @@ ApiStatus func_802A123C_71E88C(ScriptInstance* script, s32 isInitialCall) {
 
                 virtual_entity_set_pos(D_802A3F58_ptr[i], x, y, z);
 
-                if (flag == 0 && script->functionTemp[1].s == i) {
+                if (flag == 0 && script->functionTemp[1] == i) {
                     f32 x2, y2;
                     if (gGameStatusPtr->frameCounter % 5 == 0) {
 
@@ -195,7 +195,7 @@ ApiStatus func_802A123C_71E88C(ScriptInstance* script, s32 isInitialCall) {
                               N(D_802A3E88_7214D8)[randIdx * 3 + 2] + D_802A3F88_ptr->z, 0);
             }
             if (D_802A3F88_ptr->x >= 320.0f) {
-                script->functionTemp[0].s = 2;
+                script->functionTemp[0] = 2;
                 break;
             }
             return ApiStatus_DONE2;
@@ -221,8 +221,8 @@ ApiStatus N(func_802A1740_71ED90)(ScriptInstance* script, s32 isInitialCall) {
     s32 i;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
-        script->functionTemp[1].s = 0x5A;
+        script->functionTemp[0] = 0;
+        script->functionTemp[1] = 0x5A;
     }
 
     for (i = 0; i < player->targetListLength; i++) {
@@ -237,8 +237,8 @@ ApiStatus N(func_802A1740_71ED90)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    if (script->functionTemp[1].s != 0) {
-        script->functionTemp[1].s--;
+    if (script->functionTemp[1] != 0) {
+        script->functionTemp[1]--;
         return ApiStatus_BLOCK;
     }
 
@@ -252,7 +252,7 @@ ApiStatus N(func_802A1848_71EE98)(ScriptInstance* script, s32 isInitialCall) {
     s32 ret;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
     ret = 0;

src/battle/item/snowman_doll.c

@@ -69,13 +69,13 @@ ApiStatus N(func_802A123C_71C06C)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_802A13B8_71C1E8)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/battle/item/stone_cap.c

@@ -59,15 +59,15 @@ ApiStatus N(func_802A123C_7217DC)(ScriptInstance* script, s32 isInitialCall) {
     s32 i;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             inflict_status(player, STATUS_STONE, script->varTable[0]);
             player->status = 0;
-            script->functionTemp[1].s = 3;
-            script->functionTemp[0].s = 1;
+            script->functionTemp[1] = 3;
+            script->functionTemp[0] = 1;
             break;
 
         case 1:
@@ -78,7 +78,7 @@ ApiStatus N(func_802A123C_7217DC)(ScriptInstance* script, s32 isInitialCall) {
                 playFX_69(0, x, y, z, 1.0f, 25);
             }
 
-            if (script->functionTemp[1].s == 0) {
+            if (script->functionTemp[1] == 0) {
                 BattleStatus* battleStatus2 = &gBattleStatus;
 
                 battleStatus2->flags1 &= ~0x04000000;
@@ -88,7 +88,7 @@ ApiStatus N(func_802A123C_7217DC)(ScriptInstance* script, s32 isInitialCall) {
                 return ApiStatus_DONE2;
             }
 
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
             break;
     }
 

src/battle/item/stop_watch.c

@@ -57,13 +57,13 @@ ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_802A12D4_7270A4)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/battle/item/thunder_bolt.c

@@ -85,13 +85,13 @@ ApiStatus N(func_802A123C_722D7C)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_802A1420_722F60)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/battle/item/thunder_rage.c

@@ -57,13 +57,13 @@ ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_802A12D4_71B474)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254);
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/battle/move/mega_quake/756780.c

@@ -8,24 +8,24 @@
 
 ApiStatus func_802A10A4_756824(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s != 0) {
-        if (script->functionTemp[0].s != 1) {
+    if (script->functionTemp[0] != 0) {
+        if (script->functionTemp[0] != 1) {
             return ApiStatus_BLOCK;
         }
     } else {
-        script->functionTemp[1].s = 30;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[1] = 30;
+        script->functionTemp[0] = 1;
     }
 
     set_screen_overlay_center(1, 0, 0, 0);
     set_screen_overlay_center(1, 1, 320, 240);
     set_screen_overlay_params_back(12, 160.0f);
 
-    if (script->functionTemp[1].s != 0) {
-        script->functionTemp[1].s--;
+    if (script->functionTemp[1] != 0) {
+        script->functionTemp[1]--;
         return ApiStatus_BLOCK;
     } else {
         set_screen_overlay_center(1, 0, 0, 0);

src/battle/partner/goombario.c

@@ -64,14 +64,14 @@ ApiStatus N(func_80238A20_6F1B00)(ScriptInstance* script, s32 isInitialCall) {
     Vec3f* pos = &partnerActor->walk.currentPos;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         partnerActor->walk.currentPos.x = partnerActor->currentPos.x;
         partnerActor->walk.currentPos.y = partnerActor->currentPos.y;
         partnerActor->walk.currentPos.z = partnerActor->currentPos.z;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 
     if (partnerActor->walk.velocity > 0.0f) {

src/battle/star/lullaby/78D150.c

@@ -16,26 +16,26 @@ INCLUDE_ASM(s32, "battle/star/lullaby/78D150", func_802A1494_78D5E4);
 
 ApiStatus func_802A1518_78D668(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
             s32 temp;
             s32 temp2;
 
         case 0:
-            script->functionTemp[2].s = -80;
-            script->functionTemp[1].s = 0;
-            script->functionTemp[0].s = 1;
+            script->functionTemp[2] = -80;
+            script->functionTemp[1] = 0;
+            script->functionTemp[0] = 1;
         case 1:
-            temp = script->functionTemp[2].s;
-            temp2 = (sin_rad((script->functionTemp[1].s * TAU) / 360.0f) * 30.0f) + 30.0f;
+            temp = script->functionTemp[2];
+            temp2 = (sin_rad((script->functionTemp[1] * TAU) / 360.0f) * 30.0f) + 30.0f;
             playFX_26(0, temp, temp2, 50.0f);
 
-            script->functionTemp[2].s += 14;
-            script->functionTemp[1].s += 20;
+            script->functionTemp[2] += 14;
+            script->functionTemp[1] += 20;
 
-            if (script->functionTemp[1].s >= 360) {
+            if (script->functionTemp[1] >= 360) {
                 return ApiStatus_DONE2;
             }
     }

src/battle/star/peach_beam/7997B0.c

@@ -23,13 +23,13 @@ ApiStatus func_802A2468_79AC18(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus func_802A247C_79AC2C(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 230;
+        script->functionTemp[0] = 230;
     }
 
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+    set_background_color_blend(0, 0, 0, script->functionTemp[0]);
 
-    script->functionTemp[0].s -= 5;
-    if (script->functionTemp[0].s <= 200) {
+    script->functionTemp[0] -= 5;
+    if (script->functionTemp[0] <= 200) {
         set_background_color_blend(0, 0, 0, 200);
         return ApiStatus_DONE2;
     }

src/battle/star/star_beam/796FC0.c

@@ -23,13 +23,13 @@ ApiStatus func_802A2468_798428(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus func_802A247C_79843C(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 230;
+        script->functionTemp[0] = 230;
     }
 
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+    set_background_color_blend(0, 0, 0, script->functionTemp[0]);
 
-    script->functionTemp[0].s -= 5;
-    if (script->functionTemp[0].s <= 200) {
+    script->functionTemp[0] -= 5;
+    if (script->functionTemp[0] <= 200) {
         set_background_color_blend(0, 0, 0, 200);
         return ApiStatus_DONE2;
     }

src/common/FadeBackgroundToBlack.inc.c

@@ -6,11 +6,11 @@ ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall) {
         mdl_set_all_fog_mode(1);
         *D_801512F0 = 1;
         set_background_color_blend(0, 0, 0, 0);
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, ((20 - script->functionTemp[0].s) * 10) & 254);
-    script->functionTemp[0].s--;
+    set_background_color_blend(0, 0, 0, ((20 - script->functionTemp[0]) * 10) & 254);
+    script->functionTemp[0]--;
     do {} while (0);
-    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 0) * ApiStatus_DONE2;
 }

src/common/UnkBackgroundFunc.inc.c

@@ -2,13 +2,13 @@
 
 ApiStatus N(UnkBackgroundFunc)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
     }
 
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s * 10);
-    script->functionTemp[0].s -= 1;
+    set_background_color_blend(0, 0, 0, script->functionTemp[0] * 10);
+    script->functionTemp[0] -= 1;
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         set_background_color_blend(0, 0, 0, 0);
         return ApiStatus_DONE2;
     }

src/common/UnkBackgroundFunc2.inc.c

@@ -5,13 +5,13 @@ ApiStatus N(UnkBackgroundFunc2)(ScriptInstance* script, s32 isInitialCall) {
         mdl_set_all_fog_mode(1);
         *D_801512F0 = 1;
         set_background_color_blend(0, 0, 0, 0);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
-    script->functionTemp[0].s += 10;
+    set_background_color_blend(0, 0, 0, script->functionTemp[0]);
+    script->functionTemp[0] += 10;
 
-    if (script->functionTemp[0].s >= 230) {
+    if (script->functionTemp[0] >= 230) {
         set_background_color_blend(0, 0, 0, 230);
         return ApiStatus_DONE2;
     }

src/encounter_api.c

@@ -40,16 +40,16 @@ ApiStatus MakeNpcs(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             make_npcs(get_variable(script, *args++), gGameStatusPtr->mapID, get_variable(script, *args++));
-            script->functionTemp[0].s = 1;
+            script->functionTemp[0] = 1;
             break;
         case 1:
-            if (gGameState != script->functionTemp[0].s) {
+            if (gGameState != script->functionTemp[0]) {
                 return ApiStatus_DONE2;
             }
     }
@@ -57,9 +57,9 @@ ApiStatus MakeNpcs(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "1f580_len_1940", RemoveNpc, ScriptInstance* script, s32 isInitialCall);
+INCLUDE_ASM(s32, "encounter_api", RemoveNpc, ScriptInstance* script, s32 isInitialCall);
 
-INCLUDE_ASM(s32, "1f580_len_1940", RemoveEncounter, ScriptInstance* script, s32 isInitialCall);
+INCLUDE_ASM(s32, "encounter_api", RemoveEncounter, ScriptInstance* script, s32 isInitialCall);
 
 ApiStatus GetBattleOutcome(ScriptInstance* script, s32 isInitialCall) {
     set_variable(script, *script->ptrReadPos, gCurrentEncounter.battleOutcome);
@@ -98,7 +98,7 @@ ApiStatus DoNpcDefeat(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_FINISH;
 }
 
-INCLUDE_ASM(s32, "1f580_len_1940", start_battle);
+INCLUDE_ASM(s32, "encounter_api", start_battle);
 
 ApiStatus StartBattle(ScriptInstance* script, s32 isInitialCall) {
     start_battle(script, -1);
@@ -110,7 +110,7 @@ ApiStatus StartBattleWith(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE1;
 }
 
-INCLUDE_ASM(s32, "1f580_len_1940", StartBossBattle, ScriptInstance* script, s32 isInitialCall);
+INCLUDE_ASM(s32, "encounter_api", StartBossBattle, ScriptInstance* script, s32 isInitialCall);
 
 ApiStatus SetBattleMusic(ScriptInstance* script, s32 isInitialCall) {
     Bytecode songID = get_variable(script, *script->ptrReadPos);
@@ -122,7 +122,7 @@ ApiStatus SetBattleMusic(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "1f580_len_1940", BindNpcAI, ScriptInstance* script, s32 isInitialCall);
+INCLUDE_ASM(s32, "encounter_api", BindNpcAI, ScriptInstance* script, s32 isInitialCall);
 
 ApiStatus BindNpcIdle(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -197,7 +197,7 @@ ApiStatus EnableNpcAI(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "1f580_len_1940", SetNpcAux, ScriptInstance* script, s32 isInitialCall);
+INCLUDE_ASM(s32, "encounter_api", SetNpcAux, ScriptInstance* script, s32 isInitialCall);
 
 ApiStatus BindNpcAux(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;

src/entity/Block.c

@@ -51,7 +51,7 @@ void entity_block_hit_animate_scale(Entity* entity) {
     entity_base_block_idle(entity);
 }
 
-INCLUDE_ASM(s32, "104940_len_dc0", entity_base_block_update_slow_sinking);
+INCLUDE_ASM(s32, "entity/Block", entity_base_block_update_slow_sinking);
 
 s32 entity_base_block_idle(Entity* entity) {
     struct802E3650* temp = (struct802E3650*)entity->dataBuf;
@@ -319,7 +319,7 @@ s32 entity_block_handle_collision(Entity* entity) {
     return 1;
 }
 #else
-INCLUDE_ASM(s32, "104940_len_dc0", entity_block_handle_collision, Entity* entity);
+INCLUDE_ASM(s32, "entity/Block", entity_block_handle_collision, Entity* entity);
 #endif
 
 void entity_init_Hammer1Block_normal(Entity* entity) {

src/entity/BlueWarpPipe.c

@@ -145,7 +145,7 @@ void entity_BlueWarpPipe_start_bound_script(Entity* entity) {
     entity_start_script(entity);
 }
 
-INCLUDE_ASM(s32, "10A230", entity_BlueWarpPipe_setupGfx);
+INCLUDE_ASM(s32, "entity/BlueWarpPipe", entity_BlueWarpPipe_setupGfx);
 
 f32 entity_init_BlueWarpPipe(Entity* entity) {
     struct802E89B0* temp_s0;

src/entity/Chest.c

@@ -0,0 +1,37 @@
+#include "common.h"
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_adjust_camera);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_reset_camera);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_setupGfx);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_check_opened);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_idle);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_begin_opening);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_open);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_close);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_hide_effect);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_open);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_give_equipment);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_start_bound_script);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_enable_player_input);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_await_got_item);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_clear_item_id);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_readargs);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_init);
+
+INCLUDE_ASM(s32, "entity/Chest", entity_Chest_init);

src/entity/HeartBlock.c

@@ -5,9 +5,9 @@ extern u32* D_802EA760;
 extern StaticEntityData D_802EA7BC;
 extern UNK_TYPE D_802EB3C0;
 
-INCLUDE_ASM(s32, "105F90", entity_HeartBlockContent_get_previous_yaw);
+INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent_get_previous_yaw);
 
-INCLUDE_ASM(s32, "105F90", entity_HeartBlockContent__setupGfx);
+INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent__setupGfx);
 
 void entity_HeartBlockContent_setupGfx(s32 entityIndex) {
     entity_HeartBlockContent__setupGfx(entityIndex, &D_0A000808);
@@ -52,7 +52,7 @@ void entity_HeartBlockContent__reset(Entity* entity) {
     entity_HeartBlockContent_set_initial_pos(entity);
 }
 
-INCLUDE_ASM(s32, "105F90", entity_HeartBlockContent_anim_idle);
+INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent_anim_idle);
 
 void func_802E4DE0(Entity* entity) {
     struct802E4B10* temp = entity->dataBuf;
@@ -64,13 +64,13 @@ void func_802E4DE0(Entity* entity) {
     entity->rotation.z = 0.0f;
 }
 
-INCLUDE_ASM(s32, "105F90", entity_HeartBlockContent__anim_heal);
+INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent__anim_heal);
 
 void entity_HeartBlock_idle(Entity* entity) {
     entity_base_block_idle(entity);
 }
 
-INCLUDE_ASM(s32, "105F90", entity_HeartBlockContent_anim_beating);
+INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent_anim_beating);
 
 void entity_HeartBlockContent_init(Entity* entity) {
     entity_HeartBlockContent_set_initial_pos(entity);

src/entity/ItemBlock.c

@@ -30,9 +30,9 @@ void entity_HiddenItemBlock_idle(Entity* entity) {
     }
 }
 
-INCLUDE_ASM(s32, "105700_len_2130", entity_HitItemBlock_appear);
+INCLUDE_ASM(s32, "entity/ItemBlock", entity_HitItemBlock_appear);
 
-INCLUDE_ASM(void, "105700_len_2130", entity_ItemBlock_spawn_item, Entity* entity);
+INCLUDE_ASM(void, "entity/ItemBlock", entity_ItemBlock_spawn_item, Entity* entity);
 
 void entity_TriggerBlock_start_bound_script_2(Entity* entity) {
     entity_start_script(entity);

src/entity/SaveBlock.c

@@ -19,7 +19,7 @@ s32 entity_can_collide_with_jumping_player(Shadow* shadow) {
     return FALSE;
 }
 
-INCLUDE_ASM(s32, "102610_len_2330", entity_SaveBlock_setupGfx);
+INCLUDE_ASM(s32, "entity/SaveBlock", entity_SaveBlock_setupGfx);
 
 void entity_SaveBlock_idle(Entity* entity) {
     struct802E10F4* temp;

src/entity/SimpleSpring.c

@@ -0,0 +1,28 @@
+#include "common.h"
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_ScriptSpring_idle);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_idle);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_set_jump_params);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_enable_player_input);
+
+void entity_ScriptSpring_init(void) {
+}
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_init);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_setupGfx);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_set_ispy_notification);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_hide);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_idle);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_flip_over);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_is_item_on_top);
+
+INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_init);

src/entity/SuperBlock.c

@@ -68,7 +68,7 @@ void entity_SuperBlock_HitEffect_attach_to_parent(Entity* entity) {
 }
 
 // display list func
-INCLUDE_ASM(s32, "106EF0", entity_SuperBlock_HitEffect_setupGfx);
+INCLUDE_ASM(s32, "entity/SuperBlock", entity_SuperBlock_HitEffect_setupGfx);
 
 void entity_SuperBlock_HitEffect_idle(Entity* entity) {
     struct802E4B10* temp_s0 = entity->dataBuf;

src/entity/Switch.c

@@ -311,7 +311,7 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) {
     }
 }
 #else
-INCLUDE_ASM(s32, "102C80", entity_RedSwitch_animate_scale, Entity* entity);
+INCLUDE_ASM(s32, "entity/Switch", entity_RedSwitch_animate_scale, Entity* entity);
 #endif
 
 void entity_base_switch_start_bound_script(Entity* entity) {
@@ -462,7 +462,7 @@ void entity_base_switch_animate_scale(Entity* entity) {
     }
 }
 #else
-INCLUDE_ASM(void, "102C80", entity_base_switch_animate_scale, Entity* entity);
+INCLUDE_ASM(void, "entity/Switch", entity_base_switch_animate_scale, Entity* entity);
 #endif
 
 void entity_base_switch_init(Entity* entity) {
@@ -514,9 +514,9 @@ void entity_BrickBlock_idle(Entity* entity) {
 }
 
 
-INCLUDE_ASM(void, "102C80", entity_shattering_init_pieces, Entity* entity, void* arg1, void* arg2);
+INCLUDE_ASM(void, "entity/Switch", entity_shattering_init_pieces, Entity* entity, void* arg1, void* arg2);
 
-INCLUDE_ASM(void, "102C80", entity_shattering_idle, Entity* entity);
+INCLUDE_ASM(void, "entity/Switch", entity_shattering_idle, Entity* entity);
 
 #ifdef NON_MATCHING
 // display list issues
@@ -570,5 +570,5 @@ void entity_shattering_setupGfx(s32 entityIndex) {
     gMasterGfxPos = temp_s2;
 }
 #else
-INCLUDE_ASM(s32, "102C80", entity_shattering_setupGfx);
+INCLUDE_ASM(s32, "entity/Switch", entity_shattering_setupGfx);
 #endif

src/entity/WoodenCrate.c

@@ -18,7 +18,7 @@ typedef struct struct802E7DE0 {
     /* 0x304 */ f32 unk_304[36];
 } struct802E7DE0;
 
-INCLUDE_ASM(s32, "109660_len_1270", entity_WoodenCrate_init_fragments);
+INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_init_fragments);
 
 typedef struct struct802E7F40 {
     /* 0x00 */ s32 unk_00;
@@ -44,9 +44,9 @@ void entity_WoodenCrate_reset_fragments(Entity* entity) {
     entity_WoodenCrate_init_fragments(entity, &D_0A004350, &D_0A0026F0);
 }
 
-INCLUDE_ASM(s32, "109660_len_1270", entity_WoodenCrate_update_fragments);
+INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_update_fragments);
 
-INCLUDE_ASM(s32, "109660_len_1270", entity_WoodenCrate_setupGfx);
+INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_setupGfx);
 
 s32 entity_WoodenCrate_idle(Entity* entity) {
     PlayerStatus* playerStatus = &gPlayerStatus;

src/evt/f8f60_len_1560.c

@@ -86,9 +86,9 @@ ApiStatus AwaitPlayerApproach(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* ptrReadPos = script->ptrReadPos;
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    s32* targetX = &script->functionTemp[0].s;
-    s32* targetZ = &script->functionTemp[1].s;
-    s32* distanceRequired = &script->functionTemp[2].s;
+    s32* targetX = &script->functionTemp[0];
+    s32* targetZ = &script->functionTemp[1];
+    s32* distanceRequired = &script->functionTemp[2];
 
     f32 distance;
 
@@ -114,9 +114,9 @@ ApiStatus IsPlayerWithin(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* ptrReadPos = script->ptrReadPos;
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    s32* targetX = &script->functionTemp[0].s;
-    s32* targetZ = &script->functionTemp[1].s;
-    s32* distanceRequired = &script->functionTemp[2].s;
+    s32* targetX = &script->functionTemp[0];
+    s32* targetZ = &script->functionTemp[1];
+    s32* distanceRequired = &script->functionTemp[2];
 
     f32 distance;
     Bytecode outVar = SI_VAR(0);
@@ -145,9 +145,9 @@ ApiStatus AwaitPlayerLeave(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* ptrReadPos = script->ptrReadPos;
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    s32* targetX = &script->functionTemp[0].s;
-    s32* targetZ = &script->functionTemp[1].s;
-    s32* distanceRequired = &script->functionTemp[2].s;
+    s32* targetX = &script->functionTemp[0];
+    s32* targetZ = &script->functionTemp[1];
+    s32* distanceRequired = &script->functionTemp[2];
 
     f32 distance;
 
@@ -189,8 +189,8 @@ ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) {
 }
 
 ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) {
-    s32* t0 = &script->functionTemp[0].s;
-    s32* t1 = &script->functionTemp[1].s;
+    s32* t0 = &script->functionTemp[0];
+    s32* t1 = &script->functionTemp[1];
     s32 t1v;
 
     if (initialCall) {
@@ -217,8 +217,8 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) {
 }
 
 ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) {
-    s32* t0 = &script->functionTemp[0].s;
-    s32* t1 = &script->functionTemp[1].s;
+    s32* t0 = &script->functionTemp[0];
+    s32* t1 = &script->functionTemp[1];
     s32 t1v;
 
     if (initialCall) {

src/evt/fa4c0_len_3bf0.c

@@ -501,16 +501,16 @@ ApiStatus ShowGotItem(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
-            script->functionTemp[1].s = init_got_item(get_variable(script, *args++), get_variable(script, *args++), *args++);
-            script->functionTemp[0].s = 1;
+            script->functionTemp[1] = init_got_item(get_variable(script, *args++), get_variable(script, *args++), *args++);
+            script->functionTemp[0] = 1;
             break;
         case 1:
-            if (get_item_entity(script->functionTemp[1].s) == NULL) {
+            if (get_item_entity(script->functionTemp[1]) == NULL) {
                 return ApiStatus_DONE2;
             }
     }

src/evt/fx_api.c

@@ -75,19 +75,19 @@ ApiStatus func_802D7BA4(ScriptInstance* script, s32 isInitialCall) {
     f32 t1;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = var6;
+        script->functionTemp[0] = var6;
         get_screen_overlay_params(1, &t0, &t1);
-        script->functionTemp[1].s = t1;
+        script->functionTemp[1] = t1;
         set_screen_overlay_center(1, 0, var1, var2);
         set_screen_overlay_center(1, 1, var3, var4);
     }
 
     get_screen_overlay_params(1, &t0, &t1);
-    temp = (script->functionTemp[1].s - var5) * script->functionTemp[0].s;
+    temp = (script->functionTemp[1] - var5) * script->functionTemp[0];
     set_screen_overlay_params_back(12, (temp / var6) + var5);
 
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s < 0) {
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] < 0) {
         set_screen_overlay_params_back(12, var5);
         return ApiStatus_DONE2;
     }

src/evt/msg_api.c

@@ -119,7 +119,7 @@ ApiStatus ShowChoice(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
         s32 stringID = get_variable(script, *args++);
 
-        script->functionTemp[1].s = 0;
+        script->functionTemp[1] = 0;
         D_802DB268 = msg_get_printer_for_string(stringID, &script->functionTemp[1]);
     }
 
@@ -130,7 +130,7 @@ ApiStatus ShowChoice(ScriptInstance* script, s32 isInitialCall) {
         return ApiStatus_DONE1;
     }
 
-    return script->functionTemp[1].s == 1;
+    return script->functionTemp[1] == 1;
 }
 
 ApiStatus CloseChoice(ScriptInstance* script, s32 isInitialCall) {

src/evt/npc_api.c

@@ -233,10 +233,10 @@ ApiStatus NpcMoveTo(ScriptInstance* script, s32 isInitialCall) {
     f32 moveSpeed;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         NpcID npcID = get_variable(script, *args++);
         f32 targetX = get_variable(script, *args++);
         f32 targetZ = get_variable(script, *args++);
@@ -247,7 +247,7 @@ ApiStatus NpcMoveTo(ScriptInstance* script, s32 isInitialCall) {
             return ApiStatus_DONE2;
         }
 
-        script->functionTemp[1].s = (s32)npc;
+        script->functionTemp[1] = (s32)npc;
         npc->moveToPos.x = targetX;
         npc->moveToPos.z = targetZ;
         npc->duration = duration;
@@ -261,10 +261,10 @@ ApiStatus NpcMoveTo(ScriptInstance* script, s32 isInitialCall) {
         if (npc->duration == 0) {
             npc->duration = 1;
         }
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 
-    npc = (Npc*)script->functionTemp[1].s;
+    npc = (Npc*)script->functionTemp[1];
     npc->yaw = atan2(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z);
     npc_move_heading(npc, npc->moveSpeed, npc->yaw);
 
@@ -289,14 +289,14 @@ ApiStatus NpcMoveTo(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus _npc_jump_to(ScriptInstance* script, s32 isInitialCall, s32 snapYaw) {
     Bytecode* args = script->ptrReadPos;
-    f32* yaw = &script->functionTemp[2].f;
+    f32* yaw = (f32*) &script->functionTemp[2];
     Npc* npc;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         NpcID npcID = get_variable(script, *args++);
         f32 xTemp = get_variable(script, *args++);
         f32 yTemp = get_variable(script, *args++);
@@ -310,7 +310,7 @@ ApiStatus _npc_jump_to(ScriptInstance* script, s32 isInitialCall, s32 snapYaw) {
             return ApiStatus_DONE2;
         }
 
-        script->functionTemp[1].s = (s32)npc;
+        script->functionTemp[1] = (s32)npc;
         npc->moveToPos.x = xTemp;
         npc->moveToPos.y = yTemp;
         npc->moveToPos.z = zTemp;
@@ -335,10 +335,10 @@ ApiStatus _npc_jump_to(ScriptInstance* script, s32 isInitialCall, s32 snapYaw) {
 
         npc->flags |= 0x800;
         npc->jumpVelocity = (npc->jumpScale * npc->duration * 0.5f) + (yTemp / npc->duration);
-        script->functionTemp[0].s =1;
+        script->functionTemp[0] =1;
     }
 
-    npc = (Npc*)script->functionTemp[1].s;
+    npc = (Npc*)script->functionTemp[1];
     npc_move_heading(npc, npc->moveSpeed, *yaw);
 
     npc->pos.y += npc->jumpVelocity;
@@ -380,13 +380,13 @@ ApiStatus NpcFlyTo(ScriptInstance* script, s32 isInitialCall) {
             return ApiStatus_DONE2;
         }
 
-        script->functionTemp[1].s = (s32)npc;
+        script->functionTemp[1] = (s32)npc;
         npc->moveToPos.x = get_float_variable(script, *args++);
         npc->moveToPos.y = get_float_variable(script, *args++);
         npc->moveToPos.z = get_float_variable(script, *args++);
         script->varTable[6] = get_variable(script, *args++);
-        script->functionTemp[2].s = get_variable(script, *args++);
-        script->functionTemp[3].s = get_variable(script, *args++);
+        script->functionTemp[2] = get_variable(script, *args++);
+        script->functionTemp[3] = get_variable(script, *args++);
         npc->duration = 0;
         *outX = npc->pos.x;
         *outY = npc->pos.y;
@@ -402,10 +402,10 @@ ApiStatus NpcFlyTo(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    npc = (Npc*)script->functionTemp[1].s;
-    npc->pos.x = update_lerp(script->functionTemp[3].s, *outX, npc->moveToPos.x, npc->duration, script->varTable[6]);
-    npc->pos.y = update_lerp(script->functionTemp[3].s, *outY, npc->moveToPos.y, npc->duration, script->varTable[6]);
-    npc->pos.z = update_lerp(script->functionTemp[3].s, *outZ, npc->moveToPos.z, npc->duration, script->varTable[6]);
+    npc = (Npc*)script->functionTemp[1];
+    npc->pos.x = update_lerp(script->functionTemp[3], *outX, npc->moveToPos.x, npc->duration, script->varTable[6]);
+    npc->pos.y = update_lerp(script->functionTemp[3], *outY, npc->moveToPos.y, npc->duration, script->varTable[6]);
+    npc->pos.z = update_lerp(script->functionTemp[3], *outZ, npc->moveToPos.z, npc->duration, script->varTable[6]);
 
     npc->duration++;
     if (npc->duration >= script->varTable[6]) {
@@ -424,14 +424,14 @@ ApiStatus NpcFlyTo(ScriptInstance* script, s32 isInitialCall) {
     }
 
     yDelta = sin_deg((1.0 - (dist / npc->planarFlyDist)) * 180.0);
-    if (script->functionTemp[2].s == 0) {
+    if (script->functionTemp[2] == 0) {
         yDelta = 0.0f;
     }
-    if (script->functionTemp[2].s < 0) {
-        yDelta = -yDelta * -script->functionTemp[2].s;
+    if (script->functionTemp[2] < 0) {
+        yDelta = -yDelta * -script->functionTemp[2];
     }
-    if (script->functionTemp[2].s > 0) {
-        yDelta *= script->functionTemp[2].s;
+    if (script->functionTemp[2] > 0) {
+        yDelta *= script->functionTemp[2];
     }
     npc->pos.y += yDelta;
     return ApiStatus_BLOCK;
@@ -467,9 +467,9 @@ ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus InterpNpcYaw(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     Bytecode* args = script->ptrReadPos;
-    f32* t1 = &script->functionTemp[1].f;
-    f32* t2 = &script->functionTemp[2].f;
-    s32* t3 = &script->functionTemp[3].s;
+    f32* t1 = (f32*) &script->functionTemp[1];
+    f32* t2 = (f32*) &script->functionTemp[2];
+    s32* t3 = &script->functionTemp[3];
     Npc* npc;
 
     if (isInitialCall) {
@@ -482,7 +482,7 @@ ApiStatus InterpNpcYaw(ScriptInstance* script, s32 isInitialCall) {
 
         *t1 = npc->yaw;
         *t2 = get_variable(script, *args++) - *t1;
-        script->functionTemp[0].s = (s32)npc;
+        script->functionTemp[0] = (s32)npc;
         *t3 = get_variable(script, *args++);
 
         if (*t3 == 0) {
@@ -500,7 +500,7 @@ ApiStatus InterpNpcYaw(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    npc = (Npc*)script->functionTemp[0].s;
+    npc = (Npc*)script->functionTemp[0];
     if (*t3 > 0) {
         npc->duration++;
         npc->yaw = *t1 + ((*t2 * npc->duration) / *t3);
@@ -515,9 +515,9 @@ ApiStatus InterpNpcYaw(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus NpcFacePlayer(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     Bytecode* args = script->ptrReadPos;
-    f32* t1 = &script->functionTemp[1].f;
-    f32* t2 = &script->functionTemp[2].f;
-    s32* t3 = &script->functionTemp[3].s;
+    f32* t1 = (f32*) &script->functionTemp[1];
+    f32* t2 = (f32*) &script->functionTemp[2];
+    s32* t3 = &script->functionTemp[3];
     Npc* npc;
 
     if (isInitialCall) {
@@ -530,7 +530,7 @@ ApiStatus NpcFacePlayer(ScriptInstance* script, s32 isInitialCall) {
 
         *t1 = npc->yaw;
         *t2 = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) - *t1;
-        script->functionTemp[0].s = (s32)npc;
+        script->functionTemp[0] = (s32)npc;
         *t3 = get_variable(script, *args++);
         npc->duration = 0;
 
@@ -542,7 +542,7 @@ ApiStatus NpcFacePlayer(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    npc = (Npc*)script->functionTemp[0].s;
+    npc = (Npc*)script->functionTemp[0];
     if (*t3 > 0) {
         npc->duration++;
         npc->yaw = *t1 + ((*t2 * npc->duration) / *t3);
@@ -556,9 +556,9 @@ ApiStatus NpcFacePlayer(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus NpcFaceNpc(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    f32* t1 = &script->functionTemp[1].f;
-    f32* t2 = &script->functionTemp[2].f;
-    s32* t3 = &script->functionTemp[3].s;
+    f32* t1 = (f32*) &script->functionTemp[1];
+    f32* t2 = (f32*) &script->functionTemp[2];
+    s32* t3 = &script->functionTemp[3];
     Npc* npc;
     Npc* npc2;
 
@@ -578,7 +578,7 @@ ApiStatus NpcFaceNpc(ScriptInstance* script, s32 isInitialCall) {
 
         *t1 = npc2->yaw;
         *t2 = atan2(npc2->pos.x, npc2->pos.z, npc->pos.x, npc->pos.z) - *t1;
-        script->functionTemp[0].s = (s32)npc2;
+        script->functionTemp[0] = (s32)npc2;
         *t3 = get_variable(script, *args++);
         npc2->duration = 0;
 
@@ -590,7 +590,7 @@ ApiStatus NpcFaceNpc(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    npc2 = (Npc*)script->functionTemp[0].s;
+    npc2 = (Npc*)script->functionTemp[0];
     if (*t3 > 0) {
         npc2->duration++;
         npc2->yaw = *t1 + ((*t2 * npc2->duration) / *t3);

src/evt/player_api.c

@@ -135,22 +135,22 @@ ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) {
         f32 targetZ = get_variable(script, *args++);
         f32 moveSpeed;
 
-        script->functionTemp[0].s = get_variable(script, *args++);
+        script->functionTemp[0] = get_variable(script, *args++);
         playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
 
-        if (script->functionTemp[0].s == 0) {
-            script->functionTemp[0].s = dist2D(playerStatus->position.x, playerStatus->position.z, targetX,
+        if (script->functionTemp[0] == 0) {
+            script->functionTemp[0] = dist2D(playerStatus->position.x, playerStatus->position.z, targetX,
                                                targetZ) / playerNpc->moveSpeed;
             moveSpeed = playerNpc->moveSpeed;
         } else {
-            moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ) / script->functionTemp[0].s;
+            moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ) / script->functionTemp[0];
         }
-        move_player(script->functionTemp[0].s, playerStatus->targetYaw, moveSpeed);
+        move_player(script->functionTemp[0], playerStatus->targetYaw, moveSpeed);
     }
 
     // functionTemp 0 is the time left
-    script->functionTemp[0].s--;
-    return script->functionTemp[0].s < 0;
+    script->functionTemp[0]--;
+    return script->functionTemp[0] < 0;
 }
 
 ApiStatus func_802D1270(ScriptInstance* script, s32 isInitialCall) {
@@ -166,15 +166,15 @@ ApiStatus func_802D1270(ScriptInstance* script, s32 isInitialCall) {
 
         playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
         dist = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
-        script->functionTemp[0].s = dist / var3;
-        moveSpeed = dist / script->functionTemp[0].s;
+        script->functionTemp[0] = dist / var3;
+        moveSpeed = dist / script->functionTemp[0];
 
-        move_player(script->functionTemp[0].s, playerStatus->targetYaw, moveSpeed);
+        move_player(script->functionTemp[0], playerStatus->targetYaw, moveSpeed);
     }
 
     // functionTemp 0 is the time left
-    script->functionTemp[0].s--;
-    return (script->functionTemp[0].s < 0) * ApiStatus_DONE2;
+    script->functionTemp[0]--;
+    return (script->functionTemp[0] < 0) * ApiStatus_DONE2;
 }
 
 ApiStatus func_802D1380(ScriptInstance* script, s32 isInitialCall) {
@@ -215,10 +215,10 @@ s32 player_jump(ScriptInstance* script, s32 isInitialCall, s32 mode) {
     f32 dist;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         xTemp = get_variable(script, *args++);
         yTemp = get_variable(script, *args++);
         zTemp = get_variable(script, *args++);
@@ -263,7 +263,7 @@ s32 player_jump(ScriptInstance* script, s32 isInitialCall, s32 mode) {
             suggest_player_anim_clearUnkFlag(animID);
             sfx_play_sound_at_player(SOUND_JUMP_2081, 0);
         }
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 
     npc_move_heading(playerNpc, playerNpc->moveSpeed, playerNpc->yaw);
@@ -342,9 +342,9 @@ ApiStatus PlayerJump2(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     PlayerStatus* playerStatus = &gPlayerStatus;
-    f32* initialYaw = &script->functionTemp[1].f;
-    f32* deltaYaw = &script->functionTemp[2].f;
-    s32* time = &script->functionTemp[3].s;
+    f32* initialYaw = (f32*) &script->functionTemp[1];
+    f32* deltaYaw = (f32*) &script->functionTemp[2];
+    s32* time = &script->functionTemp[3];
 
     if (isInitialCall) {
         playerNpc->yaw = playerStatus->targetYaw;
@@ -380,9 +380,9 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus PlayerFaceNpc(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     s32* args = script->ptrReadPos;
-    f32* playerTargetYaw = &script->functionTemp[1].f;
-    f32* angle = &script->functionTemp[2].f;
-    s32* ft3 = &script->functionTemp[3].s;
+    f32* playerTargetYaw = (f32*) &script->functionTemp[1];
+    f32* angle = (f32*) &script->functionTemp[2];
+    s32* ft3 = &script->functionTemp[3];
 
     if (isInitialCall) {
         NpcID npcID = get_variable(script, *args++);
@@ -701,9 +701,9 @@ ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus func_802D2884(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     PlayerStatus* playerStatus = &gPlayerStatus;
-    f32* ft1 = &script->functionTemp[1].f;
-    f32* angle = &script->functionTemp[2].f;
-    s32* ft3 = &script->functionTemp[3].s;
+    f32* ft1 = (f32*) &script->functionTemp[1];
+    f32* angle = (f32*) &script->functionTemp[2];
+    s32* ft3 = &script->functionTemp[3];
 
     if (isInitialCall) {
         f32 x = get_float_variable(script, *args++);
@@ -1070,10 +1070,10 @@ ApiStatus VirtualEntityMoveTo(ScriptInstance* script, s32 isInitialCall) {
     VirtualEntity* virtualEntity;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         s32 index = get_variable(script, *args++);
         f32 xTemp = get_variable(script, *args++);
         f32 yTemp = get_variable(script, *args++);
@@ -1083,7 +1083,7 @@ ApiStatus VirtualEntityMoveTo(ScriptInstance* script, s32 isInitialCall) {
         f32 goalPosZ;
 
         virtualEntity = (*D_802DB7C0)[index];
-        script->functionTemp[1].s = index;
+        script->functionTemp[1] = index;
 
         virtualEntity->goalPos.x = xTemp;
         virtualEntity->goalPos.y = yTemp;
@@ -1105,10 +1105,10 @@ ApiStatus VirtualEntityMoveTo(ScriptInstance* script, s32 isInitialCall) {
             virtualEntity->moveSpeed = virtualEntity->moveDist / virtualEntity->moveTime;
         }
 
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 
-    virtualEntity = (*D_802DB7C0)[script->functionTemp[1].s];
+    virtualEntity = (*D_802DB7C0)[script->functionTemp[1]];
     virtual_entity_move_polar(virtualEntity, virtualEntity->moveSpeed, virtualEntity->moveAngle);
     virtualEntity->moveTime--;
 
@@ -1136,10 +1136,10 @@ ApiStatus VirtualEntityJumpTo(ScriptInstance* script, s32 isInitialCall) {
     f32 goalPosZ;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         index = get_variable(script, *args++);
         xTemp = get_variable(script, *args++);
         yTemp = get_variable(script, *args++);
@@ -1147,7 +1147,7 @@ ApiStatus VirtualEntityJumpTo(ScriptInstance* script, s32 isInitialCall) {
         moveTime = get_variable(script, *args++);
 
         virtualEntity = (*D_802DB7C0)[index];
-        script->functionTemp[1].s = index;
+        script->functionTemp[1] = index;
 
         virtualEntity->goalPos.x = xTemp;
         virtualEntity->goalPos.y = yTemp;
@@ -1175,10 +1175,10 @@ ApiStatus VirtualEntityJumpTo(ScriptInstance* script, s32 isInitialCall) {
 
         virtualEntity->jumpVelocity = (virtualEntity->jumpGravity * virtualEntity->moveTime / 2) +
                                       (goalPosY / virtualEntity->moveTime);
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 
-    virtualEntity = (*D_802DB7C0)[script->functionTemp[1].s];
+    virtualEntity = (*D_802DB7C0)[script->functionTemp[1]];
     virtualEntity->pos.y += virtualEntity->jumpVelocity;
     virtualEntity->jumpVelocity -= virtualEntity->jumpGravity;
 
@@ -1203,15 +1203,15 @@ ApiStatus VirtualEntityLandJump(ScriptInstance* script, s32 isInitialCall) {
     VirtualEntity* virtualEntity;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    if (script->functionTemp[0].s == 0) {
-        script->functionTemp[1].s = get_variable(script, *args++);
-        script->functionTemp[0].s = 1;
+    if (script->functionTemp[0] == 0) {
+        script->functionTemp[1] = get_variable(script, *args++);
+        script->functionTemp[0] = 1;
     }
 
-    virtualEntity = (*D_802DB7C0)[script->functionTemp[1].s];
+    virtualEntity = (*D_802DB7C0)[script->functionTemp[1]];
     virtualEntity->pos.y += virtualEntity->jumpVelocity;
     virtualEntity->jumpVelocity -= virtualEntity->jumpGravity;
 

src/evt/si.c

@@ -88,32 +88,32 @@ ApiStatus si_handle_wait(ScriptInstance* script) {
     Bytecode* ptrReadPos = script->ptrReadPos;
 
     if (!script->blocked) {
-        script->functionTemp[0].s = get_variable(script, *ptrReadPos);
+        script->functionTemp[0] = get_variable(script, *ptrReadPos);
         script->blocked = 1;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         return ApiStatus_DONE2;
     }
 
-    script->functionTemp[0].s -= 1;
-    return !script->functionTemp[0].s;
+    script->functionTemp[0] -= 1;
+    return !script->functionTemp[0];
 }
 
 ApiStatus si_handle_wait_seconds(ScriptInstance* script) {
     Bytecode* ptrReadPos = script->ptrReadPos;
 
     if (!script->blocked) {
-        script->functionTemp[0].s = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5;
+        script->functionTemp[0] = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5;
         script->blocked = 1;
     }
 
-    if (script->functionTemp[0].s == 0) {
+    if (script->functionTemp[0] == 0) {
         return ApiStatus_DONE2;
     }
 
-    script->functionTemp[0].s--;
-    return !script->functionTemp[0].s;
+    script->functionTemp[0]--;
+    return !script->functionTemp[0];
 }
 
 ApiStatus si_handle_if_equal(ScriptInstance* script) {

src/world/area_arn/arn_02/events.c

@@ -237,18 +237,18 @@ void N(func_802401D4_BDD384)(ScriptInstance* script, NpcAISettings* aiSettings,
     Npc* npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) {
             npc->currentAnim.w = enemy->animList[9];
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->duration = 12;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[0] = 2;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
 }
 
 #include "world/common/UnkNpcAIFunc21.inc.c"
@@ -282,7 +282,7 @@ void N(func_80240694_BDD844)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (npc->duration < 15) {
             npc->duration = 15;
         }
-        script->functionTemp[0].s = 0x16;
+        script->functionTemp[0] = 0x16;
     }
 }
 
@@ -300,7 +300,7 @@ void N(func_80240984_BDDB34)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -332,7 +332,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->flags &= ~0x800;
         if (!enemy->territory->wander.isFlying) {
@@ -349,26 +349,26 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    if ((u32)script->functionTemp[0].s - 12 < 3 && N(func_80240000_BDD1B0)(script, npcAISettings, territoryPtr)) {
-        script->functionTemp[0].s = 20;
+    if ((u32)script->functionTemp[0] - 12 < 3 && N(func_80240000_BDD1B0)(script, npcAISettings, territoryPtr)) {
+        script->functionTemp[0] = 20;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc18)(script, npcAISettings, territoryPtr);
         case 1:
             N(func_802401D4_BDD384)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 2) {
+            if (script->functionTemp[0] != 2) {
                 return ApiStatus_BLOCK;
             }
         case 2:
             N(UnkNpcAIFunc21)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 3) {
+            if (script->functionTemp[0] != 3) {
                 return ApiStatus_BLOCK;
             }
         case 3:
             N(UnkNpcAIFunc20)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 4) {
+            if (script->functionTemp[0] != 4) {
                 return ApiStatus_BLOCK;
             }
         case 4:
@@ -378,18 +378,18 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance* script, s32 isInitialCall) {
             return ApiStatus_BLOCK;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 return ApiStatus_BLOCK;
             }
         case 13:
             func_8004A124(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 14) {
+            if (script->functionTemp[0] != 14) {
                 return ApiStatus_BLOCK;
             }
         case 14:
             npc->duration--;
             if (npc->duration == 0) {
-                script->functionTemp[0].s = 40;
+                script->functionTemp[0] = 40;
             }
             return ApiStatus_BLOCK;
         case 20:
@@ -402,7 +402,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance* script, s32 isInitialCall) {
             return ApiStatus_BLOCK;
         case 40:
             N(func_80240984_BDDB34)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 return ApiStatus_BLOCK;
             }
         case 41:
@@ -412,7 +412,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc19)(script, npcAISettings, territoryPtr);
         case 51:
             N(UnkNpcAIFunc17)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 52) {
+            if (script->functionTemp[0] != 52) {
                 return ApiStatus_BLOCK;
             }
         case 52:

src/world/area_arn/arn_03/events.c

@@ -900,7 +900,7 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -911,11 +911,11 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -929,7 +929,7 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:
@@ -974,18 +974,18 @@ void N(func_80240E90_BDFC20)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     posX = npc->pos.x;
     posZ = npc->pos.z;
-    temp_f22 = (*(enemy->territory->patrol.points + script->functionTemp[2].s)).x;
-    temp_f20 = (*(enemy->territory->patrol.points + script->functionTemp[2].s)).z;
+    temp_f22 = (*(enemy->territory->patrol.points + script->functionTemp[2])).x;
+    temp_f20 = (*(enemy->territory->patrol.points + script->functionTemp[2])).z;
 
     npc->yaw = atan2(posX, posZ, temp_f22, temp_f20);
     npc_move_heading(npc, npc->moveSpeed, npc->yaw);
 
     posX = npc->pos.x;
-    posY = npc->pos.y + (*(enemy->territory->patrol.points + script->functionTemp[2].s)).y;
+    posY = npc->pos.y + (*(enemy->territory->patrol.points + script->functionTemp[2])).y;
     posZ = npc->pos.z;
     posW = 1000.0f;
     npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW);
-    posY += (*(enemy->territory->patrol.points + script->functionTemp[2].s)).y;
+    posY += (*(enemy->territory->patrol.points + script->functionTemp[2])).y;
     posW = posY - npc->pos.y;
     if (posW > 2.0) {
         npc->pos.y += 2.0;
@@ -997,7 +997,7 @@ void N(func_80240E90_BDFC20)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     posW = dist2D(npc->pos.x, npc->pos.z, temp_f22, temp_f20);
     if (!(posW > npc->moveSpeed)) {
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 }
 
@@ -1007,12 +1007,12 @@ void N(func_80241068_BDFDF8)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->duration--;
     if (npc->duration < 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s >= 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] >= 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
         } else {
-            script->functionTemp[0].s = 4;
+            script->functionTemp[0] = 4;
             npc->currentAnim.w = enemy->animList[0];
         }
     }
@@ -1036,12 +1036,12 @@ ApiStatus N(func_8024113C_BDFECC)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->flags &= ~0x800;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:

src/world/area_arn/arn_04/events.c

@@ -284,20 +284,20 @@ void N(func_80240158_BE3908)(ScriptInstance* script, NpcAISettings* aiSettings,
     s32 var;
 
     if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
+        if (script->functionTemp[1] <= 0) {
+            script->functionTemp[1] = aiSettings->unk_14;
             if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                 fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
                 ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                 if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
+                    script->functionTemp[0] = 10;
                 } else {
-                    script->functionTemp[0].s = 12;
+                    script->functionTemp[0] = 12;
                 }
                 return;
             }
         }
-        script->functionTemp[1].s--;
+        script->functionTemp[1]--;
     }
 
     if (npc->turnAroundYawAdjustment == 0) {
@@ -307,19 +307,19 @@ void N(func_80240158_BE3908)(ScriptInstance* script, NpcAISettings* aiSettings,
             func_8003D660(npc, 1);
         }
 
-        x = (*(enemy->territory->patrol.points + script->functionTemp[2].s)).x;
-        z = (*(enemy->territory->patrol.points + script->functionTemp[2].s)).z;
+        x = (*(enemy->territory->patrol.points + script->functionTemp[2])).x;
+        z = (*(enemy->territory->patrol.points + script->functionTemp[2])).z;
         npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
         npc_move_heading(npc, npc->moveSpeed, npc->yaw);
         if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
             if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
+                (aiSettings->waitTime <= 0) || (script->functionTemp[1] == 0)) {
+                script->functionTemp[0] = 4;
             }
             if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
+                script->functionTemp[0] = 4;
             }
         }
     }
@@ -362,7 +362,7 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -373,11 +373,11 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -391,7 +391,7 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr);
         case 1:
@@ -507,8 +507,8 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     s32 var;
@@ -517,14 +517,14 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -551,10 +551,10 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0 && (npc->duration <= 0 || --npc->duration <= 0)) {
-        script->functionTemp[0].s = 2;
-        script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-        if (aiSettings->unk_2C <= 0 || aiSettings->waitTime <= 0 || script->functionTemp[1].s < 3) {
-            script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 2;
+        script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+        if (aiSettings->unk_2C <= 0 || aiSettings->waitTime <= 0 || script->functionTemp[1] < 3) {
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -575,7 +575,7 @@ void N(func_80241AE4_BE5294)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -617,7 +617,7 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -684,18 +684,18 @@ void N(func_8024255C_BE5D0C)(ScriptInstance* script, NpcAISettings* aiSettings,
     Npc* npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) {
             npc->currentAnim.w = enemy->animList[9];
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->duration = 12;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[0] = 2;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
 }
 
 #include "world/common/UnkNpcAIFunc21.inc.c"
@@ -729,7 +729,7 @@ void N(func_80242A1C_BE61CC)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (npc->duration < 15) {
             npc->duration = 15;
         }
-        script->functionTemp[0].s = 0x16;
+        script->functionTemp[0] = 0x16;
     }
 }
 
@@ -747,7 +747,7 @@ void N(func_80242D0C_BE64BC)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -780,7 +780,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->flags &= ~0x800;
         if (!enemy->territory->wander.isFlying) {
@@ -800,26 +800,26 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    if ((u32)script->functionTemp[0].s - 12 < 3 && N(func_80242388_BE5B38)(script, aiSettings, territoryPtr)) {
-        script->functionTemp[0].s = 20;
+    if ((u32)script->functionTemp[0] - 12 < 3 && N(func_80242388_BE5B38)(script, aiSettings, territoryPtr)) {
+        script->functionTemp[0] = 20;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc18)(script, aiSettings, territoryPtr);
         case 1:
             N(func_8024255C_BE5D0C)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 2) {
+            if (script->functionTemp[0] != 2) {
                 return ApiStatus_BLOCK;
             }
         case 2:
             N(UnkNpcAIFunc21)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 3) {
+            if (script->functionTemp[0] != 3) {
                 return ApiStatus_BLOCK;
             }
         case 3:
             N(UnkNpcAIFunc20)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 4) {
+            if (script->functionTemp[0] != 4) {
                 return ApiStatus_BLOCK;
             }
         case 4:
@@ -829,18 +829,18 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
             return ApiStatus_BLOCK;
         case 12:
             func_80049F7C(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 return ApiStatus_BLOCK;
             }
         case 13:
             func_8004A124(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 14) {
+            if (script->functionTemp[0] != 14) {
                 return ApiStatus_BLOCK;
             }
         case 14:
             npc->duration--;
             if (npc->duration == 0) {
-                script->functionTemp[0].s = 40;
+                script->functionTemp[0] = 40;
             }
             return ApiStatus_BLOCK;
         case 20:
@@ -853,7 +853,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
             return ApiStatus_BLOCK;
         case 40:
             N(func_80242D0C_BE64BC)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 return ApiStatus_BLOCK;
             }
         case 41:
@@ -863,7 +863,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc19)(script, aiSettings, territoryPtr);
         case 51:
             N(UnkNpcAIFunc17)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 52) {
+            if (script->functionTemp[0] != 52) {
                 return ApiStatus_BLOCK;
             }
         case 52:

src/world/area_arn/arn_05/events.c

@@ -1042,7 +1042,7 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1053,11 +1053,11 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -1071,7 +1071,7 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr);
         case 1:
@@ -1117,18 +1117,18 @@ void N(func_80240E90_BE8A70)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     posX = npc->pos.x;
     posZ = npc->pos.z;
-    temp_f22 = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-    temp_f20 = script->functionTemp[2].s[enemy->territory->patrol.points].z;
+    temp_f22 = script->functionTemp[2][enemy->territory->patrol.points].x;
+    temp_f20 = script->functionTemp[2][enemy->territory->patrol.points].z;
 
     npc->yaw = atan2(posX, posZ, temp_f22, temp_f20);
     npc_move_heading(npc, npc->moveSpeed, npc->yaw);
 
     posX = npc->pos.x;
-    posY = npc->pos.y + script->functionTemp[2].s[enemy->territory->patrol.points].y;
+    posY = npc->pos.y + script->functionTemp[2][enemy->territory->patrol.points].y;
     posZ = npc->pos.z;
     posW = 1000.0f;
     npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW);
-    posY += script->functionTemp[2].s[enemy->territory->patrol.points].y;
+    posY += script->functionTemp[2][enemy->territory->patrol.points].y;
     posW = posY - npc->pos.y;
     if (posW > 2.0) {
         npc->pos.y += 2.0;
@@ -1140,7 +1140,7 @@ void N(func_80240E90_BE8A70)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     posW = dist2D(npc->pos.x, npc->pos.z, temp_f22, temp_f20);
     if (!(posW > npc->moveSpeed)) {
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 }
 
@@ -1150,12 +1150,12 @@ void N(func_80241068_BE8C48)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->duration--;
     if (npc->duration < 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s >= 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] >= 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
         } else {
-            script->functionTemp[0].s = 4;
+            script->functionTemp[0] = 4;
             npc->currentAnim.w = enemy->animList[0];
         }
     }
@@ -1179,12 +1179,12 @@ ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->flags &= ~0x800;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr);
         case 1:

src/world/area_arn/arn_07/events.c

@@ -1253,22 +1253,22 @@ void N(func_80240B00_BED8F0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -1296,10 +1296,10 @@ void N(func_80240B00_BED8F0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -1321,7 +1321,7 @@ void N(func_802415A4_BEE394)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80243BC0_BF09B0)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -1363,7 +1363,7 @@ ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:

src/world/area_arn/arn_08/BF47A0.c

@@ -6,15 +6,15 @@ ApiStatus N(func_80240000_BF47A0)(ScriptInstance* script, s32 isInitialCall) {
     s32 colliderID;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         suggest_player_anim_clearUnkFlag(0x10007);
     }
 
     temp_f20 = func_800E34D8();
     playerStatus->position.y = player_check_collision_below(temp_f20, &colliderID);
-    script->functionTemp[0].s += fabsf(temp_f20);
+    script->functionTemp[0] += fabsf(temp_f20);
     do {} while (0);
-    return (script->functionTemp[0].s > 50) * ApiStatus_DONE2;
+    return (script->functionTemp[0] > 50) * ApiStatus_DONE2;
 }
 
 ApiStatus N(func_8024008C_BF482C)(ScriptInstance* script, s32 isInitialCall) {

src/world/area_arn/arn_08/events.c

@@ -431,7 +431,7 @@ ApiStatus N(func_802400F4_BF4894)(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
     if (!(playerStatus->position.y > -10.0f)) {
@@ -439,9 +439,9 @@ ApiStatus N(func_802400F4_BF4894)(ScriptInstance* script, s32 isInitialCall) {
         s32 colliderID;
 
         playerStatus->position.y = player_check_collision_below(temp_f20, &colliderID);
-        script->functionTemp[0].s += fabsf(temp_f20);
+        script->functionTemp[0] += fabsf(temp_f20);
 
-        return (script->functionTemp[0].s > 50) * ApiStatus_DONE2;
+        return (script->functionTemp[0] > 50) * ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;

src/world/area_dgb/dgb_01/BFD9A0.c

@@ -576,22 +576,22 @@ void N(func_802402D0_BFDB50)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -619,10 +619,10 @@ void N(func_802402D0_BFDB50)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -644,7 +644,7 @@ void N(func_80240D74_BFE5F4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80244CD0_C02550)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -686,7 +686,7 @@ ApiStatus N(func_8024142C_BFECAC)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -739,7 +739,7 @@ void N(func_80241618_BFEE98)(ScriptInstance* script, NpcAISettings* aiSettings,
             }
         }
         npc->yaw = clamp_angle(phi_f20);
-        script->functionTemp[0].s = 13;
+        script->functionTemp[0] = 13;
     }
 }
 
@@ -752,16 +752,16 @@ void N(func_80241770_BFEFF0)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x,
                    gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) {
             npc->duration = 0;
-            script->functionTemp[0].s = 14;
+            script->functionTemp[0] = 14;
         } else {
             npc->duration--;
             if (npc->duration <= 0) {
                 npc->flags |= 0x200000;
-                script->functionTemp[0].s = 12;
+                script->functionTemp[0] = 12;
             }
         }
     } else {
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     }
 
 }
@@ -786,7 +786,7 @@ void N(func_80241874_BFF0F4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z);
     npc->duration = 0;
-    script->functionTemp[0].s = 15;
+    script->functionTemp[0] = 15;
 }
 
 void N(func_80241954_BFF1D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -800,7 +800,7 @@ void N(func_80241954_BFF1D4)(ScriptInstance* script, NpcAISettings* aiSettings,
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
         npc->flags &= ~0x00200000;
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     } else {
         npc->pos.x = gPlayerStatusPtr->position.x;
         npc->pos.z = gPlayerStatusPtr->position.z + 2.0f;
@@ -825,9 +825,9 @@ void N(func_80241954_BFF1D4)(ScriptInstance* script, NpcAISettings* aiSettings,
                 disable_player_input();
                 partner_disable_input();
                 npc->duration = 0;
-                script->functionTemp[0].s = 20;
+                script->functionTemp[0] = 20;
             } else {
-                script->functionTemp[0].s = 16;
+                script->functionTemp[0] = 16;
             }
         }
     }
@@ -845,7 +845,7 @@ void N(func_80241BF0_BFF470)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     npc->currentAnim.w = enemy->animList[9];
     npc->duration = 20;
-    script->functionTemp[0].s = 17;
+    script->functionTemp[0] = 17;
 }
 
 void N(func_80241CA8_BFF528)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -867,7 +867,7 @@ void N(func_80241CA8_BFF528)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->pos.y = posY + temp_f20;
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var);
         npc->duration = 10;
-        script->functionTemp[0].s = 18;
+        script->functionTemp[0] = 18;
     }
 }
 
@@ -877,7 +877,7 @@ void N(func_80241E28_BFF6A8)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[0].s = 30;
+        script->functionTemp[0] = 30;
     }
 }
 
@@ -889,11 +889,11 @@ void N(func_80241E70_BFF6F0)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration >= 3) {
         if (D_8010EBB0.unk_03 != 9) {
             npc->duration = 0;
-            script->functionTemp[0].s = 100;
+            script->functionTemp[0] = 100;
         } else {
             enable_player_input();
             partner_enable_input();
-            script->functionTemp[0].s = 16;
+            script->functionTemp[0] = 16;
         }
     }
 }
@@ -907,7 +907,7 @@ void N(func_80241EF0_BFF770)(ScriptInstance* script, NpcAISettings* aiSettings,
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
-    script->functionTemp[1].s = 0x1E;
+    script->functionTemp[1] = 0x1E;
 }
 
 void N(func_80241F98_BFF818)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -931,25 +931,25 @@ void N(func_80241F98_BFF818)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 
     enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12);
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) {
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->moveToPos.y = npc->pos.y;
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             return;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
     if (npc->turnAroundYawAdjustment == 0) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         npc_move_heading(npc, npc->moveSpeed, npc->yaw);
         posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         if (posW <= (2.0f * npc->moveSpeed)) {
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            script->functionTemp[0] = 2;
         }
     }
 }
@@ -972,17 +972,17 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
             func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0);
         case 1:
             N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
@@ -990,13 +990,13 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
             N(UnkFunc4)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
         case 12:
             N(func_80241618_BFEE98)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -1004,7 +1004,7 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 14:
             N(func_80241874_BFF0F4)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 15) {
+            if (script->functionTemp[0] != 15) {
                 break;
             }
         case 15:
@@ -1027,7 +1027,7 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80241F98_BFF818)(script, aiSettings, territoryPtr);
     }
 
-    return (script->functionTemp[0].s == 100) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 100) * ApiStatus_DONE2;
 }
 
 const char N(dgb_00_name_hack)[];
@@ -1272,7 +1272,7 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1283,11 +1283,11 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -1301,7 +1301,7 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr);
         case 1:

src/world/area_dgb/dgb_02/C2EBA0.c

@@ -478,7 +478,7 @@ ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -488,18 +488,18 @@ ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C2EDA8)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C2EDA8)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -527,12 +527,12 @@ ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -558,7 +558,7 @@ void N(func_802408D0_C2F470)(ScriptInstance* script, NpcAISettings* aiSettings,
     } else if (npc->duration <= 0) {
         npc->currentAnim.w = enemy->animList[10];
         npc->duration = 0;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 }
 
@@ -602,7 +602,7 @@ void N(func_80240958_C2F4F8)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration = 10;
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 
     npc->duration++;
@@ -626,7 +626,7 @@ void N(func_80240C10_C2F7B0)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration <= 0) {
         npc->duration = 1;
         enemy->varTable[7] = 40;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 }
 
@@ -636,8 +636,8 @@ void N(func_80240C74_C2F814)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f);
     npc->currentAnim.w = enemy->animList[0];
-    script->functionTemp[1].s = (rand_int(1000) % 2) + 2;
-    script->functionTemp[0].s = 4;
+    script->functionTemp[1] = (rand_int(1000) % 2) + 2;
+    script->functionTemp[0] = 4;
 }
 
 void N(func_80240D1C_C2F8BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -647,14 +647,14 @@ void N(func_80240D1C_C2F8BC)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
             return;
@@ -663,10 +663,10 @@ void N(func_80240D1C_C2F8BC)(ScriptInstance* script, NpcAISettings* aiSettings,
         var = enemy->varTable[7];
         if (var == 40) {
             npc->duration = 20;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         } else if (var == 50) {
             npc->duration = 25;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         }
     }
 }
@@ -683,7 +683,7 @@ void N(func_80240E54_C2F9F4)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -694,13 +694,13 @@ void N(func_80240F00_C2FAA0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                       enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 15;
         enemy->varTable[7] = 50;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     } else if (npc->turnAroundYawAdjustment == 0) {
         var = npc->yaw;
         func_8004A784(npc, 5.0f, &var, 0, 0, 0);
@@ -718,7 +718,7 @@ void N(func_80241078_C2FC18)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         if (npc->duration <= 0) {
             npc->duration = 0;
-            script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -741,7 +741,7 @@ ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 30;
         npc->currentAnim.w = enemy->animList[10];
         npc->flags &= ~0x800;
@@ -752,18 +752,18 @@ ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 40;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 40;
             npc->currentAnim.w = enemy->animList[0];
         }
         enemy->unk_B0 &= ~4;
     }
 
-    if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C2EDA8)(script)) {
-        script->functionTemp[0].s = 30;
+    if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C2EDA8)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(func_802408D0_C2F470)(script, npcAISettings, territoryPtr);
             break;
@@ -781,7 +781,7 @@ ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -791,16 +791,16 @@ ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall) {
             func_8004A3E8(script, npcAISettings, territoryPtr);
             npc->duration = 15;
             enemy->varTable[7] = 40;
-            script->functionTemp[0].s = 3;
+            script->functionTemp[0] = 3;
             break;
         case 30:
             N(UnkNpcAIFunc6)(script);
-            if (script->functionTemp[0].s != 31) {
+            if (script->functionTemp[0] != 31) {
                 break;
             }
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
@@ -811,7 +811,7 @@ ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 40:
             N(func_80240E54_C2F9F4)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 break;
             }
         case 41:

src/world/area_dgb/dgb_03/C31730.c

@@ -803,7 +803,7 @@ ApiStatus N(func_8024086C_C31D4C)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -813,18 +813,18 @@ ApiStatus N(func_8024086C_C31D4C)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -852,12 +852,12 @@ ApiStatus N(func_8024086C_C31D4C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -911,7 +911,7 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -922,11 +922,11 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -940,7 +940,7 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:
@@ -995,7 +995,7 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1005,18 +1005,18 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:
@@ -1047,12 +1047,12 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -1078,7 +1078,7 @@ void N(func_80241C7C_C3315C)(ScriptInstance* script, NpcAISettings* aiSettings,
     } else if (npc->duration <= 0) {
         npc->currentAnim.w = enemy->animList[10];
         npc->duration = 0;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 }
 
@@ -1122,7 +1122,7 @@ void N(func_80241D04_C331E4)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration = 10;
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 
     npc->duration++;
@@ -1146,7 +1146,7 @@ void N(func_80241FBC_C3349C)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration <= 0) {
         npc->duration = 1;
         enemy->varTable[7] = 40;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 }
 
@@ -1156,8 +1156,8 @@ void N(func_80242020_C33500)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f);
     npc->currentAnim.w = enemy->animList[0];
-    script->functionTemp[1].s = (rand_int(1000) % 2) + 2;
-    script->functionTemp[0].s = 4;
+    script->functionTemp[1] = (rand_int(1000) % 2) + 2;
+    script->functionTemp[0] = 4;
 }
 
 void N(func_802420C8_C335A8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1167,14 +1167,14 @@ void N(func_802420C8_C335A8)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
             return;
@@ -1183,10 +1183,10 @@ void N(func_802420C8_C335A8)(ScriptInstance* script, NpcAISettings* aiSettings,
         var = enemy->varTable[7];
         if (var == 40) {
             npc->duration = 20;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         } else if (var == 50) {
             npc->duration = 25;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         }
     }
 }
@@ -1203,7 +1203,7 @@ void N(func_80242200_C336E0)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -1214,13 +1214,13 @@ void N(func_802422AC_C3378C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                       enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 15;
         enemy->varTable[7] = 50;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     } else if (npc->turnAroundYawAdjustment == 0) {
         var = npc->yaw;
         func_8004A784(npc, 5.0f, &var, 0, 0, 0);
@@ -1238,7 +1238,7 @@ void N(func_80242424_C33904)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         if (npc->duration <= 0) {
             npc->duration = 0;
-            script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -1261,7 +1261,7 @@ ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 30;
         npc->currentAnim.w = enemy->animList[10];
         npc->flags &= ~0x800;
@@ -1272,18 +1272,18 @@ ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 40;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 40;
             npc->currentAnim.w = enemy->animList[0];
         }
         enemy->unk_B0 &= ~4;
     }
 
-    if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) {
-        script->functionTemp[0].s = 30;
+    if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(func_80241C7C_C3315C)(script, npcAISettings, territoryPtr);
             break;
@@ -1301,7 +1301,7 @@ ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -1311,16 +1311,16 @@ ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall) {
             func_8004A3E8(script, npcAISettings, territoryPtr);
             npc->duration = 15;
             enemy->varTable[7] = 40;
-            script->functionTemp[0].s = 3;
+            script->functionTemp[0] = 3;
             break;
         case 30:
             N(UnkNpcAIFunc6)(script);
-            if (script->functionTemp[0].s != 31) {
+            if (script->functionTemp[0] != 31) {
                 break;
             }
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
@@ -1331,7 +1331,7 @@ ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 40:
             N(func_80242200_C336E0)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 break;
             }
         case 41:

src/world/area_dgb/dgb_04/C36530.c

@@ -486,22 +486,22 @@ void N(func_802401B0_C366E0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -529,10 +529,10 @@ void N(func_802401B0_C366E0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -554,7 +554,7 @@ void N(func_80240C54_C37184)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80243560_C39A90)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -596,7 +596,7 @@ ApiStatus N(func_8024130C_C3783C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -648,7 +648,7 @@ void N(func_802414F8_C37A28)(ScriptInstance* script, NpcAISettings* aiSettings,
             }
         }
         npc->yaw = clamp_angle(phi_f20);
-        script->functionTemp[0].s = 13;
+        script->functionTemp[0] = 13;
     }
 }
 
@@ -661,16 +661,16 @@ void N(func_80241650_C37B80)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x,
                    gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) {
             npc->duration = 0;
-            script->functionTemp[0].s = 14;
+            script->functionTemp[0] = 14;
         } else {
             npc->duration--;
             if (npc->duration <= 0) {
                 npc->flags |= 0x200000;
-                script->functionTemp[0].s = 12;
+                script->functionTemp[0] = 12;
             }
         }
     } else {
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     }
 
 }
@@ -686,7 +686,7 @@ void N(func_80241754_C37C84)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z);
     npc->duration = 0;
-    script->functionTemp[0].s = 15;
+    script->functionTemp[0] = 15;
 }
 
 void N(func_802417F8_C37D28)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -700,7 +700,7 @@ void N(func_802417F8_C37D28)(ScriptInstance* script, NpcAISettings* aiSettings,
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
         npc->flags &= ~0x00200000;
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     } else {
         npc->pos.x = gPlayerStatusPtr->position.x;
         npc->pos.z = gPlayerStatusPtr->position.z + 2.0f;
@@ -725,9 +725,9 @@ void N(func_802417F8_C37D28)(ScriptInstance* script, NpcAISettings* aiSettings,
                 disable_player_input();
                 partner_disable_input();
                 npc->duration = 0;
-                script->functionTemp[0].s = 20;
+                script->functionTemp[0] = 20;
             } else {
-                script->functionTemp[0].s = 16;
+                script->functionTemp[0] = 16;
             }
         }
     }
@@ -745,7 +745,7 @@ void N(func_80241A94_C37FC4)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     npc->currentAnim.w = enemy->animList[9];
     npc->duration = 20;
-    script->functionTemp[0].s = 17;
+    script->functionTemp[0] = 17;
 }
 
 void N(func_80241B4C_C3807C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -767,7 +767,7 @@ void N(func_80241B4C_C3807C)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->pos.y = posY + temp_f20;
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var);
         npc->duration = 10;
-        script->functionTemp[0].s = 18;
+        script->functionTemp[0] = 18;
     }
 }
 
@@ -777,7 +777,7 @@ void N(func_80241CCC_C381FC)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[0].s = 30;
+        script->functionTemp[0] = 30;
     }
 }
 
@@ -789,11 +789,11 @@ void N(func_80241D14_C38244)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration >= 3) {
         if (D_8010EBB0.unk_03 != 9) {
             npc->duration = 0;
-            script->functionTemp[0].s = 100;
+            script->functionTemp[0] = 100;
         } else {
             enable_player_input();
             partner_enable_input();
-            script->functionTemp[0].s = 16;
+            script->functionTemp[0] = 16;
         }
     }
 }
@@ -807,7 +807,7 @@ void N(func_80241D94_C382C4)(ScriptInstance* script, NpcAISettings* aiSettings,
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
-    script->functionTemp[1].s = 0x1E;
+    script->functionTemp[1] = 0x1E;
 }
 
 void N(func_80241E3C_C3836C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -831,25 +831,25 @@ void N(func_80241E3C_C3836C)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 
     enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12);
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) {
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->moveToPos.y = npc->pos.y;
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             return;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
     if (npc->turnAroundYawAdjustment == 0) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         npc_move_heading(npc, npc->moveSpeed, npc->yaw);
         posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         if (posW <= (2.0f * npc->moveSpeed)) {
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            script->functionTemp[0] = 2;
         }
     }
 }
@@ -872,17 +872,17 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
             func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0);
         case 1:
             N(func_802401B0_C366E0)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
@@ -890,13 +890,13 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
             N(UnkFunc4)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
         case 12:
             N(func_802414F8_C37A28)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -904,7 +904,7 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 14:
             N(func_80241754_C37C84)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 15) {
+            if (script->functionTemp[0] != 15) {
                 break;
             }
         case 15:
@@ -927,7 +927,7 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80241E3C_C3836C)(script, aiSettings, territoryPtr);
     }
 
-    return (script->functionTemp[0].s == 100) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 100) * ApiStatus_DONE2;
 }
 
 #include "world/common/SetOverrideFlags_40.inc.c"
@@ -973,8 +973,8 @@ ApiStatus N(func_8024259C_C38ACC)(ScriptInstance* script, s32 isInitialCall) {
     s32 idx;
 
     if (isInitialCall) {
-        script->functionTemp[2].s = heap_malloc(0x330);
-        ptr = script->functionTemp[2].s;
+        script->functionTemp[2] = heap_malloc(0x330);
+        ptr = script->functionTemp[2];
 
         partnerActiveCount = 0;
         var = script->varTable[12] >= 0;
@@ -1004,34 +1004,34 @@ ApiStatus N(func_8024259C_C38ACC)(ScriptInstance* script, s32 isInitialCall) {
         ptr->unk_324 = partnerActiveCount;
         ptr->unk_328 = 0;
         create_popup_menu(ptr);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    ptr = script->functionTemp[2].s;
-    if (script->functionTemp[0].s == 0) {
-        script->functionTemp[1].s = ptr->unk_32C;
-        if (script->functionTemp[1].s != 0) {
+    ptr = script->functionTemp[2];
+    if (script->functionTemp[0] == 0) {
+        script->functionTemp[1] = ptr->unk_32C;
+        if (script->functionTemp[1] != 0) {
             hide_popup_menu();
         } else {
             return ApiStatus_BLOCK;
         }
     }
 
-    script->functionTemp[0].s++;
+    script->functionTemp[0]++;
 
-    if (script->functionTemp[0].s < 15) {
+    if (script->functionTemp[0] < 15) {
         return ApiStatus_BLOCK;
     }
 
     destroy_popup_menu();
-    if (script->functionTemp[1].s != 0xFF) {
-        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1].s - 1]][0];
-        script->varTable[1] = ptr->unk_108[script->functionTemp[1].s - 1];
+    if (script->functionTemp[1] != 0xFF) {
+        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1] - 1]][0];
+        script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1];
     } else {
         script->varTable[0] = -1;
     }
 
-    heap_free(script->functionTemp[2].s);
+    heap_free(script->functionTemp[2]);
 
     return ApiStatus_DONE2;
 }
@@ -1202,42 +1202,42 @@ s32 N(func_80242F08_C39438)(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
         script->varTable[0] = get_variable(script, *args++);
         script->varTable[1] = get_variable(script, *args++);
-        script->functionTemp[0].s = 0;
-        script->functionTemp[1].s = 0;
+        script->functionTemp[0] = 0;
+        script->functionTemp[1] = 0;
         set_screen_overlay_color(0, 0xD0, 0xD0, 0xD0);
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
-            if (script->functionTemp[1].s == 0xFF) {
-                script->functionTemp[0].s = 1;
-                script->functionTemp[2].s = 0;
+            if (script->functionTemp[1] == 0xFF) {
+                script->functionTemp[0] = 1;
+                script->functionTemp[2] = 0;
             }
-            script->functionTemp[1].s += script->varTable[0];
-            if (script->functionTemp[1].s >= 0x100) {
-                script->functionTemp[1].s = 0xFF;
+            script->functionTemp[1] += script->varTable[0];
+            if (script->functionTemp[1] >= 0x100) {
+                script->functionTemp[1] = 0xFF;
             }
             break;
 
         case 1:
-            script->functionTemp[2].s++;
-            if (script->functionTemp[2].s >= 2) {
-                script->functionTemp[0].s = 2;
+            script->functionTemp[2]++;
+            if (script->functionTemp[2] >= 2) {
+                script->functionTemp[0] = 2;
             }
             break;
 
         case 2:
-            if (script->functionTemp[1].s == 0) {
+            if (script->functionTemp[1] == 0) {
                 ret = 1;
             }
-            script->functionTemp[1].s -= script->varTable[1];
-            if (script->functionTemp[1].s < 0) {
-                script->functionTemp[1].s = 0;
+            script->functionTemp[1] -= script->varTable[1];
+            if (script->functionTemp[1] < 0) {
+                script->functionTemp[1] = 0;
             }
             break;
     }
 
-    set_screen_overlay_params_front(1, script->functionTemp[1].s);
+    set_screen_overlay_params_front(1, script->functionTemp[1]);
 
     return ret;
 }

src/world/area_dgb/dgb_05/C3AA10.c

@@ -408,7 +408,7 @@ void N(func_8024067C_C3B08C)(ScriptInstance* script, NpcAISettings* aiSettings,
     } else if (npc->duration <= 0) {
         npc->currentAnim.w = enemy->animList[10];
         npc->duration = 0;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 }
 
@@ -452,7 +452,7 @@ void N(func_80240704_C3B114)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration = 10;
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 
     npc->duration++;
@@ -476,7 +476,7 @@ void N(func_802409BC_C3B3CC)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration <= 0) {
         npc->duration = 1;
         enemy->varTable[7] = 40;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 }
 
@@ -486,8 +486,8 @@ void N(func_80240A20_C3B430)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f);
     npc->currentAnim.w = enemy->animList[0];
-    script->functionTemp[1].s = (rand_int(1000) % 2) + 2;
-    script->functionTemp[0].s = 4;
+    script->functionTemp[1] = (rand_int(1000) % 2) + 2;
+    script->functionTemp[0] = 4;
 }
 
 void N(func_80240AC8_C3B4D8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -497,14 +497,14 @@ void N(func_80240AC8_C3B4D8)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
             return;
@@ -513,10 +513,10 @@ void N(func_80240AC8_C3B4D8)(ScriptInstance* script, NpcAISettings* aiSettings,
         var = enemy->varTable[7];
         if (var == 40) {
             npc->duration = 20;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         } else if (var == 50) {
             npc->duration = 25;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         }
     }
 }
@@ -533,7 +533,7 @@ void N(func_80240C00_C3B610)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -544,13 +544,13 @@ void N(func_80240CAC_C3B6BC)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                       enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 15;
         enemy->varTable[7] = 50;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     } else if (npc->turnAroundYawAdjustment == 0) {
         var = npc->yaw;
         func_8004A784(npc, 5.0f, &var, 0, 0, 0);
@@ -568,7 +568,7 @@ void N(func_80240E24_C3B834)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         if (npc->duration <= 0) {
             npc->duration = 0;
-            script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -591,7 +591,7 @@ ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 30;
         npc->currentAnim.w = enemy->animList[10];
         npc->flags &= ~0x800;
@@ -602,18 +602,18 @@ ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 40;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 40;
             npc->currentAnim.w = enemy->animList[0];
         }
         enemy->unk_B0 &= ~4;
     }
 
-    if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240268_C3AC78)(script)) {
-        script->functionTemp[0].s = 30;
+    if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240268_C3AC78)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(func_8024067C_C3B08C)(script, npcAISettings, territoryPtr);
             break;
@@ -631,7 +631,7 @@ ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -641,16 +641,16 @@ ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall) {
             func_8004A3E8(script, npcAISettings, territoryPtr);
             npc->duration = 0xF;
             enemy->varTable[7] = 40;
-            script->functionTemp[0].s = 3;
+            script->functionTemp[0] = 3;
             break;
         case 30:
             N(UnkNpcAIFunc6)(script);
-            if (script->functionTemp[0].s != 31) {
+            if (script->functionTemp[0] != 31) {
                 break;
             }
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
@@ -661,7 +661,7 @@ ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 40:
             N(func_80240C00_C3B610)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 break;
             }
         case 41:
@@ -695,7 +695,7 @@ ApiStatus N(func_802411D0_C3BBE0)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -705,18 +705,18 @@ ApiStatus N(func_802411D0_C3BBE0)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240268_C3AC78)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240268_C3AC78)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -744,12 +744,12 @@ ApiStatus N(func_802411D0_C3BBE0)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_dgb/dgb_07/C3DBF0.c

@@ -317,7 +317,7 @@ void N(func_8024061C_C3E20C)(ScriptInstance* script, NpcAISettings* aiSettings,
     } else if (npc->duration <= 0) {
         npc->currentAnim.w = enemy->animList[10];
         npc->duration = 0;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 }
 
@@ -361,7 +361,7 @@ void N(func_802406A4_C3E294)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration = 10;
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 
     npc->duration++;
@@ -385,7 +385,7 @@ void N(func_8024095C_C3E54C)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration <= 0) {
         npc->duration = 1;
         enemy->varTable[7] = 40;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 }
 
@@ -395,8 +395,8 @@ void N(func_802409C0_C3E5B0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f);
     npc->currentAnim.w = enemy->animList[0];
-    script->functionTemp[1].s = (rand_int(1000) % 2) + 2;
-    script->functionTemp[0].s = 4;
+    script->functionTemp[1] = (rand_int(1000) % 2) + 2;
+    script->functionTemp[0] = 4;
 }
 
 void N(func_80240A68_C3E658)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -406,14 +406,14 @@ void N(func_80240A68_C3E658)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
             return;
@@ -422,10 +422,10 @@ void N(func_80240A68_C3E658)(ScriptInstance* script, NpcAISettings* aiSettings,
         var = enemy->varTable[7];
         if (var == 40) {
             npc->duration = 20;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         } else if (var == 50) {
             npc->duration = 25;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         }
     }
 }
@@ -442,7 +442,7 @@ void N(func_80240BA0_C3E790)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -453,13 +453,13 @@ void N(func_80240C4C_C3E83C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                       enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 15;
         enemy->varTable[7] = 50;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     } else if (npc->turnAroundYawAdjustment == 0) {
         var = npc->yaw;
         func_8004A784(npc, 5.0f, &var, 0, 0, 0);
@@ -477,7 +477,7 @@ void N(func_80240DC4_C3E9B4)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         if (npc->duration <= 0) {
             npc->duration = 0;
-            script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -500,7 +500,7 @@ ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 30;
         npc->currentAnim.w = enemy->animList[10];
         npc->flags &= ~0x800;
@@ -511,18 +511,18 @@ ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 40;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 40;
             npc->currentAnim.w = enemy->animList[0];
         }
         enemy->unk_B0 &= ~4;
     }
 
-    if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C3DDF8)(script)) {
-        script->functionTemp[0].s = 30;
+    if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C3DDF8)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(func_8024061C_C3E20C)(script, npcAISettings, territoryPtr);
             break;
@@ -540,7 +540,7 @@ ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -550,16 +550,16 @@ ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall) {
             func_8004A3E8(script, npcAISettings, territoryPtr);
             npc->duration = 15;
             enemy->varTable[7] = 40;
-            script->functionTemp[0].s = 3;
+            script->functionTemp[0] = 3;
             break;
         case 30:
             N(UnkNpcAIFunc6)(script);
-            if (script->functionTemp[0].s != 31) {
+            if (script->functionTemp[0] != 31) {
                 break;
             }
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
@@ -570,7 +570,7 @@ ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 40:
             N(func_80240BA0_C3E790)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 break;
             }
         case 41:
@@ -604,7 +604,7 @@ ApiStatus N(func_80241170_C3ED60)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -614,18 +614,18 @@ ApiStatus N(func_80241170_C3ED60)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C3DDF8)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C3DDF8)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -653,12 +653,12 @@ ApiStatus N(func_80241170_C3ED60)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_dgb/dgb_08/C3FDB0.c

@@ -994,7 +994,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1005,11 +1005,11 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -1023,7 +1023,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:
@@ -1126,7 +1126,7 @@ ApiStatus N(func_802414AC_C4125C)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1136,18 +1136,18 @@ ApiStatus N(func_802414AC_C4125C)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241098_C40E48)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241098_C40E48)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -1175,12 +1175,12 @@ ApiStatus N(func_802414AC_C4125C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -1284,22 +1284,22 @@ void N(func_80241910_C416C0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -1327,10 +1327,10 @@ void N(func_80241910_C416C0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -1352,7 +1352,7 @@ void N(func_802423B4_C42164)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80244460_C44210)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -1394,7 +1394,7 @@ ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -1447,7 +1447,7 @@ void N(func_80242C58_C42A08)(ScriptInstance* script, NpcAISettings* aiSettings,
             }
         }
         npc->yaw = clamp_angle(phi_f20);
-        script->functionTemp[0].s = 13;
+        script->functionTemp[0] = 13;
     }
 }
 
@@ -1460,16 +1460,16 @@ void N(func_80242DB0_C42B60)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x,
                    gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) {
             npc->duration = 0;
-            script->functionTemp[0].s = 14;
+            script->functionTemp[0] = 14;
         } else {
             npc->duration--;
             if (npc->duration <= 0) {
                 npc->flags |= 0x200000;
-                script->functionTemp[0].s = 12;
+                script->functionTemp[0] = 12;
             }
         }
     } else {
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     }
 
 }
@@ -1493,7 +1493,7 @@ void N(func_80242EB4_C42C64)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z);
     npc->duration = 0;
-    script->functionTemp[0].s = 15;
+    script->functionTemp[0] = 15;
 }
 
 void N(func_80242F94_C42D44)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1507,7 +1507,7 @@ void N(func_80242F94_C42D44)(ScriptInstance* script, NpcAISettings* aiSettings,
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
         npc->flags &= ~0x00200000;
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     } else {
         PlayerStatus** playerStatus = &gPlayerStatusPtr;
 
@@ -1534,9 +1534,9 @@ void N(func_80242F94_C42D44)(ScriptInstance* script, NpcAISettings* aiSettings,
                 disable_player_input();
                 partner_disable_input();
                 npc->duration = 0;
-                script->functionTemp[0].s = 20;
+                script->functionTemp[0] = 20;
             } else {
-                script->functionTemp[0].s = 16;
+                script->functionTemp[0] = 16;
             }
         }
     }
@@ -1554,7 +1554,7 @@ void N(func_80243230_C42FE0)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     npc->currentAnim.w = enemy->animList[9];
     npc->duration = 20;
-    script->functionTemp[0].s = 17;
+    script->functionTemp[0] = 17;
 }
 
 void N(func_802432E8_C43098)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1576,7 +1576,7 @@ void N(func_802432E8_C43098)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->pos.y = posY + temp_f20;
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var);
         npc->duration = 10;
-        script->functionTemp[0].s = 18;
+        script->functionTemp[0] = 18;
     }
 }
 
@@ -1586,7 +1586,7 @@ void N(filemenu_update_show_options_right_C43218)(ScriptInstance* script, NpcAIS
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[0].s = 30;
+        script->functionTemp[0] = 30;
     }
 }
 
@@ -1598,11 +1598,11 @@ void N(func_802434B0_C43260)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration >= 3) {
         if (D_8010EBB0.unk_03 != 9) {
             npc->duration = 0;
-            script->functionTemp[0].s = 100;
+            script->functionTemp[0] = 100;
         } else {
             enable_player_input();
             partner_enable_input();
-            script->functionTemp[0].s = 16;
+            script->functionTemp[0] = 16;
         }
     }
 }
@@ -1616,7 +1616,7 @@ void N(func_80243530_C432E0)(ScriptInstance* script, NpcAISettings* aiSettings,
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
-    script->functionTemp[1].s = 0x1E;
+    script->functionTemp[1] = 0x1E;
 }
 
 void N(func_802435D8_C43388)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1640,25 +1640,25 @@ void N(func_802435D8_C43388)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 
     enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12);
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) {
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->moveToPos.y = npc->pos.y;
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             return;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
     if (npc->turnAroundYawAdjustment == 0) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         npc_move_heading(npc, npc->moveSpeed, npc->yaw);
         posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         if (posW <= (2.0f * npc->moveSpeed)) {
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            script->functionTemp[0] = 2;
         }
     }
 }
@@ -1681,17 +1681,17 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         N(UnkFunc5)(npc, enemy, script, npcAISettings);
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr);
             func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0);
         case 1:
             N(func_80241910_C416C0)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
@@ -1699,13 +1699,13 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc1_copy)(script, npcAISettings, territoryPtr);
         case 3:
             N(UnkFunc4)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
         case 12:
             N(func_80242C58_C42A08)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -1713,7 +1713,7 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 14:
             N(func_80242EB4_C42C64)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 15) {
+            if (script->functionTemp[0] != 15) {
                 break;
             }
         case 15:
@@ -1736,7 +1736,7 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall) {
             N(func_802435D8_C43388)(script, npcAISettings, territoryPtr);
     }
 
-    return (script->functionTemp[0].s == 100) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 100) * ApiStatus_DONE2;
 }
 
 #include "world/common/UnkFunc1.inc.c"

src/world/area_dgb/dgb_09/C46BE0.c

@@ -661,7 +661,7 @@ ApiStatus N(func_8024061C_C471FC)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -671,18 +671,18 @@ ApiStatus N(func_8024061C_C471FC)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C46DE8)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C46DE8)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -710,12 +710,12 @@ ApiStatus N(func_8024061C_C471FC)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -741,7 +741,7 @@ void N(func_802408D0_C474B0)(ScriptInstance* script, NpcAISettings* aiSettings,
     } else if (npc->duration <= 0) {
         npc->currentAnim.w = enemy->animList[10];
         npc->duration = 0;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 }
 
@@ -785,7 +785,7 @@ void N(func_80240958_C47538)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration = 10;
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 
     npc->duration++;
@@ -809,7 +809,7 @@ void N(func_80240C10_C477F0)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration <= 0) {
         npc->duration = 1;
         enemy->varTable[7] = 40;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 }
 
@@ -819,8 +819,8 @@ void N(func_80240C74_C47854)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f);
     npc->currentAnim.w = enemy->animList[0];
-    script->functionTemp[1].s = (rand_int(1000) % 2) + 2;
-    script->functionTemp[0].s = 4;
+    script->functionTemp[1] = (rand_int(1000) % 2) + 2;
+    script->functionTemp[0] = 4;
 }
 
 void N(func_80240D1C_C478FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -830,14 +830,14 @@ void N(func_80240D1C_C478FC)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
             return;
@@ -846,10 +846,10 @@ void N(func_80240D1C_C478FC)(ScriptInstance* script, NpcAISettings* aiSettings,
         var = enemy->varTable[7];
         if (var == 40) {
             npc->duration = 20;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         } else if (var == 50) {
             npc->duration = 25;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         }
     }
 }
@@ -866,7 +866,7 @@ void N(func_80240E54_C47A34)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -877,13 +877,13 @@ void N(func_80240F00_C47AE0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                       enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 15;
         enemy->varTable[7] = 50;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     } else if (npc->turnAroundYawAdjustment == 0) {
         var = npc->yaw;
         func_8004A784(npc, 5.0f, &var, 0, 0, 0);
@@ -901,7 +901,7 @@ void N(func_80241078_C47C58)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         if (npc->duration <= 0) {
             npc->duration = 0;
-            script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -924,7 +924,7 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 30;
         npc->currentAnim.w = enemy->animList[10];
         npc->flags &= ~0x800;
@@ -935,18 +935,18 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 40;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 40;
             npc->currentAnim.w = enemy->animList[0];
         }
         enemy->unk_B0 &= ~4;
     }
 
-    if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C46DE8)(script)) {
-        script->functionTemp[0].s = 30;
+    if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C46DE8)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(func_802408D0_C474B0)(script, npcAISettings, territoryPtr);
             break;
@@ -964,7 +964,7 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -974,16 +974,16 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall) {
             func_8004A3E8(script, npcAISettings, territoryPtr);
             npc->duration = 15;
             enemy->varTable[7] = 40;
-            script->functionTemp[0].s = 3;
+            script->functionTemp[0] = 3;
             break;
         case 30:
             N(UnkNpcAIFunc6)(script);
-            if (script->functionTemp[0].s != 31) {
+            if (script->functionTemp[0] != 31) {
                 break;
             }
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
@@ -994,7 +994,7 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 40:
             N(func_80240E54_C47A34)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 break;
             }
         case 41:
@@ -1101,22 +1101,22 @@ void N(func_802415D4_C481B4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -1144,10 +1144,10 @@ void N(func_802415D4_C481B4)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -1169,7 +1169,7 @@ void N(func_80242078_C48C58)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80244358_C4AF38)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -1211,7 +1211,7 @@ ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -1264,7 +1264,7 @@ void N(func_8024291C_C494FC)(ScriptInstance* script, NpcAISettings* aiSettings,
             }
         }
         npc->yaw = clamp_angle(phi_f20);
-        script->functionTemp[0].s = 13;
+        script->functionTemp[0] = 13;
     }
 }
 
@@ -1277,16 +1277,16 @@ void N(func_80242A74_C49654)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x,
                    gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) {
             npc->duration = 0;
-            script->functionTemp[0].s = 14;
+            script->functionTemp[0] = 14;
         } else {
             npc->duration--;
             if (npc->duration <= 0) {
                 npc->flags |= 0x200000;
-                script->functionTemp[0].s = 12;
+                script->functionTemp[0] = 12;
             }
         }
     } else {
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     }
 
 }
@@ -1302,7 +1302,7 @@ void N(func_80242B78_C49758)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z);
     npc->duration = 0;
-    script->functionTemp[0].s = 15;
+    script->functionTemp[0] = 15;
 }
 
 void N(func_80242C1C_C497FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1316,7 +1316,7 @@ void N(func_80242C1C_C497FC)(ScriptInstance* script, NpcAISettings* aiSettings,
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
         npc->flags &= ~0x00200000;
-        script->functionTemp[0].s = 16;
+        script->functionTemp[0] = 16;
     } else {
         PlayerStatus** playerStatus = &gPlayerStatusPtr;
 
@@ -1343,9 +1343,9 @@ void N(func_80242C1C_C497FC)(ScriptInstance* script, NpcAISettings* aiSettings,
                 disable_player_input();
                 partner_disable_input();
                 npc->duration = 0;
-                script->functionTemp[0].s = 20;
+                script->functionTemp[0] = 20;
             } else {
-                script->functionTemp[0].s = 16;
+                script->functionTemp[0] = 16;
             }
         }
     }
@@ -1363,7 +1363,7 @@ void N(func_80242EB8_C49A98)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
     npc->currentAnim.w = enemy->animList[9];
     npc->duration = 20;
-    script->functionTemp[0].s = 17;
+    script->functionTemp[0] = 17;
 }
 
 void N(func_80242F70_C49B50)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1385,7 +1385,7 @@ void N(func_80242F70_C49B50)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->pos.y = posY + temp_f20;
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var);
         npc->duration = 10;
-        script->functionTemp[0].s = 18;
+        script->functionTemp[0] = 18;
     }
 }
 
@@ -1395,7 +1395,7 @@ void N(func_802430F0_C49CD0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[0].s = 30;
+        script->functionTemp[0] = 30;
     }
 }
 
@@ -1407,11 +1407,11 @@ void N(func_80243138_C49D18)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration >= 3) {
         if (D_8010EBB0.unk_03 != 9) {
             npc->duration = 0;
-            script->functionTemp[0].s = 100;
+            script->functionTemp[0] = 100;
         } else {
             enable_player_input();
             partner_enable_input();
-            script->functionTemp[0].s = 16;
+            script->functionTemp[0] = 16;
         }
     }
 }
@@ -1425,7 +1425,7 @@ void N(func_802431B8_C49D98)(ScriptInstance* script, NpcAISettings* aiSettings,
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
-    script->functionTemp[1].s = 0x1E;
+    script->functionTemp[1] = 0x1E;
 }
 
 void N(func_80243260_C49E40)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -1449,25 +1449,25 @@ void N(func_80243260_C49E40)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 
     enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12);
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) {
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->moveToPos.y = npc->pos.y;
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             return;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
     if (npc->turnAroundYawAdjustment == 0) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         npc_move_heading(npc, npc->moveSpeed, npc->yaw);
         posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
         if (posW <= (2.0f * npc->moveSpeed)) {
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            script->functionTemp[0] = 2;
         }
     }
 }
@@ -1490,17 +1490,17 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
             func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0);
         case 1:
             N(func_802415D4_C481B4)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
@@ -1508,13 +1508,13 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
             N(UnkFunc4)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s == 12) {
+            if (script->functionTemp[0] == 12) {
                 npc->duration = 6;
             }
             break;
         case 12:
             N(func_8024291C_C494FC)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -1522,7 +1522,7 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 14:
             N(func_80242B78_C49758)(script, aiSettings, territoryPtr);
-            if (script->functionTemp[0].s != 15) {
+            if (script->functionTemp[0] != 15) {
                 break;
             }
         case 15:
@@ -1545,7 +1545,7 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80243260_C49E40)(script, aiSettings, territoryPtr);
     }
 
-    return (script->functionTemp[0].s == 100) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 100) * ApiStatus_DONE2;
 }
 
 const char N(dgb_00_name_hack)[] = "dgb_00";

src/world/area_dgb/dgb_15/C4F510.c

@@ -509,7 +509,7 @@ ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -519,18 +519,18 @@ ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C4F718)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C4F718)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -558,12 +558,12 @@ ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -617,7 +617,7 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -628,11 +628,11 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -646,7 +646,7 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:

src/world/area_dgb/dgb_16/C52540.c

@@ -674,7 +674,7 @@ void N(func_8024061C_C52B5C)(ScriptInstance* script, NpcAISettings* aiSettings,
     } else if (npc->duration <= 0) {
         npc->currentAnim.w = enemy->animList[10];
         npc->duration = 0;
-        script->functionTemp[0].s = 1;
+        script->functionTemp[0] = 1;
     }
 }
 
@@ -718,7 +718,7 @@ void N(func_802406A4_C52BE4)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration = 10;
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 2;
+        script->functionTemp[0] = 2;
     }
 
     npc->duration++;
@@ -742,7 +742,7 @@ void N(func_8024095C_C52E9C)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (npc->duration <= 0) {
         npc->duration = 1;
         enemy->varTable[7] = 40;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 }
 
@@ -752,8 +752,8 @@ void N(func_802409C0_C52F00)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f);
     npc->currentAnim.w = enemy->animList[0];
-    script->functionTemp[1].s = (rand_int(1000) % 2) + 2;
-    script->functionTemp[0].s = 4;
+    script->functionTemp[1] = (rand_int(1000) % 2) + 2;
+    script->functionTemp[0] = 4;
 }
 
 void N(func_80240A68_C52FA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
@@ -763,14 +763,14 @@ void N(func_80240A68_C52FA8)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     npc->duration--;
     if (npc->duration <= 0) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
             return;
@@ -779,10 +779,10 @@ void N(func_80240A68_C52FA8)(ScriptInstance* script, NpcAISettings* aiSettings,
         var = enemy->varTable[7];
         if (var == 40) {
             npc->duration = 20;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         } else if (var == 50) {
             npc->duration = 25;
-            script->functionTemp[0].s = var;
+            script->functionTemp[0] = var;
         }
     }
 }
@@ -799,7 +799,7 @@ void N(func_80240BA0_C530E0)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 
@@ -810,13 +810,13 @@ void N(func_80240C4C_C5318C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x,
                       enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 15;
         enemy->varTable[7] = 50;
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     } else if (npc->turnAroundYawAdjustment == 0) {
         var = npc->yaw;
         func_8004A784(npc, 5.0f, &var, 0, 0, 0);
@@ -834,7 +834,7 @@ void N(func_80240DC4_C53304)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         if (npc->duration <= 0) {
             npc->duration = 0;
-            script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -857,7 +857,7 @@ ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 30;
         npc->currentAnim.w = enemy->animList[10];
         npc->flags &= ~0x800;
@@ -868,18 +868,18 @@ ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 40;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 40;
             npc->currentAnim.w = enemy->animList[0];
         }
         enemy->unk_B0 &= ~4;
     }
 
-    if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C52748)(script)) {
-        script->functionTemp[0].s = 30;
+    if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C52748)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(func_8024061C_C52B5C)(script, npcAISettings, territoryPtr);
             break;
@@ -897,7 +897,7 @@ ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 13) {
+            if (script->functionTemp[0] != 13) {
                 break;
             }
         case 13:
@@ -907,16 +907,16 @@ ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall) {
             func_8004A3E8(script, npcAISettings, territoryPtr);
             npc->duration = 15;
             enemy->varTable[7] = 40;
-            script->functionTemp[0].s = 3;
+            script->functionTemp[0] = 3;
             break;
         case 30:
             N(UnkNpcAIFunc6)(script);
-            if (script->functionTemp[0].s != 31) {
+            if (script->functionTemp[0] != 31) {
                 break;
             }
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
@@ -927,7 +927,7 @@ ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 40:
             N(func_80240BA0_C530E0)(script, npcAISettings, territoryPtr);
-            if (script->functionTemp[0].s != 41) {
+            if (script->functionTemp[0] != 41) {
                 break;
             }
         case 41:
@@ -961,7 +961,7 @@ ApiStatus N(func_80241170_C536B0)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -971,18 +971,18 @@ ApiStatus N(func_80241170_C536B0)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C52748)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C52748)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -1010,12 +1010,12 @@ ApiStatus N(func_80241170_C536B0)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_dgb/dgb_18/C55F40.c

@@ -724,7 +724,7 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -735,11 +735,11 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -753,7 +753,7 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:
@@ -801,11 +801,11 @@ ApiStatus N(func_80240EBC_C56DFC)(ScriptInstance* script, s32 isInitialCall) {
         posZ = npc->pos.z;
         npc->moveSpeed = 3.7f;
         npc->yaw = atan2(posX, posZ, playerStatus->position.x, playerStatus->position.z);
-        script->functionTemp[1].s = 0;
+        script->functionTemp[1] = 0;
         npc->duration = 15;
     }
 
-    if (script->functionTemp[1].s == 0) {
+    if (script->functionTemp[1] == 0) {
         if (npc->duration == 0) {
             npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z);
             npc->duration = 15;

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

@@ -2910,7 +2910,7 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -2921,11 +2921,11 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -2939,7 +2939,7 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:
@@ -3262,8 +3262,8 @@ ApiStatus N(func_80242858_95DA58)(ScriptInstance* script, s32 isInitialCall) {
     s32 res;
 
     if (isInitialCall) {
-        script->functionTemp[1].s = (Unk_Struct_1*)heap_malloc(0x3C);
-        ptr = script->functionTemp[1].s;
+        script->functionTemp[1] = (Unk_Struct_1*)heap_malloc(0x3C);
+        ptr = script->functionTemp[1];
         ptr->unk_00 = temp_s1->unk_00;
         ptr->unk_04 = temp_s1->unk_04;
         ptr->unk_08 = temp_s1->unk_08;
@@ -3281,7 +3281,7 @@ ApiStatus N(func_80242858_95DA58)(ScriptInstance* script, s32 isInitialCall) {
         ptr->unk_38 = 0;
     }
 
-    ptr = script->functionTemp[1].s;
+    ptr = script->functionTemp[1];
     switch (ptr->unk_20) {
         case 0:
             res = get_xz_dist_to_player(ptr->unk_00, ptr->unk_08);

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

@@ -3370,16 +3370,16 @@ ApiStatus N(func_802414C0_96A680)(ScriptInstance* script, s32 isInitialCall) {
                 npc->flags |= 0x800000;
             }
         }
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    script->functionTemp[0].s += 8;
-    if (script->functionTemp[0].s >= 0x100) {
-        script->functionTemp[0].s = 255;
+    script->functionTemp[0] += 8;
+    if (script->functionTemp[0] >= 0x100) {
+        script->functionTemp[0] = 255;
     }
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+    set_background_color_blend(0, 0, 0, script->functionTemp[0]);
 
-    return (script->functionTemp[0].s == 255) * ApiStatus_DONE2;
+    return (script->functionTemp[0] == 255) * ApiStatus_DONE2;
 }
 
 ApiStatus N(func_802415CC_96A78C)(ScriptInstance* script, s32 isInitialCall) {
@@ -3387,18 +3387,18 @@ ApiStatus N(func_802415CC_96A78C)(ScriptInstance* script, s32 isInitialCall) {
 
     if (isInitialCall) {
         set_background_color_blend(0, 0, 0, 0xFF);
-        script->functionTemp[0].s = 255;
-        script->functionTemp[1].s = 0;
+        script->functionTemp[0] = 255;
+        script->functionTemp[1] = 0;
     }
-    script->functionTemp[0].s -= 8;
-    if (script->functionTemp[0].s < 0) {
-        script->functionTemp[0].s = 0;
+    script->functionTemp[0] -= 8;
+    if (script->functionTemp[0] < 0) {
+        script->functionTemp[0] = 0;
     }
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+    set_background_color_blend(0, 0, 0, script->functionTemp[0]);
 
-    if (script->functionTemp[0].s == 0 && script->functionTemp[1].s == 0) {
-        script->functionTemp[1].s = 1;
-    } else if (script->functionTemp[1].s == 1) {
+    if (script->functionTemp[0] == 0 && script->functionTemp[1] == 0) {
+        script->functionTemp[1] = 1;
+    } else if (script->functionTemp[1] == 1) {
         mdl_set_all_fog_mode(0);
         *D_801512F0 = 0;
         for (i = 0; i < 64; i++) {

src/world/area_flo/flo_00/C9DF60.c

@@ -2126,7 +2126,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -2137,11 +2137,11 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -2155,7 +2155,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr);
         case 1:

src/world/area_flo/flo_08/CAED40.c

@@ -45,8 +45,8 @@ ApiStatus N(func_802401CC_CAEF0C)(ScriptInstance* script, s32 isInitialCall) {
     s32 idx;
 
     if (isInitialCall) {
-        script->functionTemp[2].s = heap_malloc(0x330);
-        ptr = script->functionTemp[2].s;
+        script->functionTemp[2] = heap_malloc(0x330);
+        ptr = script->functionTemp[2];
 
         partnerActiveCount = 0;
         var = script->varTable[12] >= 0;
@@ -76,34 +76,34 @@ ApiStatus N(func_802401CC_CAEF0C)(ScriptInstance* script, s32 isInitialCall) {
         ptr->unk_324 = partnerActiveCount;
         ptr->unk_328 = 0;
         create_popup_menu(ptr);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    ptr = script->functionTemp[2].s;
-    if (script->functionTemp[0].s == 0) {
-        script->functionTemp[1].s = ptr->unk_32C;
-        if (script->functionTemp[1].s != 0) {
+    ptr = script->functionTemp[2];
+    if (script->functionTemp[0] == 0) {
+        script->functionTemp[1] = ptr->unk_32C;
+        if (script->functionTemp[1] != 0) {
             hide_popup_menu();
         } else {
             return ApiStatus_BLOCK;
         }
     }
 
-    script->functionTemp[0].s++;
+    script->functionTemp[0]++;
 
-    if (script->functionTemp[0].s < 15) {
+    if (script->functionTemp[0] < 15) {
         return ApiStatus_BLOCK;
     }
 
     destroy_popup_menu();
-    if (script->functionTemp[1].s != 0xFF) {
-        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1].s - 1]][0];
-        script->varTable[1] = ptr->unk_108[script->functionTemp[1].s - 1];
+    if (script->functionTemp[1] != 0xFF) {
+        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1] - 1]][0];
+        script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1];
     } else {
         script->varTable[0] = -1;
     }
 
-    heap_free(script->functionTemp[2].s);
+    heap_free(script->functionTemp[2]);
 
     return ApiStatus_DONE2;
 }

src/world/area_flo/flo_08/CAFAC0.c

@@ -1050,7 +1050,7 @@ void N(func_80240D80_CAFAC0)(ScriptInstance* script, NpcAISettings* npcAISetting
         npc->duration = 0xA;
         npc->currentAnim.w = enemy->animList[8];
     }
-    script->functionTemp[0].s = 0xD;
+    script->functionTemp[0] = 0xD;
 }
 
 void N(func_80241364_CB00A4)(ScriptInstance* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
@@ -1062,7 +1062,7 @@ void N(func_80241364_CB00A4)(ScriptInstance* script, NpcAISettings* npcAISetting
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 25;
-        script->functionTemp[0].s = 14;
+        script->functionTemp[0] = 14;
     } else {
         if (npc->currentAnim.w != enemy->animList[8]) {
             if (npc->moveSpeed < 4.0) {
@@ -1076,7 +1076,7 @@ void N(func_80241364_CB00A4)(ScriptInstance* script, NpcAISettings* npcAISetting
             npc->duration--;
             return;
         } else {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
         }
     }
 }
@@ -1087,7 +1087,7 @@ void N(func_802414C8_CB0208)(ScriptInstance* script, NpcAISettings* npcAISetting
 
     npc->duration--;
     if (npc->duration == 0) {
-        script->functionTemp[0].s = NULL;
+        script->functionTemp[0] = NULL;
     }
 }
 
@@ -1109,7 +1109,7 @@ ApiStatus N(func_8024150C_CB024C)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1119,13 +1119,13 @@ ApiStatus N(func_8024150C_CB024C)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:

src/world/area_flo/flo_09/CB5320.c

@@ -95,22 +95,22 @@ void N(func_802404D0_CB54D0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -138,10 +138,10 @@ void N(func_802404D0_CB54D0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -163,7 +163,7 @@ void N(func_80240F74_CB5F74)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_8024362C_CB862C)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -204,7 +204,7 @@ ApiStatus N(func_8024162C_CB662C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr);
         case 1:

src/world/area_flo/flo_13/CC3850.c

@@ -1281,22 +1281,22 @@ void N(func_802404D0_CB54D0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -1324,10 +1324,10 @@ void N(func_802404D0_CB54D0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -1349,7 +1349,7 @@ void N(func_80240E18_CC4628)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_8024412C_CC793C)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -1391,7 +1391,7 @@ ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -1463,8 +1463,8 @@ void N(func_80241704_CC4F14)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
 
     if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
+        if (script->functionTemp[1] <= 0) {
+            script->functionTemp[1] = aiSettings->unk_14;
             if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) {
                 fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
                 ai_enemy_play_sound(npc, 0x2F4, 0x200000);
@@ -1474,11 +1474,11 @@ void N(func_80241704_CC4F14)(ScriptInstance* script, NpcAISettings* aiSettings,
                 w = 1000.0f;
                 npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w);
                 npc->moveToPos.y = y + temp_f24;
-                script->functionTemp[0].s = 12;
+                script->functionTemp[0] = 12;
                 return;
             }
         }
-        script->functionTemp[1].s--;
+        script->functionTemp[1]--;
     }
 
     if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x,
@@ -1511,10 +1511,10 @@ void N(func_80241704_CC4F14)(ScriptInstance* script, NpcAISettings* aiSettings,
                 return;
             }
         }
-        script->functionTemp[0].s = 2;
-        script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1].s == 0)) {
-            script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 2;
+        script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) {
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -1547,18 +1547,18 @@ void N(func_80241B68_CC5378)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) {
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = (rand_int(1000) % 11) + 5;
             return;
         }
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 }
 
@@ -1585,7 +1585,7 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) {
 
     if (isInitialCall) {
         N(UnkFunc5)(npc, enemy, script, aiSettings);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
     npc->unk_AB = -3;
 
@@ -1597,7 +1597,7 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) {
     }
 
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
 
@@ -1613,7 +1613,7 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) {
             break;
     }
 
-    if (script->functionTemp[0].s == 12) {
+    if (script->functionTemp[0] == 12) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
         enemy->varTable[4] = N(func_802416BC_CC4ECC)();
         if (enemy->varTable[4] >= 0) {
@@ -1622,11 +1622,11 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) {
             enemy2->varTable[11] = enemy->npcID;
             npc->duration = 15;
             npc->currentAnim.w = 0x490014;
-            script->functionTemp[0].s = 30;
+            script->functionTemp[0] = 30;
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 12:
             N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr);
 
@@ -1639,13 +1639,13 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) {
             break;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 30:
             npc->duration--;
             if (npc->duration <= 0) {
                 get_enemy(enemy->varTable[4])->varTable[10] = 2;
                 npc->duration = 5;
-                script->functionTemp[0].s = 31;
+                script->functionTemp[0] = 31;
             }
 
         case 31:
@@ -1654,25 +1654,25 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) {
                 npc->currentAnim.w = 0x490015;
                 get_enemy(enemy->varTable[4])->varTable[10] = 3;
                 npc->duration = 10;
-                script->functionTemp[0].s = 32;
+                script->functionTemp[0] = 32;
             }
 
         case 32:
             npc->duration--;
             if (npc->duration <= 0) {
                 npc->duration = 3;
-                script->functionTemp[0].s = 33;
+                script->functionTemp[0] = 33;
             }
 
         case 33:
             npc->duration--;
             if (npc->duration <= 0) {
-                script->functionTemp[0].s = 0;
+                script->functionTemp[0] = 0;
             }
             break;
     }
 
-    if (((u32)script->functionTemp[0].s - 30) < 2) {
+    if (((u32)script->functionTemp[0] - 30) < 2) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
         dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z);
         if (!is_point_within_region(territoryPtr->shape, territoryPtr->pointX, territoryPtr->pointZ, npc->pos.x, npc->pos.z,
@@ -1732,7 +1732,7 @@ ApiStatus N(func_8024262C_CC5E3C)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         enemy->unk_07 = 0;
         npc->currentAnim.w = enemy->animList[0];
@@ -1745,12 +1745,12 @@ ApiStatus N(func_8024262C_CC5E3C)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
     }
@@ -1766,7 +1766,7 @@ ApiStatus N(func_8024262C_CC5E3C)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, aiSettings, territoryPtr);
             npc->collisionHeight = enemy->varTable[6];
@@ -1869,7 +1869,7 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (isInitialCall || (enemy->varTable[10] == 100)) {
-        script->functionTemp[0].s = 100;
+        script->functionTemp[0] = 100;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1891,20 +1891,20 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
             npc->moveSpeed = 0.0f;
             npc->jumpVelocity = 0.0f;
             npc->jumpScale = 1.0f;
-            script->functionTemp[0].s = 102;
+            script->functionTemp[0] = 102;
         } else {
             fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
             npc->currentAnim.w = enemy->animList[0];
-            script->functionTemp[1].s = 0;
-            script->functionTemp[0].s = 200;
+            script->functionTemp[1] = 0;
+            script->functionTemp[0] = 200;
         }
     }
     get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z);
-    if ((script->functionTemp[0].s < 100) && ((x + 50) >= 421)) {
-        script->functionTemp[0].s = 110;
+    if ((script->functionTemp[0] < 100) && ((x + 50) >= 421)) {
+        script->functionTemp[0] = 110;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, aiSettings, territoryPtr);
             npc->collisionHeight = enemy->varTable[6];
@@ -1963,7 +1963,7 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags &= ~0x200;
             npc->renderYaw = 0.0f;
             npc->currentAnim.w = 0x4A0018;
-            script->functionTemp[0].s = 101;
+            script->functionTemp[0] = 101;
 
         case 101:
             if (enemy->varTable[10] != 3) {
@@ -1975,7 +1975,7 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
             npc->jumpVelocity = 8.0f;
             npc->jumpScale = 0.8f;
             npc->flags |= 0x800;
-            script->functionTemp[0].s = 102;
+            script->functionTemp[0] = 102;
 
         case 102:
             if (npc->moveSpeed > 0.0) {
@@ -2021,7 +2021,7 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
                     npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
                     npc->currentAnim.w = 0x4A001A;
                     npc->duration = 3;
-                    script->functionTemp[0].s = 103;
+                    script->functionTemp[0] = 103;
                     break;
                 }
             }
@@ -2034,7 +2034,7 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
             if (npc->duration <= 0) {
                 npc->flags &= 0xFFFBFFFF;
                 npc->currentAnim.w = 0x4A0001;
-                script->functionTemp[0].s = 0;
+                script->functionTemp[0] = 0;
             }
             break;
 
@@ -2044,13 +2044,13 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) {
             npc->pos.z = 0.0f;
             npc->pos.y = -1000.0f;
             npc->flags = (npc->flags | 0xA) & ~0x200;
-            script->functionTemp[0].s = 111;
+            script->functionTemp[0] = 111;
 
         case 111:
             npc->duration--;
             if (npc->duration <= 0) {
                 enemy->varTable[10] = 0;
-                script->functionTemp[0].s = 100;
+                script->functionTemp[0] = 100;
             }
             break;
 
@@ -2069,22 +2069,22 @@ ApiStatus N(func_802433C0_CC6BD0)(ScriptInstance* script, s32 isInitialCall) {
     s16 param1;
     s16 param2;
 
-    script->functionTemp[1].s = get_variable(script, *script->ptrReadPos);
+    script->functionTemp[1] = get_variable(script, *script->ptrReadPos);
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
-    if (script->functionTemp[0].s == (script->functionTemp[0].s / 5) * 5) {
+    if (script->functionTemp[0] == (script->functionTemp[0] / 5) * 5) {
 
         sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z,
                                          &param1, &param2, 0x200002);
 
         sfx_play_sound_with_params(0x295, param1, param2,
-                                   update_lerp(0, 500.0f, 0.0f, script->functionTemp[0].s, script->functionTemp[1].s));
+                                   update_lerp(0, 500.0f, 0.0f, script->functionTemp[0], script->functionTemp[1]));
     }
 
-    script->functionTemp[0].s++;
-    return (script->functionTemp[1].s < script->functionTemp[0].s) * ApiStatus_DONE2;
+    script->functionTemp[0]++;
+    return (script->functionTemp[1] < script->functionTemp[0]) * ApiStatus_DONE2;
 }
 
 ApiStatus N(func_802434D4_CC6CE4)(ScriptInstance* script, s32 isInitialCall) {
@@ -2093,17 +2093,17 @@ ApiStatus N(func_802434D4_CC6CE4)(ScriptInstance* script, s32 isInitialCall) {
     s16 param2;
 
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
-    if (script->functionTemp[0].s == (script->functionTemp[0].s / 5) * 5) {
+    if (script->functionTemp[0] == (script->functionTemp[0] / 5) * 5) {
 
         sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z,
                                          &param1, &param2, 0x200002);
 
         sfx_play_sound_with_params(0x295, param1, param2,
-                                   update_lerp(0, 500.0f, 0.0f, script->functionTemp[0].s, 0x50));
+                                   update_lerp(0, 500.0f, 0.0f, script->functionTemp[0], 0x50));
     }
 
-    script->functionTemp[0].s++;
-    return (script->functionTemp[0].s > 0x50) * ApiStatus_DONE2;
+    script->functionTemp[0]++;
+    return (script->functionTemp[0] > 0x50) * ApiStatus_DONE2;
 }

src/world/area_flo/flo_14/CCB310.c

@@ -584,10 +584,10 @@ ApiStatus N(func_8024042C_CCB73C)(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus N(func_8024046C_CCB77C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    script->functionTemp[0].s = get_variable(script, *args++);
-    script->functionTemp[1].s = get_variable(script, *args++);
-    script->functionTemp[2].s = get_variable(script, *args++);
-    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0].s, script->functionTemp[1].s, script->functionTemp[2].s);
+    script->functionTemp[0] = get_variable(script, *args++);
+    script->functionTemp[1] = get_variable(script, *args++);
+    script->functionTemp[2] = get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]);
     return ApiStatus_DONE2;
 }
 

src/world/area_flo/flo_14/CCBE20.c

@@ -405,22 +405,22 @@ void N(func_80240CC0_CCBFD0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -448,10 +448,10 @@ void N(func_80240CC0_CCBFD0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -473,7 +473,7 @@ void N(func_80241764_CCCA74)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_802444C0_CCF7D0)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -515,7 +515,7 @@ ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:

src/world/area_flo/flo_16/CD1F10.c

@@ -452,8 +452,8 @@ ApiStatus N(func_802402AC_CD20DC)(ScriptInstance* script, s32 isInitialCall) {
     s32 idx;
 
     if (isInitialCall) {
-        script->functionTemp[2].s = heap_malloc(0x330);
-        ptr = script->functionTemp[2].s;
+        script->functionTemp[2] = heap_malloc(0x330);
+        ptr = script->functionTemp[2];
 
         partnerActiveCount = 0;
         var = script->varTable[12] >= 0;
@@ -483,34 +483,34 @@ ApiStatus N(func_802402AC_CD20DC)(ScriptInstance* script, s32 isInitialCall) {
         ptr->unk_324 = partnerActiveCount;
         ptr->unk_328 = 0;
         create_popup_menu(ptr);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
-    ptr = script->functionTemp[2].s;
-    if (script->functionTemp[0].s == 0) {
-        script->functionTemp[1].s = ptr->unk_32C;
-        if (script->functionTemp[1].s != 0) {
+    ptr = script->functionTemp[2];
+    if (script->functionTemp[0] == 0) {
+        script->functionTemp[1] = ptr->unk_32C;
+        if (script->functionTemp[1] != 0) {
             hide_popup_menu();
         } else {
             return ApiStatus_BLOCK;
         }
     }
 
-    script->functionTemp[0].s++;
+    script->functionTemp[0]++;
 
-    if (script->functionTemp[0].s < 15) {
+    if (script->functionTemp[0] < 15) {
         return ApiStatus_BLOCK;
     }
 
     destroy_popup_menu();
-    if (script->functionTemp[1].s != 0xFF) {
-        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1].s - 1]][0];
-        script->varTable[1] = ptr->unk_108[script->functionTemp[1].s - 1];
+    if (script->functionTemp[1] != 0xFF) {
+        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1] - 1]][0];
+        script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1];
     } else {
         script->varTable[0] = -1;
     }
 
-    heap_free(script->functionTemp[2].s);
+    heap_free(script->functionTemp[2]);
 
     return ApiStatus_DONE2;
 }

src/world/area_flo/flo_16/CD2C80.c

@@ -432,22 +432,22 @@ void N(func_80241000_CD2E30)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -475,10 +475,10 @@ void N(func_80241000_CD2E30)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -500,7 +500,7 @@ void N(func_80241AA4_CD38D4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80244010_CD5E40)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -542,7 +542,7 @@ ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -586,7 +586,7 @@ void N(func_80242478_CD42A8)(ScriptInstance* script, NpcAISettings* aiSettings,
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 30;
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
         enemy->varTable[9] = 30;
         return;
     }
@@ -616,7 +616,7 @@ void N(func_80242478_CD42A8)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         return;
     }
-    script->functionTemp[0].s = 12;
+    script->functionTemp[0] = 12;
 }
 
 #include "world/common/UnkFunc45.inc.c"
@@ -640,7 +640,7 @@ ApiStatus N(func_80242754_CD4584)(ScriptInstance* script, s32 isInitialCall) {
 
     if (isInitialCall) {
         N(UnkFunc5)(npc, enemy, script, aiSettings);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
     npc->unk_AB = -2;
 
@@ -651,7 +651,7 @@ ApiStatus N(func_80242754_CD4584)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:

src/world/area_flo/flo_17/CD7350.c

@@ -700,22 +700,22 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -743,10 +743,10 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -768,7 +768,7 @@ void N(func_80240CC4_CD7FA4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_8024440C_CDB6EC)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -810,7 +810,7 @@ ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -882,8 +882,8 @@ void N(func_802415B0_CD8890)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
 
     if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
+        if (script->functionTemp[1] <= 0) {
+            script->functionTemp[1] = aiSettings->unk_14;
             if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) {
                 fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
                 ai_enemy_play_sound(npc, 0x2F4, 0x200000);
@@ -893,11 +893,11 @@ void N(func_802415B0_CD8890)(ScriptInstance* script, NpcAISettings* aiSettings,
                 w = 1000.0f;
                 npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w);
                 npc->moveToPos.y = y + temp_f24;
-                script->functionTemp[0].s = 12;
+                script->functionTemp[0] = 12;
                 return;
             }
         }
-        script->functionTemp[1].s--;
+        script->functionTemp[1]--;
     }
 
     if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x,
@@ -930,10 +930,10 @@ void N(func_802415B0_CD8890)(ScriptInstance* script, NpcAISettings* aiSettings,
                 return;
             }
         }
-        script->functionTemp[0].s = 2;
-        script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1].s == 0)) {
-            script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 2;
+        script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) {
+            script->functionTemp[0] = 0;
         }
     }
 }
@@ -966,18 +966,18 @@ void N(func_80241A14_CD8CF4)(ScriptInstance* script, NpcAISettings* aiSettings,
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) {
         fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
         ai_enemy_play_sound(npc, 0x2F4, 0x200000);
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
         return;
     }
 
     if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
             npc->yaw = clamp_angle(npc->yaw + 180.0f);
             npc->duration = (rand_int(1000) % 11) + 5;
             return;
         }
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 }
 
@@ -1004,7 +1004,7 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) {
 
     if (isInitialCall) {
         N(UnkFunc5)(npc, enemy, script, aiSettings);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
     npc->unk_AB = -3;
 
@@ -1016,7 +1016,7 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) {
     }
 
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
 
@@ -1032,7 +1032,7 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) {
             break;
     }
 
-    if (script->functionTemp[0].s == 12) {
+    if (script->functionTemp[0] == 12) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
         enemy->varTable[4] = N(func_80241568_CD8848)();
         if (enemy->varTable[4] >= 0) {
@@ -1041,11 +1041,11 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) {
             enemy2->varTable[11] = enemy->npcID;
             npc->duration = 15;
             npc->currentAnim.w = 0x490014;
-            script->functionTemp[0].s = 30;
+            script->functionTemp[0] = 30;
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 12:
             N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr);
 
@@ -1058,13 +1058,13 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) {
             break;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 30:
             npc->duration--;
             if (npc->duration <= 0) {
                 get_enemy(enemy->varTable[4])->varTable[10] = 2;
                 npc->duration = 5;
-                script->functionTemp[0].s = 31;
+                script->functionTemp[0] = 31;
             }
 
         case 31:
@@ -1073,25 +1073,25 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) {
                 npc->currentAnim.w = 0x490015;
                 get_enemy(enemy->varTable[4])->varTable[10] = 3;
                 npc->duration = 10;
-                script->functionTemp[0].s = 32;
+                script->functionTemp[0] = 32;
             }
 
         case 32:
             npc->duration--;
             if (npc->duration <= 0) {
                 npc->duration = 3;
-                script->functionTemp[0].s = 33;
+                script->functionTemp[0] = 33;
             }
 
         case 33:
             npc->duration--;
             if (npc->duration <= 0) {
-                script->functionTemp[0].s = 0;
+                script->functionTemp[0] = 0;
             }
             break;
     }
 
-    if (((u32)script->functionTemp[0].s - 30) < 2) {
+    if (((u32)script->functionTemp[0] - 30) < 2) {
         npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
         dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z);
         if (!is_point_within_region(territoryPtr->shape, territoryPtr->pointX, territoryPtr->pointZ, npc->pos.x, npc->pos.z,
@@ -1151,7 +1151,7 @@ ApiStatus N(func_802424D8_CD97B8)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         enemy->unk_07 = 0;
         npc->currentAnim.w = enemy->animList[0];
@@ -1164,12 +1164,12 @@ ApiStatus N(func_802424D8_CD97B8)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
     }
@@ -1185,7 +1185,7 @@ ApiStatus N(func_802424D8_CD97B8)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, aiSettings, territoryPtr);
             npc->collisionHeight = enemy->varTable[6];
@@ -1288,7 +1288,7 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (isInitialCall || (enemy->varTable[10] == 100)) {
-        script->functionTemp[0].s = 100;
+        script->functionTemp[0] = 100;
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -1310,20 +1310,20 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
             npc->moveSpeed = 0.0f;
             npc->jumpVelocity = 0.0f;
             npc->jumpScale = 1.0f;
-            script->functionTemp[0].s = 102;
+            script->functionTemp[0] = 102;
         } else {
             fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
             npc->currentAnim.w = enemy->animList[0];
-            script->functionTemp[1].s = 0;
-            script->functionTemp[0].s = 200;
+            script->functionTemp[1] = 0;
+            script->functionTemp[0] = 200;
         }
     }
     get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z);
-    if ((script->functionTemp[0].s < 100) && ((x + 50) >= 421)) {
-        script->functionTemp[0].s = 110;
+    if ((script->functionTemp[0] < 100) && ((x + 50) >= 421)) {
+        script->functionTemp[0] = 110;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, aiSettings, territoryPtr);
             npc->collisionHeight = enemy->varTable[6];
@@ -1382,7 +1382,7 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags &= ~0x200;
             npc->renderYaw = 0.0f;
             npc->currentAnim.w = 0x4A0018;
-            script->functionTemp[0].s = 101;
+            script->functionTemp[0] = 101;
 
         case 101:
             if (enemy->varTable[10] != 3) {
@@ -1394,7 +1394,7 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
             npc->jumpVelocity = 8.0f;
             npc->jumpScale = 0.8f;
             npc->flags |= 0x800;
-            script->functionTemp[0].s = 102;
+            script->functionTemp[0] = 102;
 
         case 102:
             if (npc->moveSpeed > 0.0) {
@@ -1440,7 +1440,7 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
                     npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
                     npc->currentAnim.w = 0x4A001A;
                     npc->duration = 3;
-                    script->functionTemp[0].s = 103;
+                    script->functionTemp[0] = 103;
                     break;
                 }
             }
@@ -1453,7 +1453,7 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
             if (npc->duration <= 0) {
                 npc->flags &= 0xFFFBFFFF;
                 npc->currentAnim.w = 0x4A0001;
-                script->functionTemp[0].s = 0;
+                script->functionTemp[0] = 0;
             }
             break;
 
@@ -1463,13 +1463,13 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) {
             npc->pos.z = 0.0f;
             npc->pos.y = -1000.0f;
             npc->flags = (npc->flags | 0xA) & ~0x200;
-            script->functionTemp[0].s = 111;
+            script->functionTemp[0] = 111;
 
         case 111:
             npc->duration--;
             if (npc->duration <= 0) {
                 enemy->varTable[10] = 0;
-                script->functionTemp[0].s = 100;
+                script->functionTemp[0] = 100;
             }
             break;
 

src/world/area_flo/flo_23/CEE2A0.c

@@ -537,7 +537,7 @@ ApiStatus N(func_80240728_CEE988)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         enemy->unk_07 = 0;
         npc->currentAnim.w = enemy->animList[0];
@@ -550,12 +550,12 @@ ApiStatus N(func_80240728_CEE988)(ScriptInstance* script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
     }
@@ -571,7 +571,7 @@ ApiStatus N(func_80240728_CEE988)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, aiSettings, territoryPtr);
             npc->collisionHeight = enemy->varTable[6];

src/world/area_flo/flo_25/CF2C10.c

@@ -595,22 +595,22 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     if (enemy->varTable[9] <= 0) {
         if (aiSettings->unk_14 >= 0) {
-            if (script->functionTemp[1].s <= 0) {
-                script->functionTemp[1].s = aiSettings->unk_14;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[1] = aiSettings->unk_14;
                 if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
                     func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
                     fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
                     npc->moveToPos.y = npc->pos.y;
                     ai_enemy_play_sound(npc, 0x2F4, 0x200000);
                     if (enemy->npcSettings->unk_2A & 1) {
-                        script->functionTemp[0].s = 10;
+                        script->functionTemp[0] = 10;
                     } else {
-                        script->functionTemp[0].s = 12;
+                        script->functionTemp[0] = 12;
                     }
                     return;
                 }
             }
-            script->functionTemp[1].s--;
+            script->functionTemp[1]--;
         }
     } else {
         enemy->varTable[9]--;
@@ -638,10 +638,10 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     if (aiSettings->moveTime > 0) {
         if ((npc->duration <= 0) || (--npc->duration <= 0)) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
-                script->functionTemp[0].s = 0;
+            script->functionTemp[0] = 2;
+            script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) {
+                script->functionTemp[0] = 0;
             }
         }
     }
@@ -663,7 +663,7 @@ void N(func_80240C94_CF3864)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_8024291C_CF54EC)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 
@@ -705,7 +705,7 @@ ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -749,7 +749,7 @@ void N(func_80241668_CF4238)(ScriptInstance* script, NpcAISettings* aiSettings,
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
         npc->currentAnim.w = enemy->animList[0];
         npc->duration = 30;
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
         enemy->varTable[9] = 30;
         return;
     }
@@ -779,7 +779,7 @@ void N(func_80241668_CF4238)(ScriptInstance* script, NpcAISettings* aiSettings,
         npc->duration--;
         return;
     }
-    script->functionTemp[0].s = 12;
+    script->functionTemp[0] = 12;
 }
 
 #include "world/common/UnkFunc45.inc.c"
@@ -803,7 +803,7 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
 
     if (isInitialCall) {
         N(UnkFunc5)(npc, enemy, script, aiSettings);
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
     }
 
     npc->unk_AB = -2;
@@ -815,7 +815,7 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:

src/world/area_gv/gv_01/E1E460.c

@@ -18,20 +18,20 @@
 
 ApiStatus func_802405EC_E1EA4C(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         set_curtain_scale_goal(1.0);
         set_curtain_fade(0);
     }
 
-    script->functionTemp[0].s += 5;
-    if (script->functionTemp[0].s > 255) {
-        script->functionTemp[0].s = 255;
+    script->functionTemp[0] += 5;
+    if (script->functionTemp[0] > 255) {
+        script->functionTemp[0] = 255;
     }
 
     set_screen_overlay_color(1, 208, 208, 208);
-    set_screen_overlay_params_back(0, script->functionTemp[0].s);
+    set_screen_overlay_params_back(0, script->functionTemp[0]);
     set_screen_overlay_alpha(1, 0);
-    return script->functionTemp[0].s == 255;
+    return script->functionTemp[0] == 255;
 }
 
 INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240688_E1EAE8);

src/world/area_hos/hos_02/A17210.c

@@ -18,7 +18,7 @@ void N(func_80241C44_A17E64)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80244490_A1A6B0)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 */
@@ -63,7 +63,7 @@ ApiStatus N(func_802422FC_A1851C)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             N(hos_02_UnkNpcAIFunc23)(script, aiSettings, territoryPtr);
         case 1:
@@ -110,7 +110,7 @@ void N(func_80242618_A18838)(ScriptInstance *script, NpcAISettings *aiSettings,
         fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
         npc->currentAnim = enemy->animList[0];
         npc->duration = 30;
-        script->functionTemp[0].s = 20;
+        script->functionTemp[0] = 20;
         enemy->varTable[9] = 30;
         return;
     }
@@ -140,7 +140,7 @@ void N(func_80242618_A18838)(ScriptInstance *script, NpcAISettings *aiSettings,
         npc->duration--;
         return;
     }
-    script->functionTemp[0].s = 12;
+    script->functionTemp[0] = 12;
 }
 */
 

src/world/area_hos/hos_03/A1BDB0.c

@@ -20,7 +20,7 @@ void N(func_80241904_A1CA04)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_802457F4_A208F4)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 */
@@ -65,7 +65,7 @@ ApiStatus N(func_80241FBC_A1D0BC)(ScriptInstance* script, s32 isInitialCall) {
         enemy->unk_B0 &= ~4;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
 #include "world/common/UnkNpcAIFunc23.inc.c"
         case 1:

src/world/area_iwa/iwa_01/90FBD0.c

@@ -51,18 +51,18 @@ void N(func_80242498_911B48)(ScriptInstance* script, NpcAISettings* aiSettings,
     Npc *npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) {
             npc->currentAnim = enemy->animList[9];
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->duration = 12;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[0] = 2;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
 }
 */
 
@@ -101,7 +101,7 @@ void N(func_80242958_912008)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (npc->duration < 15) {
             npc->duration = 15;
         }
-        script->functionTemp[0].s = 0x16;
+        script->functionTemp[0] = 0x16;
     }
 }
 */
@@ -122,7 +122,7 @@ void N(func_80242C48_9122F8)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 */

src/world/area_iwa/iwa_02/915D70.c

@@ -14,18 +14,18 @@ void N(func_802401D4_915F44)(ScriptInstance* script, NpcAISettings* aiSettings,
     Npc *npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) {
             npc->currentAnim = enemy->animList[9];
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->duration = 12;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[0] = 2;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
 }
 */
 
@@ -64,7 +64,7 @@ void N(func_80240694_916404)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (npc->duration < 15) {
             npc->duration = 15;
         }
-        script->functionTemp[0].s = 0x16;
+        script->functionTemp[0] = 0x16;
     }
 }
 */
@@ -85,7 +85,7 @@ void N(func_80240984_9166F4)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 */

src/world/area_iwa/iwa_03/918EF0.c

@@ -11,18 +11,18 @@ void N(func_80240514_9190C4)(ScriptInstance* script, NpcAISettings* aiSettings,
     Npc *npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) {
             npc->currentAnim = enemy->animList[9];
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->duration = 12;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[0] = 2;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
 }
 */
 
@@ -61,7 +61,7 @@ void N(func_802409D4_919584)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (npc->duration < 15) {
             npc->duration = 15;
         }
-        script->functionTemp[0].s = 0x16;
+        script->functionTemp[0] = 0x16;
     }
 }
 */
@@ -82,7 +82,7 @@ void N(func_80240CC4_919874)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 */

src/world/area_iwa/iwa_04/91B8E0.c

@@ -16,18 +16,18 @@ void N(func_80240254_91BB34)(ScriptInstance* script, NpcAISettings* aiSettings,
     Npc *npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
-    if (script->functionTemp[1].s <= 0) {
-        script->functionTemp[1].s = aiSettings->unk_14;
+    if (script->functionTemp[1] <= 0) {
+        script->functionTemp[1] = aiSettings->unk_14;
         if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) {
             npc->currentAnim = enemy->animList[9];
             fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
             ai_enemy_play_sound(npc, 0x2F4, 0x200000);
             npc->duration = 12;
-            script->functionTemp[0].s = 2;
+            script->functionTemp[0] = 2;
         }
     }
 
-    script->functionTemp[1].s--;
+    script->functionTemp[1]--;
 }
 */
 
@@ -66,7 +66,7 @@ void N(func_80240714_91BFF4)(ScriptInstance* script, NpcAISettings* aiSettings,
         if (npc->duration < 15) {
             npc->duration = 15;
         }
-        script->functionTemp[0].s = 0x16;
+        script->functionTemp[0] = 0x16;
     }
 }
 */
@@ -87,7 +87,7 @@ void N(func_80240A04_91C2E4)(ScriptInstance* script, NpcAISettings* aiSettings,
         } else {
             npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
         }
-        script->functionTemp[0].s = 0x29;
+        script->functionTemp[0] = 0x29;
     }
 }
 */

src/world/area_jan/jan_02/B2C8A0.c

@@ -45,7 +45,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -56,11 +56,11 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -74,7 +74,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
 #include "world/common/UnkNpcAIFunc24.inc.c"
         case 1:

src/world/area_jan/jan_03/B34BD0.c

@@ -68,7 +68,7 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -79,11 +79,11 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -97,7 +97,7 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
 #include "world/common/UnkNpcAIFunc24.inc.c"
         case 1:

src/world/area_jan/jan_05/B4B260.c

@@ -93,7 +93,7 @@ ApiStatus N(func_80241EE8_B4C958)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -103,18 +103,18 @@ ApiStatus N(func_80241EE8_B4C958)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241AD4_B4C544)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241AD4_B4C544)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -142,12 +142,12 @@ ApiStatus N(func_80241EE8_B4C958)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -181,7 +181,7 @@ ApiStatus N(func_8024219C_B4CC0C)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -191,18 +191,18 @@ ApiStatus N(func_8024219C_B4CC0C)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241AD4_B4C544)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241AD4_B4C544)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -230,12 +230,12 @@ ApiStatus N(func_8024219C_B4CC0C)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_jan/jan_06/B52B40.c

@@ -5,10 +5,10 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52B40", func_80240310_B52B40);
 ApiStatus N(func_80240310_B52B40)(ScriptInstance *script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    script->functionTemp[0].s = get_variable(script, *args++);
-    script->functionTemp[1].s = get_variable(script, *args++);
-    script->functionTemp[2].s = get_variable(script, *args++);
-    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0].s, script->functionTemp[1].s, script->functionTemp[2].s);
+    script->functionTemp[0] = get_variable(script, *args++);
+    script->functionTemp[1] = get_variable(script, *args++);
+    script->functionTemp[2] = get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]);
     return ApiStatus_DONE2;
 }
 */

src/world/area_jan/jan_06/B52F70.c

@@ -93,7 +93,7 @@ ApiStatus N(func_80241E38_B54668)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -103,18 +103,18 @@ ApiStatus N(func_80241E38_B54668)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241A24_B54254)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241A24_B54254)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -142,12 +142,12 @@ ApiStatus N(func_80241E38_B54668)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -181,7 +181,7 @@ ApiStatus N(func_802420EC_B5491C)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -191,18 +191,18 @@ ApiStatus N(func_802420EC_B5491C)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241A24_B54254)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241A24_B54254)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -230,12 +230,12 @@ ApiStatus N(func_802420EC_B5491C)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_jan/jan_07/B59870.c

@@ -78,7 +78,7 @@ ApiStatus N(func_80240830_B5A0A0)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -88,18 +88,18 @@ ApiStatus N(func_80240830_B5A0A0)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_8024041C_B59C8C)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_8024041C_B59C8C)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -127,12 +127,12 @@ ApiStatus N(func_80240830_B5A0A0)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -166,7 +166,7 @@ ApiStatus N(func_80240AE4_B5A354)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -176,18 +176,18 @@ ApiStatus N(func_80240AE4_B5A354)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_8024041C_B59C8C)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_8024041C_B59C8C)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -215,12 +215,12 @@ ApiStatus N(func_80240AE4_B5A354)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_jan/jan_08/B5F650.c

@@ -77,7 +77,7 @@ ApiStatus N(func_80241C84_B5FF34)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -87,18 +87,18 @@ ApiStatus N(func_80241C84_B5FF34)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241870_B5FB20)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241870_B5FB20)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -126,12 +126,12 @@ ApiStatus N(func_80241C84_B5FF34)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -165,7 +165,7 @@ ApiStatus N(func_80241F38_B601E8)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -175,18 +175,18 @@ ApiStatus N(func_80241F38_B601E8)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241870_B5FB20)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80241870_B5FB20)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -214,12 +214,12 @@ ApiStatus N(func_80241F38_B601E8)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_jan/jan_09/B663F0.c

@@ -75,7 +75,7 @@ ApiStatus N(func_80241170_B66C20)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -85,18 +85,18 @@ ApiStatus N(func_80241170_B66C20)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240D5C_B6680C)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240D5C_B6680C)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -124,12 +124,12 @@ ApiStatus N(func_80241170_B66C20)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -163,7 +163,7 @@ ApiStatus N(func_80241424_B66ED4)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -173,18 +173,18 @@ ApiStatus N(func_80241424_B66ED4)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240D5C_B6680C)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_80240D5C_B6680C)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -212,12 +212,12 @@ ApiStatus N(func_80241424_B66ED4)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_jan/jan_12/B73570.c

@@ -75,7 +75,7 @@ ApiStatus N(func_80240CF0_B73DA0)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -85,18 +85,18 @@ ApiStatus N(func_80240CF0_B73DA0)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_802408DC_B7398C)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_802408DC_B7398C)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -124,12 +124,12 @@ ApiStatus N(func_80240CF0_B73DA0)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:
@@ -163,7 +163,7 @@ ApiStatus N(func_80240FA4_B74054)(ScriptInstance *script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -173,18 +173,18 @@ ApiStatus N(func_80240FA4_B74054)(ScriptInstance *script, s32 isInitialCall) {
             npc->flags = (npc->flags & ~0x200) | 0x8;
         }
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         }
         enemy->varTable[0] = 0;
     }
 
-    if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_802408DC_B7398C)(script)) {
-        script->functionTemp[0].s = 30;
+    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(func_802408DC_B7398C)(script)) {
+        script->functionTemp[0] = 30;
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
             func_800495A0(script, npcAISettings, territoryPtr);
         case 1:
@@ -212,12 +212,12 @@ ApiStatus N(func_80240FA4_B74054)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc6)(script);
         case 31:
             N(UnkNpcAIFunc7)(script);
-            if (script->functionTemp[0].s != 32) {
+            if (script->functionTemp[0] != 32) {
                 break;
             }
         case 32:
             N(UnkNpcAIFunc8)(script);
-            if (script->functionTemp[0].s != 33) {
+            if (script->functionTemp[0] != 33) {
                 break;
             }
         case 33:

src/world/area_jan/jan_22/B84180.c

@@ -48,7 +48,7 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -59,11 +59,11 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -77,7 +77,7 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
 #include "world/common/UnkNpcAIFunc24.inc.c"
         case 1:

src/world/area_kkj/kkj_00/ABB340.c

@@ -43,7 +43,7 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -54,11 +54,11 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -72,7 +72,7 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
 #include "world/common/UnkNpcAIFunc24.inc.c"
         case 1:

src/world/area_kkj/kkj_01/AC5170.c

@@ -48,7 +48,7 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) {
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0].s = 0;
+        script->functionTemp[0] = 0;
         npc->duration = 0;
         npc->currentAnim = enemy->animList[0];
         npc->flags &= ~0x800;
@@ -59,11 +59,11 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) {
         }
 
         if (enemy->unk_B0 & 4) {
-            script->functionTemp[0].s = 99;
-            script->functionTemp[1].s = 0;
+            script->functionTemp[0] = 99;
+            script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0].s = 12;
+            script->functionTemp[0] = 12;
             enemy->flags &= ~0x40000000;
         }
 
@@ -77,7 +77,7 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) {
         }
     }
 
-    switch (script->functionTemp[0].s) {
+    switch (script->functionTemp[0]) {
         case 0:
 #include "world/common/UnkNpcAIFunc24.inc.c"
         case 1:

src/world/area_kmr/kmr_00/8ABF90.c

@@ -55,16 +55,16 @@ ApiStatus func_80240BD8_8ACB68(ScriptInstance* script, s32 isInitialCall) {
     Npc* npc;
 
     if (isInitialCall) {
-        script->functionTemp[1].s = get_variable(script, *args);
-        npc = get_npc_unsafe(script->functionTemp[1].s);
+        script->functionTemp[1] = get_variable(script, *args);
+        npc = get_npc_unsafe(script->functionTemp[1]);
         sfx_play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
         playFX_11(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f);
-        script->functionTemp[0].s = 3;
+        script->functionTemp[0] = 3;
     }
 
-    npc = get_npc_unsafe(script->functionTemp[1].s);
-    script->functionTemp[0].s--;
-    if (script->functionTemp[0].s == -1) {
+    npc = get_npc_unsafe(script->functionTemp[1]);
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] == -1) {
         npc->pos.y = -1000.0f;
         return ApiStatus_DONE2;
     }

src/world/area_kmr/kmr_05/8CE070.c

@@ -21,7 +21,7 @@ void N(func_80240C54_8CECC4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->pos.y += N(D_80241B2C_8CFB9C)[npc->duration++];
     if (npc->duration >= 5) {
-        script->functionTemp[0].s = 12;
+        script->functionTemp[0] = 12;
     }
 }
 */