Rename all si_funcs to evt_funcs (#403)

* resolve #397

* fix libultra

* Match func_80144E4C (#406)

* Update hud_element.c

* Update hud_element.h

* Update hud_element.h

* Delete func_80144E4C.s

* Trigger funcs (#405)

* remove old tools, fix warnings

* almost match si_handle_print_debug_var

* si_goto_end_loop and warnings

* is_trigger_bound and create_trigger

* Cleanup + matching 2 non-matchings

* update_triggers (trigger.c complete)

* fix warnings

* PR comments, m2ctx.py fix

* combine PR #398 with #403

* More entity decomp (#402)

* More entity decomp

* cleanup

* Vec3f instead of 3 floats in structE307C0

* resolve #397

* fix libultra

* combine PR #398 with #403

* decompile evt_goto_end_loop

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>

include/common.h

@@ -9,7 +9,7 @@
 #include "variables.h"
 #include "macros.h"
 #include "enums.h"
-#include "si.h"
+#include "evt.h"
 #include "messages.h"
 
 #ifdef PERMUTER

include/common_structs.h

@@ -4,7 +4,7 @@
 #include "macros.h"
 #include "ultra64.h"
 #include "types.h"
-#include "si.h"
+#include "evt.h"
 #include "enums.h"
 
 struct Evt;

include/evt.h

@@ -1,5 +1,5 @@
-#ifndef _SI_H_
-#define _SI_H_
+#ifndef _EVT_H_
+#define _EVT_H_
 
 #include "ultra64.h"
 
@@ -104,27 +104,27 @@ enum {
     EVT_OP_94,
 };
 
-#define SI_VAR(v)           ((v -  30000000))
-#define SI_MAP_VAR(v)       ((v -  50000000))
-#define SI_FLAG(v)          ((v -  70000000))
-#define SI_MAP_FLAG(v)      ((v -  90000000))
-#define SI_AREA_FLAG(v)     ((v - 110000000))
-#define SI_SAVE_FLAG(v)     ((v - 130000000))
-#define SI_AREA_VAR(v)      ((v - 150000000))
-#define SI_SAVE_VAR(v)      ((v - 170000000))
-#define SI_ARRAY(v)         ((v - 190000000))
-#define SI_ARRAY_FLAG(v)    ((v - 210000000))
-#define SI_FIXED(v) (((v * 1024.0f) + -230000000)) // See float_to_fixed_var
-#define SI_LIMIT        -250000000 // TODO better name
+#define EVT_VAR(v)           ((v -  30000000))
+#define EVT_MAP_VAR(v)       ((v -  50000000))
+#define EVT_FLAG(v)          ((v -  70000000))
+#define EVT_MAP_FLAG(v)      ((v -  90000000))
+#define EVT_AREA_FLAG(v)     ((v - 110000000))
+#define EVT_SAVE_FLAG(v)     ((v - 130000000))
+#define EVT_AREA_VAR(v)      ((v - 150000000))
+#define EVT_SAVE_VAR(v)      ((v - 170000000))
+#define EVT_ARRAY(v)         ((v - 190000000))
+#define EVT_ARRAY_FLAG(v)    ((v - 210000000))
+#define EVT_FIXED(v) (((v * 1024.0f) + -230000000)) // See float_to_fixed_var
+#define EVT_LIMIT        -250000000 // TODO better name
 #define MAKE_ENTITY_END 0x80000000
 
-#define SI_STORY_PROGRESS SI_SAVE_VAR(0)
-#define SI_WORLD_LOCATION SI_SAVE_VAR(425)
+#define EVT_STORY_PROGRESS EVT_SAVE_VAR(0)
+#define EVT_WORLD_LOCATION EVT_SAVE_VAR(425)
 
-/* Return type of si_execute_next_command */
-#define SI_CONTINUE 0   /* Continue to next command */
-#define SI_ABORT    1   /* Quit execution */
-#define SI_FINISH   255 /* Return from script */
+/* Return type of evt_execute_next_command */
+#define EVT_CONTINUE 0   /* Continue to next command */
+#define EVT_ABORT    1   /* Quit execution */
+#define EVT_FINISH   255 /* Return from script */
 
 /* Return type of script API functions */
 typedef s32 ApiStatus;
@@ -132,9 +132,9 @@ typedef s32 ApiStatus;
 #define ApiStatus_DONE1  1   /* Unconditional. Probably only exists to return a bool from functions */
 #define ApiStatus_DONE2  2   /* Conditional on Evt->disableScripts */
 #define ApiStatus_REPEAT 3   /* Call again immediately */
-#define ApiStatus_FINISH 255 /* Corresponds to SI_FINISH */
+#define ApiStatus_FINISH 255 /* Corresponds to EVT_FINISH */
 
-#define SI_CMD(opcode, argv...) \
+#define EVT_CMD(opcode, argv...) \
     opcode, \
     /* argc */ (sizeof((Bytecode[]){argv})/sizeof(Bytecode)), \
     ##argv

include/script_api/battle.h

@@ -2,7 +2,7 @@
 #define _SCRIPT_API_BATTLE_H_
 
 #include "common_structs.h"
-#include "si.h"
+#include "evt.h"
 
 #include "script_api/common.h"
 

include/script_api/common.h

@@ -2,7 +2,7 @@
 #define _SCRIPT_API_COMMON_H_
 
 #include "common_structs.h"
-#include "si.h"
+#include "evt.h"
 
 ApiStatus FadeBackgroundToBlack(Evt* script, s32 isInitialCall);
 ApiStatus UnfadeBackgroundFromBlack(Evt* script, s32 isInitialCall);

include/script_api/map.h

@@ -2,7 +2,7 @@
 #define _SCRIPT_API_MAP_H_
 
 #include "common_structs.h"
-#include "si.h"
+#include "evt.h"
 
 #include "script_api/common.h"
 

include/si_funcs.h

@@ -0,0 +1,226 @@
+#ifndef _EVT_FUNCS_H_
+#define _EVT_FUNCS_H_
+
+f32 fixed_var_to_float(Bytecode scriptVar);
+
+Bytecode float_to_fixed_var(f32 value);
+
+ApiStatus evt_handle_return(Evt* script);
+
+ApiStatus evt_handle_label(Evt* script);
+
+ApiStatus evt_handle_goto(Evt* script);
+
+ApiStatus evt_handle_loop(Evt* script);
+
+ApiStatus evt_handle_end_loop(Evt* script);
+
+ApiStatus evt_handle_break_loop(Evt* script);
+
+ApiStatus evt_handle_wait(Evt* script);
+
+ApiStatus evt_handle_wait_seconds(Evt* script);
+
+ApiStatus evt_handle_if_equal(Evt* script);
+
+ApiStatus evt_handle_if_not_equal(Evt* script);
+
+ApiStatus evt_handle_if_less(Evt* script);
+
+ApiStatus evt_handle_if_greater(Evt* script);
+
+ApiStatus evt_handle_if_less_equal(Evt* script);
+
+ApiStatus evt_handle_if_greater_equal(Evt* script);
+
+ApiStatus evt_handle_if_AND(Evt* script);
+
+ApiStatus evt_handle_if_not_AND(Evt* script);
+
+ApiStatus evt_handle_else(Evt* script);
+
+ApiStatus evt_handle_end_if(Evt* script);
+
+ApiStatus evt_handle_switch(Evt* script);
+
+ApiStatus evt_handle_switch_const(Evt* script);
+
+ApiStatus evt_handle_case_equal(Evt* script);
+
+ApiStatus evt_handle_case_not_equal(Evt* script);
+
+ApiStatus evt_handle_case_less(Evt* script);
+
+ApiStatus evt_handle_case_less_equal(Evt* script);
+
+ApiStatus evt_handle_case_greater(Evt* script);
+
+ApiStatus evt_handle_case_greater_equal(Evt* script);
+
+ApiStatus evt_handle_case_range(Evt* script);
+
+ApiStatus evt_handle_case_default(Evt* script);
+
+ApiStatus evt_handle_case_AND(Evt* script);
+
+ApiStatus evt_handle_case_equal_OR(Evt* script);
+
+ApiStatus evt_handle_case_equal_AND(Evt* script);
+
+ApiStatus evt_handle_end_case_group(Evt* script);
+
+ApiStatus evt_handle_break_case(Evt* script);
+
+ApiStatus evt_handle_end_switch(Evt* script);
+
+ApiStatus evt_handle_set_var(Evt* script);
+
+ApiStatus evt_handle_set_const(Evt* script);
+
+ApiStatus evt_handle_set_float(Evt* script);
+
+ApiStatus evt_handle_add(Evt* script);
+
+ApiStatus evt_handle_subtract(Evt* script);
+
+ApiStatus evt_handle_multiply(Evt* script);
+
+ApiStatus evt_handle_divide(Evt* script);
+
+ApiStatus evt_handle_mod(Evt* script);
+
+ApiStatus evt_handle_addF(Evt* script);
+
+ApiStatus evt_handle_subtractF(Evt* script);
+
+ApiStatus evt_handle_multiplyF(Evt* script);
+
+ApiStatus evt_handle_divideF(Evt* script);
+
+ApiStatus evt_handle_set_int_buffer_ptr(Evt* script);
+
+ApiStatus evt_handle_set_float_buffer_ptr(Evt* script);
+
+ApiStatus evt_handle_get_1_word(Evt* script);
+
+ApiStatus evt_handle_get_2_word(Evt* script);
+
+ApiStatus evt_handle_get_3_word(Evt* script);
+
+ApiStatus evt_handle_get_4_word(Evt* script);
+
+ApiStatus evt_handle_get_Nth_word(Evt* script);
+
+ApiStatus evt_handle_get_1_float(Evt* script);
+
+ApiStatus evt_handle_get_2_float(Evt* script);
+
+ApiStatus evt_handle_get_3_float(Evt* script);
+
+ApiStatus evt_handle_get_4_float(Evt* script);
+
+ApiStatus evt_handle_get_Nth_float(Evt* script);
+
+ApiStatus evt_handle_set_array(Evt* script);
+
+ApiStatus evt_handle_set_flag_array(Evt* script);
+
+ApiStatus evt_handle_allocate_array(Evt* script);
+
+ApiStatus evt_handle_AND(Evt* script);
+
+ApiStatus evt_handle_AND_const(Evt* script);
+
+ApiStatus evt_handle_OR(Evt* script);
+
+ApiStatus evt_handle_OR_const(Evt* script);
+
+ApiStatus evt_handle_call(Evt* script);
+
+ApiStatus evt_handle_exec1(Evt* script);
+
+ApiStatus evt_handle_exec1_get_id(Evt* script);
+
+ApiStatus evt_handle_exec_wait(Evt* script);
+
+ApiStatus evt_handle_jump(Evt* script);
+
+s32 _bound_script_trigger_handler(Trigger* trigger);
+
+ApiStatus evt_handle_bind(Evt* script);
+
+ApiStatus DeleteTrigger(Evt* script, s32 isInitialCall);
+
+ApiStatus evt_handle_unbind(Evt* script);
+
+ApiStatus evt_handle_kill(Evt* script);
+
+ApiStatus evt_handle_set_priority(Evt* script);
+
+ApiStatus evt_handle_set_timescale(Evt* script);
+
+ApiStatus evt_handle_set_group(Evt* script);
+
+ApiStatus evt_handle_suspend_all(Evt* script);
+
+ApiStatus evt_handle_resume_all(Evt* script);
+
+ApiStatus evt_handle_suspend_others(Evt* script);
+
+ApiStatus evt_handle_resume_others(Evt* script);
+
+ApiStatus evt_handle_suspend(Evt* script);
+
+ApiStatus evt_handle_resume(Evt* script);
+
+ApiStatus evt_handle_does_script_exist(Evt* script);
+
+void evt_standard_trigger_executor(Trigger* trigger);
+
+ApiStatus evt_handle_bind_lock(Evt* script);
+
+ApiStatus evt_handle_thread(Evt* script);
+
+ApiStatus evt_handle_end_thread(Evt* script);
+
+ApiStatus evt_handle_child_thread(Evt* script);
+
+ApiStatus evt_handle_end_child_thread(Evt* script);
+
+ApiStatus func_802C6E14(Evt* script);
+
+ApiStatus evt_handle_print_debug_var(Evt* script);
+
+ApiStatus func_802C739C(Evt* script);
+
+ApiStatus func_802C73B0(Evt* script);
+
+s32 func_802C73B8(Evt* script);
+
+s32 evt_execute_next_command(Evt *script);
+
+s32 get_variable(Evt* script, Bytecode var);
+
+s32 get_variable_index(Evt* script, s32 var);
+
+s32 get_variable_index_alt(s32 var);
+
+s32 set_variable(Evt* script, Bytecode var, s32 value);
+
+f32 get_float_variable(Evt* script, Bytecode var);
+
+f32 set_float_variable(Evt* script, Bytecode var, s32 value);
+
+Bytecode* evt_find_label(Evt* script, s32 arg1);
+
+Bytecode* evt_skip_if(Evt* script);
+
+Bytecode* evt_skip_else(Evt* script);
+
+Bytecode* evt_goto_end_case(Evt* script);
+
+Bytecode* evt_goto_next_case(Evt* script);
+
+Bytecode* evt_goto_end_loop(Evt* script);
+
+#endif

src/111f0_len_860.c

@@ -28,7 +28,7 @@ void init_enter_world_shared(void) {
 
     gOverrideFlags |= 0x8;
 
-    set_variable(NULL, SI_SAVE_VAR(1), gGameStatusPtr->unk_A9);
+    set_variable(NULL, EVT_SAVE_VAR(1), gGameStatusPtr->unk_A9);
     timeFreezeMode = 0;
 }
 

src/16c8e0.c

@@ -25,43 +25,43 @@ extern f32 D_8029EFB8;
 EvtSource BtlPutPartnerAway = SCRIPT({
     DispatchEvent(ACTOR_PARTNER, 62);
     parallel {
-        SI_VAR(0) = 1.0;
+        EVT_VAR(0) = 1.0;
         loop 10 {
-            SetActorScale(ACTOR_PARTNER, SI_VAR(0), SI_VAR(0), 1.0);
-            SI_VAR(0) -= 0.1005859375;
+            SetActorScale(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(0), 1.0);
+            EVT_VAR(0) -= 0.1005859375;
             sleep 1;
         }
     }
     EnablePartnerBlur();
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_E);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
     SetActorJumpGravity(ACTOR_PARTNER, 1.0);
-    SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     JumpToGoal(ACTOR_PARTNER, 10, 0, 0, 1);
     DisablePartnerBlur();
 });
 
 EvtSource BtlBringPartnerOut = SCRIPT({
     parallel {
-        SI_VAR(0) = 0.1005859375;
+        EVT_VAR(0) = 0.1005859375;
         loop 20 {
-            SetActorScale(ACTOR_PARTNER, SI_VAR(0), SI_VAR(0), 1.0);
-            SI_VAR(0) += 0.05078125;
+            SetActorScale(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(0), 1.0);
+            EVT_VAR(0) += 0.05078125;
             sleep 1;
         }
         SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0);
     }
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_D);
-    GetGoalPos(256, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(256, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetActorJumpGravity(ACTOR_PARTNER, 1.0);
-    if (SI_VAR(1) == 0) {
+    if (EVT_VAR(1) == 0) {
         JumpToGoal(ACTOR_PARTNER, 20, 0, 0, 1);
     } else {
         JumpToGoal(ACTOR_PARTNER, 20, 0, 0, 1);
     }
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    ForceHomePos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    ForceHomePos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
 });
 
 s8 D_80280CE0[] = { 0, 0, 0, 0 };

src/197F40.c

@@ -1224,15 +1224,15 @@ ApiStatus SetActorRotation(Evt* script, s32 isInitialCall) {
 
     actor = get_actor(actorID);
 
-    if (x != SI_LIMIT) {
+    if (x != EVT_LIMIT) {
         actor->rotation.x = x;
     }
 
-    if (y != SI_LIMIT) {
+    if (y != EVT_LIMIT) {
         actor->rotation.y = y;
     }
 
-    if (z != SI_LIMIT) {
+    if (z != EVT_LIMIT) {
         actor->rotation.z = z;
     }
 

src/1A5830.c

@@ -1659,10 +1659,10 @@ ApiStatus SetActorSize(Evt* script, s32 isInitialCall) {
 
     actor = get_actor(actorID);
 
-    if (y != SI_LIMIT) {
+    if (y != EVT_LIMIT) {
         actor->size.y = y;
     }
-    if (x != SI_LIMIT) {
+    if (x != EVT_LIMIT) {
         actor->size.x = x;
     }
     actor->shadowScale = actor->size.x / 24.0;
@@ -1701,11 +1701,11 @@ ApiStatus SetPartSize(Evt* script, s32 isInitialCall) {
 
     part = get_actor_part(get_actor(actorID), partIndex);
 
-    if (sizeY != SI_LIMIT) {
+    if (sizeY != EVT_LIMIT) {
         part->size.y = sizeY;
     }
 
-    if (sizeX != SI_LIMIT) {
+    if (sizeX != EVT_LIMIT) {
         part->size.x = sizeX;
     }
 

src/7fd10_len_b40.c

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

src/EA6FD0.c

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

src/battle/area_kmr_part_1/actor/goomba.c

@@ -114,44 +114,44 @@ EvtSource N(init_802197AC) = SCRIPT({
 
 EvtSource N(idle_802197F8) = SCRIPT({
 10:
-    RandInt(80, SI_VAR(0));
-    SI_VAR(0) += 80;
-    loop SI_VAR(0) {
+    RandInt(80, EVT_VAR(0));
+    EVT_VAR(0) += 80;
+    loop EVT_VAR(0) {
     0:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 0;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 5;
     SetActorIdleSpeed(ACTOR_SELF, 1.0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_80219760));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleRunToGoal(ACTOR_SELF, 0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_80219714));
     loop 20 {
     1:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 1;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 5;
     SetActorIdleSpeed(ACTOR_SELF, 1.0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_80219760));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleRunToGoal(ACTOR_SELF, 0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_80219714));
     loop 80 {
     2:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 2;
         }
@@ -164,49 +164,49 @@ EvtSource N(handleEvent_80219AD4) = SCRIPT({
     UseIdleAnimation(ACTOR_SELF, FALSE);
     EnableIdleScript(ACTOR_SELF, FALSE);
     SetActorScale(ACTOR_SELF, 1.0, 1.0, 1.0);
-    GetLastEvent(ACTOR_SELF, SI_VAR(0));
-    match SI_VAR(0) {
+    GetLastEvent(ACTOR_SELF, EVT_VAR(0));
+    match EVT_VAR(0) {
         EVENT_HIT_COMBO, EVENT_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoNormalHit;
         }
         == EVENT_BURN_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
             await DoBurnHit;
         }
         == EVENT_BURN_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
             await DoBurnHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_dead;
             await DoDeath;
             return;
         }
         == EVENT_SPIN_SMASH_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoSpinSmashHit;
         }
         == EVENT_SPIN_SMASH_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoSpinSmashHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
             await DoDeath;
             return;
         }
         == EVENT_SHOCK_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoJumpBack;
             JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
             SetAnimationRate(ACTOR_SELF, 1, 2.0);
@@ -221,26 +221,26 @@ EvtSource N(handleEvent_80219AD4) = SCRIPT({
             JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
         }
         == EVENT_SHOCK_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
             await DoDeath;
             return;
         }
         == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
             await DoImmune;
         }
         == EVENT_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoNormalHit;
             sleep 10;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
             await DoDeath;
             return;
         }
@@ -254,25 +254,25 @@ EvtSource N(handleEvent_80219AD4) = SCRIPT({
             HPBarToHome(ACTOR_SELF);
         }
         == EVENT_RECOVER_STATUS {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
             await DoRecover;
         }
         == EVENT_SCARE_AWAY {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
-            SI_VAR(2) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
+            EVT_VAR(2) = (const) NPC_ANIM_goomba_normal_pain;
             await DoScareAway;
             return;
         }
         == EVENT_BEGIN_AIR_LIFT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
             await DoAirLift;
         }
         == EVENT_BLOW_AWAY {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoBlowAway;
             return;
         }
@@ -305,27 +305,27 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({
     sleep 5;
     SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk);
-    EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16);
-    match SI_VAR(0) {
+    EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 1, 16);
+    match EVT_VAR(0) {
         HIT_RESULT_MISS, HIT_RESULT_LUCKY {
-            SI_VAR(10) = SI_VAR(0);
+            EVT_VAR(10) = EVT_VAR(0);
             SetGoalToTarget(ACTOR_SELF);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) -= 10;
-            SI_VAR(1) = 10;
-            SI_VAR(2) += 3;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) -= 10;
+            EVT_VAR(1) = 10;
+            EVT_VAR(2) += 3;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorJumpGravity(ACTOR_SELF, 1.2);
             spawn {
-                GetActorPos(ACTOR_SELF, SI_VAR(1), SI_VAR(2), SI_VAR(0));
-                SI_VAR(0) = 0;
+                GetActorPos(ACTOR_SELF, EVT_VAR(1), EVT_VAR(2), EVT_VAR(0));
+                EVT_VAR(0) = 0;
                 loop 16 {
-                    GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    N(AngleCalculate)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
-                    SI_VAR(1) = SI_VAR(4);
-                    SI_VAR(2) = SI_VAR(5);
-                    SI_VAR(3) = SI_VAR(6);
+                    GetActorPos(ACTOR_SELF, EVT_VAR(4), EVT_VAR(5), EVT_VAR(6));
+                    N(AngleCalculate)(EVT_VAR(1), EVT_VAR(2), EVT_VAR(4), EVT_VAR(5), EVT_VAR(0));
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
+                    EVT_VAR(1) = EVT_VAR(4);
+                    EVT_VAR(2) = EVT_VAR(5);
+                    EVT_VAR(3) = EVT_VAR(6);
                     sleep 1;
                 }
             }
@@ -345,24 +345,24 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({
             SetActorDispOffset(ACTOR_SELF, 0, 7, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain);
             sleep 5;
-            if (SI_VAR(10) == 5) {
-                EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0);
+            if (EVT_VAR(10) == 5) {
+                EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0x80000000)), 0, 0, 0);
             }
             sleep 5;
             SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk);
             SetGoalToTarget(ACTOR_SELF);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) += 20;
-            SI_VAR(1) = 0;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) += 20;
+            EVT_VAR(1) = 0;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorJumpGravity(ACTOR_SELF, 2.0);
             spawn {
                 sleep 4;
-                SI_VAR(0) = 180;
+                EVT_VAR(0) = 180;
                 loop 4 {
-                    SI_VAR(0) -= 45;
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+                    EVT_VAR(0) -= 45;
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
                     sleep 1;
                 }
                 SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk);
@@ -393,15 +393,15 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({
             SetGoalToTarget(ACTOR_SELF);
             SetActorJumpGravity(ACTOR_SELF, 1.2);
             spawn {
-                GetActorPos(ACTOR_SELF, SI_VAR(1), SI_VAR(2), SI_VAR(0));
-                SI_VAR(0) = 0;
+                GetActorPos(ACTOR_SELF, EVT_VAR(1), EVT_VAR(2), EVT_VAR(0));
+                EVT_VAR(0) = 0;
                 loop 16 {
-                    GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    N(AngleCalculate)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
-                    SI_VAR(1) = SI_VAR(4);
-                    SI_VAR(2) = SI_VAR(5);
-                    SI_VAR(3) = SI_VAR(6);
+                    GetActorPos(ACTOR_SELF, EVT_VAR(4), EVT_VAR(5), EVT_VAR(6));
+                    N(AngleCalculate)(EVT_VAR(1), EVT_VAR(2), EVT_VAR(4), EVT_VAR(5), EVT_VAR(0));
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
+                    EVT_VAR(1) = EVT_VAR(4);
+                    EVT_VAR(2) = EVT_VAR(5);
+                    EVT_VAR(3) = EVT_VAR(6);
                     sleep 1;
                 }
             }
@@ -417,8 +417,8 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({
             sleep 1;
         }
     }
-    EnemyDamageTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 0, 1, 32);
-    match SI_VAR(0) {
+    EnemyDamageTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 0, 1, 32);
+    match EVT_VAR(0) {
         HIT_RESULT_HIT, 2 {
             UseBattleCamPreset(2);
             SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0);
@@ -428,17 +428,17 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({
             SetActorRotation(ACTOR_SELF, 0, 0, 0);
             SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) += 40;
-            SI_VAR(1) = 0;
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) += 40;
+            EVT_VAR(1) = 0;
             SetActorJumpGravity(ACTOR_SELF, 1.8);
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 10, FALSE, TRUE, FALSE);
-            SI_VAR(0) += 30;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) += 30;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 8, FALSE, TRUE, FALSE);
-            SI_VAR(0) += 20;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) += 20;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 6, FALSE, TRUE, FALSE);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle);
             sleep 3;

src/battle/area_kmr_part_1/actor/paragoomba.c

@@ -196,42 +196,42 @@ EvtSource N(init_8021CDD8) = SCRIPT({
 
 EvtSource N(idle_8021CE24) = SCRIPT({
 10:
-    RandInt(80, SI_VAR(0));
-    SI_VAR(0) += 80;
-    loop SI_VAR(0) {
+    RandInt(80, EVT_VAR(0));
+    EVT_VAR(0) += 80;
+    loop EVT_VAR(0) {
     0:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 0;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 5;
     SetActorIdleSpeed(ACTOR_SELF, 0.6);
     SetIdleAnimations(ACTOR_SELF, 2, N(idleAnimations_8021CD74));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleFlyToGoal(ACTOR_SELF, 0, -5, 0);
     loop 20 {
     1:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 1;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 5;
     SetActorIdleSpeed(ACTOR_SELF, 0.6);
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleFlyToGoal(ACTOR_SELF, 0, -5, 0);
     SetIdleAnimations(ACTOR_SELF, 2, N(idleAnimations_8021CD28));
     loop 40 {
     2:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 2;
         }
@@ -253,80 +253,80 @@ EvtSource N(8021DF64);
 EvtSource N(handleEvent_8021D158) = SCRIPT({
     UseIdleAnimation(ACTOR_SELF, FALSE);
     EnableIdleScript(ACTOR_SELF, 0);
-    GetLastEvent(ACTOR_SELF, SI_VAR(0));
-    match SI_VAR(0) {
+    GetLastEvent(ACTOR_SELF, EVT_VAR(0));
+    match EVT_VAR(0) {
         EVENT_HIT_COMBO, EVENT_HIT {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
             await DoNormalHit;
-            GetBattlePhase(SI_VAR(0));
-            if (SI_VAR(0) == 1) {
-                GetEncounterState(SI_VAR(0));
-                if (SI_VAR(0) == 4) {
+            GetBattlePhase(EVT_VAR(0));
+            if (EVT_VAR(0) == 1) {
+                GetEncounterState(EVT_VAR(0));
+                if (EVT_VAR(0) == 4) {
                     await N(8021DF64);
                 }
             }
         }
         == EVENT_BURN_HIT {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead;
             await DoBurnHit;
         }
         == EVENT_BURN_DEATH {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead;
             await DoBurnHit;
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_dead;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_dead;
             await DoDeath;
             return;
         }
         == EVENT_FALL_TRIGGER {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
             await DoNormalHit;
             await N(8021DF64);
         }
         == 15 {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead;
             await DoBurnHit;
             await N(8021DF64);
         }
         == EVENT_SHOCK_HIT {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_electrocute;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
             await DoJumpBack;
             SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_dizzy);
             await N(8021D0E0);
         }
         == EVENT_SHOCK_DEATH {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_electrocute;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_dead;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_dead;
             await DoDeath;
             return;
         }
         == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_idle;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_idle;
             await DoImmune;
         }
         == EVENT_DEATH {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
             await DoNormalHit;
             sleep 10;
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_dead;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_dead;
             await DoDeath;
             return;
         }
@@ -340,26 +340,26 @@ EvtSource N(handleEvent_8021D158) = SCRIPT({
             HPBarToHome(ACTOR_SELF);
         }
         == EVENT_RECOVER_STATUS {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_idle;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_idle;
             await DoRecover;
         }
         == EVENT_SCARE_AWAY {
             SetActorFlagBits(ACTOR_SELF, 512, 0);
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_run;
-            SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_pain;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_run;
+            EVT_VAR(2) = (const) NPC_ANIM_paragoomba_default_pain;
             await DoScareAway;
             return;
         }
         == EVENT_BEGIN_AIR_LIFT {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_run;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_run;
             await DoAirLift;
         }
         == EVENT_BLOW_AWAY {
-            SI_VAR(0) = (const) 2;
-            SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
+            EVT_VAR(0) = (const) 2;
+            EVT_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain;
             await DoBlowAway;
             return;
         }
@@ -383,10 +383,10 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({
     AddGoalPos(ACTOR_SELF, 50, 0, 0);
     SetActorSpeed(ACTOR_SELF, 6.0);
     FlyToGoal(ACTOR_SELF, 0, -4, 0);
-    EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16);
-    match SI_VAR(0) {
+    EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 1, 16);
+    match EVT_VAR(0) {
         HIT_RESULT_MISS, HIT_RESULT_LUCKY {
-            SI_VAR(10) = SI_VAR(0);
+            EVT_VAR(10) = EVT_VAR(0);
             sleep 10;
             UseBattleCamPreset(66);
             SetBattleCamZoom(300);
@@ -397,15 +397,15 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({
             SetActorSpeed(ACTOR_SELF, 5.0);
             SetActorJumpGravity(ACTOR_SELF, 1.8);
             SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack);
-            GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 10, FALSE, FALSE, FALSE);
             PlaySoundAtActor(ACTOR_SELF, SOUND_UNUSED_2C1);
             SetActorSounds(ACTOR_SELF, 1, 0, 0);
             SetGoalToTarget(ACTOR_SELF);
-            SI_VAR(0) -= 80;
-            SI_VAR(1) = 20;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) -= 80;
+            EVT_VAR(1) = 20;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorSpeed(ACTOR_SELF, 8.0);
             SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack);
             FlyToGoal(ACTOR_SELF, 0, -10, 4);
@@ -419,8 +419,8 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({
             AddActorDecoration(ACTOR_SELF, 2, 0, 2);
             SetAnimationRate(ACTOR_SELF, 2, 3.0);
             sleep 10;
-            if (SI_VAR(10) == 5) {
-                EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0);
+            if (EVT_VAR(10) == 5) {
+                EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0x80000000)), 0, 0, 0);
             }
             sleep 10;
             SetAnimationRate(ACTOR_SELF, 2, 1.0);
@@ -447,8 +447,8 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({
             SetActorSpeed(ACTOR_SELF, 5.0);
             SetActorJumpGravity(ACTOR_SELF, 1.8);
             SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack);
-            GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 10, FALSE, FALSE, FALSE);
             PlaySoundAtActor(ACTOR_SELF, SOUND_UNUSED_2C1);
             SetActorSounds(ACTOR_SELF, 1, 0, 0);
@@ -459,8 +459,8 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({
         }
     }
     sleep 2;
-    EnemyDamageTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 0, 1, 32);
-    match SI_VAR(0) {
+    EnemyDamageTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 0, 1, 32);
+    match EVT_VAR(0) {
         HIT_RESULT_HIT, 2 {
             UseBattleCamPreset(2);
             SetGoalToTarget(ACTOR_SELF);
@@ -489,39 +489,39 @@ EvtSource N(8021DF64) = SCRIPT({
     SetPartFlags(ACTOR_SELF, 3, 1179652);
     SetPartFlags(ACTOR_SELF, 4, 1179652);
     SetPartFlags(ACTOR_SELF, 1, 8388612);
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPartPos(ACTOR_SELF, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPartPos(ACTOR_SELF, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetPartDispOffset(ACTOR_SELF, 3, -9, 7, -2);
-    SetPartPos(ACTOR_SELF, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPartPos(ACTOR_SELF, 4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetPartDispOffset(ACTOR_SELF, 4, 11, 7, -2);
-    GetLastEvent(ACTOR_SELF, SI_VAR(0));
-    if (SI_VAR(0) == 15) {
+    GetLastEvent(ACTOR_SELF, EVT_VAR(0));
+    if (EVT_VAR(0) == 15) {
         SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_burn_dead);
     } else {
         SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain);
     }
     SetActorSounds(ACTOR_SELF, 2, 769, 0);
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) = 0;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) = 0;
     SetActorJumpGravity(ACTOR_SELF, 0.8);
-    SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     JumpToGoal(ACTOR_SELF, 15, FALSE, TRUE, FALSE);
     N(StartRumbleWithParams)(100, 10);
     spawn {
         ShakeCam(1, 0, 5, 0.3);
     }
     ResetActorSounds(ACTOR_SELF, 2);
-    GetLastEvent(ACTOR_SELF, SI_VAR(3));
-    if (SI_VAR(3) == 15) {
+    GetLastEvent(ACTOR_SELF, EVT_VAR(3));
+    if (EVT_VAR(3) == 15) {
         SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain);
-        GetActorPos(ACTOR_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-        SI_VAR(4) += 10;
-        SI_VAR(5) += 5;
-        PlayEffect(0x27, 0, SI_VAR(3), SI_VAR(4), SI_VAR(5), 1.0, 10, 0, 0, 0, 0, 0, 0, 0);
+        GetActorPos(ACTOR_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+        EVT_VAR(4) += 10;
+        EVT_VAR(5) += 5;
+        PlayEffect(0x27, 0, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5), 1.0, 10, 0, 0, 0, 0, 0, 0, 0);
     }
-    SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     JumpToGoal(ACTOR_SELF, 10, FALSE, TRUE, FALSE);
-    SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
     loop 10 {
         SetPartFlagBits(ACTOR_SELF, 3, 1, 1);
@@ -533,11 +533,11 @@ EvtSource N(8021DF64) = SCRIPT({
     }
     SetPartFlagBits(ACTOR_SELF, 3, 1, 1);
     SetPartFlagBits(ACTOR_SELF, 4, 1, 1);
-    GetIndexFromHome(ACTOR_SELF, SI_VAR(0));
-    SI_VAR(0) %= 4;
-    SetGoalToIndex(ACTOR_SELF, SI_VAR(0));
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetHomePos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetIndexFromHome(ACTOR_SELF, EVT_VAR(0));
+    EVT_VAR(0) %= 4;
+    SetGoalToIndex(ACTOR_SELF, EVT_VAR(0));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetHomePos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle);
     SetActorFlagBits(ACTOR_SELF, 512, 0);
     SetStatusTable(ACTOR_SELF, N(statusTable_8021CB18));
@@ -589,44 +589,44 @@ EvtSource N(8021E584) = SCRIPT({
 
 EvtSource N(idle_8021E5D0) = SCRIPT({
 10:
-    RandInt(80, SI_VAR(0));
-    SI_VAR(0) += 80;
-    loop SI_VAR(0) {
+    RandInt(80, EVT_VAR(0));
+    EVT_VAR(0) += 80;
+    loop EVT_VAR(0) {
     0:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 0;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 5;
     SetActorIdleSpeed(ACTOR_SELF, 1.0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021E538));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleRunToGoal(ACTOR_SELF, 0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021E4EC));
     loop 20 {
     1:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 1;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 5;
     SetActorIdleSpeed(ACTOR_SELF, 1.0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021E538));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleRunToGoal(ACTOR_SELF, 0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021E4EC));
     loop 80 {
     2:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 2;
         }
@@ -639,49 +639,49 @@ EvtSource N(handleEvent_8021E8AC) = SCRIPT({
     UseIdleAnimation(ACTOR_SELF, FALSE);
     EnableIdleScript(ACTOR_SELF, FALSE);
     SetActorScale(ACTOR_SELF, 1.0, 1.0, 1.0);
-    GetLastEvent(ACTOR_SELF, SI_VAR(0));
-    match SI_VAR(0) {
+    GetLastEvent(ACTOR_SELF, EVT_VAR(0));
+    match EVT_VAR(0) {
         EVENT_HIT_COMBO, EVENT_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoNormalHit;
         }
         == EVENT_BURN_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
             await DoBurnHit;
         }
         == EVENT_BURN_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead;
             await DoBurnHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_dead;
             await DoDeath;
             return;
         }
         == EVENT_SPIN_SMASH_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoSpinSmashHit;
         }
         == EVENT_SPIN_SMASH_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoSpinSmashHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
             await DoDeath;
             return;
         }
         == EVENT_SHOCK_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoJumpBack;
             JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
             SetAnimationRate(ACTOR_SELF, 1, 2.0);
@@ -696,26 +696,26 @@ EvtSource N(handleEvent_8021E8AC) = SCRIPT({
             JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
         }
         == EVENT_SHOCK_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
             await DoDeath;
             return;
         }
         == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
             await DoImmune;
         }
         == EVENT_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoNormalHit;
             sleep 10;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_dead;
             await DoDeath;
             return;
         }
@@ -729,25 +729,25 @@ EvtSource N(handleEvent_8021E8AC) = SCRIPT({
             HPBarToHome(ACTOR_SELF);
         }
         == EVENT_RECOVER_STATUS {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_idle;
             await DoRecover;
         }
         == EVENT_SCARE_AWAY {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
-            SI_VAR(2) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
+            EVT_VAR(2) = (const) NPC_ANIM_goomba_normal_pain;
             await DoScareAway;
             return;
         }
         == EVENT_BEGIN_AIR_LIFT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_run;
             await DoAirLift;
         }
         == EVENT_BLOW_AWAY {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_goomba_normal_pain;
             await DoBlowAway;
             return;
         }
@@ -780,27 +780,27 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({
     sleep 5;
     SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk);
-    EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16);
-    match SI_VAR(0) {
+    EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 1, 16);
+    match EVT_VAR(0) {
         HIT_RESULT_MISS, HIT_RESULT_LUCKY {
-            SI_VAR(10) = SI_VAR(0);
+            EVT_VAR(10) = EVT_VAR(0);
             SetGoalToTarget(ACTOR_SELF);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) -= 10;
-            SI_VAR(1) = 10;
-            SI_VAR(2) += 3;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) -= 10;
+            EVT_VAR(1) = 10;
+            EVT_VAR(2) += 3;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorJumpGravity(ACTOR_SELF, 1.2);
             spawn {
-                GetActorPos(ACTOR_SELF, SI_VAR(1), SI_VAR(2), SI_VAR(0));
-                SI_VAR(0) = 0;
+                GetActorPos(ACTOR_SELF, EVT_VAR(1), EVT_VAR(2), EVT_VAR(0));
+                EVT_VAR(0) = 0;
                 loop 16 {
-                    GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    N(AngleCalculate)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
-                    SI_VAR(1) = SI_VAR(4);
-                    SI_VAR(2) = SI_VAR(5);
-                    SI_VAR(3) = SI_VAR(6);
+                    GetActorPos(ACTOR_SELF, EVT_VAR(4), EVT_VAR(5), EVT_VAR(6));
+                    N(AngleCalculate)(EVT_VAR(1), EVT_VAR(2), EVT_VAR(4), EVT_VAR(5), EVT_VAR(0));
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
+                    EVT_VAR(1) = EVT_VAR(4);
+                    EVT_VAR(2) = EVT_VAR(5);
+                    EVT_VAR(3) = EVT_VAR(6);
                     sleep 1;
                 }
             }
@@ -820,24 +820,24 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({
             SetActorDispOffset(ACTOR_SELF, 0, 7, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain);
             sleep 5;
-            if (SI_VAR(10) == 5) {
-                EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0);
+            if (EVT_VAR(10) == 5) {
+                EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0x80000000)), 0, 0, 0);
             }
             sleep 5;
             SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk);
             SetGoalToTarget(ACTOR_SELF);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) += 20;
-            SI_VAR(1) = 0;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) += 20;
+            EVT_VAR(1) = 0;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorJumpGravity(ACTOR_SELF, 2.0);
             spawn {
                 sleep 4;
-                SI_VAR(0) = 180;
+                EVT_VAR(0) = 180;
                 loop 4 {
-                    SI_VAR(0) -= 45;
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+                    EVT_VAR(0) -= 45;
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
                     sleep 1;
                 }
                 SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk);
@@ -868,15 +868,15 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({
             SetGoalToTarget(ACTOR_SELF);
             SetActorJumpGravity(ACTOR_SELF, 1.2);
             spawn {
-                GetActorPos(ACTOR_SELF, SI_VAR(1), SI_VAR(2), SI_VAR(0));
-                SI_VAR(0) = 0;
+                GetActorPos(ACTOR_SELF, EVT_VAR(1), EVT_VAR(2), EVT_VAR(0));
+                EVT_VAR(0) = 0;
                 loop 16 {
-                    GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    N(AngleCalculate)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
-                    SI_VAR(1) = SI_VAR(4);
-                    SI_VAR(2) = SI_VAR(5);
-                    SI_VAR(3) = SI_VAR(6);
+                    GetActorPos(ACTOR_SELF, EVT_VAR(4), EVT_VAR(5), EVT_VAR(6));
+                    N(AngleCalculate)(EVT_VAR(1), EVT_VAR(2), EVT_VAR(4), EVT_VAR(5), EVT_VAR(0));
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
+                    EVT_VAR(1) = EVT_VAR(4);
+                    EVT_VAR(2) = EVT_VAR(5);
+                    EVT_VAR(3) = EVT_VAR(6);
                     sleep 1;
                 }
             }
@@ -892,8 +892,8 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({
             sleep 1;
         }
     }
-    EnemyDamageTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 0, 1, 32);
-    match SI_VAR(0) {
+    EnemyDamageTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 0, 1, 32);
+    match EVT_VAR(0) {
         HIT_RESULT_HIT, 2 {
             UseBattleCamPreset(2);
             SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0);
@@ -903,17 +903,17 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({
             SetActorRotation(ACTOR_SELF, 0, 0, 0);
             SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) += 40;
-            SI_VAR(1) = 0;
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) += 40;
+            EVT_VAR(1) = 0;
             SetActorJumpGravity(ACTOR_SELF, 1.8);
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 10, FALSE, TRUE, FALSE);
-            SI_VAR(0) += 30;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) += 30;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 8, FALSE, TRUE, FALSE);
-            SI_VAR(0) += 20;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) += 20;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 6, FALSE, TRUE, FALSE);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle);
             sleep 3;

src/battle/area_kmr_part_1/actor/spiked_goomba.c

@@ -114,44 +114,44 @@ EvtSource N(init_8021B16C) = SCRIPT({
 
 EvtSource N(idle_8021B1B8) = SCRIPT({
 10:
-    RandInt(80, SI_VAR(0));
-    SI_VAR(0) += 80;
-    loop SI_VAR(0) {
+    RandInt(80, EVT_VAR(0));
+    EVT_VAR(0) += 80;
+    loop EVT_VAR(0) {
     0:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 0;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 5;
     SetActorIdleSpeed(ACTOR_SELF, 1.0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021B120));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleRunToGoal(ACTOR_SELF, 0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021B0D4));
     loop 20 {
     1:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 1;
         }
         sleep 1;
     }
-    GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 5;
+    GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 5;
     SetActorIdleSpeed(ACTOR_SELF, 1.0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021B120));
-    SetIdleGoal(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetIdleGoal(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     IdleRunToGoal(ACTOR_SELF, 0);
     SetIdleAnimations(ACTOR_SELF, 1, N(idleAnimations_8021B0D4));
     loop 80 {
     2:
-        GetStatusFlags(ACTOR_SELF, SI_VAR(1));
-        if (SI_VAR(1) & 3526656) {
+        GetStatusFlags(ACTOR_SELF, EVT_VAR(1));
+        if (EVT_VAR(1) & 3526656) {
             sleep 1;
             goto 2;
         }
@@ -164,49 +164,49 @@ EvtSource N(handleEvent_8021B494) = SCRIPT({
     UseIdleAnimation(ACTOR_SELF, FALSE);
     EnableIdleScript(ACTOR_SELF, FALSE);
     SetActorScale(ACTOR_SELF, 1.0, 1.0, 1.0);
-    GetLastEvent(ACTOR_SELF, SI_VAR(0));
-    match SI_VAR(0) {
+    GetLastEvent(ACTOR_SELF, EVT_VAR(0));
+    match EVT_VAR(0) {
         EVENT_HIT_COMBO, EVENT_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoNormalHit;
         }
         == EVENT_BURN_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_dead;
-            SI_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_burn_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_dead;
+            EVT_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_burn_pain;
             await DoBurnHit;
         }
         == EVENT_BURN_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_dead;
-            SI_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_burn_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_dead;
+            EVT_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_burn_pain;
             await DoBurnHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_pain;
             await DoDeath;
             return;
         }
         == EVENT_SPIN_SMASH_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoSpinSmashHit;
         }
         == EVENT_SPIN_SMASH_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoSpinSmashHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead;
             await DoDeath;
             return;
         }
         == EVENT_SHOCK_HIT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_electrocute;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoJumpBack;
             JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
             SetAnimationRate(ACTOR_SELF, 1, 2.0);
@@ -221,26 +221,26 @@ EvtSource N(handleEvent_8021B494) = SCRIPT({
             JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE);
         }
         == EVENT_SHOCK_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_electrocute;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_electrocute;
             await DoShockHit;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead;
             await DoDeath;
             return;
         }
         == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_idle;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_idle;
             await DoImmune;
         }
         == EVENT_DEATH {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoNormalHit;
             sleep 10;
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead;
             await DoDeath;
             return;
         }
@@ -254,42 +254,42 @@ EvtSource N(handleEvent_8021B494) = SCRIPT({
             HPBarToHome(ACTOR_SELF);
         }
         == EVENT_RECOVER_STATUS {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_idle;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_idle;
             await DoRecover;
         }
         == EVENT_SCARE_AWAY {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_run;
-            SI_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_run;
+            EVT_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoScareAway;
             return;
         }
         == EVENT_BEGIN_AIR_LIFT {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_run;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_run;
             await DoAirLift;
         }
         == EVENT_BLOW_AWAY {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain;
             await DoBlowAway;
             return;
         }
         == EVENT_SPIKE_TAUNT {
-            GetStatusFlags(ACTOR_SELF, SI_VAR(0));
-            if (SI_VAR(0) !& 3526656) {
+            GetStatusFlags(ACTOR_SELF, EVT_VAR(0));
+            if (EVT_VAR(0) !& 3526656) {
                 SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_laugh);
             }
             sleep 10;
-            GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            GetStatusFlags(ACTOR_SELF, SI_VAR(3));
-            if (SI_VAR(3) & 524288) {
-                SI_VAR(1) += 10;
+            GetActorPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            GetStatusFlags(ACTOR_SELF, EVT_VAR(3));
+            if (EVT_VAR(3) & 524288) {
+                EVT_VAR(1) += 10;
             } else {
-                SI_VAR(1) += 26;
+                EVT_VAR(1) += 26;
             }
-            PlayEffect(0x1A, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+            PlayEffect(0x1A, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
             sleep 20;
         }
         else {
@@ -321,27 +321,27 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({
     sleep 5;
     SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk);
-    EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16);
-    match SI_VAR(0) {
+    EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 1, 16);
+    match EVT_VAR(0) {
         HIT_RESULT_MISS, HIT_RESULT_LUCKY {
-            SI_VAR(10) = SI_VAR(0);
+            EVT_VAR(10) = EVT_VAR(0);
             SetGoalToTarget(ACTOR_SELF);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) -= 10;
-            SI_VAR(1) = 10;
-            SI_VAR(2) += 3;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) -= 10;
+            EVT_VAR(1) = 10;
+            EVT_VAR(2) += 3;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorJumpGravity(ACTOR_SELF, 1.2);
             spawn {
-                GetActorPos(ACTOR_SELF, SI_VAR(1), SI_VAR(2), SI_VAR(0));
-                SI_VAR(0) = 0;
+                GetActorPos(ACTOR_SELF, EVT_VAR(1), EVT_VAR(2), EVT_VAR(0));
+                EVT_VAR(0) = 0;
                 loop 16 {
-                    GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    N(AngleCalculate)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
-                    SI_VAR(1) = SI_VAR(4);
-                    SI_VAR(2) = SI_VAR(5);
-                    SI_VAR(3) = SI_VAR(6);
+                    GetActorPos(ACTOR_SELF, EVT_VAR(4), EVT_VAR(5), EVT_VAR(6));
+                    N(AngleCalculate)(EVT_VAR(1), EVT_VAR(2), EVT_VAR(4), EVT_VAR(5), EVT_VAR(0));
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
+                    EVT_VAR(1) = EVT_VAR(4);
+                    EVT_VAR(2) = EVT_VAR(5);
+                    EVT_VAR(3) = EVT_VAR(6);
                     sleep 1;
                 }
             }
@@ -361,24 +361,24 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({
             SetActorDispOffset(ACTOR_SELF, 0, 7, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_pain);
             sleep 5;
-            if (SI_VAR(10) == 5) {
-                EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0);
+            if (EVT_VAR(10) == 5) {
+                EnemyTestTarget(ACTOR_SELF, EVT_VAR(0), ((0x80000000)), 0, 0, 0);
             }
             sleep 5;
             SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk);
             SetGoalToTarget(ACTOR_SELF);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) += 20;
-            SI_VAR(1) = 0;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) += 20;
+            EVT_VAR(1) = 0;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             SetActorJumpGravity(ACTOR_SELF, 2.0);
             spawn {
                 sleep 4;
-                SI_VAR(0) = 180;
+                EVT_VAR(0) = 180;
                 loop 4 {
-                    SI_VAR(0) -= 45;
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+                    EVT_VAR(0) -= 45;
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
                     sleep 1;
                 }
                 SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk);
@@ -409,15 +409,15 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({
             SetGoalToTarget(ACTOR_SELF);
             SetActorJumpGravity(ACTOR_SELF, 1.2);
             spawn {
-                GetActorPos(ACTOR_SELF, SI_VAR(1), SI_VAR(2), SI_VAR(0));
-                SI_VAR(0) = 0;
+                GetActorPos(ACTOR_SELF, EVT_VAR(1), EVT_VAR(2), EVT_VAR(0));
+                EVT_VAR(0) = 0;
                 loop 16 {
-                    GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    N(AngleCalculate)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
-                    SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
-                    SI_VAR(1) = SI_VAR(4);
-                    SI_VAR(2) = SI_VAR(5);
-                    SI_VAR(3) = SI_VAR(6);
+                    GetActorPos(ACTOR_SELF, EVT_VAR(4), EVT_VAR(5), EVT_VAR(6));
+                    N(AngleCalculate)(EVT_VAR(1), EVT_VAR(2), EVT_VAR(4), EVT_VAR(5), EVT_VAR(0));
+                    SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
+                    EVT_VAR(1) = EVT_VAR(4);
+                    EVT_VAR(2) = EVT_VAR(5);
+                    EVT_VAR(3) = EVT_VAR(6);
                     sleep 1;
                 }
             }
@@ -433,8 +433,8 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({
             sleep 1;
         }
     }
-    EnemyDamageTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 0, 2, 32);
-    match SI_VAR(0) {
+    EnemyDamageTarget(ACTOR_SELF, EVT_VAR(0), ((0)), 0, 0, 2, 32);
+    match EVT_VAR(0) {
         HIT_RESULT_HIT, 2 {
             UseBattleCamPreset(2);
             SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0);
@@ -444,20 +444,20 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({
             SetActorRotation(ACTOR_SELF, 0, 0, 0);
             SetActorDispOffset(ACTOR_SELF, 0, 0, 0);
             SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle);
-            GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(0) += 40;
-            SI_VAR(1) = 0;
+            GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(0) += 40;
+            EVT_VAR(1) = 0;
             SetActorJumpGravity(ACTOR_SELF, 1.8);
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 10, FALSE, TRUE, FALSE);
-            SI_VAR(0) += 30;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) += 30;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 8, FALSE, TRUE, FALSE);
-            SI_VAR(0) += 20;
-            SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EVT_VAR(0) += 20;
+            SetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             JumpToGoal(ACTOR_SELF, 6, FALSE, TRUE, FALSE);
-            GetLastDamage(0, SI_VAR(0));
-            if (SI_VAR(0) > 0) {
+            GetLastDamage(0, EVT_VAR(0));
+            if (EVT_VAR(0) > 0) {
                 SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_laugh);
                 sleep 15;
             } else {

src/battle/area_kmr_part_1/stage/clouds.inc.c

@@ -1,59 +1,59 @@
 #include "common/UnkAngleFunc2.inc.c"
 
 EvtSource N(clouds1) = SCRIPT({
-    SI_VAR(10) = SI_VAR(0);
-    SI_VAR(7) = SI_VAR(2);
-    SI_VAR(7) *= 10;
+    EVT_VAR(10) = EVT_VAR(0);
+    EVT_VAR(7) = EVT_VAR(2);
+    EVT_VAR(7) *= 10;
 0:
-    SI_VAR(7) += 4;
-    if (SI_VAR(7) > 3599) {
-        SI_VAR(7) -= 3600;
+    EVT_VAR(7) += 4;
+    if (EVT_VAR(7) > 3599) {
+        EVT_VAR(7) -= 3600;
     }
-    N(UnkAngleFunc2)(SI_VAR(7), SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-    TranslateModel(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    RotateModel(SI_VAR(10), SI_VAR(3), 0, 1, 0);
+    N(UnkAngleFunc2)(EVT_VAR(7), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+    TranslateModel(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    RotateModel(EVT_VAR(10), EVT_VAR(3), 0, 1, 0);
     sleep 1;
     goto 0;
 });
 
 EvtSource N(clouds2) = SCRIPT({
-    SI_VAR(10) = SI_VAR(0);
-    SI_VAR(11) = SI_VAR(3);
-    SI_VAR(12) = SI_VAR(4);
-    SI_VAR(7) = SI_VAR(2);
-    SI_VAR(7) *= 10;
+    EVT_VAR(10) = EVT_VAR(0);
+    EVT_VAR(11) = EVT_VAR(3);
+    EVT_VAR(12) = EVT_VAR(4);
+    EVT_VAR(7) = EVT_VAR(2);
+    EVT_VAR(7) *= 10;
 0:
-    SI_VAR(7) += 4;
-    if (SI_VAR(7) > 3599) {
-        SI_VAR(7) -= 3600;
+    EVT_VAR(7) += 4;
+    if (EVT_VAR(7) > 3599) {
+        EVT_VAR(7) -= 3600;
     }
-    N(UnkAngleFunc2)(SI_VAR(7), SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-    SI_VAR(1) += (float) SI_VAR(11);
-    SI_VAR(2) += (float) SI_VAR(12);
-    TranslateModel(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    RotateModel(SI_VAR(10), SI_VAR(3), 0, 1, 0);
+    N(UnkAngleFunc2)(EVT_VAR(7), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+    EVT_VAR(1) += (float) EVT_VAR(11);
+    EVT_VAR(2) += (float) EVT_VAR(12);
+    TranslateModel(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    RotateModel(EVT_VAR(10), EVT_VAR(3), 0, 1, 0);
     sleep 1;
     goto 0;
 });
 
 EvtSource N(clouds3) = SCRIPT({
-    SI_VAR(10) = SI_VAR(0);
-    SI_VAR(11) = SI_VAR(3);
-    SI_VAR(12) = SI_VAR(4);
-    SI_VAR(13) = SI_VAR(5);
-    SI_VAR(7) = SI_VAR(2);
-    SI_VAR(7) *= 10;
+    EVT_VAR(10) = EVT_VAR(0);
+    EVT_VAR(11) = EVT_VAR(3);
+    EVT_VAR(12) = EVT_VAR(4);
+    EVT_VAR(13) = EVT_VAR(5);
+    EVT_VAR(7) = EVT_VAR(2);
+    EVT_VAR(7) *= 10;
 0:
-    SI_VAR(7) += 4;
-    if (SI_VAR(7) > 3599) {
-        SI_VAR(7) -= 3600;
+    EVT_VAR(7) += 4;
+    if (EVT_VAR(7) > 3599) {
+        EVT_VAR(7) -= 3600;
     }
-    N(UnkAngleFunc2)(SI_VAR(7), SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-    SI_VAR(0) += (float) SI_VAR(11);
-    SI_VAR(1) += (float) SI_VAR(12);
-    SI_VAR(2) += (float) SI_VAR(13);
-    TranslateModel(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    RotateModel(SI_VAR(10), SI_VAR(3), 0, 1, 0);
+    N(UnkAngleFunc2)(EVT_VAR(7), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+    EVT_VAR(0) += (float) EVT_VAR(11);
+    EVT_VAR(1) += (float) EVT_VAR(12);
+    EVT_VAR(2) += (float) EVT_VAR(13);
+    TranslateModel(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    RotateModel(EVT_VAR(10), EVT_VAR(3), 0, 1, 0);
     sleep 1;
     goto 0;
 });

src/battle/area_kmr_part_1/stage/kmr_03.c

@@ -8,12 +8,12 @@
 EvtSource N(beforeBattle_80220188) = SCRIPT({
     SetSpriteShading(-1);
 
-    SI_VAR(0) = 1; // model
-    SI_VAR(2) = 0; // speed
+    EVT_VAR(0) = 1; // model
+    EVT_VAR(2) = 0; // speed
     spawn N(clouds1);
 
-    SI_VAR(0) = 4;
-    SI_VAR(2) = 70;
+    EVT_VAR(0) = 4;
+    EVT_VAR(2) = 70;
     spawn N(clouds1);
 });
 

src/battle/area_kmr_part_1/stage/kmr_04.c

@@ -8,12 +8,12 @@
 EvtSource N(beforeBattle_802205D8) = SCRIPT({
     SetSpriteShading(-1);
 
-    SI_VAR(0) = 1;
-    SI_VAR(2) = 0;
+    EVT_VAR(0) = 1;
+    EVT_VAR(2) = 0;
     spawn N(clouds1);
 
-    SI_VAR(0) = 4;
-    SI_VAR(2) = 70;
+    EVT_VAR(0) = 4;
+    EVT_VAR(2) = 70;
     spawn N(clouds1);
 });
 

src/battle/area_kmr_part_1/stage/kmr_06.c

@@ -11,12 +11,12 @@ EvtSource N(beforeBattle_80220E28) = SCRIPT({
 
     N(UnkFogFunc)();
 
-    SI_VAR(0) = 1;
-    SI_VAR(2) = 0;
+    EVT_VAR(0) = 1;
+    EVT_VAR(2) = 0;
     spawn N(clouds1);
 
-    SI_VAR(0) = 4;
-    SI_VAR(2) = 70;
+    EVT_VAR(0) = 4;
+    EVT_VAR(2) = 70;
     spawn N(clouds1);
 });
 

src/battle/battle.c

@@ -501,7 +501,7 @@ void load_demo_battle(u32 index) {
             break;
     }
 
-    set_variable(NULL, SI_SAVE_FLAG(1817), 1);
+    set_variable(NULL, EVT_SAVE_FLAG(1817), 1);
     gCurrentEncounter.unk_07 = 0;
     gCurrentEncounter.unk_10 = 0;
     set_battle_stage(-1);

src/battle/item/UseItem.inc.c

@@ -1,8 +1,8 @@
 #include "common.h"
 
-/// Provide arg `TRUE` on `SI_VAR(1)` to disable refunding.
+/// Provide arg `TRUE` on `EVT_VAR(1)` to disable refunding.
 EvtSource N(UseItemWithEffect) = SCRIPT({
-    if (SI_VAR(1) == 0) {
+    if (EVT_VAR(1) == 0) {
         UseBattleCamPreset(69); // Nice
         sleep 10;
 
@@ -19,8 +19,8 @@ EvtSource N(UseItemWithEffect) = SCRIPT({
         $effectY += 10;
         $effectY += 2;
         PlayEffect(0x33, 1, $x, $effectY, $z, 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
-        MakeItemEntity(SI_VAR(10), $x, $y, $z, 1, 0);
-        SI_VAR(10) = $x;
+        MakeItemEntity(EVT_VAR(10), $x, $y, $z, 1, 0);
+        EVT_VAR(10) = $x;
 
         N(GiveRefund)();
         sleep $x;
@@ -28,7 +28,7 @@ EvtSource N(UseItemWithEffect) = SCRIPT({
         sleep 15;
 
         N(GiveRefundCleanup)();
-        RemoveItemEntity(SI_VAR(10));
+        RemoveItemEntity(EVT_VAR(10));
     } else {
         // No refund.
 
@@ -42,11 +42,11 @@ EvtSource N(UseItemWithEffect) = SCRIPT({
         $effectY += 10;
         $effectY += 2;
         PlayEffect(0x33, 1, $x, $effectY, $z, 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
-        MakeItemEntity(SI_VAR(10), $x, $y, $z, 1, 0);
-        SI_VAR(10) = $x;
+        MakeItemEntity(EVT_VAR(10), $x, $y, $z, 1, 0);
+        EVT_VAR(10) = $x;
 
         sleep 15;
-        RemoveItemEntity(SI_VAR(10));
+        RemoveItemEntity(EVT_VAR(10));
     }
 });
 
@@ -61,8 +61,8 @@ EvtSource N(UseItem) = SCRIPT({
     SetAnimation(ACTOR_PLAYER, 0, ANIM_GOT_ITEM);
     GetActorPos(ACTOR_PLAYER, $x, $y, $z);
     $y += 45;
-    MakeItemEntity(SI_VAR(10), $x, $y, $z, 1, 0);
-    SI_VAR(14) = $x;
+    MakeItemEntity(EVT_VAR(10), $x, $y, $z, 1, 0);
+    EVT_VAR(14) = $x;
 
     N(GiveRefund)();
     sleep $x;
@@ -70,7 +70,7 @@ EvtSource N(UseItem) = SCRIPT({
     sleep 15;
 
     N(GiveRefundCleanup)();
-    RemoveItemEntity(SI_VAR(14));
+    RemoveItemEntity(EVT_VAR(14));
 });
 
 EvtSource N(PlayerGoHome) = SCRIPT({

src/battle/item/coconut.c

@@ -46,7 +46,7 @@ s32 N(modelCommandList)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_COCONUT;
+    EVT_VAR(10) = (const) ITEM_COCONUT;
 
     await N(UseItemWithEffect);
 
@@ -57,21 +57,21 @@ EvtSource N(main) = SCRIPT({
     PlaySound(SOUND_THROW);
     sleep 3;
 
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
 
     $x = 1.0;
     MultiplyByActorScale($x);
-    SetVirtualEntityScale(SI_VAR(10), $x, $x, $x);
+    SetVirtualEntityScale(EVT_VAR(10), $x, $x, $x);
 
     GetActorPos(ACTOR_PLAYER, $x, $y, $z);
-    SI_VAR(3) = 20;
-    SI_VAR(4) = 42;
-    SI_VAR(5) = 5;
-    MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    $x += SI_VAR(3);
-    $y += SI_VAR(4);
-    $z += SI_VAR(5);
-    SetVirtualEntityPosition(SI_VAR(10), $x, $y, $z);
+    EVT_VAR(3) = 20;
+    EVT_VAR(4) = 42;
+    EVT_VAR(5) = 5;
+    MultiplyVec3ByActorScale(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    $x += EVT_VAR(3);
+    $y += EVT_VAR(4);
+    $z += EVT_VAR(5);
+    SetVirtualEntityPosition(EVT_VAR(10), $x, $y, $z);
 
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
@@ -81,25 +81,25 @@ EvtSource N(main) = SCRIPT({
         $x = 0;
         loop 18 {
             $x += -60;
-            SetVirtualEntityRotation(SI_VAR(10), 0, 0, $x);
+            SetVirtualEntityRotation(EVT_VAR(10), 0, 0, $x);
             sleep 1;
         }
     }
 
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.8);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.8);
     $z += 5;
-    VirtualEntityJumpTo(SI_VAR(10), $x, $y, $z, 18);
+    VirtualEntityJumpTo(EVT_VAR(10), $x, $y, $z, 18);
 
-    GetItemPower(ITEM_COCONUT, $damage, SI_VAR(4));
+    GetItemPower(ITEM_COCONUT, $damage, EVT_VAR(4));
     ApplyShrinkFromOwner($damage);
-    ItemDamageEnemy(SI_VAR(9), 0x18000000, 0, $damage, 32);
+    ItemDamageEnemy(EVT_VAR(9), 0x18000000, 0, $damage, 32);
 
     // Bounce off
     $x += 60;
     $y += 0;
-    VirtualEntityJumpTo(SI_VAR(10), $x, $y, $z, 16);
+    VirtualEntityJumpTo(EVT_VAR(10), $x, $y, $z, 16);
 
-    DeleteVirtualEntity(SI_VAR(10));
+    DeleteVirtualEntity(EVT_VAR(10));
 
     await N(PlayerGoHome);
 });

src/battle/item/dizzy_dial.c

@@ -46,7 +46,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_DIZZY_DIAL;
+    EVT_VAR(10) = (const) ITEM_DIZZY_DIAL;
     await N(UseItemWithEffect);
     UseBattleCamPreset(2);
     MoveBattleCamOver(20);
@@ -78,17 +78,17 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetItemPower(ITEM_DIZZY_DIAL, SI_VAR(0), SI_VAR(1));
-    MakeStatusField(SI_VAR(0), 0x40000, 100, SI_VAR(0));
-    func_80252B3C(SI_VAR(0), 0x50000000, SI_VAR(0), 0, 32);
+    GetItemPower(ITEM_DIZZY_DIAL, EVT_VAR(0), EVT_VAR(1));
+    MakeStatusField(EVT_VAR(0), 0x40000, 100, EVT_VAR(0));
+    func_80252B3C(EVT_VAR(0), 0x50000000, EVT_VAR(0), 0, 32);
 1:
     sleep 5;
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     sleep 30;

src/battle/item/dried_shroom.c

@@ -28,23 +28,23 @@ ApiStatus N(func_802A12FC_71CFDC)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_DRIED_SHROOM;
+    EVT_VAR(10) = (const) ITEM_DRIED_SHROOM;
     await N(UseItemWithEffect);
     await N(EatItem);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_STICK_OUT_TONGUE);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 35;
-    N(func_802A123C_71CF1C)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    SI_VAR(2) += 5;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 35;
+    N(func_802A123C_71CF1C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    EVT_VAR(2) += 5;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1);
     N(func_802A12FC_71CFDC)();
     sleep 30;
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(2) += 5;
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(2) += 5;
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     await N(PlayerGoHome);

src/battle/item/dusty_hammer.c

@@ -45,46 +45,46 @@ s32 N(modelCommandList)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) 0x86;
+    EVT_VAR(10) = (const) 0x86;
     await N(UseItemWithEffect);
     UseBattleCamPreset(3);
     MoveBattleCamOver(15);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     PlaySound(SOUND_THROW);
     sleep 3;
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
-    SI_VAR(0) = 1.0;
-    MultiplyByActorScale(SI_VAR(0));
-    SetVirtualEntityScale(SI_VAR(10), SI_VAR(0), SI_VAR(0), SI_VAR(0));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = 20;
-    SI_VAR(4) = 42;
-    SI_VAR(5) = 5;
-    MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(0) += SI_VAR(3);
-    SI_VAR(1) += SI_VAR(4);
-    SI_VAR(2) += SI_VAR(5);
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
+    EVT_VAR(0) = 1.0;
+    MultiplyByActorScale(EVT_VAR(0));
+    SetVirtualEntityScale(EVT_VAR(10), EVT_VAR(0), EVT_VAR(0), EVT_VAR(0));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = 20;
+    EVT_VAR(4) = 42;
+    EVT_VAR(5) = 5;
+    MultiplyVec3ByActorScale(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(0) += EVT_VAR(3);
+    EVT_VAR(1) += EVT_VAR(4);
+    EVT_VAR(2) += EVT_VAR(5);
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 18 {
-            SI_VAR(0) += 0xFFFFFFC4;
-            SetVirtualEntityRotation(SI_VAR(10), 0, 0, SI_VAR(0));
+            EVT_VAR(0) += 0xFFFFFFC4;
+            SetVirtualEntityRotation(EVT_VAR(10), 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.80078125);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18);
-    GetItemPower(ITEM_DUSTY_HAMMER, SI_VAR(3), SI_VAR(4));
-    ApplyShrinkFromOwner(SI_VAR(3));
-    ItemDamageEnemy(SI_VAR(9), 0x18000000, 0, SI_VAR(3), 32);
-    SI_VAR(0) += 40;
-    SI_VAR(1) += 10;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-    DeleteVirtualEntity(SI_VAR(10));
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.80078125);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 18);
+    GetItemPower(ITEM_DUSTY_HAMMER, EVT_VAR(3), EVT_VAR(4));
+    ApplyShrinkFromOwner(EVT_VAR(3));
+    ItemDamageEnemy(EVT_VAR(9), 0x18000000, 0, EVT_VAR(3), 32);
+    EVT_VAR(0) += 40;
+    EVT_VAR(1) += 10;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+    DeleteVirtualEntity(EVT_VAR(10));
     await N(PlayerGoHome);
 });

src/battle/item/egg_missile.c

@@ -140,36 +140,36 @@ s32 N(modelCommandList)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_EGG_MISSILE;
+    EVT_VAR(10) = (const) ITEM_EGG_MISSILE;
     await N(UseItemWithEffect);
     UseBattleCamPreset(3);
     MoveBattleCamOver(15);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     PlaySound(SOUND_THROW);
     sleep 3;
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 20;
-    SI_VAR(1) += 42;
-    SI_VAR(2) += 5;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 20;
+    EVT_VAR(1) += 42;
+    EVT_VAR(2) += 5;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 18 {
-            SI_VAR(0) += 60;
-            SetVirtualEntityRotation(SI_VAR(10), 0, 0, SI_VAR(0));
+            EVT_VAR(0) += 60;
+            SetVirtualEntityRotation(EVT_VAR(10), 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
-    SetVirtualEntityJumpGravity(SI_VAR(10), 1.0);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18);
-    DeleteVirtualEntity(SI_VAR(10));
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 1.0);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 18);
+    DeleteVirtualEntity(EVT_VAR(10));
     PlaySound(SOUND_UNKNOWN_2010);
-    N(func_802A123C_71CF1C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(func_802A123C_71CF1C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn {
         StartRumble(5);
         ShakeCam(1, 0, 2, 0.75);
@@ -177,7 +177,7 @@ EvtSource N(main) = SCRIPT({
         ShakeCam(1, 0, 4, 1.2001953125);
         ShakeCam(1, 0, 2, 0.4501953125);
     }
-    GetItemPower(ITEM_EGG_MISSILE, SI_VAR(0), SI_VAR(1));
-    ItemDamageEnemy(SI_VAR(0), 0x18000202, 0, SI_VAR(0), 32);
+    GetItemPower(ITEM_EGG_MISSILE, EVT_VAR(0), EVT_VAR(1));
+    ItemDamageEnemy(EVT_VAR(0), 0x18000202, 0, EVT_VAR(0), 32);
     await N(PlayerGoHome);
 });

src/battle/item/electro_pop.c

@@ -85,30 +85,30 @@ ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_ELECTRO_POP;
+    EVT_VAR(10) = (const) ITEM_ELECTRO_POP;
     await N(UseItemWithEffect);
     await N(EatItem);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    PlayEffect(0x57, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    PlayEffect(0x57, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
     PlaySound(SOUND_UNKNOWN_379);
-    GetItemPower(ITEM_VOLT_SHROOM, SI_VAR(0), SI_VAR(1));
+    GetItemPower(ITEM_VOLT_SHROOM, EVT_VAR(0), EVT_VAR(1));
     N(func_802A123C_7307DC)();
     sleep 40;
     N(func_802A14F0_730A90)();
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 20;
-    SI_VAR(1) += 25;
-    N(func_802A133C_7308DC)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-    N(AddFP)(SI_VAR(3));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 20;
+    EVT_VAR(1) += 25;
+    N(func_802A133C_7308DC)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+    N(AddFP)(EVT_VAR(3));
     sleep 10;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
     sleep 30;
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     ShowMessageBox(16, 60);

src/battle/item/fire_flower.c

@@ -35,7 +35,7 @@ ApiStatus N(func_802A1378_716FD8)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_FIRE_FLOWER;
+    EVT_VAR(10) = (const) ITEM_FIRE_FLOWER;
     await N(UseItemWithEffect);
     N(FadeBackgroundToBlack)();
     PlaySound(SOUND_UNKNOWN_377);
@@ -48,21 +48,21 @@ EvtSource N(main) = SCRIPT({
     UseBattleCamPreset(2);
     MoveBattleCamOver(20);
     sleep 10;
-    GetActorPos(ACTOR_PLAYER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(0) = 40;
-    MultiplyByActorScale(SI_VAR(0));
-    SI_VAR(3) += SI_VAR(0);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(0) = 40;
+    MultiplyByActorScale(EVT_VAR(0));
+    EVT_VAR(3) += EVT_VAR(0);
     spawn {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) -= 10;
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) -= 10;
         SetActorSpeed(ACTOR_PLAYER, 2.0);
         SetAnimation(ACTOR_PLAYER, 0, ANIM_RUNNING);
-        SetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         PlayerRunToGoal(ACTOR_PLAYER);
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     }
     spawn {
-        N(func_802A123C_716E9C)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        N(func_802A123C_716E9C)(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
         sleep 25;
         loop 12 {
             sleep 1;
@@ -78,17 +78,17 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetItemPower(ITEM_FIRE_FLOWER, SI_VAR(0), SI_VAR(1));
-    ItemDamageEnemy(SI_VAR(0), 0x38000002, 0, SI_VAR(0), 32);
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetItemPower(ITEM_FIRE_FLOWER, EVT_VAR(0), EVT_VAR(1));
+    ItemDamageEnemy(EVT_VAR(0), 0x38000002, 0, EVT_VAR(0), 32);
 1:
     sleep 5;
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     N(func_802A1378_716FD8)();

src/battle/item/food.c

@@ -108,54 +108,54 @@ EvtSource N(script6) = SCRIPT({
     sleep 1;
     SetActorYaw(ACTOR_PLAYER, 180);
     sleep 10;
-    SI_VAR(1) = SI_VAR(15);
+    EVT_VAR(1) = EVT_VAR(15);
     await N(UseItem);
-    SI_VAR(14) = SI_VAR(10);
+    EVT_VAR(14) = EVT_VAR(10);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     spawn {
         sleep 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     }
-    CreateVirtualEntity(SI_VAR(10), 0x80283EE8);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 30;
-    SI_VAR(2) += 5;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetVirtualEntityFlags(SI_VAR(10), 32);
+    CreateVirtualEntity(EVT_VAR(10), 0x80283EE8);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 30;
+    EVT_VAR(2) += 5;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetVirtualEntityFlags(EVT_VAR(10), 32);
     spawn {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 45;
-        MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0);
-        SI_VAR(14) = SI_VAR(0);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 45;
+        MakeItemEntity(EVT_VAR(14), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1, 0);
+        EVT_VAR(14) = EVT_VAR(0);
         loop 25 {
-            GetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            N(func_802A123C_73330C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            N(func_802A123C_73330C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
-        RemoveItemEntity(SI_VAR(14));
+        RemoveItemEntity(EVT_VAR(14));
     }
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetBattleCamTarget(0xFFFFFF83, 1, 0);
     SetBattleCamOffsetZ(41);
     SetBattleCamZoom(248);
     MoveBattleCamOver(25);
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.400390625);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.400390625);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 25);
     AddBattleCamZoom(100);
     MoveBattleCamOver(30);
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
-    if (SI_VAR(11) > 0) {
-        N(func_802A12EC_7333BC)(SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
+    if (EVT_VAR(11) > 0) {
+        N(func_802A12EC_7333BC)(EVT_VAR(11));
     }
     sleep 30;
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     sleep 20;
     SetActorYaw(ACTOR_PLAYER, 150);
     sleep 1;
@@ -172,62 +172,62 @@ EvtSource N(script6) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(14) = SI_VAR(1);
-    GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(10) = SI_VAR(1);
-    N(func_802A15A0_733670)(SI_VAR(10));
+    EVT_VAR(14) = EVT_VAR(1);
+    GetMenuSelection(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(10) = EVT_VAR(1);
+    N(func_802A15A0_733670)(EVT_VAR(10));
     InitTargetIterator();
-    GetOwnerTarget(SI_VAR(0), SI_VAR(1));
-    if (SI_VAR(0) == ACTOR_PARTNER) {
+    GetOwnerTarget(EVT_VAR(0), EVT_VAR(1));
+    if (EVT_VAR(0) == ACTOR_PARTNER) {
         await N(script6);
         return;
     }
-    SI_VAR(1) = SI_VAR(14);
+    EVT_VAR(1) = EVT_VAR(14);
     await N(UseItemWithEffect);
-    if (SI_VAR(13) == 0) {
+    if (EVT_VAR(13) == 0) {
         await N(EatItem);
     } else {
         await N(DrinkItem);
     }
-    if (SI_VAR(15) == 1) {
+    if (EVT_VAR(15) == 1) {
         SetAnimation(ACTOR_PLAYER, 0, ANIM_STICK_OUT_TONGUE);
     }
-    if (SI_VAR(11) > 0) {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 0;
-        SI_VAR(1) += 35;
-        N(func_802A1378_733448)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    if (EVT_VAR(11) > 0) {
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 0;
+        EVT_VAR(1) += 35;
+        N(func_802A1378_733448)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     }
-    if (SI_VAR(11) < 0) {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 0;
-        SI_VAR(1) += 35;
-        N(func_802A1378_733448)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    if (EVT_VAR(11) < 0) {
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 0;
+        EVT_VAR(1) += 35;
+        N(func_802A1378_733448)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     }
-    if (SI_VAR(12) > 0) {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 20;
-        SI_VAR(1) += 25;
-        N(func_802A1438_733508)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(12));
+    if (EVT_VAR(12) > 0) {
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 20;
+        EVT_VAR(1) += 25;
+        N(func_802A1438_733508)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(12));
     }
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
-    if (SI_VAR(11) != 0) {
-        N(AddHP)(SI_VAR(11));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
+    if (EVT_VAR(11) != 0) {
+        N(AddHP)(EVT_VAR(11));
     }
-    if (SI_VAR(12) != 0) {
-        N(AddFP)(SI_VAR(12));
+    if (EVT_VAR(12) != 0) {
+        N(AddFP)(EVT_VAR(12));
     }
-    if (SI_VAR(15) == 0) {
+    if (EVT_VAR(15) == 0) {
         sleep 10;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
         sleep 30;
     } else {
         sleep 30;
     }
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     await N(PlayerGoHome);

src/battle/item/fright_jar.c

@@ -23,7 +23,7 @@ ApiStatus N(func_802A12D4_72BBE4)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_FRIGHT_JAR;
+    EVT_VAR(10) = (const) ITEM_FRIGHT_JAR;
     await N(UseItemWithEffect);
     N(FadeBackgroundToBlack)();
     spawn {
@@ -33,17 +33,17 @@ EvtSource N(main) = SCRIPT({
     }
     SetAnimation(ACTOR_PLAYER, 0, ANIM_CROUCH);
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_367);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0xFFFFFFD8;
-    SI_VAR(1) += 5;
-    SI_VAR(3) = 0.7001953125;
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0xFFFFFFD8;
+    EVT_VAR(1) += 5;
+    EVT_VAR(3) = 0.7001953125;
     loop 5 {
-        PlayEffect(0x61, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3), 25, 0, 0, 0, 0, 0, 0, 0);
-        SI_VAR(0) += 5;
-        SI_VAR(3) += 0.150390625;
+        PlayEffect(0x61, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3), 25, 0, 0, 0, 0, 0, 0, 0);
+        EVT_VAR(0) += 5;
+        EVT_VAR(3) += 0.150390625;
         sleep 7;
     }
-    PlayEffect(0x61, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.5, 60, 0, 0, 0, 0, 0, 0, 0);
+    PlayEffect(0x61, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.5, 60, 0, 0, 0, 0, 0, 0, 0);
     sleep 20;
     loop 4 {
         AddBattleCamZoom(0xFFFFFF9C);
@@ -58,15 +58,15 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
     func_80269EAC(21);
-    ItemAfflictEnemy(SI_VAR(0), 0x70001000, 0, 100, 0, 32);
+    ItemAfflictEnemy(EVT_VAR(0), 0x70001000, 0, 100, 0, 32);
 1:
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     sleep 10;

src/battle/item/hustle_drink.c

@@ -37,17 +37,17 @@ ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_HUSTLE_DRINK;
+    EVT_VAR(10) = (const) ITEM_HUSTLE_DRINK;
     await N(UseItemWithEffect);
     await N(DrinkItem);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_SQUISH);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5);
     N(func_802A12C4_726224)();
     N(func_802A123C_72619C)();
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
     UseBattleCamPreset(13);
     BattleCamTargetActor(ACTOR_SELF);
     MoveBattleCamOver(20);
@@ -102,8 +102,8 @@ EvtSource N(main) = SCRIPT({
     }
     loop 10 {
         PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_369);
-        PlayEffect(0x6, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
-        PlayEffect(0x6, 1, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        PlayEffect(0x6, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        PlayEffect(0x6, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
         sleep 4;
     }
     sleep 10;

src/battle/item/insecticide_herb.c

@@ -94,58 +94,58 @@ s32 N(modelCommandList)[] = {
 };
 
 EvtSource script = SCRIPT({
-    SI_VAR(10) = (const) ITEM_INSECTICIDE_HERB;
+    EVT_VAR(10) = (const) ITEM_INSECTICIDE_HERB;
     await N(UseItemWithEffect);
     UseBattleCamPreset(3);
     MoveBattleCamOver(15);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     PlaySound(SOUND_THROW);
     sleep 3;
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
-    SI_VAR(0) = 1.0;
-    MultiplyByActorScale(SI_VAR(0));
-    SetVirtualEntityScale(SI_VAR(10), SI_VAR(0), SI_VAR(0), SI_VAR(0));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = 20;
-    SI_VAR(4) = 42;
-    SI_VAR(5) = 5;
-    MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(0) += SI_VAR(3);
-    SI_VAR(1) += SI_VAR(4);
-    SI_VAR(2) += SI_VAR(5);
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
+    EVT_VAR(0) = 1.0;
+    MultiplyByActorScale(EVT_VAR(0));
+    SetVirtualEntityScale(EVT_VAR(10), EVT_VAR(0), EVT_VAR(0), EVT_VAR(0));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = 20;
+    EVT_VAR(4) = 42;
+    EVT_VAR(5) = 5;
+    MultiplyVec3ByActorScale(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(0) += EVT_VAR(3);
+    EVT_VAR(1) += EVT_VAR(4);
+    EVT_VAR(2) += EVT_VAR(5);
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 18 {
-            SI_VAR(0) += 0xFFFFFFC4;
-            SetVirtualEntityRotation(SI_VAR(10), 0, 0, SI_VAR(0));
+            EVT_VAR(0) += 0xFFFFFFC4;
+            SetVirtualEntityRotation(EVT_VAR(10), 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.80078125);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18);
-    PlayEffect(0x7, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    SI_VAR(0) -= 10;
-    PlayEffect(0x7, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    SI_VAR(0) += 20;
-    PlayEffect(0x7, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.80078125);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 18);
+    PlayEffect(0x7, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    EVT_VAR(0) -= 10;
+    PlayEffect(0x7, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    EVT_VAR(0) += 20;
+    PlayEffect(0x7, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
     spawn {
-        N(func_802A12E0_72AA30)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        N(func_802A12E0_72AA30)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         sleep 3;
-        N(func_802A12E0_72AA30)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        N(func_802A12E0_72AA30)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         sleep 3;
-        N(func_802A12E0_72AA30)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        N(func_802A12E0_72AA30)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     }
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
     N(func_802A123C_72A98C)();
-    DeleteVirtualEntity(SI_VAR(10));
-    if (SI_VAR(9) == 0) {
-        ItemDamageEnemy(SI_VAR(0), 0, 0, 0, 32);
+    DeleteVirtualEntity(EVT_VAR(10));
+    if (EVT_VAR(9) == 0) {
+        ItemDamageEnemy(EVT_VAR(0), 0, 0, 0, 32);
     } else {
         InitTargetIterator();
         SetGoalToTarget(ACTOR_SELF);

src/battle/item/life_shroom.c

@@ -97,54 +97,54 @@ EvtSource N(script6) = SCRIPT({
     sleep 1;
     SetActorYaw(ACTOR_PLAYER, 180);
     sleep 10;
-    SI_VAR(1) = SI_VAR(15);
+    EVT_VAR(1) = EVT_VAR(15);
     await N(UseItem);
-    SI_VAR(14) = SI_VAR(10);
+    EVT_VAR(14) = EVT_VAR(10);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     spawn {
         sleep 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     }
-    CreateVirtualEntity(SI_VAR(10), 0x80283EE8);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 30;
-    SI_VAR(2) += 5;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetVirtualEntityFlags(SI_VAR(10), 32);
+    CreateVirtualEntity(EVT_VAR(10), 0x80283EE8);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 30;
+    EVT_VAR(2) += 5;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetVirtualEntityFlags(EVT_VAR(10), 32);
     spawn {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 45;
-        MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0);
-        SI_VAR(14) = SI_VAR(0);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 45;
+        MakeItemEntity(EVT_VAR(14), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1, 0);
+        EVT_VAR(14) = EVT_VAR(0);
         loop 25 {
-            GetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            N(func_802A123C_72E76C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            N(func_802A123C_72E76C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
-        RemoveItemEntity(SI_VAR(14));
+        RemoveItemEntity(EVT_VAR(14));
     }
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetBattleCamTarget(0xFFFFFF83, 1, 0);
     SetBattleCamOffsetZ(41);
     SetBattleCamZoom(248);
     MoveBattleCamOver(25);
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.400390625);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.400390625);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 25);
     AddBattleCamZoom(100);
     MoveBattleCamOver(30);
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
-    if (SI_VAR(11) > 0) {
-        N(func_802A12EC_72E81C)(SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
+    if (EVT_VAR(11) > 0) {
+        N(func_802A12EC_72E81C)(EVT_VAR(11));
     }
     sleep 30;
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     sleep 20;
     SetActorYaw(ACTOR_PLAYER, 150);
     sleep 1;
@@ -161,33 +161,33 @@ EvtSource N(script6) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(15) = SI_VAR(1);
-    GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(10) = SI_VAR(1);
-    N(func_802A1484_72E9B4)(SI_VAR(10));
+    EVT_VAR(15) = EVT_VAR(1);
+    GetMenuSelection(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(10) = EVT_VAR(1);
+    N(func_802A1484_72E9B4)(EVT_VAR(10));
     InitTargetIterator();
-    GetOwnerTarget(SI_VAR(0), SI_VAR(1));
-    if (SI_VAR(0) == ACTOR_PARTNER) {
+    GetOwnerTarget(EVT_VAR(0), EVT_VAR(1));
+    if (EVT_VAR(0) == ACTOR_PARTNER) {
         await N(script6);
         return;
     }
-    SI_VAR(10) = (const) ITEM_LIFE_SHROOM;
-    SI_VAR(1) = SI_VAR(15);
+    EVT_VAR(10) = (const) ITEM_LIFE_SHROOM;
+    EVT_VAR(1) = EVT_VAR(15);
     await N(UseItemWithEffect);
     await N(EatItem);
     N(func_802A1438_72E968)();
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 35;
-    N(func_802A1378_72E8A8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 35;
+    N(func_802A1378_72E8A8)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
     sleep 10;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
     sleep 30;
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     await N(PlayerGoHome);

src/battle/item/mushroom.c

@@ -96,54 +96,54 @@ EvtSource N(script6) = SCRIPT({
     sleep 1;
     SetActorYaw(ACTOR_PLAYER, 180);
     sleep 10;
-    SI_VAR(1) = SI_VAR(15);
+    EVT_VAR(1) = EVT_VAR(15);
     await N(UseItem);
-    SI_VAR(14) = SI_VAR(10);
+    EVT_VAR(14) = EVT_VAR(10);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     spawn {
         sleep 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     }
-    CreateVirtualEntity(SI_VAR(10), 0x80283EE8);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 30;
-    SI_VAR(2) += 5;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetVirtualEntityFlags(SI_VAR(10), 32);
+    CreateVirtualEntity(EVT_VAR(10), 0x80283EE8);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 30;
+    EVT_VAR(2) += 5;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetVirtualEntityFlags(EVT_VAR(10), 32);
     spawn {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 45;
-        MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0);
-        SI_VAR(14) = SI_VAR(0);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 45;
+        MakeItemEntity(EVT_VAR(14), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1, 0);
+        EVT_VAR(14) = EVT_VAR(0);
         loop 25 {
-            GetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            N(func_802A123C_715A8C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            N(func_802A123C_715A8C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
-        RemoveItemEntity(SI_VAR(14));
+        RemoveItemEntity(EVT_VAR(14));
     }
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetBattleCamTarget(0xFFFFFF83, 1, 0);
     SetBattleCamOffsetZ(41);
     SetBattleCamZoom(248);
     MoveBattleCamOver(25);
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.400390625);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.400390625);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 25);
     AddBattleCamZoom(100);
     MoveBattleCamOver(30);
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
-    if (SI_VAR(11) > 0) {
-        N(func_802A12EC_715B3C)(SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
+    if (EVT_VAR(11) > 0) {
+        N(func_802A12EC_715B3C)(EVT_VAR(11));
     }
     sleep 30;
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     sleep 20;
     SetActorYaw(ACTOR_PLAYER, 150);
     sleep 1;
@@ -160,52 +160,52 @@ EvtSource N(script6) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(14) = SI_VAR(1);
-    GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(10) = SI_VAR(1);
-    N(func_802A15A0_715DF0)(SI_VAR(10));
+    EVT_VAR(14) = EVT_VAR(1);
+    GetMenuSelection(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(10) = EVT_VAR(1);
+    N(func_802A15A0_715DF0)(EVT_VAR(10));
     InitTargetIterator();
-    GetOwnerTarget(SI_VAR(0), SI_VAR(1));
-    if (SI_VAR(0) == ACTOR_PARTNER) {
+    GetOwnerTarget(EVT_VAR(0), EVT_VAR(1));
+    if (EVT_VAR(0) == ACTOR_PARTNER) {
         await N(script6);
         return;
     }
-    SI_VAR(1) = SI_VAR(14);
+    EVT_VAR(1) = EVT_VAR(14);
     await N(UseItemWithEffect);
     await N(EatItem);
-    if (SI_VAR(15) == 1) {
+    if (EVT_VAR(15) == 1) {
         SetAnimation(ACTOR_PLAYER, 0, ANIM_STICK_OUT_TONGUE);
     }
-    if (SI_VAR(11) > 0) {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 0;
-        SI_VAR(1) += 35;
-        N(func_802A1378_715BC8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    if (EVT_VAR(11) > 0) {
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 0;
+        EVT_VAR(1) += 35;
+        N(func_802A1378_715BC8)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     }
-    if (SI_VAR(12) > 0) {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 20;
-        SI_VAR(1) += 25;
-        N(func_802A1438_715C88)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(12));
+    if (EVT_VAR(12) > 0) {
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 20;
+        EVT_VAR(1) += 25;
+        N(func_802A1438_715C88)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(12));
     }
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
-    if (SI_VAR(11) != 0) {
-        N(AddHP)(SI_VAR(11));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
+    if (EVT_VAR(11) != 0) {
+        N(AddHP)(EVT_VAR(11));
     }
-    if (SI_VAR(12) != 0) {
-        N(AddFP)(SI_VAR(12));
+    if (EVT_VAR(12) != 0) {
+        N(AddFP)(EVT_VAR(12));
     }
-    if (SI_VAR(15) == 0) {
+    if (EVT_VAR(15) == 0) {
         sleep 10;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
         sleep 30;
     } else {
         sleep 30;
     }
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     await N(PlayerGoHome);

src/battle/item/mystery.c

@@ -274,7 +274,7 @@ s32 N(D_802A229C_72D84C)[8] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_MYSTERY;
+    EVT_VAR(10) = (const) ITEM_MYSTERY;
     await N(UseItemWithEffect);
     spawn {
         sleep 220;
@@ -283,38 +283,38 @@ EvtSource N(main) = SCRIPT({
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_368);
     N(func_802A13E4_72C994)();
     sleep 2;
-    if (SI_VAR(0) != ITEM_PEBBLE) {
+    if (EVT_VAR(0) != ITEM_PEBBLE) {
         jump UseMystery;
         return;
     }
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 150;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 150;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetOwnerTarget(0, 0);
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 18 {
-            SI_VAR(0) += 0xFFFFFFC4;
-            SetVirtualEntityRotation(SI_VAR(10), 0, 0, SI_VAR(0));
+            EVT_VAR(0) += 0xFFFFFFC4;
+            SetVirtualEntityRotation(EVT_VAR(10), 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.6005859375);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 12);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.6005859375);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 12);
     spawn {
-        SI_VAR(0) += 60;
-        SI_VAR(1) += 0;
-        VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 16);
-        DeleteVirtualEntity(SI_VAR(10));
+        EVT_VAR(0) += 60;
+        EVT_VAR(1) += 0;
+        VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 16);
+        DeleteVirtualEntity(EVT_VAR(10));
     }
     SetTargetActor(ACTOR_SELF, 0);
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    N(func_802A188C_72CE3C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    N(func_802A188C_72CE3C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetBattleFlagBits(32, 1);
     DispatchDamagePlayerEvent(1, EVENT_HIT);
 });

src/battle/item/pebble.c

@@ -45,46 +45,46 @@ s32 N(modelCommandList)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_PEBBLE;
+    EVT_VAR(10) = (const) ITEM_PEBBLE;
     await N(UseItemWithEffect);
     UseBattleCamPreset(3);
     MoveBattleCamOver(15);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     PlaySound(SOUND_THROW);
     sleep 3;
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
-    SI_VAR(0) = 1.0;
-    MultiplyByActorScale(SI_VAR(0));
-    SetVirtualEntityScale(SI_VAR(10), SI_VAR(0), SI_VAR(0), SI_VAR(0));
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = 20;
-    SI_VAR(4) = 42;
-    SI_VAR(5) = 5;
-    MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(0) += SI_VAR(3);
-    SI_VAR(1) += SI_VAR(4);
-    SI_VAR(2) += SI_VAR(5);
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
+    EVT_VAR(0) = 1.0;
+    MultiplyByActorScale(EVT_VAR(0));
+    SetVirtualEntityScale(EVT_VAR(10), EVT_VAR(0), EVT_VAR(0), EVT_VAR(0));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = 20;
+    EVT_VAR(4) = 42;
+    EVT_VAR(5) = 5;
+    MultiplyVec3ByActorScale(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(0) += EVT_VAR(3);
+    EVT_VAR(1) += EVT_VAR(4);
+    EVT_VAR(2) += EVT_VAR(5);
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 18 {
-            SI_VAR(0) += 0xFFFFFFC4;
-            SetVirtualEntityRotation(SI_VAR(10), 0, 0, SI_VAR(0));
+            EVT_VAR(0) += 0xFFFFFFC4;
+            SetVirtualEntityRotation(EVT_VAR(10), 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.80078125);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18);
-    GetItemPower(ITEM_PEBBLE, SI_VAR(3), SI_VAR(4));
-    ApplyShrinkFromOwner(SI_VAR(3));
-    ItemDamageEnemy(SI_VAR(9), 0x18000000, 0, SI_VAR(3), 32);
-    SI_VAR(0) += 60;
-    SI_VAR(1) += 0;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 16);
-    DeleteVirtualEntity(SI_VAR(10));
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.80078125);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 18);
+    GetItemPower(ITEM_PEBBLE, EVT_VAR(3), EVT_VAR(4));
+    ApplyShrinkFromOwner(EVT_VAR(3));
+    ItemDamageEnemy(EVT_VAR(9), 0x18000000, 0, EVT_VAR(3), 32);
+    EVT_VAR(0) += 60;
+    EVT_VAR(1) += 0;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 16);
+    DeleteVirtualEntity(EVT_VAR(10));
     await N(PlayerGoHome);
 });

src/battle/item/please_come_back.c

@@ -5,7 +5,7 @@
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_DIZZY_DIAL;
+    EVT_VAR(10) = (const) ITEM_DIZZY_DIAL;
     await N(UseItemWithEffect);
     SetGoalToHome(ACTOR_PLAYER);
     SetJumpAnimations(ACTOR_PLAYER, 0, ANIM_MIDAIR_STILL, ANIM_MIDAIR, ANIM_10009);

src/battle/item/pow_block.c

@@ -48,11 +48,11 @@ ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_P_O_W_BLOCK;
+    EVT_VAR(10) = (const) ITEM_P_O_W_BLOCK;
     await N(UseItemWithEffect);
     sleep 10;
     MakeEntity(0x802EA2E0, -40, 60, 0, 0, MAKE_ENTITY_END);
-    SI_VAR(10) = SI_VAR(0);
+    EVT_VAR(10) = EVT_VAR(0);
     N(func_802A1318_718B68)();
     PlayEffect(0x7, 2, -40, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     PlayEffect(0x7, 2, -30, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0);
@@ -83,16 +83,16 @@ EvtSource N(main) = SCRIPT({
         ShakeCam(1, 0, 2, 0.5);
         ShakeCam(1, 0, 2, 0.2001953125);
     }
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 30;
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 30;
     SetActorSpeed(ACTOR_PLAYER, 4.0);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_RUNNING);
-    SetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     PlayerRunToGoal(ACTOR_PLAYER);
     sleep 5;
     SetJumpAnimations(ACTOR_PLAYER, 0, ANIM_MIDAIR_STILL, ANIM_MIDAIR, ANIM_10009);
     SetActorJumpGravity(ACTOR_PLAYER, 0.6005859375);
-    SetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_80273444(20, 0, 0);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     UseBattleCamPreset(3);
@@ -100,17 +100,17 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetItemPower(ITEM_P_O_W_BLOCK, SI_VAR(3), SI_VAR(4));
-    ApplyShrinkFromOwner(SI_VAR(3));
+    GetItemPower(ITEM_P_O_W_BLOCK, EVT_VAR(3), EVT_VAR(4));
+    ApplyShrinkFromOwner(EVT_VAR(3));
     func_80269EAC(22);
-    ItemDamageEnemy(SI_VAR(0), 0x38000400, 0, SI_VAR(3), 32);
+    ItemDamageEnemy(EVT_VAR(0), 0x38000400, 0, EVT_VAR(3), 32);
 1:
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     PlayEffect(0x7, 2, -70, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0);

src/battle/item/repel_gel.c

@@ -17,17 +17,17 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_REPEL_GEL;
+    EVT_VAR(10) = (const) ITEM_REPEL_GEL;
     await N(UseItemWithEffect);
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_375);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_30008);
     sleep 45;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    PlayEffect(0x33, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    PlayEffect(0x33, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_376);
-    GetItemPower(ITEM_REPEL_GEL, SI_VAR(0), SI_VAR(1));
+    GetItemPower(ITEM_REPEL_GEL, EVT_VAR(0), EVT_VAR(1));
     N(func_802A123C_72DDAC)();
     sleep 20;
     ShowMessageBox(17, 60);

src/battle/item/shooting_star.c

@@ -94,7 +94,7 @@ ApiStatus N(func_802A14D4_71DC44)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_SHOOTING_STAR;
+    EVT_VAR(10) = (const) ITEM_SHOOTING_STAR;
     await N(UseItemWithEffect);
     spawn {
         sleep 5;
@@ -103,27 +103,27 @@ EvtSource N(main) = SCRIPT({
     }
     N(func_802A1444_71DBB4)();
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 10 {
             PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_259);
             N(func_802A123C_71D9AC)();
-            SI_VAR(0) += 1;
+            EVT_VAR(0) += 1;
             sleep 5;
             PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_25A);
             N(func_802A123C_71D9AC)();
-            SI_VAR(0) += 1;
+            EVT_VAR(0) += 1;
             sleep 5;
         }
     }
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         sleep 50;
         loop 10 {
             PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_25C);
-            SI_VAR(0) += 1;
+            EVT_VAR(0) += 1;
             sleep 5;
             PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_25D);
-            SI_VAR(0) += 1;
+            EVT_VAR(0) += 1;
             sleep 5;
         }
     }
@@ -140,18 +140,18 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    N(func_802A1388_71DAF8)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetItemPower(ITEM_SHOOTING_STAR, SI_VAR(0), SI_VAR(1));
-    ItemDamageEnemy(SI_VAR(0), 0x38000100, 0, SI_VAR(0), 32);
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    N(func_802A1388_71DAF8)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetItemPower(ITEM_SHOOTING_STAR, EVT_VAR(0), EVT_VAR(1));
+    ItemDamageEnemy(EVT_VAR(0), 0x38000100, 0, EVT_VAR(0), 32);
 1:
     sleep 10;
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     sleep 20;

src/battle/item/sleepy_sheep.c

@@ -336,7 +336,7 @@ s32 N(modelCommandList)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_SLEEPY_SHEEP;
+    EVT_VAR(10) = (const) ITEM_SLEEPY_SHEEP;
     await N(UseItemWithEffect);
     UseBattleCamPreset(19);
     SetBattleCamTarget(0xFFFFFFBD, 0xFFFFFFF1, 0xFFFFFFFB);
@@ -366,9 +366,9 @@ EvtSource N(main) = SCRIPT({
     }
     sleep 20;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 32;
-    ShowEmote(0, EMOTE_QUESTION, -45, 20, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 32;
+    ShowEmote(0, EMOTE_QUESTION, -45, 20, 2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
     sleep 30;
     SetActorYaw(ACTOR_PLAYER, 30);
     sleep 1;
@@ -395,8 +395,8 @@ EvtSource N(main) = SCRIPT({
     sleep 8;
     SetJumpAnimations(ACTOR_PLAYER, 0, ANIM_1002B, ANIM_1002B, ANIM_MIDAIR);
     SetActorJumpGravity(ACTOR_PLAYER, 1.80078125);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_80273444(15, 0, 0);
     spawn {
         sleep 5;
@@ -413,21 +413,21 @@ EvtSource N(main) = SCRIPT({
         SetActorYaw(ACTOR_PLAYER, 0);
     }
     sleep 40;
-    CreateVirtualEntity(SI_VAR(10), N(modelCommandList));
-    SI_VAR(7) = 0xFFFFFF38;
-    SI_VAR(8) = 0;
-    SI_VAR(9) = 0;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(7), SI_VAR(8), SI_VAR(9));
-    SetVirtualEntityScale(SI_VAR(10), 0.7109375, 0.7109375, 0.7109375);
-    SetVirtualEntityMoveSpeed(SI_VAR(10), 7.0);
-    SetVirtualEntityJumpGravity(SI_VAR(10), 1.400390625);
+    CreateVirtualEntity(EVT_VAR(10), N(modelCommandList));
+    EVT_VAR(7) = 0xFFFFFF38;
+    EVT_VAR(8) = 0;
+    EVT_VAR(9) = 0;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(7), EVT_VAR(8), EVT_VAR(9));
+    SetVirtualEntityScale(EVT_VAR(10), 0.7109375, 0.7109375, 0.7109375);
+    SetVirtualEntityMoveSpeed(EVT_VAR(10), 7.0);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 1.400390625);
     SetOwnerTarget(0, 0);
     SetGoalToTarget(ACTOR_PLAYER);
-    GetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 60;
-    VirtualEntityMoveTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0);
-    GetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0);
+    GetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 60;
+    VirtualEntityMoveTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0);
+    GetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0);
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_HIT_BLOCK);
     spawn {
         SetAnimation(ACTOR_PLAYER, 0, ANIM_SHOCK_STILL);
@@ -439,26 +439,26 @@ EvtSource N(main) = SCRIPT({
         sleep 1;
         SetActorScale(ACTOR_PLAYER, 1.0, 1.0, 1.0);
     }
-    PlayEffect(0x6, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    PlayEffect(0x6, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
     sleep 2;
-    SetVirtualEntityJumpGravity(SI_VAR(10), 1.400390625);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 60;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0);
-    PlayEffect(0x6, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 1.400390625);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 60;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0);
+    PlayEffect(0x6, 2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-    SI_VAR(0) += 20;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0);
-    PlayEffect(0x6, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    SI_VAR(0) += 10;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0);
-    PlayEffect(0x6, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    EVT_VAR(0) += 20;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0);
+    PlayEffect(0x6, 2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    EVT_VAR(0) += 10;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0);
+    PlayEffect(0x6, 2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
     sleep 5;
     spawn {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 270;
-        VirtualEntityMoveTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0);
-        DeleteVirtualEntity(SI_VAR(10));
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 270;
+        VirtualEntityMoveTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0);
+        DeleteVirtualEntity(EVT_VAR(10));
     }
     sleep 30;
     UseBattleCamPreset(3);
@@ -466,17 +466,17 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetItemPower(ITEM_SLEEPY_SHEEP, SI_VAR(0), SI_VAR(1));
-    MakeStatusField(SI_VAR(0), 4096, 100, SI_VAR(0));
-    func_80252B3C(SI_VAR(0), 0x50000000, SI_VAR(0), 0, 32);
+    GetItemPower(ITEM_SLEEPY_SHEEP, EVT_VAR(0), EVT_VAR(1));
+    MakeStatusField(EVT_VAR(0), 4096, 100, EVT_VAR(0));
+    func_80252B3C(EVT_VAR(0), 0x50000000, EVT_VAR(0), 0, 32);
 1:
     sleep 5;
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     sleep 30;

src/battle/item/snowman_doll.c

@@ -36,18 +36,18 @@ ApiStatus N(func_802A13B8_71C1E8)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_SNOWMAN_DOLL;
+    EVT_VAR(10) = (const) ITEM_SNOWMAN_DOLL;
     await N(UseItemWithEffect);
     N(FadeBackgroundToBlack)();
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_363);
     spawn {
         loop 45 {
-            RandInt(300, SI_VAR(0));
-            SI_VAR(0) -= 150;
-            SI_VAR(1) = 170;
-            RandInt(50, SI_VAR(2));
-            SI_VAR(2) -= 25;
-            PlayEffect(0xE, SI_VAR(0), SI_VAR(1), SI_VAR(2), 60, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+            RandInt(300, EVT_VAR(0));
+            EVT_VAR(0) -= 150;
+            EVT_VAR(1) = 170;
+            RandInt(50, EVT_VAR(2));
+            EVT_VAR(2) -= 25;
+            PlayEffect(0xE, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 60, 0, 0, 0, 0, 0, 0, 0, 0, 0);
             sleep 2;
         }
     }
@@ -83,18 +83,18 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    N(func_802A123C_71C06C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetItemPower(ITEM_SNOWMAN_DOLL, SI_VAR(0), SI_VAR(1));
-    ItemDamageEnemy(SI_VAR(0), 0x38000008, 0, SI_VAR(0), 32);
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    N(func_802A123C_71C06C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetItemPower(ITEM_SNOWMAN_DOLL, EVT_VAR(0), EVT_VAR(1));
+    ItemDamageEnemy(EVT_VAR(0), 0x38000008, 0, EVT_VAR(0), 32);
     sleep 5;
 1:
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);

src/battle/item/stone_cap.c

@@ -48,15 +48,15 @@ ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_STONE_CAP;
+    EVT_VAR(10) = (const) ITEM_STONE_CAP;
     await N(UseItemWithEffect);
     PlaySound(SOUND_UNKNOWN_361);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_30009);
     sleep 30;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_CROUCH);
-    GetItemPower(ITEM_STONE_CAP, SI_VAR(0), SI_VAR(1));
+    GetItemPower(ITEM_STONE_CAP, EVT_VAR(0), EVT_VAR(1));
     PlaySound(SOUND_UNKNOWN_362);
     N(func_802A123C_7217DC)();
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     sleep 20;
 });

src/battle/item/stop_watch.c

@@ -23,7 +23,7 @@ ApiStatus N(func_802A12D4_7270A4)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_STOP_WATCH;
+    EVT_VAR(10) = (const) ITEM_STOP_WATCH;
     await N(UseItemWithEffect);
     spawn {
         sleep 5;
@@ -39,17 +39,17 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
-    GetItemPower(ITEM_STOP_WATCH, SI_VAR(0), SI_VAR(1));
-    MakeStatusField(SI_VAR(0), 0x200000, 100, SI_VAR(0));
-    func_80252B3C(SI_VAR(0), 0x50000000, SI_VAR(0), 0, 32);
+    GetItemPower(ITEM_STOP_WATCH, EVT_VAR(0), EVT_VAR(1));
+    MakeStatusField(EVT_VAR(0), 0x200000, 100, EVT_VAR(0));
+    func_80252B3C(EVT_VAR(0), 0x50000000, EVT_VAR(0), 0, 32);
 1:
     sleep 5;
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     N(func_802A12D4_7270A4)();

src/battle/item/strange_cake.c

@@ -322,32 +322,32 @@ s32 N(D_802A2858_732B58)[] = {
 };
 
 EvtSource N(script6) = SCRIPT({
-    GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    if (SI_VAR(1) == 211) {
-        SI_VAR(10) = (const) ITEM_KOOKY_COOKIE;
-        SI_VAR(1) = 0;
+    GetMenuSelection(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    if (EVT_VAR(1) == 211) {
+        EVT_VAR(10) = (const) ITEM_KOOKY_COOKIE;
+        EVT_VAR(1) = 0;
         await N(UseItemWithEffect);
         await N(EatItem);
         N(func_802A1A8C_731D8C)();
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 20;
-        SI_VAR(1) += 25;
-        N(func_802A18D8_731BD8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 25;
-        func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
-        N(AddFP)(SI_VAR(3));
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 20;
+        EVT_VAR(1) += 25;
+        N(func_802A18D8_731BD8)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 25;
+        func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
+        N(AddFP)(EVT_VAR(3));
         sleep 10;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
         sleep 30;
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
         sleep 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_GOT_ITEM);
     } else {
-        SI_VAR(10) = (const) ITEM_STRANGE_CAKE;
-        SI_VAR(1) = 0;
+        EVT_VAR(10) = (const) ITEM_STRANGE_CAKE;
+        EVT_VAR(1) = 0;
         await N(UseItemWithEffect);
         await N(EatItem);
         SetAnimation(ACTOR_PLAYER, 0, ANIM_GOT_ITEM);
@@ -360,7 +360,7 @@ EvtSource N(script6) = SCRIPT({
     PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_368);
     N(func_802A13E4_7316E4)();
     sleep 2;
-    match SI_VAR(0) {
+    match EVT_VAR(0) {
         == 0 {
             await N(script7);
         }
@@ -376,9 +376,9 @@ EvtSource N(script6) = SCRIPT({
 
 EvtSource N(script7) = SCRIPT({
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    PlayEffect(0x57, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    PlayEffect(0x57, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
     N(func_802A1AD8_731DD8)();
     sleep 20;
     ShowMessageBox(16, 60);
@@ -387,9 +387,9 @@ EvtSource N(script7) = SCRIPT({
 
 EvtSource N(script8) = SCRIPT({
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    PlayEffect(0x33, 6, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    PlayEffect(0x33, 6, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0);
     N(func_802A1B14_731E14)();
     sleep 20;
     ShowMessageBox(17, 60);
@@ -399,7 +399,7 @@ EvtSource N(script8) = SCRIPT({
 EvtSource N(script9) = SCRIPT({
     SetAnimation(ACTOR_PLAYER, 0, ANIM_30004);
     SetGoalToTarget(ACTOR_PLAYER);
-    GetGoalPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     spawn DoSleepHit;
     N(func_802A1B68_731E68)();
     sleep 20;

src/battle/item/super_soda.c

@@ -96,54 +96,54 @@ EvtSource N(script6) = SCRIPT({
     sleep 1;
     SetActorYaw(ACTOR_PLAYER, 180);
     sleep 10;
-    SI_VAR(1) = SI_VAR(15);
+    EVT_VAR(1) = EVT_VAR(15);
     await N(UseItem);
-    SI_VAR(14) = SI_VAR(10);
+    EVT_VAR(14) = EVT_VAR(10);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THROW);
     spawn {
         sleep 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     }
-    CreateVirtualEntity(SI_VAR(10), 0x80283EE8);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 30;
-    SI_VAR(2) += 5;
-    SetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetVirtualEntityFlags(SI_VAR(10), 32);
+    CreateVirtualEntity(EVT_VAR(10), 0x80283EE8);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 30;
+    EVT_VAR(2) += 5;
+    SetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetVirtualEntityFlags(EVT_VAR(10), 32);
     spawn {
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 45;
-        MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0);
-        SI_VAR(14) = SI_VAR(0);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 45;
+        MakeItemEntity(EVT_VAR(14), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1, 0);
+        EVT_VAR(14) = EVT_VAR(0);
         loop 25 {
-            GetVirtualEntityPosition(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            N(func_802A123C_724F1C)(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetVirtualEntityPosition(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            N(func_802A123C_724F1C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
-        RemoveItemEntity(SI_VAR(14));
+        RemoveItemEntity(EVT_VAR(14));
     }
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetBattleCamTarget(0xFFFFFF83, 1, 0);
     SetBattleCamOffsetZ(41);
     SetBattleCamZoom(248);
     MoveBattleCamOver(25);
-    SetVirtualEntityJumpGravity(SI_VAR(10), 0.400390625);
-    SI_VAR(2) += 5;
-    VirtualEntityJumpTo(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25);
+    SetVirtualEntityJumpGravity(EVT_VAR(10), 0.400390625);
+    EVT_VAR(2) += 5;
+    VirtualEntityJumpTo(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 25);
     AddBattleCamZoom(100);
     MoveBattleCamOver(30);
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
-    if (SI_VAR(11) > 0) {
-        N(func_802A12EC_724FCC)(SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
+    if (EVT_VAR(11) > 0) {
+        N(func_802A12EC_724FCC)(EVT_VAR(11));
     }
     sleep 30;
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11));
     sleep 20;
     SetActorYaw(ACTOR_PLAYER, 150);
     sleep 1;
@@ -160,37 +160,37 @@ EvtSource N(script6) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_SUPER_SODA;
+    EVT_VAR(10) = (const) ITEM_SUPER_SODA;
     await N(UseItemWithEffect);
     InitTargetIterator();
-    GetOwnerTarget(SI_VAR(0), SI_VAR(1));
-    if (SI_VAR(0) == ACTOR_PLAYER) {
+    GetOwnerTarget(EVT_VAR(0), EVT_VAR(1));
+    if (EVT_VAR(0) == ACTOR_PLAYER) {
         PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_2095);
         SetAnimation(ACTOR_PLAYER, 0, ANIM_DRINK);
         sleep 45;
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 0;
-        SI_VAR(1) += 35;
-        N(func_802A1418_7250F8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 0;
+        EVT_VAR(1) += 35;
+        N(func_802A1418_7250F8)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5);
         N(AddFP)(5);
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 25;
-        func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 20;
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 25;
+        func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
         sleep 30;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5);
         InitTargetIterator();
-        GetOwnerTarget(SI_VAR(0), SI_VAR(1));
+        GetOwnerTarget(EVT_VAR(0), EVT_VAR(1));
         N(func_802A1378_725058)(ACTOR_PLAYER);
         sleep 20;
     } else {
-        SI_VAR(11) = 0;
-        SI_VAR(12) = 0;
-        SI_VAR(15) = 0;
+        EVT_VAR(11) = 0;
+        EVT_VAR(12) = 0;
+        EVT_VAR(15) = 0;
         await N(script6);
     }
     await N(PlayerGoHome);

src/battle/item/tasty_tonic.c

@@ -30,37 +30,37 @@ ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_TASTY_TONIC;
+    EVT_VAR(10) = (const) ITEM_TASTY_TONIC;
     await N(UseItemWithEffect);
     InitTargetIterator();
-    GetOwnerTarget(SI_VAR(0), SI_VAR(1));
-    if (SI_VAR(0) == 0) {
+    GetOwnerTarget(EVT_VAR(0), EVT_VAR(1));
+    if (EVT_VAR(0) == 0) {
         await N(DrinkItem);
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 25;
-        SI_VAR(2) += 5;
-        func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 20;
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 25;
+        EVT_VAR(2) += 5;
+        func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 20;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
         sleep 30;
         SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-        GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(2) += 5;
-        func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+        GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(2) += 5;
+        func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
         N(func_802A123C_72223C)(ACTOR_PLAYER);
         sleep 20;
     } else {
-        GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 25;
-        SI_VAR(2) += 5;
-        func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
-        GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 20;
+        GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 25;
+        EVT_VAR(2) += 5;
+        func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5);
+        GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 20;
         sleep 30;
-        GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(2) += 5;
-        func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
+        GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(2) += 5;
+        func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5);
         N(func_802A123C_72223C)(ACTOR_PARTNER);
         sleep 20;
     }

src/battle/item/thunder_bolt.c

@@ -52,7 +52,7 @@ ApiStatus N(func_802A1420_722F60)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_THUNDER_BOLT;
+    EVT_VAR(10) = (const) ITEM_THUNDER_BOLT;
     await N(UseItemWithEffect);
     spawn {
         sleep 5;
@@ -64,16 +64,16 @@ EvtSource N(main) = SCRIPT({
     sleep 10;
     InitTargetIterator();
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
     N(func_802A123C_722D7C)();
     sleep 5;
     StartRumble(10);
     ShakeCam(1, 0, 5, 1.0);
-    GetItemPower(ITEM_THUNDER_RAGE, SI_VAR(0), SI_VAR(1));
-    ItemDamageEnemy(SI_VAR(0), 0x38000020, 0, SI_VAR(0), 32);
+    GetItemPower(ITEM_THUNDER_RAGE, EVT_VAR(0), EVT_VAR(1));
+    ItemDamageEnemy(EVT_VAR(0), 0x38000020, 0, EVT_VAR(0), 32);
 1:
     sleep 5;
     UseBattleCamPreset(3);

src/battle/item/thunder_rage.c

@@ -52,7 +52,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_THUNDER_RAGE;
+    EVT_VAR(10) = (const) ITEM_THUNDER_RAGE;
     await N(UseItemWithEffect);
     parallel {
         sleep 5;
@@ -65,8 +65,8 @@ EvtSource N(main) = SCRIPT({
     InitTargetIterator();
 0:
     SetGoalToTarget(ACTOR_SELF);
-    ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0);
-    if (SI_VAR(0) == 6) {
+    ItemCheckHit(EVT_VAR(0), 0x10000000, 0, EVT_VAR(0), 0);
+    if (EVT_VAR(0) == 6) {
         goto 1;
     }
     N(func_802A1354_71B4F4)();
@@ -74,12 +74,12 @@ EvtSource N(main) = SCRIPT({
     StartRumble(10);
     ShakeCam(1, 0, 5, 1.0);
     SetGoalToTarget(ACTOR_SELF);
-    GetItemPower(ITEM_THUNDER_RAGE, SI_VAR(0), SI_VAR(1));
-    ItemDamageEnemy(SI_VAR(0), 0x38000020, 0, SI_VAR(0), 32);
+    GetItemPower(ITEM_THUNDER_RAGE, EVT_VAR(0), EVT_VAR(1));
+    ItemDamageEnemy(EVT_VAR(0), 0x38000020, 0, EVT_VAR(0), 32);
 1:
     sleep 5;
-    ChooseNextTarget(0, SI_VAR(0));
-    if (SI_VAR(0) != -1) {
+    ChooseNextTarget(0, EVT_VAR(0));
+    if (EVT_VAR(0) != -1) {
         goto 0;
     }
     UseBattleCamPreset(3);

src/battle/item/ultra_shroom.c

@@ -27,26 +27,26 @@ ApiStatus N(func_802A12FC_723A7C)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_SUPER_SHROOM;
+    EVT_VAR(10) = (const) ITEM_SUPER_SHROOM;
     await N(UseItemWithEffect);
     AddBattleCamZoom(50);
     MoveBattleCamOver(20);
     await N(EatItem);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 35;
-    N(func_802A123C_7239BC)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    SI_VAR(2) += 5;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 35;
+    N(func_802A123C_7239BC)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    EVT_VAR(2) += 5;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
     N(func_802A12FC_723A7C)();
     sleep 10;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
     sleep 30;
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(2) += 5;
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(2) += 5;
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     await N(PlayerGoHome);

src/battle/item/unknown_item.c

@@ -27,24 +27,24 @@ ApiStatus N(func_802A12FC_72453C)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_ULTRA_SHROOM;
+    EVT_VAR(10) = (const) ITEM_ULTRA_SHROOM;
     await N(UseItemWithEffect);
     await N(EatItem);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 0;
-    SI_VAR(1) += 35;
-    N(func_802A123C_72447C)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 20);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 25;
-    SI_VAR(2) += 5;
-    func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 20);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 0;
+    EVT_VAR(1) += 35;
+    N(func_802A123C_72447C)(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 25;
+    EVT_VAR(2) += 5;
+    func_802D7520(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20);
     N(func_802A12FC_72453C)();
     sleep 10;
     SetAnimation(ACTOR_PLAYER, 0, ANIM_THUMBS_UP);
     sleep 30;
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(2) += 5;
-    func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 20);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(2) += 5;
+    func_802D75D8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
     sleep 20;
     await N(PlayerGoHome);

src/battle/item/volt_shroom.c

@@ -14,19 +14,19 @@ ApiStatus N(func_802A123C_71AA2C)(Evt* script, s32 isInitialCall) {
 #include "UseItem.inc.c"
 
 EvtSource N(main) = SCRIPT({
-    SI_VAR(10) = (const) ITEM_VOLT_SHROOM;
+    EVT_VAR(10) = (const) ITEM_VOLT_SHROOM;
     await N(UseItemWithEffect);
     await N(EatItem);
     SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);
-    GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = 20;
-    MultiplyByActorScale(SI_VAR(3));
-    SI_VAR(1) += SI_VAR(3);
-    SI_VAR(3) = 1.0;
-    MultiplyByActorScale(SI_VAR(3));
-    PlayEffect(0x57, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3), 30, 0, 0, 0, 0, 0, 0, 0);
+    GetActorPos(ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = 20;
+    MultiplyByActorScale(EVT_VAR(3));
+    EVT_VAR(1) += EVT_VAR(3);
+    EVT_VAR(3) = 1.0;
+    MultiplyByActorScale(EVT_VAR(3));
+    PlayEffect(0x57, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3), 30, 0, 0, 0, 0, 0, 0, 0);
     PlaySound(SOUND_UNKNOWN_379);
-    GetItemPower(ITEM_VOLT_SHROOM, SI_VAR(0), SI_VAR(1));
+    GetItemPower(ITEM_VOLT_SHROOM, EVT_VAR(0), EVT_VAR(1));
     N(func_802A123C_71AA2C)();
     sleep 20;
     ShowMessageBox(16, 60);

src/battle/partner/goombario.c

@@ -331,64 +331,64 @@ EvtSource N(idle_80239350) = SCRIPT({
 EvtSource N(handleEvent_80239360) = SCRIPT({
     UseIdleAnimation(ACTOR_PARTNER, FALSE);
     CloseActionCommandInfo();
-    GetLastEvent(ACTOR_PARTNER, SI_VAR(0));
-    match SI_VAR(0) {
+    GetLastEvent(ACTOR_PARTNER, EVT_VAR(0));
+    match EVT_VAR(0) {
         EVENT_HIT_COMBO, EVENT_HIT {
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
-            SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x802977BC;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x80296014;
         }
         23, EVENT_IMMUNE {
             PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_208C);
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x80297814;
         }
         == EVENT_SPIKE_CONTACT {
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
-            SI_VAR(2) = 12;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(2) = 12;
             await 0x80294FE4;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x80296014;
         }
         == EVENT_BURN_CONTACT {
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_burn_pain;
-            SI_VAR(2) = 12;
-            SI_VAR(3) = (const) NPC_ANIM_battle_goombario_default_burn_dead;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_burn_pain;
+            EVT_VAR(2) = 12;
+            EVT_VAR(3) = (const) NPC_ANIM_battle_goombario_default_burn_dead;
             await 0x80294C68;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x80296014;
         }
         == EVENT_BURN_HIT {
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_burn_pain;
-            SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_burn_dead;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_burn_pain;
+            EVT_VAR(2) = (const) NPC_ANIM_battle_goombario_default_burn_dead;
             await 0x8029621C;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x80296014;
         }
         == EVENT_SHOCK_HIT {
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
-            SI_VAR(2) = 12;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(2) = 12;
             await 0x80295744;
         }
         == 51 {
             N(StopGlowing)();
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain;
             await 0x80296014;
         }
         == 52 {
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_idle;
-            SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_run;
-            SI_VAR(3) = 0;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_idle;
+            EVT_VAR(2) = (const) NPC_ANIM_battle_goombario_default_run;
+            EVT_VAR(3) = 0;
             await 0x80295EC4;
         }
         24, EVENT_BLOCK {
             PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_208C);
-            SI_VAR(0) = (const) 1;
-            SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_block;
+            EVT_VAR(0) = (const) 1;
+            EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_block;
             await 0x80297814;
             sleep 10;
         }
@@ -399,8 +399,8 @@ EvtSource N(handleEvent_80239360) = SCRIPT({
 });
 
 EvtSource N(takeTurn_802396D8) = SCRIPT({
-    GetBattlePhase(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattlePhase(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1 {
             await N(8023993C);
         }
@@ -420,18 +420,18 @@ EvtSource N(takeTurn_802396D8) = SCRIPT({
 });
 
 EvtSource N(80239784) = SCRIPT({
-    SI_VAR(0) = (const) 1;
-    SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_celebrate;
-    SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_celebrate_still;
-    SI_VAR(3) = (const) NPC_ANIM_battle_goombario_default_idle;
+    EVT_VAR(0) = (const) 1;
+    EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_celebrate;
+    EVT_VAR(2) = (const) NPC_ANIM_battle_goombario_default_celebrate_still;
+    EVT_VAR(3) = (const) NPC_ANIM_battle_goombario_default_idle;
     await 0x80294720;
 });
 
 EvtSource N(802397E0) = SCRIPT({
-    GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetMenuSelection(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_802694A4(1);
     SetBattleFlagBits(16384, 0);
-    match SI_VAR(0) {
+    match EVT_VAR(0) {
         == 8 {
             LoadStarPowerScript();
             await 0xFE363C80;
@@ -443,7 +443,7 @@ EvtSource N(802397E0) = SCRIPT({
             return;
         }
     }
-    match SI_VAR(2) {
+    match EVT_VAR(2) {
         == 131 {
             await N(8023A754);
         }
@@ -470,8 +470,8 @@ EvtSource N(8023993C) = SCRIPT({
 });
 
 EvtSource N(8023994C) = SCRIPT({
-    SI_VAR(0) = (const) 1;
-    SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_run;
+    EVT_VAR(0) = (const) 1;
+    EVT_VAR(1) = (const) NPC_ANIM_battle_goombario_default_run;
     await 0x80294AFC;
 });
 
@@ -487,10 +487,10 @@ EvtSource N(80239988) = SCRIPT({
 });
 
 EvtSource N(nextTurn_80239A3C) = SCRIPT({
-    GetBattlePhase(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattlePhase(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 10 {
-            if (SI_SAVE_FLAG(1817) == 0) {
+            if (EVT_SAVE_FLAG(1817) == 0) {
                 UseIdleAnimation(ACTOR_PARTNER, 0);
                 UseBattleCamPreset(14);
                 BattleCamTargetActor(ACTOR_SELF);
@@ -521,7 +521,7 @@ EvtSource N(nextTurn_80239A3C) = SCRIPT({
                 sleep 1;
                 SetActorYaw(ACTOR_PLAYER, 0);
                 sleep 5;
-                SI_SAVE_FLAG(1817) = 1;
+                EVT_SAVE_FLAG(1817) = 1;
                 UseIdleAnimation(ACTOR_PARTNER, 1);
             }
         }
@@ -535,22 +535,22 @@ EvtSource N(80239CA8) = SCRIPT({
     spawn {
         sleep 4;
         SetActorRotationOffset(-127, 0, 12, 0);
-        SI_VAR(0) = 180;
+        EVT_VAR(0) = 180;
         loop 3 {
-            SI_VAR(0) += 60;
-            SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+            EVT_VAR(0) += 60;
+            SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
             sleep 1;
         }
         SetActorRotation(ACTOR_SELF, 0, 0, 0);
         SetActorRotationOffset(-127, 0, 0, 0);
     }
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 30;
-    SI_VAR(1) = 0;
-    SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 30;
+    EVT_VAR(1) = 0;
+    SetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetActorJumpGravity(ACTOR_PARTNER, 1.2);
     N(func_80238000_6F10E0)();
-    JumpToGoal(ACTOR_PARTNER, SI_VAR(0), FALSE, TRUE, FALSE);
+    JumpToGoal(ACTOR_PARTNER, EVT_VAR(0), FALSE, TRUE, FALSE);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge);
     SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0);
     sleep 1;
@@ -582,37 +582,37 @@ EvtSource N(8023A06C) = SCRIPT({
     UseBattleCamPreset(3);
     SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle);
     SetGoalToHome(ACTOR_PARTNER);
-    GetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 60;
-    SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 60;
+    SetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetActorJumpGravity(ACTOR_PARTNER, 1.4);
     N(func_80238000_6F10E0)();
     spawn {
         sleep 4;
         SetActorRotationOffset(-127, 0, 12, 0);
-        SI_VAR(0) -= 4;
-        SI_VAR(1) = SI_VAR(0);
-        SI_VAR(1) /= 3;
-        if (SI_VAR(1) < 1) {
-            SI_VAR(1) = 1;
+        EVT_VAR(0) -= 4;
+        EVT_VAR(1) = EVT_VAR(0);
+        EVT_VAR(1) /= 3;
+        if (EVT_VAR(1) < 1) {
+            EVT_VAR(1) = 1;
         }
-        SI_VAR(2) = SI_VAR(1);
-        SI_VAR(2) %= 2;
-        if (SI_VAR(2) == 0) {
-            SI_VAR(1) -= 1;
+        EVT_VAR(2) = EVT_VAR(1);
+        EVT_VAR(2) %= 2;
+        if (EVT_VAR(2) == 0) {
+            EVT_VAR(1) -= 1;
         }
-        SI_VAR(0) = 180;
-        loop SI_VAR(1) {
+        EVT_VAR(0) = 180;
+        loop EVT_VAR(1) {
             loop 3 {
-                SI_VAR(0) += 60;
-                SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+                EVT_VAR(0) += 60;
+                SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
                 sleep 1;
             }
         }
         SetActorRotation(ACTOR_SELF, 0, 0, 0);
         SetActorRotationOffset(-127, 0, 0, 0);
     }
-    JumpToGoal(ACTOR_PARTNER, SI_VAR(0), FALSE, TRUE, FALSE);
+    JumpToGoal(ACTOR_PARTNER, EVT_VAR(0), FALSE, TRUE, FALSE);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge);
     SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0);
     sleep 1;
@@ -643,16 +643,16 @@ EvtSource N(8023A06C) = SCRIPT({
 
 EvtSource N(8023A52C) = SCRIPT({
     SetGoalToFirstTarget(-127);
-    GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 40;
+    GetGoalPos(ACTOR_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 40;
     InitTargetIterator();
     SetGoalToTarget(ACTOR_PARTNER);
-    GetGoalPos(ACTOR_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(3) -= (int) 70.0;
-    if (SI_VAR(0) < SI_VAR(3)) {
-        SI_VAR(3) = SI_VAR(0);
+    GetGoalPos(ACTOR_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(3) -= (int) 70.0;
+    if (EVT_VAR(0) < EVT_VAR(3)) {
+        EVT_VAR(3) = EVT_VAR(0);
     }
-    SetGoalPos(ACTOR_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    SetGoalPos(ACTOR_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
     UseBattleCamPreset(47);
     SetActorSpeed(ACTOR_PARTNER, 5.0);
     SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run);
@@ -662,18 +662,18 @@ EvtSource N(8023A52C) = SCRIPT({
 
 EvtSource N(8023A66C) = SCRIPT({
     SetGoalToTarget(ACTOR_PARTNER);
-    GetGoalPos(ACTOR_PARTNER, SI_VAR(11), SI_VAR(7), SI_VAR(13));
-    GetActorPos(ACTOR_PARTNER, SI_VAR(7), SI_VAR(13), SI_VAR(14));
-    if (SI_VAR(11) > SI_VAR(7)) {
-        SI_VAR(11) -= SI_VAR(7);
+    GetGoalPos(ACTOR_PARTNER, EVT_VAR(11), EVT_VAR(7), EVT_VAR(13));
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(7), EVT_VAR(13), EVT_VAR(14));
+    if (EVT_VAR(11) > EVT_VAR(7)) {
+        EVT_VAR(11) -= EVT_VAR(7);
     } else {
-        SI_VAR(7) -= SI_VAR(11);
-        SI_VAR(11) = SI_VAR(7);
+        EVT_VAR(7) -= EVT_VAR(11);
+        EVT_VAR(11) = EVT_VAR(7);
     }
-    SI_VAR(11) -= 20;
-    SI_VAR(11) /= 10.5888671875;
-    SI_VAR(11) += (float) 15;
-    SI_VAR(10) = SI_VAR(11);
+    EVT_VAR(11) -= 20;
+    EVT_VAR(11) /= 10.5888671875;
+    EVT_VAR(11) += (float) 15;
+    EVT_VAR(10) = EVT_VAR(11);
 });
 
 EvtSource N(8023A754) = SCRIPT({
@@ -687,16 +687,16 @@ EvtSource N(8023A754) = SCRIPT({
     SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0);
     sleep 1;
     UseBattleCamPreset(52);
-    func_802A9120_421B10(SI_VAR(10), 3);
+    func_802A9120_421B10(EVT_VAR(10), 3);
     UseBattleCamPreset(52);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk);
     SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0);
     SetGoalToTarget(ACTOR_PARTNER);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_200D);
-    func_8023817C_6F125C(SI_VAR(10), 0);
-    PartnerTestEnemy(SI_VAR(0), 128, 20, 0, 1, 16);
-    if (SI_VAR(0) == 6) {
+    func_8023817C_6F125C(EVT_VAR(10), 0);
+    PartnerTestEnemy(EVT_VAR(0), 128, 20, 0, 1, 16);
+    if (EVT_VAR(0) == 6) {
         SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
         N(func_80238A20_6F1B00)();
         spawn {
@@ -715,21 +715,21 @@ EvtSource N(8023A754) = SCRIPT({
         SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0);
     }
     sleep 1;
-    GetActionCommandResult(SI_VAR(0));
-    match SI_VAR(0) {
+    GetActionCommandResult(EVT_VAR(0));
+    match EVT_VAR(0) {
         > 0 {
             N(IsGlowing)();
-            SI_VAR(0) += 1;
-            PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 80);
+            EVT_VAR(0) += 1;
+            PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 80);
         }
         else {
             N(StopGlowingAndGet)();
-            SI_VAR(0) += 1;
-            PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 48);
+            EVT_VAR(0) += 1;
+            PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 48);
         }
     }
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    match SI_VAR(0) {
+    match EVT_VAR(0) {
         0, 2 {
             await N(80239CA8);
             return;
@@ -742,26 +742,26 @@ EvtSource N(8023A754) = SCRIPT({
         SetGoalToTarget(ACTOR_PARTNER);
         UseBattleCamPreset(53);
     }
-    func_80269524(SI_VAR(15));
+    func_80269524(EVT_VAR(15));
     CloseActionCommandInfo();
     LoadActionCommand(1);
     func_802A9000_430020();
     func_802694A4(0);
     func_802A9120_421B10(24, 3);
-    SI_VAR(10) = 24;
+    EVT_VAR(10) = 24;
     spawn {
         sleep 4;
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 6 {
-            SI_VAR(0) += -30;
-            SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+            EVT_VAR(0) += -30;
+            SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
     SetGoalToTarget(ACTOR_PARTNER);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, 0x281);
-    func_8023817C_6F125C(SI_VAR(10), 3);
+    func_8023817C_6F125C(EVT_VAR(10), 3);
     parallel {
         SetActorScale(ACTOR_PARTNER, 1.1, 0.8, 1.0);
         sleep 1;
@@ -771,10 +771,10 @@ EvtSource N(8023A754) = SCRIPT({
     }
     sleep 1;
     N(StopGlowingAndGet)();
-    SI_VAR(0) += 1;
-    PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 32);
+    EVT_VAR(0) += 1;
+    PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 32);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    func_80269550(SI_VAR(15));
+    func_80269550(EVT_VAR(15));
     await N(8023A06C);
 });
 
@@ -789,16 +789,16 @@ EvtSource N(8023ADC4) = SCRIPT({
     SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0);
     sleep 1;
     UseBattleCamPreset(52);
-    func_802A9120_421B10(SI_VAR(10), 3);
+    func_802A9120_421B10(EVT_VAR(10), 3);
     UseBattleCamPreset(52);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk);
     SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0);
     SetGoalToTarget(ACTOR_PARTNER);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_200D);
-    func_8023817C_6F125C(SI_VAR(10), 0);
-    PartnerTestEnemy(SI_VAR(0), 128, 20, 0, 1, 16);
-    if (SI_VAR(0) == 6) {
+    func_8023817C_6F125C(EVT_VAR(10), 0);
+    PartnerTestEnemy(EVT_VAR(0), 128, 20, 0, 1, 16);
+    if (EVT_VAR(0) == 6) {
         SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
         N(func_80238A20_6F1B00)();
         spawn {
@@ -817,21 +817,21 @@ EvtSource N(8023ADC4) = SCRIPT({
         SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0);
     }
     sleep 1;
-    GetActionCommandResult(SI_VAR(0));
-    match SI_VAR(0) {
+    GetActionCommandResult(EVT_VAR(0));
+    match EVT_VAR(0) {
         > 0 {
             N(IsGlowing)();
-            SI_VAR(0) += 2;
-            PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 80);
+            EVT_VAR(0) += 2;
+            PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 80);
         }
         else {
             N(StopGlowingAndGet)();
-            SI_VAR(0) += 2;
-            PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 48);
+            EVT_VAR(0) += 2;
+            PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 48);
         }
     }
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    match SI_VAR(0) {
+    match EVT_VAR(0) {
         0, 2 {
             await N(80239CA8);
             return;
@@ -844,19 +844,19 @@ EvtSource N(8023ADC4) = SCRIPT({
         SetGoalToTarget(ACTOR_PARTNER);
         UseBattleCamPreset(53);
     }
-    func_80269524(SI_VAR(15));
+    func_80269524(EVT_VAR(15));
     CloseActionCommandInfo();
     LoadActionCommand(1);
     func_802A9000_430020();
     func_802694A4(0);
     func_802A9120_421B10(24, 3);
-    SI_VAR(10) = 24;
+    EVT_VAR(10) = 24;
     spawn {
         sleep 4;
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 6 {
-            SI_VAR(0) += -30;
-            SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
+            EVT_VAR(0) += -30;
+            SetActorRotation(ACTOR_SELF, 0, 0, EVT_VAR(0));
             sleep 1;
         }
     }
@@ -864,7 +864,7 @@ EvtSource N(8023ADC4) = SCRIPT({
     EnableActorBlur(256, 1);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, 0x281);
-    func_8023817C_6F125C(SI_VAR(10), 3);
+    func_8023817C_6F125C(EVT_VAR(10), 3);
     EnableActorBlur(256, -1);
     parallel {
         SetActorScale(ACTOR_PARTNER, 1.1, 0.8, 1.0);
@@ -875,10 +875,10 @@ EvtSource N(8023ADC4) = SCRIPT({
     }
     sleep 1;
     N(StopGlowingAndGet)();
-    SI_VAR(0) += 2;
-    PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 32);
+    EVT_VAR(0) += 2;
+    PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 32);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    func_80269550(SI_VAR(15));
+    func_80269550(EVT_VAR(15));
     await N(8023A06C);
 });
 
@@ -893,16 +893,16 @@ EvtSource N(8023B45C) = SCRIPT({
     SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0);
     sleep 1;
     UseBattleCamPreset(52);
-    func_802A9120_421B10(SI_VAR(10), 3);
+    func_802A9120_421B10(EVT_VAR(10), 3);
     UseBattleCamPreset(52);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk);
     SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0);
     SetGoalToTarget(ACTOR_PARTNER);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_200D);
-    func_8023817C_6F125C(SI_VAR(10), 0);
-    PartnerTestEnemy(SI_VAR(0), 128, 20, 0, 1, 16);
-    if (SI_VAR(0) == 6) {
+    func_8023817C_6F125C(EVT_VAR(10), 0);
+    PartnerTestEnemy(EVT_VAR(0), 128, 20, 0, 1, 16);
+    if (EVT_VAR(0) == 6) {
         SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
         N(func_80238A20_6F1B00)();
         spawn {
@@ -921,21 +921,21 @@ EvtSource N(8023B45C) = SCRIPT({
         SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0);
     }
     sleep 1;
-    GetActionCommandResult(SI_VAR(0));
-    match SI_VAR(0) {
+    GetActionCommandResult(EVT_VAR(0));
+    match EVT_VAR(0) {
         > 0 {
             N(IsGlowing)();
-            SI_VAR(0) += 3;
-            PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 80);
+            EVT_VAR(0) += 3;
+            PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 80);
         }
         else {
             N(StopGlowingAndGet)();
-            SI_VAR(0) += 3;
-            PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 48);
+            EVT_VAR(0) += 3;
+            PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 48);
         }
     }
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    match SI_VAR(0) {
+    match EVT_VAR(0) {
         0, 2 {
             await N(80239CA8);
             return;
@@ -948,28 +948,28 @@ EvtSource N(8023B45C) = SCRIPT({
         SetGoalToTarget(ACTOR_PARTNER);
         UseBattleCamPreset(53);
     }
-    func_80269524(SI_VAR(15));
+    func_80269524(EVT_VAR(15));
     CloseActionCommandInfo();
     LoadActionCommand(1);
     func_802A9000_430020();
     func_802694A4(0);
     func_802A9120_421B10(24, 3);
-    SI_VAR(10) = 24;
+    EVT_VAR(10) = 24;
     spawn {
         sleep 4;
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 6 {
-            SI_VAR(0) += -30;
-            SetActorRotation(ACTOR_SELF, 0, -250000000, SI_VAR(0));
+            EVT_VAR(0) += -30;
+            SetActorRotation(ACTOR_SELF, 0, -250000000, EVT_VAR(0));
             sleep 1;
         }
         SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk);
     }
     spawn {
-        SI_VAR(0) = 0;
-        loop SI_VAR(10) {
-            SI_VAR(0) += 133;
-            SetActorRotation(ACTOR_SELF, -250000000, SI_VAR(0), -250000000);
+        EVT_VAR(0) = 0;
+        loop EVT_VAR(10) {
+            EVT_VAR(0) += 133;
+            SetActorRotation(ACTOR_SELF, -250000000, EVT_VAR(0), -250000000);
             sleep 1;
         }
     }
@@ -977,7 +977,7 @@ EvtSource N(8023B45C) = SCRIPT({
     EnableActorBlur(256, 1);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, 0x281);
-    func_8023817C_6F125C(SI_VAR(10), 3);
+    func_8023817C_6F125C(EVT_VAR(10), 3);
     EnableActorBlur(256, -1);
     parallel {
         SetActorScale(ACTOR_PARTNER, 1.1, 0.8, 1.0);
@@ -988,10 +988,10 @@ EvtSource N(8023B45C) = SCRIPT({
     }
     sleep 1;
     N(StopGlowingAndGet)();
-    SI_VAR(0) += 3;
-    PartnerDamageEnemy(SI_VAR(0), 128, 0, 0, SI_VAR(0), 32);
+    EVT_VAR(0) += 3;
+    PartnerDamageEnemy(EVT_VAR(0), 128, 0, 0, EVT_VAR(0), 32);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    func_80269550(SI_VAR(15));
+    func_80269550(EVT_VAR(15));
     await N(8023A06C);
 });
 
@@ -1012,16 +1012,16 @@ EvtSource N(8023BB9C) = SCRIPT({
     SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0);
     sleep 1;
     UseBattleCamPreset(52);
-    func_802A9120_421B10(SI_VAR(10), 1);
+    func_802A9120_421B10(EVT_VAR(10), 1);
     UseBattleCamPreset(52);
     SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk);
     SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0);
     SetGoalToTarget(ACTOR_PARTNER);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_200D);
-    func_8023817C_6F125C(SI_VAR(10), 0);
-    PartnerTestEnemy(SI_VAR(0), 1048704, 20, 0, 1, 16);
-    if (SI_VAR(0) == 6) {
+    func_8023817C_6F125C(EVT_VAR(10), 0);
+    PartnerTestEnemy(EVT_VAR(0), 1048704, 20, 0, 1, 16);
+    if (EVT_VAR(0) == 6) {
         SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
         N(func_80238A20_6F1B00)();
         spawn {
@@ -1040,21 +1040,21 @@ EvtSource N(8023BB9C) = SCRIPT({
         SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0);
     }
     sleep 1;
-    GetActionCommandResult(SI_VAR(0));
-    match SI_VAR(0) {
+    GetActionCommandResult(EVT_VAR(0));
+    match EVT_VAR(0) {
         > 0 {
             N(IsGlowing)();
-            SI_VAR(0) += 3;
-            PartnerDamageEnemy(SI_VAR(0), 1048704, 0, 0, SI_VAR(0), 80);
+            EVT_VAR(0) += 3;
+            PartnerDamageEnemy(EVT_VAR(0), 1048704, 0, 0, EVT_VAR(0), 80);
         }
         else {
             N(StopGlowingAndGet)();
-            SI_VAR(0) += 3;
-            PartnerDamageEnemy(SI_VAR(0), 1048704, 0, 0, SI_VAR(0), 48);
+            EVT_VAR(0) += 3;
+            PartnerDamageEnemy(EVT_VAR(0), 1048704, 0, 0, EVT_VAR(0), 48);
         }
     }
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    match SI_VAR(0) {
+    match EVT_VAR(0) {
         0, 2 {
             await N(80239CA8);
             return;
@@ -1067,10 +1067,10 @@ EvtSource N(8023BB9C) = SCRIPT({
         SetGoalToTarget(ACTOR_PARTNER);
         UseBattleCamPreset(53);
     }
-    func_80269524(SI_VAR(15));
-    SI_VAR(13) = 0;
-    SI_VAR(15) = 0;
-    SI_FLAG(0) = 0;
+    func_80269524(EVT_VAR(15));
+    EVT_VAR(13) = 0;
+    EVT_VAR(15) = 0;
+    EVT_FLAG(0) = 0;
 10:
     spawn {
         UseBattleCamPreset(50);
@@ -1082,39 +1082,39 @@ EvtSource N(8023BB9C) = SCRIPT({
     func_8026919C(N(D_8023BB78_6ECC58));
     LoadActionCommand(1);
     func_802A9000_430020();
-    SI_VAR(10) = 24;
-    match SI_VAR(15) {
+    EVT_VAR(10) = 24;
+    match EVT_VAR(15) {
         == 0 {
-            func_802A9120_421B10(SI_VAR(10), 1);
+            func_802A9120_421B10(EVT_VAR(10), 1);
         }
         == 1 {
-            func_802A9120_421B10(SI_VAR(10), 2);
+            func_802A9120_421B10(EVT_VAR(10), 2);
         }
         == 2 {
-            func_802A9120_421B10(SI_VAR(10), 3);
+            func_802A9120_421B10(EVT_VAR(10), 3);
         }
         == 3 {
-            func_802A9120_421B10(SI_VAR(10), 4);
+            func_802A9120_421B10(EVT_VAR(10), 4);
         }
         else {
-            func_802A9120_421B10(SI_VAR(10), 5);
+            func_802A9120_421B10(EVT_VAR(10), 5);
         }
     }
     spawn {
         sleep 4;
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
         loop 6 {
-            SI_VAR(0) += -30;
-            SetActorRotation(ACTOR_SELF, 0, -250000000, SI_VAR(0));
+            EVT_VAR(0) += -30;
+            SetActorRotation(ACTOR_SELF, 0, -250000000, EVT_VAR(0));
             sleep 1;
         }
         SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk);
     }
     spawn {
-        SI_VAR(0) = 0;
-        loop SI_VAR(10) {
-            SI_VAR(0) += 133;
-            SetActorRotation(ACTOR_SELF, -250000000, SI_VAR(0), -250000000);
+        EVT_VAR(0) = 0;
+        loop EVT_VAR(10) {
+            EVT_VAR(0) += 133;
+            SetActorRotation(ACTOR_SELF, -250000000, EVT_VAR(0), -250000000);
             sleep 1;
         }
     }
@@ -1122,12 +1122,12 @@ EvtSource N(8023BB9C) = SCRIPT({
     EnableActorBlur(256, 1);
     SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006);
     PlaySoundAtActor(ACTOR_PARTNER, 0x281);
-    func_8023817C_6F125C(SI_VAR(10), 3);
+    func_8023817C_6F125C(EVT_VAR(10), 3);
     EnableActorBlur(256, -1);
-    SI_VAR(13) -= 1;
+    EVT_VAR(13) -= 1;
     func_802380E4_6F11C4();
-    if (SI_VAR(15) >= SI_VAR(0)) {
-        SI_FLAG(0) = 1;
+    if (EVT_VAR(15) >= EVT_VAR(0)) {
+        EVT_FLAG(0) = 1;
     }
     parallel {
         SetActorScale(ACTOR_PARTNER, 1.1, 0.8, 1.0);
@@ -1137,50 +1137,50 @@ EvtSource N(8023BB9C) = SCRIPT({
         SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0);
     }
     sleep 1;
-    GetActionCommandResult(SI_VAR(0));
-    match SI_VAR(0) {
+    GetActionCommandResult(EVT_VAR(0));
+    match EVT_VAR(0) {
         > 0 {
-            if (SI_FLAG(0) == 0) {
+            if (EVT_FLAG(0) == 0) {
                 N(IsGlowing)();
-                SI_VAR(0) += 3;
-                PartnerPowerBounceEnemy(SI_VAR(0), 1048704, 0, 0, SI_VAR(0), SI_VAR(13), 64);
+                EVT_VAR(0) += 3;
+                PartnerPowerBounceEnemy(EVT_VAR(0), 1048704, 0, 0, EVT_VAR(0), EVT_VAR(13), 64);
             } else {
                 N(StopGlowingAndGet)();
-                SI_VAR(0) += 3;
-                PartnerPowerBounceEnemy(SI_VAR(0), 1048704, 0, 0, SI_VAR(0), SI_VAR(13), 32);
+                EVT_VAR(0) += 3;
+                PartnerPowerBounceEnemy(EVT_VAR(0), 1048704, 0, 0, EVT_VAR(0), EVT_VAR(13), 32);
             }
         }
         else {
             N(StopGlowingAndGet)();
-            SI_VAR(0) += 3;
-            PartnerPowerBounceEnemy(SI_VAR(0), 1048704, 0, 0, SI_VAR(0), SI_VAR(13), 32);
-            SI_FLAG(0) = 0;
+            EVT_VAR(0) += 3;
+            PartnerPowerBounceEnemy(EVT_VAR(0), 1048704, 0, 0, EVT_VAR(0), EVT_VAR(13), 32);
+            EVT_FLAG(0) = 0;
         }
     }
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_0);
-    func_80269550(SI_VAR(14));
-    match SI_VAR(0) {
+    func_80269550(EVT_VAR(14));
+    match EVT_VAR(0) {
         0, 2 {
             await N(80239CA8);
             return;
         }
         1, 3 {
-            if (SI_FLAG(0) == 1) {
+            if (EVT_FLAG(0) == 1) {
                 await N(8023A06C);
                 return;
             }
         }
     }
-    SI_VAR(15) += 1;
+    EVT_VAR(15) += 1;
     goto 10;
 });
 
 EvtSource N(8023C5B8) = SCRIPT({
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 30;
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 30;
     SetActorSpeed(ACTOR_PARTNER, 6.0);
     SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run);
-    SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     RunToGoal(ACTOR_PARTNER, 0, FALSE);
     SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle);
     InitTargetIterator();
@@ -1192,19 +1192,19 @@ EvtSource N(8023C5B8) = SCRIPT({
     SetCamFlag80(2, 0);
     SetCamPerspective(2, 6, 25, 16, 1024);
     SetCamViewport(2, 137, 95, 138, 99);
-    GetOwnerTarget(SI_VAR(10), SI_VAR(11));
-    GetActorPos(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetOwnerTarget(EVT_VAR(10), EVT_VAR(11));
+    GetActorPos(EVT_VAR(10), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_80238BCC_6F1CAC();
     sleep 1;
-    func_802CAE50(2, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    func_802CABE8(2, 0, SI_VAR(3), 100, 4);
+    func_802CAE50(2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    func_802CABE8(2, 0, EVT_VAR(3), 100, 4);
     sleep 2;
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_282);
     SetCamFlag80(2, 1);
     sleep 10;
     func_80238B60_6F1C40();
-    ActorSpeak(SI_VAR(0), -127, 1, 589839, 589825);
+    ActorSpeak(EVT_VAR(0), -127, 1, 589839, 589825);
     func_80238E48_6F1F28();
     sleep 12;
     SetCamEnabled(2, 0);
@@ -1225,19 +1225,19 @@ EvtSource N(8023C90C) = SCRIPT({
     sleep 10;
     SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_charge);
     SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0);
-    GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 15;
+    GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 15;
     PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_208F);
-    func_802390C8_6F21A8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.2);
+    func_802390C8_6F21A8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.2);
     sleep 3;
-    func_802390C8_6F21A8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 0.8);
+    func_802390C8_6F21A8(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0.8);
     spawn {
         sleep 15;
-        GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) += 15;
-        SI_VAR(2) += -5;
+        GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) += 15;
+        EVT_VAR(2) += -5;
         PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_2003);
-        PlayEffect(0x52, 9, SI_VAR(0), SI_VAR(1), SI_VAR(2), 2.0, 20, 0, 0, 0, 0, 0, 0, 0);
+        PlayEffect(0x52, 9, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 2.0, 20, 0, 0, 0, 0, 0, 0, 0);
     }
     sleep 30;
     SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle);
@@ -1245,28 +1245,28 @@ EvtSource N(8023C90C) = SCRIPT({
     UseBattleCamPreset(2);
     MoveBattleCamOver(10);
     func_80238E74_6F1F54();
-    if (SI_VAR(0) == 0) {
-        GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 10;
-        SI_VAR(1) += 25;
-        SI_VAR(2) += 5;
+    if (EVT_VAR(0) == 0) {
+        GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 10;
+        EVT_VAR(1) += 25;
+        EVT_VAR(2) += 5;
         PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_208E);
-        func_80238EDC_6F1FBC(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        func_80238EDC_6F1FBC(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         sleep 4;
         SetActorJumpGravity(ACTOR_PARTNER, 1.4);
-        GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        GetActorPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         SetJumpAnimations(ACTOR_PARTNER, 589828, ANIM_1, ANIM_90004, ANIM_90004);
-        SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetGoalPos(ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         JumpToGoal(ACTOR_PARTNER, 20, 1, 1, 0);
         SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle);
-        GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        match SI_VAR(2) {
+        GetMenuSelection(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        match EVT_VAR(2) {
             == 134 {
                 ShowMessageBox(36, 60);
             }
             == 135 {
                 N(func_80239190_6F2270)();
-                ShowMessageBox(SI_VAR(0), 60);
+                ShowMessageBox(EVT_VAR(0), 60);
             }
             == 136 {
                 ShowMessageBox(36, 60);
@@ -1277,8 +1277,8 @@ EvtSource N(8023C90C) = SCRIPT({
     }
 0:
     sleep 1;
-    IsMessageBoxDisplayed(SI_VAR(0));
-    if (SI_VAR(0) == 1) {
+    IsMessageBoxDisplayed(EVT_VAR(0));
+    if (EVT_VAR(0) == 1) {
         goto 0;
     }
 });

src/common/IsSaveVar123.inc.c

@@ -3,7 +3,7 @@
 
 ApiStatus N(IsSaveVar123)(Evt* script, s32 isInitialCall) {
     script->varTable[0] = 0;
-    if (get_variable(NULL, SI_SAVE_VAR(123)) >= 8) {
+    if (get_variable(NULL, EVT_SAVE_VAR(123)) >= 8) {
         script->varTable[0] = 1;
     }
 

src/dc470_len_14c0.c

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

src/entity/Chest.c

@@ -185,7 +185,7 @@ void entity_GiantChest_give_equipment(Entity* entity) {
     }
 
     flag = data->unk_00;
-    if (flag <= SI_SAVE_FLAG(10000000)) {
+    if (flag <= EVT_SAVE_FLAG(10000000)) {
         flag += 130000000;
     }
     set_global_flag(flag);

src/entity/HeartBlock.c

@@ -258,14 +258,14 @@ void entity_HeartBlock_change_render_script(Entity* entity) {
 }
 
 void entity_HeartBlock_show_tutorial_message(Entity* entity) {
-    if ((!gPlayerData.partners[1].enabled) && get_global_flag(SI_SAVE_FLAG(96)) == 0) {
+    if ((!gPlayerData.partners[1].enabled) && get_global_flag(EVT_SAVE_FLAG(96)) == 0) {
         UNK_TYPE* ptr = &D_802EB3C0;
         *ptr = 0;
         msg_get_printer_for_string(0x1D0001, ptr);
         set_time_freeze_mode(TIME_FREEZE_PARTIAL);
         gOverrideFlags |= 0x40;
         disable_player_input();
-        set_global_flag(SI_SAVE_FLAG(96));
+        set_global_flag(EVT_SAVE_FLAG(96));
         return;
     }
     exec_entity_commandlist(entity);

src/entity/SaveBlock.c

@@ -49,10 +49,10 @@ void entity_SaveBlock_save_data(void) {
 }
 
 void entity_SaveBlock_show_tutorial_message(Entity* entity) {
-    if (!get_global_flag(SI_SAVE_FLAG(95))) {
+    if (!get_global_flag(EVT_SAVE_FLAG(95))) {
         D_802EB390 = FALSE;
         msg_get_printer_for_string(0x1D0000, &D_802EB390);
-        set_global_flag(SI_SAVE_FLAG(95));
+        set_global_flag(EVT_SAVE_FLAG(95));
         return;
     }
 

src/evt/cam_api.c

@@ -3,12 +3,12 @@
 
 EvtSource ShakeCam1 = SCRIPT({
     group 0;
-    ShakeCam(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0);
+    ShakeCam(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1.0);
 });
 
 EvtSource ShakeCamX = SCRIPT({
     group 0;
-    ShakeCam(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    ShakeCam(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3));
 });
 
 ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall) {
@@ -207,10 +207,10 @@ void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3) {
     Evt* script;
 
     script = start_script_in_group(&ShakeCamX, 1, 0, 4);
-    set_variable(script, SI_VAR(0), arg0);
-    set_variable(script, SI_VAR(1), arg1);
-    set_variable(script, SI_VAR(2), arg2);
-    set_float_variable(script, SI_VAR(3), arg3);
+    set_variable(script, EVT_VAR(0), arg0);
+    set_variable(script, EVT_VAR(1), arg1);
+    set_variable(script, EVT_VAR(2), arg2);
+    set_float_variable(script, EVT_VAR(3), arg3);
 }
 
 ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall) {

src/evt/f8f60_len_1560.c

@@ -119,7 +119,7 @@ ApiStatus IsPlayerWithin(Evt* script, s32 isInitialCall) {
     s32* distanceRequired = &script->functionTemp[2];
 
     f32 distance;
-    Bytecode outVar = SI_VAR(0);
+    Bytecode outVar = EVT_VAR(0);
 
     if (isInitialCall) {
         *targetX = get_variable(script, *ptrReadPos++);

src/evt/fx_api.c

@@ -616,7 +616,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) {
     }
 
     if (effectRet != NULL) {
-        set_variable(script, SI_VAR(15), effectRet);
+        set_variable(script, EVT_VAR(15), effectRet);
     }
 
     return ApiStatus_DONE2;

src/evt/script_list.c

@@ -511,7 +511,7 @@ void update_scripts(void) {
                     };
 
                     script->frameCounter -= 1.0;
-                    status = si_execute_next_command(script);
+                    status = evt_execute_next_command(script);
                     if (status == 1) {
                         stop = TRUE;
                         break;

src/fio.c

@@ -10,7 +10,7 @@ extern s32 D_800D95E8[];
 void fio_serialize_state(void);
 
 s32 get_spirits_rescued(void) {
-    s32 storyProgress = get_variable(NULL, SI_STORY_PROGRESS);
+    s32 storyProgress = get_variable(NULL, EVT_STORY_PROGRESS);
     s32 ret = 7;
 
     if (storyProgress < get_variable(NULL, STORY_CH1_STAR_SPIRIT_RESCUED)) {

src/state_demo.c

@@ -132,7 +132,7 @@ void state_step_demo(void) {
             gGameStatusPtr->peachFlags = 0;
             playerData->currentPartner = demoSceneData->partnerID;
             set_cam_viewport(0, 29, 20, -262, 177);
-            set_variable(NULL, SI_STORY_PROGRESS, demoSceneData->unk_6);
+            set_variable(NULL, EVT_STORY_PROGRESS, demoSceneData->unk_6);
 
             if (gGameStatusPtr->nextDemoScene == 0) {
                 set_map_transition_effect(3);
@@ -150,7 +150,7 @@ void state_step_demo(void) {
             gGameStatusPtr->peachFlags = 1;
             playerData->currentPartner = demoSceneData->partnerID;
             set_cam_viewport(0, 29, 20, -262, 177);
-            set_variable(NULL, SI_STORY_PROGRESS, demoSceneData->unk_6);
+            set_variable(NULL, EVT_STORY_PROGRESS, demoSceneData->unk_6);
 
             if (gGameStatusPtr->nextDemoScene == 0) {
                 set_map_transition_effect(3);

src/world/area_arn/arn.h

@@ -1,7 +1,7 @@
 #ifndef _WORLD_AREA_ARN_ARN_H_
 #define _WORLD_AREA_ARN_ARN_H_
 
-#include "si.h"
+#include "evt.h"
 
 extern MapConfig arn_02_config;
 extern MapConfig arn_03_config;

src/world/area_arn/arn_02/events.c

@@ -13,7 +13,7 @@ EvtSource N(802411A8) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    EVT_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -21,7 +21,7 @@ EvtSource N(main) = SCRIPT({
     MakeNpcs(0, N(npcGroupList_80241A9C));
     await N(makeEntities);
     spawn N(80241040);
-    SI_VAR(0) = N(802411A8);
+    EVT_VAR(0) = N(802411A8);
     spawn EnterWalk;
     sleep 1;
 });
@@ -31,14 +31,14 @@ static s32 N(pad_12C4)[] = {
 };
 
 EvtSource N(makeEntities) = SCRIPT({
-    MakeItemEntity(ITEM_DIZZY_DIAL, -248, 193, 45, 17, SI_SAVE_FLAG(1005));
-    MakeItemEntity(ITEM_LETTER07, 536, 260, 227, 17, SI_SAVE_FLAG(1006));
+    MakeItemEntity(ITEM_DIZZY_DIAL, -248, 193, 45, 17, EVT_SAVE_FLAG(1005));
+    MakeItemEntity(ITEM_LETTER07, 536, 260, 227, 17, EVT_SAVE_FLAG(1006));
     MakeEntity(0x802EA564, -350, 172, 170, 0, ITEM_COIN, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1002));
+    AssignBlockFlag(EVT_SAVE_FLAG(1002));
     MakeEntity(0x802EA564, 225, 265, 30, 0, ITEM_COIN, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1003));
+    AssignBlockFlag(EVT_SAVE_FLAG(1003));
     MakeEntity(0x802EA564, 275, 265, 150, 0, ITEM_REPEL_GEL, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1004));
+    AssignBlockFlag(EVT_SAVE_FLAG(1004));
 });
 
 NpcAISettings N(npcAISettings_802413D0) = {

src/world/area_arn/arn_02/header.c

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

src/world/area_arn/arn_03/events.c

@@ -14,13 +14,13 @@ EvtSource N(802418E8) = SCRIPT({
 });
 
 EvtSource N(enterWalk_80241930) = SCRIPT({
-    GetLoadType(SI_VAR(1));
-    if (SI_VAR(1) == 1) {
+    GetLoadType(EVT_VAR(1));
+    if (EVT_VAR(1) == 1) {
         spawn EnterSavePoint;
         spawn N(802418E8);
         return;
     }
-    if (SI_STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
         SetPlayerPos(-175, 165, 160);
         InterpPlayerYaw(90, 0);
         SetNpcPos(NPC_PARTNER, -175, 165, 160);
@@ -30,27 +30,27 @@ EvtSource N(enterWalk_80241930) = SCRIPT({
         spawn N(802418E8);
         return;
     }
-    SI_VAR(0) = N(802418E8);
+    EVT_VAR(0) = N(802418E8);
     spawn EnterWalk;
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    EVT_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    SI_AREA_FLAG(3) = 0;
-    SI_AREA_FLAG(4) = 0;
-    SI_AREA_FLAG(5) = 0;
-    if (SI_STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
+    EVT_AREA_FLAG(3) = 0;
+    EVT_AREA_FLAG(4) = 0;
+    EVT_AREA_FLAG(5) = 0;
+    if (EVT_STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
         MakeNpcs(0, N(npcGroupList_80244740));
     } else {
         MakeNpcs(0, N(npcGroupList_80244788));
     }
-    if (SI_SAVE_FLAG(1020) == 1) {
-        SI_MAP_VAR(0) = 450;
-        SI_MAP_VAR(1) = 450;
+    if (EVT_SAVE_FLAG(1020) == 1) {
+        EVT_MAP_VAR(0) = 450;
+        EVT_MAP_VAR(1) = 450;
     }
     await N(makeEntities);
     spawn N(80241780);
@@ -296,12 +296,12 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) {
 #include "world/common/StashVars.inc.c"
 
 EvtSource N(80241C6C) = SCRIPT({
-    ShowGotItem(SI_VAR(0), 1, 0);
+    ShowGotItem(EVT_VAR(0), 1, 0);
     return;
 });
 
 EvtSource N(80241C9C) = SCRIPT({
-    ShowGotItem(SI_VAR(0), 1, 16);
+    ShowGotItem(EVT_VAR(0), 1, 16);
     return;
 });
 
@@ -314,33 +314,33 @@ s32 N(D_80241CD0_BE0A60) = {
 };
 
 EvtSource N(80241CD4) = SCRIPT({
-    SI_VAR(9) = SI_VAR(1);
+    EVT_VAR(9) = EVT_VAR(1);
     ShowKeyChoicePopup();
-    SI_VAR(10) = SI_VAR(0);
-    match SI_VAR(0) {
+    EVT_VAR(10) = EVT_VAR(0);
+    match EVT_VAR(0) {
         == 0 {}
         == -1 {}
         else {
-            RemoveKeyItemAt(SI_VAR(1));
-            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-            SI_VAR(0) |= (const) 0x50000;
-            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            RemoveKeyItemAt(EVT_VAR(1));
+            GetPlayerPos(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+            N(AddPlayerHandsOffset)(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+            EVT_VAR(0) |= (const) 0x50000;
+            MakeItemEntity(EVT_VAR(0), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5), 1, 0);
             SetPlayerAnimation(0x60005);
             sleep 30;
             SetPlayerAnimation(ANIM_10002);
-            RemoveItemEntity(SI_VAR(0));
+            RemoveItemEntity(EVT_VAR(0));
         }
     }
-    N(func_80241648_BE03D8)(SI_VAR(10));
+    N(func_80241648_BE03D8)(EVT_VAR(10));
     CloseChoicePopup();
     unbind;
 });
 
 EvtSource N(80241E18) = SCRIPT({
-    N(func_80241680_BE0410)(SI_VAR(0));
+    N(func_80241680_BE0410)(EVT_VAR(0));
     bind_padlock N(80241CD4) 0x10 0 N(D_80244A20);
-    N(func_802415F4_BE0384)(SI_VAR(0));
+    N(func_802415F4_BE0384)(EVT_VAR(0));
 });
 
 EvtSource N(80241E68) = SCRIPT({
@@ -351,16 +351,16 @@ EvtSource N(80241E68) = SCRIPT({
 });
 
 EvtSource N(interact_80241EB0) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(2) == 0) {
+            if (EVT_AREA_FLAG(2) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0073));
-                SI_AREA_FLAG(2) = 1;
+                EVT_AREA_FLAG(2) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0074));
-                SI_AREA_FLAG(2) = 0;
+                EVT_AREA_FLAG(2) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -388,24 +388,24 @@ EvtSource N(idle_80242064) = SCRIPT({
     sleep 25;
     spawn {
         sleep 50;
-        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         SetCamDistance(0, 325);
         SetCamSpeed(0, 4.0);
-        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         PanToTarget(0, 0, 1);
     }
     spawn {
         sleep 20;
-        GetCurrentPartnerID(SI_VAR(6));
-        if (SI_VAR(6) != 9) {
+        GetCurrentPartnerID(EVT_VAR(6));
+        if (EVT_VAR(6) != 9) {
             BringPartnerOut(9);
             DisablePartnerAI(0);
             sleep 1;
             NpcFaceNpc(NPC_PARTNER, NPC_SELF, 0);
             sleep 5;
             SetNpcJumpscale(NPC_PARTNER, 0);
-            if (SI_VAR(6) == 4) {
+            if (EVT_VAR(6) == 4) {
                 NpcJump0(NPC_PARTNER, -81, 176, 171, 20);
             } else {
                 NpcJump0(NPC_PARTNER, -81, 186, 171, 20);
@@ -427,8 +427,8 @@ EvtSource N(idle_80242064) = SCRIPT({
     SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x0072));
     EnablePartnerAI();
     sleep 10;
-    GetCurrentPartnerID(SI_VAR(6));
-    if (SI_VAR(6) != 9) {
+    GetCurrentPartnerID(EVT_VAR(6));
+    if (EVT_VAR(6) != 9) {
         PutPartnerAway();
     }
     spawn {
@@ -437,10 +437,10 @@ EvtSource N(idle_80242064) = SCRIPT({
     }
     func_802CF56C(2);
     sleep 15;
-    SI_STORY_PROGRESS = STORY_CH3_ARRIVED_AT_GHOST_TOWN;
+    EVT_STORY_PROGRESS = STORY_CH3_ARRIVED_AT_GHOST_TOWN;
     DisablePlayerInput(FALSE);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamSpeed(0, 3);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
@@ -448,7 +448,7 @@ EvtSource N(idle_80242064) = SCRIPT({
 });
 
 EvtSource N(init_802424E0) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_ARRIVED_AT_GHOST_TOWN) {
         SetNpcPos(NPC_SELF, 175, 240, 145);
         BindNpcIdle(NPC_SELF, N(idle_80242064));
     }
@@ -456,17 +456,17 @@ EvtSource N(init_802424E0) = SCRIPT({
 });
 
 EvtSource N(interact_8024254C) = SCRIPT({
-    if (SI_MAP_VAR(0) != 0) {
-        if (SI_MAP_VAR(0) >= SI_MAP_VAR(1)) {
+    if (EVT_MAP_VAR(0) != 0) {
+        if (EVT_MAP_VAR(0) >= EVT_MAP_VAR(1)) {
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                           0x0081));
-            SI_VAR(0) = 118;
-            SI_VAR(1) = 1;
+            EVT_VAR(0) = 118;
+            EVT_VAR(1) = 1;
             await N(80241C6C);
             AddKeyItem(ITEM_PACKAGE);
-            SI_MAP_VAR(0) = 0;
-            SI_SAVE_FLAG(1015) = 1;
-            SI_SAVE_FLAG(1020) = 0;
+            EVT_MAP_VAR(0) = 0;
+            EVT_SAVE_FLAG(1015) = 1;
+            EVT_SAVE_FLAG(1020) = 0;
             return;
         } else {
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
@@ -474,16 +474,16 @@ EvtSource N(interact_8024254C) = SCRIPT({
             return;
         }
     }
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(3) == 0) {
+            if (EVT_AREA_FLAG(3) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0079));
-                SI_AREA_FLAG(3) = 1;
+                EVT_AREA_FLAG(3) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x007A));
-                SI_AREA_FLAG(3) = 0;
+                EVT_AREA_FLAG(3) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -499,20 +499,20 @@ EvtSource N(interact_8024254C) = SCRIPT({
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007E));
         }
     }
-    if (SI_SAVE_FLAG(1015) == 0) {
-        if (SI_SAVE_VAR(348) == 18) {
+    if (EVT_SAVE_FLAG(1015) == 0) {
+        if (EVT_SAVE_VAR(348) == 18) {
             await N(80241E68);
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                           0x007F));
             EndSpeech(-1, 9765124, 9765121, 0);
-            SI_MAP_VAR(0) = 0;
-            SI_MAP_VAR(1) = 450;
-            SI_SAVE_FLAG(1020) = 1;
+            EVT_MAP_VAR(0) = 0;
+            EVT_MAP_VAR(1) = 450;
+            EVT_SAVE_FLAG(1020) = 1;
             spawn {
                 loop {
-                    SI_MAP_VAR(0) += 1;
+                    EVT_MAP_VAR(0) += 1;
                     sleep 1;
-                    if (SI_MAP_VAR(0) >= SI_MAP_VAR(1)) {
+                    if (EVT_MAP_VAR(0) >= EVT_MAP_VAR(1)) {
                         break loop;
                     }
                 }
@@ -526,74 +526,74 @@ EvtSource N(init_802428A8) = SCRIPT({
 });
 
 EvtSource N(802428CC) = SCRIPT({
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    if (SI_VAR(0) > SI_VAR(3)) {
-        SI_VAR(0) += 60;
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    if (EVT_VAR(0) > EVT_VAR(3)) {
+        EVT_VAR(0) += 60;
         SetNpcYaw(0x4, 90);
     } else {
-        SI_VAR(0) -= 60;
+        EVT_VAR(0) -= 60;
         SetNpcYaw(0x4, 270);
     }
-    SI_VAR(1) += 20;
-    SetNpcPos(0x4, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    EVT_VAR(1) += 20;
+    SetNpcPos(0x4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_802CFD30(0x4, 7, 0, 0, 0, 0);
     sleep 1;
 });
 
 EvtSource N(802429D4) = SCRIPT({
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    if (SI_VAR(0) > SI_VAR(3)) {
-        SI_VAR(0) += 30;
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    if (EVT_VAR(0) > EVT_VAR(3)) {
+        EVT_VAR(0) += 30;
     } else {
-        SI_VAR(0) -= 30;
+        EVT_VAR(0) -= 30;
     }
     spawn {
         MakeLerp(0, 255, 40, 0);
 10:
         UpdateLerp();
-        func_802CFD30(0x4, 7, SI_VAR(0), 0, 0, 0);
+        func_802CFD30(0x4, 7, EVT_VAR(0), 0, 0, 0);
         sleep 1;
-        if (SI_VAR(1) == 1) {
+        if (EVT_VAR(1) == 1) {
             goto 10;
         }
     }
-    NpcMoveTo(0x4, SI_VAR(0), SI_VAR(2), 40);
+    NpcMoveTo(0x4, EVT_VAR(0), EVT_VAR(2), 40);
 });
 
 EvtSource N(80242B0C) = SCRIPT({
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    if (SI_VAR(0) > SI_VAR(3)) {
-        SI_VAR(0) += 60;
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    if (EVT_VAR(0) > EVT_VAR(3)) {
+        EVT_VAR(0) += 60;
     } else {
-        SI_VAR(0) -= 60;
+        EVT_VAR(0) -= 60;
     }
     spawn {
         MakeLerp(255, 0, 40, 0);
 10:
         UpdateLerp();
-        func_802CFD30(0x4, 7, SI_VAR(0), 0, 0, 0);
+        func_802CFD30(0x4, 7, EVT_VAR(0), 0, 0, 0);
         sleep 1;
-        if (SI_VAR(1) == 1) {
+        if (EVT_VAR(1) == 1) {
             goto 10;
         }
     }
-    NpcMoveTo(0x4, SI_VAR(0), SI_VAR(2), 40);
+    NpcMoveTo(0x4, EVT_VAR(0), EVT_VAR(2), 40);
     SetNpcPos(0x4, 0, -1000, 0);
 });
 
 EvtSource N(80242C60) = SCRIPT({
     await N(802429D4);
-    SI_MAP_VAR(2) = 0;
-    SI_MAP_VAR(3) = 0;
+    EVT_MAP_VAR(2) = 0;
+    EVT_MAP_VAR(3) = 0;
     spawn {
         sleep 25;
         SetPlayerAnimation(0x80017);
         SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_9);
         loop {
-            if (SI_MAP_VAR(2) == 1) {
+            if (EVT_MAP_VAR(2) == 1) {
                 break loop;
             }
             sleep 1;
@@ -607,21 +607,21 @@ EvtSource N(80242C60) = SCRIPT({
     SetNpcAnimation(0x4, NPC_ANIM_boo_Palette_01_Anim_1);
     sleep 10;
     await N(80242B0C);
-    SI_MAP_VAR(2) = 1;
+    EVT_MAP_VAR(2) = 1;
     sleep 15;
 });
 
 EvtSource N(interact_80242DC4) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(4) == 0) {
+            if (EVT_AREA_FLAG(4) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0082));
-                SI_AREA_FLAG(4) = 1;
+                EVT_AREA_FLAG(4) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0083));
-                SI_AREA_FLAG(4) = 0;
+                EVT_AREA_FLAG(4) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -634,10 +634,10 @@ EvtSource N(interact_80242DC4) = SCRIPT({
             DisablePartnerAI(0);
             DisablePlayerPhysics(TRUE);
             spawn {
-                GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-                SI_VAR(2) += -20;
+                GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+                EVT_VAR(2) += -20;
                 SetNpcSpeed(NPC_PARTNER, 2.0);
-                NpcMoveTo(NPC_PARTNER, SI_VAR(0), SI_VAR(2), 0);
+                NpcMoveTo(NPC_PARTNER, EVT_VAR(0), EVT_VAR(2), 0);
                 NpcFaceNpc(NPC_PARTNER, NPC_SELF, 1);
             }
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0086));
@@ -654,10 +654,10 @@ EvtSource N(interact_80242DC4) = SCRIPT({
             DisablePartnerAI(0);
             DisablePlayerPhysics(TRUE);
             spawn {
-                GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-                SI_VAR(2) += -20;
+                GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+                EVT_VAR(2) += -20;
                 SetNpcSpeed(NPC_PARTNER, 2.0);
-                NpcMoveTo(NPC_PARTNER, SI_VAR(0), SI_VAR(2), 0);
+                NpcMoveTo(NPC_PARTNER, EVT_VAR(0), EVT_VAR(2), 0);
                 NpcFaceNpc(NPC_PARTNER, NPC_SELF, 1);
             }
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0089));
@@ -678,16 +678,16 @@ EvtSource N(init_802431A4) = SCRIPT({
 });
 
 EvtSource N(interact_802431C8) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(5) == 0) {
+            if (EVT_AREA_FLAG(5) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x008C));
-                SI_AREA_FLAG(5) = 1;
+                EVT_AREA_FLAG(5) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x008D));
-                SI_AREA_FLAG(5) = 0;
+                EVT_AREA_FLAG(5) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -870,24 +870,24 @@ StaticNpc N(npcGroup_80243B38) = {
 };
 
 EvtSource N(idle_80243D28) = SCRIPT({
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = SI_VAR(0);
-    SI_VAR(3) += -60;
-    SI_VAR(4) = SI_VAR(0);
-    SI_VAR(4) += 60;
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = EVT_VAR(0);
+    EVT_VAR(3) += -60;
+    EVT_VAR(4) = EVT_VAR(0);
+    EVT_VAR(4) += 60;
     loop {
-        RandInt(5, SI_VAR(5));
-        SI_VAR(6) = (float) SI_VAR(5);
-        SI_VAR(6) *= 0.1005859375;
-        SI_VAR(6) += 0.80078125;
-        SetNpcSpeed(NPC_SELF, SI_VAR(6));
-        NpcMoveTo(NPC_SELF, SI_VAR(3), SI_VAR(2), 0);
-        RandInt(5, SI_VAR(5));
-        SI_VAR(6) = (float) SI_VAR(5);
-        SI_VAR(6) *= 0.1005859375;
-        SI_VAR(6) += 0.80078125;
-        SetNpcSpeed(NPC_SELF, SI_VAR(6));
-        NpcMoveTo(NPC_SELF, SI_VAR(4), SI_VAR(2), 0);
+        RandInt(5, EVT_VAR(5));
+        EVT_VAR(6) = (float) EVT_VAR(5);
+        EVT_VAR(6) *= 0.1005859375;
+        EVT_VAR(6) += 0.80078125;
+        SetNpcSpeed(NPC_SELF, EVT_VAR(6));
+        NpcMoveTo(NPC_SELF, EVT_VAR(3), EVT_VAR(2), 0);
+        RandInt(5, EVT_VAR(5));
+        EVT_VAR(6) = (float) EVT_VAR(5);
+        EVT_VAR(6) *= 0.1005859375;
+        EVT_VAR(6) += 0.80078125;
+        SetNpcSpeed(NPC_SELF, EVT_VAR(6));
+        NpcMoveTo(NPC_SELF, EVT_VAR(4), EVT_VAR(2), 0);
     }
 });
 
@@ -1055,7 +1055,7 @@ static s32 N(pad_47DC) = {
 
 EvtSource N(makeEntities) = SCRIPT({
     MakeEntity(0x802EA564, 300, 237, 60, 0, ITEM_COIN, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1007));
+    AssignBlockFlag(EVT_SAVE_FLAG(1007));
     MakeEntity(0x802E9A18, 250, 237, 125, 0, MAKE_ENTITY_END);
 });
 

src/world/area_arn/arn_03/header.c

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

src/world/area_arn/arn_04/events.c

@@ -14,7 +14,7 @@ EvtSource N(80243538) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    EVT_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -22,7 +22,7 @@ EvtSource N(main) = SCRIPT({
     MakeNpcs(0, N(npcGroupList_80244000));
     await N(makeEntities);
     spawn N(802433D0);
-    SI_VAR(0) = N(80243538);
+    EVT_VAR(0) = N(80243538);
     spawn EnterWalk;
     sleep 1;
 });
@@ -268,12 +268,12 @@ static s32 N(pad_403C)[] = {
 
 EvtSource N(makeEntities) = SCRIPT({
     MakeEntity(0x802EA564, 450, 285, 120, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1008));
+    AssignBlockFlag(EVT_SAVE_FLAG(1008));
     MakeEntity(0x802EA564, 720, 333, 75, 0, ITEM_COIN, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1009));
+    AssignBlockFlag(EVT_SAVE_FLAG(1009));
     MakeEntity(0x802EA0E8, 600, 290, 200, 0, MAKE_ENTITY_END);
-    AssignBlockFlag(SI_SAVE_FLAG(1010));
-    MakeItemEntity(ITEM_STAR_PIECE, 540, 230, 13, 17, SI_SAVE_FLAG(1019));
+    AssignBlockFlag(EVT_SAVE_FLAG(1010));
+    MakeItemEntity(ITEM_STAR_PIECE, 540, 230, 13, 17, EVT_SAVE_FLAG(1019));
 });
 
 #include "world/common/UnkNpcAIFunc24.inc.c"

src/world/area_arn/arn_04/header.c

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

src/world/area_arn/arn_05/events.c

@@ -26,24 +26,24 @@ EvtSource N(802414E8) = SCRIPT({
 });
 
 EvtSource N(enterWalk_80241530) = SCRIPT({
-    GetLoadType(SI_VAR(1));
-    if (SI_VAR(1) == 1) {
+    GetLoadType(EVT_VAR(1));
+    if (EVT_VAR(1) == 1) {
         spawn EnterSavePoint;
         spawn N(802414E8);
         return;
     }
-    SI_VAR(0) = N(802414E8);
+    EVT_VAR(0) = N(802414E8);
     spawn EnterWalk;
     sleep 1;
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    EVT_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (SI_STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
         MakeNpcs(0, N(npcGroupList_80244FA4));
     } else {
         MakeNpcs(0, N(npcGroupList_80244FC8));
@@ -100,16 +100,16 @@ EvtSource N(idle_80241784) = SCRIPT({
 });
 
 EvtSource N(interact_80241794) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(6) == 0) {
+            if (EVT_AREA_FLAG(6) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0092));
-                SI_AREA_FLAG(6) = 1;
+                EVT_AREA_FLAG(6) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0093));
-                SI_AREA_FLAG(6) = 0;
+                EVT_AREA_FLAG(6) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -132,16 +132,16 @@ EvtSource N(interact_802418F4) = SCRIPT({
 });
 
 EvtSource N(interact_80241924) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(7) == 0) {
+            if (EVT_AREA_FLAG(7) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x0099));
-                SI_AREA_FLAG(7) = 1;
+                EVT_AREA_FLAG(7) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x009A));
-                SI_AREA_FLAG(7) = 0;
+                EVT_AREA_FLAG(7) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -164,7 +164,7 @@ EvtSource N(interact_80241A84) = SCRIPT({
 });
 
 EvtSource N(interact_80241AB4) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {}
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {}
         < STORY_CH3_BEGAN_PEACH_MISSION {}
@@ -172,8 +172,8 @@ EvtSource N(interact_80241AB4) = SCRIPT({
             SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00A9));
         }
         >= STORY_CH5_STAR_SPRIT_DEPARTED {
-            if (SI_SAVE_FLAG(1014) == 1) {
-                if (SI_AREA_FLAG(9) == 1) {
+            if (EVT_SAVE_FLAG(1014) == 1) {
+                if (EVT_AREA_FLAG(9) == 1) {
                     SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_5, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                                   0x00AE));
                 } else {
@@ -189,20 +189,20 @@ EvtSource N(interact_80241AB4) = SCRIPT({
                 SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_A);
                 ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_A, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AC));
                 ShowChoice(1966110);
-                match SI_VAR(0) {
+                match EVT_VAR(0) {
                     == 0 {
                         SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_5);
                         ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_5, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AD));
                         SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_1);
-                        SI_SAVE_FLAG(1014) = 1;
-                        SI_AREA_FLAG(9) = 1;
+                        EVT_SAVE_FLAG(1014) = 1;
+                        EVT_AREA_FLAG(9) = 1;
                     }
                     == 1 {
                         SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_5);
                         ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_5, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AD));
                         SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_1);
-                        SI_SAVE_FLAG(1014) = 1;
-                        SI_AREA_FLAG(9) = 1;
+                        EVT_SAVE_FLAG(1014) = 1;
+                        EVT_AREA_FLAG(9) = 1;
                     }
                     == 2 {
                         ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AF));
@@ -214,7 +214,7 @@ EvtSource N(interact_80241AB4) = SCRIPT({
 });
 
 EvtSource N(interact_80241D88) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {}
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {}
         < STORY_CH3_BEGAN_PEACH_MISSION {}
@@ -228,16 +228,16 @@ EvtSource N(interact_80241D88) = SCRIPT({
 });
 
 EvtSource N(interact_80241E28) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
-            if (SI_AREA_FLAG(8) == 0) {
+            if (EVT_AREA_FLAG(8) == 0) {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x00B3));
-                SI_AREA_FLAG(8) = 1;
+                EVT_AREA_FLAG(8) = 1;
             } else {
                 SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                               0x00B4));
-                SI_AREA_FLAG(8) = 0;
+                EVT_AREA_FLAG(8) = 0;
             }
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
@@ -260,7 +260,7 @@ EvtSource N(interact_80241F88) = SCRIPT({
 });
 
 EvtSource N(init_80241FB8) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
         BindNpcIdle(NPC_SELF, N(idle_80241784));
     }
     BindNpcInteract(NPC_SELF, N(interact_80241794));
@@ -272,7 +272,7 @@ EvtSource N(init_80242008) = SCRIPT({
 
 EvtSource N(init_8024202C) = SCRIPT({
     BindNpcInteract(NPC_SELF, N(interact_80241AB4));
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_SAW_TUBBA_EAT_BOO {
             SetNpcFlagBits(NPC_SELF, NPC_FLAG_100, TRUE);
         }
@@ -295,7 +295,7 @@ EvtSource N(init_8024202C) = SCRIPT({
 
 EvtSource N(init_8024212C) = SCRIPT({
     BindNpcInteract(NPC_SELF, N(interact_80241D88));
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_SAW_TUBBA_EAT_BOO {
             RemoveNpc(NPC_SELF);
         }
@@ -315,7 +315,7 @@ EvtSource N(init_8024212C) = SCRIPT({
 });
 
 EvtSource N(init_802421EC) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
         BindNpcIdle(NPC_SELF, N(idle_80241784));
     }
     BindNpcInteract(NPC_SELF, N(interact_80241E28));
@@ -477,7 +477,7 @@ StaticNpc N(npcGroup_8024223C)[] = {
 };
 
 EvtSource N(80242BEC) = SCRIPT({
-    loop SI_VAR(0) {
+    loop EVT_VAR(0) {
         PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0);
         ShakeCam(0, 0, 10, 0.5);
         sleep 5;
@@ -490,22 +490,22 @@ EvtSource N(80242C50) = SCRIPT({
     PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0);
     ShowEmote(2, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0);
     sleep 20;
-    GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(0) -= SI_VAR(3);
-    SI_VAR(0) -= 50;
-    SI_VAR(1) -= SI_VAR(4);
-    SI_VAR(2) -= SI_VAR(5);
-    GetNpcPos(NPC_BOO2, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SI_VAR(3) -= SI_VAR(0);
-    SI_VAR(4) -= SI_VAR(1);
-    SI_VAR(5) -= SI_VAR(2);
-    NpcMoveTo(NPC_BOO2, SI_VAR(3), SI_VAR(5), 30);
+    GetNpcPos(NPC_BOO2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetPlayerPos(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(0) -= EVT_VAR(3);
+    EVT_VAR(0) -= 50;
+    EVT_VAR(1) -= EVT_VAR(4);
+    EVT_VAR(2) -= EVT_VAR(5);
+    GetNpcPos(NPC_BOO2, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    EVT_VAR(3) -= EVT_VAR(0);
+    EVT_VAR(4) -= EVT_VAR(1);
+    EVT_VAR(5) -= EVT_VAR(2);
+    NpcMoveTo(NPC_BOO2, EVT_VAR(3), EVT_VAR(5), 30);
     SetCamType(0, 6, 1);
     SetCamSpeed(0, 5.0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamDistance(0, 350);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
@@ -527,12 +527,12 @@ EvtSource N(80242C50) = SCRIPT({
     InterpNpcYaw(NPC_BOO4, 90, 1);
     sleep 20;
     PlaySound(SOUND_BOO_APPEAR);
-    SI_VAR(0) = 240.0;
+    EVT_VAR(0) = 240.0;
     loop 20 {
-        SI_VAR(0) -= 12.0;
-        func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0);
-        func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0);
-        func_802CFD30(NPC_BOO4, 7, SI_VAR(0), 0, 0, 0);
+        EVT_VAR(0) -= 12.0;
+        func_802CFD30(NPC_BOO0, 7, EVT_VAR(0), 0, 0, 0);
+        func_802CFD30(NPC_BOO1, 7, EVT_VAR(0), 0, 0, 0);
+        func_802CFD30(NPC_BOO4, 7, EVT_VAR(0), 0, 0, 0);
         sleep 1;
     }
     SetNpcPos(NPC_BOO0, 420, 300, 220);
@@ -542,21 +542,21 @@ EvtSource N(80242C50) = SCRIPT({
     EnableNpcShadow(NPC_BOO1, FALSE);
     EnableNpcShadow(NPC_BOO4, FALSE);
     PlaySound(SOUND_BOO_VANISH);
-    SI_VAR(0) = 0.0;
+    EVT_VAR(0) = 0.0;
     loop 20 {
-        SI_VAR(0) += 12.0;
-        func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0);
-        func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0);
+        EVT_VAR(0) += 12.0;
+        func_802CFD30(NPC_BOO0, 7, EVT_VAR(0), 0, 0, 0);
+        func_802CFD30(NPC_BOO1, 7, EVT_VAR(0), 0, 0, 0);
         sleep 1;
     }
     SpeakToPlayer(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 0, MESSAGE_ID(0x0E, 0x00A1));
-    GetCurrentPartnerID(SI_VAR(0));
-    if (SI_VAR(0) != 9) {
+    GetCurrentPartnerID(EVT_VAR(0));
+    if (EVT_VAR(0) != 9) {
         N(SwitchToPartner)(9);
         spawn {
-            SI_MAP_VAR(0) = 0;
+            EVT_MAP_VAR(0) = 0;
             ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00A2), 160, 40);
-            SI_MAP_VAR(0) = 1;
+            EVT_MAP_VAR(0) = 1;
         }
         sleep 50;
         DisablePartnerAI(0);
@@ -564,7 +564,7 @@ EvtSource N(80242C50) = SCRIPT({
         EnablePartnerAI();
         loop {
             sleep 1;
-            if (SI_MAP_VAR(0) == 1) {
+            if (EVT_MAP_VAR(0) == 1) {
                 break loop;
             }
         }
@@ -602,18 +602,18 @@ EvtSource N(80242C50) = SCRIPT({
     spawn {
         PlaySound(SOUND_BOO_APPEAR);
         sleep 20;
-        SI_VAR(0) = 240.0;
+        EVT_VAR(0) = 240.0;
         loop 20 {
-            SI_VAR(0) -= 12.0;
-            func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0);
-            func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0);
+            EVT_VAR(0) -= 12.0;
+            func_802CFD30(NPC_BOO0, 7, EVT_VAR(0), 0, 0, 0);
+            func_802CFD30(NPC_BOO1, 7, EVT_VAR(0), 0, 0, 0);
             sleep 1;
         }
         SetNpcPos(NPC_BOO0, 0, -1000, 0);
         SetNpcPos(NPC_BOO1, 0, -1000, 0);
         sleep 10;
     }
-    SI_VAR(0) = 4;
+    EVT_VAR(0) = 4;
     spawn N(80242BEC);
     SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9);
     NpcMoveTo(NPC_WORLD_TUBBA, 550, 196, 0);
@@ -627,16 +627,16 @@ EvtSource N(80242C50) = SCRIPT({
     SetPanTarget(0, 426, 190, 194);
     PanToTarget(0, 0, 1);
     sleep 30;
-    SI_MAP_VAR(1) = 0;
+    EVT_MAP_VAR(1) = 0;
     spawn {
-        SI_VAR(0) = 7;
+        EVT_VAR(0) = 7;
         spawn N(80242BEC);
         SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9);
         NpcMoveTo(NPC_WORLD_TUBBA, 370, 220, 0);
-        GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcMoveTo(NPC_WORLD_TUBBA, 330, SI_VAR(2), 0);
+        GetNpcPos(NPC_BOO2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcMoveTo(NPC_WORLD_TUBBA, 330, EVT_VAR(2), 0);
         SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6);
-        SI_MAP_VAR(1) = 1;
+        EVT_MAP_VAR(1) = 1;
     }
     SetCamSpeed(0, 90.0);
     SetCamPitch(0, 17.0, -11.5);
@@ -651,7 +651,7 @@ EvtSource N(80242C50) = SCRIPT({
     sleep 15;
     loop {
         sleep 1;
-        if (SI_MAP_VAR(1) == 1) {
+        if (EVT_MAP_VAR(1) == 1) {
             break loop;
         }
     }
@@ -697,16 +697,16 @@ EvtSource N(80242C50) = SCRIPT({
     sleep 15;
     SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_21, NPC_ANIM_world_tubba_Palette_00_Anim_6, 5, MESSAGE_ID(0x0E, 0x00A7));
     SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_21);
-    GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += -50;
-    SI_VAR(1) += 50;
-    SI_VAR(2) += 10;
-    PlayEffect(0x6, 1, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10, 0, 0, 0, 0, 0, 0, 0, 0);
+    GetNpcPos(NPC_WORLD_TUBBA, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += -50;
+    EVT_VAR(1) += 50;
+    EVT_VAR(2) += 10;
+    PlayEffect(0x6, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10, 0, 0, 0, 0, 0, 0, 0, 0);
     sleep 20;
     SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6);
     InterpNpcYaw(NPC_WORLD_TUBBA, 90, 1);
     sleep 30;
-    SI_VAR(0) = 7;
+    EVT_VAR(0) = 7;
     spawn N(80242BEC);
     SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9);
     NpcMoveTo(NPC_WORLD_TUBBA, 370, 220, 0);
@@ -722,12 +722,12 @@ EvtSource N(80242C50) = SCRIPT({
     EnableNpcShadow(NPC_BOO1, TRUE);
     EnableNpcShadow(NPC_BOO4, TRUE);
     PlaySound(SOUND_BOO_VANISH);
-    SI_VAR(0) = 0.0;
+    EVT_VAR(0) = 0.0;
     loop 20 {
-        SI_VAR(0) += 12.5;
-        func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0);
-        func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0);
-        func_802CFD30(NPC_BOO4, 7, SI_VAR(0), 0, 0, 0);
+        EVT_VAR(0) += 12.5;
+        func_802CFD30(NPC_BOO0, 7, EVT_VAR(0), 0, 0, 0);
+        func_802CFD30(NPC_BOO1, 7, EVT_VAR(0), 0, 0, 0);
+        func_802CFD30(NPC_BOO4, 7, EVT_VAR(0), 0, 0, 0);
         sleep 1;
     }
     func_802CFD30(NPC_BOO0, 0, 0, 0, 0, 0);
@@ -736,9 +736,9 @@ EvtSource N(80242C50) = SCRIPT({
     sleep 10;
     SetCamType(0, 4, 0);
     SetCamSpeed(0, 3.0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
@@ -747,17 +747,17 @@ EvtSource N(80242C50) = SCRIPT({
 });
 
 EvtSource N(802441FC) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) {
         SetNpcPos(NPC_BOO2, 330, 184, 240);
         loop {
-            SI_VAR(10) = 0;
-            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            if (SI_VAR(2) >= 110) {
-                if (SI_VAR(0) >= 220) {
-                    SI_VAR(10) = 1;
+            EVT_VAR(10) = 0;
+            GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            if (EVT_VAR(2) >= 110) {
+                if (EVT_VAR(0) >= 220) {
+                    EVT_VAR(10) = 1;
                 }
             }
-            if (SI_VAR(10) == 1) {
+            if (EVT_VAR(10) == 1) {
                 break loop;
             }
             sleep 1;
@@ -767,13 +767,13 @@ EvtSource N(802441FC) = SCRIPT({
         BindNpcInteract(NPC_BOO0, N(interact_802418F4));
         BindNpcInteract(NPC_BOO1, N(interact_80241A84));
         BindNpcInteract(NPC_BOO4, N(interact_80241F88));
-        SI_STORY_PROGRESS = STORY_CH3_SAW_TUBBA_EAT_BOO;
+        EVT_STORY_PROGRESS = STORY_CH3_SAW_TUBBA_EAT_BOO;
         spawn N(80241360);
     }
 });
 
 EvtSource N(init_80244358) = SCRIPT({
-    if (SI_STORY_PROGRESS >= STORY_CH3_SAW_TUBBA_EAT_BOO) {
+    if (EVT_STORY_PROGRESS >= STORY_CH3_SAW_TUBBA_EAT_BOO) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -820,24 +820,24 @@ StaticNpc N(npcGroup_802443AC) = {
 };
 
 EvtSource N(idle_8024459C) = SCRIPT({
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = SI_VAR(0);
-    SI_VAR(3) += -60;
-    SI_VAR(4) = SI_VAR(0);
-    SI_VAR(4) += 60;
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = EVT_VAR(0);
+    EVT_VAR(3) += -60;
+    EVT_VAR(4) = EVT_VAR(0);
+    EVT_VAR(4) += 60;
     loop {
-        RandInt(5, SI_VAR(5));
-        SI_VAR(6) = (float) SI_VAR(5);
-        SI_VAR(6) *= 0.1005859375;
-        SI_VAR(6) += 0.80078125;
-        SetNpcSpeed(NPC_SELF, SI_VAR(6));
-        NpcMoveTo(NPC_SELF, SI_VAR(3), SI_VAR(2), 0);
-        RandInt(5, SI_VAR(5));
-        SI_VAR(6) = (float) SI_VAR(5);
-        SI_VAR(6) *= 0.1005859375;
-        SI_VAR(6) += 0.80078125;
-        SetNpcSpeed(NPC_SELF, SI_VAR(6));
-        NpcMoveTo(NPC_SELF, SI_VAR(4), SI_VAR(2), 0);
+        RandInt(5, EVT_VAR(5));
+        EVT_VAR(6) = (float) EVT_VAR(5);
+        EVT_VAR(6) *= 0.1005859375;
+        EVT_VAR(6) += 0.80078125;
+        SetNpcSpeed(NPC_SELF, EVT_VAR(6));
+        NpcMoveTo(NPC_SELF, EVT_VAR(3), EVT_VAR(2), 0);
+        RandInt(5, EVT_VAR(5));
+        EVT_VAR(6) = (float) EVT_VAR(5);
+        EVT_VAR(6) *= 0.1005859375;
+        EVT_VAR(6) += 0.80078125;
+        SetNpcSpeed(NPC_SELF, EVT_VAR(6));
+        NpcMoveTo(NPC_SELF, EVT_VAR(4), EVT_VAR(2), 0);
     }
 });
 

src/world/area_arn/arn_05/header.c

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

src/world/area_arn/arn_07/BECDF0.c

@@ -49,7 +49,7 @@ ApiStatus N(func_8024004C_BECE3C)(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
         arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct));
         script->varTable[0] = ptr;
-        set_variable(NULL, SI_MAP_VAR(1), ptr);
+        set_variable(NULL, EVT_MAP_VAR(1), ptr);
         ptr->unk_38 = get_variable(script, *args++);
         ptr->unk_3C = get_variable(script, *args++);
         ptr->unk_0C = get_float_variable(script, *args++);
@@ -222,18 +222,18 @@ s32 N(itemList_80242040)[] = {
 
 EvtSource N(80242048) = SCRIPT({
     FadeOutMusic(0, 1000);
-    SI_VAR(0) = 0;
-    if (SI_VAR(0) == 0) {
+    EVT_VAR(0) = 0;
+    if (EVT_VAR(0) == 0) {
         DisablePlayerInput(TRUE);
         UseSettingsFrom(0, 145, 65, 0);
         SetCamSpeed(0, 0.6005859375);
         SetPanTarget(0, 145, 30, 0);
-        GetCamDistance(0, SI_VAR(1));
-        SI_VAR(1) -= 100;
-        SetCamDistance(0, SI_VAR(1));
+        GetCamDistance(0, EVT_VAR(1));
+        EVT_VAR(1) -= 100;
+        SetCamDistance(0, EVT_VAR(1));
         if (10000 != 10000) {
-            GetCamPitch(0, SI_VAR(2), SI_VAR(3));
-            SetCamPitch(0, SI_VAR(2), 10000);
+            GetCamPitch(0, EVT_VAR(2), EVT_VAR(3));
+            SetCamPitch(0, EVT_VAR(2), 10000);
         }
         PanToTarget(0, 0, 1);
         N(func_8024004C_BECE3C)(2, 50, 100, 31, -6, 145, 65, 0, 30, 0);
@@ -261,14 +261,14 @@ EvtSource N(80242048) = SCRIPT({
             sleep 80;
             SetPlayerAnimation(ANIM_10002);
         }
-        SI_VAR(1) += 100;
-        SetCamDistance(0, SI_VAR(1));
+        EVT_VAR(1) += 100;
+        SetCamDistance(0, EVT_VAR(1));
         SetPanTarget(0, 145, 0, 0);
         N(func_802405BC_BED3AC)(2);
-        GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4));
-        UseSettingsFrom(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        GetPlayerPos(EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
+        UseSettingsFrom(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
         SetCamSpeed(0, 1.0);
-        SetPanTarget(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        SetPanTarget(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
         WaitForCam(0, 1.0);
         PanToTarget(0, 0, 0);
         DisablePlayerInput(FALSE);
@@ -282,24 +282,24 @@ EvtSource N(80242048) = SCRIPT({
     N(func_802405BC_BED3AC)(3);
     PlaySoundAtPlayer(312, 0);
     DisablePlayerInput(TRUE);
-    SI_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
+    EVT_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
     GotoMapSpecial("kmr_23", 2, 14);
     sleep 100;
 });
 
 EvtSource N(80242498) = SCRIPT({
-    SI_VAR(0) = 1;
-    if (SI_VAR(0) == 0) {
+    EVT_VAR(0) = 1;
+    if (EVT_VAR(0) == 0) {
         DisablePlayerInput(TRUE);
         UseSettingsFrom(0, 145, 65, 0);
         SetCamSpeed(0, 0.6005859375);
         SetPanTarget(0, 145, 30, 0);
-        GetCamDistance(0, SI_VAR(1));
-        SI_VAR(1) -= 100;
-        SetCamDistance(0, SI_VAR(1));
+        GetCamDistance(0, EVT_VAR(1));
+        EVT_VAR(1) -= 100;
+        SetCamDistance(0, EVT_VAR(1));
         if (10000 != 10000) {
-            GetCamPitch(0, SI_VAR(2), SI_VAR(3));
-            SetCamPitch(0, SI_VAR(2), 10000);
+            GetCamPitch(0, EVT_VAR(2), EVT_VAR(3));
+            SetCamPitch(0, EVT_VAR(2), 10000);
         }
         PanToTarget(0, 0, 1);
         N(func_8024004C_BECE3C)(2, 50, 100, 31, -6, 145, 65, 0, 30, 0);
@@ -327,14 +327,14 @@ EvtSource N(80242498) = SCRIPT({
             sleep 80;
             SetPlayerAnimation(ANIM_10002);
         }
-        SI_VAR(1) += 100;
-        SetCamDistance(0, SI_VAR(1));
+        EVT_VAR(1) += 100;
+        SetCamDistance(0, EVT_VAR(1));
         SetPanTarget(0, 145, 0, 0);
         N(func_802405BC_BED3AC)(2);
-        GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4));
-        UseSettingsFrom(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        GetPlayerPos(EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
+        UseSettingsFrom(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
         SetCamSpeed(0, 1.0);
-        SetPanTarget(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        SetPanTarget(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
         WaitForCam(0, 1.0);
         PanToTarget(0, 0, 0);
         DisablePlayerInput(FALSE);
@@ -348,7 +348,7 @@ EvtSource N(80242498) = SCRIPT({
     N(func_802405BC_BED3AC)(3);
     PlaySoundAtPlayer(312, 0);
     DisablePlayerInput(TRUE);
-    SI_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
+    EVT_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED;
     GotoMapSpecial("kmr_23", 2, 14);
     sleep 100;
 });
@@ -356,10 +356,10 @@ EvtSource N(80242498) = SCRIPT({
 EvtSource N(exitSingleDoor_802428D4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 10;
-    SI_VAR(2) = 29;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 10;
+    EVT_VAR(2) = 29;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_08", 0);
@@ -403,8 +403,8 @@ EvtSource N(80242A30) = SCRIPT({
             PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0);
             NpcJump0(NPC_TUBBAS_HEART, 0, 0, 0, 10);
             sleep 1;
-            GetNpcVar(0, 0, SI_VAR(0));
-            if (SI_VAR(0) == 1) {
+            GetNpcVar(0, 0, EVT_VAR(0));
+            if (EVT_VAR(0) == 1) {
                 break loop;
             }
         }
@@ -414,9 +414,9 @@ EvtSource N(80242A30) = SCRIPT({
         MakeLerp(80, 0, 10, 0);
         loop {
             UpdateLerp();
-            RotateModel(29, SI_VAR(0), 0, -1, 0);
+            RotateModel(29, EVT_VAR(0), 0, -1, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -426,8 +426,8 @@ EvtSource N(80242A30) = SCRIPT({
     SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_A, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 5, MESSAGE_ID(0x0E, 0x00C7));
     SetNpcVar(0, 0, 1);
     loop {
-        GetNpcVar(0, 0, SI_VAR(0));
-        if (SI_VAR(0) == 2) {
+        GetNpcVar(0, 0, EVT_VAR(0));
+        if (EVT_VAR(0) == 2) {
             break loop;
         }
         sleep 1;
@@ -465,9 +465,9 @@ EvtSource N(80242A30) = SCRIPT({
         MakeLerp(0, 80, 10, 0);
         loop {
             UpdateLerp();
-            RotateModel(29, SI_VAR(0), 0, -1, 0);
+            RotateModel(29, EVT_VAR(0), 0, -1, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -491,9 +491,9 @@ EvtSource N(80242A30) = SCRIPT({
         MakeLerp(80, 0, 10, 0);
         loop {
             UpdateLerp();
-            RotateModel(29, SI_VAR(0), 0, -1, 0);
+            RotateModel(29, EVT_VAR(0), 0, -1, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -510,7 +510,7 @@ EvtSource N(80242A30) = SCRIPT({
 EvtSource N(802433C8) = SCRIPT({
     bind N(exitWalk_80242978) TRIGGER_FLOOR_ABOVE 5;
     bind N(exitWalk_802429D4) TRIGGER_FLOOR_ABOVE 1;
-    if (SI_STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
         bind_padlock N(802439B0) TRIGGER_WALL_PRESS_A entity(0) N(itemList_80242040);
     } else {
         bind N(exitSingleDoor_802428D4) TRIGGER_WALL_PRESS_A 10;
@@ -518,26 +518,26 @@ EvtSource N(802433C8) = SCRIPT({
 });
 
 EvtSource N(enterWalk_8024346C) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            if (SI_STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+            if (EVT_STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
                 await N(80242A30);
                 spawn N(802433C8);
             } else {
-                SI_VAR(2) = 29;
-                SI_VAR(3) = 1;
+                EVT_VAR(2) = 29;
+                EVT_VAR(3) = 1;
                 await EnterSingleDoor;
                 spawn N(802433C8);
             }
         }
         == 1 {
-            SI_VAR(0) = N(802433C8);
+            EVT_VAR(0) = N(802433C8);
             spawn EnterWalk;
             sleep 1;
         }
         == 2 {
-            SI_VAR(0) = N(802433C8);
+            EVT_VAR(0) = N(802433C8);
             spawn EnterWalk;
             sleep 1;
         }
@@ -549,14 +549,14 @@ EvtSource N(enterWalk_8024346C) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
+    EVT_WORLD_LOCATION = LOCATION_GUSTY_GULCH;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    SI_SAVE_FLAG(1977) = 1;
-    match SI_STORY_PROGRESS {
+    EVT_SAVE_FLAG(1977) = 1;
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER {
             MakeNpcs(0, N(npcGroupList_802478B8));
         }
@@ -570,12 +570,12 @@ EvtSource N(main) = SCRIPT({
         }
     }
     await N(makeEntities);
-    if (SI_STORY_PROGRESS == STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
+    if (EVT_STORY_PROGRESS == STORY_CH3_DEFEATED_TUBBA_BLUBBA) {
         spawn N(80242498);
     }
     spawn N(enterWalk_8024346C);
-    GetEntryID(SI_VAR(0));
-    if (SI_VAR(0) == 3) {
+    GetEntryID(EVT_VAR(0));
+    if (EVT_VAR(0) == 3) {
         sleep 65;
     }
     spawn N(80243790);

src/world/area_arn/arn_07/BED5F0.c

@@ -1,11 +1,11 @@
 #include "arn_07.h"
 
 ApiStatus N(func_80240800_BED5F0)(Evt* script, s32 isInitialCall) {
-    f32 temp_f0 = get_float_variable(script, SI_VAR(0));
+    f32 temp_f0 = get_float_variable(script, EVT_VAR(0));
 
     if (temp_f0 >= 360.0) {
         temp_f0 -= 360.0;
     }
-    set_float_variable(script, SI_VAR(0), temp_f0);
+    set_float_variable(script, EVT_VAR(0), temp_f0);
     return ApiStatus_DONE2;
 }

src/world/area_arn/arn_07/events.c

@@ -12,37 +12,37 @@ EvtSource N(80243790) = SCRIPT({
 });
 
 EvtSource N(802437AC) = SCRIPT({
-    SI_VAR(0) = 0.0;
-    SI_VAR(1) = 30;
+    EVT_VAR(0) = 0.0;
+    EVT_VAR(1) = 30;
     PlaySoundAtModel(23, 0x8000004A, 0);
 0:
-    SI_VAR(0) += 1.0;
+    EVT_VAR(0) += 1.0;
     N(func_80240800_BED5F0)();
-    RotateModel(27, SI_VAR(0), 0, 0, 1);
+    RotateModel(27, EVT_VAR(0), 0, 0, 1);
     sleep 1;
-    SI_VAR(1) -= 1;
-    if (SI_VAR(1) > 0) {
+    EVT_VAR(1) -= 1;
+    if (EVT_VAR(1) > 0) {
         goto 0;
     }
-    SI_VAR(1) = 30;
-    RandInt(100, SI_VAR(2));
-    if (SI_VAR(2) > 10) {
+    EVT_VAR(1) = 30;
+    RandInt(100, EVT_VAR(2));
+    if (EVT_VAR(2) > 10) {
         goto 0;
     }
-    SI_VAR(2) = 1.0;
+    EVT_VAR(2) = 1.0;
     loop 50 {
-        SI_VAR(2) -= 0.0107421875;
-        SI_VAR(0) += (float) SI_VAR(2);
-        RotateModel(27, SI_VAR(0), 0, 0, 1);
+        EVT_VAR(2) -= 0.0107421875;
+        EVT_VAR(0) += (float) EVT_VAR(2);
+        RotateModel(27, EVT_VAR(0), 0, 0, 1);
         sleep 1;
     }
     loop 50 {
-        SI_VAR(2) += 0.0107421875;
-        SI_VAR(0) += (float) SI_VAR(2);
-        RotateModel(27, SI_VAR(0), 0, 0, 1);
+        EVT_VAR(2) += 0.0107421875;
+        EVT_VAR(0) += (float) EVT_VAR(2);
+        RotateModel(27, EVT_VAR(0), 0, 0, 1);
         sleep 1;
     }
-    SI_VAR(1) = 30;
+    EVT_VAR(1) = 30;
     goto 0;
 });
 
@@ -50,24 +50,24 @@ EvtSource N(802439B0) = SCRIPT({
     group 0;
     SetTimeFreezeMode(1);
     ShowKeyChoicePopup();
-    if (SI_VAR(0) == 0) {
+    if (EVT_VAR(0) == 0) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00D8), 160, 40);
         CloseChoicePopup();
         SetTimeFreezeMode(0);
         return;
     }
-    if (SI_VAR(0) == -1) {
+    if (EVT_VAR(0) == -1) {
         CloseChoicePopup();
         SetTimeFreezeMode(0);
         return;
     }
-    FindKeyItem(31, SI_VAR(0));
-    RemoveKeyItemAt(SI_VAR(0));
+    FindKeyItem(31, EVT_VAR(0));
+    RemoveKeyItemAt(EVT_VAR(0));
     CloseChoicePopup();
-    SI_STORY_PROGRESS = STORY_CH3_UNLOCKED_WINDY_MILL;
-    N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) = SI_MAP_VAR(0);
+    EVT_STORY_PROGRESS = STORY_CH3_UNLOCKED_WINDY_MILL;
+    N(GetEntityPosition)(EVT_MAP_VAR(0), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    PlaySoundAt(0x269, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) = EVT_MAP_VAR(0);
     N(SetEntityFlags100000)();
     SetTimeFreezeMode(0);
     unbind;
@@ -78,10 +78,10 @@ EvtSource N(80243B28) = SCRIPT({
 });
 
 EvtSource N(makeEntities) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_UNLOCKED_WINDY_MILL) {
         MakeEntity(0x802BCD68, 10, 30, -155, 0, MAKE_ENTITY_END);
         AssignScript(N(80243B28));
-        SI_MAP_VAR(0) = SI_VAR(0);
+        EVT_MAP_VAR(0) = EVT_VAR(0);
     }
 });
 
@@ -194,8 +194,8 @@ EvtSource N(80243E24) = SCRIPT({
     SetCamDistance(0, 300);
     SetCamSpeed(0, 2.0);
     SetCamPitch(0, 5.0, -16.0);
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     WaitForCam(0, 1.0);
 });
 
@@ -235,9 +235,9 @@ EvtSource N(80243FE8) = SCRIPT({
     sleep 45;
     UseSettingsFrom(0, 236, 0, -46);
     SetCamSpeed(0, 90.0);
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 50;
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 50;
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     PanToTarget(0, 0, 1);
     sleep 5;
     SetPlayerAnimation(ANIM_STAND_STILL);
@@ -247,8 +247,8 @@ EvtSource N(80243FE8) = SCRIPT({
         sleep 5;
         SetCamSpeed(0, 90.0);
         loop 40 {
-            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
     }
@@ -258,39 +258,39 @@ EvtSource N(80243FE8) = SCRIPT({
             PlayerFaceNpc(-1, 1);
         }
     }
-    SI_VAR(10) = spawn N(80243DCC);
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 800;
-    NpcMoveTo(NPC_SELF, SI_VAR(0), SI_VAR(2), 80);
-    kill SI_VAR(10);
+    EVT_VAR(10) = spawn N(80243DCC);
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 800;
+    NpcMoveTo(NPC_SELF, EVT_VAR(0), EVT_VAR(2), 80);
+    kill EVT_VAR(10);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
     EnableNpcShadow(NPC_SELF, FALSE);
-    SI_STORY_PROGRESS = STORY_CH3_DEFEATED_TUBBA_BLUBBA;
+    EVT_STORY_PROGRESS = STORY_CH3_DEFEATED_TUBBA_BLUBBA;
     SetMusicTrack(0, SONG_CHEERFUL_BOOS_MANSION, 0, 8);
-    GetCurrentPartnerID(SI_VAR(6));
-    if (SI_VAR(6) == 9) {
-        SI_VAR(5) = -4;
+    GetCurrentPartnerID(EVT_VAR(6));
+    if (EVT_VAR(6) == 9) {
+        EVT_VAR(5) = -4;
         func_802CF56C(0);
         DisablePartnerAI(0);
         SetNpcPos(NPC_PARTNER, 257, 25, 0);
     }
     SetCamSpeed(0, 90.0);
     SetCamDistance(0, 300);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 30;
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 30;
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     sleep 10;
-    if (SI_VAR(6) != 9) {
-        SI_VAR(5) = 8;
+    if (EVT_VAR(6) != 9) {
+        EVT_VAR(5) = 8;
         SetNpcPos(NPC_WORLD_BOW, 257, 25, 0);
         func_802CFD30(NPC_WORLD_BOW, 7, 0, 0, 0, 0);
         NpcFacePlayer(NPC_WORLD_BOW, 0);
         MakeLerp(0, 240, 20, 0);
         loop {
             UpdateLerp();
-            func_802CFD30(NPC_WORLD_BOW, 7, SI_VAR(0), 0, 0, 0);
+            func_802CFD30(NPC_WORLD_BOW, 7, EVT_VAR(0), 0, 0, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -298,31 +298,31 @@ EvtSource N(80243FE8) = SCRIPT({
     }
     sleep 10;
     spawn {
-        if (SI_VAR(6) != 9) {
+        if (EVT_VAR(6) != 9) {
             DisablePartnerAI(0);
             sleep 1;
             NpcFaceNpc(NPC_PARTNER, NPC_WORLD_BOW, 0);
             sleep 5;
         }
     }
-    SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0, MESSAGE_ID(0x0E, 0x00CD));
+    SpeakToPlayer(EVT_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0, MESSAGE_ID(0x0E, 0x00CD));
     InterpPlayerYaw(270, 0);
     sleep 10;
-    GetNpcPos(SI_VAR(5), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += -20;
-    SetCamProperties(0, 2.0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 300.0, 15.0, -7.0);
-    PlayerFaceNpc(SI_VAR(5), 0);
+    GetNpcPos(EVT_VAR(5), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += -20;
+    SetCamProperties(0, 2.0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 300.0, 15.0, -7.0);
+    PlayerFaceNpc(EVT_VAR(5), 0);
     sleep 10;
-    SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00CE));
+    SpeakToPlayer(EVT_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00CE));
     ShowChoice(1966093);
-    if (SI_VAR(0) == 0) {
-        ContinueSpeech(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0,
+    if (EVT_VAR(0) == 0) {
+        ContinueSpeech(EVT_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0,
                        MESSAGE_ID(0x0E, 0x00CF));
     } else {
-        ContinueSpeech(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0,
+        ContinueSpeech(EVT_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0,
                        MESSAGE_ID(0x0E, 0x00D0));
     }
-    SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00D1));
+    SpeakToPlayer(EVT_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00D1));
     UseSettingsFrom(0, 175, 0, 0);
     SetCamSpeed(0, 4.0);
     SetPanTarget(0, 175, 0, 0);
@@ -334,7 +334,7 @@ EvtSource N(80243FE8) = SCRIPT({
         InterpPlayerYaw(270, 0);
     }
     spawn {
-        if (SI_VAR(6) != 9) {
+        if (EVT_VAR(6) != 9) {
             sleep 12;
             InterpNpcYaw(NPC_PARTNER, 270, 0);
         }
@@ -342,20 +342,20 @@ EvtSource N(80243FE8) = SCRIPT({
     MakeLerp(160, 31, 70, 0);
     loop {
         UpdateLerp();
-        SetNpcPos(NPC_BOOTLER, 93, SI_VAR(0), -6);
+        SetNpcPos(NPC_BOOTLER, 93, EVT_VAR(0), -6);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
     spawn {
-        if (SI_VAR(6) != 9) {
+        if (EVT_VAR(6) != 9) {
             InterpNpcYaw(NPC_PARTNER, 90, 0);
         }
     }
-    SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00D2));
+    SpeakToPlayer(EVT_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00D2));
     spawn {
-        if (SI_VAR(6) != 9) {
+        if (EVT_VAR(6) != 9) {
             sleep 12;
             InterpNpcYaw(NPC_PARTNER, 270, 0);
         }
@@ -365,13 +365,13 @@ EvtSource N(80243FE8) = SCRIPT({
     spawn N(80242048);
     sleep 20;
     spawn {
-        if (SI_VAR(6) != 9) {
+        if (EVT_VAR(6) != 9) {
             MakeLerp(240, 0, 20, 0);
             loop {
                 UpdateLerp();
-                func_802CFD30(NPC_WORLD_BOW, 7, SI_VAR(0), 0, 0, 0);
+                func_802CFD30(NPC_WORLD_BOW, 7, EVT_VAR(0), 0, 0, 0);
                 sleep 1;
-                if (SI_VAR(1) == 0) {
+                if (EVT_VAR(1) == 0) {
                     break loop;
                 }
             }
@@ -391,8 +391,8 @@ EvtSource N(80243FE8) = SCRIPT({
 
 EvtSource N(idle_80244C54) = SCRIPT({
     loop {
-        GetSelfVar(0, SI_VAR(0));
-        if (SI_VAR(0) == 1) {
+        GetSelfVar(0, EVT_VAR(0));
+        if (EVT_VAR(0) == 1) {
             break loop;
         }
         sleep 1;
@@ -403,48 +403,48 @@ EvtSource N(idle_80244C54) = SCRIPT({
 EvtSource N(idle_80244CC8) = SCRIPT({
 10:
     loop {
-        GetSelfVar(0, SI_VAR(0));
-        if (SI_VAR(0) == 1) {
+        GetSelfVar(0, EVT_VAR(0));
+        if (EVT_VAR(0) == 1) {
             break loop;
         }
         sleep 1;
     }
     spawn {
-        SI_VAR(0) = 0.5;
+        EVT_VAR(0) = 0.5;
         MakeLerp(50, 80, 15, 0);
         loop {
             UpdateLerp();
-            SI_VAR(2) = (float) SI_VAR(0);
-            SI_VAR(2) /= (float) 100;
-            SetNpcScale(NPC_SELF, SI_VAR(2), SI_VAR(2), SI_VAR(2));
+            EVT_VAR(2) = (float) EVT_VAR(0);
+            EVT_VAR(2) /= (float) 100;
+            SetNpcScale(NPC_SELF, EVT_VAR(2), EVT_VAR(2), EVT_VAR(2));
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
     }
     spawn {
-        RandInt(80, SI_VAR(2));
-        RandInt(10, SI_VAR(3));
-        SI_VAR(3) += 5;
-        MakeLerp(SI_VAR(2), 240, SI_VAR(3), 0);
+        RandInt(80, EVT_VAR(2));
+        RandInt(10, EVT_VAR(3));
+        EVT_VAR(3) += 5;
+        MakeLerp(EVT_VAR(2), 240, EVT_VAR(3), 0);
         loop {
             UpdateLerp();
-            func_802CFD30(NPC_SELF, 7, SI_VAR(0), 0, 0, 0);
+            func_802CFD30(NPC_SELF, 7, EVT_VAR(0), 0, 0, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
     }
     SetNpcPos(NPC_SELF, 293, 59, 21);
     sleep 1;
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetNpcJumpscale(NPC_SELF, -0.2998046875);
-    RandInt(100, SI_VAR(3));
-    SI_VAR(0) -= SI_VAR(3);
-    SI_VAR(1) += 100;
-    NpcJump0(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20);
+    RandInt(100, EVT_VAR(3));
+    EVT_VAR(0) -= EVT_VAR(3);
+    EVT_VAR(1) += 100;
+    NpcJump0(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
     SetSelfVar(0, 0);
     goto 10;
@@ -452,8 +452,8 @@ EvtSource N(idle_80244CC8) = SCRIPT({
 
 EvtSource N(defeat_80244FB8) = SCRIPT({
     SetEncounterStatusFlags(2, 1);
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 1, 8);
             await N(80243E24);
@@ -466,7 +466,7 @@ EvtSource N(defeat_80244FB8) = SCRIPT({
 });
 
 EvtSource N(init_80245058) = SCRIPT({
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -475,7 +475,7 @@ EvtSource N(init_80245090) = SCRIPT({
     SetSelfVar(0, 0);
     BindNpcIdle(NPC_SELF, N(idle_80244C54));
     BindNpcDefeat(NPC_SELF, N(defeat_80244FB8));
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -483,19 +483,19 @@ EvtSource N(init_80245090) = SCRIPT({
 EvtSource N(init_80245104) = SCRIPT({
     SetSelfVar(0, 0);
     BindNpcIdle(NPC_SELF, N(idle_80244CC8));
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 EvtSource N(init_80245164) = SCRIPT({
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 EvtSource N(init_8024519C) = SCRIPT({
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WINDY_MILL) {
         RemoveNpc(NPC_SELF);
     }
 });
@@ -530,15 +530,15 @@ s32 N(extraAnimationList_80245208)[] = {
 EvtSource N(idle_80245210) = SCRIPT({
     loop {
         loop 10 {
-            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(1) -= 1;
-            SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(1) -= 1;
+            SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
         loop 10 {
-            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(1) += 1;
-            SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(1) += 1;
+            SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
     }
@@ -547,17 +547,17 @@ EvtSource N(idle_80245210) = SCRIPT({
 EvtSource N(80245304) = SCRIPT({
     DisablePartnerAI(0);
     func_802CF56C(2);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = SI_VAR(0);
-    SI_VAR(3) += -50;
-    SI_VAR(4) = SI_VAR(1);
-    SI_VAR(4) += 26;
-    SetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(3), SI_VAR(4), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = EVT_VAR(0);
+    EVT_VAR(3) += -50;
+    EVT_VAR(4) = EVT_VAR(1);
+    EVT_VAR(4) += 26;
+    SetNpcPos(NPC_WORLD_SKOLAR, EVT_VAR(3), EVT_VAR(4), EVT_VAR(2));
     PlayerFaceNpc(13, 0);
     NpcFaceNpc(NPC_PARTNER, NPC_WORLD_SKOLAR, 0);
-    SI_VAR(0) += -25;
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    EVT_VAR(0) += -25;
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamDistance(0, 475.0);
     SetCamPitch(0, 18, -8);
     SetCamSpeed(0, 90.0);
@@ -575,9 +575,9 @@ EvtSource N(80245304) = SCRIPT({
     MakeLerp(0, 360, 10, 0);
     loop {
         UpdateLerp();
-        SetNpcRotation(NPC_WORLD_SKOLAR, 0, SI_VAR(0), 0);
+        SetNpcRotation(NPC_WORLD_SKOLAR, 0, EVT_VAR(0), 0);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
@@ -586,22 +586,22 @@ EvtSource N(80245304) = SCRIPT({
     sleep 20;
     SetPlayerAnimation(ANIM_GOT_ITEM);
     PlaySoundAtPlayer(313, 0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(3) = SI_VAR(1);
-    SI_VAR(1) += 50;
-    SI_VAR(2) += 10;
-    SI_VAR(3) += 30;
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(3) = EVT_VAR(1);
+    EVT_VAR(1) += 50;
+    EVT_VAR(2) += 10;
+    EVT_VAR(3) += 30;
     loop 5 {
-        PlayEffect(0x11, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+        PlayEffect(0x11, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
         sleep 6;
-        PlayEffect(0x11, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+        PlayEffect(0x11, 1, EVT_VAR(0), EVT_VAR(3), EVT_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
         sleep 6;
     }
     sleep 20;
     PlaySoundAtPlayer(392, 0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    PlayEffect(0x52, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 30, 0, 0, 0, 0, 0, 0, 0);
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    PlayEffect(0x52, 4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1, 30, 0, 0, 0, 0, 0, 0, 0);
     sleep 30;
     SetPlayerAnimation(ANIM_10002);
     SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_1);
@@ -609,17 +609,17 @@ EvtSource N(80245304) = SCRIPT({
     PostChapter3StatUpdate();
     ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x0193), 160, 40);
     sleep 10;
-    GetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_WORLD_SKOLAR, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamDistance(0, 250.0);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
     sleep 10;
     SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_2, NPC_ANIM_world_skolar_Palette_00_Anim_1, 512, MESSAGE_ID(0x0E, 0x00D4));
     sleep 10;
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += -25;
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += -25;
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamDistance(0, 300.0);
     SetCamSpeed(0, 4.0);
     PanToTarget(0, 0, 1);
@@ -629,34 +629,34 @@ EvtSource N(80245304) = SCRIPT({
     SetNpcFlagBits(NPC_WORLD_SKOLAR, NPC_FLAG_40000, TRUE);
     spawn {
         loop 25 {
-            GetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+            GetNpcPos(NPC_WORLD_SKOLAR, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            PlayEffect(0x11, 4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
             sleep 4;
         }
     }
     spawn {
-        SI_VAR(2) = 0;
-        SI_VAR(3) = 1800;
-        MakeLerp(SI_VAR(2), SI_VAR(3), 100, 2);
+        EVT_VAR(2) = 0;
+        EVT_VAR(3) = 1800;
+        MakeLerp(EVT_VAR(2), EVT_VAR(3), 100, 2);
         loop {
             UpdateLerp();
-            SetNpcRotation(NPC_WORLD_SKOLAR, 0, SI_VAR(0), 0);
+            SetNpcRotation(NPC_WORLD_SKOLAR, 0, EVT_VAR(0), 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
     }
     spawn {
-        GetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(2), SI_VAR(3), SI_VAR(4));
-        SI_VAR(5) = SI_VAR(3);
-        SI_VAR(5) += 180;
-        MakeLerp(SI_VAR(3), SI_VAR(5), 100, 2);
+        GetNpcPos(NPC_WORLD_SKOLAR, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4));
+        EVT_VAR(5) = EVT_VAR(3);
+        EVT_VAR(5) += 180;
+        MakeLerp(EVT_VAR(3), EVT_VAR(5), 100, 2);
         loop {
             UpdateLerp();
-            SetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(2), SI_VAR(0), SI_VAR(4));
+            SetNpcPos(NPC_WORLD_SKOLAR, EVT_VAR(2), EVT_VAR(0), EVT_VAR(4));
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -672,15 +672,15 @@ EvtSource N(80245304) = SCRIPT({
     ResetCam(0, 3);
     sleep 20;
     SetPlayerAnimation(ANIM_10002);
-    SI_STORY_PROGRESS = STORY_CH3_STAR_SPRIT_DEPARTED;
+    EVT_STORY_PROGRESS = STORY_CH3_STAR_SPRIT_DEPARTED;
     spawn N(80241F10);
     EnablePartnerAI();
     DisablePlayerInput(FALSE);
 });
 
 EvtSource N(init_80245C9C) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    if (SI_VAR(0) == 3) {
+    GetEntryID(EVT_VAR(0));
+    if (EVT_VAR(0) == 3) {
         BindNpcIdle(NPC_SELF, N(idle_80245210));
         spawn N(80245304);
     } else {
@@ -995,8 +995,8 @@ StaticNpc N(npcGroup_80246E7C) = {
 };
 
 EvtSource N(init_8024706C) = SCRIPT({
-    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
-        if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (EVT_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
+        if (EVT_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
             RemoveNpc(NPC_SELF);
         }
     }

src/world/area_arn/arn_07/header.c

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

src/world/area_arn/arn_08/events.c

@@ -15,11 +15,11 @@ EvtSource N(802403B0) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     ClearDefeatedEnemies();
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 6;
-    SI_VAR(2) = 0;
-    SI_VAR(4) = 1;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 6;
+    EVT_VAR(2) = 0;
+    EVT_VAR(4) = 1;
+    EVT_VAR(3) = -1;
     spawn 0x80285DFC;
     sleep 17;
     GotoMap("arn_07", 0);
@@ -31,26 +31,26 @@ EvtSource N(80240470) = SCRIPT({
 });
 
 EvtSource N(8024049C) = SCRIPT({
-    GetLoadType(SI_VAR(1));
-    if (SI_VAR(1) == 1) {
+    GetLoadType(EVT_VAR(1));
+    if (EVT_VAR(1) == 1) {
         spawn EnterSavePoint;
         spawn N(80240470);
         return;
     }
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(4) = 1;
-            SI_VAR(2) = 0;
-            SI_VAR(3) = -1;
+            EVT_VAR(4) = 1;
+            EVT_VAR(2) = 0;
+            EVT_VAR(3) = -1;
             await 0x80285E24;
-            SI_AREA_FLAG(1) = 0;
+            EVT_AREA_FLAG(1) = 0;
             spawn N(80240470);
         }
         == 1 {
             DisablePlayerInput(TRUE);
             DisablePlayerPhysics(TRUE);
-            if (SI_STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WELL) {
+            if (EVT_STORY_PROGRESS == STORY_CH3_HEART_ESCAPED_WELL) {
                 SetPlayerPos(1000, 1000, 0);
                 SetNpcPos(NPC_PARTNER, 1000, 1000, 0);
                 RotateModel(0, 80, 0, -1, 0);
@@ -74,10 +74,10 @@ EvtSource N(8024049C) = SCRIPT({
                 MakeLerp(80, 0, 10, 0);
                 loop {
                     UpdateLerp();
-                    RotateModel(0, SI_VAR(0), 0, -1, 0);
-                    RotateModel(1, SI_VAR(0), 0, -1, 0);
+                    RotateModel(0, EVT_VAR(0), 0, -1, 0);
+                    RotateModel(1, EVT_VAR(0), 0, -1, 0);
                     sleep 1;
-                    if (SI_VAR(1) == 0) {
+                    if (EVT_VAR(1) == 0) {
                         break loop;
                     }
                 }
@@ -85,7 +85,7 @@ EvtSource N(8024049C) = SCRIPT({
                 sleep 20;
                 SetPlayerPos(0, 0, 0);
                 SetNpcPos(NPC_PARTNER, 0, 0, 0);
-                SI_STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WINDY_MILL;
+                EVT_STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WINDY_MILL;
             }
             DisablePlayerPhysics(FALSE);
             SetPlayerJumpscale(2.0);
@@ -97,23 +97,23 @@ EvtSource N(8024049C) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
+    EVT_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    SI_SAVE_FLAG(1979) = 1;
-    if (SI_STORY_PROGRESS >= STORY_CH4_FRYING_PAN_STOLEN) {
-        SI_SAVE_FLAG(1016) = 0;
-        SI_SAVE_FLAG(1017) = 0;
-        SI_SAVE_FLAG(1018) = 0;
+    EVT_SAVE_FLAG(1979) = 1;
+    if (EVT_STORY_PROGRESS >= STORY_CH4_FRYING_PAN_STOLEN) {
+        EVT_SAVE_FLAG(1016) = 0;
+        EVT_SAVE_FLAG(1017) = 0;
+        EVT_SAVE_FLAG(1018) = 0;
     }
     MakeNpcs(0, N(npcGroupList_80241828));
     await N(makeEntities);
     spawn N(80240BA0);
-    GetDemoState(SI_VAR(0));
-    if (SI_VAR(0) != 0) {
+    GetDemoState(EVT_VAR(0));
+    if (EVT_VAR(0) != 0) {
         await N(8024118C);
         return;
     }
@@ -128,7 +128,7 @@ static s32 N(pad_A6C) = {
 
 EvtSource N(80240A70) = SCRIPT({
     loop {
-        if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
+        if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
             break loop;
         }
         sleep 1;
@@ -137,9 +137,9 @@ EvtSource N(80240A70) = SCRIPT({
     DisablePlayerInput(TRUE);
     DisablePlayerPhysics(TRUE);
     N(func_80240000_BF47A0)();
-    SI_AREA_FLAG(1) = 1;
-    if (SI_STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
-        SI_STORY_PROGRESS = STORY_CH3_WENT_DOWN_THE_WELL;
+    EVT_AREA_FLAG(1) = 1;
+    if (EVT_STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
+        EVT_STORY_PROGRESS = STORY_CH3_WENT_DOWN_THE_WELL;
     }
     GotoMap("arn_09", 1);
     sleep 100;
@@ -157,14 +157,14 @@ static s32 N(pad_B98)[] = {
 EvtSource N(80240BA0) = SCRIPT({
     PlaySound(0x8000004B);
     spawn {
-        SI_VAR(0) = 0;
+        EVT_VAR(0) = 0;
 10:
-        RotateModel(9, SI_VAR(0), 0, 0, 1);
-        RotateModel(15, SI_VAR(0), 0, 0, 1);
-        RotateModel(11, SI_VAR(0), 0, 0, 1);
-        RotateModel(13, SI_VAR(0), 0, 0, -1);
-        RotateModel(17, SI_VAR(0), 0, 0, -1);
-        SI_VAR(0) += 1;
+        RotateModel(9, EVT_VAR(0), 0, 0, 1);
+        RotateModel(15, EVT_VAR(0), 0, 0, 1);
+        RotateModel(11, EVT_VAR(0), 0, 0, 1);
+        RotateModel(13, EVT_VAR(0), 0, 0, -1);
+        RotateModel(17, EVT_VAR(0), 0, 0, -1);
+        EVT_VAR(0) += 1;
         sleep 1;
         goto 10;
     }
@@ -233,10 +233,10 @@ EvtSource N(80240CC0) = SCRIPT({
     sleep 12;
     DemoSetButtons(0);
     sleep 20;
-    if (SI_SAVE_FLAG(9) == 1) {
+    if (EVT_SAVE_FLAG(9) == 1) {
         return;
     }
-    SI_SAVE_FLAG(9) = 1;
+    EVT_SAVE_FLAG(9) = 1;
     GotoMapSpecial("arn_08", 2, 2);
     sleep 100;
 });
@@ -244,16 +244,16 @@ EvtSource N(80240CC0) = SCRIPT({
 EvtSource N(802410AC) = SCRIPT({
     sleep 10;
     loop {
-        GetDemoState(SI_VAR(0));
-        if (SI_VAR(0) == 2) {
+        GetDemoState(EVT_VAR(0));
+        if (EVT_VAR(0) == 2) {
             break loop;
         }
         sleep 1;
     }
-    if (SI_SAVE_FLAG(9) == 1) {
+    if (EVT_SAVE_FLAG(9) == 1) {
         return;
     }
-    SI_SAVE_FLAG(9) = 1;
+    EVT_SAVE_FLAG(9) = 1;
     GotoMapSpecial("arn_08", 2, 3);
     sleep 35;
 });
@@ -269,7 +269,7 @@ s32 N(D_80241188_BF5928) = {
 EvtSource N(8024118C) = SCRIPT({
     SetCamProperties(0, 90.0, 0, 0, 0, 470.0, 17.0, -7.0);
     N(func_8024019C_BF493C)();
-    SI_SAVE_FLAG(9) = 0;
+    EVT_SAVE_FLAG(9) = 0;
     spawn N(802410AC);
     spawn N(80240CC0);
 });
@@ -305,7 +305,7 @@ EvtSource N(idle_80241278) = SCRIPT({
 });
 
 EvtSource N(init_80241288) = SCRIPT({
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_ESCAPED_WELL) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
     } else {
         BindNpcIdle(NPC_SELF, N(idle_80241278));
@@ -313,7 +313,7 @@ EvtSource N(init_80241288) = SCRIPT({
 });
 
 EvtSource N(interact_802412E8) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH5_WHALE_MOUTH_OPEN {
             SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BA));
         }
@@ -333,7 +333,7 @@ EvtSource N(interact_802412E8) = SCRIPT({
 });
 
 EvtSource N(init_802413E8) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+    if (EVT_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
     } else {
         BindNpcInteract(NPC_SELF, N(interact_802412E8));
@@ -412,7 +412,7 @@ static s32 N(pad_184C) = {
 };
 
 EvtSource N(makeEntities) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_WENT_DOWN_THE_WELL) {
         MakeEntity(0x802BCE84, 0, 30, 0, 0, MAKE_ENTITY_END);
     }
 });

src/world/area_arn/arn_08/header.c

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

src/world/area_arn/arn_09/events.c

@@ -6,11 +6,11 @@ extern s32 D_000001E4;
 EvtSource N(80240140) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 5;
-    SI_VAR(2) = 0;
-    SI_VAR(4) = 1;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 5;
+    EVT_VAR(2) = 0;
+    EVT_VAR(4) = 1;
+    EVT_VAR(3) = 1;
     spawn 0x80285DFC;
     sleep 17;
     GotoMap("arn_10", 0);
@@ -22,12 +22,12 @@ EvtSource N(802401F4) = SCRIPT({
 });
 
 EvtSource N(80240220) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 0;
-            SI_VAR(4) = 1;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 0;
+            EVT_VAR(4) = 1;
+            EVT_VAR(3) = 1;
             await 0x80285E24;
             spawn N(802401F4);
         }
@@ -38,7 +38,7 @@ EvtSource N(80240220) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
+    EVT_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524288);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -56,10 +56,10 @@ static s32 N(pad_398)[] = {
 };
 
 EvtSource N(802403A0) = SCRIPT({
-    if (SI_AREA_FLAG(1) == 1) {
+    if (EVT_AREA_FLAG(1) == 1) {
         return;
     }
-    SI_AREA_FLAG(1) = 1;
+    EVT_AREA_FLAG(1) = 1;
     DisablePlayerInput(TRUE);
     DisablePlayerPhysics(TRUE);
     SetPlayerActionState(6);
@@ -82,10 +82,10 @@ static s32 N(pad_4CC)[] = {
 };
 
 EvtSource N(802404D0) = SCRIPT({
-    if (SI_AREA_FLAG(1) == 0) {
+    if (EVT_AREA_FLAG(1) == 0) {
         return;
     }
-    SI_AREA_FLAG(1) = 1;
+    EVT_AREA_FLAG(1) = 1;
     DisablePlayerInput(TRUE);
     SetPlayerActionState(8);
     func_802D2484();
@@ -93,7 +93,7 @@ EvtSource N(802404D0) = SCRIPT({
     SetPlayerJumpscale(1.5);
     PlayerJump(50, 0, 0, 16);
     SetPlayerAnimation(ANIM_10002);
-    SI_AREA_FLAG(1) = 0;
+    EVT_AREA_FLAG(1) = 0;
     DisablePlayerInput(FALSE);
 });
 
@@ -130,11 +130,11 @@ EvtSource N(idle_802405FC) = SCRIPT({
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
     NpcJump0(NPC_SELF, 0, 200, 0, 15);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    SI_STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WELL;
+    EVT_STORY_PROGRESS = STORY_CH3_HEART_ESCAPED_WELL;
 });
 
 EvtSource N(init_80240730) = SCRIPT({
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_FLED_SECOND_TUNNEL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_FLED_SECOND_TUNNEL) {
         RemoveNpc(NPC_SELF);
     } else {
         BindNpcIdle(NPC_SELF, N(idle_802405FC));

src/world/area_arn/arn_09/header.c

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

src/world/area_arn/arn_10/events.c

@@ -5,10 +5,10 @@
 EvtSource N(exitSingleDoor_80240100) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 6;
-    SI_VAR(2) = 0;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 6;
+    EVT_VAR(2) = 0;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_09", 0);
@@ -18,10 +18,10 @@ EvtSource N(exitSingleDoor_80240100) = SCRIPT({
 EvtSource N(exitSingleDoor_802401A4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 11;
-    SI_VAR(2) = 2;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 11;
+    EVT_VAR(2) = 2;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_12", 0);
@@ -34,17 +34,17 @@ EvtSource N(80240248) = SCRIPT({
 });
 
 EvtSource N(enterSingleDoor_80240290) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 0;
-            SI_VAR(3) = -1;
+            EVT_VAR(2) = 0;
+            EVT_VAR(3) = -1;
             await EnterSingleDoor;
             spawn N(80240248);
         }
         == 1 {
-            SI_VAR(2) = 2;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 2;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
             spawn N(80240248);
         }
@@ -52,7 +52,7 @@ EvtSource N(enterSingleDoor_80240290) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
+    EVT_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524289);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -114,44 +114,44 @@ NpcSettings N(npcSettings_802404CC) = {
 EvtSource N(idle_802404F8) = SCRIPT({
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
     SetNpcJumpscale(NPC_SELF, 3.0);
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 30;
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 30;
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 8);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 8);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14);
     sleep 1;
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
-    SI_VAR(0) -= 80;
+    EVT_VAR(0) -= 80;
     SetNpcJumpscale(NPC_SELF, 2.5);
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 12);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14);
     sleep 1;
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
-    SI_VAR(0) -= 80;
+    EVT_VAR(0) -= 80;
     SetNpcJumpscale(NPC_SELF, 2.5);
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 12);
     EnableNpcShadow(NPC_SELF, FALSE);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    SI_STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
+    EVT_STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
 });
 
 EvtSource N(defeat_802406F4) = SCRIPT({
-    SI_SAVE_FLAG(1016) = 1;
+    EVT_SAVE_FLAG(1016) = 1;
     DoNpcDefeat();
 });
 
 EvtSource N(init_80240720) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_802404F8));
-    if (SI_STORY_PROGRESS != STORY_UNUSED_FFFFFFEC) {
+    if (EVT_STORY_PROGRESS != STORY_UNUSED_FFFFFFEC) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 EvtSource N(init_8024076C) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
-        if (SI_SAVE_FLAG(1016) == 1) {
+    if (EVT_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+        if (EVT_SAVE_FLAG(1016) == 1) {
             RemoveNpc(NPC_SELF);
             return;
         }

src/world/area_arn/arn_10/header.c

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

src/world/area_arn/arn_11/events.c

@@ -36,12 +36,12 @@ EvtSource N(802401BC) = SCRIPT({
     SetPlayerAnimation(0x90000);
     spawn {
         SetNpcJumpscale(NPC_TUBBAS_HEART, 2.5);
-        GetNpcPos(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        GetNpcPos(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0);
-        NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+        NpcJump0(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
         sleep 1;
         PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0);
-        NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+        NpcJump0(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
     }
     sleep 40;
     SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_B, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00C2));
@@ -54,10 +54,10 @@ EvtSource N(802401BC) = SCRIPT({
 EvtSource N(exitSingleDoor_80240428) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 2;
-    SI_VAR(2) = 0;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 2;
+    EVT_VAR(2) = 0;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_13", 1);
@@ -70,11 +70,11 @@ EvtSource N(802404CC) = SCRIPT({
 
 EvtSource N(enterSingleDoor_802404F8) = SCRIPT({
     DisablePlayerInput(TRUE);
-    SI_VAR(2) = 0;
-    SI_VAR(3) = -1;
+    EVT_VAR(2) = 0;
+    EVT_VAR(3) = -1;
     await EnterSingleDoor;
     spawn N(802404CC);
-    if (SI_STORY_PROGRESS < STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
         sleep 10;
         spawn N(802400F0);
         spawn N(802401BC);
@@ -84,7 +84,7 @@ EvtSource N(enterSingleDoor_802404F8) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
+    EVT_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524290);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -118,8 +118,8 @@ NpcSettings N(npcSettings_802406A0) = {
 
 EvtSource N(idle_802406CC) = SCRIPT({
     loop {
-        GetSelfVar(0, SI_VAR(0));
-        if (SI_VAR(0) != 0) {
+        GetSelfVar(0, EVT_VAR(0));
+        if (EVT_VAR(0) != 0) {
             break loop;
         }
         sleep 1;
@@ -127,10 +127,10 @@ EvtSource N(idle_802406CC) = SCRIPT({
     spawn {
         SetCamType(0, 6, 1);
         SetCamSpeed(0, 4.0);
-        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 50;
-        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 50;
+        UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         SetCamDistance(0, 3000);
         PanToTarget(0, 0, 1);
         WaitForCam(0, 1.0);
@@ -144,9 +144,9 @@ EvtSource N(8024081C) = SCRIPT({
     MakeLerp(0, 80, 10, 0);
     loop {
         UpdateLerp();
-        RotateModel(0, SI_VAR(0), 0, -1, 0);
+        RotateModel(0, EVT_VAR(0), 0, -1, 0);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
@@ -156,9 +156,9 @@ EvtSource N(802408D8) = SCRIPT({
     MakeLerp(80, 0, 10, 0);
     loop {
         UpdateLerp();
-        RotateModel(0, SI_VAR(0), 0, -1, 0);
+        RotateModel(0, EVT_VAR(0), 0, -1, 0);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
@@ -175,20 +175,20 @@ EvtSource N(defeat_802409DC) = SCRIPT({
     spawn {
         SetCamType(0, 6, 1);
         SetCamSpeed(0, 90.0);
-        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(0) += 50;
-        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(0) += 50;
+        UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         SetCamDistance(0, 450);
         PanToTarget(0, 0, 1);
     }
     sleep 10;
     PlayerFaceNpc(0, 1);
     loop 2 {
-        GetNpcPos(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        GetNpcPos(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
         SetNpcJumpscale(NPC_TUBBAS_HEART, 2.5);
         PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-        NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 12);
+        NpcJump0(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 12);
         sleep 1;
     }
     spawn {
@@ -205,40 +205,40 @@ EvtSource N(defeat_802409DC) = SCRIPT({
     PlayerFaceNpc(0, 1);
     buf_use N(intTable_80240988);
     loop {
-        buf_read SI_VAR(0) SI_VAR(1) SI_VAR(2);
-        if (SI_VAR(0) == -10000) {
+        buf_read EVT_VAR(0) EVT_VAR(1) EVT_VAR(2);
+        if (EVT_VAR(0) == -10000) {
             break loop;
         }
         PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-        NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 12);
+        NpcJump0(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 12);
         sleep 1;
     }
     spawn N(8024081C);
     loop {
-        buf_read SI_VAR(0) SI_VAR(1) SI_VAR(2);
-        if (SI_VAR(0) == -10000) {
+        buf_read EVT_VAR(0) EVT_VAR(1) EVT_VAR(2);
+        if (EVT_VAR(0) == -10000) {
             break loop;
         }
         PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-        NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 12);
+        NpcJump0(NPC_TUBBAS_HEART, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 12);
         sleep 1;
     }
     spawn N(802408D8);
     sleep 30;
     SetCamType(0, 6, 1);
     SetCamSpeed(0, 90.0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamDistance(0, 450);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
-    SI_STORY_PROGRESS = STORY_CH3_HEART_FLED_FIRST_TUNNEL;
+    EVT_STORY_PROGRESS = STORY_CH3_HEART_FLED_FIRST_TUNNEL;
 });
 
 EvtSource N(init_80240E70) = SCRIPT({
-    if (SI_STORY_PROGRESS >= STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
+    if (EVT_STORY_PROGRESS >= STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
         RemoveNpc(NPC_SELF);
     } else {
         SetSelfVar(0, 0);

src/world/area_arn/arn_11/header.c

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

src/world/area_arn/arn_12/events.c

@@ -5,10 +5,10 @@
 EvtSource N(exitSingleDoor_80240100) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 2;
-    SI_VAR(2) = 0;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 2;
+    EVT_VAR(2) = 0;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_10", 1);
@@ -18,10 +18,10 @@ EvtSource N(exitSingleDoor_80240100) = SCRIPT({
 EvtSource N(exitSingleDoor_802401A4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 7;
-    SI_VAR(2) = 2;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 7;
+    EVT_VAR(2) = 2;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_13", 0);
@@ -34,17 +34,17 @@ EvtSource N(80240248) = SCRIPT({
 });
 
 EvtSource N(enterSingleDoor_80240290) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 0;
-            SI_VAR(3) = -1;
+            EVT_VAR(2) = 0;
+            EVT_VAR(3) = -1;
             await EnterSingleDoor;
             spawn N(80240248);
         }
         == 1 {
-            SI_VAR(2) = 2;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 2;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
             spawn N(80240248);
         }
@@ -52,7 +52,7 @@ EvtSource N(enterSingleDoor_80240290) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
+    EVT_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524291);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -113,44 +113,44 @@ NpcSettings N(npcSettings_802404BC) = {
 EvtSource N(idle_802404E8) = SCRIPT({
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
     SetNpcJumpscale(NPC_SELF, 3.0);
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 30;
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 30;
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 8);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 8);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14);
     sleep 1;
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
-    SI_VAR(0) -= 80;
+    EVT_VAR(0) -= 80;
     SetNpcJumpscale(NPC_SELF, 2.5);
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 12);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14);
     sleep 1;
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
-    SI_VAR(0) -= 80;
+    EVT_VAR(0) -= 80;
     SetNpcJumpscale(NPC_SELF, 2.5);
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 12);
     EnableNpcShadow(NPC_SELF, FALSE);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    SI_STORY_PROGRESS = STORY_UNUSED_FFFFFFEC;
+    EVT_STORY_PROGRESS = STORY_UNUSED_FFFFFFEC;
 });
 
 EvtSource N(defeat_802406E4) = SCRIPT({
-    SI_SAVE_FLAG(1017) = 1;
+    EVT_SAVE_FLAG(1017) = 1;
     DoNpcDefeat();
 });
 
 EvtSource N(init_80240710) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_802404E8));
-    if (SI_STORY_PROGRESS != STORY_UNUSED_FFFFFFEB) {
+    if (EVT_STORY_PROGRESS != STORY_UNUSED_FFFFFFEB) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 EvtSource N(init_8024075C) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
-        if (SI_SAVE_FLAG(1017) == 1) {
+    if (EVT_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+        if (EVT_SAVE_FLAG(1017) == 1) {
             RemoveNpc(NPC_SELF);
             return;
         }

src/world/area_arn/arn_12/header.c

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

src/world/area_arn/arn_13/events.c

@@ -5,10 +5,10 @@
 EvtSource N(exitSingleDoor_80240100) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 2;
-    SI_VAR(2) = 0;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 2;
+    EVT_VAR(2) = 0;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_12", 1);
@@ -18,10 +18,10 @@ EvtSource N(exitSingleDoor_80240100) = SCRIPT({
 EvtSource N(exitSingleDoor_802401A4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 7;
-    SI_VAR(2) = 2;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 7;
+    EVT_VAR(2) = 2;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("arn_11", 0);
@@ -34,17 +34,17 @@ EvtSource N(80240248) = SCRIPT({
 });
 
 EvtSource N(enterSingleDoor_80240290) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 0;
-            SI_VAR(3) = -1;
+            EVT_VAR(2) = 0;
+            EVT_VAR(3) = -1;
             await EnterSingleDoor;
             spawn N(80240248);
         }
         == 1 {
-            SI_VAR(2) = 2;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 2;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
             spawn N(80240248);
         }
@@ -52,7 +52,7 @@ EvtSource N(enterSingleDoor_80240290) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_WINDY_MILL;
+    EVT_WORLD_LOCATION = LOCATION_WINDY_MILL;
     SetSpriteShading(524292);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -114,44 +114,44 @@ NpcSettings N(npcSettings_802404CC) = {
 EvtSource N(idle_802404F8) = SCRIPT({
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
     SetNpcJumpscale(NPC_SELF, 3.0);
-    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) -= 30;
+    GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) -= 30;
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 8);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 8);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14);
     sleep 1;
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
-    SI_VAR(0) -= 80;
+    EVT_VAR(0) -= 80;
     SetNpcJumpscale(NPC_SELF, 2.5);
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 12);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14);
     sleep 1;
     SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13);
-    SI_VAR(0) -= 80;
+    EVT_VAR(0) -= 80;
     SetNpcJumpscale(NPC_SELF, 2.5);
     PlaySoundAtNpc(NPC_SELF, 0x20C8, 0);
-    NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12);
+    NpcJump0(NPC_SELF, EVT_VAR(0), 0, EVT_VAR(2), 12);
     EnableNpcShadow(NPC_SELF, FALSE);
     SetNpcPos(NPC_SELF, 0, -1000, 0);
-    SI_STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
+    EVT_STORY_PROGRESS = STORY_CH3_HEART_FLED_SECOND_TUNNEL;
 });
 
 EvtSource N(defeat_802406F4) = SCRIPT({
-    SI_SAVE_FLAG(1018) = 1;
+    EVT_SAVE_FLAG(1018) = 1;
     DoNpcDefeat();
 });
 
 EvtSource N(init_80240720) = SCRIPT({
     BindNpcIdle(NPC_SELF, N(idle_802404F8));
-    if (SI_STORY_PROGRESS != STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
+    if (EVT_STORY_PROGRESS != STORY_CH3_HEART_FLED_FIRST_TUNNEL) {
         RemoveNpc(NPC_SELF);
     }
 });
 
 EvtSource N(init_8024076C) = SCRIPT({
-    if (SI_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
-        if (SI_SAVE_FLAG(1018) == 1) {
+    if (EVT_STORY_PROGRESS < STORY_CH4_FRYING_PAN_STOLEN) {
+        if (EVT_SAVE_FLAG(1018) == 1) {
             RemoveNpc(NPC_SELF);
             return;
         }

src/world/area_arn/arn_13/header.c

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

src/world/area_dgb/dgb_00/BFA0A0.c

@@ -22,7 +22,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(80240110) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8);
         }
@@ -45,10 +45,10 @@ EvtSource N(exitDoubleDoor_8024021C) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 18;
-    SI_VAR(2) = 5;
-    SI_VAR(3) = 7;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 18;
+    EVT_VAR(2) = 5;
+    EVT_VAR(3) = 7;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_01", 0);
@@ -57,7 +57,7 @@ EvtSource N(exitDoubleDoor_8024021C) = SCRIPT({
 
 EvtSource N(802402D0) = SCRIPT({
     bind N(exitWalk_802401C0) TRIGGER_FLOOR_ABOVE 15;
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES {
             bind N(exitDoubleDoor_8024021C) TRIGGER_WALL_PRESS_A 18;
         }
@@ -72,22 +72,22 @@ EvtSource N(802402D0) = SCRIPT({
 });
 
 EvtSource N(enterDoubleDoor_8024038C) = SCRIPT({
-    GetLoadType(SI_VAR(1));
-    if (SI_VAR(1) == 1) {
+    GetLoadType(EVT_VAR(1));
+    if (EVT_VAR(1) == 1) {
         spawn EnterSavePoint;
         spawn N(802402D0);
         return;
     }
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(0) = N(802402D0);
+            EVT_VAR(0) = N(802402D0);
             spawn EnterWalk;
             sleep 1;
         }
         == 1 {
-            if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) {
-                if (SI_STORY_PROGRESS < STORY_CH3_ESCAPED_TUBBAS_MANOR) {
+            if (EVT_STORY_PROGRESS >= STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) {
+                if (EVT_STORY_PROGRESS < STORY_CH3_ESCAPED_TUBBAS_MANOR) {
                     spawn N(802402D0);
                     spawn {
                         await N(8024103C);
@@ -97,8 +97,8 @@ EvtSource N(enterDoubleDoor_8024038C) = SCRIPT({
                 }
             }
             UseDoorSounds(3);
-            SI_VAR(2) = 5;
-            SI_VAR(3) = 7;
+            EVT_VAR(2) = 5;
+            EVT_VAR(3) = 7;
             await EnterDoubleDoor;
             spawn N(802402D0);
         }
@@ -110,15 +110,15 @@ EvtSource N(enterDoubleDoor_8024038C) = SCRIPT({
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
-    SI_SAVE_FLAG(1978) = 1;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_SAVE_FLAG(1978) = 1;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    GetEntryID(SI_VAR(0));
-    if (SI_VAR(0) == 2) {
+    GetEntryID(EVT_VAR(0));
+    if (EVT_VAR(0) == 2) {
         MakeNpcs(0, N(npcGroupList_80243740));
     } else {
         MakeNpcs(0, N(npcGroupList_802436EC));

src/world/area_dgb/dgb_00/BFA100.c

@@ -30,31 +30,31 @@ NpcSettings N(npcSettings_8024066C) = {
 };
 
 EvtSource N(80240698) = SCRIPT({
-    SI_VAR(3) = 0;
-    SI_VAR(3) -= SI_VAR(2);
+    EVT_VAR(3) = 0;
+    EVT_VAR(3) -= EVT_VAR(2);
     ModifyColliderFlags(0, 18, 0x7FFFFE00);
     PlaySoundAtCollider(18, 455, 0);
     MakeLerp(0, 80, 30, 0);
 10:
     UpdateLerp();
-    RotateModel(7, SI_VAR(0), 0, SI_VAR(2), 0);
-    RotateModel(5, SI_VAR(0), 0, SI_VAR(3), 0);
+    RotateModel(7, EVT_VAR(0), 0, EVT_VAR(2), 0);
+    RotateModel(5, EVT_VAR(0), 0, EVT_VAR(3), 0);
     sleep 1;
-    if (SI_VAR(1) != 0) {
+    if (EVT_VAR(1) != 0) {
         goto 10;
     }
 });
 
 EvtSource N(8024079C) = SCRIPT({
-    SI_VAR(3) = 0;
-    SI_VAR(3) -= SI_VAR(2);
+    EVT_VAR(3) = 0;
+    EVT_VAR(3) -= EVT_VAR(2);
     MakeLerp(80, 0, 12, 0);
 10:
     UpdateLerp();
-    RotateModel(7, SI_VAR(0), 0, SI_VAR(2), 0);
-    RotateModel(5, SI_VAR(0), 0, SI_VAR(3), 0);
+    RotateModel(7, EVT_VAR(0), 0, EVT_VAR(2), 0);
+    RotateModel(5, EVT_VAR(0), 0, EVT_VAR(3), 0);
     sleep 1;
-    if (SI_VAR(1) != 0) {
+    if (EVT_VAR(1) != 0) {
         goto 10;
     }
     ModifyColliderFlags(1, 18, 0x7FFFFE00);
@@ -62,39 +62,39 @@ EvtSource N(8024079C) = SCRIPT({
 });
 
 EvtSource N(802408A0) = SCRIPT({
-    GetNpcPos(NPC_BOO0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 200;
-    NpcMoveTo(NPC_BOO0, SI_VAR(0), SI_VAR(2), 46);
+    GetNpcPos(NPC_BOO0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 200;
+    NpcMoveTo(NPC_BOO0, EVT_VAR(0), EVT_VAR(2), 46);
 });
 
 EvtSource N(802408F8) = SCRIPT({
-    GetNpcPos(NPC_BOO1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 200;
-    NpcMoveTo(NPC_BOO1, SI_VAR(0), SI_VAR(2), 50);
+    GetNpcPos(NPC_BOO1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 200;
+    NpcMoveTo(NPC_BOO1, EVT_VAR(0), EVT_VAR(2), 50);
 });
 
 EvtSource N(80240950) = SCRIPT({
-    GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 200;
-    NpcMoveTo(NPC_BOO2, SI_VAR(0), SI_VAR(2), 53);
+    GetNpcPos(NPC_BOO2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 200;
+    NpcMoveTo(NPC_BOO2, EVT_VAR(0), EVT_VAR(2), 53);
 });
 
 EvtSource N(802409A8) = SCRIPT({
-    GetNpcPos(NPC_BOO3, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 200;
-    NpcMoveTo(NPC_BOO3, SI_VAR(0), SI_VAR(2), 46);
+    GetNpcPos(NPC_BOO3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 200;
+    NpcMoveTo(NPC_BOO3, EVT_VAR(0), EVT_VAR(2), 46);
 });
 
 EvtSource N(80240A00) = SCRIPT({
-    GetNpcPos(NPC_BOO4, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 200;
-    NpcMoveTo(NPC_BOO4, SI_VAR(0), SI_VAR(2), 50);
+    GetNpcPos(NPC_BOO4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 200;
+    NpcMoveTo(NPC_BOO4, EVT_VAR(0), EVT_VAR(2), 50);
 });
 
 EvtSource N(80240A58) = SCRIPT({
-    GetNpcPos(NPC_BOO5, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 200;
-    NpcMoveTo(NPC_BOO5, SI_VAR(0), SI_VAR(2), 53);
+    GetNpcPos(NPC_BOO5, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 200;
+    NpcMoveTo(NPC_BOO5, EVT_VAR(0), EVT_VAR(2), 53);
 });
 
 EvtSource N(80240AB0) = SCRIPT({
@@ -157,37 +157,37 @@ EvtSource N(80240D90) = SCRIPT({
 });
 
 EvtSource N(80240DDC) = SCRIPT({
-    GetNpcPos(NPC_BOO0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_BOO0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     loop {
-        RandInt(5, SI_VAR(10));
-        SI_VAR(10) += 2;
-        SI_VAR(11) = 0;
+        RandInt(5, EVT_VAR(10));
+        EVT_VAR(10) += 2;
+        EVT_VAR(11) = 0;
 10:
-        SI_VAR(3) = SI_VAR(0);
-        SI_VAR(3) += 1;
-        SetNpcPos(NPC_BOO0, SI_VAR(3), SI_VAR(1), SI_VAR(2));
+        EVT_VAR(3) = EVT_VAR(0);
+        EVT_VAR(3) += 1;
+        SetNpcPos(NPC_BOO0, EVT_VAR(3), EVT_VAR(1), EVT_VAR(2));
         sleep 1;
-        SI_VAR(3) = SI_VAR(0);
-        SI_VAR(3) += -1;
-        SetNpcPos(NPC_BOO0, SI_VAR(3), SI_VAR(1), SI_VAR(2));
+        EVT_VAR(3) = EVT_VAR(0);
+        EVT_VAR(3) += -1;
+        SetNpcPos(NPC_BOO0, EVT_VAR(3), EVT_VAR(1), EVT_VAR(2));
         sleep 1;
-        SI_VAR(11) += 1;
-        if (SI_VAR(11) < SI_VAR(10)) {
+        EVT_VAR(11) += 1;
+        if (EVT_VAR(11) < EVT_VAR(10)) {
             goto 10;
         }
-        RandInt(10, SI_VAR(10));
-        SI_VAR(10) += 10;
-        sleep SI_VAR(10);
+        RandInt(10, EVT_VAR(10));
+        EVT_VAR(10) += 10;
+        sleep EVT_VAR(10);
     }
 });
 
 EvtSource N(80240F50) = SCRIPT({
     group 239;
     loop {
-        RandInt(50, SI_VAR(0));
-        SI_VAR(0) += 80;
-        sleep SI_VAR(0);
-        if (SI_MAP_VAR(0) == 0) {
+        RandInt(50, EVT_VAR(0));
+        EVT_VAR(0) += 80;
+        sleep EVT_VAR(0);
+        if (EVT_MAP_VAR(0) == 0) {
             DisablePlayerInput(TRUE);
             PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125);
             ShakeCam(0, 0, 20, 2.0);
@@ -206,12 +206,12 @@ EvtSource N(8024103C) = SCRIPT({
     EnablePartnerAI();
     SetCamType(0, 4, 0);
     SetCamSpeed(0, 90.0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) = 175;
-    SI_VAR(1) = 0;
-    SI_VAR(2) = -75;
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) = 175;
+    EVT_VAR(1) = 0;
+    EVT_VAR(2) = -75;
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
     sleep 40;
@@ -237,7 +237,7 @@ EvtSource N(8024103C) = SCRIPT({
     SetPlayerPos(350, 10, -150);
     InterpPlayerYaw(270, 1);
     SetNpcPos(NPC_PARTNER, 350, 10, -150);
-    SI_VAR(2) = 1;
+    EVT_VAR(2) = 1;
     await N(80240698);
 });
 
@@ -257,22 +257,22 @@ EvtSource N(802413F4) = SCRIPT({
     ShowEmote(4, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0);
     ShowEmote(5, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0);
     sleep 50;
-    SI_VAR(2) = 1;
+    EVT_VAR(2) = 1;
     spawn N(8024079C);
     spawn N(80240D90);
     sleep 20;
     SetCamType(0, 6, 1);
     SetCamSpeed(0, 6.0);
     SetCamPitch(0, 15.0, -15.0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamDistance(0, 300);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
-    SI_VAR(10) = spawn N(80240DDC);
+    EVT_VAR(10) = spawn N(80240DDC);
     SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00DF));
-    kill SI_VAR(10);
+    kill EVT_VAR(10);
     SetPlayerAnimation(ANIM_80007);
     sleep 20;
     SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00E0));
@@ -281,8 +281,8 @@ EvtSource N(802413F4) = SCRIPT({
     sleep 20;
     SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00E1));
     DisablePartnerAI(0);
-    GetCurrentPartnerID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetCurrentPartnerID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1 {
             SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_goombario_normal_talk, NPC_ANIM_world_goombario_normal_idle, 0, MESSAGE_ID(0x0E, 0x00E2));
         }
@@ -302,9 +302,9 @@ EvtSource N(802413F4) = SCRIPT({
     EnablePartnerAI();
     SetCamType(0, 4, 0);
     SetCamSpeed(0, 6.0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
@@ -319,7 +319,7 @@ EvtSource N(802413F4) = SCRIPT({
     SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 5, MESSAGE_ID(0x0E, 0x00E8));
     SetNpcAnimation(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6);
     spawn N(80240F50);
-    SI_STORY_PROGRESS = STORY_CH3_ESCAPED_TUBBAS_MANOR;
+    EVT_STORY_PROGRESS = STORY_CH3_ESCAPED_TUBBAS_MANOR;
     DisablePlayerInput(FALSE);
 });
 
@@ -351,12 +351,12 @@ EvtSource N(80241AA0) = SCRIPT({
 });
 
 EvtSource N(interact_80241CD8) = SCRIPT({
-    SI_MAP_VAR(0) = 1;
+    EVT_MAP_VAR(0) = 1;
     SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 5, MESSAGE_ID(0x0E, 0x00E9));
     SetNpcAnimation(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6);
     DisablePartnerAI(0);
-    GetCurrentPartnerID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetCurrentPartnerID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1 {
             AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0);
             SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_goombario_normal_talk, NPC_ANIM_world_goombario_normal_idle, 0, MESSAGE_ID(0x0E, 0x00EA));
@@ -384,7 +384,7 @@ EvtSource N(interact_80241CD8) = SCRIPT({
         }
     }
     EnablePartnerAI();
-    SI_MAP_VAR(0) = 0;
+    EVT_MAP_VAR(0) = 0;
 });
 
 EvtSource N(init_80241F70) = SCRIPT({
@@ -600,7 +600,7 @@ EvtSource N(80242B84) = SCRIPT({
     PlaySound(SOUND_UNKNOWN_32E);
     spawn {
         loop 180 {
-            GetNpcPos(NPC_SENTINEL, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_SENTINEL, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             N(func_80240060_BFA100)();
             sleep 1;
         }
@@ -618,7 +618,7 @@ EvtSource N(80242B84) = SCRIPT({
     PanToTarget(0, 0, 1);
     sleep 20;
     spawn {
-        SI_VAR(2) = 1;
+        EVT_VAR(2) = 1;
         spawn N(80240698);
     }
     sleep 15;
@@ -653,7 +653,7 @@ EvtSource N(80242B84) = SCRIPT({
     }
     spawn {
         sleep 60;
-        SI_VAR(2) = 1;
+        EVT_VAR(2) = 1;
         spawn N(8024079C);
     }
     SetPlayerJumpscale(0);
@@ -671,8 +671,8 @@ EvtSource N(80242B84) = SCRIPT({
         PanToTarget(0, 0, 1);
     }
     sleep 65;
-    GetCurrentPartnerID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetCurrentPartnerID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1 {
             SetNpcFlagBits(NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE);
         }
@@ -684,8 +684,8 @@ EvtSource N(80242B84) = SCRIPT({
         }
     }
     DisablePartnerAI(0);
-    GetCurrentPartnerID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetCurrentPartnerID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1 {
             SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00D6));
         }
@@ -723,13 +723,13 @@ EvtSource N(80242B84) = SCRIPT({
     sleep 10;
     SetPlayerAnimation(ANIM_MIDAIR_STILL);
     SetPlayerJumpscale(1);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    PlayerJump1(SI_VAR(0), 0, SI_VAR(2), 10);
-    PlayerJump1(SI_VAR(0), 0, SI_VAR(2), 10);
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    PlayerJump1(EVT_VAR(0), 0, EVT_VAR(2), 10);
+    PlayerJump1(EVT_VAR(0), 0, EVT_VAR(2), 10);
     SetPlayerAnimation(ANIM_10002);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamSpeed(0, 4.0);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);

src/world/area_dgb/dgb_01/BFD9A0.c

@@ -21,7 +21,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(802434A0) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -42,10 +42,10 @@ EvtSource N(exitDoubleDoor_80243550) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 4;
-    SI_VAR(2) = 54;
-    SI_VAR(3) = 57;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 4;
+    EVT_VAR(2) = 54;
+    EVT_VAR(3) = 57;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_00", 1);
@@ -56,10 +56,10 @@ EvtSource N(exitDoubleDoor_80243604) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 8;
-    SI_VAR(2) = 34;
-    SI_VAR(3) = 36;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 8;
+    EVT_VAR(2) = 34;
+    EVT_VAR(3) = 36;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_02", 1);
@@ -70,10 +70,10 @@ EvtSource N(exitDoubleDoor_802436B8) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 2;
-    SI_VAR(1) = 20;
-    SI_VAR(2) = 41;
-    SI_VAR(3) = 39;
+    EVT_VAR(0) = 2;
+    EVT_VAR(1) = 20;
+    EVT_VAR(2) = 41;
+    EVT_VAR(3) = 39;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_08", 0);
@@ -84,10 +84,10 @@ EvtSource N(exitDoubleDoor_8024376C) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 3;
-    SI_VAR(1) = 12;
-    SI_VAR(2) = 29;
-    SI_VAR(3) = 31;
+    EVT_VAR(0) = 3;
+    EVT_VAR(1) = 12;
+    EVT_VAR(2) = 29;
+    EVT_VAR(3) = 31;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_09", 1);
@@ -98,10 +98,10 @@ EvtSource N(exitDoubleDoor_80243820) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 4;
-    SI_VAR(1) = 24;
-    SI_VAR(2) = 46;
-    SI_VAR(3) = 44;
+    EVT_VAR(0) = 4;
+    EVT_VAR(1) = 24;
+    EVT_VAR(2) = 46;
+    EVT_VAR(3) = 44;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_08", 1);
@@ -112,10 +112,10 @@ EvtSource N(exitDoubleDoor_802438D4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 5;
-    SI_VAR(1) = 16;
-    SI_VAR(2) = 24;
-    SI_VAR(3) = 26;
+    EVT_VAR(0) = 5;
+    EVT_VAR(1) = 16;
+    EVT_VAR(2) = 24;
+    EVT_VAR(3) = 26;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_17", 1);
@@ -126,10 +126,10 @@ EvtSource N(exitDoubleDoor_80243988) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 6;
-    SI_VAR(1) = 28;
-    SI_VAR(2) = 51;
-    SI_VAR(3) = 49;
+    EVT_VAR(0) = 6;
+    EVT_VAR(1) = 28;
+    EVT_VAR(2) = 51;
+    EVT_VAR(3) = 49;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_18", 0);
@@ -138,45 +138,45 @@ EvtSource N(exitDoubleDoor_80243988) = SCRIPT({
 
 EvtSource N(enterDoubleDoor_80243A3C) = SCRIPT({
     UseDoorSounds(3);
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            if (SI_SAVE_FLAG(1041) == 0) {
-                SI_SAVE_FLAG(1041) = 1;
-                SI_STORY_PROGRESS = STORY_CH3_ARRIVED_AT_TUBBAS_MANOR;
+            if (EVT_SAVE_FLAG(1041) == 0) {
+                EVT_SAVE_FLAG(1041) = 1;
+                EVT_STORY_PROGRESS = STORY_CH3_ARRIVED_AT_TUBBAS_MANOR;
             }
-            SI_VAR(2) = 54;
-            SI_VAR(3) = 57;
+            EVT_VAR(2) = 54;
+            EVT_VAR(3) = 57;
             await EnterDoubleDoor;
         }
         == 1 {
-            SI_VAR(2) = 34;
-            SI_VAR(3) = 36;
+            EVT_VAR(2) = 34;
+            EVT_VAR(3) = 36;
             await EnterDoubleDoor;
         }
         == 2 {
-            SI_VAR(2) = 41;
-            SI_VAR(3) = 39;
+            EVT_VAR(2) = 41;
+            EVT_VAR(3) = 39;
             await EnterDoubleDoor;
         }
         == 3 {
-            SI_VAR(2) = 29;
-            SI_VAR(3) = 31;
+            EVT_VAR(2) = 29;
+            EVT_VAR(3) = 31;
             await EnterDoubleDoor;
         }
         == 4 {
-            SI_VAR(2) = 46;
-            SI_VAR(3) = 44;
+            EVT_VAR(2) = 46;
+            EVT_VAR(3) = 44;
             await EnterDoubleDoor;
         }
         == 5 {
-            SI_VAR(2) = 24;
-            SI_VAR(3) = 26;
+            EVT_VAR(2) = 24;
+            EVT_VAR(3) = 26;
             await EnterDoubleDoor;
         }
         == 6 {
-            SI_VAR(2) = 51;
-            SI_VAR(3) = 49;
+            EVT_VAR(2) = 51;
+            EVT_VAR(3) = 49;
             await EnterDoubleDoor;
         }
     }
@@ -188,13 +188,13 @@ s32 N(itemList_80243C40)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
     SetCamLeadPlayer(0, 0);
-    SI_SAVE_FLAG(1978) = 1;
+    EVT_SAVE_FLAG(1978) = 1;
     await N(makeEntities);
     spawn N(802449C4);
     spawn N(802434A0);
@@ -204,18 +204,18 @@ EvtSource N(main) = SCRIPT({
     bind N(exitDoubleDoor_80243820) TRIGGER_WALL_PRESS_A 24;
     bind N(exitDoubleDoor_802438D4) TRIGGER_WALL_PRESS_A 16;
     bind N(exitDoubleDoor_80243988) TRIGGER_WALL_PRESS_A 28;
-    if (SI_SAVE_FLAG(1040) == 0) {
+    if (EVT_SAVE_FLAG(1040) == 0) {
         bind_padlock N(80244AD0) TRIGGER_WALL_PRESS_A entity(0) N(itemList_80243C40);
     } else {
         bind N(exitDoubleDoor_802436B8) TRIGGER_WALL_PRESS_A 20;
     }
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             MakeNpcs(1, N(npcGroupList_80246E50));
         }
         < STORY_CH3_DEFEATED_TUBBA_BLUBBA {
-            GetEntryID(SI_VAR(0));
-            match SI_VAR(0) {
+            GetEntryID(EVT_VAR(0));
+            match EVT_VAR(0) {
                 == 2 {
                     MakeNpcs(1, N(npcGroupList_80246F1C));
                 }
@@ -237,8 +237,8 @@ static s32 N(pad_3EE4)[] = {
 
 EvtSource N(80243EF0) = SCRIPT({
     loop {
-        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        if (SI_VAR(0) < 100) {
+        GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        if (EVT_VAR(0) < 100) {
             break loop;
         }
         sleep 1;
@@ -276,26 +276,26 @@ EvtSource N(80243EF0) = SCRIPT({
     SetCamSpeed(0, 3.0);
     PanToTarget(0, 0, 1);
     WaitForCam(0, 1.0);
-    SI_SAVE_VAR(203) = 1;
+    EVT_SAVE_VAR(203) = 1;
     SetNpcVar(4, 0, 1);
     loop {
-        GetNpcVar(4, 0, SI_VAR(0));
-        if (SI_VAR(0) == 3) {
+        GetNpcVar(4, 0, EVT_VAR(0));
+        if (EVT_VAR(0) == 3) {
             break loop;
         }
         sleep 1;
     }
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += -50;
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += -50;
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamSpeed(0, 90.0);
     SetCamDistance(0, 750.0);
     SetCamPitch(0, 0.0, 3.0);
     DisablePartnerAI(0);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) += 30;
-    SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) += 30;
+    SetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     sleep 1;
     EnablePartnerAI();
     ShakeCam(0, 0, 20, 1.0);
@@ -346,11 +346,11 @@ EvtSource N(80243EF0) = SCRIPT({
     }
     spawn {
         DisablePartnerAI(0);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) -= 210;
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) -= 210;
         sleep 1;
         SetNpcJumpscale(NPC_PARTNER, 0.5);
-        NpcJump1(NPC_PARTNER, 151, SI_VAR(1), 0, 60);
+        NpcJump1(NPC_PARTNER, 151, EVT_VAR(1), 0, 60);
         sleep 30;
         EnablePartnerAI();
     }
@@ -370,13 +370,13 @@ EvtSource N(80243EF0) = SCRIPT({
         sleep 8;
     }
     sleep 20;
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    UseSettingsFrom(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     SetCamSpeed(0, 2.0);
-    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     WaitForCam(0, 1.0);
     PanToTarget(0, 0, 0);
-    SI_STORY_PROGRESS = STORY_CH3_TUBBA_SMASHED_THE_BRIDGES;
+    EVT_STORY_PROGRESS = STORY_CH3_TUBBA_SMASHED_THE_BRIDGES;
     SetGroupEnabled(210, 1);
     DeleteAnimatedModel(0);
     spawn {
@@ -404,7 +404,7 @@ EvtSource N(80243EF0) = SCRIPT({
 });
 
 EvtSource N(802449C4) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetGroupEnabled(210, 0);
             ModifyColliderFlags(0, 50, 0x7FFFFE00);
@@ -428,24 +428,24 @@ EvtSource N(80244AD0) = SCRIPT({
     group 0;
     suspend group 1;
     ShowKeyChoicePopup();
-    if (SI_VAR(0) == 0) {
+    if (EVT_VAR(0) == 0) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00D8), 160, 40);
         CloseChoicePopup();
         resume group 1;
         return;
     }
-    if (SI_VAR(0) == -1) {
+    if (EVT_VAR(0) == -1) {
         CloseChoicePopup();
         resume group 1;
         return;
     }
-    FindKeyItem(19, SI_VAR(0));
-    RemoveKeyItemAt(SI_VAR(0));
+    FindKeyItem(19, EVT_VAR(0));
+    RemoveKeyItemAt(EVT_VAR(0));
     CloseChoicePopup();
-    SI_SAVE_FLAG(1040) = 1;
-    N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) = SI_MAP_VAR(0);
+    EVT_SAVE_FLAG(1040) = 1;
+    N(GetEntityPosition)(EVT_MAP_VAR(0), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    PlaySoundAt(0x269, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) = EVT_MAP_VAR(0);
     N(SetEntityFlags100000)();
     resume group 1;
     unbind;
@@ -456,10 +456,10 @@ EvtSource N(80244C38) = SCRIPT({
 });
 
 EvtSource N(makeEntities) = SCRIPT({
-    if (SI_SAVE_FLAG(1040) == 0) {
+    if (EVT_SAVE_FLAG(1040) == 0) {
         MakeEntity(0x802BCD68, 490, 8, 0, -80, MAKE_ENTITY_END);
         AssignScript(N(80244C38));
-        SI_MAP_VAR(0) = SI_VAR(0);
+        EVT_MAP_VAR(0) = EVT_VAR(0);
     }
 });
 
@@ -1042,11 +1042,11 @@ EvtSource N(npcAI_80244D54) = SCRIPT({
     DisablePlayerInput(TRUE);
     sleep 2;
 20:
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(4), SI_VAR(2));
-    GetPlayerActionState(SI_VAR(0));
-    if (SI_VAR(0) != 0) {
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(4), EVT_VAR(2));
+    GetPlayerActionState(EVT_VAR(0));
+    if (EVT_VAR(0) != 0) {
         sleep 1;
         goto 20;
     }
@@ -1055,10 +1055,10 @@ EvtSource N(npcAI_80244D54) = SCRIPT({
     DisablePartnerAI(0);
     group 0;
     SetTimeFreezeMode(1);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    SI_VAR(2) += 2;
-    SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    EVT_VAR(2) += 2;
+    SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_80045838(-1, 759, 0);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_8);
     sleep 10;
@@ -1067,25 +1067,25 @@ EvtSource N(npcAI_80244D54) = SCRIPT({
     func_80045838(-1, 1838, 0);
     spawn {
         loop 100 {
-            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(1) += 1;
-            SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(1) += 1;
-            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(1) += 1;
+            SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(1) += 1;
+            SetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
     }
     spawn {
         SetNpcAnimation(NPC_PARTNER, 0x108);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
     }
     sleep 30;
     GotoMap(N(dgb_00_name_hack), 2);
@@ -1093,18 +1093,18 @@ EvtSource N(npcAI_80244D54) = SCRIPT({
 });
 
 EvtSource N(8024517C) = SCRIPT({
-    GetOwnerEncounterTrigger(SI_VAR(0));
-    match SI_VAR(0) {
+    GetOwnerEncounterTrigger(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1, 2, 4, 6 {
-            GetSelfAnimationFromTable(7, SI_VAR(0));
+            GetSelfAnimationFromTable(7, EVT_VAR(0));
             await 0x800936DC;
         }
     }
 });
 
 EvtSource N(80245208) = SCRIPT({
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             DoNpcDefeat();
         }
@@ -1164,21 +1164,21 @@ NpcSettings N(npcSettings_80245340) = {
 
 EvtSource N(idle_8024536C) = SCRIPT({
     loop {
-        GetSelfVar(0, SI_VAR(0));
-        if (SI_VAR(0) == 1) {
+        GetSelfVar(0, EVT_VAR(0));
+        if (EVT_VAR(0) == 1) {
             break loop;
         }
         sleep 1;
     }
-    SI_SAVE_VAR(203) = 1;
+    EVT_SAVE_VAR(203) = 1;
     PlaySoundAtCollider(28, 455, 0);
     MakeLerp(0, 80, 10, 0);
     loop {
         UpdateLerp();
-        RotateModel(49, SI_VAR(0), 0, 1, 0);
-        RotateModel(51, SI_VAR(0), 0, -1, 0);
+        RotateModel(49, EVT_VAR(0), 0, 1, 0);
+        RotateModel(51, EVT_VAR(0), 0, -1, 0);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
@@ -1192,10 +1192,10 @@ EvtSource N(idle_8024536C) = SCRIPT({
         MakeLerp(80, 0, 10, 0);
         loop {
             UpdateLerp();
-            RotateModel(49, SI_VAR(0), 0, 1, 0);
-            RotateModel(51, SI_VAR(0), 0, -1, 0);
+            RotateModel(49, EVT_VAR(0), 0, 1, 0);
+            RotateModel(51, EVT_VAR(0), 0, -1, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -1215,8 +1215,8 @@ EvtSource N(idle_8024536C) = SCRIPT({
     }
     sleep 4;
     SetNpcJumpscale(NPC_WORLD_TUBBA, 1.0);
-    GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    NpcJump0(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2), 30);
+    GetNpcPos(NPC_WORLD_TUBBA, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    NpcJump0(NPC_WORLD_TUBBA, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 30);
     PlaySoundAtNpc(NPC_WORLD_TUBBA, 0x20A0, 0);
     PlaySound(0x8000005D);
     ShakeCam(0, 0, 15, 4.0);
@@ -1351,12 +1351,12 @@ EvtSource N(defeat_802457D8) = SCRIPT({
 });
 
 EvtSource N(init_80245814) = SCRIPT({
-    if (SI_SAVE_VAR(203) != 1) {
+    if (EVT_SAVE_VAR(203) != 1) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE);
         return;
     }
-    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) {
+    if (EVT_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE);
         return;
@@ -1376,16 +1376,16 @@ EvtSource N(init_80245814) = SCRIPT({
 
 EvtSource N(idle_8024598C) = SCRIPT({
     AwaitPlayerApproach(0, 420, 400);
-    SI_SAVE_VAR(203) = 1;
-    SI_STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER;
+    EVT_SAVE_VAR(203) = 1;
+    EVT_STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER;
     PlaySoundAtCollider(20, 455, 0);
     MakeLerp(0, 80, 10, 0);
     loop {
         UpdateLerp();
-        RotateModel(39, SI_VAR(0), 0, -1, 0);
-        RotateModel(41, SI_VAR(0), 0, 1, 0);
+        RotateModel(39, EVT_VAR(0), 0, -1, 0);
+        RotateModel(41, EVT_VAR(0), 0, 1, 0);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
@@ -1398,10 +1398,10 @@ EvtSource N(idle_8024598C) = SCRIPT({
         MakeLerp(80, 0, 10, 0);
         loop {
             UpdateLerp();
-            RotateModel(39, SI_VAR(0), 0, -1, 0);
-            RotateModel(41, SI_VAR(0), 0, 1, 0);
+            RotateModel(39, EVT_VAR(0), 0, -1, 0);
+            RotateModel(41, EVT_VAR(0), 0, 1, 0);
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
@@ -1429,7 +1429,7 @@ EvtSource N(defeat_80245CB4) = SCRIPT({
 });
 
 EvtSource N(init_80245CF0) = SCRIPT({
-    if (SI_SAVE_VAR(203) != 1) {
+    if (EVT_SAVE_VAR(203) != 1) {
         BindNpcIdle(NPC_SELF, N(idle_8024598C));
     } else {
         SetNpcPos(NPC_SELF, 136, 0, -330);
@@ -1439,8 +1439,8 @@ EvtSource N(init_80245CF0) = SCRIPT({
 });
 
 EvtSource N(init_80245D80) = SCRIPT({
-    SI_VAR(0) = SI_STORY_PROGRESS;
-    if (SI_VAR(0) >= -29) {
+    EVT_VAR(0) = EVT_STORY_PROGRESS;
+    if (EVT_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
         SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1);
@@ -1451,8 +1451,8 @@ EvtSource N(init_80245D80) = SCRIPT({
 });
 
 EvtSource N(init_80245E44) = SCRIPT({
-    SI_VAR(0) = SI_STORY_PROGRESS;
-    if (SI_VAR(0) >= -29) {
+    EVT_VAR(0) = EVT_STORY_PROGRESS;
+    if (EVT_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
         SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1);
@@ -1463,8 +1463,8 @@ EvtSource N(init_80245E44) = SCRIPT({
 });
 
 EvtSource N(init_80245F08) = SCRIPT({
-    SI_VAR(0) = SI_STORY_PROGRESS;
-    if (SI_VAR(0) >= -29) {
+    EVT_VAR(0) = EVT_STORY_PROGRESS;
+    if (EVT_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
         SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1);
@@ -1475,8 +1475,8 @@ EvtSource N(init_80245F08) = SCRIPT({
 });
 
 EvtSource N(init_80245FCC) = SCRIPT({
-    SI_VAR(0) = SI_STORY_PROGRESS;
-    if (SI_VAR(0) >= -29) {
+    EVT_VAR(0) = EVT_STORY_PROGRESS;
+    if (EVT_VAR(0) >= -29) {
         SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE);
         EnableNpcShadow(NPC_SELF, FALSE);
         SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1);

src/world/area_dgb/dgb_02/C2EBA0.c

@@ -27,7 +27,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(802414B0) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -47,10 +47,10 @@ EvtSource N(exitDoubleDoor_80241550) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 5;
-    SI_VAR(2) = 11;
-    SI_VAR(3) = 13;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 5;
+    EVT_VAR(2) = 11;
+    EVT_VAR(3) = 13;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_03", 1);
@@ -61,10 +61,10 @@ EvtSource N(exitDoubleDoor_80241604) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 17;
-    SI_VAR(2) = 18;
-    SI_VAR(3) = 16;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 17;
+    EVT_VAR(2) = 18;
+    EVT_VAR(3) = 16;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_01", 1);
@@ -75,10 +75,10 @@ EvtSource N(exitSingleDoor_802416B8) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 2;
-    SI_VAR(1) = 9;
-    SI_VAR(2) = 21;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 2;
+    EVT_VAR(1) = 9;
+    EVT_VAR(2) = 21;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_07", 0);
@@ -89,10 +89,10 @@ EvtSource N(exitSingleDoor_8024176C) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 3;
-    SI_VAR(1) = 13;
-    SI_VAR(2) = 23;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 3;
+    EVT_VAR(1) = 13;
+    EVT_VAR(2) = 23;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_11", 0);
@@ -100,42 +100,42 @@ EvtSource N(exitSingleDoor_8024176C) = SCRIPT({
 });
 
 EvtSource N(enterSingleDoor_80241820) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             UseDoorSounds(3);
-            SI_VAR(2) = 11;
-            SI_VAR(3) = 13;
+            EVT_VAR(2) = 11;
+            EVT_VAR(3) = 13;
             await EnterDoubleDoor;
         }
         == 1 {
             UseDoorSounds(3);
-            SI_VAR(2) = 18;
-            SI_VAR(3) = 16;
+            EVT_VAR(2) = 18;
+            EVT_VAR(3) = 16;
             await EnterDoubleDoor;
         }
         == 2 {
             UseDoorSounds(0);
-            SI_VAR(2) = 21;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 21;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
         }
         == 3 {
             UseDoorSounds(0);
-            SI_VAR(2) = 23;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 23;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
         }
     }
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_802425C8));
     }
     bind N(exitDoubleDoor_80241550) TRIGGER_WALL_PRESS_A 5;
@@ -151,8 +151,8 @@ static s32 N(pad_1AA8)[] = {
 };
 
 EvtSource N(80241AB0) = SCRIPT({
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             RemoveNpc(NPC_SELF);
         }

src/world/area_dgb/dgb_03/C31730.c

@@ -31,7 +31,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(80242870) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -51,10 +51,10 @@ EvtSource N(exitDoubleDoor_80242910) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 25;
-    SI_VAR(2) = 36;
-    SI_VAR(3) = 34;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 25;
+    EVT_VAR(2) = 36;
+    EVT_VAR(3) = 34;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_02", 0);
@@ -65,10 +65,10 @@ EvtSource N(exitDoubleDoor_802429C4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 4;
-    SI_VAR(1) = 21;
-    SI_VAR(2) = 46;
-    SI_VAR(3) = 44;
+    EVT_VAR(0) = 4;
+    EVT_VAR(1) = 21;
+    EVT_VAR(2) = 46;
+    EVT_VAR(3) = 44;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_09", 0);
@@ -79,10 +79,10 @@ EvtSource N(exitDoubleDoor_80242A78) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 13;
-    SI_VAR(2) = 29;
-    SI_VAR(3) = 31;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 13;
+    EVT_VAR(2) = 29;
+    EVT_VAR(3) = 31;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_04", 0);
@@ -95,10 +95,10 @@ EvtSource N(exitSingleDoor_80242B88) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 2;
-    SI_VAR(1) = 33;
-    SI_VAR(2) = 49;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 2;
+    EVT_VAR(1) = 33;
+    EVT_VAR(2) = 49;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_05", 0);
@@ -109,10 +109,10 @@ EvtSource N(exitDoubleDoor_80242C3C) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 3;
-    SI_VAR(1) = 17;
-    SI_VAR(2) = 39;
-    SI_VAR(3) = 41;
+    EVT_VAR(0) = 3;
+    EVT_VAR(1) = 17;
+    EVT_VAR(2) = 39;
+    EVT_VAR(3) = 41;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_14", 0);
@@ -124,45 +124,45 @@ EvtSource N(80242CF0) = SCRIPT({
 });
 
 EvtSource N(enterDoubleDoor_80242D1C) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             UseDoorSounds(3);
-            SI_VAR(2) = 29;
-            SI_VAR(3) = 31;
+            EVT_VAR(2) = 29;
+            EVT_VAR(3) = 31;
             await EnterDoubleDoor;
             spawn N(80242CF0);
         }
         == 1 {
             UseDoorSounds(3);
-            SI_VAR(2) = 36;
-            SI_VAR(3) = 34;
+            EVT_VAR(2) = 36;
+            EVT_VAR(3) = 34;
             await EnterDoubleDoor;
             spawn N(80242CF0);
         }
         == 2 {
             UseDoorSounds(0);
-            SI_VAR(2) = 49;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 49;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
             spawn N(80242CF0);
         }
         == 3 {
             UseDoorSounds(3);
-            SI_VAR(2) = 39;
-            SI_VAR(3) = 41;
+            EVT_VAR(2) = 39;
+            EVT_VAR(3) = 41;
             await EnterDoubleDoor;
             spawn N(80242CF0);
         }
         == 4 {
             UseDoorSounds(3);
-            SI_VAR(2) = 46;
-            SI_VAR(3) = 44;
+            EVT_VAR(2) = 46;
+            EVT_VAR(3) = 44;
             await EnterDoubleDoor;
             spawn N(80242CF0);
         }
         == 5 {
-            SI_VAR(0) = N(80242CF0);
+            EVT_VAR(0) = N(80242CF0);
             spawn EnterWalkShort;
             sleep 1;
         }
@@ -175,12 +175,12 @@ s32 N(itemList_80242F28)[] = {
 };
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamEnabled(0, 1);
-    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_80244988));
     }
     await N(makeEntities);
@@ -189,7 +189,7 @@ EvtSource N(main) = SCRIPT({
     bind N(exitDoubleDoor_802429C4) TRIGGER_WALL_PRESS_A 21;
     bind N(exitDoubleDoor_80242A78) TRIGGER_WALL_PRESS_A 13;
     bind N(exitSingleDoor_80242B88) TRIGGER_WALL_PRESS_A 33;
-    if (SI_SAVE_FLAG(1043) == 0) {
+    if (EVT_SAVE_FLAG(1043) == 0) {
         bind_padlock N(80243740) TRIGGER_WALL_PRESS_A entity(0) N(itemList_80242F28);
     } else {
         bind N(exitDoubleDoor_80242C3C) TRIGGER_WALL_PRESS_A 17;
@@ -205,23 +205,23 @@ static s32 N(pad_30D8)[] = {
 EvtSource N(802430E0) = SCRIPT({
     group 0;
     loop 20 {
-        GetCurrentPartner(SI_VAR(10));
-        if (SI_VAR(10) != 0) {
-            SI_VAR(8) = -1;
+        GetCurrentPartner(EVT_VAR(10));
+        if (EVT_VAR(10) != 0) {
+            EVT_VAR(8) = -1;
             return;
         }
-        N(UnkFunc11)(SI_VAR(9));
-        if (SI_VAR(0) == 0) {
-            SI_VAR(8) = -1;
+        N(UnkFunc11)(EVT_VAR(9));
+        if (EVT_VAR(0) == 0) {
+            EVT_VAR(8) = -1;
             return;
         } else {
             SetPlayerActionState(20);
         }
         sleep 1;
     }
-    GetCurrentPartner(SI_VAR(10));
-    if (SI_VAR(10) != 0) {
-        SI_VAR(8) = -1;
+    GetCurrentPartner(EVT_VAR(10));
+    if (EVT_VAR(10) != 0) {
+        EVT_VAR(8) = -1;
         return;
     }
     DisablePlayerInput(TRUE);
@@ -229,40 +229,40 @@ EvtSource N(802430E0) = SCRIPT({
         ShakeCam(0, 0, 100, 0.6005859375);
     }
     spawn {
-        if (SI_VAR(6) >= SI_VAR(7)) {
+        if (EVT_VAR(6) >= EVT_VAR(7)) {
             InterpPlayerYaw(270, 0);
         } else {
             InterpPlayerYaw(90, 0);
         }
         SetPlayerActionState(20);
-        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        SI_VAR(1) = SI_VAR(0);
-        SI_VAR(2) = SI_VAR(7);
-        SI_VAR(2) -= SI_VAR(6);
-        SI_VAR(1) += SI_VAR(2);
-        MakeLerp(SI_VAR(0), SI_VAR(1), 100, 0);
+        GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        EVT_VAR(1) = EVT_VAR(0);
+        EVT_VAR(2) = EVT_VAR(7);
+        EVT_VAR(2) -= EVT_VAR(6);
+        EVT_VAR(1) += EVT_VAR(2);
+        MakeLerp(EVT_VAR(0), EVT_VAR(1), 100, 0);
         loop {
             SetPlayerActionState(20);
             UpdateLerp();
             N(UnkFunc12)();
             sleep 1;
-            if (SI_VAR(1) == 0) {
+            if (EVT_VAR(1) == 0) {
                 break loop;
             }
         }
         SetPlayerActionState(0);
         DisablePlayerInput(FALSE);
     }
-    MakeLerp(SI_VAR(6), SI_VAR(7), 100, 0);
+    MakeLerp(EVT_VAR(6), EVT_VAR(7), 100, 0);
     PlaySoundAtCollider(27, 0x80000010, 0);
     loop {
         UpdateLerp();
-        TranslateModel(51, SI_VAR(0), 0, 0);
+        TranslateModel(51, EVT_VAR(0), 0, 0);
         UpdateColliderTransform(27);
         UpdateColliderTransform(28);
         UpdateColliderTransform(29);
         sleep 1;
-        if (SI_VAR(1) == 0) {
+        if (EVT_VAR(1) == 0) {
             break loop;
         }
     }
@@ -270,35 +270,35 @@ EvtSource N(802430E0) = SCRIPT({
 });
 
 EvtSource N(80243470) = SCRIPT({
-    if (SI_SAVE_FLAG(1044) != 0) {
+    if (EVT_SAVE_FLAG(1044) != 0) {
         goto 90;
     }
-    SI_VAR(6) = 0;
-    SI_VAR(7) = 48;
-    SI_VAR(8) = 0;
-    SI_VAR(9) = 27;
+    EVT_VAR(6) = 0;
+    EVT_VAR(7) = 48;
+    EVT_VAR(8) = 0;
+    EVT_VAR(9) = 27;
     await N(802430E0);
 90:
-    if (SI_VAR(8) != -1) {
-        SI_SAVE_FLAG(1045) = 0;
-        SI_SAVE_FLAG(1044) = 1;
+    if (EVT_VAR(8) != -1) {
+        EVT_SAVE_FLAG(1045) = 0;
+        EVT_SAVE_FLAG(1044) = 1;
         unbind;
     }
 });
 
 EvtSource N(8024353C) = SCRIPT({
-    if (SI_SAVE_FLAG(1044) != 0) {
+    if (EVT_SAVE_FLAG(1044) != 0) {
         goto 90;
     }
-    SI_VAR(6) = 0;
-    SI_VAR(7) = -48;
-    SI_VAR(8) = 0;
-    SI_VAR(9) = 28;
+    EVT_VAR(6) = 0;
+    EVT_VAR(7) = -48;
+    EVT_VAR(8) = 0;
+    EVT_VAR(9) = 28;
     await N(802430E0);
 90:
-    if (SI_VAR(8) != -1) {
-        SI_SAVE_FLAG(1045) = 1;
-        SI_SAVE_FLAG(1044) = 1;
+    if (EVT_VAR(8) != -1) {
+        EVT_SAVE_FLAG(1045) = 1;
+        EVT_SAVE_FLAG(1044) = 1;
         unbind;
     }
 });
@@ -307,16 +307,16 @@ EvtSource N(80243608) = SCRIPT({
     ParentColliderToModel(27, 51);
     ParentColliderToModel(28, 51);
     ParentColliderToModel(29, 51);
-    if (SI_SAVE_FLAG(1044) == 0) {
+    if (EVT_SAVE_FLAG(1044) == 0) {
         bind N(80243470) TRIGGER_WALL_PUSH 27;
         bind N(8024353C) TRIGGER_WALL_PUSH 28;
     } else {
-        if (SI_SAVE_FLAG(1045) == 0) {
-            SI_VAR(0) = 48;
+        if (EVT_SAVE_FLAG(1045) == 0) {
+            EVT_VAR(0) = 48;
         } else {
-            SI_VAR(0) = -48;
+            EVT_VAR(0) = -48;
         }
-        TranslateModel(51, SI_VAR(0), 0, 0);
+        TranslateModel(51, EVT_VAR(0), 0, 0);
         UpdateColliderTransform(27);
         UpdateColliderTransform(28);
         UpdateColliderTransform(29);
@@ -331,24 +331,24 @@ EvtSource N(80243740) = SCRIPT({
     group 0;
     suspend group 1;
     ShowKeyChoicePopup();
-    if (SI_VAR(0) == 0) {
+    if (EVT_VAR(0) == 0) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00D8), 160, 40);
         CloseChoicePopup();
         resume group 1;
         return;
     }
-    if (SI_VAR(0) == -1) {
+    if (EVT_VAR(0) == -1) {
         CloseChoicePopup();
         resume group 1;
         return;
     }
-    FindKeyItem(19, SI_VAR(0));
-    RemoveKeyItemAt(SI_VAR(0));
+    FindKeyItem(19, EVT_VAR(0));
+    RemoveKeyItemAt(EVT_VAR(0));
     CloseChoicePopup();
-    SI_SAVE_FLAG(1043) = 1;
-    N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(0) = SI_MAP_VAR(0);
+    EVT_SAVE_FLAG(1043) = 1;
+    N(GetEntityPosition)(EVT_MAP_VAR(0), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    PlaySoundAt(0x269, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(0) = EVT_MAP_VAR(0);
     N(SetEntityFlags100000)();
     resume group 1;
     unbind;
@@ -359,12 +359,12 @@ EvtSource N(802438A8) = SCRIPT({
 });
 
 EvtSource N(makeEntities) = SCRIPT({
-    if (SI_SAVE_FLAG(1043) == 0) {
+    if (EVT_SAVE_FLAG(1043) == 0) {
         MakeEntity(0x802BCD68, -355, 218, 75, 80, MAKE_ENTITY_END);
         AssignScript(N(802438A8));
-        SI_MAP_VAR(0) = SI_VAR(0);
+        EVT_MAP_VAR(0) = EVT_VAR(0);
     }
-    MakeItemEntity(ITEM_STAR_PIECE, 0, 75, 100, 17, SI_SAVE_FLAG(1042));
+    MakeItemEntity(ITEM_STAR_PIECE, 0, 75, 100, 17, EVT_SAVE_FLAG(1042));
 });
 
 static s32 N(pad_3964)[] = {
@@ -372,8 +372,8 @@ static s32 N(pad_3964)[] = {
 };
 
 EvtSource N(80243970) = SCRIPT({
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             RemoveNpc(NPC_SELF);
         }
@@ -515,8 +515,8 @@ NpcSettings N(npcSettings_80243D68) = {
 };
 
 EvtSource N(init_80243D94) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    if (SI_VAR(0) == 3) {
+    GetEntryID(EVT_VAR(0));
+    if (EVT_VAR(0) == 3) {
         SetNpcPos(NPC_SELF, -330, 210, -20);
     }
 });

src/world/area_dgb/dgb_04/C36530.c

@@ -23,7 +23,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(80243170) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -43,10 +43,10 @@ EvtSource N(exitSingleDoor_80243210) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 16;
-    SI_VAR(2) = 16;
-    SI_VAR(3) = 1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 16;
+    EVT_VAR(2) = 16;
+    EVT_VAR(3) = 1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_06", 0);
@@ -57,10 +57,10 @@ EvtSource N(exitDoubleDoor_802432C4) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(3);
-    SI_VAR(0) = 1;
-    SI_VAR(1) = 20;
-    SI_VAR(2) = 13;
-    SI_VAR(3) = 11;
+    EVT_VAR(0) = 1;
+    EVT_VAR(1) = 20;
+    EVT_VAR(2) = 13;
+    EVT_VAR(3) = 11;
     spawn ExitDoubleDoor;
     sleep 17;
     GotoMap("dgb_03", 0);
@@ -68,31 +68,31 @@ EvtSource N(exitDoubleDoor_802432C4) = SCRIPT({
 });
 
 EvtSource N(enterSingleDoor_80243378) = SCRIPT({
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             UseDoorSounds(3);
-            SI_VAR(2) = 13;
-            SI_VAR(3) = 11;
+            EVT_VAR(2) = 13;
+            EVT_VAR(3) = 11;
             await EnterDoubleDoor;
         }
         == 1 {
             UseDoorSounds(0);
-            SI_VAR(2) = 16;
-            SI_VAR(3) = 1;
+            EVT_VAR(2) = 16;
+            EVT_VAR(3) = 1;
             await EnterSingleDoor;
         }
     }
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_80243D18));
     }
     await N(makeEntities);
@@ -140,11 +140,11 @@ EvtSource N(npcAI_802435E4) = SCRIPT({
     DisablePlayerInput(TRUE);
     sleep 2;
 20:
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5));
-    SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(4), SI_VAR(2));
-    GetPlayerActionState(SI_VAR(0));
-    if (SI_VAR(0) != 0) {
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    GetNpcPos(NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
+    SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(4), EVT_VAR(2));
+    GetPlayerActionState(EVT_VAR(0));
+    if (EVT_VAR(0) != 0) {
         sleep 1;
         goto 20;
     }
@@ -153,10 +153,10 @@ EvtSource N(npcAI_802435E4) = SCRIPT({
     DisablePartnerAI(0);
     group 0;
     SetTimeFreezeMode(1);
-    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-    SI_VAR(1) += 20;
-    SI_VAR(2) += 2;
-    SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+    EVT_VAR(1) += 20;
+    EVT_VAR(2) += 2;
+    SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
     func_80045838(-1, 759, 0);
     SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_8);
     sleep 10;
@@ -165,25 +165,25 @@ EvtSource N(npcAI_802435E4) = SCRIPT({
     func_80045838(-1, 1838, 0);
     spawn {
         loop 100 {
-            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(1) += 1;
-            SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
-            SI_VAR(1) += 1;
-            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(1) += 1;
+            SetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+            EVT_VAR(1) += 1;
+            SetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
             sleep 1;
         }
     }
     spawn {
         SetNpcAnimation(NPC_PARTNER, 0x108);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
-        GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
-        NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
+        GetNpcPos(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2));
+        NpcJump0(NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10);
     }
     sleep 30;
     GotoMap(N(dgb_00_name_hack), 2);
@@ -191,18 +191,18 @@ EvtSource N(npcAI_802435E4) = SCRIPT({
 });
 
 EvtSource N(80243A0C) = SCRIPT({
-    GetOwnerEncounterTrigger(SI_VAR(0));
-    match SI_VAR(0) {
+    GetOwnerEncounterTrigger(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 1, 2, 4, 6 {
-            GetSelfAnimationFromTable(7, SI_VAR(0));
+            GetSelfAnimationFromTable(7, EVT_VAR(0));
             await 0x800936DC;
         }
     }
 });
 
 EvtSource N(80243A98) = SCRIPT({
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             DoNpcDefeat();
         }
@@ -279,7 +279,7 @@ f32 N(D_80243D88_C3A2B8)[] = {
 EvtSource N(80243D94) = SCRIPT({
     sleep 10;
     PlaySound(0x212D);
-    N(UnkFunc21)(SI_MAP_VAR(0));
+    N(UnkFunc21)(EVT_MAP_VAR(0));
     sleep 85;
     spawn {
         PlaySound(0x212E);
@@ -290,7 +290,7 @@ EvtSource N(80243D94) = SCRIPT({
     }
     spawn {
         sleep 3;
-        N(func_8024240C_C3893C)(SI_MAP_VAR(0));
+        N(func_8024240C_C3893C)(EVT_MAP_VAR(0));
     }
     spawn {
         sleep 47;
@@ -302,20 +302,20 @@ EvtSource N(80243D94) = SCRIPT({
         N(UnkPartnerPosFunc)();
     }
     sleep 3;
-    N(func_802429D0_C38F00)(SI_MAP_VAR(0));
+    N(func_802429D0_C38F00)(EVT_MAP_VAR(0));
     sleep 30;
 });
 
 EvtSource N(80243EF8) = SCRIPT({
-    if (SI_SAVE_FLAG(1046) == 1) {
+    if (EVT_SAVE_FLAG(1046) == 1) {
         return;
     }
-    IsStartingConversation(SI_VAR(0));
-    if (SI_VAR(0) == 1) {
+    IsStartingConversation(EVT_VAR(0));
+    if (EVT_VAR(0) == 1) {
         return;
     }
     N(UnkFunc24)();
-    if (SI_VAR(0) == 1) {
+    if (EVT_VAR(0) == 1) {
         return;
     }
     ModifyGlobalOverrideFlags(1, 2097152);
@@ -323,40 +323,40 @@ EvtSource N(80243EF8) = SCRIPT({
     DisablePlayerInput(TRUE);
     DisablePartnerAI(0);
     SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
-    N(UnkFunc20)(SI_MAP_VAR(0), SI_VAR(9));
-    FindKeyItem(15, SI_VAR(12));
+    N(UnkFunc20)(EVT_MAP_VAR(0), EVT_VAR(9));
+    FindKeyItem(15, EVT_VAR(12));
     N(UnkFunc38)();
-    if (SI_VAR(0) == -1) {
+    if (EVT_VAR(0) == -1) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DC), 160, 40);
         sleep 10;
-        N(UnkFunc39)(SI_VAR(9));
+        N(UnkFunc39)(EVT_VAR(9));
         DisablePlayerInput(FALSE);
         EnablePartnerAI();
         ModifyGlobalOverrideFlags(0, 2097152);
         N(UnkFunc17)();
         return;
     }
-    if (SI_SAVE_FLAG(438) == 0) {
-        SI_SAVE_FLAG(438) = 1;
+    if (EVT_SAVE_FLAG(438) == 0) {
+        EVT_SAVE_FLAG(438) = 1;
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DA), 160, 40);
     } else {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DB), 160, 40);
     }
     N(func_8024259C_C38ACC)();
-    if (SI_VAR(0) == -1) {
-        N(UnkFunc39)(SI_VAR(9));
+    if (EVT_VAR(0) == -1) {
+        N(UnkFunc39)(EVT_VAR(9));
         DisablePlayerInput(FALSE);
         EnablePartnerAI();
         ModifyGlobalOverrideFlags(0, 2097152);
         N(UnkFunc17)();
         return;
     }
-    SI_VAR(10) = SI_VAR(0);
-    SI_VAR(11) = SI_VAR(1);
+    EVT_VAR(10) = EVT_VAR(0);
+    EVT_VAR(11) = EVT_VAR(1);
     EnablePartnerAI();
-    GetCurrentPartnerID(SI_VAR(0));
-    if (SI_VAR(0) != SI_VAR(11)) {
-        N(SwitchToPartner)(SI_VAR(11));
+    GetCurrentPartnerID(EVT_VAR(0));
+    if (EVT_VAR(0) != EVT_VAR(11)) {
+        N(SwitchToPartner)(EVT_VAR(11));
     } else {
         func_802CF56C(2);
     }
@@ -364,8 +364,8 @@ EvtSource N(80243EF8) = SCRIPT({
     ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DF), 160, 40);
     ShowChoice(1966093);
     CloseMessage();
-    if (SI_VAR(0) != 0) {
-        N(UnkFunc39)(SI_VAR(9));
+    if (EVT_VAR(0) != 0) {
+        N(UnkFunc39)(EVT_VAR(9));
         DisablePlayerInput(FALSE);
         EnablePartnerAI();
         ModifyGlobalOverrideFlags(0, 2097152);
@@ -373,11 +373,11 @@ EvtSource N(80243EF8) = SCRIPT({
         return;
     }
     await N(80243D94);
-    N(UnkFunc18)(SI_VAR(11), SI_VAR(13));
-    SI_SAVE_FLAG(1046) = 1;
-    N(UnkFunc39)(SI_VAR(9));
+    N(UnkFunc18)(EVT_VAR(11), EVT_VAR(13));
+    EVT_SAVE_FLAG(1046) = 1;
+    N(UnkFunc39)(EVT_VAR(9));
     N(UnkFunc19)();
-    if (SI_VAR(13) == 1) {
+    if (EVT_VAR(13) == 1) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DD), 160, 40);
     } else {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DE), 160, 40);
@@ -390,8 +390,8 @@ EvtSource N(80243EF8) = SCRIPT({
 
 EvtSource N(makeEntities) = SCRIPT({
     MakeEntity(0x802EA910, 500, -360, 110, 0, MAKE_ENTITY_END);
-    SI_MAP_VAR(0) = SI_VAR(0);
-    AssignBlockFlag(SI_SAVE_FLAG(1046));
+    EVT_MAP_VAR(0) = EVT_VAR(0);
+    AssignBlockFlag(EVT_SAVE_FLAG(1046));
     AssignScript(N(80243EF8));
 });
 

src/world/area_dgb/dgb_05/C3AA10.c

@@ -24,7 +24,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(802414E0) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -44,10 +44,10 @@ EvtSource N(exitSingleDoor_80241580) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 16;
-    SI_VAR(2) = 30;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 16;
+    EVT_VAR(2) = 30;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_03", 2);
@@ -56,24 +56,24 @@ EvtSource N(exitSingleDoor_80241580) = SCRIPT({
 
 EvtSource N(enterSingleDoor_80241634) = SCRIPT({
     UseDoorSounds(0);
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 30;
-            SI_VAR(3) = -1;
+            EVT_VAR(2) = 30;
+            EVT_VAR(3) = -1;
             await EnterSingleDoor;
         }
     }
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_8024230C));
     }
     await N(makeEntities);
@@ -91,9 +91,9 @@ static s32 N(pad_17E8)[] = {
 
 EvtSource N(802417F0) = SCRIPT({
     N(func_80240000_C3AA10)();
-    func_802CA988(0, SI_VAR(2), SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    func_802CA988(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5));
     N(func_80240030_C3AA40)();
-    SI_SAVE_FLAG(1047) = 1;
+    EVT_SAVE_FLAG(1047) = 1;
     GotoMap("dgb_06", 1);
     sleep 100;
 });
@@ -103,7 +103,7 @@ static s32 N(pad_1868)[] = {
 };
 
 EvtSource N(makeEntities) = SCRIPT({
-    if (SI_SAVE_FLAG(1047) == 0) {
+    if (EVT_SAVE_FLAG(1047) == 0) {
         MakeEntity(0x802BCE84, 510, -210, 100, 0, MAKE_ENTITY_END);
     }
 });
@@ -113,8 +113,8 @@ static s32 N(pad_18BC) = {
 };
 
 EvtSource N(802418C0) = SCRIPT({
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             RemoveNpc(NPC_SELF);
         }

src/world/area_dgb/dgb_06/C3D080.c

@@ -19,7 +19,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(80240320) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -39,10 +39,10 @@ EvtSource N(exitSingleDoor_802403C0) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 12;
-    SI_VAR(2) = 5;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 12;
+    EVT_VAR(2) = 5;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_04", 1);
@@ -51,18 +51,18 @@ EvtSource N(exitSingleDoor_802403C0) = SCRIPT({
 
 EvtSource N(enterSingleDoor_80240474) = SCRIPT({
     UseDoorSounds(0);
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 5;
-            SI_VAR(3) = -1;
+            EVT_VAR(2) = 5;
+            EVT_VAR(3) = -1;
             await EnterSingleDoor;
         }
     }
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(589824);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
@@ -70,7 +70,7 @@ EvtSource N(main) = SCRIPT({
     SetCamEnabled(0, 1);
     MakeNpcs(1, N(npcGroupList_80240B44));
     await N(makeEntities);
-    if (SI_SAVE_FLAG(1047) == 0) {
+    if (EVT_SAVE_FLAG(1047) == 0) {
         EnableGroup(28, 0);
     } else {
         EnableGroup(25, 0);
@@ -86,26 +86,26 @@ EvtSource N(80240624) = SCRIPT({
     group 0;
     SetTimeFreezeMode(2);
     sleep 40;
-    ShowGotItem(SI_VAR(0), 0, 0);
+    ShowGotItem(EVT_VAR(0), 0, 0);
     SetTimeFreezeMode(0);
     return;
 });
 
 EvtSource N(8024068C) = SCRIPT({
     DisablePlayerInput(TRUE);
-    SI_VAR(0) = SI_VAR(10);
-    if (SI_VAR(10) != 0) {
+    EVT_VAR(0) = EVT_VAR(10);
+    if (EVT_VAR(10) != 0) {
         await N(80240624);
     }
-    match SI_VAR(11) {
+    match EVT_VAR(11) {
         == 0 {
-            AddItem(SI_VAR(10), SI_VAR(0));
+            AddItem(EVT_VAR(10), EVT_VAR(0));
         }
         == 1 {
-            AddKeyItem(SI_VAR(10));
+            AddKeyItem(EVT_VAR(10));
         }
         == 2 {
-            AddBadge(SI_VAR(10), SI_VAR(0));
+            AddBadge(EVT_VAR(10), EVT_VAR(0));
         }
     }
     sleep 15;
@@ -113,15 +113,15 @@ EvtSource N(8024068C) = SCRIPT({
 });
 
 EvtSource N(8024076C) = SCRIPT({
-    SI_VAR(10) = 19;
-    SI_VAR(11) = 1;
-    SI_SAVE_FLAG(1048) = 1;
+    EVT_VAR(10) = 19;
+    EVT_VAR(11) = 1;
+    EVT_SAVE_FLAG(1048) = 1;
     await N(8024068C);
 });
 
 EvtSource N(makeEntities) = SCRIPT({
     MakeEntity(0x802EAE30, -300, 50, -200, 0, ITEM_NONE, MAKE_ENTITY_END);
-    AssignFlag(SI_SAVE_FLAG(1048));
+    AssignFlag(EVT_SAVE_FLAG(1048));
     AssignScript(N(8024076C));
     MakeEntity(0x802EA7E0, -125, 60, 175, 0, MAKE_ENTITY_END);
 });
@@ -137,19 +137,19 @@ NpcSettings N(npcSettings_80240840) = {
 };
 
 EvtSource N(interact_8024086C) = SCRIPT({
-    if (SI_AREA_FLAG(4) == 0) {
+    if (EVT_AREA_FLAG(4) == 0) {
         SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                       0x00F0));
-        SI_AREA_FLAG(4) = 1;
+        EVT_AREA_FLAG(4) = 1;
     } else {
         SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E,
                       0x00F1));
-        SI_AREA_FLAG(4) = 0;
+        EVT_AREA_FLAG(4) = 0;
     }
 });
 
 EvtSource N(init_802408FC) = SCRIPT({
-    if (SI_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
+    if (EVT_STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) {
         SetNpcPos(NPC_SELF, 0, -1000, 0);
     }
     BindNpcInteract(NPC_SELF, N(interact_8024086C));

src/world/area_dgb/dgb_07/C3DBF0.c

@@ -23,7 +23,7 @@ MapConfig N(config) = {
 };
 
 EvtSource N(80241490) = SCRIPT({
-    match SI_STORY_PROGRESS {
+    match EVT_STORY_PROGRESS {
         < STORY_CH3_TUBBA_WOKE_UP {
             SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8);
         }
@@ -43,10 +43,10 @@ EvtSource N(exitSingleDoor_80241530) = SCRIPT({
     group 27;
     DisablePlayerInput(TRUE);
     UseDoorSounds(0);
-    SI_VAR(0) = 0;
-    SI_VAR(1) = 6;
-    SI_VAR(2) = 22;
-    SI_VAR(3) = -1;
+    EVT_VAR(0) = 0;
+    EVT_VAR(1) = 6;
+    EVT_VAR(2) = 22;
+    EVT_VAR(3) = -1;
     spawn ExitSingleDoor;
     sleep 17;
     GotoMap("dgb_02", 2);
@@ -55,24 +55,24 @@ EvtSource N(exitSingleDoor_80241530) = SCRIPT({
 
 EvtSource N(enterSingleDoor_802415E4) = SCRIPT({
     UseDoorSounds(0);
-    GetEntryID(SI_VAR(0));
-    match SI_VAR(0) {
+    GetEntryID(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
-            SI_VAR(2) = 22;
-            SI_VAR(3) = -1;
+            EVT_VAR(2) = 22;
+            EVT_VAR(3) = -1;
             await EnterSingleDoor;
         }
     }
 });
 
 EvtSource N(main) = SCRIPT({
-    SI_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
+    EVT_WORLD_LOCATION = LOCATION_TUBBAS_MANOR;
     SetSpriteShading(-1);
     SetCamPerspective(0, 3, 25, 16, 4096);
     SetCamBGColor(0, 0, 0, 0);
     SetCamLeadPlayer(0, 0);
     SetCamEnabled(0, 1);
-    if (SI_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
+    if (EVT_STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) {
         MakeNpcs(1, N(npcGroupList_80241E5C));
     }
     await N(makeEntities);
@@ -82,7 +82,7 @@ EvtSource N(main) = SCRIPT({
 });
 
 EvtSource N(makeEntities) = SCRIPT({
-    MakeItemEntity(ITEM_STAR_PIECE, -220, 75, -210, 17, SI_SAVE_FLAG(1050));
+    MakeItemEntity(ITEM_STAR_PIECE, -220, 75, -210, 17, EVT_SAVE_FLAG(1050));
     MakeEntity(0x802EAED4, -370, 0, -200, 0, -1, MAKE_ENTITY_END);
     MakeEntity(0x802EAED4, -410, 0, -200, 0, -1, MAKE_ENTITY_END);
 });
@@ -92,8 +92,8 @@ static s32 N(pad_17E4)[] = {
 };
 
 EvtSource N(802417F0) = SCRIPT({
-    GetBattleOutcome(SI_VAR(0));
-    match SI_VAR(0) {
+    GetBattleOutcome(EVT_VAR(0));
+    match EVT_VAR(0) {
         == 0 {
             RemoveNpc(NPC_SELF);
         }