diff --git a/Jenkinsfile b/Jenkinsfile
index 54d99a3109..6cd0420ebe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,6 +11,7 @@ pipeline {
                 sh 'curl -L "https://github.com/pmret/gcc-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc'
                 sh 'curl -L "https://github.com/pmret/binutils-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc'
                 sh 'curl -L "https://github.com/ethteck/ido-static-recomp/releases/download/per-function/ido-5.3-recomp-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/ido5.3'
+		sh 'curl -L "https://github.com/Mr-Wiseguy/kmc-gcc-wrapper/releases/download/master/kmc-gcc-wrapper-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/kmcgcc'
                 sh './configure'
             }
         }
diff --git a/include/common_structs.h b/include/common_structs.h
index 5c0e0e9421..38e9b422d5 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1243,7 +1243,7 @@ typedef Shadow* ShadowList[MAX_SHADOWS];
 typedef struct StaticShadowData {
     /* 0x00 */ u16 flags;
     /* 0x02 */ char unk_02[0x2];
-    /* 0x04 */ s32 unk_04;
+    /* 0x04 */ s32* unk_04;
     /* 0x08 */ StaticAnimatorNode** animModelNode;
     /* 0x0C */ void (*onCreateCallback)(Shadow* shadow);
     /* 0x10 */ char unk_10[0x10];
diff --git a/include/effects_internal.h b/include/effects_internal.h
index a7d0a204e2..a036f1a246 100644
--- a/include/effects_internal.h
+++ b/include/effects_internal.h
@@ -3,10 +3,41 @@
 
 #include "effects.h"
 
+// Used by effects 8 and 9 (TODO: better name)
+typedef struct Effect8 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ u16 unk_04;
+    /* 0x06 */ s16 unk_06;
+    /* 0x08 */ u8 primAlpha;
+    /* 0x09 */ s8 unk_09;
+    /* 0x0A */ char unk_0A[0x2];
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ f32 unk_24;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ f32 unk_2C;
+    /* 0x30 */ Mtx unk_30;
+    /* 0x70 */ f32 unk_70;
+    /* 0x74 */ f32 unk_74;
+    /* 0x78 */ f32 unk_78;
+    /* 0x7C */ f32 unk_7C;
+    /* 0x80 */ f32 unk_80;
+    /* 0x84 */ f32 unk_84;
+    /* 0x88 */ f32 unk_88;
+    /* 0x8C */ f32 unk_8C;
+    /* 0x90 */ f32 unk_90;
+    /* 0x94 */ f32 unk_94;
+} Effect8; // size = 0x98
+
 u32 func_E0200000(s32);
 
 EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp);
 void shim_remove_effect(EffectInstance*);
+s32 shim_rand_int(s32);
 void* shim_general_heap_malloc(s32 size);
 RenderTask* shim_queue_render_task(RenderTask* task);
 f32 shim_sin_deg(f32 x);
diff --git a/include/functions.h b/include/functions.h
index c9a680551a..142da26e0c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -305,6 +305,9 @@ void set_aux_pan_v(s32 texPannerID, s32 value);
 void enable_world_fog(void);
 void set_world_fog_dist(s32 start, s32 end);
 void set_world_fog_color(s32 r, s32 g, s32 b, s32 a);
+void enable_entity_fog(void);
+void set_entity_fog_dist(s32 start, s32 end);
+void set_entity_fog_color(s32 r, s32 g, s32 b, s32 a);
 
 ModelTransformGroup* get_transform_group(s32 index);
 
@@ -471,6 +474,16 @@ void crash_screen_set_draw_info(u16* frameBufPtr, s16 width, s16 height);
 void func_80077BD0(s32, s32, s32, s32, s32, s32);
 void func_8006CAC0(float mf[4][4], float x, float y, float z);
 
+void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_800496B8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049C04(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049E3C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049ECC(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049F7C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_8004A124(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_8004A3E8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_8004A73C(Evt* script);
+
 s32 create_generic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void));
 EntityModel* get_entity_model(s32 idx);
 f32 phys_get_spin_history(s32 lag, s32* x, s32* y, s32* z);
diff --git a/include/include_asm_libultra.h b/include/include_asm_libultra.h
new file mode 100644
index 0000000000..c0117de64b
--- /dev/null
+++ b/include/include_asm_libultra.h
@@ -0,0 +1,31 @@
+#ifndef __INCLUDE_ASM_LIBULTRA_H__
+#define __INCLUDE_ASM_LIBULTRA_H__
+
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#if !defined(SPLAT) && !defined(__CTX__) && !defined(PERMUTER)
+#ifndef INCLUDE_ASM_LIBULTRA
+#define INCLUDE_ASM_LIBULTRA(FOLDER, NAME) \
+   __asm__( \
+        ".section .text\n" \
+        "\t.align\t2\n" \
+        "\t.globl\t"#NAME"\n" \
+        "\t.ent\t"#NAME"\n" \
+        #NAME ":\n" \
+        "\t.include \"ver/"STRINGIFY(VERSION)"/asm/os/"FOLDER"/"#NAME".s\"\n" \
+        "\t.set reorder\n" \
+        "\t.set at\n" \
+        "\t.end\t"#NAME \
+    );
+#endif
+__asm__(".include \"include/macro.inc\"\n");
+#ifdef MOVE_ADDU
+__asm__(".include \"include/move_addu.inc\"\n");
+#endif
+#else
+#define INCLUDE_ASM_LIBULTRA(FOLDER, NAME)
+#endif
+
+
+#endif
diff --git a/include/map.h b/include/map.h
index 76c4f41f8a..16d52e7ca8 100644
--- a/include/map.h
+++ b/include/map.h
@@ -327,6 +327,11 @@ typedef struct {
     /* 0x08 */ s32 battle;
 } NpcGroupList[]; // size = 0x0C
 
+typedef struct QuizRequirements {
+    s32 unk_00;
+    s32 unk_04;
+} QuizRequirements; // size = 0x8
+
 #define NPC_GROUP(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle }
 
 Enemy* get_enemy(s32 npcId);
diff --git a/include/variables.h b/include/variables.h
index ecc900172e..0f4d82a942 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -112,15 +112,6 @@ extern f32 D_800F7B70[4];
 
 extern TempSetZoneEnabled* D_800D91D4;
 
-extern UNK_TYPE D_0A0031E0;
-extern UNK_TYPE D_0A001508;
-extern UNK_TYPE D_0A0031B0;
-extern UNK_TYPE D_0A0014D8;
-extern UNK_TYPE D_0A002F78;
-extern UNK_TYPE D_0A001218;
-extern UNK_TYPE D_0A003F70;
-extern UNK_TYPE D_0A002318;
-
 // Animation related
 extern AnimatedMeshList* gCurrentAnimMeshListPtr;
 
diff --git a/install.sh b/install.sh
index 69464aecd7..a3052b1932 100755
--- a/install.sh
+++ b/install.sh
@@ -23,7 +23,7 @@ if [[ "$uname" == "Darwin" ]]; then
     fi
 
     # Install packages
-    brew install md5sha1sum ninja gcc nanaian/brew/mips-linux-gnu-binutils || exit 1
+    brew install md5sha1sum ninja gcc nanaian/brew/mips-linux-gnu-binutils wine || exit 1
     python3 -m pip install -U -r requirements.txt || exit 1
 
     if [[ $1 == "--extra" ]]; then
@@ -42,6 +42,9 @@ curl -L "https://github.com/pmret/binutils-papermario/releases/download/master/l
 echo "Downloading IDO 5.3 for Linux"
 curl -L "https://github.com/ethteck/ido-static-recomp/releases/download/per-function/ido-5.3-recomp-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/ido5.3
 
+echo "Downloading KMC GCC wrapper for Linux"
+curl -L "https://github.com/Mr-Wiseguy/kmc-gcc-wrapper/releases/download/master/kmc-gcc-wrapper-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/kmcgcc
+
 # Debian and derivatives (apt)
 if cat /etc/os-release | grep -E 'ID=debian|ID_LIKE=(.*)debian' &> /dev/null; then
     echo "Installing packages for Debian or derivative (apt)"
diff --git a/src/104730.c b/src/104730.c
index 26bbd727eb..447ca747ff 100644
--- a/src/104730.c
+++ b/src/104730.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "ld_addrs.h"
 
 void entity_shattering_block_init(Entity* entity);
 
@@ -7,31 +8,18 @@ extern UNK_TYPE D_802E91F0;
 extern UNK_TYPE D_802E9270;
 extern UNK_TYPE D_802E92B0;
 
-extern UNK_TYPE D_0A003508;
-extern UNK_TYPE D_00E4B2E0;
-extern UNK_TYPE D_00E4E7F0;
-extern UNK_TYPE D_0A000EF8;
-extern UNK_TYPE D_0A000EF8;
-extern UNK_TYPE D_0A000EE8;
 extern UNK_TYPE D_0A000740;
-
-extern UNK_TYPE D_00E62AC0;
-extern UNK_TYPE D_00E639C0;
-extern UNK_TYPE D_00E639C0;
-extern UNK_TYPE D_00E648D0;
-extern UNK_TYPE D_00E639C0;
-extern UNK_TYPE D_00E648D0;
-extern UNK_TYPE D_00E62370;
-extern UNK_TYPE D_00E62AC0;
-
-extern UNK_TYPE D_0A0031E0;
-extern UNK_TYPE D_0A001508;
-extern UNK_TYPE D_0A0031B0;
-extern UNK_TYPE D_0A0014D8;
-extern UNK_TYPE D_0A002F78;
+extern UNK_TYPE D_0A000EE8;
+extern UNK_TYPE D_0A000EF8;
 extern UNK_TYPE D_0A001218;
-extern UNK_TYPE D_0A003F70;
+extern UNK_TYPE D_0A0014D8;
+extern UNK_TYPE D_0A001508;
 extern UNK_TYPE D_0A002318;
+extern UNK_TYPE D_0A002F78;
+extern UNK_TYPE D_0A0031B0;
+extern UNK_TYPE D_0A0031E0;
+extern UNK_TYPE D_0A003508;
+extern UNK_TYPE D_0A003F70;
 
 Gfx D_802E96F0[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -46,21 +34,21 @@ Gfx D_802E96F0[] = {
 };
 
 Gfx D_802E9738[] = {
-    gsSPDisplayList(&D_802E96F0),
+    gsSPDisplayList(D_802E96F0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsDPLoadTextureTile_4b(&D_802E9170, G_IM_FMT_I, 16, 0, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD),
     gsSPEndDisplayList(),
 };
 
 Gfx D_802E9788[] = {
-    gsSPDisplayList(&D_802E96F0),
+    gsSPDisplayList(D_802E96F0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsDPLoadTextureTile_4b(&D_802E91F0, G_IM_FMT_I, 16, 0, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD),
     gsSPEndDisplayList(),
 };
 
 Gfx D_802E97B0[] = {
-    gsSPDisplayList(&D_802E9738),
+    gsSPDisplayList(D_802E9738),
     gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH),
     gsSPVertex(&D_802E92B0, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -68,7 +56,7 @@ Gfx D_802E97B0[] = {
 };
 
 Gfx D_802E97D8[] = {
-    gsSPDisplayList(&D_802E9788),
+    gsSPDisplayList(D_802E9788),
     gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH),
     gsSPVertex(&D_802E9270, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -81,30 +69,30 @@ Gfx D_802E9828[] = {
 
 // Entity "script" data; unknown if it's used or not.
 s32 D_802E9830[8] = {
-    0x00000001, 0x0000003C, (s32) &D_802E9828, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E9828, 0x00000002,
     0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 
 s32 D_802E9850[9] = {
     0x00000005, 0x00000800, 0x00000004, 0x00000020,
-    0x00000001, 0x0000003C, (s32) &D_802E97D8, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E97D8, 0x00000002,
     0x00000000
 };
 
 s32 D_802E9874[9] = {
     0x00000005, 0x00000800, 0x00000004, 0x00000020,
-    0x00000001, 0x0000003C, (s32) &D_802E97D8, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E97D8, 0x00000002,
     0x00000000
 };
 s32 D_802E9898[9] = {
     0x00000005, 0x00000800, 0x00000004, 0x00000020,
-    0x00000001, 0x0000003C, &D_802E97B0, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E97B0, 0x00000002,
     0x00000000,
 };
 
 StaticShadowData D_802E98BC = {
     .flags = 0x20,
-    .unk_04 = &D_802E9850,
+    .unk_04 = D_802E9850,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
     .unk_20 = 0x01190A19,
@@ -112,7 +100,7 @@ StaticShadowData D_802E98BC = {
 
 StaticShadowData D_802E98E0 = {
     .flags = 0x20,
-    .unk_04 = &D_802E9874,
+    .unk_04 = D_802E9874,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
     .unk_20 = 0x01190A19,
@@ -120,7 +108,7 @@ StaticShadowData D_802E98E0 = {
 
 StaticShadowData D_802E9904 = {
     .flags = 0x20,
-    .unk_04 = &D_802E9898,
+    .unk_04 = D_802E9898,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
     .unk_20 = 0x01190A19,
@@ -147,12 +135,11 @@ s32 D_802E9930[51] = {
 };
 
 s32 D_802E99FC[7] = {
-
     0x00000004, 0x00000022, 0x00000001, 0x0000003C,
     &D_0A003508, 0x00000002, 0x00000000,
 };
 
-StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, &D_00E4B2E0, &D_00E4E7F0, 32, {0x19, 0x19, 0x19}};
+StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19}};
 
 // potential file split(?)
 s32 D_802E9A3C[1] = {
@@ -208,10 +195,10 @@ s32 D_802E9B94[7] = {
     (s32) &D_0A000740, 0x00000002, 0x00000000,
 };
 
-StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init,              &D_802E9A40, NULL, &D_00E62AC0, &D_00E639C0,  8, {0x16, 0x17, 0x16} };
-StaticEntityData D_802E9BD4 = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init,     &D_802E9AC4, NULL, &D_00E639C0, &D_00E648D0,  7, {0x16, 0x17, 0x16} };
-StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, &D_00E639C0, &D_00E648D0,  9, {0x42, 0x4B, 0x42} };
-StaticEntityData D_802E9C1C = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init,              &D_802E9B00, NULL, &D_00E62370, &D_00E62AC0, 10, {0x32, 0x0F, 0x32} };
+StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init,    &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, 8, {0x16, 0x17, 0x16} };
+StaticEntityData D_802E9BD4 = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init,     &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, 7, {0x16, 0x17, 0x16} };
+StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, 9, {0x42, 0x4B, 0x42} };
+StaticEntityData D_802E9C1C = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init,    &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, 10, {0x32, 0x0F, 0x32} };
 
 s32 D_802E9C40[12] = {
     0x00000007, 0x00000020, 0x00000003, 0x00000000,
@@ -224,20 +211,13 @@ s32 D_802E9C70[7] = {
     (s32) &D_802E9828, 0x00000002, 0x00000000
 };
 
-extern UNK_TYPE D_00E32420;
-extern UNK_TYPE D_00E35670;
-extern UNK_TYPE D_00E38890;
-extern UNK_TYPE D_00E3B870;
-extern UNK_TYPE D_00E3E260;
-extern UNK_TYPE D_00E42240;
-
-StaticEntityData D_802E9C8C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E32420, &D_00E35670, 21, {0x10, 0x10, 0x10}};
-StaticEntityData D_802E9CB0 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E35670, &D_00E38890, 22, {0x10, 0x10, 0x10}};
-StaticEntityData D_802E9CD4 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E38890, &D_00E3B870, 23, {0x10, 0x10, 0x10}};
-StaticEntityData D_802E9CF8 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E32420, &D_00E35670, 24, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9D1C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E35670, &D_00E38890, 25, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9D40 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E38890, &D_00E3B870, 26, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9D64 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E3E260, &D_00E42240, 13, {0x08, 0x08, 0x08}};
+StaticEntityData D_802E9C8C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, 21, {0x10, 0x10, 0x10}};
+StaticEntityData D_802E9CB0 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, 22, {0x10, 0x10, 0x10}};
+StaticEntityData D_802E9CD4 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, 23, {0x10, 0x10, 0x10}};
+StaticEntityData D_802E9CF8 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, 24, {0x08, 0x08, 0x08}};
+StaticEntityData D_802E9D1C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, 25, {0x08, 0x08, 0x08}};
+StaticEntityData D_802E9D40 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, 26, {0x08, 0x08, 0x08}};
+StaticEntityData D_802E9D64 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, 13, {0x08, 0x08, 0x08}};
 
 void entity_shattering_block_init(Entity* entity) {
     u32 type;
diff --git a/src/23680.c b/src/23680.c
index 091482e253..691d89af3f 100644
--- a/src/23680.c
+++ b/src/23680.c
@@ -182,7 +182,25 @@ void func_80049550(Evt* script, s32 arg1) {
     }
 }
 
-INCLUDE_ASM(s32, "23680", func_800495A0);
+void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration = (npcAISettings->moveTime / 2) + rand_int((npcAISettings->moveTime / 2) + 1);
+    npc->yaw = clamp_angle(npc->yaw + rand_int(60) - 30.0f);
+    npc->currentAnim.w = enemy->animList[1];
+    script->functionTemp[1] = 0;
+
+    if (enemy->territory->wander.moveSpeedOverride < 0) {
+        npc->moveSpeed = npcAISettings->moveSpeed;
+    } else {
+        npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
+    }
+
+    enemy->unk_B0 &= ~0x40;
+    enemy->unk_B0 &= ~0x20;
+    script->functionTemp[0] = 1;
+}
 
 INCLUDE_ASM(s32, "23680", func_800496B8);
 
@@ -191,7 +209,7 @@ INCLUDE_ASM(s32, "23680", func_800496B8);
 
 INCLUDE_ASM(s32, "23680", func_80049C04);
 
-void func_80049E3C(Evt* script) {
+void func_80049E3C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
@@ -204,7 +222,7 @@ void func_80049E3C(Evt* script) {
     script->functionTemp[0] = 11;
 }
 
-void func_80049ECC(Evt* script) {
+void func_80049ECC(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
     Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
     s32 flag = FALSE;
 
@@ -225,11 +243,45 @@ void func_80049ECC(Evt* script) {
     }
 }
 
-INCLUDE_ASM(s32, "23680", func_80049F7C);
+void func_80049F7C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    s32 cond = FALSE;
+
+    if ((gPlayerStatusPtr->actionState == ACTION_STATE_JUMP || gPlayerStatusPtr->actionState == ACTION_STATE_BOUNCE ||
+        gPlayerStatusPtr->actionState == ACTION_STATE_HOP || gPlayerStatusPtr->actionState == ACTION_STATE_FALLING) &&
+        (f64)dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) < npc->collisionRadius)
+    {
+        cond = TRUE;
+    }
+
+    if (!cond) {
+        f32 yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+        f32 angleDiff = get_clamped_angle_diff(npc->yaw, yaw);
+        s32 temp_f4 = npcAISettings->unk_1C.s;
+
+        if (temp_f4 < fabsf(angleDiff)) {
+            yaw = npc->yaw;
+            if (angleDiff < 0.0f) {
+                yaw += -npcAISettings->unk_1C.s;
+            } else {
+                yaw += temp_f4;
+            }
+        }
+        npc->yaw = clamp_angle(yaw);
+        npc->duration = (npcAISettings->unk_20 / 2) + rand_int((npcAISettings->unk_20 / 2) + 1);
+    } else {
+        npc->duration = 0;
+    }
+
+    npc->currentAnim.w = enemy->animList[3];
+    npc->moveSpeed = npcAISettings->chaseSpeed;
+    script->functionTemp[0] = 13;
+}
 
 INCLUDE_ASM(s32, "23680", func_8004A124);
 
-void func_8004A3E8(Evt* script, s32 arg1) {
+void func_8004A3E8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
diff --git a/src/effects/effect_1.c b/src/effects/effect_1.c
index a9ac180ab0..a9f01bcce4 100644
--- a/src/effects/effect_1.c
+++ b/src/effects/effect_1.c
@@ -17,11 +17,6 @@ typedef struct Effect1 {
     /* 0x28 */ char unk_28[0x4];
 } Effect1; // size = 0x2C
 
-void fx_1_init(EffectInstance* effect);
-void fx_1_update(EffectInstance* effect);
-void fx_1_render(EffectInstance* effect);
-void fx_1_appendGfx(EffectInstance* effect);
-
 static f32 D_E0002760[10] = { 10.0f, 40.0f, 80.0f, 170.0f, 140.0f, 100.0f, 25.0f, 155.0f, 60.0f, 120.0f };
 static f32 D_E0002788[10] = { 2.2f, 2.7f, 3.0f, 2.2f, 2.7f, 3.0f, 1.9f, 1.9f, 1.5f, 1.5f };
 static f32 sPartScales[10] = { 1.4f, 1.3f, 1.2f, 1.3f, 1.4f, 1.3f, 1.6f, 1.6f, 1.6f, 1.6f };
@@ -29,6 +24,11 @@ static f32 sPartYaws[10] = { 0.0f, 234.0f, 468.0f, 702.0f, 936.0f, 1260.0f, 1404
 
 static s32 sDlists[7] = { 0x09000FA0, 0x09001060, 0x09001120, 0x090011E0, 0x090012A0, 0x09001360, 0x09001420 };
 
+void fx_1_init(EffectInstance* effect);
+void fx_1_update(EffectInstance* effect);
+void fx_1_render(EffectInstance* effect);
+void fx_1_appendGfx(EffectInstance* effect);
+
 void fx_1_main(f32 x, f32 y, f32 z) {
     EffectBlueprint bp;
     EffectInstance* effect;
diff --git a/src/effects/effect_10.c b/src/effects/effect_10.c
index a6d085f51b..1e6474f6f2 100644
--- a/src/effects/effect_10.c
+++ b/src/effects/effect_10.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_10", fx_10_main);
 
-void func_E0014258(void) {
+void fx_10_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_10", func_E0014260);
+INCLUDE_ASM(s32, "effects/effect_10", fx_10_update);
 
-INCLUDE_ASM(s32, "effects/effect_10", func_E001449C);
+INCLUDE_ASM(s32, "effects/effect_10", fx_10_render);
 
-INCLUDE_ASM(s32, "effects/effect_10", func_E00144E0);
+INCLUDE_ASM(s32, "effects/effect_10", fx_10_appendGfx);
diff --git a/src/effects/effect_100.c b/src/effects/effect_100.c
index 5829d0ecd6..8752805327 100644
--- a/src/effects/effect_100.c
+++ b/src/effects/effect_100.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_100", fx_100_main);
 
-void func_E00C8218(void) {
+void fx_100_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_100", func_E00C8220);
+INCLUDE_ASM(s32, "effects/effect_100", fx_100_update);
 
-INCLUDE_ASM(s32, "effects/effect_100", func_E00C8404);
+INCLUDE_ASM(s32, "effects/effect_100", fx_100_render);
 
 void func_E00C844C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_100", func_E00C8454);
+INCLUDE_ASM(s32, "effects/effect_100", fx_100_appendGfx);
diff --git a/src/effects/effect_101.c b/src/effects/effect_101.c
index 4c37fa3cd6..be9390e131 100644
--- a/src/effects/effect_101.c
+++ b/src/effects/effect_101.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_101", fx_101_main);
 
-void func_E00CA240(void) {
+void fx_101_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_101", func_E00CA248);
+INCLUDE_ASM(s32, "effects/effect_101", fx_101_update);
 
-INCLUDE_ASM(s32, "effects/effect_101", func_E00CA484);
+INCLUDE_ASM(s32, "effects/effect_101", fx_101_render);
 
-INCLUDE_ASM(s32, "effects/effect_101", func_E00CA4CC);
+INCLUDE_ASM(s32, "effects/effect_101", fx_101_appendGfx);
diff --git a/src/effects/effect_102.c b/src/effects/effect_102.c
index 14c82a75c9..e668a215b5 100644
--- a/src/effects/effect_102.c
+++ b/src/effects/effect_102.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_102", fx_102_main);
 
-void func_E00CC250(void) {
+void fx_102_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_102", func_E00CC258);
+INCLUDE_ASM(s32, "effects/effect_102", fx_102_update);
 
-INCLUDE_ASM(s32, "effects/effect_102", func_E00CC980);
+INCLUDE_ASM(s32, "effects/effect_102", fx_102_render);
 
 void func_E00CC9C8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_102", func_E00CC9D0);
+INCLUDE_ASM(s32, "effects/effect_102", fx_102_appendGfx);
diff --git a/src/effects/effect_103.c b/src/effects/effect_103.c
index 78389e570d..c88e60d836 100644
--- a/src/effects/effect_103.c
+++ b/src/effects/effect_103.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_103", fx_103_main);
 
-void func_E00CE21C(void) {
+void fx_103_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_103", func_E00CE224);
+INCLUDE_ASM(s32, "effects/effect_103", fx_103_update);
 
-INCLUDE_ASM(s32, "effects/effect_103", func_E00CE428);
+INCLUDE_ASM(s32, "effects/effect_103", fx_103_render);
 
 void func_E00CE470(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_103", func_E00CE478);
+INCLUDE_ASM(s32, "effects/effect_103", fx_103_appendGfx);
diff --git a/src/effects/effect_104.c b/src/effects/effect_104.c
index 3378916ff4..c6fc2fc205 100644
--- a/src/effects/effect_104.c
+++ b/src/effects/effect_104.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_104", fx_104_main);
 
-void func_E00D018C(void) {
+void fx_104_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_104", func_E00D0194);
+INCLUDE_ASM(s32, "effects/effect_104", fx_104_update);
 
-INCLUDE_ASM(s32, "effects/effect_104", func_E00D0448);
+INCLUDE_ASM(s32, "effects/effect_104", fx_104_render);
 
-INCLUDE_ASM(s32, "effects/effect_104", func_E00D048C);
+INCLUDE_ASM(s32, "effects/effect_104", fx_104_appendGfx);
diff --git a/src/effects/effect_105.c b/src/effects/effect_105.c
index 6662b132f9..4afe0af763 100644
--- a/src/effects/effect_105.c
+++ b/src/effects/effect_105.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_105", fx_105_main);
 
-void func_E00D2118(void) {
+void fx_105_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_105", func_E00D2120);
+INCLUDE_ASM(s32, "effects/effect_105", fx_105_update);
 
-INCLUDE_ASM(s32, "effects/effect_105", func_E00D2234);
+INCLUDE_ASM(s32, "effects/effect_105", fx_105_render);
 
 void func_E00D227C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_105", func_E00D2284);
+INCLUDE_ASM(s32, "effects/effect_105", fx_105_appendGfx);
diff --git a/src/effects/effect_107.c b/src/effects/effect_107.c
index ed990a97f7..5050ae0deb 100644
--- a/src/effects/effect_107.c
+++ b/src/effects/effect_107.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_107", fx_107_main);
 
-void func_E00D6718(void) {
+void fx_107_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_107", func_E00D6720);
+INCLUDE_ASM(s32, "effects/effect_107", fx_107_update);
 
-INCLUDE_ASM(s32, "effects/effect_107", func_E00D693C);
+INCLUDE_ASM(s32, "effects/effect_107", fx_107_render);
 
 void func_E00D6978(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_107", func_E00D6980);
+INCLUDE_ASM(s32, "effects/effect_107", fx_107_appendGfx);
diff --git a/src/effects/effect_108.c b/src/effects/effect_108.c
index 90806dcfcb..d75f1b0f42 100644
--- a/src/effects/effect_108.c
+++ b/src/effects/effect_108.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_108", fx_108_main);
 
-void func_E00D8120(void) {
+void fx_108_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_108", func_E00D8128);
+INCLUDE_ASM(s32, "effects/effect_108", fx_108_update);
 
-void func_E00D825C(void) {
+void fx_108_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_108", func_E00D8264);
diff --git a/src/effects/effect_109.c b/src/effects/effect_109.c
index d7c22b9a80..1512f854c7 100644
--- a/src/effects/effect_109.c
+++ b/src/effects/effect_109.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_109", fx_109_main);
 
-void func_E00DA0FC(void) {
+void fx_109_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_109", func_E00DA104);
+INCLUDE_ASM(s32, "effects/effect_109", fx_109_update);
 
-INCLUDE_ASM(s32, "effects/effect_109", func_E00DA1E0);
+INCLUDE_ASM(s32, "effects/effect_109", fx_109_render);
 
 void func_E00DA228(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_109", func_E00DA230);
+INCLUDE_ASM(s32, "effects/effect_109", fx_109_appendGfx);
diff --git a/src/effects/effect_11.c b/src/effects/effect_11.c
index 4255660484..0c6416f82e 100644
--- a/src/effects/effect_11.c
+++ b/src/effects/effect_11.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_11", fx_11_main);
 
-void func_E0016220(void) {
+void fx_11_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_11", func_E0016228);
+INCLUDE_ASM(s32, "effects/effect_11", fx_11_update);
 
-INCLUDE_ASM(s32, "effects/effect_11", func_E0016410);
+INCLUDE_ASM(s32, "effects/effect_11", fx_11_render);
 
-INCLUDE_ASM(s32, "effects/effect_11", func_E0016454);
+INCLUDE_ASM(s32, "effects/effect_11", fx_11_appendGfx);
diff --git a/src/effects/effect_110.c b/src/effects/effect_110.c
index 6509a64cf8..255c103e51 100644
--- a/src/effects/effect_110.c
+++ b/src/effects/effect_110.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_110", fx_110_main);
 
-void func_E00DC190(void) {
+void fx_110_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_110", func_E00DC198);
+INCLUDE_ASM(s32, "effects/effect_110", fx_110_update);
 
-INCLUDE_ASM(s32, "effects/effect_110", func_E00DC2C0);
+INCLUDE_ASM(s32, "effects/effect_110", fx_110_render);
 
 void func_E00DC2FC(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_110", func_E00DC304);
+INCLUDE_ASM(s32, "effects/effect_110", fx_110_appendGfx);
diff --git a/src/effects/effect_111.c b/src/effects/effect_111.c
index 164a0f78c0..877d247c71 100644
--- a/src/effects/effect_111.c
+++ b/src/effects/effect_111.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_111", fx_111_main);
 
-void func_E00DE11C(void) {
+void fx_111_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_111", func_E00DE124);
+INCLUDE_ASM(s32, "effects/effect_111", fx_111_update);
 
-INCLUDE_ASM(s32, "effects/effect_111", func_E00DE260);
+INCLUDE_ASM(s32, "effects/effect_111", fx_111_render);
 
-INCLUDE_ASM(s32, "effects/effect_111", func_E00DE2A8);
+INCLUDE_ASM(s32, "effects/effect_111", fx_111_appendGfx);
diff --git a/src/effects/effect_112.c b/src/effects/effect_112.c
index c505cdea5f..f0a245cce6 100644
--- a/src/effects/effect_112.c
+++ b/src/effects/effect_112.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_112", fx_112_main);
 
-void func_E00E01D0(void) {
+void fx_112_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_112", func_E00E01D8);
+INCLUDE_ASM(s32, "effects/effect_112", fx_112_update);
 
-INCLUDE_ASM(s32, "effects/effect_112", func_E00E05B0);
+INCLUDE_ASM(s32, "effects/effect_112", fx_112_render);
 
 void func_E00E05F8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_112", func_E00E0600);
+INCLUDE_ASM(s32, "effects/effect_112", fx_112_appendGfx);
diff --git a/src/effects/effect_113.c b/src/effects/effect_113.c
index e44fe3ddd9..62da68a101 100644
--- a/src/effects/effect_113.c
+++ b/src/effects/effect_113.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_113", fx_113_main);
 
-void func_E00E212C(void) {
+void fx_113_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_113", func_E00E2134);
+INCLUDE_ASM(s32, "effects/effect_113", fx_113_update);
 
-INCLUDE_ASM(s32, "effects/effect_113", func_E00E21C8);
+INCLUDE_ASM(s32, "effects/effect_113", fx_113_render);
 
 void func_E00E2210(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_113", func_E00E2218);
+INCLUDE_ASM(s32, "effects/effect_113", fx_113_appendGfx);
diff --git a/src/effects/effect_114.c b/src/effects/effect_114.c
index 4770147629..b4aae4d1a3 100644
--- a/src/effects/effect_114.c
+++ b/src/effects/effect_114.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_114", fx_114_main);
 
-void func_E00E4288(void) {
+void fx_114_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_114", func_E00E4290);
+INCLUDE_ASM(s32, "effects/effect_114", fx_114_update);
 
-INCLUDE_ASM(s32, "effects/effect_114", func_E00E490C);
+INCLUDE_ASM(s32, "effects/effect_114", fx_114_render);
 
 void func_E00E4954(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_114", func_E00E495C);
+INCLUDE_ASM(s32, "effects/effect_114", fx_114_appendGfx);
diff --git a/src/effects/effect_115.c b/src/effects/effect_115.c
index 872d3a625f..d0e2766ab5 100644
--- a/src/effects/effect_115.c
+++ b/src/effects/effect_115.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_115", fx_115_main);
 
-void func_E00E617C(void) {
+void fx_115_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_115", func_E00E6184);
+INCLUDE_ASM(s32, "effects/effect_115", fx_115_update);
 
-INCLUDE_ASM(s32, "effects/effect_115", func_E00E64D4);
+INCLUDE_ASM(s32, "effects/effect_115", fx_115_render);
 
 void func_E00E651C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_115", func_E00E6524);
+INCLUDE_ASM(s32, "effects/effect_115", fx_115_appendGfx);
diff --git a/src/effects/effect_116.c b/src/effects/effect_116.c
index 2395c5b2d0..480176f802 100644
--- a/src/effects/effect_116.c
+++ b/src/effects/effect_116.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_116", fx_116_main);
 
-void func_E00E825C(void) {
+void fx_116_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_116", func_E00E8264);
+INCLUDE_ASM(s32, "effects/effect_116", fx_116_update);
 
-INCLUDE_ASM(s32, "effects/effect_116", func_E00E8374);
+INCLUDE_ASM(s32, "effects/effect_116", fx_116_render);
 
-INCLUDE_ASM(s32, "effects/effect_116", func_E00E83BC);
+INCLUDE_ASM(s32, "effects/effect_116", fx_116_appendGfx);
diff --git a/src/effects/effect_117.c b/src/effects/effect_117.c
index 18faed1f3b..b167f17d2a 100644
--- a/src/effects/effect_117.c
+++ b/src/effects/effect_117.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_117", fx_117_main);
 
-void func_E00EA190(void) {
+void fx_117_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_117", func_E00EA198);
+INCLUDE_ASM(s32, "effects/effect_117", fx_117_update);
 
-INCLUDE_ASM(s32, "effects/effect_117", func_E00EA520);
+INCLUDE_ASM(s32, "effects/effect_117", fx_117_render);
 
 void func_E00EA664(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_117", func_E00EA66C);
+INCLUDE_ASM(s32, "effects/effect_117", fx_117_appendGfx);
diff --git a/src/effects/effect_119.c b/src/effects/effect_119.c
index ba489f06dc..23f13bf7dc 100644
--- a/src/effects/effect_119.c
+++ b/src/effects/effect_119.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_119", fx_119_main);
 
-void func_E010A184(void) {
+void fx_119_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_119", func_E010A18C);
+INCLUDE_ASM(s32, "effects/effect_119", fx_119_update);
 
-INCLUDE_ASM(s32, "effects/effect_119", func_E010A4A0);
+INCLUDE_ASM(s32, "effects/effect_119", fx_119_render);
 
-INCLUDE_ASM(s32, "effects/effect_119", func_E010A4E8);
+INCLUDE_ASM(s32, "effects/effect_119", fx_119_appendGfx);
diff --git a/src/effects/effect_12.c b/src/effects/effect_12.c
index 14f104ea8b..25bd8b402d 100644
--- a/src/effects/effect_12.c
+++ b/src/effects/effect_12.c
@@ -4,13 +4,13 @@ INCLUDE_ASM(s32, "effects/effect_12", func_E0018000);
 
 INCLUDE_ASM(s32, "effects/effect_12", fx_12_main);
 
-void func_E00182AC(void) {
+void fx_12_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_12", func_E00182B4);
+INCLUDE_ASM(s32, "effects/effect_12", fx_12_update);
 
-INCLUDE_ASM(s32, "effects/effect_12", func_E0018378);
+INCLUDE_ASM(s32, "effects/effect_12", fx_12_render);
 
 INCLUDE_ASM(s32, "effects/effect_12", func_E00183BC);
 
-INCLUDE_ASM(s32, "effects/effect_12", func_E00183D8);
+INCLUDE_ASM(s32, "effects/effect_12", fx_12_appendGfx);
diff --git a/src/effects/effect_120.c b/src/effects/effect_120.c
index 5b47ff5caa..e9c1e04def 100644
--- a/src/effects/effect_120.c
+++ b/src/effects/effect_120.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_120", fx_120_main);
 
-void func_E010C190(void) {
+void fx_120_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_120", func_E010C198);
+INCLUDE_ASM(s32, "effects/effect_120", fx_120_update);
 
-INCLUDE_ASM(s32, "effects/effect_120", func_E010C354);
+INCLUDE_ASM(s32, "effects/effect_120", fx_120_render);
 
-INCLUDE_ASM(s32, "effects/effect_120", func_E010C39C);
+INCLUDE_ASM(s32, "effects/effect_120", fx_120_appendGfx);
diff --git a/src/effects/effect_121.c b/src/effects/effect_121.c
index 308b68ce19..400fee49ff 100644
--- a/src/effects/effect_121.c
+++ b/src/effects/effect_121.c
@@ -4,11 +4,11 @@ INCLUDE_ASM(s32, "effects/effect_121", func_E010E000);
 
 INCLUDE_ASM(s32, "effects/effect_121", fx_121_main);
 
-void func_E010E4A0(void) {
+void fx_121_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E4A8);
+INCLUDE_ASM(s32, "effects/effect_121", fx_121_update);
 
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E510);
+INCLUDE_ASM(s32, "effects/effect_121", fx_121_render);
 
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E558);
+INCLUDE_ASM(s32, "effects/effect_121", fx_121_appendGfx);
diff --git a/src/effects/effect_122.c b/src/effects/effect_122.c
index 7bab95542c..54a6fb8b6c 100644
--- a/src/effects/effect_122.c
+++ b/src/effects/effect_122.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_122", fx_122_main);
 
-void func_E0110224(void) {
+void fx_122_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_122", func_E011022C);
+INCLUDE_ASM(s32, "effects/effect_122", fx_122_update);
 
-INCLUDE_ASM(s32, "effects/effect_122", func_E01103A4);
+INCLUDE_ASM(s32, "effects/effect_122", fx_122_render);
 
-INCLUDE_ASM(s32, "effects/effect_122", func_E01103EC);
+INCLUDE_ASM(s32, "effects/effect_122", fx_122_appendGfx);
diff --git a/src/effects/effect_123.c b/src/effects/effect_123.c
index 8d783923ab..c2c8877ba1 100644
--- a/src/effects/effect_123.c
+++ b/src/effects/effect_123.c
@@ -2,13 +2,13 @@
 
 INCLUDE_ASM(s32, "effects/effect_123", fx_123_main);
 
-void func_E01121B8(void) {
+void fx_123_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_123", func_E01121C0);
+INCLUDE_ASM(s32, "effects/effect_123", fx_123_update);
 
-INCLUDE_ASM(s32, "effects/effect_123", func_E01122E8);
+INCLUDE_ASM(s32, "effects/effect_123", fx_123_render);
 
 INCLUDE_ASM(s32, "effects/effect_123", func_E0112330);
 
-INCLUDE_ASM(s32, "effects/effect_123", func_E01124CC);
+INCLUDE_ASM(s32, "effects/effect_123", fx_123_appendGfx);
diff --git a/src/effects/effect_124.c b/src/effects/effect_124.c
index 59221c95bb..e5d308c300 100644
--- a/src/effects/effect_124.c
+++ b/src/effects/effect_124.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_124", fx_124_main);
 
-void func_E01140D4(void) {
+void fx_124_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_124", func_E01140DC);
+INCLUDE_ASM(s32, "effects/effect_124", fx_124_update);
 
-INCLUDE_ASM(s32, "effects/effect_124", func_E0114340);
+INCLUDE_ASM(s32, "effects/effect_124", fx_124_render);
 
-INCLUDE_ASM(s32, "effects/effect_124", func_E0114388);
+INCLUDE_ASM(s32, "effects/effect_124", fx_124_appendGfx);
diff --git a/src/effects/effect_125.c b/src/effects/effect_125.c
index f51ee50ef5..6e036c77c4 100644
--- a/src/effects/effect_125.c
+++ b/src/effects/effect_125.c
@@ -2,13 +2,13 @@
 
 INCLUDE_ASM(s32, "effects/effect_125", fx_125_main);
 
-void func_E0116184(void) {
+void fx_125_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_125", func_E011618C);
+INCLUDE_ASM(s32, "effects/effect_125", fx_125_update);
 
-INCLUDE_ASM(s32, "effects/effect_125", func_E01166A0);
+INCLUDE_ASM(s32, "effects/effect_125", fx_125_render);
 
 INCLUDE_ASM(s32, "effects/effect_125", func_E01166E8);
 
-INCLUDE_ASM(s32, "effects/effect_125", func_E0116884);
+INCLUDE_ASM(s32, "effects/effect_125", fx_125_appendGfx);
diff --git a/src/effects/effect_126.c b/src/effects/effect_126.c
index e504368282..f9715350ea 100644
--- a/src/effects/effect_126.c
+++ b/src/effects/effect_126.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_126", fx_126_main);
 
-void func_E01182EC(void) {
+void fx_126_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_126", func_E01182F4);
+INCLUDE_ASM(s32, "effects/effect_126", fx_126_update);
 
-INCLUDE_ASM(s32, "effects/effect_126", func_E0118454);
+INCLUDE_ASM(s32, "effects/effect_126", fx_126_render);
 
-INCLUDE_ASM(s32, "effects/effect_126", func_E011849C);
+INCLUDE_ASM(s32, "effects/effect_126", fx_126_appendGfx);
diff --git a/src/effects/effect_127.c b/src/effects/effect_127.c
index 9a85a651ca..999966cf0f 100644
--- a/src/effects/effect_127.c
+++ b/src/effects/effect_127.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_127", fx_127_main);
 
-void func_E011A0FC(void) {
+void fx_127_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_127", func_E011A104);
+INCLUDE_ASM(s32, "effects/effect_127", fx_127_update);
 
-void func_E011A398(void) {
+void fx_127_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_127", func_E011A3A0);
diff --git a/src/effects/effect_128.c b/src/effects/effect_128.c
index 7d1c65fd89..cb2890da47 100644
--- a/src/effects/effect_128.c
+++ b/src/effects/effect_128.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_128", fx_128_main);
 
-void func_E011C0F4(void) {
+void fx_128_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_128", func_E011C0FC);
+INCLUDE_ASM(s32, "effects/effect_128", fx_128_update);
 
-INCLUDE_ASM(s32, "effects/effect_128", func_E011C17C);
+INCLUDE_ASM(s32, "effects/effect_128", fx_128_render);
 
-INCLUDE_ASM(s32, "effects/effect_128", func_E011C1C4);
+INCLUDE_ASM(s32, "effects/effect_128", fx_128_appendGfx);
diff --git a/src/effects/effect_129.c b/src/effects/effect_129.c
index bd0112fa0b..d0c4551c35 100644
--- a/src/effects/effect_129.c
+++ b/src/effects/effect_129.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_129", fx_129_main);
 
-void func_E011E18C(void) {
+void fx_129_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_129", func_E011E194);
+INCLUDE_ASM(s32, "effects/effect_129", fx_129_update);
 
-INCLUDE_ASM(s32, "effects/effect_129", func_E011E530);
+INCLUDE_ASM(s32, "effects/effect_129", fx_129_render);
 
-INCLUDE_ASM(s32, "effects/effect_129", func_E011E578);
+INCLUDE_ASM(s32, "effects/effect_129", fx_129_appendGfx);
diff --git a/src/effects/effect_13.c b/src/effects/effect_13.c
index 67864a1404..3072c35576 100644
--- a/src/effects/effect_13.c
+++ b/src/effects/effect_13.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_13", fx_13_main);
 
-void func_E001A21C(void) {
+void fx_13_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_13", func_E001A224);
+INCLUDE_ASM(s32, "effects/effect_13", fx_13_update);
 
-INCLUDE_ASM(s32, "effects/effect_13", func_E001A3FC);
+INCLUDE_ASM(s32, "effects/effect_13", fx_13_render);
 
-INCLUDE_ASM(s32, "effects/effect_13", func_E001A440);
+INCLUDE_ASM(s32, "effects/effect_13", fx_13_appendGfx);
diff --git a/src/effects/effect_130.c b/src/effects/effect_130.c
index 9601841e0a..1980541003 100644
--- a/src/effects/effect_130.c
+++ b/src/effects/effect_130.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_130", fx_130_main);
 
-void func_E0120134(void) {
+void fx_130_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_130", func_E012013C);
+INCLUDE_ASM(s32, "effects/effect_130", fx_130_update);
 
-INCLUDE_ASM(s32, "effects/effect_130", func_E012039C);
+INCLUDE_ASM(s32, "effects/effect_130", fx_130_render);
 
-INCLUDE_ASM(s32, "effects/effect_130", func_E01203E4);
+INCLUDE_ASM(s32, "effects/effect_130", fx_130_appendGfx);
diff --git a/src/effects/effect_131.c b/src/effects/effect_131.c
index 8eedff6260..9c62349dab 100644
--- a/src/effects/effect_131.c
+++ b/src/effects/effect_131.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_131", fx_131_main);
 
-void func_E0122174(void) {
+void fx_131_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_131", func_E012217C);
+INCLUDE_ASM(s32, "effects/effect_131", fx_131_update);
 
-INCLUDE_ASM(s32, "effects/effect_131", func_E01226C4);
+INCLUDE_ASM(s32, "effects/effect_131", fx_131_render);
 
-INCLUDE_ASM(s32, "effects/effect_131", func_E012270C);
+INCLUDE_ASM(s32, "effects/effect_131", fx_131_appendGfx);
diff --git a/src/effects/effect_132.c b/src/effects/effect_132.c
index 1504aef290..10da8ef2e7 100644
--- a/src/effects/effect_132.c
+++ b/src/effects/effect_132.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_132", fx_132_main);
 
-void func_E01242FC(void) {
+void fx_132_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_132", func_E0124304);
+INCLUDE_ASM(s32, "effects/effect_132", fx_132_update);
 
-INCLUDE_ASM(s32, "effects/effect_132", func_E012448C);
+INCLUDE_ASM(s32, "effects/effect_132", fx_132_render);
 
-INCLUDE_ASM(s32, "effects/effect_132", func_E01244C4);
+INCLUDE_ASM(s32, "effects/effect_132", fx_132_appendGfx);
diff --git a/src/effects/effect_133.c b/src/effects/effect_133.c
index fa7c638cd3..d1d6d8fd72 100644
--- a/src/effects/effect_133.c
+++ b/src/effects/effect_133.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_133", fx_133_main);
 
-void func_E012612C(void) {
+void fx_133_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_133", func_E0126134);
+INCLUDE_ASM(s32, "effects/effect_133", fx_133_update);
 
-INCLUDE_ASM(s32, "effects/effect_133", func_E01264A4);
+INCLUDE_ASM(s32, "effects/effect_133", fx_133_render);
 
-INCLUDE_ASM(s32, "effects/effect_133", func_E01264EC);
+INCLUDE_ASM(s32, "effects/effect_133", fx_133_appendGfx);
diff --git a/src/effects/effect_134.c b/src/effects/effect_134.c
index dde553dbaa..7b75a31aea 100644
--- a/src/effects/effect_134.c
+++ b/src/effects/effect_134.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_134", fx_134_main);
 
-void func_E0128128(void) {
+void fx_134_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_134", func_E0128130);
+INCLUDE_ASM(s32, "effects/effect_134", fx_134_update);
 
-INCLUDE_ASM(s32, "effects/effect_134", func_E0128198);
+INCLUDE_ASM(s32, "effects/effect_134", fx_134_render);
 
-INCLUDE_ASM(s32, "effects/effect_134", func_E01281E0);
+INCLUDE_ASM(s32, "effects/effect_134", fx_134_appendGfx);
diff --git a/src/effects/effect_14.c b/src/effects/effect_14.c
index 298387dc07..9b17ad5c16 100644
--- a/src/effects/effect_14.c
+++ b/src/effects/effect_14.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_14", fx_14_main);
 
-void func_E001C120(void) {
+void fx_14_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_14", func_E001C128);
+INCLUDE_ASM(s32, "effects/effect_14", fx_14_update);
 
-INCLUDE_ASM(s32, "effects/effect_14", func_E001C200);
+INCLUDE_ASM(s32, "effects/effect_14", fx_14_render);
 
-INCLUDE_ASM(s32, "effects/effect_14", func_E001C30C);
+INCLUDE_ASM(s32, "effects/effect_14", fx_14_appendGfx);
diff --git a/src/effects/effect_15.c b/src/effects/effect_15.c
index 785595866c..e281ab7a5a 100644
--- a/src/effects/effect_15.c
+++ b/src/effects/effect_15.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_15", fx_15_main);
 
-void func_E001E370(void) {
+void fx_15_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_15", func_E001E378);
+INCLUDE_ASM(s32, "effects/effect_15", fx_15_update);
 
-INCLUDE_ASM(s32, "effects/effect_15", func_E001E6E8);
+INCLUDE_ASM(s32, "effects/effect_15", fx_15_render);
 
-INCLUDE_ASM(s32, "effects/effect_15", func_E001E730);
+INCLUDE_ASM(s32, "effects/effect_15", fx_15_appendGfx);
diff --git a/src/effects/effect_16.c b/src/effects/effect_16.c
index ed40ce76da..1fc51135f0 100644
--- a/src/effects/effect_16.c
+++ b/src/effects/effect_16.c
@@ -4,11 +4,11 @@ INCLUDE_ASM(s32, "effects/effect_16", func_E0020000);
 
 INCLUDE_ASM(s32, "effects/effect_16", fx_16_main);
 
-void func_E0020460(void) {
+void fx_16_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E0020468);
+INCLUDE_ASM(s32, "effects/effect_16", fx_16_update);
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E002058C);
+INCLUDE_ASM(s32, "effects/effect_16", fx_16_render);
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E00205D0);
+INCLUDE_ASM(s32, "effects/effect_16", fx_16_appendGfx);
diff --git a/src/effects/effect_17.c b/src/effects/effect_17.c
index 67d953194e..2ed48d8816 100644
--- a/src/effects/effect_17.c
+++ b/src/effects/effect_17.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_17", fx_17_main);
 
-void func_E0022544(void) {
+void fx_17_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_17", func_E002254C);
+INCLUDE_ASM(s32, "effects/effect_17", fx_17_update);
 
-INCLUDE_ASM(s32, "effects/effect_17", func_E0022960);
+INCLUDE_ASM(s32, "effects/effect_17", fx_17_render);
 
-INCLUDE_ASM(s32, "effects/effect_17", func_E0022998);
+INCLUDE_ASM(s32, "effects/effect_17", fx_17_appendGfx);
diff --git a/src/effects/effect_18.c b/src/effects/effect_18.c
index 3bb55cd26d..c75babda33 100644
--- a/src/effects/effect_18.c
+++ b/src/effects/effect_18.c
@@ -2,15 +2,15 @@
 
 INCLUDE_ASM(s32, "effects/effect_18", fx_18_main);
 
-void func_E0024180(void) {
+void fx_18_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_18", func_E0024188);
+INCLUDE_ASM(s32, "effects/effect_18", fx_18_update);
 
-INCLUDE_ASM(s32, "effects/effect_18", func_E00242E0);
+INCLUDE_ASM(s32, "effects/effect_18", fx_18_render);
 
 INCLUDE_ASM(s32, "effects/effect_18", func_E0024324);
 
 INCLUDE_ASM(s32, "effects/effect_18", func_E00243BC);
 
-INCLUDE_ASM(s32, "effects/effect_18", func_E0024454);
+INCLUDE_ASM(s32, "effects/effect_18", fx_18_appendGfx);
diff --git a/src/effects/effect_19.c b/src/effects/effect_19.c
index c3b4607963..6f65e43dd8 100644
--- a/src/effects/effect_19.c
+++ b/src/effects/effect_19.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_19", fx_19_main);
 
-void func_E0026184(void) {
+void fx_19_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_19", func_E002618C);
+INCLUDE_ASM(s32, "effects/effect_19", fx_19_update);
 
-INCLUDE_ASM(s32, "effects/effect_19", func_E00264B0);
+INCLUDE_ASM(s32, "effects/effect_19", fx_19_render);
 
-INCLUDE_ASM(s32, "effects/effect_19", func_E00264F4);
+INCLUDE_ASM(s32, "effects/effect_19", fx_19_appendGfx);
diff --git a/src/effects/effect_20.c b/src/effects/effect_20.c
index 3a78629a48..a4e16f77b4 100644
--- a/src/effects/effect_20.c
+++ b/src/effects/effect_20.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_20", fx_20_main);
 
-void func_E0028240(void) {
+void fx_20_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_20", func_E0028248);
+INCLUDE_ASM(s32, "effects/effect_20", fx_20_update);
 
-INCLUDE_ASM(s32, "effects/effect_20", func_E00284E8);
+INCLUDE_ASM(s32, "effects/effect_20", fx_20_render);
 
-INCLUDE_ASM(s32, "effects/effect_20", func_E002852C);
+INCLUDE_ASM(s32, "effects/effect_20", fx_20_appendGfx);
diff --git a/src/effects/effect_21.c b/src/effects/effect_21.c
index fb34ba4ae4..afab84669b 100644
--- a/src/effects/effect_21.c
+++ b/src/effects/effect_21.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_21", fx_21_main);
 
-void func_E002A284(void) {
+void fx_21_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_21", func_E002A28C);
+INCLUDE_ASM(s32, "effects/effect_21", fx_21_update);
 
-INCLUDE_ASM(s32, "effects/effect_21", func_E002A380);
+INCLUDE_ASM(s32, "effects/effect_21", fx_21_render);
 
-INCLUDE_ASM(s32, "effects/effect_21", func_E002A3C4);
+INCLUDE_ASM(s32, "effects/effect_21", fx_21_appendGfx);
diff --git a/src/effects/effect_22.c b/src/effects/effect_22.c
index d5083f0955..5ad5087985 100644
--- a/src/effects/effect_22.c
+++ b/src/effects/effect_22.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_22", fx_22_main);
 
-void func_E002C234(void) {
+void fx_22_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_22", func_E002C23C);
+INCLUDE_ASM(s32, "effects/effect_22", fx_22_update);
 
-INCLUDE_ASM(s32, "effects/effect_22", func_E002C3D0);
+INCLUDE_ASM(s32, "effects/effect_22", fx_22_render);
 
-INCLUDE_ASM(s32, "effects/effect_22", func_E002C414);
+INCLUDE_ASM(s32, "effects/effect_22", fx_22_appendGfx);
diff --git a/src/effects/effect_23.c b/src/effects/effect_23.c
index cbb4b016ca..4dde157a67 100644
--- a/src/effects/effect_23.c
+++ b/src/effects/effect_23.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_23", fx_23_main);
 
-void func_E002E248(void) {
+void fx_23_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_23", func_E002E250);
+INCLUDE_ASM(s32, "effects/effect_23", fx_23_update);
 
-INCLUDE_ASM(s32, "effects/effect_23", func_E002E330);
+INCLUDE_ASM(s32, "effects/effect_23", fx_23_render);
 
-INCLUDE_ASM(s32, "effects/effect_23", func_E002E368);
+INCLUDE_ASM(s32, "effects/effect_23", fx_23_appendGfx);
diff --git a/src/effects/effect_24.c b/src/effects/effect_24.c
index 5029f95630..b84df57044 100644
--- a/src/effects/effect_24.c
+++ b/src/effects/effect_24.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_24", fx_24_main);
 
-void func_E0030728(void) {
+void fx_24_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_24", func_E0030730);
+INCLUDE_ASM(s32, "effects/effect_24", fx_24_update);
 
-INCLUDE_ASM(s32, "effects/effect_24", func_E0030A24);
+INCLUDE_ASM(s32, "effects/effect_24", fx_24_render);
 
-INCLUDE_ASM(s32, "effects/effect_24", func_E0030A68);
+INCLUDE_ASM(s32, "effects/effect_24", fx_24_appendGfx);
diff --git a/src/effects/effect_25.c b/src/effects/effect_25.c
index 26d708bb43..9b9671cb8c 100644
--- a/src/effects/effect_25.c
+++ b/src/effects/effect_25.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_25", fx_25_main);
 
-void func_E00321D0(void) {
+void fx_25_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_25", func_E00321D8);
+INCLUDE_ASM(s32, "effects/effect_25", fx_25_update);
 
-INCLUDE_ASM(s32, "effects/effect_25", func_E0032420);
+INCLUDE_ASM(s32, "effects/effect_25", fx_25_render);
 
-INCLUDE_ASM(s32, "effects/effect_25", func_E003245C);
+INCLUDE_ASM(s32, "effects/effect_25", fx_25_appendGfx);
diff --git a/src/effects/effect_26.c b/src/effects/effect_26.c
index db6b1785b0..d8477f0dd9 100644
--- a/src/effects/effect_26.c
+++ b/src/effects/effect_26.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_26", fx_26_main);
 
-void func_E0034108(void) {
+void fx_26_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_26", func_E0034110);
+INCLUDE_ASM(s32, "effects/effect_26", fx_26_update);
 
-INCLUDE_ASM(s32, "effects/effect_26", func_E00342C8);
+INCLUDE_ASM(s32, "effects/effect_26", fx_26_render);
 
-INCLUDE_ASM(s32, "effects/effect_26", func_E0034310);
+INCLUDE_ASM(s32, "effects/effect_26", fx_26_appendGfx);
diff --git a/src/effects/effect_27.c b/src/effects/effect_27.c
index 1b9b321534..241bab2dc7 100644
--- a/src/effects/effect_27.c
+++ b/src/effects/effect_27.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_27", fx_27_main);
 
-void func_E00360DC(void) {
+void fx_27_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_27", func_E00360E4);
+INCLUDE_ASM(s32, "effects/effect_27", fx_27_update);
 
-INCLUDE_ASM(s32, "effects/effect_27", func_E00361D8);
+INCLUDE_ASM(s32, "effects/effect_27", fx_27_render);
 
 void func_E003621C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_27", func_E0036224);
+INCLUDE_ASM(s32, "effects/effect_27", fx_27_appendGfx);
diff --git a/src/effects/effect_28.c b/src/effects/effect_28.c
index e58488e2d0..19995f59a2 100644
--- a/src/effects/effect_28.c
+++ b/src/effects/effect_28.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_28", fx_28_main);
 
-void func_E003841C(void) {
+void fx_28_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_28", func_E0038424);
+INCLUDE_ASM(s32, "effects/effect_28", fx_28_update);
 
-INCLUDE_ASM(s32, "effects/effect_28", func_E0038704);
+INCLUDE_ASM(s32, "effects/effect_28", fx_28_render);
 
-INCLUDE_ASM(s32, "effects/effect_28", func_E0038748);
+INCLUDE_ASM(s32, "effects/effect_28", fx_28_appendGfx);
diff --git a/src/effects/effect_29.c b/src/effects/effect_29.c
index 6c9d25e35f..88e16bb021 100644
--- a/src/effects/effect_29.c
+++ b/src/effects/effect_29.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_29", fx_29_main);
 
-void func_E003A1D4(void) {
+void fx_29_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_29", func_E003A1DC);
+INCLUDE_ASM(s32, "effects/effect_29", fx_29_update);
 
-INCLUDE_ASM(s32, "effects/effect_29", func_E003A310);
+INCLUDE_ASM(s32, "effects/effect_29", fx_29_render);
 
-INCLUDE_ASM(s32, "effects/effect_29", func_E003A354);
+INCLUDE_ASM(s32, "effects/effect_29", fx_29_appendGfx);
diff --git a/src/effects/effect_30.c b/src/effects/effect_30.c
index 0a3d6071f2..c249b07c4b 100644
--- a/src/effects/effect_30.c
+++ b/src/effects/effect_30.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_30", fx_30_main);
 
-void func_E003C23C(void) {
+void fx_30_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_30", func_E003C244);
+INCLUDE_ASM(s32, "effects/effect_30", fx_30_update);
 
-void func_E003C474(void) {
+void fx_30_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_30", func_E003C47C);
diff --git a/src/effects/effect_31.c b/src/effects/effect_31.c
index 9610d6e9bd..fbf07d7c67 100644
--- a/src/effects/effect_31.c
+++ b/src/effects/effect_31.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_31", fx_31_main);
 
-void func_E003E3F8(void) {
+void fx_31_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_31", func_E003E400);
+INCLUDE_ASM(s32, "effects/effect_31", fx_31_update);
 
-INCLUDE_ASM(s32, "effects/effect_31", func_E003E5F4);
+INCLUDE_ASM(s32, "effects/effect_31", fx_31_render);
 
-INCLUDE_ASM(s32, "effects/effect_31", func_E003E638);
+INCLUDE_ASM(s32, "effects/effect_31", fx_31_appendGfx);
diff --git a/src/effects/effect_32.c b/src/effects/effect_32.c
index 9f050fa2da..9a188d5b90 100644
--- a/src/effects/effect_32.c
+++ b/src/effects/effect_32.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_32", fx_32_main);
 
-void func_E0040148(void) {
+void fx_32_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_32", func_E0040150);
+INCLUDE_ASM(s32, "effects/effect_32", fx_32_update);
 
-INCLUDE_ASM(s32, "effects/effect_32", func_E0040210);
+INCLUDE_ASM(s32, "effects/effect_32", fx_32_render);
 
-INCLUDE_ASM(s32, "effects/effect_32", func_E0040348);
+INCLUDE_ASM(s32, "effects/effect_32", fx_32_appendGfx);
diff --git a/src/effects/effect_33.c b/src/effects/effect_33.c
index e0087eb92d..307040ff6a 100644
--- a/src/effects/effect_33.c
+++ b/src/effects/effect_33.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_33", fx_33_main);
 
-void func_E004222C(void) {
+void fx_33_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_33", func_E0042234);
+INCLUDE_ASM(s32, "effects/effect_33", fx_33_update);
 
-INCLUDE_ASM(s32, "effects/effect_33", func_E0042374);
+INCLUDE_ASM(s32, "effects/effect_33", fx_33_render);
 
-INCLUDE_ASM(s32, "effects/effect_33", func_E00423B8);
+INCLUDE_ASM(s32, "effects/effect_33", fx_33_appendGfx);
diff --git a/src/effects/effect_34.c b/src/effects/effect_34.c
index 96f474eaa4..2fb4ba572b 100644
--- a/src/effects/effect_34.c
+++ b/src/effects/effect_34.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_34", fx_34_main);
 
-void func_E004441C(void) {
+void fx_34_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_34", func_E0044424);
+INCLUDE_ASM(s32, "effects/effect_34", fx_34_update);
 
-INCLUDE_ASM(s32, "effects/effect_34", func_E00448E4);
+INCLUDE_ASM(s32, "effects/effect_34", fx_34_render);
 
-INCLUDE_ASM(s32, "effects/effect_34", func_E004491C);
+INCLUDE_ASM(s32, "effects/effect_34", fx_34_appendGfx);
diff --git a/src/effects/effect_35.c b/src/effects/effect_35.c
index 4afe8bf9ac..3147b17649 100644
--- a/src/effects/effect_35.c
+++ b/src/effects/effect_35.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_35", fx_35_main);
 
-void func_E0046158(void) {
+void fx_35_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_35", func_E0046160);
+INCLUDE_ASM(s32, "effects/effect_35", fx_35_update);
 
-INCLUDE_ASM(s32, "effects/effect_35", func_E004627C);
+INCLUDE_ASM(s32, "effects/effect_35", fx_35_render);
 
-INCLUDE_ASM(s32, "effects/effect_35", func_E00462C0);
+INCLUDE_ASM(s32, "effects/effect_35", fx_35_appendGfx);
diff --git a/src/effects/effect_36.c b/src/effects/effect_36.c
index a66f8d2730..c4a13b27ef 100644
--- a/src/effects/effect_36.c
+++ b/src/effects/effect_36.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_36", fx_36_main);
 
-void func_E0048128(void) {
+void fx_36_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_36", func_E0048130);
+INCLUDE_ASM(s32, "effects/effect_36", fx_36_update);
 
-INCLUDE_ASM(s32, "effects/effect_36", func_E00481D4);
+INCLUDE_ASM(s32, "effects/effect_36", fx_36_render);
 
-INCLUDE_ASM(s32, "effects/effect_36", func_E0048218);
+INCLUDE_ASM(s32, "effects/effect_36", fx_36_appendGfx);
diff --git a/src/effects/effect_37.c b/src/effects/effect_37.c
index 9faa1d1876..e5ef579f80 100644
--- a/src/effects/effect_37.c
+++ b/src/effects/effect_37.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_37", fx_37_main);
 
-void func_E004A328(void) {
+void fx_37_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_37", func_E004A330);
+INCLUDE_ASM(s32, "effects/effect_37", fx_37_update);
 
-INCLUDE_ASM(s32, "effects/effect_37", func_E004A748);
+INCLUDE_ASM(s32, "effects/effect_37", fx_37_render);
 
-INCLUDE_ASM(s32, "effects/effect_37", func_E004A78C);
+INCLUDE_ASM(s32, "effects/effect_37", fx_37_appendGfx);
diff --git a/src/effects/effect_38.c b/src/effects/effect_38.c
index c21b9d55c9..48f035a23e 100644
--- a/src/effects/effect_38.c
+++ b/src/effects/effect_38.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_38", fx_38_main);
 
-void func_E004C204(void) {
+void fx_38_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_38", func_E004C20C);
+INCLUDE_ASM(s32, "effects/effect_38", fx_38_update);
 
-INCLUDE_ASM(s32, "effects/effect_38", func_E004C364);
+INCLUDE_ASM(s32, "effects/effect_38", fx_38_render);
 
-INCLUDE_ASM(s32, "effects/effect_38", func_E004C3A8);
+INCLUDE_ASM(s32, "effects/effect_38", fx_38_appendGfx);
diff --git a/src/effects/effect_39.c b/src/effects/effect_39.c
index eb76fb33db..aba7dfff17 100644
--- a/src/effects/effect_39.c
+++ b/src/effects/effect_39.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_39", fx_39_main);
 
-void func_E004E15C(void) {
+void fx_39_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_39", func_E004E164);
+INCLUDE_ASM(s32, "effects/effect_39", fx_39_update);
 
-INCLUDE_ASM(s32, "effects/effect_39", func_E004E1D0);
+INCLUDE_ASM(s32, "effects/effect_39", fx_39_render);
 
-INCLUDE_ASM(s32, "effects/effect_39", func_E004E214);
+INCLUDE_ASM(s32, "effects/effect_39", fx_39_appendGfx);
diff --git a/src/effects/effect_40.c b/src/effects/effect_40.c
index 53fd135355..3e6a5a0444 100644
--- a/src/effects/effect_40.c
+++ b/src/effects/effect_40.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_40", fx_40_main);
 
-void func_E00501D0(void) {
+void fx_40_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_40", func_E00501D8);
+INCLUDE_ASM(s32, "effects/effect_40", fx_40_update);
 
-INCLUDE_ASM(s32, "effects/effect_40", func_E00502C4);
+INCLUDE_ASM(s32, "effects/effect_40", fx_40_render);
 
-INCLUDE_ASM(s32, "effects/effect_40", func_E0050308);
+INCLUDE_ASM(s32, "effects/effect_40", fx_40_appendGfx);
diff --git a/src/effects/effect_41.c b/src/effects/effect_41.c
index d02586f572..7ba4fb4d68 100644
--- a/src/effects/effect_41.c
+++ b/src/effects/effect_41.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_41", fx_41_main);
 
-void func_E00520E8(void) {
+void fx_41_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_41", func_E00520F0);
+INCLUDE_ASM(s32, "effects/effect_41", fx_41_update);
 
-INCLUDE_ASM(s32, "effects/effect_41", func_E005241C);
+INCLUDE_ASM(s32, "effects/effect_41", fx_41_render);
 
-INCLUDE_ASM(s32, "effects/effect_41", func_E0052460);
+INCLUDE_ASM(s32, "effects/effect_41", fx_41_appendGfx);
diff --git a/src/effects/effect_43.c b/src/effects/effect_43.c
index cab3b5d2ef..5ea0c09a18 100644
--- a/src/effects/effect_43.c
+++ b/src/effects/effect_43.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_43", fx_43_main);
 
-void func_E0056304(void) {
+void fx_43_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_43", func_E005630C);
+INCLUDE_ASM(s32, "effects/effect_43", fx_43_update);
 
-INCLUDE_ASM(s32, "effects/effect_43", func_E0056B8C);
+INCLUDE_ASM(s32, "effects/effect_43", fx_43_render);
 
-INCLUDE_ASM(s32, "effects/effect_43", func_E0056BD0);
+INCLUDE_ASM(s32, "effects/effect_43", fx_43_appendGfx);
diff --git a/src/effects/effect_44.c b/src/effects/effect_44.c
index 14801256d6..8182729b21 100644
--- a/src/effects/effect_44.c
+++ b/src/effects/effect_44.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_44", fx_44_main);
 
-void func_E00581AC(void) {
+void fx_44_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_44", func_E00581B4);
+INCLUDE_ASM(s32, "effects/effect_44", fx_44_update);
 
-INCLUDE_ASM(s32, "effects/effect_44", func_E0058490);
+INCLUDE_ASM(s32, "effects/effect_44", fx_44_render);
 
-INCLUDE_ASM(s32, "effects/effect_44", func_E00584D4);
+INCLUDE_ASM(s32, "effects/effect_44", fx_44_appendGfx);
diff --git a/src/effects/effect_45.c b/src/effects/effect_45.c
index 6c1a452a51..a177405cd2 100644
--- a/src/effects/effect_45.c
+++ b/src/effects/effect_45.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_45", fx_45_main);
 
-void func_E005A1F4(void) {
+void fx_45_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_45", func_E005A1FC);
+INCLUDE_ASM(s32, "effects/effect_45", fx_45_update);
 
-INCLUDE_ASM(s32, "effects/effect_45", func_E005A3B0);
+INCLUDE_ASM(s32, "effects/effect_45", fx_45_render);
 
-INCLUDE_ASM(s32, "effects/effect_45", func_E005A3F4);
+INCLUDE_ASM(s32, "effects/effect_45", fx_45_appendGfx);
diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c
index bc53fd2696..47cbce928b 100644
--- a/src/effects/effect_46.c
+++ b/src/effects/effect_46.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_46", fx_46_main);
 
-void func_E005C178(void) {
+void fx_46_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_46", func_E005C180);
+INCLUDE_ASM(s32, "effects/effect_46", fx_46_update);
 
-INCLUDE_ASM(s32, "effects/effect_46", func_E005C2B4);
+INCLUDE_ASM(s32, "effects/effect_46", fx_46_render);
 
-INCLUDE_ASM(s32, "effects/effect_46", func_E005C2F8);
+INCLUDE_ASM(s32, "effects/effect_46", fx_46_appendGfx);
diff --git a/src/effects/effect_47.c b/src/effects/effect_47.c
index 347ed404ea..91156a7b3d 100644
--- a/src/effects/effect_47.c
+++ b/src/effects/effect_47.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_47", fx_47_main);
 
-void func_E005E1B0(void) {
+void fx_47_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_47", func_E005E1B8);
+INCLUDE_ASM(s32, "effects/effect_47", fx_47_update);
 
-void func_E005E310(void) {
+void fx_47_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_47", func_E005E318);
diff --git a/src/effects/effect_48.c b/src/effects/effect_48.c
index e2f6833742..93b2c932a9 100644
--- a/src/effects/effect_48.c
+++ b/src/effects/effect_48.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_48", fx_48_main);
 
-void func_E00601D8(void) {
+void fx_48_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_48", func_E00601E0);
+INCLUDE_ASM(s32, "effects/effect_48", fx_48_update);
 
-INCLUDE_ASM(s32, "effects/effect_48", func_E006040C);
+INCLUDE_ASM(s32, "effects/effect_48", fx_48_render);
 
-INCLUDE_ASM(s32, "effects/effect_48", func_E0060450);
+INCLUDE_ASM(s32, "effects/effect_48", fx_48_appendGfx);
diff --git a/src/effects/effect_49.c b/src/effects/effect_49.c
index fa7edf68bc..c5dd9d2596 100644
--- a/src/effects/effect_49.c
+++ b/src/effects/effect_49.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_49", fx_49_main);
 
-void func_E0062218(void) {
+void fx_49_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_49", func_E0062220);
+INCLUDE_ASM(s32, "effects/effect_49", fx_49_update);
 
-INCLUDE_ASM(s32, "effects/effect_49", func_E00624A8);
+INCLUDE_ASM(s32, "effects/effect_49", fx_49_render);
 
-INCLUDE_ASM(s32, "effects/effect_49", func_E00624EC);
+INCLUDE_ASM(s32, "effects/effect_49", fx_49_appendGfx);
diff --git a/src/effects/effect_50.c b/src/effects/effect_50.c
index bdf52d5018..b6e25c66f4 100644
--- a/src/effects/effect_50.c
+++ b/src/effects/effect_50.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_50", fx_50_main);
 
-void func_E006419C(void) {
+void fx_50_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_50", func_E00641A4);
+INCLUDE_ASM(s32, "effects/effect_50", fx_50_update);
 
-INCLUDE_ASM(s32, "effects/effect_50", func_E00643DC);
+INCLUDE_ASM(s32, "effects/effect_50", fx_50_render);
 
-INCLUDE_ASM(s32, "effects/effect_50", func_E0064414);
+INCLUDE_ASM(s32, "effects/effect_50", fx_50_appendGfx);
diff --git a/src/effects/effect_51.c b/src/effects/effect_51.c
index a07b38f5f3..39e0005761 100644
--- a/src/effects/effect_51.c
+++ b/src/effects/effect_51.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_51", fx_51_main);
 
-void func_E0066490(void) {
+void fx_51_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_51", func_E0066498);
+INCLUDE_ASM(s32, "effects/effect_51", fx_51_update);
 
-INCLUDE_ASM(s32, "effects/effect_51", func_E006672C);
+INCLUDE_ASM(s32, "effects/effect_51", fx_51_render);
 
-INCLUDE_ASM(s32, "effects/effect_51", func_E0066770);
+INCLUDE_ASM(s32, "effects/effect_51", fx_51_appendGfx);
diff --git a/src/effects/effect_52.c b/src/effects/effect_52.c
index 3de544d33e..91cff87cb3 100644
--- a/src/effects/effect_52.c
+++ b/src/effects/effect_52.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_52", fx_52_main);
 
-void func_E0068140(void) {
+void fx_52_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_52", func_E0068148);
+INCLUDE_ASM(s32, "effects/effect_52", fx_52_update);
 
-INCLUDE_ASM(s32, "effects/effect_52", func_E00681D8);
+INCLUDE_ASM(s32, "effects/effect_52", fx_52_render);
 
-INCLUDE_ASM(s32, "effects/effect_52", func_E0068234);
+INCLUDE_ASM(s32, "effects/effect_52", fx_52_appendGfx);
diff --git a/src/effects/effect_53.c b/src/effects/effect_53.c
index 4e40e479fa..e57dc9f928 100644
--- a/src/effects/effect_53.c
+++ b/src/effects/effect_53.c
@@ -6,15 +6,15 @@ INCLUDE_ASM(s32, "effects/effect_53", func_E006A0BC);
 
 INCLUDE_ASM(s32, "effects/effect_53", fx_53_main);
 
-void func_E006A45C(void) {
+void fx_53_init(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_53", func_E006A464);
 
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A580);
+INCLUDE_ASM(s32, "effects/effect_53", fx_53_update);
 
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A814);
+INCLUDE_ASM(s32, "effects/effect_53", fx_53_render);
 
 INCLUDE_ASM(s32, "effects/effect_53", func_E006A85C);
 
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A94C);
+INCLUDE_ASM(s32, "effects/effect_53", fx_53_appendGfx);
diff --git a/src/effects/effect_54.c b/src/effects/effect_54.c
index 24a1ce017f..3063b0ff31 100644
--- a/src/effects/effect_54.c
+++ b/src/effects/effect_54.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_54", fx_54_main);
 
-void func_E006C298(void) {
+void fx_54_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_54", func_E006C2A0);
+INCLUDE_ASM(s32, "effects/effect_54", fx_54_update);
 
-INCLUDE_ASM(s32, "effects/effect_54", func_E006C5A0);
+INCLUDE_ASM(s32, "effects/effect_54", fx_54_render);
 
-INCLUDE_ASM(s32, "effects/effect_54", func_E006C5E8);
+INCLUDE_ASM(s32, "effects/effect_54", fx_54_appendGfx);
diff --git a/src/effects/effect_55.c b/src/effects/effect_55.c
index c9b917e001..0126388206 100644
--- a/src/effects/effect_55.c
+++ b/src/effects/effect_55.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_55", fx_55_main);
 
-void func_E006E354(void) {
+void fx_55_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_55", func_E006E35C);
+INCLUDE_ASM(s32, "effects/effect_55", fx_55_update);
 
-INCLUDE_ASM(s32, "effects/effect_55", func_E006E6E4);
+INCLUDE_ASM(s32, "effects/effect_55", fx_55_render);
 
-INCLUDE_ASM(s32, "effects/effect_55", func_E006E764);
+INCLUDE_ASM(s32, "effects/effect_55", fx_55_appendGfx);
diff --git a/src/effects/effect_56.c b/src/effects/effect_56.c
index 7d46af5287..e5f7f69264 100644
--- a/src/effects/effect_56.c
+++ b/src/effects/effect_56.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_56", fx_56_main);
 
-void func_E00701EC(void) {
+void fx_56_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_56", func_E00701F4);
+INCLUDE_ASM(s32, "effects/effect_56", fx_56_update);
 
-INCLUDE_ASM(s32, "effects/effect_56", func_E00706F0);
+INCLUDE_ASM(s32, "effects/effect_56", fx_56_render);
 
 void func_E0070738(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_56", func_E0070740);
+INCLUDE_ASM(s32, "effects/effect_56", fx_56_appendGfx);
diff --git a/src/effects/effect_57.c b/src/effects/effect_57.c
index fcd04f7b1c..04d5fe18e4 100644
--- a/src/effects/effect_57.c
+++ b/src/effects/effect_57.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_57", fx_57_main);
 
-void func_E0072148(void) {
+void fx_57_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_57", func_E0072150);
+INCLUDE_ASM(s32, "effects/effect_57", fx_57_update);
 
-INCLUDE_ASM(s32, "effects/effect_57", func_E007238C);
+INCLUDE_ASM(s32, "effects/effect_57", fx_57_render);
 
-INCLUDE_ASM(s32, "effects/effect_57", func_E00723D4);
+INCLUDE_ASM(s32, "effects/effect_57", fx_57_appendGfx);
diff --git a/src/effects/effect_58.c b/src/effects/effect_58.c
index 219ce61c5a..463775fcbf 100644
--- a/src/effects/effect_58.c
+++ b/src/effects/effect_58.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_58", fx_58_main);
 
-void func_E00741E0(void) {
+void fx_58_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_58", func_E00741E8);
+INCLUDE_ASM(s32, "effects/effect_58", fx_58_update);
 
-INCLUDE_ASM(s32, "effects/effect_58", func_E0074598);
+INCLUDE_ASM(s32, "effects/effect_58", fx_58_render);
 
-INCLUDE_ASM(s32, "effects/effect_58", func_E00745E0);
+INCLUDE_ASM(s32, "effects/effect_58", fx_58_appendGfx);
diff --git a/src/effects/effect_59.c b/src/effects/effect_59.c
index eccd5c849e..7f26a9ab97 100644
--- a/src/effects/effect_59.c
+++ b/src/effects/effect_59.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_59", fx_59_main);
 
-void func_E0076370(void) {
+void fx_59_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_59", func_E0076378);
+INCLUDE_ASM(s32, "effects/effect_59", fx_59_update);
 
-INCLUDE_ASM(s32, "effects/effect_59", func_E0076808);
+INCLUDE_ASM(s32, "effects/effect_59", fx_59_render);
 
 void func_E007684C(void) {
 }
@@ -15,4 +15,4 @@ void func_E007684C(void) {
 void func_E0076854(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_59", func_E007685C);
+INCLUDE_ASM(s32, "effects/effect_59", fx_59_appendGfx);
diff --git a/src/effects/effect_6.c b/src/effects/effect_6.c
index c3479fe38f..b3279571e0 100644
--- a/src/effects/effect_6.c
+++ b/src/effects/effect_6.c
@@ -22,11 +22,6 @@ typedef struct Effect6 {
     /* 0x40 */ s32 unk_40;
 } Effect6; // size = 0x44
 
-void fx_6_init(EffectInstance* effect);
-void fx_6_update(EffectInstance* effect);
-void fx_6_render(EffectInstance* effect);
-void fx_6_appendGfx(EffectInstance* effect);
-
 static s32 sDlists[] = { 0x09002B20, 0x09002B40, 0x09002B60, 0x09002B60, 0x09002B60 };
 static s32 sDlists2[] = { 0x09002780, 0x09002868, 0x09002950, 0x09002A38, 0x09002A38 };
 
@@ -54,6 +49,11 @@ static s8 D_E000CCE0[] = { 0x00, 0x10, 0x20, 0x30, 0x01, 0x11, 0x21, 0x31, 0x02,
 
 static s8* D_E000CD24[4] = { &D_E000CC38, &D_E000CC48, &D_E000CC5C, &D_E000CCE0 };
 
+void fx_6_init(EffectInstance* effect);
+void fx_6_update(EffectInstance* effect);
+void fx_6_render(EffectInstance* effect);
+void fx_6_appendGfx(EffectInstance* effect);
+
 void func_E000C000(Effect6* part) {
     part->unk_18 += part->unk_1C;
     part->unk_14 += part->unk_18;
diff --git a/src/effects/effect_60.c b/src/effects/effect_60.c
index ac07a83cf8..bab0156cef 100644
--- a/src/effects/effect_60.c
+++ b/src/effects/effect_60.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_60", fx_60_main);
 
-void func_E0078124(void) {
+void fx_60_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_60", func_E007812C);
+INCLUDE_ASM(s32, "effects/effect_60", fx_60_update);
 
-INCLUDE_ASM(s32, "effects/effect_60", func_E0078210);
+INCLUDE_ASM(s32, "effects/effect_60", fx_60_render);
 
 void func_E0078274(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_60", func_E007827C);
+INCLUDE_ASM(s32, "effects/effect_60", fx_60_appendGfx);
diff --git a/src/effects/effect_61.c b/src/effects/effect_61.c
index 0b8ba9148f..c238de7a6f 100644
--- a/src/effects/effect_61.c
+++ b/src/effects/effect_61.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_61", fx_61_main);
 
-void func_E007A504(void) {
+void fx_61_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_61", func_E007A50C);
+INCLUDE_ASM(s32, "effects/effect_61", fx_61_update);
 
-INCLUDE_ASM(s32, "effects/effect_61", func_E007A840);
+INCLUDE_ASM(s32, "effects/effect_61", fx_61_render);
 
 void func_E007A884(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_61", func_E007A88C);
+INCLUDE_ASM(s32, "effects/effect_61", fx_61_appendGfx);
diff --git a/src/effects/effect_62.c b/src/effects/effect_62.c
index 1d8ce44611..6f10a3edee 100644
--- a/src/effects/effect_62.c
+++ b/src/effects/effect_62.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_62", fx_62_main);
 
-void func_E007C128(void) {
+void fx_62_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_62", func_E007C130);
+INCLUDE_ASM(s32, "effects/effect_62", fx_62_update);
 
-INCLUDE_ASM(s32, "effects/effect_62", func_E007C1B0);
+INCLUDE_ASM(s32, "effects/effect_62", fx_62_render);
 
-INCLUDE_ASM(s32, "effects/effect_62", func_E007C1F4);
+INCLUDE_ASM(s32, "effects/effect_62", fx_62_appendGfx);
diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c
index fb6b50bf9a..cb5ca71f06 100644
--- a/src/effects/effect_63.c
+++ b/src/effects/effect_63.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_63", fx_63_main);
 
-void func_E007E1FC(void) {
+void fx_63_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_63", func_E007E204);
+INCLUDE_ASM(s32, "effects/effect_63", fx_63_update);
 
-INCLUDE_ASM(s32, "effects/effect_63", func_E007E508);
+INCLUDE_ASM(s32, "effects/effect_63", fx_63_render);
 
-INCLUDE_ASM(s32, "effects/effect_63", func_E007E54C);
+INCLUDE_ASM(s32, "effects/effect_63", fx_63_appendGfx);
diff --git a/src/effects/effect_64.c b/src/effects/effect_64.c
index 6f72a6a0a5..f8524de72d 100644
--- a/src/effects/effect_64.c
+++ b/src/effects/effect_64.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_64", fx_64_main);
 
-void func_E00801C8(void) {
+void fx_64_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_64", func_E00801D0);
+INCLUDE_ASM(s32, "effects/effect_64", fx_64_update);
 
-void func_E0080424(void) {
+void fx_64_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_64", func_E008042C);
diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c
index ea233376d1..7c3e8167da 100644
--- a/src/effects/effect_65.c
+++ b/src/effects/effect_65.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_65", fx_65_main);
 
-void func_E00821B0(void) {
+void fx_65_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_65", func_E00821B8);
+INCLUDE_ASM(s32, "effects/effect_65", fx_65_update);
 
-void func_E0082520(void) {
+void fx_65_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_65", func_E0082528);
diff --git a/src/effects/effect_66.c b/src/effects/effect_66.c
index 199a959f58..1662836061 100644
--- a/src/effects/effect_66.c
+++ b/src/effects/effect_66.c
@@ -8,11 +8,11 @@ INCLUDE_ASM(s32, "effects/effect_66", func_E0084060);
 
 INCLUDE_ASM(s32, "effects/effect_66", fx_66_main);
 
-void func_E0084658(void) {
+void fx_66_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_66", func_E0084660);
+INCLUDE_ASM(s32, "effects/effect_66", fx_66_update);
 
-INCLUDE_ASM(s32, "effects/effect_66", func_E00848E4);
+INCLUDE_ASM(s32, "effects/effect_66", fx_66_render);
 
-INCLUDE_ASM(s32, "effects/effect_66", func_E0084928);
+INCLUDE_ASM(s32, "effects/effect_66", fx_66_appendGfx);
diff --git a/src/effects/effect_67.c b/src/effects/effect_67.c
index 34bd8c221c..7a68c967c6 100644
--- a/src/effects/effect_67.c
+++ b/src/effects/effect_67.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_67", fx_67_main);
 
-void func_E0086270(void) {
+void fx_67_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_67", func_E0086278);
+INCLUDE_ASM(s32, "effects/effect_67", fx_67_update);
 
-void func_E0086390(void) {
+void fx_67_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_67", func_E0086398);
diff --git a/src/effects/effect_68.c b/src/effects/effect_68.c
index afba8a8ddf..8c62e32435 100644
--- a/src/effects/effect_68.c
+++ b/src/effects/effect_68.c
@@ -4,11 +4,11 @@ INCLUDE_ASM(s32, "effects/effect_68", func_E0088000);
 
 INCLUDE_ASM(s32, "effects/effect_68", fx_68_main);
 
-void func_E00885A0(void) {
+void fx_68_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_68", func_E00885A8);
+INCLUDE_ASM(s32, "effects/effect_68", fx_68_update);
 
-INCLUDE_ASM(s32, "effects/effect_68", func_E00887A8);
+INCLUDE_ASM(s32, "effects/effect_68", fx_68_render);
 
-INCLUDE_ASM(s32, "effects/effect_68", func_E00887E0);
+INCLUDE_ASM(s32, "effects/effect_68", fx_68_appendGfx);
diff --git a/src/effects/effect_69.c b/src/effects/effect_69.c
index 40fdc98611..e9039bbc7c 100644
--- a/src/effects/effect_69.c
+++ b/src/effects/effect_69.c
@@ -4,13 +4,13 @@ INCLUDE_ASM(s32, "effects/effect_69", func_E008A000);
 
 INCLUDE_ASM(s32, "effects/effect_69", fx_69_main);
 
-void func_E008A288(void) {
+void fx_69_init(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_69", func_E008A290);
 
-INCLUDE_ASM(s32, "effects/effect_69", func_E008A53C);
+INCLUDE_ASM(s32, "effects/effect_69", fx_69_update);
 
-INCLUDE_ASM(s32, "effects/effect_69", func_E008A6E4);
+INCLUDE_ASM(s32, "effects/effect_69", fx_69_render);
 
-INCLUDE_ASM(s32, "effects/effect_69", func_E008A728);
+INCLUDE_ASM(s32, "effects/effect_69", fx_69_appendGfx);
diff --git a/src/effects/effect_70.c b/src/effects/effect_70.c
index 8ce8226040..6c7cfb24ae 100644
--- a/src/effects/effect_70.c
+++ b/src/effects/effect_70.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_70", fx_70_main);
 
-void func_E008C3F4(void) {
+void fx_70_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_70", func_E008C3FC);
+INCLUDE_ASM(s32, "effects/effect_70", fx_70_update);
 
-INCLUDE_ASM(s32, "effects/effect_70", func_E008C6B8);
+INCLUDE_ASM(s32, "effects/effect_70", fx_70_render);
 
-INCLUDE_ASM(s32, "effects/effect_70", func_E008C6FC);
+INCLUDE_ASM(s32, "effects/effect_70", fx_70_appendGfx);
diff --git a/src/effects/effect_71.c b/src/effects/effect_71.c
index 88682c43f5..1bd6c728c5 100644
--- a/src/effects/effect_71.c
+++ b/src/effects/effect_71.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_71", fx_71_main);
 
-void func_E008E1FC(void) {
+void fx_71_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_71", func_E008E204);
+INCLUDE_ASM(s32, "effects/effect_71", fx_71_update);
 
-INCLUDE_ASM(s32, "effects/effect_71", func_E008E498);
+INCLUDE_ASM(s32, "effects/effect_71", fx_71_render);
 
-INCLUDE_ASM(s32, "effects/effect_71", func_E008E4E0);
+INCLUDE_ASM(s32, "effects/effect_71", fx_71_appendGfx);
diff --git a/src/effects/effect_72.c b/src/effects/effect_72.c
index 867bcec9c2..41d3e89e87 100644
--- a/src/effects/effect_72.c
+++ b/src/effects/effect_72.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_72", fx_72_main);
 
-void func_E00901C0(void) {
+void fx_72_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_72", func_E00901C8);
+INCLUDE_ASM(s32, "effects/effect_72", fx_72_update);
 
-void func_E0090420(void) {
+void fx_72_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_72", func_E0090428);
diff --git a/src/effects/effect_73.c b/src/effects/effect_73.c
index 27087eff82..acfd433260 100644
--- a/src/effects/effect_73.c
+++ b/src/effects/effect_73.c
@@ -1,12 +1,166 @@
 #include "common.h"
+#include "effects_internal.h"
 
-INCLUDE_ASM(s32, "effects/effect_73", fx_73_main);
+typedef struct Effect73 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ s32 unk_14;
+    /* 0x18 */ s32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ s32 unk_20;
+} Effect73; // size = 0x24
 
-void func_E00921AC(void) {
+extern Gfx D_090002C0[];
+extern Gfx D_09000330[];
+extern Gfx D_09000370[];
+extern Gfx D_090003B0[];
+extern Gfx D_090003F0[];
+extern Gfx D_09000430[];
+extern Gfx D_09000470[];
+
+static Gfx* sDlists[] = { D_09000430, D_090003F0, D_090003B0, D_09000370, D_09000330 };
+
+static s32 sPartParams[4 * 5] = {
+    1, 0, 0, 0, 100,
+    2, 4, -2, 0, 100,
+    3, -2, 2, 0, 70,
+    4, 2, 4, 0, 40,
+};
+
+void fx_73_init(EffectInstance* effect);
+void fx_73_update(EffectInstance* effect);
+void fx_73_render(EffectInstance* effect);
+void fx_73_appendGfx(EffectInstance* effect);
+
+EffectInstance* fx_73_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
+    EffectBlueprint bp;
+    EffectInstance* effect;
+    Effect73* data;
+    Effect73* part;
+    s32 numParts = 5;
+    s32 i;
+
+    bp.init = fx_73_init;
+    bp.update = fx_73_update;
+    bp.renderWorld = fx_73_render;
+    bp.unk_00 = 0;
+    bp.unk_14 = NULL;
+    bp.effectIndex = 73;
+
+    effect = shim_create_effect_instance(&bp);
+    effect->numParts = numParts;
+
+    data = shim_general_heap_malloc(numParts * sizeof(*data));
+    effect->data = data;
+    part = data;
+
+    ASSERT(data != NULL);
+
+    part->unk_00 = arg0;
+    part->unk_18 = 0;
+    part->unk_14 = 14;
+    part->unk_08 = arg1;
+    part->unk_0C = arg2;
+    part->unk_10 = arg3;
+
+    part++;
+    for (i = 1; i < numParts; i++, part++) {
+            part->unk_08 = sPartParams[1 + (i - 1) * 5];
+            part->unk_0C = sPartParams[2 + (i - 1) * 5];
+            part->unk_10 = sPartParams[3 + (i - 1) * 5];
+            part->unk_04 = -1;
+            part->unk_20 = sPartParams[0 + (i - 1) * 5];
+            part->unk_1C = (arg4 * sPartParams[4 + (i - 1) * 5]) * 0.01;
+    }
+    return effect;
 }
 
-INCLUDE_ASM(s32, "effects/effect_73", func_E00921B4);
+void fx_73_init(EffectInstance* effect) {
+}
 
-INCLUDE_ASM(s32, "effects/effect_73", func_E0092258);
+void fx_73_update(EffectInstance* effect) {
+    Effect73* part = (Effect73*) effect->data;
+    s32 i;
 
-INCLUDE_ASM(s32, "effects/effect_73", func_E00922A0);
+    part->unk_14--;
+    part->unk_18++;
+
+    if (part->unk_14 < 0) {
+        shim_remove_effect(effect);
+        return;
+    }
+
+    part++;
+    for (i = 1; i < effect->numParts; i++, part++) {
+        if (part->unk_20 > 0) {
+            part->unk_20--;
+        }
+
+        if (part->unk_20 <= 0) {
+            part->unk_04++;
+            if (part->unk_04 >= 10) {
+                part->unk_20 = -1;
+            }
+        }
+    }
+}
+
+void fx_73_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_73_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void fx_73_appendGfx(EffectInstance* effect) {
+    Effect73* part = effect->data;
+    Matrix4f sp18;
+    Matrix4f sp58;
+    Matrix4f sp98;
+    Mtx* spD8;
+    s32 i;
+
+    shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
+    shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]);
+    spD8 = &gDisplayContext->matrixStack[gMatrixListPos++];
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data));
+    shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10);
+    shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, D_090002C0);
+    gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 15, 255);
+
+    part++;
+    for (i = 1; i < effect->numParts; i++, part++) {
+        if (part->unk_20 == 0) {
+            f32 temp_f20 = part->unk_1C;
+
+            shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10);
+            if (temp_f20 != 1.0f) {
+                shim_guScaleF(sp58, temp_f20, temp_f20, 1.0f);
+                shim_guMtxCatF(sp58, sp18, sp18);
+            }
+            shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]);
+            gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+                      G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+            gSPMatrix(gMasterGfxPos++, spD8, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+            gSPDisplayList(gMasterGfxPos++, sDlists[part->unk_04 >> 1]);
+            gSPDisplayList(gMasterGfxPos++, D_09000470);
+            gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+        }
+    }
+
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    gDPPipeSync(gMasterGfxPos++);
+}
diff --git a/src/effects/effect_74.c b/src/effects/effect_74.c
index f3aa269b70..fbdef452b1 100644
--- a/src/effects/effect_74.c
+++ b/src/effects/effect_74.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_74", fx_74_main);
 
-void func_E0094190(void) {
+void fx_74_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_74", func_E0094198);
+INCLUDE_ASM(s32, "effects/effect_74", fx_74_update);
 
-INCLUDE_ASM(s32, "effects/effect_74", func_E00942C0);
+INCLUDE_ASM(s32, "effects/effect_74", fx_74_render);
 
-INCLUDE_ASM(s32, "effects/effect_74", func_E00942FC);
+INCLUDE_ASM(s32, "effects/effect_74", fx_74_appendGfx);
diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c
index a0d7e7ad7f..063bd7eea1 100644
--- a/src/effects/effect_75.c
+++ b/src/effects/effect_75.c
@@ -1,12 +1,120 @@
 #include "common.h"
+#include "effects_internal.h"
 
-INCLUDE_ASM(s32, "effects/effect_75", fx_75_main);
+typedef struct Effect75 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ s32 unk_1C;
+    /* 0x20 */ s32 unk_20;
+} Effect75; // size = 0x24
 
-void func_E00960EC(void) {
+extern Gfx D_09001280[];
+extern Gfx D_09001358[];
+extern Gfx D_09001430[];
+extern Gfx D_09001508[];
+
+Gfx* D_E00963E0[] = { D_09001280, D_09001358, D_09001430 };
+
+void fx_75_init(EffectInstance* effect);
+void fx_75_update(EffectInstance* effect);
+void fx_75_render(EffectInstance* effect);
+void fx_75_appendGfx(EffectInstance* effect);
+
+EffectInstance* fx_75_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
+    EffectBlueprint bp;
+    EffectInstance* effect;
+    Effect75* data;
+    Effect75* part;
+    s32 numParts = 1;
+
+    bp.init = fx_75_init;
+    bp.update = fx_75_update;
+    bp.renderWorld = fx_75_render;
+    bp.unk_00 = 0;
+    bp.unk_14 = NULL;
+    bp.effectIndex = 75;
+
+    effect = shim_create_effect_instance(&bp);
+    effect->numParts = numParts;
+
+    data = shim_general_heap_malloc(numParts * sizeof(*data));
+    effect->data = data;
+    part = data;
+
+    ASSERT(data != NULL);
+
+    part->unk_00 = arg0;
+    part->unk_04 = arg1;
+    part->unk_08 = arg2;
+    part->unk_0C = arg3;
+    part->unk_10 = 0.0f;
+    part->unk_1C = arg5;
+    part->unk_18 = 0.67f;
+    part->unk_20 = 0;
+    part->unk_14 = arg4;
+
+    return effect;
 }
 
-INCLUDE_ASM(s32, "effects/effect_75", func_E00960F4);
+void fx_75_init(EffectInstance* effect) {
+}
 
-INCLUDE_ASM(s32, "effects/effect_75", func_E0096178);
+void fx_75_update(EffectInstance* effect) {
+    Effect75* part = (Effect75*)effect->data;
 
-INCLUDE_ASM(s32, "effects/effect_75", func_E00961BC);
+    part->unk_1C--;
+    part->unk_20++;
+
+    if (part->unk_1C < 0) {
+        shim_remove_effect(effect);
+        return;
+    }
+
+    part->unk_10 += part->unk_14;
+    if (part->unk_10 > 2.0f) {
+        part->unk_10 = 2.0f;
+    }
+    part->unk_08 += part->unk_10;
+}
+
+void fx_75_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_75_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void fx_75_appendGfx(EffectInstance* effect) {
+    Matrix4f sp18;
+    Matrix4f sp58;
+    Effect75* part = effect->data;
+    s32 idx = part->unk_00;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data));
+
+    shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C);
+    shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
+    shim_guMtxCatF(sp58, sp18, sp18);
+    shim_guScaleF(sp58, part->unk_18, part->unk_18, 1.0f);
+    shim_guMtxCatF(sp58, sp18, sp18);
+    shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]);
+    gSPDisplayList(gMasterGfxPos++, D_09001508);
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    gDPPipeSync(gMasterGfxPos++);
+}
diff --git a/src/effects/effect_76.c b/src/effects/effect_76.c
index 8f03ff0483..5aff95f342 100644
--- a/src/effects/effect_76.c
+++ b/src/effects/effect_76.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_76", fx_76_main);
 
-void func_E0098168(void) {
+void fx_76_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_76", func_E0098170);
+INCLUDE_ASM(s32, "effects/effect_76", fx_76_update);
 
-INCLUDE_ASM(s32, "effects/effect_76", func_E009829C);
+INCLUDE_ASM(s32, "effects/effect_76", fx_76_render);
 
-INCLUDE_ASM(s32, "effects/effect_76", func_E00982EC);
+INCLUDE_ASM(s32, "effects/effect_76", fx_76_appendGfx);
diff --git a/src/effects/effect_77.c b/src/effects/effect_77.c
index 20acb5eabf..ddc6ede54c 100644
--- a/src/effects/effect_77.c
+++ b/src/effects/effect_77.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_77", fx_77_main);
 
-void func_E009A138(void) {
+void fx_77_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_77", func_E009A140);
+INCLUDE_ASM(s32, "effects/effect_77", fx_77_update);
 
-INCLUDE_ASM(s32, "effects/effect_77", func_E009A398);
+INCLUDE_ASM(s32, "effects/effect_77", fx_77_render);
 
-INCLUDE_ASM(s32, "effects/effect_77", func_E009A3E0);
+INCLUDE_ASM(s32, "effects/effect_77", fx_77_appendGfx);
diff --git a/src/effects/effect_78.c b/src/effects/effect_78.c
index 24e5db493f..144709ab3b 100644
--- a/src/effects/effect_78.c
+++ b/src/effects/effect_78.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_78", fx_78_main);
 
-void func_E009C100(void) {
+void fx_78_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_78", func_E009C108);
+INCLUDE_ASM(s32, "effects/effect_78", fx_78_update);
 
-INCLUDE_ASM(s32, "effects/effect_78", func_E009C1DC);
+INCLUDE_ASM(s32, "effects/effect_78", fx_78_render);
 
-INCLUDE_ASM(s32, "effects/effect_78", func_E009C220);
+INCLUDE_ASM(s32, "effects/effect_78", fx_78_appendGfx);
diff --git a/src/effects/effect_79.c b/src/effects/effect_79.c
index bfaa109b41..6b5faf4ed9 100644
--- a/src/effects/effect_79.c
+++ b/src/effects/effect_79.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_79", fx_79_main);
 
-void func_E009E1DC(void) {
+void fx_79_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_79", func_E009E1E4);
+INCLUDE_ASM(s32, "effects/effect_79", fx_79_update);
 
-INCLUDE_ASM(s32, "effects/effect_79", func_E009E3DC);
+INCLUDE_ASM(s32, "effects/effect_79", fx_79_render);
 
-INCLUDE_ASM(s32, "effects/effect_79", func_E009E424);
+INCLUDE_ASM(s32, "effects/effect_79", fx_79_appendGfx);
diff --git a/src/effects/effect_8.c b/src/effects/effect_8.c
index 886a79711e..74e74df2f9 100644
--- a/src/effects/effect_8.c
+++ b/src/effects/effect_8.c
@@ -1,41 +1,13 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect8 {
-    /* 0x00 */ s32 unk_00;
-    /* 0x04 */ char unk_04[0x2];
-    /* 0x06 */ s16 unk_06;
-    /* 0x08 */ u8 primAlpha;
-    /* 0x09 */ char unk_09[0x3];
-    /* 0x0C */ f32 unk_0C;
-    /* 0x10 */ f32 unk_10;
-    /* 0x14 */ f32 unk_14;
-    /* 0x18 */ f32 unk_18;
-    /* 0x1C */ f32 unk_1C;
-    /* 0x20 */ f32 unk_20;
-    /* 0x24 */ f32 unk_24;
-    /* 0x28 */ f32 unk_28;
-    /* 0x2C */ f32 unk_2C;
-    /* 0x30 */ Mtx unk_30;
-    /* 0x70 */ f32 unk_70;
-    /* 0x74 */ f32 unk_74;
-    /* 0x78 */ f32 unk_78;
-    /* 0x7C */ f32 unk_7C;
-    /* 0x80 */ f32 unk_80;
-    /* 0x84 */ f32 unk_84;
-    /* 0x88 */ f32 unk_88;
-    /* 0x8C */ f32 unk_8C;
-    /* 0x90 */ f32 unk_90;
-    /* 0x94 */ f32 unk_94;
-} Effect8; // size = 0x98
+extern Gfx D_09000E08[];
 
 void fx_8_init(EffectInstance* effect);
 void fx_8_update(EffectInstance* effect);
 void fx_8_render(EffectInstance* effect);
 void fx_8_appendGfx(EffectInstance* effect);
 
-extern Gfx D_09000E08[];
-
 void func_E0010000(Effect8* effect) {
     Matrix4f sp18;
     Matrix4f sp58;
diff --git a/src/effects/effect_81.c b/src/effects/effect_81.c
index e20b42572a..0aeb9c7a91 100644
--- a/src/effects/effect_81.c
+++ b/src/effects/effect_81.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_81", fx_81_main);
 
-void func_E00A2118(void) {
+void fx_81_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_81", func_E00A2120);
+INCLUDE_ASM(s32, "effects/effect_81", fx_81_update);
 
-INCLUDE_ASM(s32, "effects/effect_81", func_E00A21EC);
+INCLUDE_ASM(s32, "effects/effect_81", fx_81_render);
 
 void func_E00A2234(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_81", func_E00A223C);
+INCLUDE_ASM(s32, "effects/effect_81", fx_81_appendGfx);
diff --git a/src/effects/effect_82.c b/src/effects/effect_82.c
index 0aa82ed078..cbd1a63374 100644
--- a/src/effects/effect_82.c
+++ b/src/effects/effect_82.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_82", fx_82_main);
 
-void func_E00A41A4(void) {
+void fx_82_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_82", func_E00A41AC);
+INCLUDE_ASM(s32, "effects/effect_82", fx_82_update);
 
-INCLUDE_ASM(s32, "effects/effect_82", func_E00A45DC);
+INCLUDE_ASM(s32, "effects/effect_82", fx_82_render);
 
 void func_E00A4648(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_82", func_E00A4650);
+INCLUDE_ASM(s32, "effects/effect_82", fx_82_appendGfx);
diff --git a/src/effects/effect_83.c b/src/effects/effect_83.c
index f92c41006e..c2d076ee70 100644
--- a/src/effects/effect_83.c
+++ b/src/effects/effect_83.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_83", fx_83_main);
 
-void func_E00A611C(void) {
+void fx_83_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_83", func_E00A6124);
+INCLUDE_ASM(s32, "effects/effect_83", fx_83_update);
 
-INCLUDE_ASM(s32, "effects/effect_83", func_E00A6358);
+INCLUDE_ASM(s32, "effects/effect_83", fx_83_render);
 
 void func_E00A639C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_83", func_E00A63A4);
+INCLUDE_ASM(s32, "effects/effect_83", fx_83_appendGfx);
diff --git a/src/effects/effect_84.c b/src/effects/effect_84.c
index c7c13e65e5..b1453245bd 100644
--- a/src/effects/effect_84.c
+++ b/src/effects/effect_84.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_84", fx_84_main);
 
-void func_E00A80FC(void) {
+void fx_84_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_84", func_E00A8104);
+INCLUDE_ASM(s32, "effects/effect_84", fx_84_update);
 
-INCLUDE_ASM(s32, "effects/effect_84", func_E00A82D4);
+INCLUDE_ASM(s32, "effects/effect_84", fx_84_render);
 
 void func_E00A8318(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_84", func_E00A8320);
+INCLUDE_ASM(s32, "effects/effect_84", fx_84_appendGfx);
diff --git a/src/effects/effect_85.c b/src/effects/effect_85.c
index fd1f79b73a..78ef0efbf3 100644
--- a/src/effects/effect_85.c
+++ b/src/effects/effect_85.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_85", fx_85_main);
 
-void func_E00AA104(void) {
+void fx_85_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_85", func_E00AA10C);
+INCLUDE_ASM(s32, "effects/effect_85", fx_85_update);
 
-INCLUDE_ASM(s32, "effects/effect_85", func_E00AA3C0);
+INCLUDE_ASM(s32, "effects/effect_85", fx_85_render);
 
-INCLUDE_ASM(s32, "effects/effect_85", func_E00AA404);
+INCLUDE_ASM(s32, "effects/effect_85", fx_85_appendGfx);
diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c
index b5108109a8..7e62179136 100644
--- a/src/effects/effect_86.c
+++ b/src/effects/effect_86.c
@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_86", fx_86_main);
 
-void func_E00AC11C(void) {
+void fx_86_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_86", func_E00AC124);
+INCLUDE_ASM(s32, "effects/effect_86", fx_86_update);
 
-void func_E00AC280(void) {
+void fx_86_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_86", func_E00AC288);
diff --git a/src/effects/effect_87.c b/src/effects/effect_87.c
index 9c60b6b4fb..5b97e93f2d 100644
--- a/src/effects/effect_87.c
+++ b/src/effects/effect_87.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_87", fx_87_main);
 
-void func_E00AE1AC(void) {
+void fx_87_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_87", func_E00AE1B4);
+INCLUDE_ASM(s32, "effects/effect_87", fx_87_update);
 
-INCLUDE_ASM(s32, "effects/effect_87", func_E00AE4FC);
+INCLUDE_ASM(s32, "effects/effect_87", fx_87_render);
 
 void func_E00AE544(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_87", func_E00AE54C);
+INCLUDE_ASM(s32, "effects/effect_87", fx_87_appendGfx);
diff --git a/src/effects/effect_88.c b/src/effects/effect_88.c
index 0407d0f714..4bc7c0bad4 100644
--- a/src/effects/effect_88.c
+++ b/src/effects/effect_88.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_88", fx_88_main);
 
-void func_E00B011C(void) {
+void fx_88_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_88", func_E00B0124);
+INCLUDE_ASM(s32, "effects/effect_88", fx_88_update);
 
-INCLUDE_ASM(s32, "effects/effect_88", func_E00B01F8);
+INCLUDE_ASM(s32, "effects/effect_88", fx_88_render);
 
-INCLUDE_ASM(s32, "effects/effect_88", func_E00B0234);
+INCLUDE_ASM(s32, "effects/effect_88", fx_88_appendGfx);
diff --git a/src/effects/effect_89.c b/src/effects/effect_89.c
index 2b8ff0ae8f..513967c993 100644
--- a/src/effects/effect_89.c
+++ b/src/effects/effect_89.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_89", fx_89_main);
 
-void func_E00B21DC(void) {
+void fx_89_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_89", func_E00B21E4);
+INCLUDE_ASM(s32, "effects/effect_89", fx_89_update);
 
-INCLUDE_ASM(s32, "effects/effect_89", func_E00B2460);
+INCLUDE_ASM(s32, "effects/effect_89", fx_89_render);
 
 void func_E00B24A8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_89", func_E00B24B0);
+INCLUDE_ASM(s32, "effects/effect_89", fx_89_appendGfx);
diff --git a/src/effects/effect_9.c b/src/effects/effect_9.c
index 142aed6ae4..3780f9c705 100644
--- a/src/effects/effect_9.c
+++ b/src/effects/effect_9.c
@@ -1,40 +1,15 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect9 {
-    /* 0x00 */ s32 unk_00;
-    /* 0x04 */ char unk_04[0x2];
-    /* 0x06 */ s16 unk_06;
-    /* 0x08 */ u8 primAlpha;
-    /* 0x09 */ char unk_09[0x3];
-    /* 0x0C */ f32 unk_0C;
-    /* 0x10 */ f32 unk_10;
-    /* 0x14 */ f32 unk_14;
-    /* 0x18 */ f32 unk_18;
-    /* 0x1C */ f32 unk_1C;
-    /* 0x20 */ f32 unk_20;
-    /* 0x24 */ f32 unk_24;
-    /* 0x28 */ f32 unk_28;
-    /* 0x2C */ f32 unk_2C;
-    /* 0x30 */ Mtx unk_30;
-    /* 0x70 */ f32 unk_70;
-    /* 0x74 */ f32 unk_74;
-    /* 0x78 */ f32 unk_78;
-    /* 0x7C */ f32 unk_7C;
-    /* 0x80 */ f32 unk_80;
-    /* 0x84 */ f32 unk_84;
-    /* 0x88 */ f32 unk_88;
-    /* 0x8C */ f32 unk_8C;
-    /* 0x90 */ f32 unk_90;
-    /* 0x94 */ f32 unk_94;
-} Effect9; // size = 0x98
+extern Gfx D_09000E20[];
+extern Gfx D_09000E38[];
 
 void fx_9_init(EffectInstance* effect);
 void fx_9_update(EffectInstance* effect);
 void fx_9_render(EffectInstance* effect);
 void fx_9_appendGfx(EffectInstance* effect);
 
-void func_E0012000(Effect9* effect) {
+void func_E0012000(Effect8* effect) {
     Matrix4f sp18;
     Matrix4f sp58;
 
@@ -50,16 +25,98 @@ void func_E0012000(Effect9* effect) {
     shim_guMtxF2L(sp18, &effect->unk_30);
 }
 
-void func_E0012104(Effect9* effect);
-INCLUDE_ASM(s32, "effects/effect_9", func_E0012104);
+void func_E0012104(Effect8* effect) {
+    if (effect->unk_04 == 0 && effect->unk_78 != 0.0f && gPlayerActionState == ACTION_STATE_IDLE) {
+        effect->unk_06++;
+        return;
+    }
 
-INCLUDE_ASM(s32, "effects/effect_9", fx_9_main);
+    effect->primAlpha -= 12;
+    effect->unk_88 += effect->unk_8C;
+    effect->unk_84 += effect->unk_88;
+    effect->unk_80 += effect->unk_84;
+    effect->unk_2C += effect->unk_80 * effect->unk_70;
+    effect->unk_0C -= effect->unk_80 * effect->unk_74 * effect->unk_90;
+    effect->unk_14 -= effect->unk_80 * effect->unk_74 * effect->unk_94;
 
-void func_E0012440(EffectInstance* effect) {
+    if (effect->unk_80 < 0.0f) {
+        effect->unk_78 = 0.0f;
+    }
+}
+
+void fx_9_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
+    EffectBlueprint bp;
+    EffectInstance* effect;
+    Effect8* part;
+    s32 numParts = 1;
+    f32 angle;
+    f32 temp;
+    s32 i;
+
+    bp.init = fx_9_init;
+    bp.update = fx_9_update;
+    bp.renderWorld = fx_9_render;
+    bp.unk_00 = 0;
+    bp.unk_14 = NULL;
+    bp.effectIndex = 9;
+
+    effect = shim_create_effect_instance(&bp);
+    effect->numParts = numParts;
+
+    part = shim_general_heap_malloc(numParts * sizeof(*part));
+    effect->data = part;
+    ASSERT(effect->data != NULL);
+
+    shim_mem_clear(part, numParts * sizeof(*part));
+
+    for (i = 0; i < numParts; i++, part++) {
+        part->unk_00 = 1;
+        part->unk_04 = arg0;
+        part->unk_7C = 0.0f;
+        part->unk_0C = arg1;
+        part->unk_10 = arg2;
+        part->unk_14 = arg3;
+        part->unk_18 = 1.0f;
+        part->unk_1C = 1.0f;
+        part->unk_20 = 1.0f;
+        part->primAlpha = 255;
+        part->unk_78 = 1.0f;
+        part->unk_74 = 5.4f;
+
+        if (arg5 != 0.0f) {
+            part->unk_70 = -10.0f;
+        } else {
+            part->unk_70 = 10.0f;
+        }
+
+        part->unk_8C = 0;
+        part->unk_06 = 15;
+        part->unk_28 = arg4;
+        part->unk_24 = 0;
+        part->unk_2C = 0;
+        part->unk_80 = 0.5f;
+        part->unk_84 = -0.07f;
+        part->unk_88 = 0.003f;
+        part->unk_09 = (shim_rand_int(100) >> 4) & 1;
+
+        if (arg5 != 0.0f) {
+            temp = -90.0f;
+            angle = shim_clamp_angle(arg4 + temp);
+        } else {
+            temp = 90.0f;
+            angle = shim_clamp_angle(arg4 + temp);
+        }
+
+        part->unk_90 = shim_sin_deg(angle);
+        part->unk_94 = shim_cos_deg(angle);
+    }
+}
+
+void fx_9_init(EffectInstance* effect) {
 }
 
 void fx_9_update(EffectInstance* effect) {
-    Effect9* part = (Effect9*)effect->data;
+    Effect8* part = (Effect8*)effect->data;
     s32 cond = FALSE;
     s32 i;
 
@@ -98,4 +155,32 @@ void func_E0012548(EffectInstance* effect) {
     shim_remove_effect(effect);
 }
 
-INCLUDE_ASM(s32, "effects/effect_9", fx_9_appendGfx);
+void fx_9_appendGfx(EffectInstance* effect) {
+    EffectInstance* effectTemp = effect;
+    Effect8* part = (Effect8*)effectTemp->data;
+    Gfx* dlist;
+    s32 i;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data));
+
+    for (i = 0; i < effectTemp->numParts; i++, part++) {
+        if (part->unk_00 != 0) {
+            if (part->unk_09 != 0) {
+                dlist = D_09000E20;
+            } else {
+                dlist = D_09000E38;
+            }
+
+            gDisplayContext->matrixStack[gMatrixListPos] = part->unk_30;
+
+            gDPPipeSync(gMasterGfxPos++);
+            gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, part->primAlpha);
+            gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+                        G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+            gSPDisplayList(gMasterGfxPos++, dlist);
+            gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+        }
+    }
+    gDPPipeSync(gMasterGfxPos++);
+}
diff --git a/src/effects/effect_90.c b/src/effects/effect_90.c
index a3e315163f..1008bce513 100644
--- a/src/effects/effect_90.c
+++ b/src/effects/effect_90.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_90", fx_90_main);
 
-void func_E00B4134(void) {
+void fx_90_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_90", func_E00B413C);
+INCLUDE_ASM(s32, "effects/effect_90", fx_90_update);
 
-INCLUDE_ASM(s32, "effects/effect_90", func_E00B452C);
+INCLUDE_ASM(s32, "effects/effect_90", fx_90_render);
 
 void func_E00B4574(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_90", func_E00B457C);
+INCLUDE_ASM(s32, "effects/effect_90", fx_90_appendGfx);
diff --git a/src/effects/effect_91.c b/src/effects/effect_91.c
index b0458be30e..c8c84e6902 100644
--- a/src/effects/effect_91.c
+++ b/src/effects/effect_91.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_91", fx_91_main);
 
-void func_E00B6178(void) {
+void fx_91_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_91", func_E00B6180);
+INCLUDE_ASM(s32, "effects/effect_91", fx_91_update);
 
-INCLUDE_ASM(s32, "effects/effect_91", func_E00B629C);
+INCLUDE_ASM(s32, "effects/effect_91", fx_91_render);
 
 void func_E00B62D8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_91", func_E00B62E0);
+INCLUDE_ASM(s32, "effects/effect_91", fx_91_appendGfx);
diff --git a/src/effects/effect_92.c b/src/effects/effect_92.c
index 5c31631add..07bffa7c8f 100644
--- a/src/effects/effect_92.c
+++ b/src/effects/effect_92.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_92", fx_92_main);
 
-void func_E00B812C(void) {
+void fx_92_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_92", func_E00B8134);
+INCLUDE_ASM(s32, "effects/effect_92", fx_92_update);
 
-INCLUDE_ASM(s32, "effects/effect_92", func_E00B81B8);
+INCLUDE_ASM(s32, "effects/effect_92", fx_92_render);
 
 void func_E00B8200(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_92", func_E00B8208);
+INCLUDE_ASM(s32, "effects/effect_92", fx_92_appendGfx);
diff --git a/src/effects/effect_93.c b/src/effects/effect_93.c
index 6b0a8a247a..575c8ce764 100644
--- a/src/effects/effect_93.c
+++ b/src/effects/effect_93.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_93", fx_93_main);
 
-void func_E00BA16C(void) {
+void fx_93_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_93", func_E00BA174);
+INCLUDE_ASM(s32, "effects/effect_93", fx_93_update);
 
-INCLUDE_ASM(s32, "effects/effect_93", func_E00BA5DC);
+INCLUDE_ASM(s32, "effects/effect_93", fx_93_render);
 
 void func_E00BA618(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_93", func_E00BA620);
+INCLUDE_ASM(s32, "effects/effect_93", fx_93_appendGfx);
diff --git a/src/effects/effect_94.c b/src/effects/effect_94.c
index 0eebb99a79..b063492605 100644
--- a/src/effects/effect_94.c
+++ b/src/effects/effect_94.c
@@ -2,19 +2,18 @@
 
 INCLUDE_ASM(s32, "effects/effect_94", fx_94_main);
 
-void func_E00BC1D0(void) {
+void fx_94_init(void) {
 }
 
 f32 func_E00BC1D8(f32 arg0) {
     return (f32)shim_rand_int((s32)arg0) - arg0 * 0.5;
 }
 
-INCLUDE_ASM(s32, "effects/effect_94", func_E00BC238);
+INCLUDE_ASM(s32, "effects/effect_94", fx_94_update);
 
-
-INCLUDE_ASM(s32, "effects/effect_94", func_E00BC2E8);
+INCLUDE_ASM(s32, "effects/effect_94", fx_94_render);
 
 void func_E00BC36C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_94", func_E00BC374);
+INCLUDE_ASM(s32, "effects/effect_94", fx_94_appendGfx);
diff --git a/src/effects/effect_95.c b/src/effects/effect_95.c
index 473809e325..ca24bf04da 100644
--- a/src/effects/effect_95.c
+++ b/src/effects/effect_95.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_95", fx_95_main);
 
-void func_E00BE39C(void) {
+void fx_95_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_95", func_E00BE3A4);
+INCLUDE_ASM(s32, "effects/effect_95", fx_95_update);
 
-INCLUDE_ASM(s32, "effects/effect_95", func_E00BE578);
+INCLUDE_ASM(s32, "effects/effect_95", fx_95_render);
 
 void func_E00BE5B4(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_95", func_E00BE5BC);
+INCLUDE_ASM(s32, "effects/effect_95", fx_95_appendGfx);
diff --git a/src/effects/effect_96.c b/src/effects/effect_96.c
index c81676f72a..a7c8967402 100644
--- a/src/effects/effect_96.c
+++ b/src/effects/effect_96.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_96", fx_96_main);
 
-void func_E00C0158(void) {
+void fx_96_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_96", func_E00C0160);
+INCLUDE_ASM(s32, "effects/effect_96", fx_96_update);
 
-INCLUDE_ASM(s32, "effects/effect_96", func_E00C0710);
+INCLUDE_ASM(s32, "effects/effect_96", fx_96_render);
 
 void func_E00C0758(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_96", func_E00C0760);
+INCLUDE_ASM(s32, "effects/effect_96", fx_96_appendGfx);
diff --git a/src/effects/effect_97.c b/src/effects/effect_97.c
index dac1790854..dae6ded3e1 100644
--- a/src/effects/effect_97.c
+++ b/src/effects/effect_97.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_97", fx_97_main);
 
-void func_E00C2124(void) {
+void fx_97_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_97", func_E00C212C);
+INCLUDE_ASM(s32, "effects/effect_97", fx_97_update);
 
-INCLUDE_ASM(s32, "effects/effect_97", func_E00C21CC);
+INCLUDE_ASM(s32, "effects/effect_97", fx_97_render);
 
 void func_E00C2214(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_97", func_E00C221C);
+INCLUDE_ASM(s32, "effects/effect_97", fx_97_appendGfx);
diff --git a/src/effects/effect_98.c b/src/effects/effect_98.c
index c580994b23..440b0a29df 100644
--- a/src/effects/effect_98.c
+++ b/src/effects/effect_98.c
@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_98", fx_98_main);
 
-void func_E00C4170(void) {
+void fx_98_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_98", func_E00C4178);
+INCLUDE_ASM(s32, "effects/effect_98", fx_98_update);
 
-INCLUDE_ASM(s32, "effects/effect_98", func_E00C42C4);
+INCLUDE_ASM(s32, "effects/effect_98", fx_98_render);
 
 void func_E00C4300(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_98", func_E00C4308);
+INCLUDE_ASM(s32, "effects/effect_98", fx_98_appendGfx);
diff --git a/src/effects/effect_99.c b/src/effects/effect_99.c
index 16de31633a..1566efb6cc 100644
--- a/src/effects/effect_99.c
+++ b/src/effects/effect_99.c
@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_99", fx_99_main);
 
-void func_E00C6394(void) {
+void fx_99_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_99", func_E00C639C);
+INCLUDE_ASM(s32, "effects/effect_99", fx_99_update);
 
-INCLUDE_ASM(s32, "effects/effect_99", func_E00C6768);
+INCLUDE_ASM(s32, "effects/effect_99", fx_99_render);
 
-INCLUDE_ASM(s32, "effects/effect_99", func_E00C67B0);
+INCLUDE_ASM(s32, "effects/effect_99", fx_99_appendGfx);
diff --git a/src/os/39cb0_len_100.c b/src/os/39cb0_len_100.c
index 4e95ca0d39..6f5481fb67 100644
--- a/src/os/39cb0_len_100.c
+++ b/src/os/39cb0_len_100.c
@@ -7,7 +7,7 @@
 extern u64 nuScStack[NU_SC_STACK_SIZE / sizeof(u64)];
 
 // probably should be at 0x8009A630, unless D_8009A630 (what's technically used in boot_idle) isn't nuIdleFunc
-static void (*nuIdleFunc)(void);
+BSS void (*nuIdleFunc)(void);
 
 void nuBoot(void) {
     osInitialize(); // osInitialize
diff --git a/src/os/guOrtho.c b/src/os/guOrtho.c
index 5f8434041f..3b746cbd1c 100644
--- a/src/os/guOrtho.c
+++ b/src/os/guOrtho.c
@@ -1,8 +1,8 @@
-#include "common.h"
+#include "PR/gu.h"
+#include "include_asm_libultra.h"
 
-#ifdef NON_MATCHING
-void guOrthoF(float mf[4][4], float l, float r, float b, float t,
-              float n, float f, float scale) {
+#ifndef KMC_ASM
+void guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale) {
     s32 i, j;
 
     guMtxIdentF(mf);
@@ -22,20 +22,18 @@ void guOrthoF(float mf[4][4], float l, float r, float b, float t,
     }
 }
 #else
-INCLUDE_ASM(void, "os/guOrtho", guOrthoF, float mf[4][4], float l, float r, float b, float t, float n, float f,
-            float scale);
+void guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale);
+INCLUDE_ASM_LIBULTRA("guOrtho", guOrthoF);
 #endif
 
-#ifdef NON_MATCHING
-void guOrtho(Mtx* m, float l, float r, float b, float t,
-             float n, float f, float scale) {
+#ifndef KMC_ASM
+void guOrtho(Mtx* m, float l, float r, float b, float t, float n, float f, float scale) {
     float mf[4][4];
 
-    guOrthoF(mf, l, r, b, t, n, f, scale);
+	guOrthoF(mf, l, r, b, t, n, f, scale);
 
-    guMtxF2L(mf, m);
+	guMtxF2L(mf, m);
 }
 #else
-INCLUDE_ASM(void, "os/guOrtho", guOrtho, Mtx* m, float l, float r, float b, float t,
-            float n, float f, float scale);
+INCLUDE_ASM_LIBULTRA("guOrtho", guOrtho);
 #endif
diff --git a/src/os/guRotate.c b/src/os/guRotate.c
index a652b1f269..50566a3afc 100644
--- a/src/os/guRotate.c
+++ b/src/os/guRotate.c
@@ -1,5 +1,59 @@
 #include "common.h"
+#include "include_asm_libultra.h"
 
-INCLUDE_ASM(void, "os/guRotate", guRotateF, float mf[4][4], float a, float x, float y, float z);
+extern float D_800958C0;
 
-INCLUDE_ASM(void, "os/guRotate", guRotate, Mtx* m, float a, float x, float y, float z);
+#ifndef KMC_ASM
+void guRotateF(float mf[4][4], float a, float x, float y, float z) {
+	static float dtor = PI_D / 180.0;
+	float sine;
+	float cosine;
+	float ab, bc, ca, t;
+    float xs, ys, zs;
+
+	guNormalize(&x, &y, &z);
+	a *= D_800958C0; // change to dtor later?
+	sine = sin_rad(a);
+	cosine = cos_rad(a);
+	t = 1.0f - cosine;
+	ab = x * y * t;
+	bc = y * z * t;
+	ca = z * x * t;
+
+	guMtxIdentF(mf);
+
+    ys = y * sine;
+    xs = x * sine;
+    zs = z * sine;
+
+	t = x * x;
+	mf[0][0] = t + cosine * (1.0f - t);
+	mf[2][1] = bc - xs;
+	mf[1][2] = bc + xs;
+
+	t = y * y;
+	mf[1][1] = t + cosine * (1.0f - t);
+	mf[2][0] = ca + ys;
+	mf[0][2] = ca - ys;
+
+	t = z * z;
+	mf[2][2] = t + cosine * (1.0f - t);
+	mf[1][0] = ab - zs;
+	mf[0][1] = ab + zs;
+}
+#else
+INCLUDE_ASM_LIBULTRA("guRotate", guRotateF);
+#endif
+
+
+#ifndef KMC_ASM
+void guRotate(Mtx *m, float a, float x, float y, float z) {
+	float mf[4][4];
+
+	guRotateF(mf, a, x, y, z);
+
+	guMtxF2L(mf, m);
+}
+#else
+INCLUDE_ASM_LIBULTRA("guRotate", guRotate);
+#endif
diff --git a/src/os/osEPiLinkHandle.c b/src/os/osEPiLinkHandle.c
index 50048acbd0..5a6c8210fb 100644
--- a/src/os/osEPiLinkHandle.c
+++ b/src/os/osEPiLinkHandle.c
@@ -1,3 +1,14 @@
 #include "common.h"
+#include "include_asm_libultra.h"
 
-INCLUDE_ASM(s32, "os/osEPiLinkHandle", osEPiLinkHandle, OSPiHandle* handle);
+#ifndef KMC_ASM
+s32 osEPiLinkHandle(OSPiHandle* EPiHandle) {
+    u32 saveMask = __osDisableInt();
+    EPiHandle->next = __osPiTable;
+    __osPiTable = EPiHandle;
+    __osRestoreInt(saveMask);
+    return 0;
+}
+#else
+INCLUDE_ASM_LIBULTRA("osEPiLinkHandle", osEPiLinkHandle);
+#endif
diff --git a/src/os/osEPiReadIo.c b/src/os/osEPiReadIo.c
index aefb621eae..ac4862e3a9 100644
--- a/src/os/osEPiReadIo.c
+++ b/src/os/osEPiReadIo.c
@@ -1,4 +1,6 @@
+#ifdef KMC_ASM
 #define MOVE_ADDU
+#endif
 
 #include "common.h"
 
diff --git a/src/os/osEPiStartDma.c b/src/os/osEPiStartDma.c
index f8c6c08511..de524ddc15 100644
--- a/src/os/osEPiStartDma.c
+++ b/src/os/osEPiStartDma.c
@@ -1,4 +1,6 @@
+#ifdef KMC_ASM
 #define MOVE_ADDU
+#endif
 
 #include "common.h"
 
diff --git a/src/os/osEPiWriteIo.c b/src/os/osEPiWriteIo.c
index a16668b0b8..1950b55ee0 100644
--- a/src/os/osEPiWriteIo.c
+++ b/src/os/osEPiWriteIo.c
@@ -1,4 +1,6 @@
+#ifdef KMC_ASM
 #define MOVE_ADDU
+#endif
 
 #include "common.h"
 
diff --git a/src/os/osSetThreadPri.c b/src/os/osSetThreadPri.c
index 5ac93ca7f4..73f51f2565 100644
--- a/src/os/osSetThreadPri.c
+++ b/src/os/osSetThreadPri.c
@@ -14,7 +14,7 @@ OSThread* __osRunningThread = NULL;
 OSThread* __osFaultedThread = NULL;
 
 void osSetThreadPri(OSThread* thread, OSPri pri) {
-    register u32 prevInt = osDisableInt();
+    register u32 prevInt = __osDisableInt();
 
     if (thread == NULL) {
         thread = __osRunningThread;
@@ -32,5 +32,5 @@ void osSetThreadPri(OSThread* thread, OSPri pri) {
         }
     }
 
-    osRestoreInt(prevInt);
+    __osRestoreInt(prevInt);
 }
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 56412c4524..989f2792bf 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -567,12 +567,7 @@ u8 N(quizAnswers)[] = {
     0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01,
 };
 
-typedef struct {
-    s32 unk_00;
-    s32 unk_04;
-} N(quizReqStruct);
-
-N(quizReqStruct) N(quizRequirements)[] = {
+QuizRequirements N(quizRequirements)[] = {
     { -108, 0 }, { -76, 10 },
     { -54, 20 }, { -14, 30 },
     {   6, 37 }, {  39, 44 },
@@ -1149,7 +1144,7 @@ EvtSource N(802468F8) = SCRIPT({
 });
 
 EvtSource N(80247628) = SCRIPT({
-    N(func_802415AC_95C7AC)();
+    N(UnkQuizFunc)();
     if (EVT_VAR(0) == 0) {
         return;
     }
@@ -2996,63 +2991,7 @@ ApiStatus N(func_80241470_95C670)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/Set80151310.inc.c"
 
-// Ok good luck.
-ApiStatus N(func_802415AC_95C7AC)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->debugQuizmo != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h
index 4e22391f55..3d3f594cb9 100644
--- a/src/world/area_dro/dro_01/dro_01.h
+++ b/src/world/area_dro/dro_01/dro_01.h
@@ -39,7 +39,7 @@ ApiStatus N(UnkFunc25)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_80241174_95C374)(Evt* script, s32 isInitialCall);
-ApiStatus N(func_802415AC_95C7AC)(Evt* script, s32 isInitialCall);
+ApiStatus N(UnkQuizFunc)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkFunc31)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkFunc29)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_80241B5C_95CD5C)(Evt* script, s32 isInitialCall);
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index c707e64011..4302b0380f 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -465,12 +465,7 @@ u8 N(quizAnswers)[] = {
     0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01,
 };
 
-typedef struct {
-    s32 unk_00;
-    s32 unk_04;
-} N(quizReqStruct);
-
-N(quizReqStruct) N(quizRequirements)[] = {
+QuizRequirements N(quizRequirements)[] = {
     { -108, 0 }, { -76, 10 },
     { -54, 20 }, { -14, 30 },
     {   6, 37 }, {  39, 44 },
@@ -1047,7 +1042,7 @@ EvtSource N(80246520) = SCRIPT({
 });
 
 EvtSource N(80247250) = SCRIPT({
-    N(func_8024043C_9695FC)();
+    N(UnkQuizFunc)();
     if (EVT_VAR(0) == 0) {
         return;
     }
@@ -3110,62 +3105,7 @@ ApiStatus N(func_80240300_9694C0)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/Set80151310.inc.c"
 
-ApiStatus N(func_8024043C_9695FC)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->debugQuizmo != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h
index d4558da3f2..0ec47f30a8 100644
--- a/src/world/area_dro/dro_02/dro_02.h
+++ b/src/world/area_dro/dro_02/dro_02.h
@@ -24,7 +24,7 @@ ApiStatus N(UnkMovePartner)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkRotatePartner)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkRotatePlayer)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall);
-ApiStatus N(func_8024043C_9695FC)(Evt* script, s32 isInitialCall);
+ApiStatus N(UnkQuizFunc)(Evt* script, s32 isInitialCall);
 ApiStatus N(UnkFunc31)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_802409EC_969BAC)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_80240A70_969C30)(Evt* script, s32 isInitialCall);
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 691c9b6e56..608fad7d49 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -13,17 +13,6 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60);
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04);
-/*
-void N(func_80241904_A1CA04)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-
-    npc->pos.y += N(D_802457F4_A208F4)[npc->duration++];
-    if (npc->duration >= 5) {
-        script->functionTemp[0] = 12;
-    }
-}
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -34,67 +23,6 @@ void N(func_80241904_A1CA04)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit
 #include "world/common/UnkFunc5.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC);
-/*
-ApiStatus N(func_80241FBC_A1D0BC)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Bytecode* args = script->ptrReadPos;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* aiSettings = evt_get_variable(script, *args);
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->wander.detectShape;
-    territory.pointX = enemy->territory->wander.detect.x;
-    territory.pointZ = enemy->territory->wander.detect.z;
-    territory.sizeX = enemy->territory->wander.detectSizeX;
-    territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_18 = 120.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall) {
-        N(func_80241E98_A1CF98)(npc, enemy, script, aiSettings);
-    }
-
-    npc->unk_AB = -2;
-
-    if (enemy->unk_B0 & 4) {
-        if (enemy->unk_B4 != 0) {
-            return ApiStatus_BLOCK;
-        }
-        enemy->unk_B0 &= ~4;
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc23.inc.c"
-        case 1:
-            N(btl_merlee_on_start_turn_A1BF60)(script, aiSettings, territoryPtr);
-            break;
-        case 2:
-            N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
-        case 3:
-            N(func_80241548_A1C648)(script, aiSettings, territoryPtr);
-            break;
-        case 10:
-            N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
-        case 11:
-            N(func_80241904_A1CA04)(script, aiSettings, territoryPtr);
-            break;
-        case 12:
-            N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr);
-            break;
-        case 13:
-            N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
-            break;
-        case 14:
-            N(func_80241B08_A1CC08)(script, aiSettings, territoryPtr);
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 #include "world/common/Call800E9894.inc.c"
 
@@ -117,233 +45,30 @@ ApiStatus N(func_80241FBC_A1D0BC)(Evt* script, s32 isInitialCall) {
 #include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4);
-/*
-ApiStatus N(func_802424A4_A1D5A4)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_8024801C_A2311C) == NULL) {
-        N(D_8024801C_A2311C) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_8024801C_A2311C)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_8024801C_A2311C)[i];
-        }
-        heap_free(N(D_8024801C_A2311C));
-        N(D_8024801C_A2311C) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0);
-/*
-ApiStatus N(func_802425E0_A1D6E0)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242B90_A1DC90);
-/*
-ApiStatus N(func_80242B90_A1DC90)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242C14_A1DD14);
-/*
-ApiStatus N(func_80242C14_A1DD14)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242E2C_A1DF2C);
-/*
-ApiStatus N(func_80242E2C_A1DF2C)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242EE0_A1DFE0);
-/*
-ApiStatus N(func_80242EE0_A1DFE0)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F14_A1E014);
-/*
-ApiStatus N(func_80242F14_A1E014)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F94_A1E094);
-/*
-ApiStatus N(func_80242F94_A1E094)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FAC_A1E0AC);
-/*
-ApiStatus N(func_80242FAC_A1E0AC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8);
-/*
-ApiStatus N(func_80242FC8_A1E0C8)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -358,22 +83,5 @@ ApiStatus N(func_80242FC8_A1E0C8)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C);
-/*
-void N(func_8024349C_A1E59C)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243508_A1E608);
-/*
-ApiStatus N(func_80243508_A1E608)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 986ba62209..dcf0fa4bbb 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -25,376 +25,42 @@
 #include "world/common/UnkFunc16.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4_B2D434);
-/*
-ApiStatus N(func_80240FC4_B2D434)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++);
-    f32 posX, posY, posZ, posW;
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detect.x;
-    territory.pointZ = enemy->territory->patrol.detect.z;
-    territory.sizeX = enemy->territory->patrol.detectSizeX;
-    territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_18 = 65.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[0];
-        npc->flags &= ~0x800;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags = (npc->flags | 0x200) & ~8;
-        } else {
-            npc->flags = (npc->flags & ~0x200) | 8;
-        }
-
-        if (enemy->unk_B0 & 4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = 100.0f;
-
-        if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            npc->pos.y = posY;
-        }
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc24.inc.c"
-        case 1:
-            N(func_80240588_B2C9F8)(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
-        case 3:
-            N(func_802408F0_B2CD60)(script, npcAISettings, territoryPtr);
-            break;
-        case 4:
-#include "world/common/UnkNpcAIFunc25.inc.c"
-            break;
-        case 10:
-            N(NpcJumpFunc2)(script, npcAISettings, territoryPtr);
-        case 11:
-            N(NpcJumpFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
-        case 13:
-            N(func_80240D7C_B2D1EC)(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 15:
-            N(func_80240F04_B2D374)(script, npcAISettings, territoryPtr);
-            break;
-        case 99:
-            func_8004A73C(script);
-    }
-    return ApiStatus_BLOCK;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
-/*
-ApiStatus N(func_802414EC_B2D95C)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_80243048_B2F4B8) = FALSE;
-    }
-
-    if (N(D_80243048_B2F4B8)) {
-        N(D_80243048_B2F4B8) = FALSE;
-        evt_set_variable(script, *args, N(D_8024304C_B2F4BC));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0);
-/*
-ApiStatus N(func_80241540_B2D9B0)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_8024304C_B2F4BC) = evt_get_variable(script, *args);
-    N(D_80243048_B2F4B8) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8);
-/*
-ApiStatus N(func_80241578_B2D9E8)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84);
-/*
-ApiStatus N(func_80241614_B2DA84)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_802431E4_B2F654) == NULL) {
-        N(D_802431E4_B2F654) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_802431E4_B2F654)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_802431E4_B2F654)[i];
-        }
-        heap_free(N(D_802431E4_B2F654));
-        N(D_802431E4_B2F654) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0);
-/*
-ApiStatus N(func_80241750_B2DBC0)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241D00_B2E170);
-/*
-ApiStatus N(func_80241D00_B2E170)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241D84_B2E1F4);
-/*
-ApiStatus N(func_80241D84_B2E1F4)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241F9C_B2E40C);
-/*
-ApiStatus N(func_80241F9C_B2E40C)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242050_B2E4C0);
-/*
-ApiStatus N(func_80242050_B2E4C0)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242084_B2E4F4);
-/*
-ApiStatus N(func_80242084_B2E4F4)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242104_B2E574);
-/*
-ApiStatus N(func_80242104_B2E574)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024211C_B2E58C);
-/*
-ApiStatus N(func_8024211C_B2E58C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8);
-/*
-ApiStatus N(func_80242138_B2E5A8)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -409,24 +75,7 @@ ApiStatus N(func_80242138_B2E5A8)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C);
-/*
-void N(func_8024260C_B2EA7C)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242678_B2EAE8);
-/*
-ApiStatus N(func_80242678_B2EAE8)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SwitchToPartner.inc.c"
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index c0011f3986..4ffc3057d8 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -48,91 +48,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
 #include "world/common/UnkFunc16.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84);
-/*
-ApiStatus N(func_802411B4_B35D84)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++);
-    f32 posX, posY, posZ, posW;
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detect.x;
-    territory.pointZ = enemy->territory->patrol.detect.z;
-    territory.sizeX = enemy->territory->patrol.detectSizeX;
-    territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_18 = 65.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[0];
-        npc->flags &= ~0x800;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags = (npc->flags | 0x200) & ~8;
-        } else {
-            npc->flags = (npc->flags & ~0x200) | 8;
-        }
-
-        if (enemy->unk_B0 & 4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = 100.0f;
-
-        if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            npc->pos.y = posY;
-        }
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc24.inc.c"
-        case 1:
-            N(func_80240778_B35348)(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
-        case 3:
-            N(func_80240AE0_B356B0)(script, npcAISettings, territoryPtr);
-            break;
-        case 4:
-#include "world/common/UnkNpcAIFunc25.inc.c"
-            break;
-        case 10:
-            N(NpcJumpFunc2)(script, npcAISettings, territoryPtr);
-        case 11:
-            N(NpcJumpFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
-        case 13:
-            N(func_80240F6C_B35B3C)(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 15:
-            N(func_802410F4_B35CC4)(script, npcAISettings, territoryPtr);
-            break;
-        case 99:
-            func_8004A73C(script);
-    }
-    return ApiStatus_BLOCK;
-}
-*/
 
 static char* N(exit_str_4) = "tik_08";
 
@@ -161,307 +76,38 @@ static char* N(exit_str_4) = "tik_08";
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
-/*
-ApiStatus N(func_802419D8_B365A8)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_80247444_B3C014) = FALSE;
-    }
-
-    if (N(D_80247444_B3C014)) {
-        N(D_80247444_B3C014) = FALSE;
-        evt_set_variable(script, *args, N(D_80247448_B3C018));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC);
-/*
-ApiStatus N(func_80241A2C_B365FC)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_80247448_B3C018) = evt_get_variable(script, *args);
-    N(D_80247444_B3C014) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634);
-/*
-ApiStatus N(func_80241A64_B36634)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0);
-/*
-ApiStatus N(func_80241B00_B366D0)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C);
-/*
-ApiStatus N(func_80241B9C_B3676C)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80247764_B3C334) == NULL) {
-        N(D_80247764_B3C334) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80247764_B3C334)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80247764_B3C334)[i];
-        }
-        heap_free(N(D_80247764_B3C334));
-        N(D_80247764_B3C334) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8);
-/*
-ApiStatus N(func_80241CD8_B368A8)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242288_B36E58);
-/*
-ApiStatus N(func_80242288_B36E58)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024230C_B36EDC);
-/*
-ApiStatus N(func_8024230C_B36EDC)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242524_B370F4);
-/*
-ApiStatus N(func_80242524_B370F4)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802425D8_B371A8);
-/*
-ApiStatus N(func_802425D8_B371A8)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024260C_B371DC);
-/*
-ApiStatus N(func_8024260C_B371DC)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024268C_B3725C);
-/*
-ApiStatus N(func_8024268C_B3725C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426A4_B37274);
-/*
-ApiStatus N(func_802426A4_B37274)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290);
-/*
-ApiStatus N(func_802426C0_B37290)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -476,47 +122,15 @@ ApiStatus N(func_802426C0_B37290)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764);
-/*
-void N(func_80242B94_B37764)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C00_B377D0);
-/*
-ApiStatus N(func_80242C00_B377D0)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EAC_B37A7C);
-/*
-ApiStatus N(func_80242EAC_B37A7C)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EF0_B37AC0);
-/*
-ApiStatus N(func_80242EF0_B37AC0)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C_B37AEC);
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 9924c05efd..f9681f1334 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -24,233 +24,30 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350);
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400);
-/*
-ApiStatus N(func_80240390_8B0400)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_802455D0_8B5640) == NULL) {
-        N(D_802455D0_8B5640) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_802455D0_8B5640)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_802455D0_8B5640)[i];
-        }
-        heap_free(N(D_802455D0_8B5640));
-        N(D_802455D0_8B5640) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C);
-/*
-ApiStatus N(func_802404CC_8B053C)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240A7C_8B0AEC);
-/*
-ApiStatus N(func_80240A7C_8B0AEC)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240B00_8B0B70);
-/*
-ApiStatus N(func_80240B00_8B0B70)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240D18_8B0D88);
-/*
-ApiStatus N(func_80240D18_8B0D88)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240DCC_8B0E3C);
-/*
-ApiStatus N(func_80240DCC_8B0E3C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E00_8B0E70);
-/*
-ApiStatus N(func_80240E00_8B0E70)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E80_8B0EF0);
-/*
-ApiStatus N(func_80240E80_8B0EF0)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E98_8B0F08);
-/*
-ApiStatus N(func_80240E98_8B0F08)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24);
-/*
-ApiStatus N(func_80240EB4_8B0F24)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -265,25 +62,8 @@ ApiStatus N(func_80240EB4_8B0F24)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8);
-/*
-void N(func_80241388_8B13F8)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802413F4_8B1464);
-/*
-ApiStatus N(func_802413F4_8B1464)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424_8B1494);
 
@@ -318,56 +98,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084);
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC);
-/*
-ApiStatus N(func_8024226C_8B22DC)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_80247E30_8B7EA0) = FALSE;
-    }
-
-    if (N(D_80247E30_8B7EA0)) {
-        N(D_80247E30_8B7EA0) = FALSE;
-        evt_set_variable(script, *args, N(D_80247E34_8B7EA4));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330);
-/*
-ApiStatus N(func_802422C0_8B2330)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_80247E34_8B7EA4) = evt_get_variable(script, *args);
-    N(D_80247E30_8B7EA0) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368);
-/*
-ApiStatus N(func_802422F8_8B2368)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 
@@ -376,23 +110,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426A0_8B2710);
-/*
-ApiStatus N(func_802426A0_8B2710)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426E4_8B2754);
-/*
-ApiStatus N(func_802426E4_8B2754)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710_8B2780);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 6ead5a7fb6..2bb6b0cb79 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -3,233 +3,30 @@
 #define UNK_ALPHA_FUNC_NPC 6
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340);
-/*
-ApiStatus N(func_80240630_7EB340)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80245DC0_7F0AD0) == NULL) {
-        N(D_80245DC0_7F0AD0) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80245DC0_7F0AD0)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80245DC0_7F0AD0)[i];
-        }
-        heap_free(N(D_80245DC0_7F0AD0));
-        N(D_80245DC0_7F0AD0) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C);
-/*
-ApiStatus N(func_8024076C_7EB47C)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240D1C_7EBA2C);
-/*
-ApiStatus N(func_80240D1C_7EBA2C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240DA0_7EBAB0);
-/*
-ApiStatus N(func_80240DA0_7EBAB0)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240FB8_7EBCC8);
-/*
-ApiStatus N(func_80240FB8_7EBCC8)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024106C_7EBD7C);
-/*
-ApiStatus N(func_8024106C_7EBD7C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802410A0_7EBDB0);
-/*
-ApiStatus N(func_802410A0_7EBDB0)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241120_7EBE30);
-/*
-ApiStatus N(func_80241120_7EBE30)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241138_7EBE48);
-/*
-ApiStatus N(func_80241138_7EBE48)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64);
-/*
-ApiStatus N(func_80241154_7EBE64)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -244,126 +41,28 @@ ApiStatus N(func_80241154_7EBE64)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338);
-/*
-void N(func_80241628_7EC338)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694_7EC3A4);
-/*
-ApiStatus N(func_80241694_7EC3A4)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600);
-/*
-ApiStatus N(func_802418F0_7EC600)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_802483E8_7F30F8) = FALSE;
-    }
-
-    if (N(D_802483E8_7F30F8)) {
-        N(D_802483E8_7F30F8) = FALSE;
-        evt_set_variable(script, *args, N(D_802483EC_7F30FC));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654);
-/*
-ApiStatus N(func_80241944_7EC654)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_802483EC_7F30FC) = evt_get_variable(script, *args);
-    N(D_802483E8_7F30F8) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C);
-/*
-ApiStatus N(func_8024197C_7EC68C)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728);
-/*
-ApiStatus N(func_80241A18_7EC728)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40);
-/*
-ApiStatus N(func_80241D30_7ECA40)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D74_7ECA84);
-/*
-ApiStatus N(func_80241D74_7ECA84)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0_7ECAB0);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 2106f567fd..4e7f0de650 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -43,323 +43,35 @@ extern u8 D_80258407_818C87;
 #include "world/common/UnkFunc16.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14_802494);
-/*
-ApiStatus N(func_80241C14_802494)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++);
-    f32 posX, posY, posZ, posW;
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detect.x;
-    territory.pointZ = enemy->territory->patrol.detect.z;
-    territory.sizeX = enemy->territory->patrol.detectSizeX;
-    territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_18 = 65.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[0];
-        npc->flags &= ~0x800;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags = (npc->flags | 0x200) & ~8;
-        } else {
-            npc->flags = (npc->flags & ~0x200) | 8;
-        }
-
-        if (enemy->unk_B0 & 4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = 100.0f;
-
-        if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            npc->pos.y = posY;
-        }
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc24.inc.c"
-        case 1:
-            N(func_802411D8_801A58)(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            dup_UnkNpcAIFunc1(script, npcAISettings, territoryPtr);
-        case 3:
-            N(func_80241540_801DC0)(script, npcAISettings, territoryPtr);
-            break;
-        case 4:
-            N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr);
-            break;
-        case 10:
-            dup_NpcJumpFunc2(script, npcAISettings, territoryPtr);
-        case 11:
-            dup_NpcJumpFunc(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            dup_UnkNpcAIFunc13(script, npcAISettings, territoryPtr);
-        case 13:
-            N(func_802419CC_80224C)(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            dup_UnkNpcDurationFlagFunc(script, npcAISettings, territoryPtr);
-            break;
-        case 15:
-            N(func_80241B54_8023D4)(script, npcAISettings, territoryPtr);
-            break;
-        case 99:
-            func_8004A73C(script);
-    }
-    return ApiStatus_BLOCK;
-}
-*/
 
 static char* N(exit_str_0) = "flo_00";
 static char* N(exit_str_1) = "kmr_22";
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790);
-/*
-ApiStatus N(func_80241F10_802790)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80248C30_8094B0) == NULL) {
-        N(D_80248C30_8094B0) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80248C30_8094B0)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80248C30_8094B0)[i];
-        }
-        heap_free(N(D_80248C30_8094B0));
-        N(D_80248C30_8094B0) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC);
-/*
-ApiStatus N(func_8024204C_8028CC)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802425FC_802E7C);
-/*
-ApiStatus N(func_802425FC_802E7C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242680_802F00);
-/*
-ApiStatus N(func_80242680_802F00)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242898_803118);
-/*
-ApiStatus N(func_80242898_803118)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024294C_8031CC);
-/*
-ApiStatus N(func_8024294C_8031CC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242980_803200);
-/*
-ApiStatus N(func_80242980_803200)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A00_803280);
-/*
-ApiStatus N(func_80242A00_803280)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A18_803298);
-/*
-ApiStatus N(func_80242A18_803298)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4);
-/*
-ApiStatus N(func_80242A34_8032B4)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -374,25 +86,8 @@ ApiStatus N(func_80242A34_8032B4)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788);
-/*
-void N(func_80242F08_803788)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F74_8037F4);
-/*
-ApiStatus N(func_80242F74_8037F4)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242FA4_803824);
 
@@ -435,79 +130,18 @@ ApiStatus func_80243AA0_804320(Evt* script, s32 isInitialCall) {
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554);
-/*
-ApiStatus N(func_80243CD4_804554)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_8024D944_80E1C4) = FALSE;
-    }
-
-    if (N(D_8024D944_80E1C4)) {
-        N(D_8024D944_80E1C4) = FALSE;
-        evt_set_variable(script, *args, N(D_8024D948_80E1C8));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28_8045A8);
-/*
-ApiStatus N(func_80243D28_8045A8)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_8024D948_80E1C8) = evt_get_variable(script, *args);
-    N(D_8024D944_80E1C4) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0);
-/*
-ApiStatus N(func_80243D60_8045E0)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8);
-/*
-ApiStatus N(func_80244078_8048F8)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440BC_80493C);
-/*
-ApiStatus N(func_802440BC_80493C)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetPlayerCoins.inc.c"
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 1cc73abda5..18995dcc49 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -25,320 +25,32 @@
 #include "world/common/UnkFunc16.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802414C4_824784);
-/*
-ApiStatus N(func_802414C4_824784)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++);
-    f32 posX, posY, posZ, posW;
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detect.x;
-    territory.pointZ = enemy->territory->patrol.detect.z;
-    territory.sizeX = enemy->territory->patrol.detectSizeX;
-    territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_18 = 65.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[0];
-        npc->flags &= ~0x800;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags = (npc->flags | 0x200) & ~8;
-        } else {
-            npc->flags = (npc->flags & ~0x200) | 8;
-        }
-
-        if (enemy->unk_B0 & 4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = 100.0f;
-
-        if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            npc->pos.y = posY;
-        }
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc24.inc.c"
-        case 1:
-            N(func_80240A88_823D48)(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
-        case 3:
-            N(func_80240DF0_8240B0)(script, npcAISettings, territoryPtr);
-            break;
-        case 4:
-#include "world/common/UnkNpcAIFunc25.inc.c"
-            break;
-        case 10:
-            N(NpcJumpFunc2)(script, npcAISettings, territoryPtr);
-        case 11:
-            N(NpcJumpFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
-        case 13:
-            N(func_8024127C_82453C)(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 15:
-            N(func_80241404_8246C4)(script, npcAISettings, territoryPtr);
-            break;
-        case 99:
-            func_8004A73C(script);
-    }
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80);
-/*
-ApiStatus N(func_802417C0_824A80)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80246150_829410) == NULL) {
-        N(D_80246150_829410) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80246150_829410)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80246150_829410)[i];
-        }
-        heap_free(N(D_80246150_829410));
-        N(D_80246150_829410) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC);
-/*
-ApiStatus N(func_802418FC_824BBC)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241EAC_82516C);
-/*
-ApiStatus N(func_80241EAC_82516C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241F30_8251F0);
-/*
-ApiStatus N(func_80241F30_8251F0)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242148_825408);
-/*
-ApiStatus N(func_80242148_825408)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802421FC_8254BC);
-/*
-ApiStatus N(func_802421FC_8254BC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242230_8254F0);
-/*
-ApiStatus N(func_80242230_8254F0)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422B0_825570);
-/*
-ApiStatus N(func_802422B0_825570)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422C8_825588);
-/*
-ApiStatus N(func_802422C8_825588)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4);
-/*
-ApiStatus N(func_802422E4_8255A4)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -353,103 +65,20 @@ ApiStatus N(func_802422E4_8255A4)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78);
-/*
-void N(func_802427B8_825A78)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824_825AE4);
-/*
-ApiStatus N(func_80242824_825AE4)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40);
-/*
-ApiStatus N(func_80242A80_825D40)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_80248778_82BA38) = FALSE;
-    }
-
-    if (N(D_80248778_82BA38)) {
-        N(D_80248778_82BA38) = FALSE;
-        evt_set_variable(script, *args, N(D_8024877C_82BA3C));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94);
-/*
-ApiStatus N(func_80242AD4_825D94)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_8024877C_82BA3C) = evt_get_variable(script, *args);
-    N(D_80248778_82BA38) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242B0C_825DCC);
-/*
-ApiStatus N(func_80242B0C_825DCC)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242BA8_825E68);
-/*
-ApiStatus N(func_80242BA8_825E68)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44_825F04);
 
@@ -462,40 +91,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243040_826300);
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243088_826348);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0_826390);
-/*
-ApiStatus N(func_802430D0_826390)(Evt *script, s32 isInitialCall) {
-    s32 i;
-
-    for (i = 0; i <= 90; i++) {
-        N(D_8024EA10)[i] = 128 + i;
-    }
-
-    N(D_8024EA14) = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243380_826640);
-/*
-ApiStatus N(func_80243380_826640)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433C4_826684);
-/*
-ApiStatus N(func_802433C4_826684)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/UnkMusicFunc.inc.c"
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 351079ad3f..01d2ae85f0 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -5,233 +5,30 @@
 #include "common/UnkFloatFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0);
-/*
-ApiStatus N(func_802404B0_831CB0)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80246644_837E44) == NULL) {
-        N(D_80246644_837E44) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80246644_837E44)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80246644_837E44)[i];
-        }
-        heap_free(N(D_80246644_837E44));
-        N(D_80246644_837E44) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC);
-/*
-ApiStatus N(func_802405EC_831DEC)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240B9C_83239C);
-/*
-ApiStatus N(func_80240B9C_83239C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240C20_832420);
-/*
-ApiStatus N(func_80240C20_832420)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240E38_832638);
-/*
-ApiStatus N(func_80240E38_832638)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240EEC_8326EC);
-/*
-ApiStatus N(func_80240EEC_8326EC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240F20_832720);
-/*
-ApiStatus N(func_80240F20_832720)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FA0_8327A0);
-/*
-ApiStatus N(func_80240FA0_8327A0)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FB8_8327B8);
-/*
-ApiStatus N(func_80240FB8_8327B8)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4);
-/*
-ApiStatus N(func_80240FD4_8327D4)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -246,104 +43,26 @@ ApiStatus N(func_80240FD4_8327D4)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8);
-/*
-void N(func_802414A8_832CA8)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514_832D14);
-/*
-ApiStatus N(func_80241514_832D14)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70);
-/*
-ApiStatus N(func_80241770_832F70)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_80248C6C_83A46C) = FALSE;
-    }
-
-    if (N(D_80248C6C_83A46C)) {
-        N(D_80248C6C_83A46C) = FALSE;
-        evt_set_variable(script, *args, N(D_80248C70_83A470));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4);
-/*
-ApiStatus N(func_802417C4_832FC4)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_80248C70_83A470) = evt_get_variable(script, *args);
-    N(D_80248C6C_83A46C) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC);
-/*
-ApiStatus N(func_802417FC_832FFC)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B14_833314);
-/*
-ApiStatus N(func_80241B14_833314)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B58_833358);
-/*
-ApiStatus N(func_80241B58_833358)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84_833384);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 4c16f624a5..9356532b8e 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -3,233 +3,30 @@
 #define UNK_ALPHA_FUNC_NPC 20
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030);
-/*
-ApiStatus N(func_80240460_843030)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80243FE8_846BB8) == NULL) {
-        N(D_80243FE8_846BB8) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80243FE8_846BB8)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80243FE8_846BB8)[i];
-        }
-        heap_free(N(D_80243FE8_846BB8));
-        N(D_80243FE8_846BB8) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C);
-/*
-ApiStatus N(func_8024059C_84316C)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240B4C_84371C);
-/*
-ApiStatus N(func_80240B4C_84371C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240BD0_8437A0);
-/*
-ApiStatus N(func_80240BD0_8437A0)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240DE8_8439B8);
-/*
-ApiStatus N(func_80240DE8_8439B8)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240E9C_843A6C);
-/*
-ApiStatus N(func_80240E9C_843A6C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240ED0_843AA0);
-/*
-ApiStatus N(func_80240ED0_843AA0)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F50_843B20);
-/*
-ApiStatus N(func_80240F50_843B20)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F68_843B38);
-/*
-ApiStatus N(func_80240F68_843B38)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54);
-/*
-ApiStatus N(func_80240F84_843B54)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -244,81 +41,18 @@ ApiStatus N(func_80240F84_843B54)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028);
-/*
-void N(func_80241458_844028)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094);
-/*
-ApiStatus N(func_802414C4_844094)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0);
-/*
-ApiStatus N(func_80241720_8442F0)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_80246610_8491E0) = FALSE;
-    }
-
-    if (N(D_80246610_8491E0)) {
-        N(D_80246610_8491E0) = FALSE;
-        evt_set_variable(script, *args, N(D_80246614_8491E4));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344);
-/*
-ApiStatus N(func_80241774_844344)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_80246614_8491E4) = evt_get_variable(script, *args);
-    N(D_80246610_8491E0) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC_84437C);
-/*
-ApiStatus N(func_802417AC_84437C)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index 4a0a9f53c6..1fa9df2a92 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -36,320 +36,32 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC);
 #include "world/common/UnkFunc16.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241024_853194);
-/*
-ApiStatus N(func_80241024_853194)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++);
-    f32 posX, posY, posZ, posW;
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detect.x;
-    territory.pointZ = enemy->territory->patrol.detect.z;
-    territory.sizeX = enemy->territory->patrol.detectSizeX;
-    territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_18 = 65.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[0];
-        npc->flags &= ~0x800;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags = (npc->flags | 0x200) & ~8;
-        } else {
-            npc->flags = (npc->flags & ~0x200) | 8;
-        }
-
-        if (enemy->unk_B0 & 4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = 100.0f;
-
-        if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            npc->pos.y = posY;
-        }
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc24.inc.c"
-        case 1:
-            N(func_802405E8_852758)(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
-        case 3:
-            N(func_80240950_852AC0)(script, npcAISettings, territoryPtr);
-            break;
-        case 4:
-#include "world/common/UnkNpcAIFunc25.inc.c"
-            break;
-        case 10:
-            N(NpcJumpFunc2)(script, npcAISettings, territoryPtr);
-        case 11:
-            N(NpcJumpFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
-        case 13:
-            N(func_80240DDC_852F4C)(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 15:
-            N(func_80240F64_8530D4)(script, npcAISettings, territoryPtr);
-            break;
-        case 99:
-            func_8004A73C(script);
-    }
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490);
-/*
-ApiStatus N(func_80241320_853490)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_802450B0_857220) == NULL) {
-        N(D_802450B0_857220) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_802450B0_857220)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_802450B0_857220)[i];
-        }
-        heap_free(N(D_802450B0_857220));
-        N(D_802450B0_857220) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC);
-/*
-ApiStatus N(func_8024145C_8535CC)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A0C_853B7C);
-/*
-ApiStatus N(func_80241A0C_853B7C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A90_853C00);
-/*
-ApiStatus N(func_80241A90_853C00)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241CA8_853E18);
-/*
-ApiStatus N(func_80241CA8_853E18)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D5C_853ECC);
-/*
-ApiStatus N(func_80241D5C_853ECC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D90_853F00);
-/*
-ApiStatus N(func_80241D90_853F00)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E10_853F80);
-/*
-ApiStatus N(func_80241E10_853F80)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E28_853F98);
-/*
-ApiStatus N(func_80241E28_853F98)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4);
-/*
-ApiStatus N(func_80241E44_853FB4)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -364,126 +76,28 @@ ApiStatus N(func_80241E44_853FB4)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488);
-/*
-void N(func_80242318_854488)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4);
-/*
-ApiStatus N(func_80242384_8544F4)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750);
-/*
-ApiStatus N(func_802425E0_854750)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_802476D8_859848) = FALSE;
-    }
-
-    if (N(D_802476D8_859848)) {
-        N(D_802476D8_859848) = FALSE;
-        evt_set_variable(script, *args, N(D_802476DC_85984C));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4);
-/*
-ApiStatus N(func_80242634_8547A4)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_802476DC_85984C) = evt_get_variable(script, *args);
-    N(D_802476D8_859848) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC);
-/*
-ApiStatus N(func_8024266C_8547DC)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878);
-/*
-ApiStatus N(func_80242708_854878)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A20_854B90);
-/*
-ApiStatus N(func_80242A20_854B90)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A64_854BD4);
-/*
-ApiStatus N(func_80242A64_854BD4)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index e99670a07d..85ad2f15f6 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -46,233 +46,30 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4);
 #include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D68_9C6148);
-/*
-ApiStatus N(func_80240D68_9C6148)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80245F44_9CB324) == NULL) {
-        N(D_80245F44_9CB324) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80245F44_9CB324)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80245F44_9CB324)[i];
-        }
-        heap_free(N(D_80245F44_9CB324));
-        N(D_80245F44_9CB324) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284);
-/*
-ApiStatus N(func_80240EA4_9C6284)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241454_9C6834);
-/*
-ApiStatus N(func_80241454_9C6834)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802414D8_9C68B8);
-/*
-ApiStatus N(func_802414D8_9C68B8)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802416F0_9C6AD0);
-/*
-ApiStatus N(func_802416F0_9C6AD0)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417A4_9C6B84);
-/*
-ApiStatus N(func_802417A4_9C6B84)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417D8_9C6BB8);
-/*
-ApiStatus N(func_802417D8_9C6BB8)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241858_9C6C38);
-/*
-ApiStatus N(func_80241858_9C6C38)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241870_9C6C50);
-/*
-ApiStatus N(func_80241870_9C6C50)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C);
-/*
-ApiStatus N(func_8024188C_9C6C6C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -287,104 +84,26 @@ ApiStatus N(func_8024188C_9C6C6C)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140);
-/*
-void N(func_80241D60_9C7140)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC_9C71AC);
-/*
-ApiStatus N(func_80241DCC_9C71AC)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
-/*
-ApiStatus N(func_80242028_9C7408)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_8024856C_9CD94C) = FALSE;
-    }
-
-    if (N(D_8024856C_9CD94C)) {
-        N(D_8024856C_9CD94C) = FALSE;
-        evt_set_variable(script, *args, N(D_80248570_9CD950));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C);
-/*
-ApiStatus N(func_8024207C_9C745C)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_80248570_9CD950) = evt_get_variable(script, *args);
-    N(D_8024856C_9CD94C) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494);
-/*
-ApiStatus N(func_802420B4_9C7494)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802423CC_9C77AC);
-/*
-ApiStatus N(func_802423CC_9C77AC)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242410_9C77F0);
-/*
-ApiStatus N(func_80242410_9C77F0)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C_9C781C);
 
@@ -409,11 +128,3 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428B8_9C7C98);
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428D8_9C7CB8);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242910_9C7CF0);
-/*
-ApiStatus N(func_80242910_9C7CF0)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-
-    playerData->unk_328 = playerData->frameCounter;
-    return ApiStatus_DONE2;
-}
-*/
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 5c33bba7ac..10164e6936 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -25,323 +25,35 @@
 #include "world/common/UnkFunc16.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241614_9D8634);
-/*
-ApiStatus N(func_80241614_9D8634)(Evt* script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyTerritoryThing territory;
-    EnemyTerritoryThing* territoryPtr = &territory;
-    NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++);
-    f32 posX, posY, posZ, posW;
-
-    territory.unk_00 = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detect.x;
-    territory.pointZ = enemy->territory->patrol.detect.z;
-    territory.sizeX = enemy->territory->patrol.detectSizeX;
-    territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_18 = 65.0f;
-    territory.unk_1C = 0;
-
-    if (isInitialCall || enemy->unk_B0 & 4) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[0];
-        npc->flags &= ~0x800;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags = (npc->flags | 0x200) & ~8;
-        } else {
-            npc->flags = (npc->flags & ~0x200) | 8;
-        }
-
-        if (enemy->unk_B0 & 4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
-            script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = 100.0f;
-
-        if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            npc->pos.y = posY;
-        }
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-#include "world/common/UnkNpcAIFunc24.inc.c"
-        case 1:
-            N(func_80240BD8_9D7BF8)(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
-        case 3:
-            N(func_80240F40_9D7F60)(script, npcAISettings, territoryPtr);
-            break;
-        case 4:
-#include "world/common/UnkNpcAIFunc25.inc.c"
-            break;
-        case 10:
-            N(NpcJumpFunc2)(script, npcAISettings, territoryPtr);
-        case 11:
-            N(NpcJumpFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
-        case 13:
-            N(func_802413CC_9D83EC)(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
-            break;
-        case 15:
-            N(func_80241554_9D8574)(script, npcAISettings, territoryPtr);
-            break;
-        case 99:
-            func_8004A73C(script);
-    }
-    return ApiStatus_BLOCK;
-}
-*/
 
 static char* N(exit_str_0) = "nok_02";
 static char* N(exit_str_1) = "obk_09";
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930);
-/*
-ApiStatus N(func_80241910_9D8930)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_802470C8_9DE0E8) == NULL) {
-        N(D_802470C8_9DE0E8) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_802470C8_9DE0E8)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_802470C8_9DE0E8)[i];
-        }
-        heap_free(N(D_802470C8_9DE0E8));
-        N(D_802470C8_9DE0E8) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C);
-/*
-ApiStatus N(func_80241A4C_9D8A6C)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241FFC_9D901C);
-/*
-ApiStatus N(func_80241FFC_9D901C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242080_9D90A0);
-/*
-ApiStatus N(func_80242080_9D90A0)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242298_9D92B8);
-/*
-ApiStatus N(func_80242298_9D92B8)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024234C_9D936C);
-/*
-ApiStatus N(func_8024234C_9D936C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242380_9D93A0);
-/*
-ApiStatus N(func_80242380_9D93A0)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242400_9D9420);
-/*
-ApiStatus N(func_80242400_9D9420)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242418_9D9438);
-/*
-ApiStatus N(func_80242418_9D9438)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454);
-/*
-ApiStatus N(func_80242434_9D9454)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -356,104 +68,26 @@ ApiStatus N(func_80242434_9D9454)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928);
-/*
-void N(func_80242908_9D9928)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974_9D9994);
-/*
-ApiStatus N(func_80242974_9D9994)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
-/*
-ApiStatus N(func_80242BD0_9D9BF0)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_802496F0_9E0710) = FALSE;
-    }
-
-    if (N(D_802496F0_9E0710)) {
-        N(D_802496F0_9E0710) = FALSE;
-        evt_set_variable(script, *args, N(D_802496F4_9E0714));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44);
-/*
-ApiStatus N(func_80242C24_9D9C44)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_802496F4_9E0714) = evt_get_variable(script, *args);
-    N(D_802496F0_9E0710) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C);
-/*
-ApiStatus N(func_80242C5C_9D9C7C)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242F74_9D9F94);
-/*
-ApiStatus N(func_80242F74_9D9F94)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FB8_9D9FD8);
-/*
-ApiStatus N(func_80242FB8_9D9FD8)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SwitchToPartner.inc.c"
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 607f9dd788..a1d249840c 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -7,307 +7,38 @@
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC);
-/*
-ApiStatus N(func_8024053C_CF80AC)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        N(D_802432D0_CFAE40) = FALSE;
-    }
-
-    if (N(D_802432D0_CFAE40)) {
-        N(D_802432D0_CFAE40) = FALSE;
-        evt_set_variable(script, *args, N(D_802432D4_CFAE44));
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100);
-/*
-ApiStatus N(func_80240590_CF8100)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(D_802432D4_CFAE44) = evt_get_variable(script, *args);
-    N(D_802432D0_CFAE40) = TRUE;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138);
-/*
-ApiStatus N(func_802405C8_CF8138)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4);
-/*
-ApiStatus N(func_80240664_CF81D4)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = evt_get_variable(script, *args);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            N(D_80244A20)[i] = ptr[i];
-        }
-        N(D_80244A20)[i] = 0;
-    } else {
-        for (i = 0; i < 0x70; i++) {
-            N(D_80244A20)[i] = i + 16;
-            N(D_80244A20)[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270);
-/*
-ApiStatus N(func_80240700_CF8270)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_802435F0_CFB160) == NULL) {
-        N(D_802435F0_CFB160) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_802435F0_CFB160)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_802435F0_CFB160)[i];
-        }
-        heap_free(N(D_802435F0_CFB160));
-        N(D_802435F0_CFB160) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC);
-/*
-ApiStatus N(func_8024083C_CF83AC)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240DEC_CF895C);
-/*
-ApiStatus N(func_80240DEC_CF895C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240E70_CF89E0);
-/*
-ApiStatus N(func_80240E70_CF89E0)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241088_CF8BF8);
-/*
-ApiStatus N(func_80241088_CF8BF8)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024113C_CF8CAC);
-/*
-ApiStatus N(func_8024113C_CF8CAC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241170_CF8CE0);
-/*
-ApiStatus N(func_80241170_CF8CE0)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802411F0_CF8D60);
-/*
-ApiStatus N(func_802411F0_CF8D60)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241208_CF8D78);
-/*
-ApiStatus N(func_80241208_CF8D78)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94);
-/*
-ApiStatus N(func_80241224_CF8D94)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -322,73 +53,22 @@ ApiStatus N(func_80241224_CF8D94)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268);
-/*
-void N(func_802416F8_CF9268)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241764_CF92D4);
-/*
-ApiStatus N(func_80241764_CF92D4)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A10_CF9580);
-/*
-ApiStatus N(func_80241A10_CF9580)(Evt *script, s32 isInitialCall) {
-    Npc *npc = get_npc_unsafe(script->varTable[2]);
-
-    D_8024E1B4 = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54_CF95C4);
-/*
-ApiStatus N(func_80241A54_CF95C4)(Evt *script, s32 isInitialCall) {
-    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "common/GetItemEntityPosition.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800);
-/*
-ApiStatus N(func_80241C90_CF9800)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_8024D8F0_D05460) == NULL) {
-        N(D_8024D8F0_D05460) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_8024D8F0_D05460)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_8024D8F0_D05460)[i];
-        }
-        heap_free(N(D_8024D8F0_D05460));
-        N(D_8024D8F0_D05460) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #define NAMESPACE dup_sam_01
 #include "world/common/GetItemName.inc.c"
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index ab3b111edc..51517c0cbd 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -23,233 +23,30 @@
 #include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C);
-/*
-ApiStatus N(func_80240B2C_D0625C)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80246B60_D0C290) == NULL) {
-        N(D_80246B60_D0C290) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80246B60_D0C290)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80246B60_D0C290)[i];
-        }
-        heap_free(N(D_80246B60_D0C290));
-        N(D_80246B60_D0C290) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398);
-/*
-ApiStatus N(func_80240C68_D06398)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", begin_battle_D06948);
-/*
-ApiStatus N(begin_battle_D06948)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024129C_D069CC);
-/*
-ApiStatus N(func_8024129C_D069CC)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802414B4_D06BE4);
-/*
-ApiStatus N(func_802414B4_D06BE4)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241568_D06C98);
-/*
-ApiStatus N(func_80241568_D06C98)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024159C_D06CCC);
-/*
-ApiStatus N(func_8024159C_D06CCC)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024161C_D06D4C);
-/*
-ApiStatus N(func_8024161C_D06D4C)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241634_D06D64);
-/*
-ApiStatus N(func_80241634_D06D64)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80);
-/*
-ApiStatus N(func_80241650_D06D80)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -264,22 +61,5 @@ ApiStatus N(func_80241650_D06D80)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254);
-/*
-void N(func_80241B24_D07254)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B90_D072C0);
-/*
-ApiStatus N(func_80241B90_D072C0)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 5553ea61de..c4f3602884 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -3,25 +3,6 @@
 #define UNK_ALPHA_FUNC_NPC 17
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0);
-/*
-ApiStatus N(func_802407D0_D3ADA0)(Evt* script, s32 isInitialCall) {
-    s32 i;
-
-    if (N(D_80244F78_D3F548) == NULL) {
-        N(D_80244F78_D3F548) = heap_malloc(16 * sizeof(s32));
-        for (i = 0; i < 16; i++) {
-            N(D_80244F78_D3F548)[i] = script->varTable[i];
-        }
-    } else {
-        for (i = 0; i < 16; i++) {
-            script->varTable[i] = N(D_80244F78_D3F548)[i];
-        }
-        heap_free(N(D_80244F78_D3F548));
-        N(D_80244F78_D3F548) = NULL;
-    }
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetItemName.inc.c"
 
@@ -29,209 +10,25 @@ ApiStatus N(func_802407D0_D3ADA0)(Evt* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 #define NAMESPACE sam_11
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC);
-/*
-ApiStatus N(func_8024090C_D3AEDC)(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemyID;
-    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
-    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
-    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
-    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
-    s32 var;
-    s32 i;
-
-    s32 test2;
-    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
-    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
-    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
-    s32 temp_v0;
-    s32 temp_s0_2;
-
-    if (temp_s3 != temp_s6) {
-        phi_s7 = 0;
-        phi_s0 = 0;
-    }
-
-    if (phi_s0 == 0) {
-        if (rand_int(100) < 30) {
-            phi_s5 = rand_int(temp_s2 - 1);
-            temp_s6 = temp_s3;
-            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
-            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
-            phi_s0 = 1;
-        }
-    }
-
-    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
-    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
-    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
-    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
-
-    for (i = 0; i < 8; i++) {
-        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
-            break;
-        }
-    }
-
-    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
-    test2 = var = temp_v0;
-
-    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
-        script->varTable[0] = 1;
-    } else {
-        kill_enemy(enemy);
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkQuizFunc.inc.c"
 
 #include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240EBC_D3B48C);
-/*
-ApiStatus N(func_80240EBC_D3B48C)(Evt *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
-
-    if (quizzesAnswered < 0x3E7) {
-        playerData->quizzesAnswered++;
-    }
-
-    if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) {
-        script->varTable[0] = 1;
-        playerData->quizzesCorrect++;
-    } else {
-        script->varTable[0] = 0;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240F40_D3B510);
-/*
-ApiStatus N(func_80240F40_D3B510)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        Effect** effect = &D_8024DFE0;
-
-        *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)));
-        D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
-
-        effectPtr = (*effect)->unk_0C;
-        effectPtr->unk_18 = 0;
-        effectPtr->unk_20 = 0;
-        effectPtr->unk_24.s = 0;
-        effectPtr->unk_28 = 0;
-        effectPtr->unk_1C = 0;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-
-    effectPtr->unk_20 += 10;
-    effectPtr->unk_28 += 10;
-    effectPtr->unk_24.s += 10;
-    effectPtr->unk_18 += 10;
-    effectPtr->unk_1C += 10;
-    if (effectPtr->unk_18 >= 255) {
-        effectPtr->unk_18 = 255;
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241158_D3B728);
-/*
-ApiStatus N(func_80241158_D3B728)(Evt *script, s32 isInitialCall) {
-    EffectInstanceDataThing* effectPtr;
-
-    if (isInitialCall) {
-        D_8024DFE4->flags |= 0x10;
-        D_8024DFE8->flags |= 0x10;
-    }
-
-    effectPtr = D_8024DFE0->unk_0C;
-    effectPtr->unk_18 -= 10;
-    effectPtr->unk_20 -= 10;
-    effectPtr->unk_24.s -= 10;
-    effectPtr->unk_28 -= 10;
-    effectPtr->unk_1C -= 10;
-
-    if (effectPtr->unk_18 <= 0) {
-        effectPtr->unk_18 = 0;
-        remove_effect(D_8024DFE0, effectPtr);
-        free_generic_entity(D_8024DFC0);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024120C_D3B7DC);
-/*
-ApiStatus N(func_8024120C_D3B7DC)(Evt *script, s32 isInitialCall) {
-    D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos);
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241240_D3B810);
-/*
-ApiStatus N(func_80241240_D3B810)(Evt *script, s32 isInitialCall) {
-    s32 var = evt_get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
-
-    switch (var) {
-        case 0:
-            effectPtr->unk_38 = 0xC0;
-            break;
-        case 1:
-            effectPtr->unk_38 = 0x80;
-            break;
-        case 2:
-            effectPtr->unk_38 = 0x40;
-            break;
-        default:
-            effectPtr->unk_38 = 0;
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412C0_D3B890);
-/*
-ApiStatus N(func_802412C0_D3B890)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 0;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412D8_D3B8A8);
-/*
-ApiStatus N(func_802412D8_D3B8A8)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 1;
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4);
-/*
-ApiStatus N(func_802412F4_D3B8C4)(Evt *script, s32 isInitialCall) {
-    D_8024DFE8->unk_0C->unk_1C = 2;
-    return ApiStatus_DONE2;
-}
-*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -246,25 +43,8 @@ ApiStatus N(func_802412F4_D3B8C4)(Evt *script, s32 isInitialCall) {
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98);
-/*
-void N(func_802417C8_D3BD98)(void) {
-    s32 var = evt_get_variable(NULL, D_8024DFD8);
-
-    if (var == 1) {
-        playFX_50(0, 0, 0, 0);
-    } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
-    }
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241834_D3BE04);
-/*
-ApiStatus N(func_80241834_D3BE04)(Evt *script, s32 isInitialCall) {
-    D_8024DFC0 = create_generic_entity_frontUI(NULL, N(func_80242468_95D668));
-    return ApiStatus_DONE2;
-}
-*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241864_D3BE34);
 
diff --git a/src/world/common/UnkNpcAIFunc15.inc.c b/src/world/common/UnkNpcAIFunc15.inc.c
index e27f8acc9f..310ad905c6 100644
--- a/src/world/common/UnkNpcAIFunc15.inc.c
+++ b/src/world/common/UnkNpcAIFunc15.inc.c
@@ -1,11 +1,11 @@
 #include "common.h"
 #include "map.h"
 
-void N(UnkNpcAIFunc15)(Evt* script, NpcAISettings* aiSettings, s32 arg2) {
+void N(UnkNpcAIFunc15)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Npc* enemy = get_npc_unsafe(script->owner1.enemy->npcID);
 
-    func_80049F7C(script, aiSettings, arg2);
-    enemy->flags = enemy->flags | 0x800;
+    func_80049F7C(script, aiSettings, territory);
+    enemy->flags |= 0x800;
     enemy->jumpVelocity = rand_int(5) + 10.0;
     enemy->jumpScale = 1.5f;
     enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
diff --git a/src/world/common/UnkQuizFunc.inc.c b/src/world/common/UnkQuizFunc.inc.c
new file mode 100644
index 0000000000..a6f70a0196
--- /dev/null
+++ b/src/world/common/UnkQuizFunc.inc.c
@@ -0,0 +1,61 @@
+#include "common.h"
+#include "map.h"
+
+extern QuizRequirements N(quizRequirements)[];
+
+ApiStatus N(UnkQuizFunc)(Evt* script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768));
+    u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769));
+    u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350));
+    u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351));
+    s32 var;
+    s32 i;
+
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
+
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
+
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6);
+            evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
+
+    evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0);
+    evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352));
+    temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS);
+
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->debugQuizmo != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
diff --git a/tools/bootstrap_effects.py b/tools/bootstrap_effects.py
new file mode 100755
index 0000000000..c5eeb2a0d0
--- /dev/null
+++ b/tools/bootstrap_effects.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python3
+
+import os
+import re
+from pathlib import Path
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = script_dir + "/../"
+asm_dir = root_dir + "ver/current/asm/"
+asm_effects_dir = asm_dir + "nonmatchings/effects/"
+
+renames = []
+
+# Walk through asm files and rename stuff
+print("Walking through asm files")
+for root, dirs, files in os.walk(asm_effects_dir):
+    for f_name in files:
+        if f_name.endswith("_render.s"):
+            f_path = os.path.join(root, f_name)
+
+            effect_num = f_name.split("_")[1]
+
+            with open(f_path) as f:
+                asm_text = f.read()
+
+            funcs = []
+            for m in re.finditer(r"func_[0-9A-F]{8}", asm_text):
+                func_name = m.group(0)
+                if func_name not in funcs:
+                    funcs.append(func_name)
+                if len(funcs) == 1:
+                    break
+
+            if len(funcs) != 1:
+                print("Error: Couldn't find all functions in effect " + effect_num)
+                continue
+
+            renames.append(f"{funcs[0]} fx_{effect_num}_appendGfx\n")
+
+with open("tools/to_rename.txt", "w", newline="\n") as f:
+    f.writelines(renames)
diff --git a/tools/build/cc/kmcgcc/.gitignore b/tools/build/cc/kmcgcc/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/tools/build/cc/kmcgcc/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tools/build/configure.py b/tools/build/configure.py
index 3533e18dd1..6e0e73578b 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -31,7 +31,8 @@ def exec_shell(command: List[str]) -> str:
     ret = subprocess.run(command, stdout=subprocess.PIPE, text=True)
     return ret.stdout
 
-def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra_cflags: str, use_ccache: bool):
+def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra_cflags: str, use_ccache: bool,
+                      non_matching: bool):
     # platform-specific
     if sys.platform  == "darwin":
         iconv = "tools/iconv.py UTF-8 SHIFT-JIS"
@@ -52,15 +53,23 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra
     cross = "mips-linux-gnu-"
     cc = f"{BUILD_TOOLS}/cc/gcc/gcc"
     cc_ido = f"{BUILD_TOOLS}/cc/ido5.3/cc"
+    cc_kmc = f"{BUILD_TOOLS}/cc/kmcgcc/gcc"
     cxx = f"{BUILD_TOOLS}/cc/gcc/g++"
     compile_script = f"$python {BUILD_TOOLS}/cc_dsl/compile_script.py"
 
-    CPPFLAGS_COMMON = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM " \
+    CPPFLAGS_COMMON = "-Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM " \
                "-DVERSION=$version -DF3DEX_GBI_2 -D_MIPS_SZLONG=32"
 
-    CPPFLAGS = CPPFLAGS_COMMON + " -nostdinc"
+    CPPFLAGS = "-w " + CPPFLAGS_COMMON + " -nostdinc"
+
+    if sys.platform == "darwin" and not non_matching:
+        CPPFLAGS += " -DKMC_ASM"
+
+    CPPFLAGS_LIBULTRA = "-Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM " \
+               "-DVERSION=$version -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -nostdinc"
 
     cflags = f"-c -G0 -O2 -fno-common -B {BUILD_TOOLS}/cc/gcc/ {extra_cflags}"
+    kmc_cflags = f"-c -G0 -mgp32 -mfp32 -mips3 {extra_cflags}"
 
     ninja.variable("python", sys.executable)
 
@@ -100,7 +109,12 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra
 
     ninja.rule("cc_ido",
         description="cc_ido $in",
-        command=f"{ccache}{cc_ido} {CPPFLAGS_COMMON} {cppflags} -c -mips1 -O0 -G0 -non_shared -Xfullwarn -Xcpluscomm -o $out $in",
+        command=f"{ccache}{cc_ido} -w {CPPFLAGS_COMMON} {cppflags} -c -mips1 -O0 -G0 -non_shared -Xfullwarn -Xcpluscomm -o $out $in",
+    )
+
+    ninja.rule("cc_kmc",
+        description="cc_kmc $in",
+        command=f"bash -o pipefail -c 'N64ALIGN=ON VR4300MUL=ON {cc_kmc} {CPPFLAGS_LIBULTRA} {cppflags} {kmc_cflags} $cflags $in -o $out && mips-linux-gnu-objcopy -N $in $out'",
     )
 
     ninja.rule("cxx",
@@ -282,7 +296,7 @@ class Configure:
         # ¯\_(ツ)_/¯
         return path
 
-    def write_ninja(self, ninja: ninja_syntax.Writer, skip_outputs: Set[str]):
+    def write_ninja(self, ninja: ninja_syntax.Writer, skip_outputs: Set[str], non_matching: bool):
         import segtypes
         import segtypes.common.data
         import segtypes.n64.Yay0
@@ -317,7 +331,7 @@ class Configure:
 
                 if task == "yay0":
                     implicit.append(YAY0_COMPRESS_TOOL)
-                elif task in ["cc", "cc_dsl", "cc_ido", "cxx"]:
+                elif task in ["cc", "cc_dsl", "cxx"]:
                     order_only.append("generated_headers_" + self.version)
 
                 ninja.build(
@@ -361,8 +375,13 @@ class Configure:
                     s = f.read()
                     if "SCRIPT(" in s or "#pragma SCRIPT" in s or "#include \"world/common/foliage.inc.c\"" in s:
                         task = "cc_dsl"
+
                 if seg.name.endswith("osFlash"):
                     task = "cc_ido"
+                elif "kmc" in cflags and (sys.platform != "darwin" or non_matching):
+                    task = "cc_kmc"
+
+                cflags = cflags.replace("kmc", "")
 
                 build(entry.object_path, entry.src_paths, task, variables={"cflags": cflags})
 
@@ -719,7 +738,7 @@ if __name__ == "__main__":
 
     ninja = ninja_syntax.Writer(open(str(ROOT / "build.ninja"), "w"), width=9999)
 
-    write_ninja_rules(ninja, args.cpp or "cpp", cppflags, cflags, args.ccache)
+    write_ninja_rules(ninja, args.cpp or "cpp", cppflags, cflags, args.ccache, args.non_matching)
     write_ninja_for_tools(ninja)
 
     skip_files = set()
@@ -735,7 +754,7 @@ if __name__ == "__main__":
             first_configure = configure
 
         configure.split(not args.no_split_assets, args.split_code)
-        configure.write_ninja(ninja, skip_files)
+        configure.write_ninja(ninja, skip_files, args.non_matching)
 
         all_rom_oks.append(str(configure.rom_ok_path()))
 
diff --git a/tools/m2ctx.py b/tools/m2ctx.py
index e891545318..e540460936 100755
--- a/tools/m2ctx.py
+++ b/tools/m2ctx.py
@@ -1,5 +1,6 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
+import argparse
 import os
 import sys
 import subprocess
@@ -9,27 +10,29 @@ script_dir = os.path.dirname(os.path.realpath(__file__))
 root_dir = os.path.abspath(os.path.join(script_dir, ".."))
 src_dir = root_dir + "src/"
 
+# Project-specific
+CPP_FLAGS = [
+    "-Iinclude",
+    "-Isrc",
+    "-Iver/current/build/include",
+    "-D_LANGUAGE_C",
+    "-DF3DEX_GBI_2",
+    "-D_MIPS_SZLONG=32",
+    "-DSCRIPT(...)={}"
+    "-D__attribute__(...)=",
+    "-D__asm__(...)=",
+    "-ffreestanding",
+]
 
-def get_c_dir(dirname):
-    for root, dirs, files in os.walk(src_dir):
-        for directory in dirs:
-            if directory == dirname:
-                return os.path.join(root, directory)
-
-
-def get_c_file(directory):
-    for root, dirs, files in os.walk(directory):
-        for file in files:
-            if file.endswith(".c") and "data" not in file:
-                return file
-
-
-def import_c_file(in_file):
+def import_c_file(in_file) -> str:
     in_file = os.path.relpath(in_file, root_dir)
-    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-Iver/current/build/include" ,"-D_LANGUAGE_C",
-                   "-ffreestanding", "-DF3DEX_GBI_2", "-D_MIPS_SZLONG=32", "-DSCRIPT(...)={}", in_file]
+    cpp_command = ["gcc", "-E", "-P", "-dM", *CPP_FLAGS, in_file]
+    cpp_command2 = ["gcc", "-E", "-P", *CPP_FLAGS, in_file]
+
+    out_text = ""
     try:
-        return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
+        out_text += subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
+        out_text += subprocess.check_output(cpp_command2, cwd=root_dir, encoding="utf-8")
     except subprocess.CalledProcessError:
         print(
             "Failed to preprocess input file, when running command:\n"
@@ -38,33 +41,25 @@ def import_c_file(in_file):
             )
         sys.exit(1)
 
+    if not out_text:
+        print("Output is empty - aborting")
+        sys.exit(1)
+    return out_text
 
 def main():
-    if len(sys.argv) > 1:
-        arg = sys.argv[1]
-        if arg == "-h" or arg == "--help":
-            sys.exit("Usage: ./m2ctx.py path/to/file.c\n" \
-            "Output will be saved in the project root as ctx.c")
-        c_file_path = Path.cwd() / sys.argv[1]
-    else:
-        this_dir = Path.cwd()
-        c_dir_path = get_c_dir(this_dir.name)
-        if c_dir_path is None:
-            sys.exit("Cannot find appropriate c file dir. In argumentless mode, run this script from the c file's corresponding asm dir.")
-        c_file = get_c_file(c_dir_path)
-        c_file_path = os.path.join(c_dir_path, c_file)
+    parser = argparse.ArgumentParser(
+        description="""Create a context file which can be used for mips_to_c"""
+    )
+    parser.add_argument(
+        "c_file",
+        help="""File from which to create context""",
+    )
+    args = parser.parse_args()
 
-    processed = import_c_file(c_file_path)
-    processed_lines = processed.split("\n")
-    output = []
-
-    for line in processed_lines:
-        if ("__attribute__" not in line
-            and "__asm" not in line):
-            output.append(line)
+    output = import_c_file(args.c_file)
 
     with open(os.path.join(root_dir, "ctx.c"), "w", encoding="UTF-8") as f:
-        f.write("\n".join(output))
+        f.write(output)
 
 
 if __name__ == "__main__":
diff --git a/tools/rename.py b/tools/rename.py
index 4cd30d5c98..f2048b0840 100755
--- a/tools/rename.py
+++ b/tools/rename.py
@@ -25,9 +25,8 @@ def handle_file(f_path, try_rename_file=False):
     for rename in renames:
         f_text = re.sub(r"(?:\b)" + rename + r"(?:\b)", renames[rename], f_text)
 
-    if f_text != f_text_orig:
-        with open(f_path, "w", newline="\n") as f:
-            f.write(f_text)
+    with open(f_path, "w", newline="\n") as f:
+        f.write(f_text)
 
 
 # Read Star Rod's output file
@@ -48,7 +47,7 @@ for root, dirs, files in os.walk(asm_dir):
 
             handle_file(f_path, True)
 
-# Delete old names of renamed asm files
+# Delete old versions of newly saved asm files
 print("Deleting old asm files")
 for d in deletes:
     os.remove(d)
diff --git a/tools/to_rename.txt b/tools/to_rename.txt
index a8b74ca5db..dcbdb18081 100644
--- a/tools/to_rename.txt
+++ b/tools/to_rename.txt
@@ -1,2 +1,109 @@
-get_hud_element_script get_hud_element_anim
-set_hud_element_script set_hud_element_anim
+func_E00E495C fx_114_appendGfx
+func_E006C5E8 fx_54_appendGfx
+func_E0050308 fx_40_appendGfx
+func_E0034310 fx_26_appendGfx
+func_E011C1C4 fx_128_appendGfx
+func_E007685C fx_59_appendGfx
+func_E011849C fx_126_appendGfx
+func_E00D048C fx_104_appendGfx
+func_E00624EC fx_49_appendGfx
+func_E0066770 fx_51_appendGfx
+func_E0038748 fx_28_appendGfx
+func_E01264EC fx_133_appendGfx
+func_E00E2218 fx_113_appendGfx
+func_E00C8454 fx_100_appendGfx
+func_E005C2F8 fx_46_appendGfx
+func_E007E54C fx_63_appendGfx
+func_E0048218 fx_36_appendGfx
+func_E002C414 fx_22_appendGfx
+func_E00E6524 fx_115_appendGfx
+func_E00745E0 fx_58_appendGfx
+func_E004491C fx_34_appendGfx
+func_E002E368 fx_23_appendGfx
+func_E00423B8 fx_33_appendGfx
+func_E00942FC fx_74_appendGfx
+func_E00462C0 fx_35_appendGfx
+func_E006A94C fx_53_appendGfx
+func_E0060450 fx_48_appendGfx
+func_E00264F4 fx_19_appendGfx
+func_E008A728 fx_69_appendGfx
+func_E001A440 fx_13_appendGfx
+func_E01124CC fx_123_appendGfx
+func_E00BA620 fx_93_appendGfx
+func_E008E4E0 fx_71_appendGfx
+func_E007C1F4 fx_62_appendGfx
+func_E001C30C fx_14_appendGfx
+func_E00C67B0 fx_99_appendGfx
+func_E00D6980 fx_107_appendGfx
+func_E00AE54C fx_87_appendGfx
+func_E0036224 fx_27_appendGfx
+func_E0016454 fx_11_appendGfx
+func_E009C220 fx_78_appendGfx
+func_E00A63A4 fx_83_appendGfx
+func_E005A3F4 fx_45_appendGfx
+func_E011E578 fx_129_appendGfx
+func_E00DE2A8 fx_111_appendGfx
+func_E00B62E0 fx_91_appendGfx
+func_E0116884 fx_125_appendGfx
+func_E00BC374 fx_94_appendGfx
+func_E003245C fx_25_appendGfx
+func_E009E424 fx_79_appendGfx
+func_E0064414 fx_50_appendGfx
+func_E002852C fx_20_appendGfx
+func_E010C39C fx_120_appendGfx
+func_E00723D4 fx_57_appendGfx
+func_E00CC9D0 fx_102_appendGfx
+func_E00B457C fx_90_appendGfx
+func_E0056BD0 fx_43_appendGfx
+func_E00144E0 fx_10_appendGfx
+func_E007827C fx_60_appendGfx
+func_E0114388 fx_124_appendGfx
+func_E009A3E0 fx_77_appendGfx
+func_E002A3C4 fx_21_appendGfx
+func_E00205D0 fx_16_appendGfx
+func_E00DC304 fx_110_appendGfx
+func_E00CA4CC fx_101_appendGfx
+func_E0022998 fx_17_appendGfx
+func_E012270C fx_131_appendGfx
+func_E00E83BC fx_116_appendGfx
+func_E0040348 fx_32_appendGfx
+func_E00AA404 fx_85_appendGfx
+func_E0052460 fx_41_appendGfx
+func_E0030A68 fx_24_appendGfx
+func_E001E730 fx_15_appendGfx
+func_E010E558 fx_121_appendGfx
+func_E00BE5BC fx_95_appendGfx
+func_E00EA66C fx_117_appendGfx
+func_E003E638 fx_31_appendGfx
+func_E0070740 fx_56_appendGfx
+func_E00A8320 fx_84_appendGfx
+func_E00A223C fx_81_appendGfx
+func_E00B24B0 fx_89_appendGfx
+func_E00584D4 fx_44_appendGfx
+func_E004C3A8 fx_38_appendGfx
+func_E00A4650 fx_82_appendGfx
+func_E010A4E8 fx_119_appendGfx
+func_E00887E0 fx_68_appendGfx
+func_E004E214 fx_39_appendGfx
+func_E004A78C fx_37_appendGfx
+func_E007A88C fx_61_appendGfx
+func_E003A354 fx_29_appendGfx
+func_E00CE478 fx_103_appendGfx
+func_E01103EC fx_122_appendGfx
+func_E0024454 fx_18_appendGfx
+func_E0068234 fx_52_appendGfx
+func_E00183D8 fx_12_appendGfx
+func_E00E0600 fx_112_appendGfx
+func_E008C6FC fx_70_appendGfx
+func_E01281E0 fx_134_appendGfx
+func_E01203E4 fx_130_appendGfx
+func_E01244C4 fx_132_appendGfx
+func_E00C4308 fx_98_appendGfx
+func_E00B8208 fx_92_appendGfx
+func_E00D2284 fx_105_appendGfx
+func_E00C0760 fx_96_appendGfx
+func_E00982EC fx_76_appendGfx
+func_E00B0234 fx_88_appendGfx
+func_E00DA230 fx_109_appendGfx
+func_E00C221C fx_97_appendGfx
+func_E006E764 fx_55_appendGfx
diff --git a/ver/us/asm/data/32CEB0.data.s b/ver/us/asm/data/32CEB0.data.s
deleted file mode 100644
index d4e0a723fa..0000000000
--- a/ver/us/asm/data/32CEB0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_E0010710
-.double 0.85, 0.0
diff --git a/ver/us/asm/data/effects/32C770.data.s b/ver/us/asm/data/effects/32C770.data.s
deleted file mode 100644
index 8d0ae3c92f..0000000000
--- a/ver/us/asm/data/effects/32C770.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_E000E660
-.word 0x00010202, 0x03030404, 0x05050506, 0x0606FF00
-
-glabel D_E000E670
-.word 0x00010202, 0x03030404, 0x05050606, 0x06070707, 0xFF000000
-
-glabel D_E000E684
-.word D_E000E660, D_E000E670, 0x00000000
diff --git a/ver/us/asm/data/effects/32CEB0.data.s b/ver/us/asm/data/effects/32CEB0.data.s
deleted file mode 100644
index d4e0a723fa..0000000000
--- a/ver/us/asm/data/effects/32CEB0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_E0010710
-.double 0.85, 0.0
diff --git a/ver/us/asm/data/effects/3923C0.data.s b/ver/us/asm/data/effects/3923C0.data.s
deleted file mode 100644
index 6915338a26..0000000000
--- a/ver/us/asm/data/effects/3923C0.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_E0092690
-.word 0x09000430, 0x090003F0, 0x090003B0, 0x09000370, 0x09000330
-
-glabel D_E00926A4
-.word 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000002, 0x00000004, 0xFFFFFFFE, 0x00000000, 0x00000064, 0x00000003, 0xFFFFFFFE, 0x00000002, 0x00000000, 0x00000046, 0x00000004, 0x00000002, 0x00000004, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000000
-
-glabel D_E0092700
-.double 0.01, 0.0
diff --git a/ver/us/asm/data/effects/394660.data.s b/ver/us/asm/data/effects/394660.data.s
deleted file mode 100644
index bf5650e4bf..0000000000
--- a/ver/us/asm/data/effects/394660.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_E00963E0
-.word 0x09001280, 0x09001358, 0x09001430, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
index b0efbcdc03..578b13cbae 100644
--- a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
@@ -8,7 +8,7 @@ glabel D_80248020_A23120
 glabel D_80248080_A23180
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_802480C0_A231C0
+glabel hos_03_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80248110_A23210
@@ -54,7 +54,7 @@ glabel D_8024975C_A2485C
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, hos_03_Set80151310_1, 0x00000043, 0x00000001, hos_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802481C0_A232C0, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802488E8_A239E8, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242C14_A1DD14, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_8024895C_A23A5C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80243508_A1E608, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242B90_A1DC90, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242FAC_A1E0AC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802495FC_A246FC, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802496AC_A247AC, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242FC8_A1E0C8, 0x00000043, 0x00000001, func_80242E2C_A1DF2C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000044, 0x00000001, D_80248458_A23558, 0x00000043, 0x00000001, hos_03_UnkFunc29, 0x00000043, 0x00000001, hos_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A48C_A2558C
-.word 0x00000043, 0x00000001, func_802425E0_A1D6E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, hos_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, hos_03_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, hos_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A500_A25600
 .word 0x0000003C, 0x00000001, 0x8024BDD8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_8024975C_A2485C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
index d02b0bde95..f23ae6d6c6 100644
--- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
@@ -32,7 +32,7 @@ glabel D_802431E8_B2F658
 glabel D_80243248_B2F6B8
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80243288_B2F6F8
+glabel jan_02_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_802432D8_B2F748
@@ -78,7 +78,7 @@ glabel D_80244924_B30D94
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_02_Set80151310_1, 0x00000043, 0x00000001, jan_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80243388_B2F7F8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243AB0_B2FF20, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241D84_B2E1F4, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243B24_B2FF94, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242678_B2EAE8, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241D00_B2E170, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_8024211C_B2E58C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802447C4_B30C34, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244874_B30CE4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242138_B2E5A8, 0x00000043, 0x00000001, func_80241F9C_B2E40C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000044, 0x00000001, D_80243620_B2FA90, 0x00000043, 0x00000001, jan_02_UnkFunc29, 0x00000043, 0x00000001, jan_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245654_B31AC4
-.word 0x00000043, 0x00000001, func_80241750_B2DBC0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, jan_02_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802456C8_B31B38
 .word 0x0000003C, 0x00000001, 0x80248928, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80244924_B30D94, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
index 69354a2df3..d9e641d14f 100644
--- a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
@@ -149,7 +149,7 @@ glabel D_80247768_B3C338
 glabel D_802477C8_B3C398
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80247808_B3C3D8
+glabel jan_03_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80247858_B3C428
@@ -195,7 +195,7 @@ glabel D_80248EA4_B3DA74
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_03_Set80151310_1, 0x00000043, 0x00000001, jan_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_80247908_B3C4D8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80248030_B3CC00, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024230C_B36EDC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802480A4_B3CC74, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242C00_B377D0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242288_B36E58, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802426A4_B37274, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248D44_B3D914, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248DF4_B3D9C4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802426C0_B37290, 0x00000043, 0x00000001, func_80242524_B370F4, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000044, 0x00000001, D_80247BA0_B3C770, 0x00000043, 0x00000001, jan_03_UnkFunc29, 0x00000043, 0x00000001, jan_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249BD4_B3E7A4
-.word 0x00000043, 0x00000001, func_80241CD8_B368A8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, jan_03_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249C48_B3E818
 .word 0x0000003C, 0x00000001, D_8024FEE0_C0D760, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80248EA4_B3DA74, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
index d0c177317e..482c0ca9ca 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
@@ -11,7 +11,7 @@ glabel D_802455D4_8B5644
 glabel D_80245634_8B56A4
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80245674_8B56E4
+glabel kmr_02_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_802456C4_8B5734
@@ -57,7 +57,7 @@ glabel D_80246D10_8B6D80
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, kmr_02_Set80151310_1, 0x00000043, 0x00000001, kmr_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245774_8B57E4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245E9C_8B5F0C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240B00_8B0B70, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80245F10_8B5F80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802413F4_8B1464, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240A7C_8B0AEC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240E98_8B0F08, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246BB0_8B6C20, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246C60_8B6CD0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240EB4_8B0F24, 0x00000043, 0x00000001, func_80240D18_8B0D88, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000044, 0x00000001, D_80245A0C_8B5A7C, 0x00000043, 0x00000001, kmr_02_UnkFunc29, 0x00000043, 0x00000001, kmr_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247A40_8B7AB0
-.word 0x00000043, 0x00000001, func_802404CC_8B053C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, kmr_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, kmr_02_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, kmr_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247AB4_8B7B24
 .word 0x0000003C, 0x00000001, 0x80257F30, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80246D10_8B6D80, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
index fd322e03b9..e01d1b67e2 100644
--- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
@@ -20,7 +20,7 @@ glabel D_80245DC4_7F0AD4
 glabel D_80245E24_7F0B34
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80245E64_7F0B74
+glabel mac_00_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80245EB4_7F0BC4
@@ -66,7 +66,7 @@ glabel D_80247500_7F2210
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_00_Set80151310_1, 0x00000043, 0x00000001, mac_00_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245F64_7F0C74, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024668C_7F139C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240DA0_7EBAB0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246700_7F1410, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241694_7EC3A4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240D1C_7EBA2C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241138_7EBE48, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802473A0_7F20B0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247450_7F2160, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241154_7EBE64, 0x00000043, 0x00000001, func_80240FB8_7EBCC8, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000044, 0x00000001, D_802461FC_7F0F0C, 0x00000043, 0x00000001, mac_00_UnkFunc29, 0x00000043, 0x00000001, mac_00_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248230_7F2F40
-.word 0x00000043, 0x00000001, func_8024076C_7EB47C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_00_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_00_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_00_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802482A4_7F2FB4
 .word 0x0000003C, 0x00000001, 0x80255B78, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247500_7F2210, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
index 3022522bd6..896604bb1f 100644
--- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
@@ -53,7 +53,7 @@ glabel D_80248C34_8094B4
 glabel D_80248C94_809514
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80248CD4_809554
+glabel mac_01_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80248D24_8095A4
@@ -99,7 +99,7 @@ glabel D_8024A370_80ABF0
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_01_Set80151310_1, 0x00000043, 0x00000001, mac_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_80248DD4_809654, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802494FC_809D7C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242680_802F00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80249570_809DF0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242980_803200, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242F74_8037F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_802425FC_802E7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242A18_803298, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024A210_80AA90, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_8024A2C0_80AB40, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242980_803200, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242A34_8032B4, 0x00000043, 0x00000001, func_80242898_803118, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000044, 0x00000001, D_8024906C_8098EC, 0x00000043, 0x00000001, mac_01_UnkFunc29, 0x00000043, 0x00000001, mac_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024B0A0_80B920
-.word 0x00000043, 0x00000001, func_8024204C_8028CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_01_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024B114_80B994
 .word 0x0000003C, 0x00000001, 0x80262A48, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_8024A370_80ABF0, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
index 599c87e221..b7582888d9 100644
--- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
@@ -50,7 +50,7 @@ glabel D_80246154_829414
 glabel D_802461B4_829474
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_802461F4_8294B4
+glabel mac_02_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80246244_829504
@@ -96,7 +96,7 @@ glabel D_80247890_82AB50
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246244_829504, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_02_Set80151310_1, 0x00000043, 0x00000001, mac_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_802462F4_8295B4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246A1C_829CDC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241F30_8251F0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246A90_829D50, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242824_825AE4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241EAC_82516C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802422C8_825588, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247730_82A9F0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802477E0_82AAA0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802422E4_8255A4, 0x00000043, 0x00000001, func_80242148_825408, 0x00000046, 0x00000001, D_80246244_829504, 0x00000044, 0x00000001, D_8024658C_82984C, 0x00000043, 0x00000001, mac_02_UnkFunc29, 0x00000043, 0x00000001, mac_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802485C0_82B880
-.word 0x00000043, 0x00000001, func_802418FC_824BBC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_02_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248634_82B8F4
 .word 0x0000003C, 0x00000001, 0x8024E548, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247890_82AB50, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
index dfb7e5b7a7..4dfcfdab3b 100644
--- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
@@ -38,7 +38,7 @@ glabel D_80246648_837E48
 glabel D_802466A8_837EA8
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_802466E8_837EE8
+glabel mac_03_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80246738_837F38
@@ -84,7 +84,7 @@ glabel D_80247D84_839584
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_03_Set80151310_1, 0x00000043, 0x00000001, mac_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802467E8_837FE8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246F10_838710, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240C20_832420, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246F84_838784, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240F20_832720, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241514_832D14, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B9C_83239C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240FB8_8327B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247C24_839424, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247CD4_8394D4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240F20_832720, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240FD4_8327D4, 0x00000043, 0x00000001, func_80240E38_832638, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000044, 0x00000001, D_80246A80_838280, 0x00000043, 0x00000001, mac_03_UnkFunc29, 0x00000043, 0x00000001, mac_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248AB4_83A2B4
-.word 0x00000043, 0x00000001, func_802405EC_831DEC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_03_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248B28_83A328
 .word 0x0000003C, 0x00000001, 0x802513D8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247D84_839584, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
index 5c32921447..611e53b422 100644
--- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
@@ -35,7 +35,7 @@ glabel D_80243FEC_846BBC
 glabel D_8024404C_846C1C
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_8024408C_846C5C
+glabel mac_04_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_802440DC_846CAC
@@ -81,7 +81,7 @@ glabel D_80245728_8482F8
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_04_Set80151310_1, 0x00000043, 0x00000001, mac_04_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024418C_846D5C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802448B4_847484, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240BD0_8437A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80244928_8474F8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802414C4_844094, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B4C_84371C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240F68_843B38, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802455C8_848198, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80245678_848248, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240F84_843B54, 0x00000043, 0x00000001, func_80240DE8_8439B8, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000044, 0x00000001, D_80244424_846FF4, 0x00000043, 0x00000001, mac_04_UnkFunc29, 0x00000043, 0x00000001, mac_04_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246458_849028
-.word 0x00000043, 0x00000001, func_8024059C_84316C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_04_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_04_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_04_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802464CC_84909C
 .word 0x0000003C, 0x00000001, 0x8024F5A8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80245728_8482F8, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
index c6f8faef12..aacd6da69b 100644
--- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
@@ -29,7 +29,7 @@ glabel D_802450B4_857224
 glabel D_80245114_857284
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80245154_8572C4
+glabel mac_05_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_802451A4_857314
@@ -75,7 +75,7 @@ glabel D_802467F0_858960
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_05_Set80151310_1, 0x00000043, 0x00000001, mac_05_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245254_8573C4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024597C_857AEC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241A90_853C00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802459F0_857B60, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242384_8544F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241A0C_853B7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241E28_853F98, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246690_858800, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246740_8588B0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241E44_853FB4, 0x00000043, 0x00000001, func_80241CA8_853E18, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000044, 0x00000001, D_802454EC_85765C, 0x00000043, 0x00000001, mac_05_UnkFunc29, 0x00000043, 0x00000001, mac_05_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247520_859690
-.word 0x00000043, 0x00000001, func_8024145C_8535CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_05_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_05_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_05_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247594_859704
 .word 0x0000003C, 0x00000001, 0x802529D8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802467F0_858960, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
index 16d22de85f..695b5f0fb9 100644
--- a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
@@ -113,7 +113,7 @@ glabel D_80245F48_9CB328
 glabel D_80245FA8_9CB388
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80245FE8_9CB3C8
+glabel nok_01_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80246038_9CB418
@@ -159,7 +159,7 @@ glabel D_80247684_9CCA64
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_01_Set80151310_1, 0x00000043, 0x00000001, nok_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_802460E8_9CB4C8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246810_9CBBF0, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802414D8_9C68B8, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246884_9CBC64, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241DCC_9C71AC, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241454_9C6834, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241870_9C6C50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247524_9CC904, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802475D4_9CC9B4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024188C_9C6C6C, 0x00000043, 0x00000001, func_802416F0_9C6AD0, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000044, 0x00000001, D_80246380_9CB760, 0x00000043, 0x00000001, nok_01_UnkFunc29, 0x00000043, 0x00000001, nok_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802483B4_9CD794
-.word 0x00000043, 0x00000001, func_80240EA4_9C6284, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, nok_01_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248428_9CD808
 .word 0x0000003C, 0x00000001, 0x80251C48, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247684_9CCA64, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
index ad0d960428..2459d7900e 100644
--- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
@@ -47,7 +47,7 @@ glabel D_802470CC_9DE0EC
 glabel D_8024712C_9DE14C
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_8024716C_9DE18C
+glabel nok_02_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_802471BC_9DE1DC
@@ -93,7 +93,7 @@ glabel D_80248808_9DF828
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_02_Set80151310_1, 0x00000043, 0x00000001, nok_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024726C_9DE28C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80247994_9DE9B4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242080_9D90A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80247A08_9DEA28, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242974_9D9994, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241FFC_9D901C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242418_9D9438, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802486A8_9DF6C8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248758_9DF778, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242434_9D9454, 0x00000043, 0x00000001, func_80242298_9D92B8, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000044, 0x00000001, D_80247504_9DE524, 0x00000043, 0x00000001, nok_02_UnkFunc29, 0x00000043, 0x00000001, nok_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249538_9E0558
-.word 0x00000043, 0x00000001, func_80241A4C_9D8A6C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, nok_02_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802495AC_9E05CC
 .word 0x0000003C, 0x00000001, 0x802549A8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80248808_9DF828, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
index 135a29d8b5..95b48d209b 100644
--- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
@@ -116,7 +116,7 @@ glabel D_802436D0_CFB240
 glabel D_802436FC_CFB26C
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_8024373C_CFB2AC
+glabel sam_01_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_8024378C_CFB2FC
@@ -162,7 +162,7 @@ glabel D_80244DD8_CFC948
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_01_Set80151310_1, 0x00000043, 0x00000001, sam_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024383C_CFB3AC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243F64_CFBAD4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240E70_CF89E0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243FD8_CFBB48, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241764_CF92D4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240DEC_CF895C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241208_CF8D78, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80244C78_CFC7E8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244D28_CFC898, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241224_CF8D94, 0x00000043, 0x00000001, func_80241088_CF8BF8, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000044, 0x00000001, D_80243AD4_CFB644, 0x00000043, 0x00000001, sam_01_UnkFunc29, 0x00000043, 0x00000001, sam_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245B08_CFD678
-.word 0x00000043, 0x00000001, func_8024083C_CF83AC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, sam_01_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245B7C_CFD6EC
 .word 0x0000003C, 0x00000001, 0x8024DF00, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80244DD8_CFC948, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
index 8a2632a147..f506e7a6a0 100644
--- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
@@ -98,7 +98,7 @@ glabel D_80246B64_D0C294
 glabel D_80246BC4_D0C2F4
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_80246C04_D0C334
+glabel sam_02_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_80246C54_D0C384
@@ -144,7 +144,7 @@ glabel D_802482A0_D0D9D0
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_02_Set80151310_1, 0x00000043, 0x00000001, sam_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80246D04_D0C434, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024742C_D0CB5C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024129C_D069CC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802474A0_D0CBD0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241B90_D072C0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, begin_battle_D06948, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241634_D06D64, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248140_D0D870, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802481F0_D0D920, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241650_D06D80, 0x00000043, 0x00000001, func_802414B4_D06BE4, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000044, 0x00000001, D_80246F9C_D0C6CC, 0x00000043, 0x00000001, sam_02_UnkFunc29, 0x00000043, 0x00000001, sam_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248FD0_D0E700
-.word 0x00000043, 0x00000001, func_80240C68_D06398, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, sam_02_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249044_D0E774
 .word 0x0000003C, 0x00000001, 0x8024B998, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802482A0_D0D9D0, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
index 8d05388546..fcecff52a7 100644
--- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
@@ -125,7 +125,7 @@ glabel D_80244F7C_D3F54C
 glabel D_80244FDC_D3F5AC
 .byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01
 
-glabel D_8024501C_D3F5EC
+glabel sam_11_quizRequirements
 .word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040
 
 glabel D_8024506C_D3F63C
@@ -171,7 +171,7 @@ glabel D_802466B8_D40C88
 .word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, dup_sam_11_Set80151310_1, 0x00000043, 0x00000001, sam_11_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024511C_D3F6EC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245844_D3FE14, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240F40_D3B510, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802458B8_D3FE88, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241834_D3BE04, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240EBC_D3B48C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802412D8_D3B8A8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246558_D40B28, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246608_D40BD8, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802412F4_D3B8C4, 0x00000043, 0x00000001, func_80241158_D3B728, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000044, 0x00000001, D_802453B4_D3F984, 0x00000043, 0x00000001, sam_11_UnkFunc29, 0x00000043, 0x00000001, dup_sam_11_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802473E8_D419B8
-.word 0x00000043, 0x00000001, func_8024090C_D3AEDC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_11_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, sam_11_UnkQuizFunc, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_11_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024745C_D41A2C
 .word 0x0000003C, 0x00000001, 0x80251458, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802466B8_D40C88, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/23680/func_800495A0.s b/ver/us/asm/nonmatchings/23680/func_800495A0.s
deleted file mode 100644
index 9c73dfe7a5..0000000000
--- a/ver/us/asm/nonmatchings/23680/func_800495A0.s
+++ /dev/null
@@ -1,83 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_80098720
-.double 32767.0
-
-.section .text
-
-glabel func_800495A0
-/* 249A0 800495A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 249A4 800495A4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 249A8 800495A8 0080982D */  daddu     $s3, $a0, $zero
-/* 249AC 800495AC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 249B0 800495B0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 249B4 800495B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 249B8 800495B8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 249BC 800495BC 8E710148 */  lw        $s1, 0x148($s3)
-/* 249C0 800495C0 86240008 */  lh        $a0, 8($s1)
-/* 249C4 800495C4 0C00EABB */  jal       get_npc_unsafe
-/* 249C8 800495C8 00A0902D */   daddu    $s2, $a1, $zero
-/* 249CC 800495CC 8E440004 */  lw        $a0, 4($s2)
-/* 249D0 800495D0 0040802D */  daddu     $s0, $v0, $zero
-/* 249D4 800495D4 00041FC2 */  srl       $v1, $a0, 0x1f
-/* 249D8 800495D8 00832021 */  addu      $a0, $a0, $v1
-/* 249DC 800495DC 00042043 */  sra       $a0, $a0, 1
-/* 249E0 800495E0 0C00A67F */  jal       rand_int
-/* 249E4 800495E4 24840001 */   addiu    $a0, $a0, 1
-/* 249E8 800495E8 8E430004 */  lw        $v1, 4($s2)
-/* 249EC 800495EC 2404003C */  addiu     $a0, $zero, 0x3c
-/* 249F0 800495F0 00032FC2 */  srl       $a1, $v1, 0x1f
-/* 249F4 800495F4 00651821 */  addu      $v1, $v1, $a1
-/* 249F8 800495F8 00031843 */  sra       $v1, $v1, 1
-/* 249FC 800495FC 00621821 */  addu      $v1, $v1, $v0
-/* 24A00 80049600 0C00A67F */  jal       rand_int
-/* 24A04 80049604 A603008E */   sh       $v1, 0x8e($s0)
-/* 24A08 80049608 C60C000C */  lwc1      $f12, 0xc($s0)
-/* 24A0C 8004960C 44820000 */  mtc1      $v0, $f0
-/* 24A10 80049610 00000000 */  nop
-/* 24A14 80049614 46800020 */  cvt.s.w   $f0, $f0
-/* 24A18 80049618 46006300 */  add.s     $f12, $f12, $f0
-/* 24A1C 8004961C 3C0141F0 */  lui       $at, 0x41f0
-/* 24A20 80049620 44810000 */  mtc1      $at, $f0
-/* 24A24 80049624 0C00A6C9 */  jal       clamp_angle
-/* 24A28 80049628 46006301 */   sub.s    $f12, $f12, $f0
-/* 24A2C 8004962C E600000C */  swc1      $f0, 0xc($s0)
-/* 24A30 80049630 8E2200CC */  lw        $v0, 0xcc($s1)
-/* 24A34 80049634 8C420004 */  lw        $v0, 4($v0)
-/* 24A38 80049638 AE020028 */  sw        $v0, 0x28($s0)
-/* 24A3C 8004963C AE600074 */  sw        $zero, 0x74($s3)
-/* 24A40 80049640 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* 24A44 80049644 8C420014 */  lw        $v0, 0x14($v0)
-/* 24A48 80049648 04410004 */  bgez      $v0, .L8004965C
-/* 24A4C 8004964C 00000000 */   nop
-/* 24A50 80049650 C6400000 */  lwc1      $f0, ($s2)
-/* 24A54 80049654 0801259F */  j         .L8004967C
-/* 24A58 80049658 E6000018 */   swc1     $f0, 0x18($s0)
-.L8004965C:
-/* 24A5C 8004965C 3C01800A */  lui       $at, %hi(D_80098720)
-/* 24A60 80049660 D4228720 */  ldc1      $f2, %lo(D_80098720)($at)
-/* 24A64 80049664 44820000 */  mtc1      $v0, $f0
-/* 24A68 80049668 00000000 */  nop
-/* 24A6C 8004966C 46800021 */  cvt.d.w   $f0, $f0
-/* 24A70 80049670 46220003 */  div.d     $f0, $f0, $f2
-/* 24A74 80049674 46200020 */  cvt.s.d   $f0, $f0
-/* 24A78 80049678 E6000018 */  swc1      $f0, 0x18($s0)
-.L8004967C:
-/* 24A7C 8004967C 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* 24A80 80049680 2403FFBF */  addiu     $v1, $zero, -0x41
-/* 24A84 80049684 00431024 */  and       $v0, $v0, $v1
-/* 24A88 80049688 2403FFDF */  addiu     $v1, $zero, -0x21
-/* 24A8C 8004968C 00431024 */  and       $v0, $v0, $v1
-/* 24A90 80049690 AE2200B0 */  sw        $v0, 0xb0($s1)
-/* 24A94 80049694 24020001 */  addiu     $v0, $zero, 1
-/* 24A98 80049698 AE620070 */  sw        $v0, 0x70($s3)
-/* 24A9C 8004969C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 24AA0 800496A0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 24AA4 800496A4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 24AA8 800496A8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 24AAC 800496AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 24AB0 800496B0 03E00008 */  jr        $ra
-/* 24AB4 800496B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/23680/func_80049F7C.s b/ver/us/asm/nonmatchings/23680/func_80049F7C.s
deleted file mode 100644
index e55a4ab24e..0000000000
--- a/ver/us/asm/nonmatchings/23680/func_80049F7C.s
+++ /dev/null
@@ -1,115 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80049F7C
-/* 2537C 80049F7C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 25380 80049F80 AFB40020 */  sw        $s4, 0x20($sp)
-/* 25384 80049F84 0080A02D */  daddu     $s4, $a0, $zero
-/* 25388 80049F88 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 2538C 80049F8C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 25390 80049F90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 25394 80049F94 AFB10014 */  sw        $s1, 0x14($sp)
-/* 25398 80049F98 AFB00010 */  sw        $s0, 0x10($sp)
-/* 2539C 80049F9C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 253A0 80049FA0 8E930148 */  lw        $s3, 0x148($s4)
-/* 253A4 80049FA4 86640008 */  lh        $a0, 8($s3)
-/* 253A8 80049FA8 0C00EABB */  jal       get_npc_unsafe
-/* 253AC 80049FAC 00A0902D */   daddu    $s2, $a1, $zero
-/* 253B0 80049FB0 3C04800F */  lui       $a0, %hi(gPlayerStatusPtr)
-/* 253B4 80049FB4 8C847B30 */  lw        $a0, %lo(gPlayerStatusPtr)($a0)
-/* 253B8 80049FB8 908300B4 */  lbu       $v1, 0xb4($a0)
-/* 253BC 80049FBC 0040802D */  daddu     $s0, $v0, $zero
-/* 253C0 80049FC0 2462FFFD */  addiu     $v0, $v1, -3
-/* 253C4 80049FC4 2C420003 */  sltiu     $v0, $v0, 3
-/* 253C8 80049FC8 14400006 */  bnez      $v0, .L80049FE4
-/* 253CC 80049FCC 0000882D */   daddu    $s1, $zero, $zero
-/* 253D0 80049FD0 00031600 */  sll       $v0, $v1, 0x18
-/* 253D4 80049FD4 00021603 */  sra       $v0, $v0, 0x18
-/* 253D8 80049FD8 24030008 */  addiu     $v1, $zero, 8
-/* 253DC 80049FDC 1443000F */  bne       $v0, $v1, .L8004A01C
-/* 253E0 80049FE0 00000000 */   nop
-.L80049FE4:
-/* 253E4 80049FE4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* 253E8 80049FE8 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* 253EC 80049FEC 8C860028 */  lw        $a2, 0x28($a0)
-/* 253F0 80049FF0 0C00A7B5 */  jal       dist2D
-/* 253F4 80049FF4 8C870030 */   lw       $a3, 0x30($a0)
-/* 253F8 80049FF8 860200A6 */  lh        $v0, 0xa6($s0)
-/* 253FC 80049FFC 46000021 */  cvt.d.s   $f0, $f0
-/* 25400 8004A000 44821000 */  mtc1      $v0, $f2
-/* 25404 8004A004 00000000 */  nop
-/* 25408 8004A008 468010A1 */  cvt.d.w   $f2, $f2
-/* 2540C 8004A00C 4622003C */  c.lt.d    $f0, $f2
-/* 25410 8004A010 00000000 */  nop
-/* 25414 8004A014 45030001 */  bc1tl     .L8004A01C
-/* 25418 8004A018 24110001 */   addiu    $s1, $zero, 1
-.L8004A01C:
-/* 2541C 8004A01C 56200031 */  bnel      $s1, $zero, .L8004A0E4
-/* 25420 8004A020 A600008E */   sh       $zero, 0x8e($s0)
-/* 25424 8004A024 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* 25428 8004A028 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* 2542C 8004A02C 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* 25430 8004A030 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* 25434 8004A034 8C460028 */  lw        $a2, 0x28($v0)
-/* 25438 8004A038 0C00A720 */  jal       atan2
-/* 2543C 8004A03C 8C470030 */   lw       $a3, 0x30($v0)
-/* 25440 8004A040 46000506 */  mov.s     $f20, $f0
-/* 25444 8004A044 C60C000C */  lwc1      $f12, 0xc($s0)
-/* 25448 8004A048 0C00A70A */  jal       get_clamped_angle_diff
-/* 2544C 8004A04C 4600A386 */   mov.s    $f14, $f20
-/* 25450 8004A050 46000086 */  mov.s     $f2, $f0
-/* 25454 8004A054 8E42001C */  lw        $v0, 0x1c($s2)
-/* 25458 8004A058 46001005 */  abs.s     $f0, $f2
-/* 2545C 8004A05C 44822000 */  mtc1      $v0, $f4
-/* 25460 8004A060 00000000 */  nop
-/* 25464 8004A064 46802120 */  cvt.s.w   $f4, $f4
-/* 25468 8004A068 4600203C */  c.lt.s    $f4, $f0
-/* 2546C 8004A06C 00000000 */  nop
-/* 25470 8004A070 4500000D */  bc1f      .L8004A0A8
-/* 25474 8004A074 00000000 */   nop
-/* 25478 8004A078 44800000 */  mtc1      $zero, $f0
-/* 2547C 8004A07C C614000C */  lwc1      $f20, 0xc($s0)
-/* 25480 8004A080 4600103C */  c.lt.s    $f2, $f0
-/* 25484 8004A084 00000000 */  nop
-/* 25488 8004A088 45000006 */  bc1f      .L8004A0A4
-/* 2548C 8004A08C 00021023 */   negu     $v0, $v0
-/* 25490 8004A090 44820000 */  mtc1      $v0, $f0
-/* 25494 8004A094 00000000 */  nop
-/* 25498 8004A098 46800020 */  cvt.s.w   $f0, $f0
-/* 2549C 8004A09C 0801282A */  j         .L8004A0A8
-/* 254A0 8004A0A0 4600A500 */   add.s    $f20, $f20, $f0
-.L8004A0A4:
-/* 254A4 8004A0A4 4604A500 */  add.s     $f20, $f20, $f4
-.L8004A0A8:
-/* 254A8 8004A0A8 0C00A6C9 */  jal       clamp_angle
-/* 254AC 8004A0AC 4600A306 */   mov.s    $f12, $f20
-/* 254B0 8004A0B0 E600000C */  swc1      $f0, 0xc($s0)
-/* 254B4 8004A0B4 8E440020 */  lw        $a0, 0x20($s2)
-/* 254B8 8004A0B8 000417C2 */  srl       $v0, $a0, 0x1f
-/* 254BC 8004A0BC 00822021 */  addu      $a0, $a0, $v0
-/* 254C0 8004A0C0 00042043 */  sra       $a0, $a0, 1
-/* 254C4 8004A0C4 0C00A67F */  jal       rand_int
-/* 254C8 8004A0C8 24840001 */   addiu    $a0, $a0, 1
-/* 254CC 8004A0CC 8E430020 */  lw        $v1, 0x20($s2)
-/* 254D0 8004A0D0 000327C2 */  srl       $a0, $v1, 0x1f
-/* 254D4 8004A0D4 00641821 */  addu      $v1, $v1, $a0
-/* 254D8 8004A0D8 00031843 */  sra       $v1, $v1, 1
-/* 254DC 8004A0DC 00621821 */  addu      $v1, $v1, $v0
-/* 254E0 8004A0E0 A603008E */  sh        $v1, 0x8e($s0)
-.L8004A0E4:
-/* 254E4 8004A0E4 8E6200CC */  lw        $v0, 0xcc($s3)
-/* 254E8 8004A0E8 8C42000C */  lw        $v0, 0xc($v0)
-/* 254EC 8004A0EC AE020028 */  sw        $v0, 0x28($s0)
-/* 254F0 8004A0F0 C6400018 */  lwc1      $f0, 0x18($s2)
-/* 254F4 8004A0F4 2402000D */  addiu     $v0, $zero, 0xd
-/* 254F8 8004A0F8 E6000018 */  swc1      $f0, 0x18($s0)
-/* 254FC 8004A0FC AE820070 */  sw        $v0, 0x70($s4)
-/* 25500 8004A100 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 25504 8004A104 8FB40020 */  lw        $s4, 0x20($sp)
-/* 25508 8004A108 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 2550C 8004A10C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 25510 8004A110 8FB10014 */  lw        $s1, 0x14($sp)
-/* 25514 8004A114 8FB00010 */  lw        $s0, 0x10($sp)
-/* 25518 8004A118 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 2551C 8004A11C 03E00008 */  jr        $ra
-/* 25520 8004A120 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s
rename to ver/us/asm/nonmatchings/effects/effect_10/fx_10_appendGfx.s
index 62ac03888f..8ce5033422 100644
--- a/ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00144E0
+glabel fx_10_appendGfx
 /* 32E970 E00144E0 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 32E974 E00144E4 AFB600B8 */  sw        $s6, 0xb8($sp)
 /* 32E978 E00144E8 0080B02D */  daddu     $s6, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s
index c3c2800681..9f4caad148 100644
--- a/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s
@@ -10,14 +10,14 @@ glabel fx_10_main
 /* 32E4A4 E0014014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32E4A8 E0014018 F7BE0068 */  sdc1      $f30, 0x68($sp)
 /* 32E4AC E001401C 4486F000 */  mtc1      $a2, $f30
-/* 32E4B0 E0014020 3C02E001 */  lui       $v0, %hi(func_E0014258)
-/* 32E4B4 E0014024 24424258 */  addiu     $v0, $v0, %lo(func_E0014258)
+/* 32E4B0 E0014020 3C02E001 */  lui       $v0, %hi(fx_10_init)
+/* 32E4B4 E0014024 24424258 */  addiu     $v0, $v0, %lo(fx_10_init)
 /* 32E4B8 E0014028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32E4BC E001402C 3C02E001 */  lui       $v0, %hi(func_E0014260)
-/* 32E4C0 E0014030 24424260 */  addiu     $v0, $v0, %lo(func_E0014260)
+/* 32E4BC E001402C 3C02E001 */  lui       $v0, %hi(fx_10_update)
+/* 32E4C0 E0014030 24424260 */  addiu     $v0, $v0, %lo(fx_10_update)
 /* 32E4C4 E0014034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32E4C8 E0014038 3C02E001 */  lui       $v0, %hi(func_E001449C)
-/* 32E4CC E001403C 2442449C */  addiu     $v0, $v0, %lo(func_E001449C)
+/* 32E4C8 E0014038 3C02E001 */  lui       $v0, %hi(fx_10_render)
+/* 32E4CC E001403C 2442449C */  addiu     $v0, $v0, %lo(fx_10_render)
 /* 32E4D0 E0014040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32E4D4 E0014044 2402000A */  addiu     $v0, $zero, 0xa
 /* 32E4D8 E0014048 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s
rename to ver/us/asm/nonmatchings/effects/effect_10/fx_10_render.s
index 52c55eda83..3949df900b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001449C
+glabel fx_10_render
 /* 32E92C E001449C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 32E930 E00144A0 3C02E001 */  lui       $v0, %hi(func_E00144E0)
-/* 32E934 E00144A4 244244E0 */  addiu     $v0, $v0, %lo(func_E00144E0)
+/* 32E930 E00144A0 3C02E001 */  lui       $v0, %hi(fx_10_appendGfx)
+/* 32E934 E00144A4 244244E0 */  addiu     $v0, $v0, %lo(fx_10_appendGfx)
 /* 32E938 E00144A8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 32E93C E00144AC 24020028 */  addiu     $v0, $zero, 0x28
 /* 32E940 E00144B0 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s
rename to ver/us/asm/nonmatchings/effects/effect_10/fx_10_update.s
index 5cd1de2251..3a5f02bae0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s
+++ b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0014260
+glabel fx_10_update
 /* 32E6F0 E0014260 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 32E6F4 E0014264 AFB40020 */  sw        $s4, 0x20($sp)
 /* 32E6F8 E0014268 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s
rename to ver/us/asm/nonmatchings/effects/effect_100/fx_100_appendGfx.s
index 23f0922e58..e82326d935 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s
+++ b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C8454
+glabel fx_100_appendGfx
 /* 3CF7F4 E00C8454 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3CF7F8 E00C8458 0080302D */  daddu     $a2, $a0, $zero
 /* 3CF7FC E00C845C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s
index a437123fea..dcc13a93bc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s
@@ -20,14 +20,14 @@ glabel fx_100_main
 /* 3CF3DC E00C803C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3CF3E0 E00C8040 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3CF3E4 E00C8044 8FB10090 */  lw        $s1, 0x90($sp)
-/* 3CF3E8 E00C8048 3C02E00D */  lui       $v0, %hi(func_E00C8218)
-/* 3CF3EC E00C804C 24428218 */  addiu     $v0, $v0, %lo(func_E00C8218)
+/* 3CF3E8 E00C8048 3C02E00D */  lui       $v0, %hi(fx_100_init)
+/* 3CF3EC E00C804C 24428218 */  addiu     $v0, $v0, %lo(fx_100_init)
 /* 3CF3F0 E00C8050 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3CF3F4 E00C8054 3C02E00D */  lui       $v0, %hi(func_E00C8220)
-/* 3CF3F8 E00C8058 24428220 */  addiu     $v0, $v0, %lo(func_E00C8220)
+/* 3CF3F4 E00C8054 3C02E00D */  lui       $v0, %hi(fx_100_update)
+/* 3CF3F8 E00C8058 24428220 */  addiu     $v0, $v0, %lo(fx_100_update)
 /* 3CF3FC E00C805C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3CF400 E00C8060 3C02E00D */  lui       $v0, %hi(func_E00C8404)
-/* 3CF404 E00C8064 24428404 */  addiu     $v0, $v0, %lo(func_E00C8404)
+/* 3CF400 E00C8060 3C02E00D */  lui       $v0, %hi(fx_100_render)
+/* 3CF404 E00C8064 24428404 */  addiu     $v0, $v0, %lo(fx_100_render)
 /* 3CF408 E00C8068 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3CF40C E00C806C 24020064 */  addiu     $v0, $zero, 0x64
 /* 3CF410 E00C8070 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s
rename to ver/us/asm/nonmatchings/effects/effect_100/fx_100_render.s
index 1add794454..567757a535 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s
+++ b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C8404
+glabel fx_100_render
 /* 3CF7A4 E00C8404 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3CF7A8 E00C8408 3C02E00D */  lui       $v0, %hi(func_E00C8454)
-/* 3CF7AC E00C840C 24428454 */  addiu     $v0, $v0, %lo(func_E00C8454)
+/* 3CF7A8 E00C8408 3C02E00D */  lui       $v0, %hi(fx_100_appendGfx)
+/* 3CF7AC E00C840C 24428454 */  addiu     $v0, $v0, %lo(fx_100_appendGfx)
 /* 3CF7B0 E00C8410 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3CF7B4 E00C8414 2402000A */  addiu     $v0, $zero, 0xa
 /* 3CF7B8 E00C8418 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s
rename to ver/us/asm/nonmatchings/effects/effect_100/fx_100_update.s
index 5652c24b63..4cc9a06929 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s
+++ b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C8220
+glabel fx_100_update
 /* 3CF5C0 E00C8220 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3CF5C4 E00C8224 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3CF5C8 E00C8228 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s
rename to ver/us/asm/nonmatchings/effects/effect_101/fx_101_appendGfx.s
index 62b1d1c1c6..b6b7e5810f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CA4CC
+glabel fx_101_appendGfx
 /* 3D09CC E00CA4CC 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D09D0 E00CA4D0 0080482D */  daddu     $t1, $a0, $zero
 /* 3D09D4 E00CA4D4 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s
index 8993512abf..e8c97c7dea 100644
--- a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s
@@ -14,14 +14,14 @@ glabel fx_101_main
 /* 3D0524 E00CA024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D0528 E00CA028 AFB30034 */  sw        $s3, 0x34($sp)
 /* 3D052C E00CA02C 8FB3006C */  lw        $s3, 0x6c($sp)
-/* 3D0530 E00CA030 3C02E00D */  lui       $v0, %hi(func_E00CA240)
-/* 3D0534 E00CA034 2442A240 */  addiu     $v0, $v0, %lo(func_E00CA240)
+/* 3D0530 E00CA030 3C02E00D */  lui       $v0, %hi(fx_101_init)
+/* 3D0534 E00CA034 2442A240 */  addiu     $v0, $v0, %lo(fx_101_init)
 /* 3D0538 E00CA038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D053C E00CA03C 3C02E00D */  lui       $v0, %hi(func_E00CA248)
-/* 3D0540 E00CA040 2442A248 */  addiu     $v0, $v0, %lo(func_E00CA248)
+/* 3D053C E00CA03C 3C02E00D */  lui       $v0, %hi(fx_101_update)
+/* 3D0540 E00CA040 2442A248 */  addiu     $v0, $v0, %lo(fx_101_update)
 /* 3D0544 E00CA044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D0548 E00CA048 3C02E00D */  lui       $v0, %hi(func_E00CA484)
-/* 3D054C E00CA04C 2442A484 */  addiu     $v0, $v0, %lo(func_E00CA484)
+/* 3D0548 E00CA048 3C02E00D */  lui       $v0, %hi(fx_101_render)
+/* 3D054C E00CA04C 2442A484 */  addiu     $v0, $v0, %lo(fx_101_render)
 /* 3D0550 E00CA050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D0554 E00CA054 24020065 */  addiu     $v0, $zero, 0x65
 /* 3D0558 E00CA058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s
rename to ver/us/asm/nonmatchings/effects/effect_101/fx_101_render.s
index 4025bf4f09..fcf37dd5e6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s
+++ b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CA484
+glabel fx_101_render
 /* 3D0984 E00CA484 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D0988 E00CA488 3C02E00D */  lui       $v0, %hi(func_E00CA4CC)
-/* 3D098C E00CA48C 2442A4CC */  addiu     $v0, $v0, %lo(func_E00CA4CC)
+/* 3D0988 E00CA488 3C02E00D */  lui       $v0, %hi(fx_101_appendGfx)
+/* 3D098C E00CA48C 2442A4CC */  addiu     $v0, $v0, %lo(fx_101_appendGfx)
 /* 3D0990 E00CA490 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D0994 E00CA494 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D0998 E00CA498 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s
rename to ver/us/asm/nonmatchings/effects/effect_101/fx_101_update.s
index 15b6d1343b..3c5b15df24 100644
--- a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s
+++ b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CA248
+glabel fx_101_update
 /* 3D0748 E00CA248 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3D074C E00CA24C AFBF0018 */  sw        $ra, 0x18($sp)
 /* 3D0750 E00CA250 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s
rename to ver/us/asm/nonmatchings/effects/effect_102/fx_102_appendGfx.s
index c63d6159d0..e5c8a9b687 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CC9D0
+glabel fx_102_appendGfx
 /* 3D2060 E00CC9D0 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3D2064 E00CC9D4 0080302D */  daddu     $a2, $a0, $zero
 /* 3D2068 E00CC9D8 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s
index 2085581552..6db879eee5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s
@@ -14,14 +14,14 @@ glabel fx_102_main
 /* 3D16B4 E00CC024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D16B8 E00CC028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3D16BC E00CC02C 8FB00084 */  lw        $s0, 0x84($sp)
-/* 3D16C0 E00CC030 3C02E00D */  lui       $v0, %hi(func_E00CC250)
-/* 3D16C4 E00CC034 2442C250 */  addiu     $v0, $v0, %lo(func_E00CC250)
+/* 3D16C0 E00CC030 3C02E00D */  lui       $v0, %hi(fx_102_init)
+/* 3D16C4 E00CC034 2442C250 */  addiu     $v0, $v0, %lo(fx_102_init)
 /* 3D16C8 E00CC038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D16CC E00CC03C 3C02E00D */  lui       $v0, %hi(func_E00CC258)
-/* 3D16D0 E00CC040 2442C258 */  addiu     $v0, $v0, %lo(func_E00CC258)
+/* 3D16CC E00CC03C 3C02E00D */  lui       $v0, %hi(fx_102_update)
+/* 3D16D0 E00CC040 2442C258 */  addiu     $v0, $v0, %lo(fx_102_update)
 /* 3D16D4 E00CC044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D16D8 E00CC048 3C02E00D */  lui       $v0, %hi(func_E00CC980)
-/* 3D16DC E00CC04C 2442C980 */  addiu     $v0, $v0, %lo(func_E00CC980)
+/* 3D16D8 E00CC048 3C02E00D */  lui       $v0, %hi(fx_102_render)
+/* 3D16DC E00CC04C 2442C980 */  addiu     $v0, $v0, %lo(fx_102_render)
 /* 3D16E0 E00CC050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D16E4 E00CC054 24020066 */  addiu     $v0, $zero, 0x66
 /* 3D16E8 E00CC058 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s
rename to ver/us/asm/nonmatchings/effects/effect_102/fx_102_render.s
index 27a35c468c..c246e82ca8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s
+++ b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CC980
+glabel fx_102_render
 /* 3D2010 E00CC980 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D2014 E00CC984 3C02E00D */  lui       $v0, %hi(func_E00CC9D0)
-/* 3D2018 E00CC988 2442C9D0 */  addiu     $v0, $v0, %lo(func_E00CC9D0)
+/* 3D2014 E00CC984 3C02E00D */  lui       $v0, %hi(fx_102_appendGfx)
+/* 3D2018 E00CC988 2442C9D0 */  addiu     $v0, $v0, %lo(fx_102_appendGfx)
 /* 3D201C E00CC98C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D2020 E00CC990 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D2024 E00CC994 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s
rename to ver/us/asm/nonmatchings/effects/effect_102/fx_102_update.s
index 14d07d9741..0d4bb58bf5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s
+++ b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CC258
+glabel fx_102_update
 /* 3D18E8 E00CC258 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3D18EC E00CC25C AFBF00BC */  sw        $ra, 0xbc($sp)
 /* 3D18F0 E00CC260 AFBE00B8 */  sw        $fp, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s
rename to ver/us/asm/nonmatchings/effects/effect_103/fx_103_appendGfx.s
index b010eb9421..4c1dcc6f58 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s
+++ b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CE478
+glabel fx_103_appendGfx
 /* 3D2F38 E00CE478 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 3D2F3C E00CE47C 0080502D */  daddu     $t2, $a0, $zero
 /* 3D2F40 E00CE480 3C0BDB06 */  lui       $t3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s
index 304560be18..14e72fcc51 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s
@@ -12,14 +12,14 @@ glabel fx_103_main
 /* 3D2ADC E00CE01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D2AE0 E00CE020 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3D2AE4 E00CE024 8FB00084 */  lw        $s0, 0x84($sp)
-/* 3D2AE8 E00CE028 3C02E00D */  lui       $v0, %hi(func_E00CE21C)
-/* 3D2AEC E00CE02C 2442E21C */  addiu     $v0, $v0, %lo(func_E00CE21C)
+/* 3D2AE8 E00CE028 3C02E00D */  lui       $v0, %hi(fx_103_init)
+/* 3D2AEC E00CE02C 2442E21C */  addiu     $v0, $v0, %lo(fx_103_init)
 /* 3D2AF0 E00CE030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D2AF4 E00CE034 3C02E00D */  lui       $v0, %hi(func_E00CE224)
-/* 3D2AF8 E00CE038 2442E224 */  addiu     $v0, $v0, %lo(func_E00CE224)
+/* 3D2AF4 E00CE034 3C02E00D */  lui       $v0, %hi(fx_103_update)
+/* 3D2AF8 E00CE038 2442E224 */  addiu     $v0, $v0, %lo(fx_103_update)
 /* 3D2AFC E00CE03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D2B00 E00CE040 3C02E00D */  lui       $v0, %hi(func_E00CE428)
-/* 3D2B04 E00CE044 2442E428 */  addiu     $v0, $v0, %lo(func_E00CE428)
+/* 3D2B00 E00CE040 3C02E00D */  lui       $v0, %hi(fx_103_render)
+/* 3D2B04 E00CE044 2442E428 */  addiu     $v0, $v0, %lo(fx_103_render)
 /* 3D2B08 E00CE048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D2B0C E00CE04C 24020067 */  addiu     $v0, $zero, 0x67
 /* 3D2B10 E00CE050 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s
rename to ver/us/asm/nonmatchings/effects/effect_103/fx_103_render.s
index bd430eb3d3..fa39d5ba9b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s
+++ b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CE428
+glabel fx_103_render
 /* 3D2EE8 E00CE428 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D2EEC E00CE42C 3C02E00D */  lui       $v0, %hi(func_E00CE478)
-/* 3D2EF0 E00CE430 2442E478 */  addiu     $v0, $v0, %lo(func_E00CE478)
+/* 3D2EEC E00CE42C 3C02E00D */  lui       $v0, %hi(fx_103_appendGfx)
+/* 3D2EF0 E00CE430 2442E478 */  addiu     $v0, $v0, %lo(fx_103_appendGfx)
 /* 3D2EF4 E00CE434 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D2EF8 E00CE438 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D2EFC E00CE43C AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s
rename to ver/us/asm/nonmatchings/effects/effect_103/fx_103_update.s
index 9e000b3c3f..cba763a1f5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s
+++ b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00CE224
+glabel fx_103_update
 /* 3D2CE4 E00CE224 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D2CE8 E00CE228 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D2CEC E00CE22C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s
rename to ver/us/asm/nonmatchings/effects/effect_104/fx_104_appendGfx.s
index 1c87f72804..28796d73fc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D048C
+glabel fx_104_appendGfx
 /* 3D42AC E00D048C 27BDFED8 */  addiu     $sp, $sp, -0x128
 /* 3D42B0 E00D0490 3C07DB06 */  lui       $a3, 0xdb06
 /* 3D42B4 E00D0494 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s
index eddf5f30c6..12376bfd66 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s
@@ -24,15 +24,15 @@ glabel fx_104_main
 /* 3D3E6C E00D004C 24100007 */  addiu     $s0, $zero, 7
 .LE00D0050:
 /* 3D3E70 E00D0050 26100001 */  addiu     $s0, $s0, 1
-/* 3D3E74 E00D0054 3C02E00D */  lui       $v0, %hi(func_E00D018C)
-/* 3D3E78 E00D0058 2442018C */  addiu     $v0, $v0, %lo(func_E00D018C)
+/* 3D3E74 E00D0054 3C02E00D */  lui       $v0, %hi(fx_104_init)
+/* 3D3E78 E00D0058 2442018C */  addiu     $v0, $v0, %lo(fx_104_init)
 /* 3D3E7C E00D005C AFA00010 */  sw        $zero, 0x10($sp)
 /* 3D3E80 E00D0060 AC820008 */  sw        $v0, 8($a0)
-/* 3D3E84 E00D0064 3C02E00D */  lui       $v0, %hi(func_E00D0194)
-/* 3D3E88 E00D0068 24420194 */  addiu     $v0, $v0, %lo(func_E00D0194)
+/* 3D3E84 E00D0064 3C02E00D */  lui       $v0, %hi(fx_104_update)
+/* 3D3E88 E00D0068 24420194 */  addiu     $v0, $v0, %lo(fx_104_update)
 /* 3D3E8C E00D006C AC82000C */  sw        $v0, 0xc($a0)
-/* 3D3E90 E00D0070 3C02E00D */  lui       $v0, %hi(func_E00D0448)
-/* 3D3E94 E00D0074 24420448 */  addiu     $v0, $v0, %lo(func_E00D0448)
+/* 3D3E90 E00D0070 3C02E00D */  lui       $v0, %hi(fx_104_render)
+/* 3D3E94 E00D0074 24420448 */  addiu     $v0, $v0, %lo(fx_104_render)
 /* 3D3E98 E00D0078 AC820010 */  sw        $v0, 0x10($a0)
 /* 3D3E9C E00D007C 24020068 */  addiu     $v0, $zero, 0x68
 /* 3D3EA0 E00D0080 AC800014 */  sw        $zero, 0x14($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s
rename to ver/us/asm/nonmatchings/effects/effect_104/fx_104_render.s
index 98420ba24f..d64342d954 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s
+++ b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D0448
+glabel fx_104_render
 /* 3D4268 E00D0448 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D426C E00D044C 3C02E00D */  lui       $v0, %hi(func_E00D048C)
-/* 3D4270 E00D0450 2442048C */  addiu     $v0, $v0, %lo(func_E00D048C)
+/* 3D426C E00D044C 3C02E00D */  lui       $v0, %hi(fx_104_appendGfx)
+/* 3D4270 E00D0450 2442048C */  addiu     $v0, $v0, %lo(fx_104_appendGfx)
 /* 3D4274 E00D0454 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D4278 E00D0458 24020028 */  addiu     $v0, $zero, 0x28
 /* 3D427C E00D045C AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s
rename to ver/us/asm/nonmatchings/effects/effect_104/fx_104_update.s
index 56cb3850e2..42c2895314 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s
+++ b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D0194
+glabel fx_104_update
 /* 3D3FB4 E00D0194 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3D3FB8 E00D0198 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 3D3FBC E00D019C 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s
rename to ver/us/asm/nonmatchings/effects/effect_105/fx_105_appendGfx.s
index 1f2bda0dfb..26b5d1f3a8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s
+++ b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D2284
+glabel fx_105_appendGfx
 /* 3D4BF4 E00D2284 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3D4BF8 E00D2288 0080302D */  daddu     $a2, $a0, $zero
 /* 3D4BFC E00D228C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s
index 28692df160..bc809bffd7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s
@@ -14,14 +14,14 @@ glabel fx_105_main
 /* 3D4994 E00D2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D4998 E00D2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3D499C E00D202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3D49A0 E00D2030 3C02E00D */  lui       $v0, %hi(func_E00D2118)
-/* 3D49A4 E00D2034 24422118 */  addiu     $v0, $v0, %lo(func_E00D2118)
+/* 3D49A0 E00D2030 3C02E00D */  lui       $v0, %hi(fx_105_init)
+/* 3D49A4 E00D2034 24422118 */  addiu     $v0, $v0, %lo(fx_105_init)
 /* 3D49A8 E00D2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D49AC E00D203C 3C02E00D */  lui       $v0, %hi(func_E00D2120)
-/* 3D49B0 E00D2040 24422120 */  addiu     $v0, $v0, %lo(func_E00D2120)
+/* 3D49AC E00D203C 3C02E00D */  lui       $v0, %hi(fx_105_update)
+/* 3D49B0 E00D2040 24422120 */  addiu     $v0, $v0, %lo(fx_105_update)
 /* 3D49B4 E00D2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D49B8 E00D2048 3C02E00D */  lui       $v0, %hi(func_E00D2234)
-/* 3D49BC E00D204C 24422234 */  addiu     $v0, $v0, %lo(func_E00D2234)
+/* 3D49B8 E00D2048 3C02E00D */  lui       $v0, %hi(fx_105_render)
+/* 3D49BC E00D204C 24422234 */  addiu     $v0, $v0, %lo(fx_105_render)
 /* 3D49C0 E00D2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D49C4 E00D2054 24020069 */  addiu     $v0, $zero, 0x69
 /* 3D49C8 E00D2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s
rename to ver/us/asm/nonmatchings/effects/effect_105/fx_105_render.s
index c6f8efc4a1..a5a564a15a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s
+++ b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D2234
+glabel fx_105_render
 /* 3D4BA4 E00D2234 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D4BA8 E00D2238 3C02E00D */  lui       $v0, %hi(func_E00D2284)
-/* 3D4BAC E00D223C 24422284 */  addiu     $v0, $v0, %lo(func_E00D2284)
+/* 3D4BA8 E00D2238 3C02E00D */  lui       $v0, %hi(fx_105_appendGfx)
+/* 3D4BAC E00D223C 24422284 */  addiu     $v0, $v0, %lo(fx_105_appendGfx)
 /* 3D4BB0 E00D2240 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D4BB4 E00D2244 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D4BB8 E00D2248 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s
rename to ver/us/asm/nonmatchings/effects/effect_105/fx_105_update.s
index 75b80b92ad..69d2c080ff 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s
+++ b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D2120
+glabel fx_105_update
 /* 3D4A90 E00D2120 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D4A94 E00D2124 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D4A98 E00D2128 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s
rename to ver/us/asm/nonmatchings/effects/effect_107/fx_107_appendGfx.s
index ecdb7dfcf5..146bdfd8ba 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s
+++ b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D6980
+glabel fx_107_appendGfx
 /* 3D59A0 E00D6980 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 3D59A4 E00D6984 3C08DB06 */  lui       $t0, 0xdb06
 /* 3D59A8 E00D6988 AFB200B8 */  sw        $s2, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s
index b5d13626bb..2c584cbd0f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s
@@ -27,14 +27,14 @@ glabel fx_107_main
 /* 3D5078 E00D6058 3C08E00D */  lui       $t0, %hi(D_E00D6E74)
 /* 3D507C E00D605C 01174021 */  addu      $t0, $t0, $s7
 /* 3D5080 E00D6060 91086E74 */  lbu       $t0, %lo(D_E00D6E74)($t0)
-/* 3D5084 E00D6064 3C02E00D */  lui       $v0, %hi(func_E00D6718)
-/* 3D5088 E00D6068 24426718 */  addiu     $v0, $v0, %lo(func_E00D6718)
+/* 3D5084 E00D6064 3C02E00D */  lui       $v0, %hi(fx_107_init)
+/* 3D5088 E00D6068 24426718 */  addiu     $v0, $v0, %lo(fx_107_init)
 /* 3D508C E00D606C AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D5090 E00D6070 3C02E00D */  lui       $v0, %hi(func_E00D6720)
-/* 3D5094 E00D6074 24426720 */  addiu     $v0, $v0, %lo(func_E00D6720)
+/* 3D5090 E00D6070 3C02E00D */  lui       $v0, %hi(fx_107_update)
+/* 3D5094 E00D6074 24426720 */  addiu     $v0, $v0, %lo(fx_107_update)
 /* 3D5098 E00D6078 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D509C E00D607C 3C02E00D */  lui       $v0, %hi(func_E00D693C)
-/* 3D50A0 E00D6080 2442693C */  addiu     $v0, $v0, %lo(func_E00D693C)
+/* 3D509C E00D607C 3C02E00D */  lui       $v0, %hi(fx_107_render)
+/* 3D50A0 E00D6080 2442693C */  addiu     $v0, $v0, %lo(fx_107_render)
 /* 3D50A4 E00D6084 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D50A8 E00D6088 2402006B */  addiu     $v0, $zero, 0x6b
 /* 3D50AC E00D608C AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s
rename to ver/us/asm/nonmatchings/effects/effect_107/fx_107_render.s
index 34c7fa7689..2865272dec 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D693C
+glabel fx_107_render
 /* 3D595C E00D693C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D5960 E00D6940 3C02E00D */  lui       $v0, %hi(func_E00D6980)
-/* 3D5964 E00D6944 24426980 */  addiu     $v0, $v0, %lo(func_E00D6980)
+/* 3D5960 E00D6940 3C02E00D */  lui       $v0, %hi(fx_107_appendGfx)
+/* 3D5964 E00D6944 24426980 */  addiu     $v0, $v0, %lo(fx_107_appendGfx)
 /* 3D5968 E00D6948 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D596C E00D694C 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D5970 E00D6950 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s
rename to ver/us/asm/nonmatchings/effects/effect_107/fx_107_update.s
index e026c10afb..c6b559b651 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s
+++ b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D6720
+glabel fx_107_update
 /* 3D5740 E00D6720 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3D5744 E00D6724 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3D5748 E00D6728 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s b/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s
index fc0f30017d..11e277942a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s
@@ -14,14 +14,14 @@ glabel fx_108_main
 /* 3D67E4 E00D8024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D67E8 E00D8028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3D67EC E00D802C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3D67F0 E00D8030 3C02E00E */  lui       $v0, %hi(func_E00D8120)
-/* 3D67F4 E00D8034 24428120 */  addiu     $v0, $v0, %lo(func_E00D8120)
+/* 3D67F0 E00D8030 3C02E00E */  lui       $v0, %hi(fx_108_init)
+/* 3D67F4 E00D8034 24428120 */  addiu     $v0, $v0, %lo(fx_108_init)
 /* 3D67F8 E00D8038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D67FC E00D803C 3C02E00E */  lui       $v0, %hi(func_E00D8128)
-/* 3D6800 E00D8040 24428128 */  addiu     $v0, $v0, %lo(func_E00D8128)
+/* 3D67FC E00D803C 3C02E00E */  lui       $v0, %hi(fx_108_update)
+/* 3D6800 E00D8040 24428128 */  addiu     $v0, $v0, %lo(fx_108_update)
 /* 3D6804 E00D8044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D6808 E00D8048 3C02E00E */  lui       $v0, %hi(func_E00D825C)
-/* 3D680C E00D804C 2442825C */  addiu     $v0, $v0, %lo(func_E00D825C)
+/* 3D6808 E00D8048 3C02E00E */  lui       $v0, %hi(fx_108_render)
+/* 3D680C E00D804C 2442825C */  addiu     $v0, $v0, %lo(fx_108_render)
 /* 3D6810 E00D8050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D6814 E00D8054 3C02E00E */  lui       $v0, %hi(func_E00D8264)
 /* 3D6818 E00D8058 24428264 */  addiu     $v0, $v0, %lo(func_E00D8264)
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s b/ver/us/asm/nonmatchings/effects/effect_108/fx_108_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s
rename to ver/us/asm/nonmatchings/effects/effect_108/fx_108_update.s
index f41796d3be..618bed4419 100644
--- a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s
+++ b/ver/us/asm/nonmatchings/effects/effect_108/fx_108_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00D8128
+glabel fx_108_update
 /* 3D68E8 E00D8128 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D68EC E00D812C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D68F0 E00D8130 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s
rename to ver/us/asm/nonmatchings/effects/effect_109/fx_109_appendGfx.s
index f65a24f46c..d33681a52e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s
+++ b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DA230
+glabel fx_109_appendGfx
 /* 3D7470 E00DA230 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3D7474 E00DA234 0080302D */  daddu     $a2, $a0, $zero
 /* 3D7478 E00DA238 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s
index 6747f85153..ee5fb30458 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s
@@ -12,14 +12,14 @@ glabel fx_109_main
 /* 3D725C E00DA01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D7260 E00DA020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3D7264 E00DA024 4487C000 */  mtc1      $a3, $f24
-/* 3D7268 E00DA028 3C02E00E */  lui       $v0, %hi(func_E00DA0FC)
-/* 3D726C E00DA02C 2442A0FC */  addiu     $v0, $v0, %lo(func_E00DA0FC)
+/* 3D7268 E00DA028 3C02E00E */  lui       $v0, %hi(fx_109_init)
+/* 3D726C E00DA02C 2442A0FC */  addiu     $v0, $v0, %lo(fx_109_init)
 /* 3D7270 E00DA030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D7274 E00DA034 3C02E00E */  lui       $v0, %hi(func_E00DA104)
-/* 3D7278 E00DA038 2442A104 */  addiu     $v0, $v0, %lo(func_E00DA104)
+/* 3D7274 E00DA034 3C02E00E */  lui       $v0, %hi(fx_109_update)
+/* 3D7278 E00DA038 2442A104 */  addiu     $v0, $v0, %lo(fx_109_update)
 /* 3D727C E00DA03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D7280 E00DA040 3C02E00E */  lui       $v0, %hi(func_E00DA1E0)
-/* 3D7284 E00DA044 2442A1E0 */  addiu     $v0, $v0, %lo(func_E00DA1E0)
+/* 3D7280 E00DA040 3C02E00E */  lui       $v0, %hi(fx_109_render)
+/* 3D7284 E00DA044 2442A1E0 */  addiu     $v0, $v0, %lo(fx_109_render)
 /* 3D7288 E00DA048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D728C E00DA04C 2402006D */  addiu     $v0, $zero, 0x6d
 /* 3D7290 E00DA050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s
rename to ver/us/asm/nonmatchings/effects/effect_109/fx_109_render.s
index 6315f8c59e..fd508b6c7e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DA1E0
+glabel fx_109_render
 /* 3D7420 E00DA1E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D7424 E00DA1E4 3C02E00E */  lui       $v0, %hi(func_E00DA230)
-/* 3D7428 E00DA1E8 2442A230 */  addiu     $v0, $v0, %lo(func_E00DA230)
+/* 3D7424 E00DA1E4 3C02E00E */  lui       $v0, %hi(fx_109_appendGfx)
+/* 3D7428 E00DA1E8 2442A230 */  addiu     $v0, $v0, %lo(fx_109_appendGfx)
 /* 3D742C E00DA1EC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D7430 E00DA1F0 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D7434 E00DA1F4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s
rename to ver/us/asm/nonmatchings/effects/effect_109/fx_109_update.s
index 65711308b2..1efd35568f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s
+++ b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DA104
+glabel fx_109_update
 /* 3D7344 E00DA104 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D7348 E00DA108 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D734C E00DA10C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s
rename to ver/us/asm/nonmatchings/effects/effect_11/fx_11_appendGfx.s
index fef40572f8..07479a53a9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s
+++ b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0016454
+glabel fx_11_appendGfx
 /* 32F284 E0016454 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 32F288 E0016458 AFB600B8 */  sw        $s6, 0xb8($sp)
 /* 32F28C E001645C 0080B02D */  daddu     $s6, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s
index 732128ac23..f1edaffa12 100644
--- a/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s
@@ -12,14 +12,14 @@ glabel fx_11_main
 /* 32EE4C E001601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32EE50 E0016020 F7BC0068 */  sdc1      $f28, 0x68($sp)
 /* 32EE54 E0016024 4487E000 */  mtc1      $a3, $f28
-/* 32EE58 E0016028 3C02E001 */  lui       $v0, %hi(func_E0016220)
-/* 32EE5C E001602C 24426220 */  addiu     $v0, $v0, %lo(func_E0016220)
+/* 32EE58 E0016028 3C02E001 */  lui       $v0, %hi(fx_11_init)
+/* 32EE5C E001602C 24426220 */  addiu     $v0, $v0, %lo(fx_11_init)
 /* 32EE60 E0016030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32EE64 E0016034 3C02E001 */  lui       $v0, %hi(func_E0016228)
-/* 32EE68 E0016038 24426228 */  addiu     $v0, $v0, %lo(func_E0016228)
+/* 32EE64 E0016034 3C02E001 */  lui       $v0, %hi(fx_11_update)
+/* 32EE68 E0016038 24426228 */  addiu     $v0, $v0, %lo(fx_11_update)
 /* 32EE6C E001603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32EE70 E0016040 3C02E001 */  lui       $v0, %hi(func_E0016410)
-/* 32EE74 E0016044 24426410 */  addiu     $v0, $v0, %lo(func_E0016410)
+/* 32EE70 E0016040 3C02E001 */  lui       $v0, %hi(fx_11_render)
+/* 32EE74 E0016044 24426410 */  addiu     $v0, $v0, %lo(fx_11_render)
 /* 32EE78 E0016048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32EE7C E001604C 2402000B */  addiu     $v0, $zero, 0xb
 /* 32EE80 E0016050 AFBF0044 */  sw        $ra, 0x44($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s
rename to ver/us/asm/nonmatchings/effects/effect_11/fx_11_render.s
index e81afd8bbc..f227236f44 100644
--- a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s
+++ b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0016410
+glabel fx_11_render
 /* 32F240 E0016410 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 32F244 E0016414 3C02E001 */  lui       $v0, %hi(func_E0016454)
-/* 32F248 E0016418 24426454 */  addiu     $v0, $v0, %lo(func_E0016454)
+/* 32F244 E0016414 3C02E001 */  lui       $v0, %hi(fx_11_appendGfx)
+/* 32F248 E0016418 24426454 */  addiu     $v0, $v0, %lo(fx_11_appendGfx)
 /* 32F24C E001641C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 32F250 E0016420 24020028 */  addiu     $v0, $zero, 0x28
 /* 32F254 E0016424 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s
rename to ver/us/asm/nonmatchings/effects/effect_11/fx_11_update.s
index 6979e590db..9e0b2506c9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s
+++ b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0016228
+glabel fx_11_update
 /* 32F058 E0016228 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 32F05C E001622C AFB40020 */  sw        $s4, 0x20($sp)
 /* 32F060 E0016230 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s
rename to ver/us/asm/nonmatchings/effects/effect_110/fx_110_appendGfx.s
index ca1abff37e..d1abd62a07 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s
+++ b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DC304
+glabel fx_110_appendGfx
 /* 3D7D74 E00DC304 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D7D78 E00DC308 0080302D */  daddu     $a2, $a0, $zero
 /* 3D7D7C E00DC30C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s
index 7bf6427171..82335565f4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s
@@ -14,14 +14,14 @@ glabel fx_110_main
 /* 3D7A94 E00DC024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D7A98 E00DC028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3D7A9C E00DC02C 8FB00074 */  lw        $s0, 0x74($sp)
-/* 3D7AA0 E00DC030 3C02E00E */  lui       $v0, %hi(func_E00DC190)
-/* 3D7AA4 E00DC034 2442C190 */  addiu     $v0, $v0, %lo(func_E00DC190)
+/* 3D7AA0 E00DC030 3C02E00E */  lui       $v0, %hi(fx_110_init)
+/* 3D7AA4 E00DC034 2442C190 */  addiu     $v0, $v0, %lo(fx_110_init)
 /* 3D7AA8 E00DC038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D7AAC E00DC03C 3C02E00E */  lui       $v0, %hi(func_E00DC198)
-/* 3D7AB0 E00DC040 2442C198 */  addiu     $v0, $v0, %lo(func_E00DC198)
+/* 3D7AAC E00DC03C 3C02E00E */  lui       $v0, %hi(fx_110_update)
+/* 3D7AB0 E00DC040 2442C198 */  addiu     $v0, $v0, %lo(fx_110_update)
 /* 3D7AB4 E00DC044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D7AB8 E00DC048 3C02E00E */  lui       $v0, %hi(func_E00DC2C0)
-/* 3D7ABC E00DC04C 2442C2C0 */  addiu     $v0, $v0, %lo(func_E00DC2C0)
+/* 3D7AB8 E00DC048 3C02E00E */  lui       $v0, %hi(fx_110_render)
+/* 3D7ABC E00DC04C 2442C2C0 */  addiu     $v0, $v0, %lo(fx_110_render)
 /* 3D7AC0 E00DC050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D7AC4 E00DC054 2402006E */  addiu     $v0, $zero, 0x6e
 /* 3D7AC8 E00DC058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s
rename to ver/us/asm/nonmatchings/effects/effect_110/fx_110_render.s
index a071ce6182..884105866f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DC2C0
+glabel fx_110_render
 /* 3D7D30 E00DC2C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D7D34 E00DC2C4 3C02E00E */  lui       $v0, %hi(func_E00DC304)
-/* 3D7D38 E00DC2C8 2442C304 */  addiu     $v0, $v0, %lo(func_E00DC304)
+/* 3D7D34 E00DC2C4 3C02E00E */  lui       $v0, %hi(fx_110_appendGfx)
+/* 3D7D38 E00DC2C8 2442C304 */  addiu     $v0, $v0, %lo(fx_110_appendGfx)
 /* 3D7D3C E00DC2CC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D7D40 E00DC2D0 2402000A */  addiu     $v0, $zero, 0xa
 /* 3D7D44 E00DC2D4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s
rename to ver/us/asm/nonmatchings/effects/effect_110/fx_110_update.s
index e64108d4fe..420a41747c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s
+++ b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DC198
+glabel fx_110_update
 /* 3D7C08 E00DC198 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D7C0C E00DC19C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D7C10 E00DC1A0 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s
rename to ver/us/asm/nonmatchings/effects/effect_111/fx_111_appendGfx.s
index 8744e0c3c8..f548e5764d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DE2A8
+glabel fx_111_appendGfx
 /* 3D89C8 E00DE2A8 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D89CC E00DE2AC 0080302D */  daddu     $a2, $a0, $zero
 /* 3D89D0 E00DE2B0 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s
index dbdc7ee443..638bccc550 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s
@@ -14,14 +14,14 @@ glabel fx_111_main
 /* 3D8744 E00DE024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D8748 E00DE028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3D874C E00DE02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3D8750 E00DE030 3C02E00E */  lui       $v0, %hi(func_E00DE11C)
-/* 3D8754 E00DE034 2442E11C */  addiu     $v0, $v0, %lo(func_E00DE11C)
+/* 3D8750 E00DE030 3C02E00E */  lui       $v0, %hi(fx_111_init)
+/* 3D8754 E00DE034 2442E11C */  addiu     $v0, $v0, %lo(fx_111_init)
 /* 3D8758 E00DE038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D875C E00DE03C 3C02E00E */  lui       $v0, %hi(func_E00DE124)
-/* 3D8760 E00DE040 2442E124 */  addiu     $v0, $v0, %lo(func_E00DE124)
+/* 3D875C E00DE03C 3C02E00E */  lui       $v0, %hi(fx_111_update)
+/* 3D8760 E00DE040 2442E124 */  addiu     $v0, $v0, %lo(fx_111_update)
 /* 3D8764 E00DE044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D8768 E00DE048 3C02E00E */  lui       $v0, %hi(func_E00DE260)
-/* 3D876C E00DE04C 2442E260 */  addiu     $v0, $v0, %lo(func_E00DE260)
+/* 3D8768 E00DE048 3C02E00E */  lui       $v0, %hi(fx_111_render)
+/* 3D876C E00DE04C 2442E260 */  addiu     $v0, $v0, %lo(fx_111_render)
 /* 3D8770 E00DE050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D8774 E00DE054 2402006F */  addiu     $v0, $zero, 0x6f
 /* 3D8778 E00DE058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s
rename to ver/us/asm/nonmatchings/effects/effect_111/fx_111_render.s
index df753c9379..8bd7754de1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s
+++ b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DE260
+glabel fx_111_render
 /* 3D8980 E00DE260 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D8984 E00DE264 3C02E00E */  lui       $v0, %hi(func_E00DE2A8)
-/* 3D8988 E00DE268 2442E2A8 */  addiu     $v0, $v0, %lo(func_E00DE2A8)
+/* 3D8984 E00DE264 3C02E00E */  lui       $v0, %hi(fx_111_appendGfx)
+/* 3D8988 E00DE268 2442E2A8 */  addiu     $v0, $v0, %lo(fx_111_appendGfx)
 /* 3D898C E00DE26C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3D8990 E00DE270 24020006 */  addiu     $v0, $zero, 6
 /* 3D8994 E00DE274 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s
rename to ver/us/asm/nonmatchings/effects/effect_111/fx_111_update.s
index 7c55a6a8b7..b0cf84654b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s
+++ b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00DE124
+glabel fx_111_update
 /* 3D8844 E00DE124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D8848 E00DE128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D884C E00DE12C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s
rename to ver/us/asm/nonmatchings/effects/effect_112/fx_112_appendGfx.s
index 8c537e1bc7..c87727628f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s
+++ b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E0600
+glabel fx_112_appendGfx
 /* 3DBA60 E00E0600 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3DBA64 E00E0604 AFBE00B0 */  sw        $fp, 0xb0($sp)
 /* 3DBA68 E00E0608 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s
index e9670d58c4..8902ff95bd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s
@@ -16,14 +16,14 @@ glabel fx_112_main
 /* 3DB48C E00E002C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3DB490 E00E0030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3DB494 E00E0034 8FB20078 */  lw        $s2, 0x78($sp)
-/* 3DB498 E00E0038 3C02E00E */  lui       $v0, %hi(func_E00E01D0)
-/* 3DB49C E00E003C 244201D0 */  addiu     $v0, $v0, %lo(func_E00E01D0)
+/* 3DB498 E00E0038 3C02E00E */  lui       $v0, %hi(fx_112_init)
+/* 3DB49C E00E003C 244201D0 */  addiu     $v0, $v0, %lo(fx_112_init)
 /* 3DB4A0 E00E0040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3DB4A4 E00E0044 3C02E00E */  lui       $v0, %hi(func_E00E01D8)
-/* 3DB4A8 E00E0048 244201D8 */  addiu     $v0, $v0, %lo(func_E00E01D8)
+/* 3DB4A4 E00E0044 3C02E00E */  lui       $v0, %hi(fx_112_update)
+/* 3DB4A8 E00E0048 244201D8 */  addiu     $v0, $v0, %lo(fx_112_update)
 /* 3DB4AC E00E004C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3DB4B0 E00E0050 3C02E00E */  lui       $v0, %hi(func_E00E05B0)
-/* 3DB4B4 E00E0054 244205B0 */  addiu     $v0, $v0, %lo(func_E00E05B0)
+/* 3DB4B0 E00E0050 3C02E00E */  lui       $v0, %hi(fx_112_render)
+/* 3DB4B4 E00E0054 244205B0 */  addiu     $v0, $v0, %lo(fx_112_render)
 /* 3DB4B8 E00E0058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3DB4BC E00E005C 24020070 */  addiu     $v0, $zero, 0x70
 /* 3DB4C0 E00E0060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s
rename to ver/us/asm/nonmatchings/effects/effect_112/fx_112_render.s
index c25fba3c24..7ac2e4f467 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E05B0
+glabel fx_112_render
 /* 3DBA10 E00E05B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3DBA14 E00E05B4 3C02E00E */  lui       $v0, %hi(func_E00E0600)
-/* 3DBA18 E00E05B8 24420600 */  addiu     $v0, $v0, %lo(func_E00E0600)
+/* 3DBA14 E00E05B4 3C02E00E */  lui       $v0, %hi(fx_112_appendGfx)
+/* 3DBA18 E00E05B8 24420600 */  addiu     $v0, $v0, %lo(fx_112_appendGfx)
 /* 3DBA1C E00E05BC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3DBA20 E00E05C0 2402000A */  addiu     $v0, $zero, 0xa
 /* 3DBA24 E00E05C4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s
rename to ver/us/asm/nonmatchings/effects/effect_112/fx_112_update.s
index 4873450032..9c13868f2f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E01D8
+glabel fx_112_update
 /* 3DB638 E00E01D8 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3DB63C E00E01DC AFB20020 */  sw        $s2, 0x20($sp)
 /* 3DB640 E00E01E0 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s
rename to ver/us/asm/nonmatchings/effects/effect_113/fx_113_appendGfx.s
index 905a81b406..cacb9cd8f1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s
+++ b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E2218
+glabel fx_113_appendGfx
 /* 3DC528 E00E2218 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3DC52C E00E221C 0080302D */  daddu     $a2, $a0, $zero
 /* 3DC530 E00E2220 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s
index 03aa3acf2d..52e572c5ff 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s
@@ -14,14 +14,14 @@ glabel fx_113_main
 /* 3DC334 E00E2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3DC338 E00E2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3DC33C E00E202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3DC340 E00E2030 3C02E00E */  lui       $v0, %hi(func_E00E212C)
-/* 3DC344 E00E2034 2442212C */  addiu     $v0, $v0, %lo(func_E00E212C)
+/* 3DC340 E00E2030 3C02E00E */  lui       $v0, %hi(fx_113_init)
+/* 3DC344 E00E2034 2442212C */  addiu     $v0, $v0, %lo(fx_113_init)
 /* 3DC348 E00E2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3DC34C E00E203C 3C02E00E */  lui       $v0, %hi(func_E00E2134)
-/* 3DC350 E00E2040 24422134 */  addiu     $v0, $v0, %lo(func_E00E2134)
+/* 3DC34C E00E203C 3C02E00E */  lui       $v0, %hi(fx_113_update)
+/* 3DC350 E00E2040 24422134 */  addiu     $v0, $v0, %lo(fx_113_update)
 /* 3DC354 E00E2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3DC358 E00E2048 3C02E00E */  lui       $v0, %hi(func_E00E21C8)
-/* 3DC35C E00E204C 244221C8 */  addiu     $v0, $v0, %lo(func_E00E21C8)
+/* 3DC358 E00E2048 3C02E00E */  lui       $v0, %hi(fx_113_render)
+/* 3DC35C E00E204C 244221C8 */  addiu     $v0, $v0, %lo(fx_113_render)
 /* 3DC360 E00E2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3DC364 E00E2054 24020071 */  addiu     $v0, $zero, 0x71
 /* 3DC368 E00E2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s
rename to ver/us/asm/nonmatchings/effects/effect_113/fx_113_render.s
index 1ddc406f07..a275a45d73 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E21C8
+glabel fx_113_render
 /* 3DC4D8 E00E21C8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3DC4DC E00E21CC 3C02E00E */  lui       $v0, %hi(func_E00E2218)
-/* 3DC4E0 E00E21D0 24422218 */  addiu     $v0, $v0, %lo(func_E00E2218)
+/* 3DC4DC E00E21CC 3C02E00E */  lui       $v0, %hi(fx_113_appendGfx)
+/* 3DC4E0 E00E21D0 24422218 */  addiu     $v0, $v0, %lo(fx_113_appendGfx)
 /* 3DC4E4 E00E21D4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3DC4E8 E00E21D8 2402000A */  addiu     $v0, $zero, 0xa
 /* 3DC4EC E00E21DC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s
rename to ver/us/asm/nonmatchings/effects/effect_113/fx_113_update.s
index 9bfa2bfcf4..831faf3798 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s
+++ b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E2134
+glabel fx_113_update
 /* 3DC444 E00E2134 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3DC448 E00E2138 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3DC44C E00E213C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s
rename to ver/us/asm/nonmatchings/effects/effect_114/fx_114_appendGfx.s
index e556455909..1c95b28cda 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E495C
+glabel fx_114_appendGfx
 /* 3DE95C E00E495C 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 3DE960 E00E4960 AFB700BC */  sw        $s7, 0xbc($sp)
 /* 3DE964 E00E4964 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s
index 790b0d372a..6638f78efb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s
@@ -16,14 +16,14 @@ glabel fx_114_main
 /* 3DE02C E00E402C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3DE030 E00E4030 AFB40038 */  sw        $s4, 0x38($sp)
 /* 3DE034 E00E4034 8FB40078 */  lw        $s4, 0x78($sp)
-/* 3DE038 E00E4038 3C02E00E */  lui       $v0, %hi(func_E00E4288)
-/* 3DE03C E00E403C 24424288 */  addiu     $v0, $v0, %lo(func_E00E4288)
+/* 3DE038 E00E4038 3C02E00E */  lui       $v0, %hi(fx_114_init)
+/* 3DE03C E00E403C 24424288 */  addiu     $v0, $v0, %lo(fx_114_init)
 /* 3DE040 E00E4040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3DE044 E00E4044 3C02E00E */  lui       $v0, %hi(func_E00E4290)
-/* 3DE048 E00E4048 24424290 */  addiu     $v0, $v0, %lo(func_E00E4290)
+/* 3DE044 E00E4044 3C02E00E */  lui       $v0, %hi(fx_114_update)
+/* 3DE048 E00E4048 24424290 */  addiu     $v0, $v0, %lo(fx_114_update)
 /* 3DE04C E00E404C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3DE050 E00E4050 3C02E00E */  lui       $v0, %hi(func_E00E490C)
-/* 3DE054 E00E4054 2442490C */  addiu     $v0, $v0, %lo(func_E00E490C)
+/* 3DE050 E00E4050 3C02E00E */  lui       $v0, %hi(fx_114_render)
+/* 3DE054 E00E4054 2442490C */  addiu     $v0, $v0, %lo(fx_114_render)
 /* 3DE058 E00E4058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3DE05C E00E405C 24020072 */  addiu     $v0, $zero, 0x72
 /* 3DE060 E00E4060 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s
rename to ver/us/asm/nonmatchings/effects/effect_114/fx_114_render.s
index c3655f45b6..65bb30d736 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E490C
+glabel fx_114_render
 /* 3DE90C E00E490C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3DE910 E00E4910 3C02E00E */  lui       $v0, %hi(func_E00E495C)
-/* 3DE914 E00E4914 2442495C */  addiu     $v0, $v0, %lo(func_E00E495C)
+/* 3DE910 E00E4910 3C02E00E */  lui       $v0, %hi(fx_114_appendGfx)
+/* 3DE914 E00E4914 2442495C */  addiu     $v0, $v0, %lo(fx_114_appendGfx)
 /* 3DE918 E00E4918 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3DE91C E00E491C 24020007 */  addiu     $v0, $zero, 7
 /* 3DE920 E00E4920 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s
rename to ver/us/asm/nonmatchings/effects/effect_114/fx_114_update.s
index f728df34b1..aae009cb19 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s
+++ b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E4290
+glabel fx_114_update
 /* 3DE290 E00E4290 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 3DE294 E00E4294 AFB40038 */  sw        $s4, 0x38($sp)
 /* 3DE298 E00E4298 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s
rename to ver/us/asm/nonmatchings/effects/effect_115/fx_115_appendGfx.s
index 2ddf7de123..1c3bb0b267 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s
+++ b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E6524
+glabel fx_115_appendGfx
 /* 3E0E54 E00E6524 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3E0E58 E00E6528 AFBE00C8 */  sw        $fp, 0xc8($sp)
 /* 3E0E5C E00E652C 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s
index c25021e3ae..53446d156d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s
@@ -16,14 +16,14 @@ glabel fx_115_main
 /* 3E095C E00E602C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E0960 E00E6030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3E0964 E00E6034 8FB20070 */  lw        $s2, 0x70($sp)
-/* 3E0968 E00E6038 3C02E00E */  lui       $v0, %hi(func_E00E617C)
-/* 3E096C E00E603C 2442617C */  addiu     $v0, $v0, %lo(func_E00E617C)
+/* 3E0968 E00E6038 3C02E00E */  lui       $v0, %hi(fx_115_init)
+/* 3E096C E00E603C 2442617C */  addiu     $v0, $v0, %lo(fx_115_init)
 /* 3E0970 E00E6040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E0974 E00E6044 3C02E00E */  lui       $v0, %hi(func_E00E6184)
-/* 3E0978 E00E6048 24426184 */  addiu     $v0, $v0, %lo(func_E00E6184)
+/* 3E0974 E00E6044 3C02E00E */  lui       $v0, %hi(fx_115_update)
+/* 3E0978 E00E6048 24426184 */  addiu     $v0, $v0, %lo(fx_115_update)
 /* 3E097C E00E604C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E0980 E00E6050 3C02E00E */  lui       $v0, %hi(func_E00E64D4)
-/* 3E0984 E00E6054 244264D4 */  addiu     $v0, $v0, %lo(func_E00E64D4)
+/* 3E0980 E00E6050 3C02E00E */  lui       $v0, %hi(fx_115_render)
+/* 3E0984 E00E6054 244264D4 */  addiu     $v0, $v0, %lo(fx_115_render)
 /* 3E0988 E00E6058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E098C E00E605C 24020073 */  addiu     $v0, $zero, 0x73
 /* 3E0990 E00E6060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s
rename to ver/us/asm/nonmatchings/effects/effect_115/fx_115_render.s
index 677d7524d0..b67fe36f9f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E64D4
+glabel fx_115_render
 /* 3E0E04 E00E64D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3E0E08 E00E64D8 3C02E00E */  lui       $v0, %hi(func_E00E6524)
-/* 3E0E0C E00E64DC 24426524 */  addiu     $v0, $v0, %lo(func_E00E6524)
+/* 3E0E08 E00E64D8 3C02E00E */  lui       $v0, %hi(fx_115_appendGfx)
+/* 3E0E0C E00E64DC 24426524 */  addiu     $v0, $v0, %lo(fx_115_appendGfx)
 /* 3E0E10 E00E64E0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3E0E14 E00E64E4 2402000A */  addiu     $v0, $zero, 0xa
 /* 3E0E18 E00E64E8 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s
rename to ver/us/asm/nonmatchings/effects/effect_115/fx_115_update.s
index 0450bd561b..4cccad5e08 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s
+++ b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E6184
+glabel fx_115_update
 /* 3E0AB4 E00E6184 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3E0AB8 E00E6188 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3E0ABC E00E618C 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s
rename to ver/us/asm/nonmatchings/effects/effect_116/fx_116_appendGfx.s
index f35be1bd63..63cca7426c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E83BC
+glabel fx_116_appendGfx
 /* 3E1A4C E00E83BC 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 3E1A50 E00E83C0 0080302D */  daddu     $a2, $a0, $zero
 /* 3E1A54 E00E83C4 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s
index 42c2463e6a..1466a3bff9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s
@@ -10,14 +10,14 @@ glabel fx_116_main
 /* 3E16A4 E00E8014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E16A8 E00E8018 F7BC0058 */  sdc1      $f28, 0x58($sp)
 /* 3E16AC E00E801C C7BC0084 */  lwc1      $f28, 0x84($sp)
-/* 3E16B0 E00E8020 3C02E00F */  lui       $v0, %hi(func_E00E825C)
-/* 3E16B4 E00E8024 2442825C */  addiu     $v0, $v0, %lo(func_E00E825C)
+/* 3E16B0 E00E8020 3C02E00F */  lui       $v0, %hi(fx_116_init)
+/* 3E16B4 E00E8024 2442825C */  addiu     $v0, $v0, %lo(fx_116_init)
 /* 3E16B8 E00E8028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E16BC E00E802C 3C02E00F */  lui       $v0, %hi(func_E00E8264)
-/* 3E16C0 E00E8030 24428264 */  addiu     $v0, $v0, %lo(func_E00E8264)
+/* 3E16BC E00E802C 3C02E00F */  lui       $v0, %hi(fx_116_update)
+/* 3E16C0 E00E8030 24428264 */  addiu     $v0, $v0, %lo(fx_116_update)
 /* 3E16C4 E00E8034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E16C8 E00E8038 3C02E00F */  lui       $v0, %hi(func_E00E8374)
-/* 3E16CC E00E803C 24428374 */  addiu     $v0, $v0, %lo(func_E00E8374)
+/* 3E16C8 E00E8038 3C02E00F */  lui       $v0, %hi(fx_116_render)
+/* 3E16CC E00E803C 24428374 */  addiu     $v0, $v0, %lo(fx_116_render)
 /* 3E16D0 E00E8040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E16D4 E00E8044 24020074 */  addiu     $v0, $zero, 0x74
 /* 3E16D8 E00E8048 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s
rename to ver/us/asm/nonmatchings/effects/effect_116/fx_116_render.s
index 5dbb64b652..f5b059c30f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s
+++ b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E8374
+glabel fx_116_render
 /* 3E1A04 E00E8374 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3E1A08 E00E8378 3C02E00F */  lui       $v0, %hi(func_E00E83BC)
-/* 3E1A0C E00E837C 244283BC */  addiu     $v0, $v0, %lo(func_E00E83BC)
+/* 3E1A08 E00E8378 3C02E00F */  lui       $v0, %hi(fx_116_appendGfx)
+/* 3E1A0C E00E837C 244283BC */  addiu     $v0, $v0, %lo(fx_116_appendGfx)
 /* 3E1A10 E00E8380 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3E1A14 E00E8384 2402000A */  addiu     $v0, $zero, 0xa
 /* 3E1A18 E00E8388 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s
rename to ver/us/asm/nonmatchings/effects/effect_116/fx_116_update.s
index 0712a178e6..b9d9f35b2a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s
+++ b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00E8264
+glabel fx_116_update
 /* 3E18F4 E00E8264 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3E18F8 E00E8268 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3E18FC E00E826C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s
rename to ver/us/asm/nonmatchings/effects/effect_117/fx_117_appendGfx.s
index 0d6e21c043..6126c706b5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00EA66C
+glabel fx_117_appendGfx
 /* 3E254C E00EA66C 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3E2550 E00EA670 0080302D */  daddu     $a2, $a0, $zero
 /* 3E2554 E00EA674 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s
index af1c20e9c5..9219a730e6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s
@@ -14,14 +14,14 @@ glabel fx_117_main
 /* 3E1F04 E00EA024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E1F08 E00EA028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3E1F0C E00EA02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3E1F10 E00EA030 3C02E00F */  lui       $v0, %hi(func_E00EA190)
-/* 3E1F14 E00EA034 2442A190 */  addiu     $v0, $v0, %lo(func_E00EA190)
+/* 3E1F10 E00EA030 3C02E00F */  lui       $v0, %hi(fx_117_init)
+/* 3E1F14 E00EA034 2442A190 */  addiu     $v0, $v0, %lo(fx_117_init)
 /* 3E1F18 E00EA038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E1F1C E00EA03C 3C02E00F */  lui       $v0, %hi(func_E00EA198)
-/* 3E1F20 E00EA040 2442A198 */  addiu     $v0, $v0, %lo(func_E00EA198)
+/* 3E1F1C E00EA03C 3C02E00F */  lui       $v0, %hi(fx_117_update)
+/* 3E1F20 E00EA040 2442A198 */  addiu     $v0, $v0, %lo(fx_117_update)
 /* 3E1F24 E00EA044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E1F28 E00EA048 3C02E00F */  lui       $v0, %hi(func_E00EA520)
-/* 3E1F2C E00EA04C 2442A520 */  addiu     $v0, $v0, %lo(func_E00EA520)
+/* 3E1F28 E00EA048 3C02E00F */  lui       $v0, %hi(fx_117_render)
+/* 3E1F2C E00EA04C 2442A520 */  addiu     $v0, $v0, %lo(fx_117_render)
 /* 3E1F30 E00EA050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E1F34 E00EA054 24020075 */  addiu     $v0, $zero, 0x75
 /* 3E1F38 E00EA058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_render.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s
rename to ver/us/asm/nonmatchings/effects/effect_117/fx_117_render.s
index 33259749af..af12eeab06 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s
+++ b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_render.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00EA520
+glabel fx_117_render
 /* 3E2400 E00EA520 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3E2404 E00EA524 AFB1004C */  sw        $s1, 0x4c($sp)
 /* 3E2408 E00EA528 0080882D */  daddu     $s1, $a0, $zero
@@ -69,8 +69,8 @@ glabel func_E00EA520
 /* 3E24F8 E00EA618 0000182D */   daddu    $v1, $zero, $zero
 /* 3E24FC E00EA61C 0200202D */  daddu     $a0, $s0, $zero
 .LE00EA620:
-/* 3E2500 E00EA620 3C02E00F */  lui       $v0, %hi(func_E00EA66C)
-/* 3E2504 E00EA624 2442A66C */  addiu     $v0, $v0, %lo(func_E00EA66C)
+/* 3E2500 E00EA620 3C02E00F */  lui       $v0, %hi(fx_117_appendGfx)
+/* 3E2504 E00EA624 2442A66C */  addiu     $v0, $v0, %lo(fx_117_appendGfx)
 /* 3E2508 E00EA628 AC82000C */  sw        $v0, 0xc($a0)
 /* 3E250C E00EA62C 00031023 */  negu      $v0, $v1
 /* 3E2510 E00EA630 AC820004 */  sw        $v0, 4($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s
rename to ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
index 696977a45f..daed28776f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s
+++ b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00EA198
+glabel fx_117_update
 /* 3E2078 E00EA198 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3E207C E00EA19C AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3E2080 E00EA1A0 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s
rename to ver/us/asm/nonmatchings/effects/effect_119/fx_119_appendGfx.s
index 54a42a8db8..456aa08d8b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010A4E8
+glabel fx_119_appendGfx
 /* 3E4888 E010A4E8 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 3E488C E010A4EC AFB70094 */  sw        $s7, 0x94($sp)
 /* 3E4890 E010A4F0 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s
index e0265ba020..23434eeb92 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s
@@ -14,14 +14,14 @@ glabel fx_119_main
 /* 3E43C4 E010A024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E43C8 E010A028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3E43CC E010A02C 8FB10070 */  lw        $s1, 0x70($sp)
-/* 3E43D0 E010A030 3C02E011 */  lui       $v0, %hi(func_E010A184)
-/* 3E43D4 E010A034 2442A184 */  addiu     $v0, $v0, %lo(func_E010A184)
+/* 3E43D0 E010A030 3C02E011 */  lui       $v0, %hi(fx_119_init)
+/* 3E43D4 E010A034 2442A184 */  addiu     $v0, $v0, %lo(fx_119_init)
 /* 3E43D8 E010A038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E43DC E010A03C 3C02E011 */  lui       $v0, %hi(func_E010A18C)
-/* 3E43E0 E010A040 2442A18C */  addiu     $v0, $v0, %lo(func_E010A18C)
+/* 3E43DC E010A03C 3C02E011 */  lui       $v0, %hi(fx_119_update)
+/* 3E43E0 E010A040 2442A18C */  addiu     $v0, $v0, %lo(fx_119_update)
 /* 3E43E4 E010A044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E43E8 E010A048 3C02E011 */  lui       $v0, %hi(func_E010A4A0)
-/* 3E43EC E010A04C 2442A4A0 */  addiu     $v0, $v0, %lo(func_E010A4A0)
+/* 3E43E8 E010A048 3C02E011 */  lui       $v0, %hi(fx_119_render)
+/* 3E43EC E010A04C 2442A4A0 */  addiu     $v0, $v0, %lo(fx_119_render)
 /* 3E43F0 E010A050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E43F4 E010A054 24020077 */  addiu     $v0, $zero, 0x77
 /* 3E43F8 E010A058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s
rename to ver/us/asm/nonmatchings/effects/effect_119/fx_119_render.s
index b9a539474f..e4fc07264f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010A4A0
+glabel fx_119_render
 /* 3E4840 E010A4A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3E4844 E010A4A4 3C02E011 */  lui       $v0, %hi(func_E010A4E8)
-/* 3E4848 E010A4A8 2442A4E8 */  addiu     $v0, $v0, %lo(func_E010A4E8)
+/* 3E4844 E010A4A4 3C02E011 */  lui       $v0, %hi(fx_119_appendGfx)
+/* 3E4848 E010A4A8 2442A4E8 */  addiu     $v0, $v0, %lo(fx_119_appendGfx)
 /* 3E484C E010A4AC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3E4850 E010A4B0 240202BC */  addiu     $v0, $zero, 0x2bc
 /* 3E4854 E010A4B4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s
rename to ver/us/asm/nonmatchings/effects/effect_119/fx_119_update.s
index 85f7630372..9e0d3abf18 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010A18C
+glabel fx_119_update
 /* 3E452C E010A18C 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3E4530 E010A190 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 3E4534 E010A194 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E00183D8.s b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_12/func_E00183D8.s
rename to ver/us/asm/nonmatchings/effects/effect_12/fx_12_appendGfx.s
index c2a3a117a1..2b6ff6a5aa 100644
--- a/ver/us/asm/nonmatchings/effects/effect_12/func_E00183D8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00183D8
+glabel fx_12_appendGfx
 /* 32F958 E00183D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 32F95C E00183DC 0080602D */  daddu     $t4, $a0, $zero
 /* 32F960 E00183E0 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s
index 5b15872c60..c4f8434fbe 100644
--- a/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s
@@ -8,14 +8,14 @@ glabel fx_12_main
 /* 32F604 E0018084 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32F608 E0018088 F7BE0068 */  sdc1      $f30, 0x68($sp)
 /* 32F60C E001808C C7BE0080 */  lwc1      $f30, 0x80($sp)
-/* 32F610 E0018090 3C02E002 */  lui       $v0, %hi(func_E00182AC)
-/* 32F614 E0018094 244282AC */  addiu     $v0, $v0, %lo(func_E00182AC)
+/* 32F610 E0018090 3C02E002 */  lui       $v0, %hi(fx_12_init)
+/* 32F614 E0018094 244282AC */  addiu     $v0, $v0, %lo(fx_12_init)
 /* 32F618 E0018098 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32F61C E001809C 3C02E002 */  lui       $v0, %hi(func_E00182B4)
-/* 32F620 E00180A0 244282B4 */  addiu     $v0, $v0, %lo(func_E00182B4)
+/* 32F61C E001809C 3C02E002 */  lui       $v0, %hi(fx_12_update)
+/* 32F620 E00180A0 244282B4 */  addiu     $v0, $v0, %lo(fx_12_update)
 /* 32F624 E00180A4 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32F628 E00180A8 3C02E002 */  lui       $v0, %hi(func_E0018378)
-/* 32F62C E00180AC 24428378 */  addiu     $v0, $v0, %lo(func_E0018378)
+/* 32F628 E00180A8 3C02E002 */  lui       $v0, %hi(fx_12_render)
+/* 32F62C E00180AC 24428378 */  addiu     $v0, $v0, %lo(fx_12_render)
 /* 32F630 E00180B0 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32F634 E00180B4 2402000C */  addiu     $v0, $zero, 0xc
 /* 32F638 E00180B8 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s
rename to ver/us/asm/nonmatchings/effects/effect_12/fx_12_render.s
index 584eb0a132..a769374d49 100644
--- a/ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s
+++ b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0018378
+glabel fx_12_render
 /* 32F8F8 E0018378 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 32F8FC E001837C 3C02E002 */  lui       $v0, %hi(func_E00183D8)
-/* 32F900 E0018380 244283D8 */  addiu     $v0, $v0, %lo(func_E00183D8)
+/* 32F8FC E001837C 3C02E002 */  lui       $v0, %hi(fx_12_appendGfx)
+/* 32F900 E0018380 244283D8 */  addiu     $v0, $v0, %lo(fx_12_appendGfx)
 /* 32F904 E0018384 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 32F908 E0018388 24020028 */  addiu     $v0, $zero, 0x28
 /* 32F90C E001838C AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s
rename to ver/us/asm/nonmatchings/effects/effect_12/fx_12_update.s
index 22e38d99fe..53de1c7c9c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00182B4
+glabel fx_12_update
 /* 32F834 E00182B4 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 32F838 E00182B8 AFB40020 */  sw        $s4, 0x20($sp)
 /* 32F83C E00182BC 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s
rename to ver/us/asm/nonmatchings/effects/effect_120/fx_120_appendGfx.s
index f05c4a149c..e6368e7762 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010C39C
+glabel fx_120_appendGfx
 /* 3E585C E010C39C 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3E5860 E010C3A0 3C07DB06 */  lui       $a3, 0xdb06
 /* 3E5864 E010C3A4 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s
index 3a58d48350..0a64d025d4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s
@@ -14,14 +14,14 @@ glabel fx_120_main
 /* 3E54E4 E010C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E54E8 E010C028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3E54EC E010C02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3E54F0 E010C030 3C02E011 */  lui       $v0, %hi(func_E010C190)
-/* 3E54F4 E010C034 2442C190 */  addiu     $v0, $v0, %lo(func_E010C190)
+/* 3E54F0 E010C030 3C02E011 */  lui       $v0, %hi(fx_120_init)
+/* 3E54F4 E010C034 2442C190 */  addiu     $v0, $v0, %lo(fx_120_init)
 /* 3E54F8 E010C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E54FC E010C03C 3C02E011 */  lui       $v0, %hi(func_E010C198)
-/* 3E5500 E010C040 2442C198 */  addiu     $v0, $v0, %lo(func_E010C198)
+/* 3E54FC E010C03C 3C02E011 */  lui       $v0, %hi(fx_120_update)
+/* 3E5500 E010C040 2442C198 */  addiu     $v0, $v0, %lo(fx_120_update)
 /* 3E5504 E010C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E5508 E010C048 3C02E011 */  lui       $v0, %hi(func_E010C354)
-/* 3E550C E010C04C 2442C354 */  addiu     $v0, $v0, %lo(func_E010C354)
+/* 3E5508 E010C048 3C02E011 */  lui       $v0, %hi(fx_120_render)
+/* 3E550C E010C04C 2442C354 */  addiu     $v0, $v0, %lo(fx_120_render)
 /* 3E5510 E010C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E5514 E010C054 24020078 */  addiu     $v0, $zero, 0x78
 /* 3E5518 E010C058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s
rename to ver/us/asm/nonmatchings/effects/effect_120/fx_120_render.s
index 286b6f92b7..195d3e0ede 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s
+++ b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010C354
+glabel fx_120_render
 /* 3E5814 E010C354 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3E5818 E010C358 3C02E011 */  lui       $v0, %hi(func_E010C39C)
-/* 3E581C E010C35C 2442C39C */  addiu     $v0, $v0, %lo(func_E010C39C)
+/* 3E5818 E010C358 3C02E011 */  lui       $v0, %hi(fx_120_appendGfx)
+/* 3E581C E010C35C 2442C39C */  addiu     $v0, $v0, %lo(fx_120_appendGfx)
 /* 3E5820 E010C360 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3E5824 E010C364 2402000A */  addiu     $v0, $zero, 0xa
 /* 3E5828 E010C368 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s
rename to ver/us/asm/nonmatchings/effects/effect_120/fx_120_update.s
index 1841ddab70..247c8895f5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s
+++ b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010C198
+glabel fx_120_update
 /* 3E5658 E010C198 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3E565C E010C19C AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3E5660 E010C1A0 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s
rename to ver/us/asm/nonmatchings/effects/effect_121/fx_121_appendGfx.s
index 08614acaee..da284cee96 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s
+++ b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010E558
+glabel fx_121_appendGfx
 /* 3EBA38 E010E558 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3EBA3C E010E55C 3C07DB06 */  lui       $a3, 0xdb06
 /* 3EBA40 E010E560 3C06800A */  lui       $a2, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s
index 3d4238ca07..7db3edba44 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s
@@ -14,14 +14,14 @@ glabel fx_121_main
 /* 3EB830 E010E350 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3EB834 E010E354 AFB30034 */  sw        $s3, 0x34($sp)
 /* 3EB838 E010E358 8FB3006C */  lw        $s3, 0x6c($sp)
-/* 3EB83C E010E35C 3C02E011 */  lui       $v0, %hi(func_E010E4A0)
-/* 3EB840 E010E360 2442E4A0 */  addiu     $v0, $v0, %lo(func_E010E4A0)
+/* 3EB83C E010E35C 3C02E011 */  lui       $v0, %hi(fx_121_init)
+/* 3EB840 E010E360 2442E4A0 */  addiu     $v0, $v0, %lo(fx_121_init)
 /* 3EB844 E010E364 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3EB848 E010E368 3C02E011 */  lui       $v0, %hi(func_E010E4A8)
-/* 3EB84C E010E36C 2442E4A8 */  addiu     $v0, $v0, %lo(func_E010E4A8)
+/* 3EB848 E010E368 3C02E011 */  lui       $v0, %hi(fx_121_update)
+/* 3EB84C E010E36C 2442E4A8 */  addiu     $v0, $v0, %lo(fx_121_update)
 /* 3EB850 E010E370 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3EB854 E010E374 3C02E011 */  lui       $v0, %hi(func_E010E510)
-/* 3EB858 E010E378 2442E510 */  addiu     $v0, $v0, %lo(func_E010E510)
+/* 3EB854 E010E374 3C02E011 */  lui       $v0, %hi(fx_121_render)
+/* 3EB858 E010E378 2442E510 */  addiu     $v0, $v0, %lo(fx_121_render)
 /* 3EB85C E010E37C AFA20020 */  sw        $v0, 0x20($sp)
 /* 3EB860 E010E380 24020079 */  addiu     $v0, $zero, 0x79
 /* 3EB864 E010E384 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s
rename to ver/us/asm/nonmatchings/effects/effect_121/fx_121_render.s
index 252f73f8b8..d2c7cfc6d6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s
+++ b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010E510
+glabel fx_121_render
 /* 3EB9F0 E010E510 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3EB9F4 E010E514 3C02E011 */  lui       $v0, %hi(func_E010E558)
-/* 3EB9F8 E010E518 2442E558 */  addiu     $v0, $v0, %lo(func_E010E558)
+/* 3EB9F4 E010E514 3C02E011 */  lui       $v0, %hi(fx_121_appendGfx)
+/* 3EB9F8 E010E518 2442E558 */  addiu     $v0, $v0, %lo(fx_121_appendGfx)
 /* 3EB9FC E010E51C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3EBA00 E010E520 2402000A */  addiu     $v0, $zero, 0xa
 /* 3EBA04 E010E524 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s
rename to ver/us/asm/nonmatchings/effects/effect_121/fx_121_update.s
index da0f36ef70..78e6ebd405 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E010E4A8
+glabel fx_121_update
 /* 3EB988 E010E4A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3EB98C E010E4AC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3EB990 E010E4B0 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s
rename to ver/us/asm/nonmatchings/effects/effect_122/fx_122_appendGfx.s
index 1df2e37e8c..df901f6995 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01103EC
+glabel fx_122_appendGfx
 /* 3F87DC E01103EC 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3F87E0 E01103F0 0080402D */  daddu     $t0, $a0, $zero
 /* 3F87E4 E01103F4 3C09DB06 */  lui       $t1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s
index 990b968e32..6c6a9acc1d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s
@@ -14,14 +14,14 @@ glabel fx_122_main
 /* 3F8414 E0110024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3F8418 E0110028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3F841C E011002C 8FB0006C */  lw        $s0, 0x6c($sp)
-/* 3F8420 E0110030 3C02E011 */  lui       $v0, %hi(func_E0110224)
-/* 3F8424 E0110034 24420224 */  addiu     $v0, $v0, %lo(func_E0110224)
+/* 3F8420 E0110030 3C02E011 */  lui       $v0, %hi(fx_122_init)
+/* 3F8424 E0110034 24420224 */  addiu     $v0, $v0, %lo(fx_122_init)
 /* 3F8428 E0110038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3F842C E011003C 3C02E011 */  lui       $v0, %hi(func_E011022C)
-/* 3F8430 E0110040 2442022C */  addiu     $v0, $v0, %lo(func_E011022C)
+/* 3F842C E011003C 3C02E011 */  lui       $v0, %hi(fx_122_update)
+/* 3F8430 E0110040 2442022C */  addiu     $v0, $v0, %lo(fx_122_update)
 /* 3F8434 E0110044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3F8438 E0110048 3C02E011 */  lui       $v0, %hi(func_E01103A4)
-/* 3F843C E011004C 244203A4 */  addiu     $v0, $v0, %lo(func_E01103A4)
+/* 3F8438 E0110048 3C02E011 */  lui       $v0, %hi(fx_122_render)
+/* 3F843C E011004C 244203A4 */  addiu     $v0, $v0, %lo(fx_122_render)
 /* 3F8440 E0110050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3F8444 E0110054 2402007A */  addiu     $v0, $zero, 0x7a
 /* 3F8448 E0110058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s
rename to ver/us/asm/nonmatchings/effects/effect_122/fx_122_render.s
index ff18ab2203..217c1dfc33 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01103A4
+glabel fx_122_render
 /* 3F8794 E01103A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3F8798 E01103A8 3C02E011 */  lui       $v0, %hi(func_E01103EC)
-/* 3F879C E01103AC 244203EC */  addiu     $v0, $v0, %lo(func_E01103EC)
+/* 3F8798 E01103A8 3C02E011 */  lui       $v0, %hi(fx_122_appendGfx)
+/* 3F879C E01103AC 244203EC */  addiu     $v0, $v0, %lo(fx_122_appendGfx)
 /* 3F87A0 E01103B0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3F87A4 E01103B4 2402000A */  addiu     $v0, $zero, 0xa
 /* 3F87A8 E01103B8 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s
rename to ver/us/asm/nonmatchings/effects/effect_122/fx_122_update.s
index 48718948b0..da2acbe03b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011022C
+glabel fx_122_update
 /* 3F861C E011022C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3F8620 E0110230 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3F8624 E0110234 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E01124CC.s b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_123/func_E01124CC.s
rename to ver/us/asm/nonmatchings/effects/effect_123/fx_123_appendGfx.s
index b5995cb8bd..a70894f13e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/func_E01124CC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01124CC
+glabel fx_123_appendGfx
 /* 3FA31C E01124CC 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3FA320 E01124D0 3C06DB06 */  lui       $a2, 0xdb06
 /* 3FA324 E01124D4 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s
index 309bbd6dbe..b68d991a09 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s
@@ -16,14 +16,14 @@ glabel fx_123_main
 /* 3F9E7C E011202C 27A40028 */  addiu     $a0, $sp, 0x28
 /* 3F9E80 E0112030 AFB3004C */  sw        $s3, 0x4c($sp)
 /* 3F9E84 E0112034 8FB30094 */  lw        $s3, 0x94($sp)
-/* 3F9E88 E0112038 3C02E011 */  lui       $v0, %hi(func_E01121B8)
-/* 3F9E8C E011203C 244221B8 */  addiu     $v0, $v0, %lo(func_E01121B8)
+/* 3F9E88 E0112038 3C02E011 */  lui       $v0, %hi(fx_123_init)
+/* 3F9E8C E011203C 244221B8 */  addiu     $v0, $v0, %lo(fx_123_init)
 /* 3F9E90 E0112040 AFA20030 */  sw        $v0, 0x30($sp)
-/* 3F9E94 E0112044 3C02E011 */  lui       $v0, %hi(func_E01121C0)
-/* 3F9E98 E0112048 244221C0 */  addiu     $v0, $v0, %lo(func_E01121C0)
+/* 3F9E94 E0112044 3C02E011 */  lui       $v0, %hi(fx_123_update)
+/* 3F9E98 E0112048 244221C0 */  addiu     $v0, $v0, %lo(fx_123_update)
 /* 3F9E9C E011204C AFA20034 */  sw        $v0, 0x34($sp)
-/* 3F9EA0 E0112050 3C02E011 */  lui       $v0, %hi(func_E01122E8)
-/* 3F9EA4 E0112054 244222E8 */  addiu     $v0, $v0, %lo(func_E01122E8)
+/* 3F9EA0 E0112050 3C02E011 */  lui       $v0, %hi(fx_123_render)
+/* 3F9EA4 E0112054 244222E8 */  addiu     $v0, $v0, %lo(fx_123_render)
 /* 3F9EA8 E0112058 AFA20038 */  sw        $v0, 0x38($sp)
 /* 3F9EAC E011205C 2402007B */  addiu     $v0, $zero, 0x7b
 /* 3F9EB0 E0112060 AFBF0050 */  sw        $ra, 0x50($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s
rename to ver/us/asm/nonmatchings/effects/effect_123/fx_123_render.s
index 7444d48407..cd6d2c394e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01122E8
+glabel fx_123_render
 /* 3FA138 E01122E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3FA13C E01122EC 3C02E011 */  lui       $v0, %hi(func_E01124CC)
-/* 3FA140 E01122F0 244224CC */  addiu     $v0, $v0, %lo(func_E01124CC)
+/* 3FA13C E01122EC 3C02E011 */  lui       $v0, %hi(fx_123_appendGfx)
+/* 3FA140 E01122F0 244224CC */  addiu     $v0, $v0, %lo(fx_123_appendGfx)
 /* 3FA144 E01122F4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3FA148 E01122F8 2402000A */  addiu     $v0, $zero, 0xa
 /* 3FA14C E01122FC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s
rename to ver/us/asm/nonmatchings/effects/effect_123/fx_123_update.s
index 8f573c21bd..3b660254bb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01121C0
+glabel fx_123_update
 /* 3FA010 E01121C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3FA014 E01121C4 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3FA018 E01121C8 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s
rename to ver/us/asm/nonmatchings/effects/effect_124/fx_124_appendGfx.s
index 650378748d..31e52a0931 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s
+++ b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0114388
+glabel fx_124_appendGfx
 /* 3FEE68 E0114388 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 3FEE6C E011438C 3C07DB06 */  lui       $a3, 0xdb06
 /* 3FEE70 E0114390 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s
index 259ce43e88..ec8016b9b1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s
@@ -4,14 +4,14 @@
 glabel fx_124_main
 /* 3FEAE0 E0114000 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3FEAE4 E0114004 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3FEAE8 E0114008 3C02E011 */  lui       $v0, %hi(func_E01140D4)
-/* 3FEAEC E011400C 244240D4 */  addiu     $v0, $v0, %lo(func_E01140D4)
+/* 3FEAE8 E0114008 3C02E011 */  lui       $v0, %hi(fx_124_init)
+/* 3FEAEC E011400C 244240D4 */  addiu     $v0, $v0, %lo(fx_124_init)
 /* 3FEAF0 E0114010 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3FEAF4 E0114014 3C02E011 */  lui       $v0, %hi(func_E01140DC)
-/* 3FEAF8 E0114018 244240DC */  addiu     $v0, $v0, %lo(func_E01140DC)
+/* 3FEAF4 E0114014 3C02E011 */  lui       $v0, %hi(fx_124_update)
+/* 3FEAF8 E0114018 244240DC */  addiu     $v0, $v0, %lo(fx_124_update)
 /* 3FEAFC E011401C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3FEB00 E0114020 3C02E011 */  lui       $v0, %hi(func_E0114340)
-/* 3FEB04 E0114024 24424340 */  addiu     $v0, $v0, %lo(func_E0114340)
+/* 3FEB00 E0114020 3C02E011 */  lui       $v0, %hi(fx_124_render)
+/* 3FEB04 E0114024 24424340 */  addiu     $v0, $v0, %lo(fx_124_render)
 /* 3FEB08 E0114028 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3FEB0C E011402C 2402007C */  addiu     $v0, $zero, 0x7c
 /* 3FEB10 E0114030 AFBF002C */  sw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s
rename to ver/us/asm/nonmatchings/effects/effect_124/fx_124_render.s
index 8495a4a33d..17f3dd99b2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s
+++ b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0114340
+glabel fx_124_render
 /* 3FEE20 E0114340 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3FEE24 E0114344 3C02E011 */  lui       $v0, %hi(func_E0114388)
-/* 3FEE28 E0114348 24424388 */  addiu     $v0, $v0, %lo(func_E0114388)
+/* 3FEE24 E0114344 3C02E011 */  lui       $v0, %hi(fx_124_appendGfx)
+/* 3FEE28 E0114348 24424388 */  addiu     $v0, $v0, %lo(fx_124_appendGfx)
 /* 3FEE2C E011434C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3FEE30 E0114350 2402000A */  addiu     $v0, $zero, 0xa
 /* 3FEE34 E0114354 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s
rename to ver/us/asm/nonmatchings/effects/effect_124/fx_124_update.s
index 7db754ed15..9310021696 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01140DC
+glabel fx_124_update
 /* 3FEBBC E01140DC 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3FEBC0 E01140E0 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3FEBC4 E01140E4 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E0116884.s b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_125/func_E0116884.s
rename to ver/us/asm/nonmatchings/effects/effect_125/fx_125_appendGfx.s
index ef61ca727b..3669da8a26 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/func_E0116884.s
+++ b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0116884
+glabel fx_125_appendGfx
 /* 402EC4 E0116884 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 402EC8 E0116888 AFB7002C */  sw        $s7, 0x2c($sp)
 /* 402ECC E011688C 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s
index d8334e4783..fb92b2d9c7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s
@@ -16,14 +16,14 @@ glabel fx_125_main
 /* 40266C E011602C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 402670 E0116030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 402674 E0116034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 402678 E0116038 3C02E011 */  lui       $v0, %hi(func_E0116184)
-/* 40267C E011603C 24426184 */  addiu     $v0, $v0, %lo(func_E0116184)
+/* 402678 E0116038 3C02E011 */  lui       $v0, %hi(fx_125_init)
+/* 40267C E011603C 24426184 */  addiu     $v0, $v0, %lo(fx_125_init)
 /* 402680 E0116040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 402684 E0116044 3C02E011 */  lui       $v0, %hi(func_E011618C)
-/* 402688 E0116048 2442618C */  addiu     $v0, $v0, %lo(func_E011618C)
+/* 402684 E0116044 3C02E011 */  lui       $v0, %hi(fx_125_update)
+/* 402688 E0116048 2442618C */  addiu     $v0, $v0, %lo(fx_125_update)
 /* 40268C E011604C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 402690 E0116050 3C02E011 */  lui       $v0, %hi(func_E01166A0)
-/* 402694 E0116054 244266A0 */  addiu     $v0, $v0, %lo(func_E01166A0)
+/* 402690 E0116050 3C02E011 */  lui       $v0, %hi(fx_125_render)
+/* 402694 E0116054 244266A0 */  addiu     $v0, $v0, %lo(fx_125_render)
 /* 402698 E0116058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40269C E011605C 2402007D */  addiu     $v0, $zero, 0x7d
 /* 4026A0 E0116060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s
rename to ver/us/asm/nonmatchings/effects/effect_125/fx_125_render.s
index c38a1f21a8..1756201efe 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01166A0
+glabel fx_125_render
 /* 402CE0 E01166A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 402CE4 E01166A4 3C02E011 */  lui       $v0, %hi(func_E0116884)
-/* 402CE8 E01166A8 24426884 */  addiu     $v0, $v0, %lo(func_E0116884)
+/* 402CE4 E01166A4 3C02E011 */  lui       $v0, %hi(fx_125_appendGfx)
+/* 402CE8 E01166A8 24426884 */  addiu     $v0, $v0, %lo(fx_125_appendGfx)
 /* 402CEC E01166AC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 402CF0 E01166B0 2402000A */  addiu     $v0, $zero, 0xa
 /* 402CF4 E01166B4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s
rename to ver/us/asm/nonmatchings/effects/effect_125/fx_125_update.s
index 76421b50e9..fb9c70b57e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011618C
+glabel fx_125_update
 /* 4027CC E011618C 27BDFF88 */  addiu     $sp, $sp, -0x78
 /* 4027D0 E0116190 AFB40030 */  sw        $s4, 0x30($sp)
 /* 4027D4 E0116194 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s
rename to ver/us/asm/nonmatchings/effects/effect_126/fx_126_appendGfx.s
index 3dc08b591a..ba01694092 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011849C
+glabel fx_126_appendGfx
 /* 40389C E011849C 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 4038A0 E01184A0 AFB700BC */  sw        $s7, 0xbc($sp)
 /* 4038A4 E01184A4 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s
index 0e3bf93cb4..22e520283b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s
@@ -16,14 +16,14 @@ glabel fx_126_main
 /* 40342C E011802C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 403430 E0118030 AFB00028 */  sw        $s0, 0x28($sp)
 /* 403434 E0118034 8FB00084 */  lw        $s0, 0x84($sp)
-/* 403438 E0118038 3C02E012 */  lui       $v0, %hi(func_E01182EC)
-/* 40343C E011803C 244282EC */  addiu     $v0, $v0, %lo(func_E01182EC)
+/* 403438 E0118038 3C02E012 */  lui       $v0, %hi(fx_126_init)
+/* 40343C E011803C 244282EC */  addiu     $v0, $v0, %lo(fx_126_init)
 /* 403440 E0118040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 403444 E0118044 3C02E012 */  lui       $v0, %hi(func_E01182F4)
-/* 403448 E0118048 244282F4 */  addiu     $v0, $v0, %lo(func_E01182F4)
+/* 403444 E0118044 3C02E012 */  lui       $v0, %hi(fx_126_update)
+/* 403448 E0118048 244282F4 */  addiu     $v0, $v0, %lo(fx_126_update)
 /* 40344C E011804C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 403450 E0118050 3C02E012 */  lui       $v0, %hi(func_E0118454)
-/* 403454 E0118054 24428454 */  addiu     $v0, $v0, %lo(func_E0118454)
+/* 403450 E0118050 3C02E012 */  lui       $v0, %hi(fx_126_render)
+/* 403454 E0118054 24428454 */  addiu     $v0, $v0, %lo(fx_126_render)
 /* 403458 E0118058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40345C E011805C 2402007E */  addiu     $v0, $zero, 0x7e
 /* 403460 E0118060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s
rename to ver/us/asm/nonmatchings/effects/effect_126/fx_126_render.s
index 50f0703892..1eb96e77e5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s
+++ b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0118454
+glabel fx_126_render
 /* 403854 E0118454 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 403858 E0118458 3C02E012 */  lui       $v0, %hi(func_E011849C)
-/* 40385C E011845C 2442849C */  addiu     $v0, $v0, %lo(func_E011849C)
+/* 403858 E0118458 3C02E012 */  lui       $v0, %hi(fx_126_appendGfx)
+/* 40385C E011845C 2442849C */  addiu     $v0, $v0, %lo(fx_126_appendGfx)
 /* 403860 E0118460 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 403864 E0118464 2402000A */  addiu     $v0, $zero, 0xa
 /* 403868 E0118468 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s
rename to ver/us/asm/nonmatchings/effects/effect_126/fx_126_update.s
index e228f258ba..4c92841252 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01182F4
+glabel fx_126_update
 /* 4036F4 E01182F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 4036F8 E01182F8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 4036FC E01182FC 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s b/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s
index 5b82ca2456..49b9e3bbd4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s
@@ -8,14 +8,14 @@ glabel fx_127_main
 /* 40422C E011A00C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 404230 E011A010 AFB20030 */  sw        $s2, 0x30($sp)
 /* 404234 E011A014 8FB2004C */  lw        $s2, 0x4c($sp)
-/* 404238 E011A018 3C02E012 */  lui       $v0, %hi(func_E011A0FC)
-/* 40423C E011A01C 2442A0FC */  addiu     $v0, $v0, %lo(func_E011A0FC)
+/* 404238 E011A018 3C02E012 */  lui       $v0, %hi(fx_127_init)
+/* 40423C E011A01C 2442A0FC */  addiu     $v0, $v0, %lo(fx_127_init)
 /* 404240 E011A020 AFA20018 */  sw        $v0, 0x18($sp)
-/* 404244 E011A024 3C02E012 */  lui       $v0, %hi(func_E011A104)
-/* 404248 E011A028 2442A104 */  addiu     $v0, $v0, %lo(func_E011A104)
+/* 404244 E011A024 3C02E012 */  lui       $v0, %hi(fx_127_update)
+/* 404248 E011A028 2442A104 */  addiu     $v0, $v0, %lo(fx_127_update)
 /* 40424C E011A02C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 404250 E011A030 3C02E012 */  lui       $v0, %hi(func_E011A398)
-/* 404254 E011A034 2442A398 */  addiu     $v0, $v0, %lo(func_E011A398)
+/* 404250 E011A030 3C02E012 */  lui       $v0, %hi(fx_127_render)
+/* 404254 E011A034 2442A398 */  addiu     $v0, $v0, %lo(fx_127_render)
 /* 404258 E011A038 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40425C E011A03C 3C02E012 */  lui       $v0, %hi(func_E011A3A0)
 /* 404260 E011A040 2442A3A0 */  addiu     $v0, $v0, %lo(func_E011A3A0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s b/ver/us/asm/nonmatchings/effects/effect_127/fx_127_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s
rename to ver/us/asm/nonmatchings/effects/effect_127/fx_127_update.s
index 9242e6a5e3..5cbc160422 100644
--- a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s
+++ b/ver/us/asm/nonmatchings/effects/effect_127/fx_127_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011A104
+glabel fx_127_update
 /* 404324 E011A104 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 404328 E011A108 AFBF002C */  sw        $ra, 0x2c($sp)
 /* 40432C E011A10C AFB60028 */  sw        $s6, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s
rename to ver/us/asm/nonmatchings/effects/effect_128/fx_128_appendGfx.s
index 256296a9e6..5c568e15e2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011C1C4
+glabel fx_128_appendGfx
 /* 406D04 E011C1C4 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 406D08 E011C1C8 0080302D */  daddu     $a2, $a0, $zero
 /* 406D0C E011C1CC 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s
index 5fcac42ea3..3e9455d5f0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s
@@ -14,14 +14,14 @@ glabel fx_128_main
 /* 406B64 E011C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 406B68 E011C028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 406B6C E011C02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 406B70 E011C030 3C02E012 */  lui       $v0, %hi(func_E011C0F4)
-/* 406B74 E011C034 2442C0F4 */  addiu     $v0, $v0, %lo(func_E011C0F4)
+/* 406B70 E011C030 3C02E012 */  lui       $v0, %hi(fx_128_init)
+/* 406B74 E011C034 2442C0F4 */  addiu     $v0, $v0, %lo(fx_128_init)
 /* 406B78 E011C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 406B7C E011C03C 3C02E012 */  lui       $v0, %hi(func_E011C0FC)
-/* 406B80 E011C040 2442C0FC */  addiu     $v0, $v0, %lo(func_E011C0FC)
+/* 406B7C E011C03C 3C02E012 */  lui       $v0, %hi(fx_128_update)
+/* 406B80 E011C040 2442C0FC */  addiu     $v0, $v0, %lo(fx_128_update)
 /* 406B84 E011C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 406B88 E011C048 3C02E012 */  lui       $v0, %hi(func_E011C17C)
-/* 406B8C E011C04C 2442C17C */  addiu     $v0, $v0, %lo(func_E011C17C)
+/* 406B88 E011C048 3C02E012 */  lui       $v0, %hi(fx_128_render)
+/* 406B8C E011C04C 2442C17C */  addiu     $v0, $v0, %lo(fx_128_render)
 /* 406B90 E011C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 406B94 E011C054 24020080 */  addiu     $v0, $zero, 0x80
 /* 406B98 E011C058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s
rename to ver/us/asm/nonmatchings/effects/effect_128/fx_128_render.s
index 532312416d..4cda84b27d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011C17C
+glabel fx_128_render
 /* 406CBC E011C17C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 406CC0 E011C180 3C02E012 */  lui       $v0, %hi(func_E011C1C4)
-/* 406CC4 E011C184 2442C1C4 */  addiu     $v0, $v0, %lo(func_E011C1C4)
+/* 406CC0 E011C180 3C02E012 */  lui       $v0, %hi(fx_128_appendGfx)
+/* 406CC4 E011C184 2442C1C4 */  addiu     $v0, $v0, %lo(fx_128_appendGfx)
 /* 406CC8 E011C188 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 406CCC E011C18C 2402000A */  addiu     $v0, $zero, 0xa
 /* 406CD0 E011C190 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s
rename to ver/us/asm/nonmatchings/effects/effect_128/fx_128_update.s
index 9763761d2d..7e6ca81636 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011C0FC
+glabel fx_128_update
 /* 406C3C E011C0FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 406C40 E011C100 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 406C44 E011C104 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s
rename to ver/us/asm/nonmatchings/effects/effect_129/fx_129_appendGfx.s
index 993673fe44..3f73324807 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s
+++ b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011E578
+glabel fx_129_appendGfx
 /* 409F08 E011E578 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 409F0C E011E57C 0080302D */  daddu     $a2, $a0, $zero
 /* 409F10 E011E580 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s
index 74a629fe0f..3662096186 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s
@@ -16,14 +16,14 @@ glabel fx_129_main
 /* 4099BC E011E02C 27A40028 */  addiu     $a0, $sp, 0x28
 /* 4099C0 E011E030 AFB20048 */  sw        $s2, 0x48($sp)
 /* 4099C4 E011E034 8FB2008C */  lw        $s2, 0x8c($sp)
-/* 4099C8 E011E038 3C02E012 */  lui       $v0, %hi(func_E011E18C)
-/* 4099CC E011E03C 2442E18C */  addiu     $v0, $v0, %lo(func_E011E18C)
+/* 4099C8 E011E038 3C02E012 */  lui       $v0, %hi(fx_129_init)
+/* 4099CC E011E03C 2442E18C */  addiu     $v0, $v0, %lo(fx_129_init)
 /* 4099D0 E011E040 AFA20030 */  sw        $v0, 0x30($sp)
-/* 4099D4 E011E044 3C02E012 */  lui       $v0, %hi(func_E011E194)
-/* 4099D8 E011E048 2442E194 */  addiu     $v0, $v0, %lo(func_E011E194)
+/* 4099D4 E011E044 3C02E012 */  lui       $v0, %hi(fx_129_update)
+/* 4099D8 E011E048 2442E194 */  addiu     $v0, $v0, %lo(fx_129_update)
 /* 4099DC E011E04C AFA20034 */  sw        $v0, 0x34($sp)
-/* 4099E0 E011E050 3C02E012 */  lui       $v0, %hi(func_E011E530)
-/* 4099E4 E011E054 2442E530 */  addiu     $v0, $v0, %lo(func_E011E530)
+/* 4099E0 E011E050 3C02E012 */  lui       $v0, %hi(fx_129_render)
+/* 4099E4 E011E054 2442E530 */  addiu     $v0, $v0, %lo(fx_129_render)
 /* 4099E8 E011E058 AFA20038 */  sw        $v0, 0x38($sp)
 /* 4099EC E011E05C 24020081 */  addiu     $v0, $zero, 0x81
 /* 4099F0 E011E060 AFBF0050 */  sw        $ra, 0x50($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s
rename to ver/us/asm/nonmatchings/effects/effect_129/fx_129_render.s
index 0dba42a3e0..fe361df2fa 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s
+++ b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011E530
+glabel fx_129_render
 /* 409EC0 E011E530 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 409EC4 E011E534 3C02E012 */  lui       $v0, %hi(func_E011E578)
-/* 409EC8 E011E538 2442E578 */  addiu     $v0, $v0, %lo(func_E011E578)
+/* 409EC4 E011E534 3C02E012 */  lui       $v0, %hi(fx_129_appendGfx)
+/* 409EC8 E011E538 2442E578 */  addiu     $v0, $v0, %lo(fx_129_appendGfx)
 /* 409ECC E011E53C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 409ED0 E011E540 24020005 */  addiu     $v0, $zero, 5
 /* 409ED4 E011E544 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s
rename to ver/us/asm/nonmatchings/effects/effect_129/fx_129_update.s
index cffb2763b4..7c2a7f82f6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s
+++ b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E011E194
+glabel fx_129_update
 /* 409B24 E011E194 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 409B28 E011E198 AFB30024 */  sw        $s3, 0x24($sp)
 /* 409B2C E011E19C 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s
rename to ver/us/asm/nonmatchings/effects/effect_13/fx_13_appendGfx.s
index dda5783f38..5e736f92e5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s
+++ b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001A440
+glabel fx_13_appendGfx
 /* 330270 E001A440 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 330274 E001A444 0080382D */  daddu     $a3, $a0, $zero
 /* 330278 E001A448 3C08DB06 */  lui       $t0, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s
index 50885f5d97..5d8a69bb31 100644
--- a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s
@@ -14,14 +14,14 @@ glabel fx_13_main
 /* 32FE54 E001A024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32FE58 E001A028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 32FE5C E001A02C 8FB20060 */  lw        $s2, 0x60($sp)
-/* 32FE60 E001A030 3C02E002 */  lui       $v0, %hi(func_E001A21C)
-/* 32FE64 E001A034 2442A21C */  addiu     $v0, $v0, %lo(func_E001A21C)
+/* 32FE60 E001A030 3C02E002 */  lui       $v0, %hi(fx_13_init)
+/* 32FE64 E001A034 2442A21C */  addiu     $v0, $v0, %lo(fx_13_init)
 /* 32FE68 E001A038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32FE6C E001A03C 3C02E002 */  lui       $v0, %hi(func_E001A224)
-/* 32FE70 E001A040 2442A224 */  addiu     $v0, $v0, %lo(func_E001A224)
+/* 32FE6C E001A03C 3C02E002 */  lui       $v0, %hi(fx_13_update)
+/* 32FE70 E001A040 2442A224 */  addiu     $v0, $v0, %lo(fx_13_update)
 /* 32FE74 E001A044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32FE78 E001A048 3C02E002 */  lui       $v0, %hi(func_E001A3FC)
-/* 32FE7C E001A04C 2442A3FC */  addiu     $v0, $v0, %lo(func_E001A3FC)
+/* 32FE78 E001A048 3C02E002 */  lui       $v0, %hi(fx_13_render)
+/* 32FE7C E001A04C 2442A3FC */  addiu     $v0, $v0, %lo(fx_13_render)
 /* 32FE80 E001A050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32FE84 E001A054 2402000D */  addiu     $v0, $zero, 0xd
 /* 32FE88 E001A058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s
rename to ver/us/asm/nonmatchings/effects/effect_13/fx_13_render.s
index 967fd37077..438c7ced09 100644
--- a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001A3FC
+glabel fx_13_render
 /* 33022C E001A3FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 330230 E001A400 3C02E002 */  lui       $v0, %hi(func_E001A440)
-/* 330234 E001A404 2442A440 */  addiu     $v0, $v0, %lo(func_E001A440)
+/* 330230 E001A400 3C02E002 */  lui       $v0, %hi(fx_13_appendGfx)
+/* 330234 E001A404 2442A440 */  addiu     $v0, $v0, %lo(fx_13_appendGfx)
 /* 330238 E001A408 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33023C E001A40C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 330240 E001A410 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s
rename to ver/us/asm/nonmatchings/effects/effect_13/fx_13_update.s
index 6057152420..4bf60362fa 100644
--- a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s
+++ b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001A224
+glabel fx_13_update
 /* 330054 E001A224 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 330058 E001A228 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 33005C E001A22C 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s
rename to ver/us/asm/nonmatchings/effects/effect_130/fx_130_appendGfx.s
index 0745e07209..b465748896 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01203E4
+glabel fx_130_appendGfx
 /* 40B7D4 E01203E4 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 40B7D8 E01203E8 0080402D */  daddu     $t0, $a0, $zero
 /* 40B7DC E01203EC AFBF00B8 */  sw        $ra, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s
index 5479645d17..d588a45d48 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s
@@ -14,14 +14,14 @@ glabel fx_130_main
 /* 40B414 E0120024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 40B418 E0120028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 40B41C E012002C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 40B420 E0120030 3C02E012 */  lui       $v0, %hi(func_E0120134)
-/* 40B424 E0120034 24420134 */  addiu     $v0, $v0, %lo(func_E0120134)
+/* 40B420 E0120030 3C02E012 */  lui       $v0, %hi(fx_130_init)
+/* 40B424 E0120034 24420134 */  addiu     $v0, $v0, %lo(fx_130_init)
 /* 40B428 E0120038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 40B42C E012003C 3C02E012 */  lui       $v0, %hi(func_E012013C)
-/* 40B430 E0120040 2442013C */  addiu     $v0, $v0, %lo(func_E012013C)
+/* 40B42C E012003C 3C02E012 */  lui       $v0, %hi(fx_130_update)
+/* 40B430 E0120040 2442013C */  addiu     $v0, $v0, %lo(fx_130_update)
 /* 40B434 E0120044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 40B438 E0120048 3C02E012 */  lui       $v0, %hi(func_E012039C)
-/* 40B43C E012004C 2442039C */  addiu     $v0, $v0, %lo(func_E012039C)
+/* 40B438 E0120048 3C02E012 */  lui       $v0, %hi(fx_130_render)
+/* 40B43C E012004C 2442039C */  addiu     $v0, $v0, %lo(fx_130_render)
 /* 40B440 E0120050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40B444 E0120054 24020082 */  addiu     $v0, $zero, 0x82
 /* 40B448 E0120058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s
rename to ver/us/asm/nonmatchings/effects/effect_130/fx_130_render.s
index ec03803b1c..238394ac40 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E012039C
+glabel fx_130_render
 /* 40B78C E012039C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 40B790 E01203A0 3C02E012 */  lui       $v0, %hi(func_E01203E4)
-/* 40B794 E01203A4 244203E4 */  addiu     $v0, $v0, %lo(func_E01203E4)
+/* 40B790 E01203A0 3C02E012 */  lui       $v0, %hi(fx_130_appendGfx)
+/* 40B794 E01203A4 244203E4 */  addiu     $v0, $v0, %lo(fx_130_appendGfx)
 /* 40B798 E01203A8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 40B79C E01203AC 2402000A */  addiu     $v0, $zero, 0xa
 /* 40B7A0 E01203B0 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s
rename to ver/us/asm/nonmatchings/effects/effect_130/fx_130_update.s
index e34cfa3b45..71a20f0dda 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E012013C
+glabel fx_130_update
 /* 40B52C E012013C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 40B530 E0120140 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 40B534 E0120144 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s
rename to ver/us/asm/nonmatchings/effects/effect_131/fx_131_appendGfx.s
index 516eaca882..55bb1d8d09 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E012270C
+glabel fx_131_appendGfx
 /* 40CCAC E012270C 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 40CCB0 E0122710 0080402D */  daddu     $t0, $a0, $zero
 /* 40CCB4 E0122714 3C09DB06 */  lui       $t1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s
index f94efa706a..8dc7c623ec 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s
@@ -14,14 +14,14 @@ glabel fx_131_main
 /* 40C5C4 E0122024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 40C5C8 E0122028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 40C5CC E012202C 8FB20064 */  lw        $s2, 0x64($sp)
-/* 40C5D0 E0122030 3C02E012 */  lui       $v0, %hi(func_E0122174)
-/* 40C5D4 E0122034 24422174 */  addiu     $v0, $v0, %lo(func_E0122174)
+/* 40C5D0 E0122030 3C02E012 */  lui       $v0, %hi(fx_131_init)
+/* 40C5D4 E0122034 24422174 */  addiu     $v0, $v0, %lo(fx_131_init)
 /* 40C5D8 E0122038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 40C5DC E012203C 3C02E012 */  lui       $v0, %hi(func_E012217C)
-/* 40C5E0 E0122040 2442217C */  addiu     $v0, $v0, %lo(func_E012217C)
+/* 40C5DC E012203C 3C02E012 */  lui       $v0, %hi(fx_131_update)
+/* 40C5E0 E0122040 2442217C */  addiu     $v0, $v0, %lo(fx_131_update)
 /* 40C5E4 E0122044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 40C5E8 E0122048 3C02E012 */  lui       $v0, %hi(func_E01226C4)
-/* 40C5EC E012204C 244226C4 */  addiu     $v0, $v0, %lo(func_E01226C4)
+/* 40C5E8 E0122048 3C02E012 */  lui       $v0, %hi(fx_131_render)
+/* 40C5EC E012204C 244226C4 */  addiu     $v0, $v0, %lo(fx_131_render)
 /* 40C5F0 E0122050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40C5F4 E0122054 24020083 */  addiu     $v0, $zero, 0x83
 /* 40C5F8 E0122058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s
rename to ver/us/asm/nonmatchings/effects/effect_131/fx_131_render.s
index e3b685820a..fe92aedb5d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01226C4
+glabel fx_131_render
 /* 40CC64 E01226C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 40CC68 E01226C8 3C02E012 */  lui       $v0, %hi(func_E012270C)
-/* 40CC6C E01226CC 2442270C */  addiu     $v0, $v0, %lo(func_E012270C)
+/* 40CC68 E01226C8 3C02E012 */  lui       $v0, %hi(fx_131_appendGfx)
+/* 40CC6C E01226CC 2442270C */  addiu     $v0, $v0, %lo(fx_131_appendGfx)
 /* 40CC70 E01226D0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 40CC74 E01226D4 2402000A */  addiu     $v0, $zero, 0xa
 /* 40CC78 E01226D8 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s
rename to ver/us/asm/nonmatchings/effects/effect_131/fx_131_update.s
index 2506b1f725..a4048faa6a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E012217C
+glabel fx_131_update
 /* 40C71C E012217C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 40C720 E0122180 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 40C724 E0122184 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s
rename to ver/us/asm/nonmatchings/effects/effect_132/fx_132_appendGfx.s
index 8a45daca9c..73b4af1742 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01244C4
+glabel fx_132_appendGfx
 /* 412BF4 E01244C4 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 412BF8 E01244C8 3C06DB06 */  lui       $a2, 0xdb06
 /* 412BFC E01244CC 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s
index bf0aa8ff5e..0c02745d0b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s
@@ -11,14 +11,14 @@ glabel fx_132_main
 /* 412748 E0124018 27A40010 */  addiu     $a0, $sp, 0x10
 /* 41274C E012401C F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 412750 E0124020 4487C000 */  mtc1      $a3, $f24
-/* 412754 E0124024 3C02E012 */  lui       $v0, %hi(func_E01242FC)
-/* 412758 E0124028 244242FC */  addiu     $v0, $v0, %lo(func_E01242FC)
+/* 412754 E0124024 3C02E012 */  lui       $v0, %hi(fx_132_init)
+/* 412758 E0124028 244242FC */  addiu     $v0, $v0, %lo(fx_132_init)
 /* 41275C E012402C AFA20018 */  sw        $v0, 0x18($sp)
-/* 412760 E0124030 3C02E012 */  lui       $v0, %hi(func_E0124304)
-/* 412764 E0124034 24424304 */  addiu     $v0, $v0, %lo(func_E0124304)
+/* 412760 E0124030 3C02E012 */  lui       $v0, %hi(fx_132_update)
+/* 412764 E0124034 24424304 */  addiu     $v0, $v0, %lo(fx_132_update)
 /* 412768 E0124038 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 41276C E012403C 3C02E012 */  lui       $v0, %hi(func_E012448C)
-/* 412770 E0124040 2442448C */  addiu     $v0, $v0, %lo(func_E012448C)
+/* 41276C E012403C 3C02E012 */  lui       $v0, %hi(fx_132_render)
+/* 412770 E0124040 2442448C */  addiu     $v0, $v0, %lo(fx_132_render)
 /* 412774 E0124044 AFA20020 */  sw        $v0, 0x20($sp)
 /* 412778 E0124048 24020084 */  addiu     $v0, $zero, 0x84
 /* 41277C E012404C AFBF004C */  sw        $ra, 0x4c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_render.s
similarity index 82%
rename from ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s
rename to ver/us/asm/nonmatchings/effects/effect_132/fx_132_render.s
index 655ab7b479..5e5daf1ee4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E012448C
+glabel fx_132_render
 /* 412BBC E012448C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 412BC0 E0124490 3C02E012 */  lui       $v0, %hi(func_E01244C4)
-/* 412BC4 E0124494 244244C4 */  addiu     $v0, $v0, %lo(func_E01244C4)
+/* 412BC0 E0124490 3C02E012 */  lui       $v0, %hi(fx_132_appendGfx)
+/* 412BC4 E0124494 244244C4 */  addiu     $v0, $v0, %lo(fx_132_appendGfx)
 /* 412BC8 E0124498 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 412BCC E012449C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 412BD0 E01244A0 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s
rename to ver/us/asm/nonmatchings/effects/effect_132/fx_132_update.s
index 75c066c5db..ec6ddcd99c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s
+++ b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0124304
+glabel fx_132_update
 /* 412A34 E0124304 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 412A38 E0124308 0000302D */  daddu     $a2, $zero, $zero
 /* 412A3C E012430C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s
rename to ver/us/asm/nonmatchings/effects/effect_133/fx_133_appendGfx.s
index 0e8c034a77..19ac3242a4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01264EC
+glabel fx_133_appendGfx
 /* 41384C E01264EC 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 413850 E01264F0 0080302D */  daddu     $a2, $a0, $zero
 /* 413854 E01264F4 AFBF00D4 */  sw        $ra, 0xd4($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s
index 9714cedbca..bc5cd7b660 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s
@@ -14,14 +14,14 @@ glabel fx_133_main
 /* 413384 E0126024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 413388 E0126028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 41338C E012602C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 413390 E0126030 3C02E012 */  lui       $v0, %hi(func_E012612C)
-/* 413394 E0126034 2442612C */  addiu     $v0, $v0, %lo(func_E012612C)
+/* 413390 E0126030 3C02E012 */  lui       $v0, %hi(fx_133_init)
+/* 413394 E0126034 2442612C */  addiu     $v0, $v0, %lo(fx_133_init)
 /* 413398 E0126038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 41339C E012603C 3C02E012 */  lui       $v0, %hi(func_E0126134)
-/* 4133A0 E0126040 24426134 */  addiu     $v0, $v0, %lo(func_E0126134)
+/* 41339C E012603C 3C02E012 */  lui       $v0, %hi(fx_133_update)
+/* 4133A0 E0126040 24426134 */  addiu     $v0, $v0, %lo(fx_133_update)
 /* 4133A4 E0126044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 4133A8 E0126048 3C02E012 */  lui       $v0, %hi(func_E01264A4)
-/* 4133AC E012604C 244264A4 */  addiu     $v0, $v0, %lo(func_E01264A4)
+/* 4133A8 E0126048 3C02E012 */  lui       $v0, %hi(fx_133_render)
+/* 4133AC E012604C 244264A4 */  addiu     $v0, $v0, %lo(fx_133_render)
 /* 4133B0 E0126050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 4133B4 E0126054 24020085 */  addiu     $v0, $zero, 0x85
 /* 4133B8 E0126058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s
rename to ver/us/asm/nonmatchings/effects/effect_133/fx_133_render.s
index 64ed663049..239afaf8d5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01264A4
+glabel fx_133_render
 /* 413804 E01264A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 413808 E01264A8 3C02E012 */  lui       $v0, %hi(func_E01264EC)
-/* 41380C E01264AC 244264EC */  addiu     $v0, $v0, %lo(func_E01264EC)
+/* 413808 E01264A8 3C02E012 */  lui       $v0, %hi(fx_133_appendGfx)
+/* 41380C E01264AC 244264EC */  addiu     $v0, $v0, %lo(fx_133_appendGfx)
 /* 413810 E01264B0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 413814 E01264B4 2402000A */  addiu     $v0, $zero, 0xa
 /* 413818 E01264B8 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s
rename to ver/us/asm/nonmatchings/effects/effect_133/fx_133_update.s
index aa7af39640..f888b646cd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s
+++ b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0126134
+glabel fx_133_update
 /* 413494 E0126134 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 413498 E0126138 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 41349C E012613C AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s
rename to ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s
index ccdc1f4659..3c04042198 100644
--- a/ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E01281E0
+glabel fx_134_appendGfx
 /* 414D80 E01281E0 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 414D84 E01281E4 0080302D */  daddu     $a2, $a0, $zero
 /* 414D88 E01281E8 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s
index 75496942d5..11b1362ed5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s
@@ -14,14 +14,14 @@ glabel fx_134_main
 /* 414BC4 E0128024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 414BC8 E0128028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 414BCC E012802C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 414BD0 E0128030 3C02E013 */  lui       $v0, %hi(func_E0128128)
-/* 414BD4 E0128034 24428128 */  addiu     $v0, $v0, %lo(func_E0128128)
+/* 414BD0 E0128030 3C02E013 */  lui       $v0, %hi(fx_134_init)
+/* 414BD4 E0128034 24428128 */  addiu     $v0, $v0, %lo(fx_134_init)
 /* 414BD8 E0128038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 414BDC E012803C 3C02E013 */  lui       $v0, %hi(func_E0128130)
-/* 414BE0 E0128040 24428130 */  addiu     $v0, $v0, %lo(func_E0128130)
+/* 414BDC E012803C 3C02E013 */  lui       $v0, %hi(fx_134_update)
+/* 414BE0 E0128040 24428130 */  addiu     $v0, $v0, %lo(fx_134_update)
 /* 414BE4 E0128044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 414BE8 E0128048 3C02E013 */  lui       $v0, %hi(func_E0128198)
-/* 414BEC E012804C 24428198 */  addiu     $v0, $v0, %lo(func_E0128198)
+/* 414BE8 E0128048 3C02E013 */  lui       $v0, %hi(fx_134_render)
+/* 414BEC E012804C 24428198 */  addiu     $v0, $v0, %lo(fx_134_render)
 /* 414BF0 E0128050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 414BF4 E0128054 24020086 */  addiu     $v0, $zero, 0x86
 /* 414BF8 E0128058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s
rename to ver/us/asm/nonmatchings/effects/effect_134/fx_134_render.s
index 0b1108967b..d46f67dc89 100644
--- a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s
+++ b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0128198
+glabel fx_134_render
 /* 414D38 E0128198 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 414D3C E012819C 3C02E013 */  lui       $v0, %hi(func_E01281E0)
-/* 414D40 E01281A0 244281E0 */  addiu     $v0, $v0, %lo(func_E01281E0)
+/* 414D3C E012819C 3C02E013 */  lui       $v0, %hi(fx_134_appendGfx)
+/* 414D40 E01281A0 244281E0 */  addiu     $v0, $v0, %lo(fx_134_appendGfx)
 /* 414D44 E01281A4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 414D48 E01281A8 2402000A */  addiu     $v0, $zero, 0xa
 /* 414D4C E01281AC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s
rename to ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s
index a48607f2f7..96dd8cedc3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s
+++ b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0128130
+glabel fx_134_update
 /* 414CD0 E0128130 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 414CD4 E0128134 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 414CD8 E0128138 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s
rename to ver/us/asm/nonmatchings/effects/effect_14/fx_14_appendGfx.s
index c573addcc1..2bcc6e1790 100644
--- a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001C30C
+glabel fx_14_appendGfx
 /* 330C1C E001C30C 27BDFE70 */  addiu     $sp, $sp, -0x190
 /* 330C20 E001C310 0080302D */  daddu     $a2, $a0, $zero
 /* 330C24 E001C314 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s
index 1723e7fc2a..f3abcbaf06 100644
--- a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s
@@ -12,14 +12,14 @@ glabel fx_14_main
 /* 33092C E001C01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 330930 E001C020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 330934 E001C024 4486C000 */  mtc1      $a2, $f24
-/* 330938 E001C028 3C02E002 */  lui       $v0, %hi(func_E001C120)
-/* 33093C E001C02C 2442C120 */  addiu     $v0, $v0, %lo(func_E001C120)
+/* 330938 E001C028 3C02E002 */  lui       $v0, %hi(fx_14_init)
+/* 33093C E001C02C 2442C120 */  addiu     $v0, $v0, %lo(fx_14_init)
 /* 330940 E001C030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 330944 E001C034 3C02E002 */  lui       $v0, %hi(func_E001C128)
-/* 330948 E001C038 2442C128 */  addiu     $v0, $v0, %lo(func_E001C128)
+/* 330944 E001C034 3C02E002 */  lui       $v0, %hi(fx_14_update)
+/* 330948 E001C038 2442C128 */  addiu     $v0, $v0, %lo(fx_14_update)
 /* 33094C E001C03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 330950 E001C040 3C02E002 */  lui       $v0, %hi(func_E001C200)
-/* 330954 E001C044 2442C200 */  addiu     $v0, $v0, %lo(func_E001C200)
+/* 330950 E001C040 3C02E002 */  lui       $v0, %hi(fx_14_render)
+/* 330954 E001C044 2442C200 */  addiu     $v0, $v0, %lo(fx_14_render)
 /* 330958 E001C048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33095C E001C04C 2402000E */  addiu     $v0, $zero, 0xe
 /* 330960 E001C050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_render.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s
rename to ver/us/asm/nonmatchings/effects/effect_14/fx_14_render.s
index 86f21639a5..aea5abb209 100644
--- a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s
+++ b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_render.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001C200
+glabel fx_14_render
 /* 330B10 E001C200 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 330B14 E001C204 0080282D */  daddu     $a1, $a0, $zero
 /* 330B18 E001C208 3C038011 */  lui       $v1, %hi(gPlayerStatus)
@@ -61,8 +61,8 @@ glabel func_E001C200
 .LE001C2D0:
 /* 330BE0 E001C2D0 E4400008 */  swc1      $f0, 8($v0)
 .LE001C2D4:
-/* 330BE4 E001C2D4 3C02E002 */  lui       $v0, %hi(func_E001C30C)
-/* 330BE8 E001C2D8 2442C30C */  addiu     $v0, $v0, %lo(func_E001C30C)
+/* 330BE4 E001C2D4 3C02E002 */  lui       $v0, %hi(fx_14_appendGfx)
+/* 330BE8 E001C2D8 2442C30C */  addiu     $v0, $v0, %lo(fx_14_appendGfx)
 /* 330BEC E001C2DC AC82000C */  sw        $v0, 0xc($a0)
 /* 330BF0 E001C2E0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 330BF4 E001C2E4 AC850008 */  sw        $a1, 8($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s
rename to ver/us/asm/nonmatchings/effects/effect_14/fx_14_update.s
index 9033bd0d4d..83b7a1c1fd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s
+++ b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001C128
+glabel fx_14_update
 /* 330A38 E001C128 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 330A3C E001C12C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 330A40 E001C130 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s
rename to ver/us/asm/nonmatchings/effects/effect_15/fx_15_appendGfx.s
index 2b47889a2b..b4dc45405a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s
+++ b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001E730
+glabel fx_15_appendGfx
 /* 332070 E001E730 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 332074 E001E734 3C03DB06 */  lui       $v1, 0xdb06
 /* 332078 E001E738 AFB700BC */  sw        $s7, 0xbc($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s
index ef44f905fe..70e1f6521f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s
@@ -14,14 +14,14 @@ glabel fx_15_main
 /* 331964 E001E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 331968 E001E028 F7BE0060 */  sdc1      $f30, 0x60($sp)
 /* 33196C E001E02C C7BE0084 */  lwc1      $f30, 0x84($sp)
-/* 331970 E001E030 3C02E002 */  lui       $v0, %hi(func_E001E370)
-/* 331974 E001E034 2442E370 */  addiu     $v0, $v0, %lo(func_E001E370)
+/* 331970 E001E030 3C02E002 */  lui       $v0, %hi(fx_15_init)
+/* 331974 E001E034 2442E370 */  addiu     $v0, $v0, %lo(fx_15_init)
 /* 331978 E001E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33197C E001E03C 3C02E002 */  lui       $v0, %hi(func_E001E378)
-/* 331980 E001E040 2442E378 */  addiu     $v0, $v0, %lo(func_E001E378)
+/* 33197C E001E03C 3C02E002 */  lui       $v0, %hi(fx_15_update)
+/* 331980 E001E040 2442E378 */  addiu     $v0, $v0, %lo(fx_15_update)
 /* 331984 E001E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 331988 E001E048 3C02E002 */  lui       $v0, %hi(func_E001E6E8)
-/* 33198C E001E04C 2442E6E8 */  addiu     $v0, $v0, %lo(func_E001E6E8)
+/* 331988 E001E048 3C02E002 */  lui       $v0, %hi(fx_15_render)
+/* 33198C E001E04C 2442E6E8 */  addiu     $v0, $v0, %lo(fx_15_render)
 /* 331990 E001E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 331994 E001E054 2402000F */  addiu     $v0, $zero, 0xf
 /* 331998 E001E058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s
rename to ver/us/asm/nonmatchings/effects/effect_15/fx_15_render.s
index 2f9076c5da..0336829f04 100644
--- a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_render.s
@@ -1,13 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001E6E8
+glabel fx_15_render
 /* 332028 E001E6E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 33202C E001E6EC 0000282D */  daddu     $a1, $zero, $zero
 /* 332030 E001E6F0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 332034 E001E6F4 8C83000C */  lw        $v1, 0xc($a0)
-/* 332038 E001E6F8 3C02E002 */  lui       $v0, %hi(func_E001E730)
-/* 33203C E001E6FC 2442E730 */  addiu     $v0, $v0, %lo(func_E001E730)
+/* 332038 E001E6F8 3C02E002 */  lui       $v0, %hi(fx_15_appendGfx)
+/* 33203C E001E6FC 2442E730 */  addiu     $v0, $v0, %lo(fx_15_appendGfx)
 /* 332040 E001E700 AFA40018 */  sw        $a0, 0x18($sp)
 /* 332044 E001E704 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 332048 E001E708 AFA00014 */  sw        $zero, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s
rename to ver/us/asm/nonmatchings/effects/effect_15/fx_15_update.s
index 5607d7cf97..529fc73211 100644
--- a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s
+++ b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E001E378
+glabel fx_15_update
 /* 331CB8 E001E378 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 331CBC E001E37C AFB1002C */  sw        $s1, 0x2c($sp)
 /* 331CC0 E001E380 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s
rename to ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s
index 90285a5694..0601d509ea 100644
--- a/ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00205D0
+glabel fx_16_appendGfx
 /* 334490 E00205D0 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 334494 E00205D4 3C06DB06 */  lui       $a2, 0xdb06
 /* 334498 E00205D8 AFB600C0 */  sw        $s6, 0xc0($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s
index cc616fd3a6..8bed4b022f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s
@@ -28,14 +28,14 @@ glabel fx_16_main
 /* 3341E8 E0020328 AFB1002C */   sw       $s1, 0x2c($sp)
 /* 3341EC E002032C 24130003 */  addiu     $s3, $zero, 3
 .LE0020330:
-/* 3341F0 E0020330 3C02E002 */  lui       $v0, %hi(func_E0020460)
-/* 3341F4 E0020334 24420460 */  addiu     $v0, $v0, %lo(func_E0020460)
+/* 3341F0 E0020330 3C02E002 */  lui       $v0, %hi(fx_16_init)
+/* 3341F4 E0020334 24420460 */  addiu     $v0, $v0, %lo(fx_16_init)
 /* 3341F8 E0020338 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3341FC E002033C 3C02E002 */  lui       $v0, %hi(func_E0020468)
-/* 334200 E0020340 24420468 */  addiu     $v0, $v0, %lo(func_E0020468)
+/* 3341FC E002033C 3C02E002 */  lui       $v0, %hi(fx_16_update)
+/* 334200 E0020340 24420468 */  addiu     $v0, $v0, %lo(fx_16_update)
 /* 334204 E0020344 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 334208 E0020348 3C02E002 */  lui       $v0, %hi(func_E002058C)
-/* 33420C E002034C 2442058C */  addiu     $v0, $v0, %lo(func_E002058C)
+/* 334208 E0020348 3C02E002 */  lui       $v0, %hi(fx_16_render)
+/* 33420C E002034C 2442058C */  addiu     $v0, $v0, %lo(fx_16_render)
 /* 334210 E0020350 AFA20020 */  sw        $v0, 0x20($sp)
 /* 334214 E0020354 24020010 */  addiu     $v0, $zero, 0x10
 /* 334218 E0020358 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s
rename to ver/us/asm/nonmatchings/effects/effect_16/fx_16_render.s
index ba88765b4d..4542107c5c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002058C
+glabel fx_16_render
 /* 33444C E002058C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 334450 E0020590 3C02E002 */  lui       $v0, %hi(func_E00205D0)
-/* 334454 E0020594 244205D0 */  addiu     $v0, $v0, %lo(func_E00205D0)
+/* 334450 E0020590 3C02E002 */  lui       $v0, %hi(fx_16_appendGfx)
+/* 334454 E0020594 244205D0 */  addiu     $v0, $v0, %lo(fx_16_appendGfx)
 /* 334458 E0020598 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33445C E002059C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 334460 E00205A0 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s
rename to ver/us/asm/nonmatchings/effects/effect_16/fx_16_update.s
index cde73fdfd2..5a3f59efe4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s
+++ b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0020468
+glabel fx_16_update
 /* 334328 E0020468 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 33432C E002046C AFB20018 */  sw        $s2, 0x18($sp)
 /* 334330 E0020470 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s
rename to ver/us/asm/nonmatchings/effects/effect_17/fx_17_appendGfx.s
index 0a044f8f11..6dbcbd67ba 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s
+++ b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0022998
+glabel fx_17_appendGfx
 /* 337BD8 E0022998 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 337BDC E002299C 3C06DB06 */  lui       $a2, 0xdb06
 /* 337BE0 E00229A0 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s
index 0a586578e1..96c32d1b73 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s
@@ -58,14 +58,14 @@ glabel fx_17_main
 /* 3372FC E00220BC 4481F000 */  mtc1      $at, $f30
 .LE00220C0:
 /* 337300 E00220C0 26520001 */  addiu     $s2, $s2, 1
-/* 337304 E00220C4 3C02E002 */  lui       $v0, %hi(func_E0022544)
-/* 337308 E00220C8 24422544 */  addiu     $v0, $v0, %lo(func_E0022544)
+/* 337304 E00220C4 3C02E002 */  lui       $v0, %hi(fx_17_init)
+/* 337308 E00220C8 24422544 */  addiu     $v0, $v0, %lo(fx_17_init)
 /* 33730C E00220CC AC820008 */  sw        $v0, 8($a0)
-/* 337310 E00220D0 3C02E002 */  lui       $v0, %hi(func_E002254C)
-/* 337314 E00220D4 2442254C */  addiu     $v0, $v0, %lo(func_E002254C)
+/* 337310 E00220D0 3C02E002 */  lui       $v0, %hi(fx_17_update)
+/* 337314 E00220D4 2442254C */  addiu     $v0, $v0, %lo(fx_17_update)
 /* 337318 E00220D8 AC82000C */  sw        $v0, 0xc($a0)
-/* 33731C E00220DC 3C02E002 */  lui       $v0, %hi(func_E0022960)
-/* 337320 E00220E0 24422960 */  addiu     $v0, $v0, %lo(func_E0022960)
+/* 33731C E00220DC 3C02E002 */  lui       $v0, %hi(fx_17_render)
+/* 337320 E00220E0 24422960 */  addiu     $v0, $v0, %lo(fx_17_render)
 /* 337324 E00220E4 AC820010 */  sw        $v0, 0x10($a0)
 /* 337328 E00220E8 24020011 */  addiu     $v0, $zero, 0x11
 /* 33732C E00220EC AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_render.s
similarity index 82%
rename from ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s
rename to ver/us/asm/nonmatchings/effects/effect_17/fx_17_render.s
index 78aa16ac9d..9e4b5529c0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s
+++ b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0022960
+glabel fx_17_render
 /* 337BA0 E0022960 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 337BA4 E0022964 3C02E002 */  lui       $v0, %hi(func_E0022998)
-/* 337BA8 E0022968 24422998 */  addiu     $v0, $v0, %lo(func_E0022998)
+/* 337BA4 E0022964 3C02E002 */  lui       $v0, %hi(fx_17_appendGfx)
+/* 337BA8 E0022968 24422998 */  addiu     $v0, $v0, %lo(fx_17_appendGfx)
 /* 337BAC E002296C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 337BB0 E0022970 2402002D */  addiu     $v0, $zero, 0x2d
 /* 337BB4 E0022974 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s
rename to ver/us/asm/nonmatchings/effects/effect_17/fx_17_update.s
index 5f4e9e48a8..ed27c2f951 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002254C
+glabel fx_17_update
 /* 33778C E002254C 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 337790 E0022550 AFB50024 */  sw        $s5, 0x24($sp)
 /* 337794 E0022554 0080A82D */  daddu     $s5, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s
rename to ver/us/asm/nonmatchings/effects/effect_18/fx_18_appendGfx.s
index 6fc282018d..04a871a8c0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s
+++ b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0024454
+glabel fx_18_appendGfx
 /* 3396A4 E0024454 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3396A8 E0024458 3C07DB06 */  lui       $a3, 0xdb06
 /* 3396AC E002445C 3C05800A */  lui       $a1, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s
index 86b1a78137..6bfbf79560 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s
@@ -14,14 +14,14 @@ glabel fx_18_main
 /* 339274 E0024024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 339278 E0024028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 33927C E002402C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 339280 E0024030 3C02E002 */  lui       $v0, %hi(func_E0024180)
-/* 339284 E0024034 24424180 */  addiu     $v0, $v0, %lo(func_E0024180)
+/* 339280 E0024030 3C02E002 */  lui       $v0, %hi(fx_18_init)
+/* 339284 E0024034 24424180 */  addiu     $v0, $v0, %lo(fx_18_init)
 /* 339288 E0024038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33928C E002403C 3C02E002 */  lui       $v0, %hi(func_E0024188)
-/* 339290 E0024040 24424188 */  addiu     $v0, $v0, %lo(func_E0024188)
+/* 33928C E002403C 3C02E002 */  lui       $v0, %hi(fx_18_update)
+/* 339290 E0024040 24424188 */  addiu     $v0, $v0, %lo(fx_18_update)
 /* 339294 E0024044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 339298 E0024048 3C02E002 */  lui       $v0, %hi(func_E00242E0)
-/* 33929C E002404C 244242E0 */  addiu     $v0, $v0, %lo(func_E00242E0)
+/* 339298 E0024048 3C02E002 */  lui       $v0, %hi(fx_18_render)
+/* 33929C E002404C 244242E0 */  addiu     $v0, $v0, %lo(fx_18_render)
 /* 3392A0 E0024050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3392A4 E0024054 24020012 */  addiu     $v0, $zero, 0x12
 /* 3392A8 E0024058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s
rename to ver/us/asm/nonmatchings/effects/effect_18/fx_18_render.s
index 7ad92bb563..c5affe05c5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00242E0
+glabel fx_18_render
 /* 339530 E00242E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 339534 E00242E4 3C02E002 */  lui       $v0, %hi(func_E0024454)
-/* 339538 E00242E8 24424454 */  addiu     $v0, $v0, %lo(func_E0024454)
+/* 339534 E00242E4 3C02E002 */  lui       $v0, %hi(fx_18_appendGfx)
+/* 339538 E00242E8 24424454 */  addiu     $v0, $v0, %lo(fx_18_appendGfx)
 /* 33953C E00242EC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 339540 E00242F0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 339544 E00242F4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s
rename to ver/us/asm/nonmatchings/effects/effect_18/fx_18_update.s
index d8ae668981..77541dd564 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s
+++ b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0024188
+glabel fx_18_update
 /* 3393D8 E0024188 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3393DC E002418C AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3393E0 E0024190 AFB10024 */  sw        $s1, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s
rename to ver/us/asm/nonmatchings/effects/effect_19/fx_19_appendGfx.s
index 1564d86896..5034114379 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00264F4
+glabel fx_19_appendGfx
 /* 33B674 E00264F4 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 33B678 E00264F8 AFB70104 */  sw        $s7, 0x104($sp)
 /* 33B67C E00264FC 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s
index 263eac4058..1da9888c58 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s
@@ -14,14 +14,14 @@ glabel fx_19_main
 /* 33B1A4 E0026024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33B1A8 E0026028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 33B1AC E002602C C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* 33B1B0 E0026030 3C02E002 */  lui       $v0, %hi(func_E0026184)
-/* 33B1B4 E0026034 24426184 */  addiu     $v0, $v0, %lo(func_E0026184)
+/* 33B1B0 E0026030 3C02E002 */  lui       $v0, %hi(fx_19_init)
+/* 33B1B4 E0026034 24426184 */  addiu     $v0, $v0, %lo(fx_19_init)
 /* 33B1B8 E0026038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33B1BC E002603C 3C02E002 */  lui       $v0, %hi(func_E002618C)
-/* 33B1C0 E0026040 2442618C */  addiu     $v0, $v0, %lo(func_E002618C)
+/* 33B1BC E002603C 3C02E002 */  lui       $v0, %hi(fx_19_update)
+/* 33B1C0 E0026040 2442618C */  addiu     $v0, $v0, %lo(fx_19_update)
 /* 33B1C4 E0026044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33B1C8 E0026048 3C02E002 */  lui       $v0, %hi(func_E00264B0)
-/* 33B1CC E002604C 244264B0 */  addiu     $v0, $v0, %lo(func_E00264B0)
+/* 33B1C8 E0026048 3C02E002 */  lui       $v0, %hi(fx_19_render)
+/* 33B1CC E002604C 244264B0 */  addiu     $v0, $v0, %lo(fx_19_render)
 /* 33B1D0 E0026050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33B1D4 E0026054 24020013 */  addiu     $v0, $zero, 0x13
 /* 33B1D8 E0026058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s
rename to ver/us/asm/nonmatchings/effects/effect_19/fx_19_render.s
index 552b555ad4..9eb9f1421e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00264B0
+glabel fx_19_render
 /* 33B630 E00264B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 33B634 E00264B4 3C02E002 */  lui       $v0, %hi(func_E00264F4)
-/* 33B638 E00264B8 244264F4 */  addiu     $v0, $v0, %lo(func_E00264F4)
+/* 33B634 E00264B4 3C02E002 */  lui       $v0, %hi(fx_19_appendGfx)
+/* 33B638 E00264B8 244264F4 */  addiu     $v0, $v0, %lo(fx_19_appendGfx)
 /* 33B63C E00264BC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33B640 E00264C0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 33B644 E00264C4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s
rename to ver/us/asm/nonmatchings/effects/effect_19/fx_19_update.s
index 38c8680b07..1e04457014 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002618C
+glabel fx_19_update
 /* 33B30C E002618C 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 33B310 E0026190 AFB1003C */  sw        $s1, 0x3c($sp)
 /* 33B314 E0026194 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s
rename to ver/us/asm/nonmatchings/effects/effect_20/fx_20_appendGfx.s
index 4af1c69a33..eb21dc7bc3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002852C
+glabel fx_20_appendGfx
 /* 33D31C E002852C 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 33D320 E0028530 AFB700F4 */  sw        $s7, 0xf4($sp)
 /* 33D324 E0028534 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s
index 5235c95a00..970ee28fb5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s
@@ -12,14 +12,14 @@ glabel fx_20_main
 /* 33CE0C E002801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33CE10 E0028020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 33CE14 E0028024 4487C000 */  mtc1      $a3, $f24
-/* 33CE18 E0028028 3C02E003 */  lui       $v0, %hi(func_E0028240)
-/* 33CE1C E002802C 24428240 */  addiu     $v0, $v0, %lo(func_E0028240)
+/* 33CE18 E0028028 3C02E003 */  lui       $v0, %hi(fx_20_init)
+/* 33CE1C E002802C 24428240 */  addiu     $v0, $v0, %lo(fx_20_init)
 /* 33CE20 E0028030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33CE24 E0028034 3C02E003 */  lui       $v0, %hi(func_E0028248)
-/* 33CE28 E0028038 24428248 */  addiu     $v0, $v0, %lo(func_E0028248)
+/* 33CE24 E0028034 3C02E003 */  lui       $v0, %hi(fx_20_update)
+/* 33CE28 E0028038 24428248 */  addiu     $v0, $v0, %lo(fx_20_update)
 /* 33CE2C E002803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33CE30 E0028040 3C02E003 */  lui       $v0, %hi(func_E00284E8)
-/* 33CE34 E0028044 244284E8 */  addiu     $v0, $v0, %lo(func_E00284E8)
+/* 33CE30 E0028040 3C02E003 */  lui       $v0, %hi(fx_20_render)
+/* 33CE34 E0028044 244284E8 */  addiu     $v0, $v0, %lo(fx_20_render)
 /* 33CE38 E0028048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33CE3C E002804C 24020014 */  addiu     $v0, $zero, 0x14
 /* 33CE40 E0028050 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s
rename to ver/us/asm/nonmatchings/effects/effect_20/fx_20_render.s
index 63e3b131fe..fda008b901 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00284E8
+glabel fx_20_render
 /* 33D2D8 E00284E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 33D2DC E00284EC 3C02E003 */  lui       $v0, %hi(func_E002852C)
-/* 33D2E0 E00284F0 2442852C */  addiu     $v0, $v0, %lo(func_E002852C)
+/* 33D2DC E00284EC 3C02E003 */  lui       $v0, %hi(fx_20_appendGfx)
+/* 33D2E0 E00284F0 2442852C */  addiu     $v0, $v0, %lo(fx_20_appendGfx)
 /* 33D2E4 E00284F4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33D2E8 E00284F8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 33D2EC E00284FC AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s
rename to ver/us/asm/nonmatchings/effects/effect_20/fx_20_update.s
index 70525a344c..193559afee 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s
+++ b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0028248
+glabel fx_20_update
 /* 33D038 E0028248 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 33D03C E002824C AFB3001C */  sw        $s3, 0x1c($sp)
 /* 33D040 E0028250 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s
rename to ver/us/asm/nonmatchings/effects/effect_21/fx_21_appendGfx.s
index 9655530b1e..f2a5d0a9a3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002A3C4
+glabel fx_21_appendGfx
 /* 33EC84 E002A3C4 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 33EC88 E002A3C8 3C02DB06 */  lui       $v0, 0xdb06
 /* 33EC8C E002A3CC 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s
index 66cde56c7d..fc67cbb1ef 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s
@@ -22,14 +22,14 @@ glabel fx_21_main
 /* 33E904 E002A044 AFB00028 */   sw       $s0, 0x28($sp)
 /* 33E908 E002A048 24120005 */  addiu     $s2, $zero, 5
 .LE002A04C:
-/* 33E90C E002A04C 3C02E003 */  lui       $v0, %hi(func_E002A284)
-/* 33E910 E002A050 2442A284 */  addiu     $v0, $v0, %lo(func_E002A284)
+/* 33E90C E002A04C 3C02E003 */  lui       $v0, %hi(fx_21_init)
+/* 33E910 E002A050 2442A284 */  addiu     $v0, $v0, %lo(fx_21_init)
 /* 33E914 E002A054 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33E918 E002A058 3C02E003 */  lui       $v0, %hi(func_E002A28C)
-/* 33E91C E002A05C 2442A28C */  addiu     $v0, $v0, %lo(func_E002A28C)
+/* 33E918 E002A058 3C02E003 */  lui       $v0, %hi(fx_21_update)
+/* 33E91C E002A05C 2442A28C */  addiu     $v0, $v0, %lo(fx_21_update)
 /* 33E920 E002A060 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33E924 E002A064 3C02E003 */  lui       $v0, %hi(func_E002A380)
-/* 33E928 E002A068 2442A380 */  addiu     $v0, $v0, %lo(func_E002A380)
+/* 33E924 E002A064 3C02E003 */  lui       $v0, %hi(fx_21_render)
+/* 33E928 E002A068 2442A380 */  addiu     $v0, $v0, %lo(fx_21_render)
 /* 33E92C E002A06C AFA20020 */  sw        $v0, 0x20($sp)
 /* 33E930 E002A070 24020015 */  addiu     $v0, $zero, 0x15
 /* 33E934 E002A074 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s
rename to ver/us/asm/nonmatchings/effects/effect_21/fx_21_render.s
index 848421d36b..a5cc7bdf9e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s
+++ b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002A380
+glabel fx_21_render
 /* 33EC40 E002A380 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 33EC44 E002A384 3C02E003 */  lui       $v0, %hi(func_E002A3C4)
-/* 33EC48 E002A388 2442A3C4 */  addiu     $v0, $v0, %lo(func_E002A3C4)
+/* 33EC44 E002A384 3C02E003 */  lui       $v0, %hi(fx_21_appendGfx)
+/* 33EC48 E002A388 2442A3C4 */  addiu     $v0, $v0, %lo(fx_21_appendGfx)
 /* 33EC4C E002A38C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33EC50 E002A390 24020011 */  addiu     $v0, $zero, 0x11
 /* 33EC54 E002A394 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s
rename to ver/us/asm/nonmatchings/effects/effect_21/fx_21_update.s
index 93438b78d0..c8f062aa66 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002A28C
+glabel fx_21_update
 /* 33EB4C E002A28C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 33EB50 E002A290 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 33EB54 E002A294 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s
rename to ver/us/asm/nonmatchings/effects/effect_22/fx_22_appendGfx.s
index 97af4a88fd..3d1c90025e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s
+++ b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002C414
+glabel fx_22_appendGfx
 /* 340294 E002C414 27BDFEA0 */  addiu     $sp, $sp, -0x160
 /* 340298 E002C418 3C02DB06 */  lui       $v0, 0xdb06
 /* 34029C E002C41C 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s
index c00b7aeac9..53a747fd39 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s
@@ -10,14 +10,14 @@ glabel fx_22_main
 /* 33FE94 E002C014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33FE98 E002C018 F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 33FE9C E002C01C 4487C000 */  mtc1      $a3, $f24
-/* 33FEA0 E002C020 3C02E003 */  lui       $v0, %hi(func_E002C234)
-/* 33FEA4 E002C024 2442C234 */  addiu     $v0, $v0, %lo(func_E002C234)
+/* 33FEA0 E002C020 3C02E003 */  lui       $v0, %hi(fx_22_init)
+/* 33FEA4 E002C024 2442C234 */  addiu     $v0, $v0, %lo(fx_22_init)
 /* 33FEA8 E002C028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33FEAC E002C02C 3C02E003 */  lui       $v0, %hi(func_E002C23C)
-/* 33FEB0 E002C030 2442C23C */  addiu     $v0, $v0, %lo(func_E002C23C)
+/* 33FEAC E002C02C 3C02E003 */  lui       $v0, %hi(fx_22_update)
+/* 33FEB0 E002C030 2442C23C */  addiu     $v0, $v0, %lo(fx_22_update)
 /* 33FEB4 E002C034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33FEB8 E002C038 3C02E003 */  lui       $v0, %hi(func_E002C3D0)
-/* 33FEBC E002C03C 2442C3D0 */  addiu     $v0, $v0, %lo(func_E002C3D0)
+/* 33FEB8 E002C038 3C02E003 */  lui       $v0, %hi(fx_22_render)
+/* 33FEBC E002C03C 2442C3D0 */  addiu     $v0, $v0, %lo(fx_22_render)
 /* 33FEC0 E002C040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33FEC4 E002C044 24020016 */  addiu     $v0, $zero, 0x16
 /* 33FEC8 E002C048 AFBF0048 */  sw        $ra, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s
rename to ver/us/asm/nonmatchings/effects/effect_22/fx_22_render.s
index a7a5f2ab74..a80d595149 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002C3D0
+glabel fx_22_render
 /* 340250 E002C3D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 340254 E002C3D4 3C02E003 */  lui       $v0, %hi(func_E002C414)
-/* 340258 E002C3D8 2442C414 */  addiu     $v0, $v0, %lo(func_E002C414)
+/* 340254 E002C3D4 3C02E003 */  lui       $v0, %hi(fx_22_appendGfx)
+/* 340258 E002C3D8 2442C414 */  addiu     $v0, $v0, %lo(fx_22_appendGfx)
 /* 34025C E002C3DC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 340260 E002C3E0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 340264 E002C3E4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s
rename to ver/us/asm/nonmatchings/effects/effect_22/fx_22_update.s
index b5b5b83fa4..bff4d2a209 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002C23C
+glabel fx_22_update
 /* 3400BC E002C23C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3400C0 E002C240 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3400C4 E002C244 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s
rename to ver/us/asm/nonmatchings/effects/effect_23/fx_23_appendGfx.s
index f9be197fa9..443ae07821 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s
+++ b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002E368
+glabel fx_23_appendGfx
 /* 341D48 E002E368 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 341D4C E002E36C AFBE0100 */  sw        $fp, 0x100($sp)
 /* 341D50 E002E370 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s
index ee46dd682c..44d0cd9f9d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s
@@ -40,14 +40,14 @@ glabel fx_23_main
 /* 341A60 E002E080 3C014228 */  lui       $at, 0x4228
 /* 341A64 E002E084 4481B000 */  mtc1      $at, $f22
 .LE002E088:
-/* 341A68 E002E088 3C02E003 */  lui       $v0, %hi(func_E002E248)
-/* 341A6C E002E08C 2442E248 */  addiu     $v0, $v0, %lo(func_E002E248)
+/* 341A68 E002E088 3C02E003 */  lui       $v0, %hi(fx_23_init)
+/* 341A6C E002E08C 2442E248 */  addiu     $v0, $v0, %lo(fx_23_init)
 /* 341A70 E002E090 AC820008 */  sw        $v0, 8($a0)
-/* 341A74 E002E094 3C02E003 */  lui       $v0, %hi(func_E002E250)
-/* 341A78 E002E098 2442E250 */  addiu     $v0, $v0, %lo(func_E002E250)
+/* 341A74 E002E094 3C02E003 */  lui       $v0, %hi(fx_23_update)
+/* 341A78 E002E098 2442E250 */  addiu     $v0, $v0, %lo(fx_23_update)
 /* 341A7C E002E09C AC82000C */  sw        $v0, 0xc($a0)
-/* 341A80 E002E0A0 3C02E003 */  lui       $v0, %hi(func_E002E330)
-/* 341A84 E002E0A4 2442E330 */  addiu     $v0, $v0, %lo(func_E002E330)
+/* 341A80 E002E0A0 3C02E003 */  lui       $v0, %hi(fx_23_render)
+/* 341A84 E002E0A4 2442E330 */  addiu     $v0, $v0, %lo(fx_23_render)
 /* 341A88 E002E0A8 AC820010 */  sw        $v0, 0x10($a0)
 /* 341A8C E002E0AC 24020017 */  addiu     $v0, $zero, 0x17
 /* 341A90 E002E0B0 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_render.s
similarity index 82%
rename from ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s
rename to ver/us/asm/nonmatchings/effects/effect_23/fx_23_render.s
index 85914fb894..7cc216b5fc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s
+++ b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002E330
+glabel fx_23_render
 /* 341D10 E002E330 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 341D14 E002E334 3C02E003 */  lui       $v0, %hi(func_E002E368)
-/* 341D18 E002E338 2442E368 */  addiu     $v0, $v0, %lo(func_E002E368)
+/* 341D14 E002E334 3C02E003 */  lui       $v0, %hi(fx_23_appendGfx)
+/* 341D18 E002E338 2442E368 */  addiu     $v0, $v0, %lo(fx_23_appendGfx)
 /* 341D1C E002E33C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 341D20 E002E340 24020028 */  addiu     $v0, $zero, 0x28
 /* 341D24 E002E344 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s
rename to ver/us/asm/nonmatchings/effects/effect_23/fx_23_update.s
index fc0871b038..5591b30766 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s
+++ b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E002E250
+glabel fx_23_update
 /* 341C30 E002E250 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 341C34 E002E254 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 341C38 E002E258 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s
rename to ver/us/asm/nonmatchings/effects/effect_24/fx_24_appendGfx.s
index 336b9f38be..294b7c40bf 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s
+++ b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0030A68
+glabel fx_24_appendGfx
 /* 342BA8 E0030A68 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 342BAC E0030A6C 3C05DB06 */  lui       $a1, 0xdb06
 /* 342BB0 E0030A70 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s
index 7f167d6d85..df78148607 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s
@@ -123,16 +123,16 @@ glabel fx_24_main
 /* 34230C E00301CC 4600F782 */  mul.s     $f30, $f30, $f0
 /* 342310 E00301D0 00000000 */  nop
 /* 342314 E00301D4 0200202D */  daddu     $a0, $s0, $zero
-/* 342318 E00301D8 3C02E003 */  lui       $v0, %hi(func_E0030728)
-/* 34231C E00301DC 24420728 */  addiu     $v0, $v0, %lo(func_E0030728)
+/* 342318 E00301D8 3C02E003 */  lui       $v0, %hi(fx_24_init)
+/* 34231C E00301DC 24420728 */  addiu     $v0, $v0, %lo(fx_24_init)
 /* 342320 E00301E0 AC820008 */  sw        $v0, 8($a0)
 /* 342324 E00301E4 46004202 */  mul.s     $f8, $f8, $f0
 /* 342328 E00301E8 00000000 */  nop
-/* 34232C E00301EC 3C02E003 */  lui       $v0, %hi(func_E0030730)
-/* 342330 E00301F0 24420730 */  addiu     $v0, $v0, %lo(func_E0030730)
+/* 34232C E00301EC 3C02E003 */  lui       $v0, %hi(fx_24_update)
+/* 342330 E00301F0 24420730 */  addiu     $v0, $v0, %lo(fx_24_update)
 /* 342334 E00301F4 AC82000C */  sw        $v0, 0xc($a0)
-/* 342338 E00301F8 3C02E003 */  lui       $v0, %hi(func_E0030A24)
-/* 34233C E00301FC 24420A24 */  addiu     $v0, $v0, %lo(func_E0030A24)
+/* 342338 E00301F8 3C02E003 */  lui       $v0, %hi(fx_24_render)
+/* 34233C E00301FC 24420A24 */  addiu     $v0, $v0, %lo(fx_24_render)
 /* 342340 E0030200 AC800000 */  sw        $zero, ($a0)
 /* 342344 E0030204 4600E702 */  mul.s     $f28, $f28, $f0
 /* 342348 E0030208 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s
rename to ver/us/asm/nonmatchings/effects/effect_24/fx_24_render.s
index 88ec73f931..782c869e82 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s
+++ b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0030A24
+glabel fx_24_render
 /* 342B64 E0030A24 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 342B68 E0030A28 3C02E003 */  lui       $v0, %hi(func_E0030A68)
-/* 342B6C E0030A2C 24420A68 */  addiu     $v0, $v0, %lo(func_E0030A68)
+/* 342B68 E0030A28 3C02E003 */  lui       $v0, %hi(fx_24_appendGfx)
+/* 342B6C E0030A2C 24420A68 */  addiu     $v0, $v0, %lo(fx_24_appendGfx)
 /* 342B70 E0030A30 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 342B74 E0030A34 2402002D */  addiu     $v0, $zero, 0x2d
 /* 342B78 E0030A38 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s
rename to ver/us/asm/nonmatchings/effects/effect_24/fx_24_update.s
index 28a31ba5e1..a83e88d6d8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s
+++ b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0030730
+glabel fx_24_update
 /* 342870 E0030730 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 342874 E0030734 AFB40020 */  sw        $s4, 0x20($sp)
 /* 342878 E0030738 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s
rename to ver/us/asm/nonmatchings/effects/effect_25/fx_25_appendGfx.s
index 928022969c..1c6183f489 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003245C
+glabel fx_25_appendGfx
 /* 343ADC E003245C 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 343AE0 E0032460 0080302D */  daddu     $a2, $a0, $zero
 /* 343AE4 E0032464 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s
index 8c11b46e22..0c9a811067 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s
@@ -12,17 +12,17 @@ glabel fx_25_main
 /* 34369C E003201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3436A0 E0032020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3436A4 E0032024 4487C000 */  mtc1      $a3, $f24
-/* 3436A8 E0032028 3C02E003 */  lui       $v0, %hi(func_E00321D0)
-/* 3436AC E003202C 244221D0 */  addiu     $v0, $v0, %lo(func_E00321D0)
+/* 3436A8 E0032028 3C02E003 */  lui       $v0, %hi(fx_25_init)
+/* 3436AC E003202C 244221D0 */  addiu     $v0, $v0, %lo(fx_25_init)
 /* 3436B0 E0032030 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 3436B4 E0032034 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3436B8 E0032038 AFA00010 */  sw        $zero, 0x10($sp)
 /* 3436BC E003203C AC820008 */  sw        $v0, 8($a0)
-/* 3436C0 E0032040 3C02E003 */  lui       $v0, %hi(func_E00321D8)
-/* 3436C4 E0032044 244221D8 */  addiu     $v0, $v0, %lo(func_E00321D8)
+/* 3436C0 E0032040 3C02E003 */  lui       $v0, %hi(fx_25_update)
+/* 3436C4 E0032044 244221D8 */  addiu     $v0, $v0, %lo(fx_25_update)
 /* 3436C8 E0032048 AC82000C */  sw        $v0, 0xc($a0)
-/* 3436CC E003204C 3C02E003 */  lui       $v0, %hi(func_E0032420)
-/* 3436D0 E0032050 24422420 */  addiu     $v0, $v0, %lo(func_E0032420)
+/* 3436CC E003204C 3C02E003 */  lui       $v0, %hi(fx_25_render)
+/* 3436D0 E0032050 24422420 */  addiu     $v0, $v0, %lo(fx_25_render)
 /* 3436D4 E0032054 AC820010 */  sw        $v0, 0x10($a0)
 /* 3436D8 E0032058 24020019 */  addiu     $v0, $zero, 0x19
 /* 3436DC E003205C AC800014 */  sw        $zero, 0x14($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s
rename to ver/us/asm/nonmatchings/effects/effect_25/fx_25_render.s
index b1e30218aa..4b8aabb126 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s
+++ b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0032420
+glabel fx_25_render
 /* 343AA0 E0032420 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 343AA4 E0032424 3C02E003 */  lui       $v0, %hi(func_E003245C)
-/* 343AA8 E0032428 2442245C */  addiu     $v0, $v0, %lo(func_E003245C)
+/* 343AA4 E0032424 3C02E003 */  lui       $v0, %hi(fx_25_appendGfx)
+/* 343AA8 E0032428 2442245C */  addiu     $v0, $v0, %lo(fx_25_appendGfx)
 /* 343AAC E003242C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 343AB0 E0032430 2402000A */  addiu     $v0, $zero, 0xa
 /* 343AB4 E0032434 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s
rename to ver/us/asm/nonmatchings/effects/effect_25/fx_25_update.s
index d57e730b5e..a8135b7dc8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00321D8
+glabel fx_25_update
 /* 343858 E00321D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 34385C E00321DC AFBF0024 */  sw        $ra, 0x24($sp)
 /* 343860 E00321E0 AFB20020 */  sw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s
rename to ver/us/asm/nonmatchings/effects/effect_26/fx_26_appendGfx.s
index 7cb1ca3508..8ef4384777 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s
+++ b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0034310
+glabel fx_26_appendGfx
 /* 344D20 E0034310 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 344D24 E0034314 3C03DB06 */  lui       $v1, 0xdb06
 /* 344D28 E0034318 AFB600F8 */  sw        $s6, 0xf8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s
index 7d50593d67..93e9f8365e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s
@@ -12,14 +12,14 @@ glabel fx_26_main
 /* 344A2C E003401C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 344A30 E0034020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 344A34 E0034024 4487C000 */  mtc1      $a3, $f24
-/* 344A38 E0034028 3C02E003 */  lui       $v0, %hi(func_E0034108)
-/* 344A3C E003402C 24424108 */  addiu     $v0, $v0, %lo(func_E0034108)
+/* 344A38 E0034028 3C02E003 */  lui       $v0, %hi(fx_26_init)
+/* 344A3C E003402C 24424108 */  addiu     $v0, $v0, %lo(fx_26_init)
 /* 344A40 E0034030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 344A44 E0034034 3C02E003 */  lui       $v0, %hi(func_E0034110)
-/* 344A48 E0034038 24424110 */  addiu     $v0, $v0, %lo(func_E0034110)
+/* 344A44 E0034034 3C02E003 */  lui       $v0, %hi(fx_26_update)
+/* 344A48 E0034038 24424110 */  addiu     $v0, $v0, %lo(fx_26_update)
 /* 344A4C E003403C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 344A50 E0034040 3C02E003 */  lui       $v0, %hi(func_E00342C8)
-/* 344A54 E0034044 244242C8 */  addiu     $v0, $v0, %lo(func_E00342C8)
+/* 344A50 E0034040 3C02E003 */  lui       $v0, %hi(fx_26_render)
+/* 344A54 E0034044 244242C8 */  addiu     $v0, $v0, %lo(fx_26_render)
 /* 344A58 E0034048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 344A5C E003404C 2402001A */  addiu     $v0, $zero, 0x1a
 /* 344A60 E0034050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s
rename to ver/us/asm/nonmatchings/effects/effect_26/fx_26_render.s
index 357e0ba1ec..da9a3209ab 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00342C8
+glabel fx_26_render
 /* 344CD8 E00342C8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 344CDC E00342CC 3C02E003 */  lui       $v0, %hi(func_E0034310)
-/* 344CE0 E00342D0 24424310 */  addiu     $v0, $v0, %lo(func_E0034310)
+/* 344CDC E00342CC 3C02E003 */  lui       $v0, %hi(fx_26_appendGfx)
+/* 344CE0 E00342D0 24424310 */  addiu     $v0, $v0, %lo(fx_26_appendGfx)
 /* 344CE4 E00342D4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 344CE8 E00342D8 24020014 */  addiu     $v0, $zero, 0x14
 /* 344CEC E00342DC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s
rename to ver/us/asm/nonmatchings/effects/effect_26/fx_26_update.s
index 1d06bd495c..47805f8376 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s
+++ b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0034110
+glabel fx_26_update
 /* 344B20 E0034110 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 344B24 E0034114 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 344B28 E0034118 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s
rename to ver/us/asm/nonmatchings/effects/effect_27/fx_27_appendGfx.s
index 86a8a2ebf5..06a455b185 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s
+++ b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0036224
+glabel fx_27_appendGfx
 /* 345704 E0036224 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 345708 E0036228 0080402D */  daddu     $t0, $a0, $zero
 /* 34570C E003622C AFBF00B8 */  sw        $ra, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s
index 521aec39f8..db016209ae 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s
@@ -12,14 +12,14 @@ glabel fx_27_main
 /* 3454FC E003601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 345500 E0036020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 345504 E0036024 4487C000 */  mtc1      $a3, $f24
-/* 345508 E0036028 3C02E003 */  lui       $v0, %hi(func_E00360DC)
-/* 34550C E003602C 244260DC */  addiu     $v0, $v0, %lo(func_E00360DC)
+/* 345508 E0036028 3C02E003 */  lui       $v0, %hi(fx_27_init)
+/* 34550C E003602C 244260DC */  addiu     $v0, $v0, %lo(fx_27_init)
 /* 345510 E0036030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 345514 E0036034 3C02E003 */  lui       $v0, %hi(func_E00360E4)
-/* 345518 E0036038 244260E4 */  addiu     $v0, $v0, %lo(func_E00360E4)
+/* 345514 E0036034 3C02E003 */  lui       $v0, %hi(fx_27_update)
+/* 345518 E0036038 244260E4 */  addiu     $v0, $v0, %lo(fx_27_update)
 /* 34551C E003603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 345520 E0036040 3C02E003 */  lui       $v0, %hi(func_E00361D8)
-/* 345524 E0036044 244261D8 */  addiu     $v0, $v0, %lo(func_E00361D8)
+/* 345520 E0036040 3C02E003 */  lui       $v0, %hi(fx_27_render)
+/* 345524 E0036044 244261D8 */  addiu     $v0, $v0, %lo(fx_27_render)
 /* 345528 E0036048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34552C E003604C 2402001B */  addiu     $v0, $zero, 0x1b
 /* 345530 E0036050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s
rename to ver/us/asm/nonmatchings/effects/effect_27/fx_27_render.s
index 6260f698bf..c1276297c0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00361D8
+glabel fx_27_render
 /* 3456B8 E00361D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3456BC E00361DC 3C02E003 */  lui       $v0, %hi(func_E0036224)
-/* 3456C0 E00361E0 24426224 */  addiu     $v0, $v0, %lo(func_E0036224)
+/* 3456BC E00361DC 3C02E003 */  lui       $v0, %hi(fx_27_appendGfx)
+/* 3456C0 E00361E0 24426224 */  addiu     $v0, $v0, %lo(fx_27_appendGfx)
 /* 3456C4 E00361E4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3456C8 E00361E8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 3456CC E00361EC AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s
rename to ver/us/asm/nonmatchings/effects/effect_27/fx_27_update.s
index ded3de5ed6..8b00907d62 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00360E4
+glabel fx_27_update
 /* 3455C4 E00360E4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3455C8 E00360E8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3455CC E00360EC 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s
rename to ver/us/asm/nonmatchings/effects/effect_28/fx_28_appendGfx.s
index a2033ecdc0..20c8b7dbef 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s
+++ b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0038748
+glabel fx_28_appendGfx
 /* 34E468 E0038748 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 34E46C E003874C AFB700B4 */  sw        $s7, 0xb4($sp)
 /* 34E470 E0038750 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s
index 7d8faad62e..3cffa7f90a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s
@@ -78,16 +78,16 @@ glabel fx_28_main
 /* 34DE38 E0038118 0200202D */  daddu     $a0, $s0, $zero
 /* 34DE3C E003811C 3C014190 */  lui       $at, 0x4190
 /* 34DE40 E0038120 44810000 */  mtc1      $at, $f0
-/* 34DE44 E0038124 3C02E004 */  lui       $v0, %hi(func_E003841C)
-/* 34DE48 E0038128 2442841C */  addiu     $v0, $v0, %lo(func_E003841C)
+/* 34DE44 E0038124 3C02E004 */  lui       $v0, %hi(fx_28_init)
+/* 34DE48 E0038128 2442841C */  addiu     $v0, $v0, %lo(fx_28_init)
 /* 34DE4C E003812C AC820008 */  sw        $v0, 8($a0)
 /* 34DE50 E0038130 4600D682 */  mul.s     $f26, $f26, $f0
 /* 34DE54 E0038134 00000000 */  nop
-/* 34DE58 E0038138 3C02E004 */  lui       $v0, %hi(func_E0038424)
-/* 34DE5C E003813C 24428424 */  addiu     $v0, $v0, %lo(func_E0038424)
+/* 34DE58 E0038138 3C02E004 */  lui       $v0, %hi(fx_28_update)
+/* 34DE5C E003813C 24428424 */  addiu     $v0, $v0, %lo(fx_28_update)
 /* 34DE60 E0038140 AC82000C */  sw        $v0, 0xc($a0)
-/* 34DE64 E0038144 3C02E004 */  lui       $v0, %hi(func_E0038704)
-/* 34DE68 E0038148 24428704 */  addiu     $v0, $v0, %lo(func_E0038704)
+/* 34DE64 E0038144 3C02E004 */  lui       $v0, %hi(fx_28_render)
+/* 34DE68 E0038148 24428704 */  addiu     $v0, $v0, %lo(fx_28_render)
 /* 34DE6C E003814C AC820010 */  sw        $v0, 0x10($a0)
 /* 34DE70 E0038150 4600C602 */  mul.s     $f24, $f24, $f0
 /* 34DE74 E0038154 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s
rename to ver/us/asm/nonmatchings/effects/effect_28/fx_28_render.s
index 9e72e9390b..12fd636bec 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s
+++ b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0038704
+glabel fx_28_render
 /* 34E424 E0038704 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 34E428 E0038708 3C02E004 */  lui       $v0, %hi(func_E0038748)
-/* 34E42C E003870C 24428748 */  addiu     $v0, $v0, %lo(func_E0038748)
+/* 34E428 E0038708 3C02E004 */  lui       $v0, %hi(fx_28_appendGfx)
+/* 34E42C E003870C 24428748 */  addiu     $v0, $v0, %lo(fx_28_appendGfx)
 /* 34E430 E0038710 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 34E434 E0038714 2402002D */  addiu     $v0, $zero, 0x2d
 /* 34E438 E0038718 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s
rename to ver/us/asm/nonmatchings/effects/effect_28/fx_28_update.s
index ba7a77b901..3974bccb30 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s
+++ b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0038424
+glabel fx_28_update
 /* 34E144 E0038424 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 34E148 E0038428 AFB40020 */  sw        $s4, 0x20($sp)
 /* 34E14C E003842C 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s
rename to ver/us/asm/nonmatchings/effects/effect_29/fx_29_appendGfx.s
index 024b919205..12800a08fc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s
+++ b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003A354
+glabel fx_29_appendGfx
 /* 34EFD4 E003A354 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 34EFD8 E003A358 AFBE0100 */  sw        $fp, 0x100($sp)
 /* 34EFDC E003A35C 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s
index 1a6b570b77..8594c80419 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s
@@ -18,14 +18,14 @@ glabel fx_29_main
 /* 34ECB4 E003A034 27A40010 */  addiu     $a0, $sp, 0x10
 /* 34ECB8 E003A038 AFB40038 */  sw        $s4, 0x38($sp)
 /* 34ECBC E003A03C 8FB40084 */  lw        $s4, 0x84($sp)
-/* 34ECC0 E003A040 3C02E004 */  lui       $v0, %hi(func_E003A1D4)
-/* 34ECC4 E003A044 2442A1D4 */  addiu     $v0, $v0, %lo(func_E003A1D4)
+/* 34ECC0 E003A040 3C02E004 */  lui       $v0, %hi(fx_29_init)
+/* 34ECC4 E003A044 2442A1D4 */  addiu     $v0, $v0, %lo(fx_29_init)
 /* 34ECC8 E003A048 AFA20018 */  sw        $v0, 0x18($sp)
-/* 34ECCC E003A04C 3C02E004 */  lui       $v0, %hi(func_E003A1DC)
-/* 34ECD0 E003A050 2442A1DC */  addiu     $v0, $v0, %lo(func_E003A1DC)
+/* 34ECCC E003A04C 3C02E004 */  lui       $v0, %hi(fx_29_update)
+/* 34ECD0 E003A050 2442A1DC */  addiu     $v0, $v0, %lo(fx_29_update)
 /* 34ECD4 E003A054 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 34ECD8 E003A058 3C02E004 */  lui       $v0, %hi(func_E003A310)
-/* 34ECDC E003A05C 2442A310 */  addiu     $v0, $v0, %lo(func_E003A310)
+/* 34ECD8 E003A058 3C02E004 */  lui       $v0, %hi(fx_29_render)
+/* 34ECDC E003A05C 2442A310 */  addiu     $v0, $v0, %lo(fx_29_render)
 /* 34ECE0 E003A060 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34ECE4 E003A064 2402001D */  addiu     $v0, $zero, 0x1d
 /* 34ECE8 E003A068 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s
rename to ver/us/asm/nonmatchings/effects/effect_29/fx_29_render.s
index 57012db935..fd6bcd369b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s
+++ b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003A310
+glabel fx_29_render
 /* 34EF90 E003A310 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 34EF94 E003A314 3C02E004 */  lui       $v0, %hi(func_E003A354)
-/* 34EF98 E003A318 2442A354 */  addiu     $v0, $v0, %lo(func_E003A354)
+/* 34EF94 E003A314 3C02E004 */  lui       $v0, %hi(fx_29_appendGfx)
+/* 34EF98 E003A318 2442A354 */  addiu     $v0, $v0, %lo(fx_29_appendGfx)
 /* 34EF9C E003A31C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 34EFA0 E003A320 24020028 */  addiu     $v0, $zero, 0x28
 /* 34EFA4 E003A324 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s
rename to ver/us/asm/nonmatchings/effects/effect_29/fx_29_update.s
index d455646547..56c082c933 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003A1DC
+glabel fx_29_update
 /* 34EE5C E003A1DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 34EE60 E003A1E0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 34EE64 E003A1E4 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s b/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s
index ee04941c27..75d2637ac6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s
@@ -27,14 +27,14 @@ glabel fx_30_main
 /* 34F518 E003C058 24120014 */  addiu     $s2, $zero, 0x14
 .LE003C05C:
 /* 34F51C E003C05C 26520001 */  addiu     $s2, $s2, 1
-/* 34F520 E003C060 3C02E004 */  lui       $v0, %hi(func_E003C23C)
-/* 34F524 E003C064 2442C23C */  addiu     $v0, $v0, %lo(func_E003C23C)
+/* 34F520 E003C060 3C02E004 */  lui       $v0, %hi(fx_30_init)
+/* 34F524 E003C064 2442C23C */  addiu     $v0, $v0, %lo(fx_30_init)
 /* 34F528 E003C068 AFA20018 */  sw        $v0, 0x18($sp)
-/* 34F52C E003C06C 3C02E004 */  lui       $v0, %hi(func_E003C244)
-/* 34F530 E003C070 2442C244 */  addiu     $v0, $v0, %lo(func_E003C244)
+/* 34F52C E003C06C 3C02E004 */  lui       $v0, %hi(fx_30_update)
+/* 34F530 E003C070 2442C244 */  addiu     $v0, $v0, %lo(fx_30_update)
 /* 34F534 E003C074 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 34F538 E003C078 3C02E004 */  lui       $v0, %hi(func_E003C474)
-/* 34F53C E003C07C 2442C474 */  addiu     $v0, $v0, %lo(func_E003C474)
+/* 34F538 E003C078 3C02E004 */  lui       $v0, %hi(fx_30_render)
+/* 34F53C E003C07C 2442C474 */  addiu     $v0, $v0, %lo(fx_30_render)
 /* 34F540 E003C080 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34F544 E003C084 3C02E004 */  lui       $v0, %hi(func_E003C47C)
 /* 34F548 E003C088 2442C47C */  addiu     $v0, $v0, %lo(func_E003C47C)
diff --git a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s b/ver/us/asm/nonmatchings/effects/effect_30/fx_30_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s
rename to ver/us/asm/nonmatchings/effects/effect_30/fx_30_update.s
index 969132af67..bab36d0244 100644
--- a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s
+++ b/ver/us/asm/nonmatchings/effects/effect_30/fx_30_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003C244
+glabel fx_30_update
 /* 34F704 E003C244 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 34F708 E003C248 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 34F70C E003C24C F7B40018 */  sdc1      $f20, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s
rename to ver/us/asm/nonmatchings/effects/effect_31/fx_31_appendGfx.s
index 94b4337dcd..048defa3d2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s
+++ b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003E638
+glabel fx_31_appendGfx
 /* 352A78 E003E638 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 352A7C E003E63C 0080182D */  daddu     $v1, $a0, $zero
 /* 352A80 E003E640 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s
index c35e567d0e..2ca369f4a3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s
@@ -152,16 +152,16 @@ glabel fx_31_main
 /* 352678 E003E238 460C8402 */  mul.s     $f16, $f16, $f12
 /* 35267C E003E23C 00000000 */  nop
 /* 352680 E003E240 0200202D */  daddu     $a0, $s0, $zero
-/* 352684 E003E244 3C02E004 */  lui       $v0, %hi(func_E003E3F8)
-/* 352688 E003E248 2442E3F8 */  addiu     $v0, $v0, %lo(func_E003E3F8)
+/* 352684 E003E244 3C02E004 */  lui       $v0, %hi(fx_31_init)
+/* 352688 E003E248 2442E3F8 */  addiu     $v0, $v0, %lo(fx_31_init)
 /* 35268C E003E24C E7B2006C */  swc1      $f18, 0x6c($sp)
 /* 352690 E003E250 E7B00070 */  swc1      $f16, 0x70($sp)
 /* 352694 E003E254 AC820008 */  sw        $v0, 8($a0)
-/* 352698 E003E258 3C02E004 */  lui       $v0, %hi(func_E003E400)
-/* 35269C E003E25C 2442E400 */  addiu     $v0, $v0, %lo(func_E003E400)
+/* 352698 E003E258 3C02E004 */  lui       $v0, %hi(fx_31_update)
+/* 35269C E003E25C 2442E400 */  addiu     $v0, $v0, %lo(fx_31_update)
 /* 3526A0 E003E260 AC82000C */  sw        $v0, 0xc($a0)
-/* 3526A4 E003E264 3C02E004 */  lui       $v0, %hi(func_E003E5F4)
-/* 3526A8 E003E268 2442E5F4 */  addiu     $v0, $v0, %lo(func_E003E5F4)
+/* 3526A4 E003E264 3C02E004 */  lui       $v0, %hi(fx_31_render)
+/* 3526A8 E003E268 2442E5F4 */  addiu     $v0, $v0, %lo(fx_31_render)
 /* 3526AC E003E26C AC820010 */  sw        $v0, 0x10($a0)
 /* 3526B0 E003E270 2402001F */  addiu     $v0, $zero, 0x1f
 /* 3526B4 E003E274 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s
rename to ver/us/asm/nonmatchings/effects/effect_31/fx_31_render.s
index 9f636c33a9..5a709ddf4b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003E5F4
+glabel fx_31_render
 /* 352A34 E003E5F4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 352A38 E003E5F8 3C02E004 */  lui       $v0, %hi(func_E003E638)
-/* 352A3C E003E5FC 2442E638 */  addiu     $v0, $v0, %lo(func_E003E638)
+/* 352A38 E003E5F8 3C02E004 */  lui       $v0, %hi(fx_31_appendGfx)
+/* 352A3C E003E5FC 2442E638 */  addiu     $v0, $v0, %lo(fx_31_appendGfx)
 /* 352A40 E003E600 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 352A44 E003E604 2402002D */  addiu     $v0, $zero, 0x2d
 /* 352A48 E003E608 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s
rename to ver/us/asm/nonmatchings/effects/effect_31/fx_31_update.s
index 37ceb565e2..f04dcd7b47 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s
+++ b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E003E400
+glabel fx_31_update
 /* 352840 E003E400 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 352844 E003E404 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 352848 E003E408 F7B60020 */  sdc1      $f22, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s
rename to ver/us/asm/nonmatchings/effects/effect_32/fx_32_appendGfx.s
index db6cc09355..631ae7fdc2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s
+++ b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0040348
+glabel fx_32_appendGfx
 /* 353648 E0040348 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 35364C E004034C 3C03DB06 */  lui       $v1, 0xdb06
 /* 353650 E0040350 AFB400E8 */  sw        $s4, 0xe8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s
index f713a71bce..7cf224c155 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s
@@ -20,14 +20,14 @@ glabel fx_32_main
 /* 35333C E004003C AFB1002C */   sw       $s1, 0x2c($sp)
 /* 353340 E0040040 24100003 */  addiu     $s0, $zero, 3
 .LE0040044:
-/* 353344 E0040044 3C02E004 */  lui       $v0, %hi(func_E0040148)
-/* 353348 E0040048 24420148 */  addiu     $v0, $v0, %lo(func_E0040148)
+/* 353344 E0040044 3C02E004 */  lui       $v0, %hi(fx_32_init)
+/* 353348 E0040048 24420148 */  addiu     $v0, $v0, %lo(fx_32_init)
 /* 35334C E004004C AFA20018 */  sw        $v0, 0x18($sp)
-/* 353350 E0040050 3C02E004 */  lui       $v0, %hi(func_E0040150)
-/* 353354 E0040054 24420150 */  addiu     $v0, $v0, %lo(func_E0040150)
+/* 353350 E0040050 3C02E004 */  lui       $v0, %hi(fx_32_update)
+/* 353354 E0040054 24420150 */  addiu     $v0, $v0, %lo(fx_32_update)
 /* 353358 E0040058 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35335C E004005C 3C02E004 */  lui       $v0, %hi(func_E0040210)
-/* 353360 E0040060 24420210 */  addiu     $v0, $v0, %lo(func_E0040210)
+/* 35335C E004005C 3C02E004 */  lui       $v0, %hi(fx_32_render)
+/* 353360 E0040060 24420210 */  addiu     $v0, $v0, %lo(fx_32_render)
 /* 353364 E0040064 AFA20020 */  sw        $v0, 0x20($sp)
 /* 353368 E0040068 24020020 */  addiu     $v0, $zero, 0x20
 /* 35336C E004006C AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_render.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s
rename to ver/us/asm/nonmatchings/effects/effect_32/fx_32_render.s
index 78a4ff8d05..5187e0d08e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s
+++ b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_render.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0040210
+glabel fx_32_render
 /* 353510 E0040210 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 353514 E0040214 AFB1004C */  sw        $s1, 0x4c($sp)
 /* 353518 E0040218 0080882D */  daddu     $s1, $a0, $zero
@@ -69,8 +69,8 @@ glabel func_E0040210
 /* 353608 E0040308 0000182D */   daddu    $v1, $zero, $zero
 /* 35360C E004030C 0200202D */  daddu     $a0, $s0, $zero
 .LE0040310:
-/* 353610 E0040310 3C02E004 */  lui       $v0, %hi(func_E0040348)
-/* 353614 E0040314 24420348 */  addiu     $v0, $v0, %lo(func_E0040348)
+/* 353610 E0040310 3C02E004 */  lui       $v0, %hi(fx_32_appendGfx)
+/* 353614 E0040314 24420348 */  addiu     $v0, $v0, %lo(fx_32_appendGfx)
 /* 353618 E0040318 AC82000C */  sw        $v0, 0xc($a0)
 /* 35361C E004031C 00031023 */  negu      $v0, $v1
 /* 353620 E0040320 AC820004 */  sw        $v0, 4($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040150.s b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_32/func_E0040150.s
rename to ver/us/asm/nonmatchings/effects/effect_32/fx_32_update.s
index c932eb6bb1..f205ba0b15 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040150.s
+++ b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0040150
+glabel fx_32_update
 /* 353450 E0040150 8C820008 */  lw        $v0, 8($a0)
 /* 353454 E0040154 8C83000C */  lw        $v1, 0xc($a0)
 /* 353458 E0040158 1840002B */  blez      $v0, .LE0040208
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s
rename to ver/us/asm/nonmatchings/effects/effect_33/fx_33_appendGfx.s
index 34bf3da0af..76edfea111 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00423B8
+glabel fx_33_appendGfx
 /* 354B58 E00423B8 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 354B5C E00423BC 3C05DB06 */  lui       $a1, 0xdb06
 /* 354B60 E00423C0 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s
index b3b3ec6c34..6f12c1ec52 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s
@@ -24,14 +24,14 @@ glabel fx_33_main
 /* 3547EC E004204C 12600069 */  beqz      $s3, .LE00421F4
 /* 3547F0 E0042050 AFA700BC */   sw       $a3, 0xbc($sp)
 /* 3547F4 E0042054 26730001 */  addiu     $s3, $s3, 1
-/* 3547F8 E0042058 3C02E004 */  lui       $v0, %hi(func_E004222C)
-/* 3547FC E004205C 2442222C */  addiu     $v0, $v0, %lo(func_E004222C)
+/* 3547F8 E0042058 3C02E004 */  lui       $v0, %hi(fx_33_init)
+/* 3547FC E004205C 2442222C */  addiu     $v0, $v0, %lo(fx_33_init)
 /* 354800 E0042060 AFA20018 */  sw        $v0, 0x18($sp)
-/* 354804 E0042064 3C02E004 */  lui       $v0, %hi(func_E0042234)
-/* 354808 E0042068 24422234 */  addiu     $v0, $v0, %lo(func_E0042234)
+/* 354804 E0042064 3C02E004 */  lui       $v0, %hi(fx_33_update)
+/* 354808 E0042068 24422234 */  addiu     $v0, $v0, %lo(fx_33_update)
 /* 35480C E004206C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 354810 E0042070 3C02E004 */  lui       $v0, %hi(func_E0042374)
-/* 354814 E0042074 24422374 */  addiu     $v0, $v0, %lo(func_E0042374)
+/* 354810 E0042070 3C02E004 */  lui       $v0, %hi(fx_33_render)
+/* 354814 E0042074 24422374 */  addiu     $v0, $v0, %lo(fx_33_render)
 /* 354818 E0042078 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35481C E004207C 24020021 */  addiu     $v0, $zero, 0x21
 /* 354820 E0042080 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s
rename to ver/us/asm/nonmatchings/effects/effect_33/fx_33_render.s
index 8acdfc0450..9f9867620b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s
+++ b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0042374
+glabel fx_33_render
 /* 354B14 E0042374 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 354B18 E0042378 3C02E004 */  lui       $v0, %hi(func_E00423B8)
-/* 354B1C E004237C 244223B8 */  addiu     $v0, $v0, %lo(func_E00423B8)
+/* 354B18 E0042378 3C02E004 */  lui       $v0, %hi(fx_33_appendGfx)
+/* 354B1C E004237C 244223B8 */  addiu     $v0, $v0, %lo(fx_33_appendGfx)
 /* 354B20 E0042380 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 354B24 E0042384 2402002D */  addiu     $v0, $zero, 0x2d
 /* 354B28 E0042388 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s
rename to ver/us/asm/nonmatchings/effects/effect_33/fx_33_update.s
index 0e942a639b..19984e3c53 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s
+++ b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0042234
+glabel fx_33_update
 /* 3549D4 E0042234 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3549D8 E0042238 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3549DC E004223C 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s
rename to ver/us/asm/nonmatchings/effects/effect_34/fx_34_appendGfx.s
index e7b5353b1a..eff1f03397 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004491C
+glabel fx_34_appendGfx
 /* 35587C E004491C 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 355880 E0044920 3C07DB06 */  lui       $a3, 0xdb06
 /* 355884 E0044924 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s
index 5379afbd9e..c3870f396b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s
@@ -14,14 +14,14 @@ glabel fx_34_main
 /* 354F84 E0044024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 354F88 E0044028 AFB20038 */  sw        $s2, 0x38($sp)
 /* 354F8C E004402C 8FB20098 */  lw        $s2, 0x98($sp)
-/* 354F90 E0044030 3C02E004 */  lui       $v0, %hi(func_E004441C)
-/* 354F94 E0044034 2442441C */  addiu     $v0, $v0, %lo(func_E004441C)
+/* 354F90 E0044030 3C02E004 */  lui       $v0, %hi(fx_34_init)
+/* 354F94 E0044034 2442441C */  addiu     $v0, $v0, %lo(fx_34_init)
 /* 354F98 E0044038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 354F9C E004403C 3C02E004 */  lui       $v0, %hi(func_E0044424)
-/* 354FA0 E0044040 24424424 */  addiu     $v0, $v0, %lo(func_E0044424)
+/* 354F9C E004403C 3C02E004 */  lui       $v0, %hi(fx_34_update)
+/* 354FA0 E0044040 24424424 */  addiu     $v0, $v0, %lo(fx_34_update)
 /* 354FA4 E0044044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 354FA8 E0044048 3C02E004 */  lui       $v0, %hi(func_E00448E4)
-/* 354FAC E004404C 244248E4 */  addiu     $v0, $v0, %lo(func_E00448E4)
+/* 354FA8 E0044048 3C02E004 */  lui       $v0, %hi(fx_34_render)
+/* 354FAC E004404C 244248E4 */  addiu     $v0, $v0, %lo(fx_34_render)
 /* 354FB0 E0044050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 354FB4 E0044054 24020022 */  addiu     $v0, $zero, 0x22
 /* 354FB8 E0044058 AFBF0048 */  sw        $ra, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_render.s
similarity index 82%
rename from ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s
rename to ver/us/asm/nonmatchings/effects/effect_34/fx_34_render.s
index a74c3d28ae..f84b31ff76 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00448E4
+glabel fx_34_render
 /* 355844 E00448E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 355848 E00448E8 3C02E004 */  lui       $v0, %hi(func_E004491C)
-/* 35584C E00448EC 2442491C */  addiu     $v0, $v0, %lo(func_E004491C)
+/* 355848 E00448E8 3C02E004 */  lui       $v0, %hi(fx_34_appendGfx)
+/* 35584C E00448EC 2442491C */  addiu     $v0, $v0, %lo(fx_34_appendGfx)
 /* 355850 E00448F0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 355854 E00448F4 2402002D */  addiu     $v0, $zero, 0x2d
 /* 355858 E00448F8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s
rename to ver/us/asm/nonmatchings/effects/effect_34/fx_34_update.s
index 15030696b2..148f2e5a5f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s
+++ b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0044424
+glabel fx_34_update
 /* 355384 E0044424 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 355388 E0044428 AFB40020 */  sw        $s4, 0x20($sp)
 /* 35538C E004442C 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s
rename to ver/us/asm/nonmatchings/effects/effect_35/fx_35_appendGfx.s
index 135679b4b4..fa66c6bb80 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00462C0
+glabel fx_35_appendGfx
 /* 3561A0 E00462C0 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3561A4 E00462C4 3C05DB06 */  lui       $a1, 0xdb06
 /* 3561A8 E00462C8 3C09800A */  lui       $t1, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s
index c453a53312..e3c4b2048b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s
@@ -14,14 +14,14 @@ glabel fx_35_main
 /* 355F04 E0046024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 355F08 E0046028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 355F0C E004602C C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* 355F10 E0046030 3C02E004 */  lui       $v0, %hi(func_E0046158)
-/* 355F14 E0046034 24426158 */  addiu     $v0, $v0, %lo(func_E0046158)
+/* 355F10 E0046030 3C02E004 */  lui       $v0, %hi(fx_35_init)
+/* 355F14 E0046034 24426158 */  addiu     $v0, $v0, %lo(fx_35_init)
 /* 355F18 E0046038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 355F1C E004603C 3C02E004 */  lui       $v0, %hi(func_E0046160)
-/* 355F20 E0046040 24426160 */  addiu     $v0, $v0, %lo(func_E0046160)
+/* 355F1C E004603C 3C02E004 */  lui       $v0, %hi(fx_35_update)
+/* 355F20 E0046040 24426160 */  addiu     $v0, $v0, %lo(fx_35_update)
 /* 355F24 E0046044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 355F28 E0046048 3C02E004 */  lui       $v0, %hi(func_E004627C)
-/* 355F2C E004604C 2442627C */  addiu     $v0, $v0, %lo(func_E004627C)
+/* 355F28 E0046048 3C02E004 */  lui       $v0, %hi(fx_35_render)
+/* 355F2C E004604C 2442627C */  addiu     $v0, $v0, %lo(fx_35_render)
 /* 355F30 E0046050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 355F34 E0046054 24020023 */  addiu     $v0, $zero, 0x23
 /* 355F38 E0046058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s
rename to ver/us/asm/nonmatchings/effects/effect_35/fx_35_render.s
index ff9ee3c9e6..caf362822d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004627C
+glabel fx_35_render
 /* 35615C E004627C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 356160 E0046280 3C02E004 */  lui       $v0, %hi(func_E00462C0)
-/* 356164 E0046284 244262C0 */  addiu     $v0, $v0, %lo(func_E00462C0)
+/* 356160 E0046280 3C02E004 */  lui       $v0, %hi(fx_35_appendGfx)
+/* 356164 E0046284 244262C0 */  addiu     $v0, $v0, %lo(fx_35_appendGfx)
 /* 356168 E0046288 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35616C E004628C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 356170 E0046290 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s
rename to ver/us/asm/nonmatchings/effects/effect_35/fx_35_update.s
index 94a1e954a2..6ab14fbbf5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s
+++ b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0046160
+glabel fx_35_update
 /* 356040 E0046160 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 356044 E0046164 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 356048 E0046168 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s
rename to ver/us/asm/nonmatchings/effects/effect_36/fx_36_appendGfx.s
index 72adb2cf92..58bdf23c1e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s
+++ b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0048218
+glabel fx_36_appendGfx
 /* 356B98 E0048218 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 356B9C E004821C 0080302D */  daddu     $a2, $a0, $zero
 /* 356BA0 E0048220 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s
index 32613107c4..64654dc2a2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s
@@ -14,14 +14,14 @@ glabel fx_36_main
 /* 3569A4 E0048024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3569A8 E0048028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3569AC E004802C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3569B0 E0048030 3C02E005 */  lui       $v0, %hi(func_E0048128)
-/* 3569B4 E0048034 24428128 */  addiu     $v0, $v0, %lo(func_E0048128)
+/* 3569B0 E0048030 3C02E005 */  lui       $v0, %hi(fx_36_init)
+/* 3569B4 E0048034 24428128 */  addiu     $v0, $v0, %lo(fx_36_init)
 /* 3569B8 E0048038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3569BC E004803C 3C02E005 */  lui       $v0, %hi(func_E0048130)
-/* 3569C0 E0048040 24428130 */  addiu     $v0, $v0, %lo(func_E0048130)
+/* 3569BC E004803C 3C02E005 */  lui       $v0, %hi(fx_36_update)
+/* 3569C0 E0048040 24428130 */  addiu     $v0, $v0, %lo(fx_36_update)
 /* 3569C4 E0048044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3569C8 E0048048 3C02E005 */  lui       $v0, %hi(func_E00481D4)
-/* 3569CC E004804C 244281D4 */  addiu     $v0, $v0, %lo(func_E00481D4)
+/* 3569C8 E0048048 3C02E005 */  lui       $v0, %hi(fx_36_render)
+/* 3569CC E004804C 244281D4 */  addiu     $v0, $v0, %lo(fx_36_render)
 /* 3569D0 E0048050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3569D4 E0048054 24020024 */  addiu     $v0, $zero, 0x24
 /* 3569D8 E0048058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s
rename to ver/us/asm/nonmatchings/effects/effect_36/fx_36_render.s
index 86034e61f7..c72196c8b0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00481D4
+glabel fx_36_render
 /* 356B54 E00481D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 356B58 E00481D8 3C02E005 */  lui       $v0, %hi(func_E0048218)
-/* 356B5C E00481DC 24428218 */  addiu     $v0, $v0, %lo(func_E0048218)
+/* 356B58 E00481D8 3C02E005 */  lui       $v0, %hi(fx_36_appendGfx)
+/* 356B5C E00481DC 24428218 */  addiu     $v0, $v0, %lo(fx_36_appendGfx)
 /* 356B60 E00481E0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 356B64 E00481E4 24020028 */  addiu     $v0, $zero, 0x28
 /* 356B68 E00481E8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s
rename to ver/us/asm/nonmatchings/effects/effect_36/fx_36_update.s
index 9f7ead2406..46d4703ad2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s
+++ b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0048130
+glabel fx_36_update
 /* 356AB0 E0048130 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 356AB4 E0048134 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 356AB8 E0048138 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s
rename to ver/us/asm/nonmatchings/effects/effect_37/fx_37_appendGfx.s
index 8137266cfb..016e49c6c2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004A78C
+glabel fx_37_appendGfx
 /* 358C4C E004A78C 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 358C50 E004A790 AFBF00FC */  sw        $ra, 0xfc($sp)
 /* 358C54 E004A794 AFBE00F8 */  sw        $fp, 0xf8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s
index 15b36aea71..b724bee4d8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s
@@ -66,14 +66,14 @@ glabel fx_37_main
 .LE004A0D0:
 /* 358590 E004A0D0 26730001 */  addiu     $s3, $s3, 1
 .LE004A0D4:
-/* 358594 E004A0D4 3C02E005 */  lui       $v0, %hi(func_E004A328)
-/* 358598 E004A0D8 2442A328 */  addiu     $v0, $v0, %lo(func_E004A328)
+/* 358594 E004A0D4 3C02E005 */  lui       $v0, %hi(fx_37_init)
+/* 358598 E004A0D8 2442A328 */  addiu     $v0, $v0, %lo(fx_37_init)
 /* 35859C E004A0DC AC820008 */  sw        $v0, 8($a0)
-/* 3585A0 E004A0E0 3C02E005 */  lui       $v0, %hi(func_E004A330)
-/* 3585A4 E004A0E4 2442A330 */  addiu     $v0, $v0, %lo(func_E004A330)
+/* 3585A0 E004A0E0 3C02E005 */  lui       $v0, %hi(fx_37_update)
+/* 3585A4 E004A0E4 2442A330 */  addiu     $v0, $v0, %lo(fx_37_update)
 /* 3585A8 E004A0E8 AC82000C */  sw        $v0, 0xc($a0)
-/* 3585AC E004A0EC 3C02E005 */  lui       $v0, %hi(func_E004A748)
-/* 3585B0 E004A0F0 2442A748 */  addiu     $v0, $v0, %lo(func_E004A748)
+/* 3585AC E004A0EC 3C02E005 */  lui       $v0, %hi(fx_37_render)
+/* 3585B0 E004A0F0 2442A748 */  addiu     $v0, $v0, %lo(fx_37_render)
 /* 3585B4 E004A0F4 AC820010 */  sw        $v0, 0x10($a0)
 /* 3585B8 E004A0F8 24020025 */  addiu     $v0, $zero, 0x25
 /* 3585BC E004A0FC AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s
rename to ver/us/asm/nonmatchings/effects/effect_37/fx_37_render.s
index 6bd2af1612..b8e36a128c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s
+++ b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004A748
+glabel fx_37_render
 /* 358C08 E004A748 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 358C0C E004A74C 3C02E005 */  lui       $v0, %hi(func_E004A78C)
-/* 358C10 E004A750 2442A78C */  addiu     $v0, $v0, %lo(func_E004A78C)
+/* 358C0C E004A74C 3C02E005 */  lui       $v0, %hi(fx_37_appendGfx)
+/* 358C10 E004A750 2442A78C */  addiu     $v0, $v0, %lo(fx_37_appendGfx)
 /* 358C14 E004A754 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 358C18 E004A758 24020028 */  addiu     $v0, $zero, 0x28
 /* 358C1C E004A75C AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s
rename to ver/us/asm/nonmatchings/effects/effect_37/fx_37_update.s
index 5ba14047fb..2f67981666 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s
+++ b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004A330
+glabel fx_37_update
 /* 3587F0 E004A330 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3587F4 E004A334 AFB40020 */  sw        $s4, 0x20($sp)
 /* 3587F8 E004A338 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s
rename to ver/us/asm/nonmatchings/effects/effect_38/fx_38_appendGfx.s
index cf63b72c9d..d4fc96ef94 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004C3A8
+glabel fx_38_appendGfx
 /* 35A2C8 E004C3A8 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 35A2CC E004C3AC 0080182D */  daddu     $v1, $a0, $zero
 /* 35A2D0 E004C3B0 3C0838E3 */  lui       $t0, 0x38e3
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s
index 347d17ff03..960816dacf 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s
@@ -12,14 +12,14 @@ glabel fx_38_main
 /* 359F3C E004C01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 359F40 E004C020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 359F44 E004C024 4487C000 */  mtc1      $a3, $f24
-/* 359F48 E004C028 3C02E005 */  lui       $v0, %hi(func_E004C204)
-/* 359F4C E004C02C 2442C204 */  addiu     $v0, $v0, %lo(func_E004C204)
+/* 359F48 E004C028 3C02E005 */  lui       $v0, %hi(fx_38_init)
+/* 359F4C E004C02C 2442C204 */  addiu     $v0, $v0, %lo(fx_38_init)
 /* 359F50 E004C030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 359F54 E004C034 3C02E005 */  lui       $v0, %hi(func_E004C20C)
-/* 359F58 E004C038 2442C20C */  addiu     $v0, $v0, %lo(func_E004C20C)
+/* 359F54 E004C034 3C02E005 */  lui       $v0, %hi(fx_38_update)
+/* 359F58 E004C038 2442C20C */  addiu     $v0, $v0, %lo(fx_38_update)
 /* 359F5C E004C03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 359F60 E004C040 3C02E005 */  lui       $v0, %hi(func_E004C364)
-/* 359F64 E004C044 2442C364 */  addiu     $v0, $v0, %lo(func_E004C364)
+/* 359F60 E004C040 3C02E005 */  lui       $v0, %hi(fx_38_render)
+/* 359F64 E004C044 2442C364 */  addiu     $v0, $v0, %lo(fx_38_render)
 /* 359F68 E004C048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 359F6C E004C04C 24020026 */  addiu     $v0, $zero, 0x26
 /* 359F70 E004C050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s
rename to ver/us/asm/nonmatchings/effects/effect_38/fx_38_render.s
index fa5e6367ab..0b932ece48 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s
+++ b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004C364
+glabel fx_38_render
 /* 35A284 E004C364 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35A288 E004C368 3C02E005 */  lui       $v0, %hi(func_E004C3A8)
-/* 35A28C E004C36C 2442C3A8 */  addiu     $v0, $v0, %lo(func_E004C3A8)
+/* 35A288 E004C368 3C02E005 */  lui       $v0, %hi(fx_38_appendGfx)
+/* 35A28C E004C36C 2442C3A8 */  addiu     $v0, $v0, %lo(fx_38_appendGfx)
 /* 35A290 E004C370 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35A294 E004C374 2402002D */  addiu     $v0, $zero, 0x2d
 /* 35A298 E004C378 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s
rename to ver/us/asm/nonmatchings/effects/effect_38/fx_38_update.s
index bfaad62094..8b1a9ce5cd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004C20C
+glabel fx_38_update
 /* 35A12C E004C20C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35A130 E004C210 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 35A134 E004C214 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s
rename to ver/us/asm/nonmatchings/effects/effect_39/fx_39_appendGfx.s
index 8897a81d1b..d097fd0df7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s
+++ b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004E214
+glabel fx_39_appendGfx
 /* 35BBE4 E004E214 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 35BBE8 E004E218 0080302D */  daddu     $a2, $a0, $zero
 /* 35BBEC E004E21C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s
index 399d572d7f..95c02b0538 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s
@@ -14,14 +14,14 @@ glabel fx_39_main
 /* 35B9F4 E004E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35B9F8 E004E028 AFB30034 */  sw        $s3, 0x34($sp)
 /* 35B9FC E004E02C 8FB3006C */  lw        $s3, 0x6c($sp)
-/* 35BA00 E004E030 3C02E005 */  lui       $v0, %hi(func_E004E15C)
-/* 35BA04 E004E034 2442E15C */  addiu     $v0, $v0, %lo(func_E004E15C)
+/* 35BA00 E004E030 3C02E005 */  lui       $v0, %hi(fx_39_init)
+/* 35BA04 E004E034 2442E15C */  addiu     $v0, $v0, %lo(fx_39_init)
 /* 35BA08 E004E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35BA0C E004E03C 3C02E005 */  lui       $v0, %hi(func_E004E164)
-/* 35BA10 E004E040 2442E164 */  addiu     $v0, $v0, %lo(func_E004E164)
+/* 35BA0C E004E03C 3C02E005 */  lui       $v0, %hi(fx_39_update)
+/* 35BA10 E004E040 2442E164 */  addiu     $v0, $v0, %lo(fx_39_update)
 /* 35BA14 E004E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35BA18 E004E048 3C02E005 */  lui       $v0, %hi(func_E004E1D0)
-/* 35BA1C E004E04C 2442E1D0 */  addiu     $v0, $v0, %lo(func_E004E1D0)
+/* 35BA18 E004E048 3C02E005 */  lui       $v0, %hi(fx_39_render)
+/* 35BA1C E004E04C 2442E1D0 */  addiu     $v0, $v0, %lo(fx_39_render)
 /* 35BA20 E004E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35BA24 E004E054 24020027 */  addiu     $v0, $zero, 0x27
 /* 35BA28 E004E058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s
rename to ver/us/asm/nonmatchings/effects/effect_39/fx_39_render.s
index 662a00570f..cc5adf4e27 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004E1D0
+glabel fx_39_render
 /* 35BBA0 E004E1D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35BBA4 E004E1D4 3C02E005 */  lui       $v0, %hi(func_E004E214)
-/* 35BBA8 E004E1D8 2442E214 */  addiu     $v0, $v0, %lo(func_E004E214)
+/* 35BBA4 E004E1D4 3C02E005 */  lui       $v0, %hi(fx_39_appendGfx)
+/* 35BBA8 E004E1D8 2442E214 */  addiu     $v0, $v0, %lo(fx_39_appendGfx)
 /* 35BBAC E004E1DC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35BBB0 E004E1E0 24020028 */  addiu     $v0, $zero, 0x28
 /* 35BBB4 E004E1E4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s
rename to ver/us/asm/nonmatchings/effects/effect_39/fx_39_update.s
index 69e0052aaf..e72f1e1096 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s
+++ b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E004E164
+glabel fx_39_update
 /* 35BB34 E004E164 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35BB38 E004E168 0080282D */  daddu     $a1, $a0, $zero
 /* 35BB3C E004E16C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s
rename to ver/us/asm/nonmatchings/effects/effect_40/fx_40_appendGfx.s
index 567c2ff032..2b3a906997 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s
+++ b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0050308
+glabel fx_40_appendGfx
 /* 35C2D8 E0050308 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 35C2DC E005030C 0080282D */  daddu     $a1, $a0, $zero
 /* 35C2E0 E0050310 3C06DB06 */  lui       $a2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s
index 9511ef409f..c6b7158da8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s
@@ -14,14 +14,14 @@ glabel fx_40_main
 /* 35BFF4 E0050024 27A40018 */  addiu     $a0, $sp, 0x18
 /* 35BFF8 E0050028 F7B60088 */  sdc1      $f22, 0x88($sp)
 /* 35BFFC E005002C C7B600BC */  lwc1      $f22, 0xbc($sp)
-/* 35C000 E0050030 3C02E005 */  lui       $v0, %hi(func_E00501D0)
-/* 35C004 E0050034 244201D0 */  addiu     $v0, $v0, %lo(func_E00501D0)
+/* 35C000 E0050030 3C02E005 */  lui       $v0, %hi(fx_40_init)
+/* 35C004 E0050034 244201D0 */  addiu     $v0, $v0, %lo(fx_40_init)
 /* 35C008 E0050038 AFA20020 */  sw        $v0, 0x20($sp)
-/* 35C00C E005003C 3C02E005 */  lui       $v0, %hi(func_E00501D8)
-/* 35C010 E0050040 244201D8 */  addiu     $v0, $v0, %lo(func_E00501D8)
+/* 35C00C E005003C 3C02E005 */  lui       $v0, %hi(fx_40_update)
+/* 35C010 E0050040 244201D8 */  addiu     $v0, $v0, %lo(fx_40_update)
 /* 35C014 E0050044 AFA20024 */  sw        $v0, 0x24($sp)
-/* 35C018 E0050048 3C02E005 */  lui       $v0, %hi(func_E00502C4)
-/* 35C01C E005004C 244202C4 */  addiu     $v0, $v0, %lo(func_E00502C4)
+/* 35C018 E0050048 3C02E005 */  lui       $v0, %hi(fx_40_render)
+/* 35C01C E005004C 244202C4 */  addiu     $v0, $v0, %lo(fx_40_render)
 /* 35C020 E0050050 AFA20028 */  sw        $v0, 0x28($sp)
 /* 35C024 E0050054 24020028 */  addiu     $v0, $zero, 0x28
 /* 35C028 E0050058 AFBF007C */  sw        $ra, 0x7c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s
rename to ver/us/asm/nonmatchings/effects/effect_40/fx_40_render.s
index 750625fe06..1df5da0849 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00502C4
+glabel fx_40_render
 /* 35C294 E00502C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35C298 E00502C8 3C02E005 */  lui       $v0, %hi(func_E0050308)
-/* 35C29C E00502CC 24420308 */  addiu     $v0, $v0, %lo(func_E0050308)
+/* 35C298 E00502C8 3C02E005 */  lui       $v0, %hi(fx_40_appendGfx)
+/* 35C29C E00502CC 24420308 */  addiu     $v0, $v0, %lo(fx_40_appendGfx)
 /* 35C2A0 E00502D0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35C2A4 E00502D4 2402002D */  addiu     $v0, $zero, 0x2d
 /* 35C2A8 E00502D8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s
rename to ver/us/asm/nonmatchings/effects/effect_40/fx_40_update.s
index d520daa35b..f8075dc1ab 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00501D8
+glabel fx_40_update
 /* 35C1A8 E00501D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35C1AC E00501DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 35C1B0 E00501E0 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s
rename to ver/us/asm/nonmatchings/effects/effect_41/fx_41_appendGfx.s
index 796742eda6..3832a5d47b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s
+++ b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0052460
+glabel fx_41_appendGfx
 /* 35CEE0 E0052460 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 35CEE4 E0052464 3C05DB06 */  lui       $a1, 0xdb06
 /* 35CEE8 E0052468 3C07800A */  lui       $a3, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s
index 1a039ee2d2..59409a69b4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s
@@ -12,14 +12,14 @@ glabel fx_41_main
 /* 35CA9C E005201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35CAA0 E0052020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 35CAA4 E0052024 4487C000 */  mtc1      $a3, $f24
-/* 35CAA8 E0052028 3C02E005 */  lui       $v0, %hi(func_E00520E8)
-/* 35CAAC E005202C 244220E8 */  addiu     $v0, $v0, %lo(func_E00520E8)
+/* 35CAA8 E0052028 3C02E005 */  lui       $v0, %hi(fx_41_init)
+/* 35CAAC E005202C 244220E8 */  addiu     $v0, $v0, %lo(fx_41_init)
 /* 35CAB0 E0052030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35CAB4 E0052034 3C02E005 */  lui       $v0, %hi(func_E00520F0)
-/* 35CAB8 E0052038 244220F0 */  addiu     $v0, $v0, %lo(func_E00520F0)
+/* 35CAB4 E0052034 3C02E005 */  lui       $v0, %hi(fx_41_update)
+/* 35CAB8 E0052038 244220F0 */  addiu     $v0, $v0, %lo(fx_41_update)
 /* 35CABC E005203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35CAC0 E0052040 3C02E005 */  lui       $v0, %hi(func_E005241C)
-/* 35CAC4 E0052044 2442241C */  addiu     $v0, $v0, %lo(func_E005241C)
+/* 35CAC0 E0052040 3C02E005 */  lui       $v0, %hi(fx_41_render)
+/* 35CAC4 E0052044 2442241C */  addiu     $v0, $v0, %lo(fx_41_render)
 /* 35CAC8 E0052048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35CACC E005204C 24020029 */  addiu     $v0, $zero, 0x29
 /* 35CAD0 E0052050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s
rename to ver/us/asm/nonmatchings/effects/effect_41/fx_41_render.s
index 2eace6fdf4..c7ac461fc8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005241C
+glabel fx_41_render
 /* 35CE9C E005241C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35CEA0 E0052420 3C02E005 */  lui       $v0, %hi(func_E0052460)
-/* 35CEA4 E0052424 24422460 */  addiu     $v0, $v0, %lo(func_E0052460)
+/* 35CEA0 E0052420 3C02E005 */  lui       $v0, %hi(fx_41_appendGfx)
+/* 35CEA4 E0052424 24422460 */  addiu     $v0, $v0, %lo(fx_41_appendGfx)
 /* 35CEA8 E0052428 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35CEAC E005242C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 35CEB0 E0052430 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s
rename to ver/us/asm/nonmatchings/effects/effect_41/fx_41_update.s
index c87f70fcbe..569b1fc135 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00520F0
+glabel fx_41_update
 /* 35CB70 E00520F0 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 35CB74 E00520F4 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 35CB78 E00520F8 AFB7002C */  sw        $s7, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s
rename to ver/us/asm/nonmatchings/effects/effect_43/fx_43_appendGfx.s
index 57b40fd4d5..3736071eee 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0056BD0
+glabel fx_43_appendGfx
 /* 35E5D0 E0056BD0 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 35E5D4 E0056BD4 AFBE00F8 */  sw        $fp, 0xf8($sp)
 /* 35E5D8 E0056BD8 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s
index e493118845..6b2a572bb1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s
@@ -12,14 +12,14 @@ glabel fx_43_main
 /* 35DA1C E005601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35DA20 E0056020 F7B80058 */  sdc1      $f24, 0x58($sp)
 /* 35DA24 E0056024 4487C000 */  mtc1      $a3, $f24
-/* 35DA28 E0056028 3C02E005 */  lui       $v0, %hi(func_E0056304)
-/* 35DA2C E005602C 24426304 */  addiu     $v0, $v0, %lo(func_E0056304)
+/* 35DA28 E0056028 3C02E005 */  lui       $v0, %hi(fx_43_init)
+/* 35DA2C E005602C 24426304 */  addiu     $v0, $v0, %lo(fx_43_init)
 /* 35DA30 E0056030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35DA34 E0056034 3C02E005 */  lui       $v0, %hi(func_E005630C)
-/* 35DA38 E0056038 2442630C */  addiu     $v0, $v0, %lo(func_E005630C)
+/* 35DA34 E0056034 3C02E005 */  lui       $v0, %hi(fx_43_update)
+/* 35DA38 E0056038 2442630C */  addiu     $v0, $v0, %lo(fx_43_update)
 /* 35DA3C E005603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35DA40 E0056040 3C02E005 */  lui       $v0, %hi(func_E0056B8C)
-/* 35DA44 E0056044 24426B8C */  addiu     $v0, $v0, %lo(func_E0056B8C)
+/* 35DA40 E0056040 3C02E005 */  lui       $v0, %hi(fx_43_render)
+/* 35DA44 E0056044 24426B8C */  addiu     $v0, $v0, %lo(fx_43_render)
 /* 35DA48 E0056048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35DA4C E005604C 2402002B */  addiu     $v0, $zero, 0x2b
 /* 35DA50 E0056050 AFBF0044 */  sw        $ra, 0x44($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s
rename to ver/us/asm/nonmatchings/effects/effect_43/fx_43_render.s
index 085f0a9b22..0333e2ca7b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0056B8C
+glabel fx_43_render
 /* 35E58C E0056B8C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35E590 E0056B90 3C02E005 */  lui       $v0, %hi(func_E0056BD0)
-/* 35E594 E0056B94 24426BD0 */  addiu     $v0, $v0, %lo(func_E0056BD0)
+/* 35E590 E0056B90 3C02E005 */  lui       $v0, %hi(fx_43_appendGfx)
+/* 35E594 E0056B94 24426BD0 */  addiu     $v0, $v0, %lo(fx_43_appendGfx)
 /* 35E598 E0056B98 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35E59C E0056B9C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 35E5A0 E0056BA0 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s
rename to ver/us/asm/nonmatchings/effects/effect_43/fx_43_update.s
index deb1c7a99d..66a6d8fdcc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005630C
+glabel fx_43_update
 /* 35DD0C E005630C 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 35DD10 E0056310 AFB40020 */  sw        $s4, 0x20($sp)
 /* 35DD14 E0056314 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s
rename to ver/us/asm/nonmatchings/effects/effect_44/fx_44_appendGfx.s
index ff4520aa9e..63523b69c6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00584D4
+glabel fx_44_appendGfx
 /* 35EDF4 E00584D4 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 35EDF8 E00584D8 AFB700F4 */  sw        $s7, 0xf4($sp)
 /* 35EDFC E00584DC 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s
index 51cf8349b9..2a7cf4fbc8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s
@@ -12,14 +12,14 @@ glabel fx_44_main
 /* 35E93C E005801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35E940 E0058020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 35E944 E0058024 4487C000 */  mtc1      $a3, $f24
-/* 35E948 E0058028 3C02E006 */  lui       $v0, %hi(func_E00581AC)
-/* 35E94C E005802C 244281AC */  addiu     $v0, $v0, %lo(func_E00581AC)
+/* 35E948 E0058028 3C02E006 */  lui       $v0, %hi(fx_44_init)
+/* 35E94C E005802C 244281AC */  addiu     $v0, $v0, %lo(fx_44_init)
 /* 35E950 E0058030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35E954 E0058034 3C02E006 */  lui       $v0, %hi(func_E00581B4)
-/* 35E958 E0058038 244281B4 */  addiu     $v0, $v0, %lo(func_E00581B4)
+/* 35E954 E0058034 3C02E006 */  lui       $v0, %hi(fx_44_update)
+/* 35E958 E0058038 244281B4 */  addiu     $v0, $v0, %lo(fx_44_update)
 /* 35E95C E005803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35E960 E0058040 3C02E006 */  lui       $v0, %hi(func_E0058490)
-/* 35E964 E0058044 24428490 */  addiu     $v0, $v0, %lo(func_E0058490)
+/* 35E960 E0058040 3C02E006 */  lui       $v0, %hi(fx_44_render)
+/* 35E964 E0058044 24428490 */  addiu     $v0, $v0, %lo(fx_44_render)
 /* 35E968 E0058048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35E96C E005804C 2402002C */  addiu     $v0, $zero, 0x2c
 /* 35E970 E0058050 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s
rename to ver/us/asm/nonmatchings/effects/effect_44/fx_44_render.s
index 8ff8367644..2370bc7483 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s
+++ b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0058490
+glabel fx_44_render
 /* 35EDB0 E0058490 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35EDB4 E0058494 3C02E006 */  lui       $v0, %hi(func_E00584D4)
-/* 35EDB8 E0058498 244284D4 */  addiu     $v0, $v0, %lo(func_E00584D4)
+/* 35EDB4 E0058494 3C02E006 */  lui       $v0, %hi(fx_44_appendGfx)
+/* 35EDB8 E0058498 244284D4 */  addiu     $v0, $v0, %lo(fx_44_appendGfx)
 /* 35EDBC E005849C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 35EDC0 E00584A0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 35EDC4 E00584A4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s
rename to ver/us/asm/nonmatchings/effects/effect_44/fx_44_update.s
index b686f829da..cd782e6320 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00581B4
+glabel fx_44_update
 /* 35EAD4 E00581B4 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 35EAD8 E00581B8 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 35EADC E00581BC 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s
rename to ver/us/asm/nonmatchings/effects/effect_45/fx_45_appendGfx.s
index 80305ac8ac..c3f1ea5e02 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005A3F4
+glabel fx_45_appendGfx
 /* 3606B4 E005A3F4 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3606B8 E005A3F8 AFBE00B8 */  sw        $fp, 0xb8($sp)
 /* 3606BC E005A3FC 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s
index 5ec6b8d853..41c425194d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s
@@ -16,14 +16,14 @@ glabel fx_45_main
 /* 3602EC E005A02C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3602F0 E005A030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3602F4 E005A034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 3602F8 E005A038 3C02E006 */  lui       $v0, %hi(func_E005A1F4)
-/* 3602FC E005A03C 2442A1F4 */  addiu     $v0, $v0, %lo(func_E005A1F4)
+/* 3602F8 E005A038 3C02E006 */  lui       $v0, %hi(fx_45_init)
+/* 3602FC E005A03C 2442A1F4 */  addiu     $v0, $v0, %lo(fx_45_init)
 /* 360300 E005A040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 360304 E005A044 3C02E006 */  lui       $v0, %hi(func_E005A1FC)
-/* 360308 E005A048 2442A1FC */  addiu     $v0, $v0, %lo(func_E005A1FC)
+/* 360304 E005A044 3C02E006 */  lui       $v0, %hi(fx_45_update)
+/* 360308 E005A048 2442A1FC */  addiu     $v0, $v0, %lo(fx_45_update)
 /* 36030C E005A04C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 360310 E005A050 3C02E006 */  lui       $v0, %hi(func_E005A3B0)
-/* 360314 E005A054 2442A3B0 */  addiu     $v0, $v0, %lo(func_E005A3B0)
+/* 360310 E005A050 3C02E006 */  lui       $v0, %hi(fx_45_render)
+/* 360314 E005A054 2442A3B0 */  addiu     $v0, $v0, %lo(fx_45_render)
 /* 360318 E005A058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36031C E005A05C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 360320 E005A060 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s
rename to ver/us/asm/nonmatchings/effects/effect_45/fx_45_render.s
index 4444d07cbd..f4e437f668 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005A3B0
+glabel fx_45_render
 /* 360670 E005A3B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 360674 E005A3B4 3C02E006 */  lui       $v0, %hi(func_E005A3F4)
-/* 360678 E005A3B8 2442A3F4 */  addiu     $v0, $v0, %lo(func_E005A3F4)
+/* 360674 E005A3B4 3C02E006 */  lui       $v0, %hi(fx_45_appendGfx)
+/* 360678 E005A3B8 2442A3F4 */  addiu     $v0, $v0, %lo(fx_45_appendGfx)
 /* 36067C E005A3BC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 360680 E005A3C0 24020028 */  addiu     $v0, $zero, 0x28
 /* 360684 E005A3C4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s
rename to ver/us/asm/nonmatchings/effects/effect_45/fx_45_update.s
index efa47df85c..8aaf3d2e48 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005A1FC
+glabel fx_45_update
 /* 3604BC E005A1FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3604C0 E005A200 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3604C4 E005A204 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s
rename to ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s
index acf98a9e1b..197fef57a2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005C2F8
+glabel fx_46_appendGfx
 /* 361238 E005C2F8 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 36123C E005C2FC AFBE0100 */  sw        $fp, 0x100($sp)
 /* 361240 E005C300 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s
index 6a1893131a..eca85a356e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s
@@ -14,14 +14,14 @@ glabel fx_46_main
 /* 360F64 E005C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 360F68 E005C028 AFB40038 */  sw        $s4, 0x38($sp)
 /* 360F6C E005C02C 8FB40074 */  lw        $s4, 0x74($sp)
-/* 360F70 E005C030 3C02E006 */  lui       $v0, %hi(func_E005C178)
-/* 360F74 E005C034 2442C178 */  addiu     $v0, $v0, %lo(func_E005C178)
+/* 360F70 E005C030 3C02E006 */  lui       $v0, %hi(fx_46_init)
+/* 360F74 E005C034 2442C178 */  addiu     $v0, $v0, %lo(fx_46_init)
 /* 360F78 E005C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 360F7C E005C03C 3C02E006 */  lui       $v0, %hi(func_E005C180)
-/* 360F80 E005C040 2442C180 */  addiu     $v0, $v0, %lo(func_E005C180)
+/* 360F7C E005C03C 3C02E006 */  lui       $v0, %hi(fx_46_update)
+/* 360F80 E005C040 2442C180 */  addiu     $v0, $v0, %lo(fx_46_update)
 /* 360F84 E005C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 360F88 E005C048 3C02E006 */  lui       $v0, %hi(func_E005C2B4)
-/* 360F8C E005C04C 2442C2B4 */  addiu     $v0, $v0, %lo(func_E005C2B4)
+/* 360F88 E005C048 3C02E006 */  lui       $v0, %hi(fx_46_render)
+/* 360F8C E005C04C 2442C2B4 */  addiu     $v0, $v0, %lo(fx_46_render)
 /* 360F90 E005C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 360F94 E005C054 2402002E */  addiu     $v0, $zero, 0x2e
 /* 360F98 E005C058 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s
rename to ver/us/asm/nonmatchings/effects/effect_46/fx_46_render.s
index 65a2010db9..07c23f57fc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005C2B4
+glabel fx_46_render
 /* 3611F4 E005C2B4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3611F8 E005C2B8 3C02E006 */  lui       $v0, %hi(func_E005C2F8)
-/* 3611FC E005C2BC 2442C2F8 */  addiu     $v0, $v0, %lo(func_E005C2F8)
+/* 3611F8 E005C2B8 3C02E006 */  lui       $v0, %hi(fx_46_appendGfx)
+/* 3611FC E005C2BC 2442C2F8 */  addiu     $v0, $v0, %lo(fx_46_appendGfx)
 /* 361200 E005C2C0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 361204 E005C2C4 24020028 */  addiu     $v0, $zero, 0x28
 /* 361208 E005C2C8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s
rename to ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s
index e98379c956..a14e1f57c6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005C180
+glabel fx_46_update
 /* 3610C0 E005C180 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3610C4 E005C184 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3610C8 E005C188 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s b/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s
index c4f46802e8..b919a119e1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s
@@ -14,14 +14,14 @@ glabel fx_47_main
 /* 3625E4 E005E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3625E8 E005E028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3625EC E005E02C 8FB1006C */  lw        $s1, 0x6c($sp)
-/* 3625F0 E005E030 3C02E006 */  lui       $v0, %hi(func_E005E1B0)
-/* 3625F4 E005E034 2442E1B0 */  addiu     $v0, $v0, %lo(func_E005E1B0)
+/* 3625F0 E005E030 3C02E006 */  lui       $v0, %hi(fx_47_init)
+/* 3625F4 E005E034 2442E1B0 */  addiu     $v0, $v0, %lo(fx_47_init)
 /* 3625F8 E005E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3625FC E005E03C 3C02E006 */  lui       $v0, %hi(func_E005E1B8)
-/* 362600 E005E040 2442E1B8 */  addiu     $v0, $v0, %lo(func_E005E1B8)
+/* 3625FC E005E03C 3C02E006 */  lui       $v0, %hi(fx_47_update)
+/* 362600 E005E040 2442E1B8 */  addiu     $v0, $v0, %lo(fx_47_update)
 /* 362604 E005E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 362608 E005E048 3C02E006 */  lui       $v0, %hi(func_E005E310)
-/* 36260C E005E04C 2442E310 */  addiu     $v0, $v0, %lo(func_E005E310)
+/* 362608 E005E048 3C02E006 */  lui       $v0, %hi(fx_47_render)
+/* 36260C E005E04C 2442E310 */  addiu     $v0, $v0, %lo(fx_47_render)
 /* 362610 E005E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 362614 E005E054 3C02E006 */  lui       $v0, %hi(func_E005E318)
 /* 362618 E005E058 2442E318 */  addiu     $v0, $v0, %lo(func_E005E318)
diff --git a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s b/ver/us/asm/nonmatchings/effects/effect_47/fx_47_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s
rename to ver/us/asm/nonmatchings/effects/effect_47/fx_47_update.s
index 6d56cbbf72..ac36c90195 100644
--- a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_47/fx_47_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E005E1B8
+glabel fx_47_update
 /* 362778 E005E1B8 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 36277C E005E1BC AFB20018 */  sw        $s2, 0x18($sp)
 /* 362780 E005E1C0 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s
rename to ver/us/asm/nonmatchings/effects/effect_48/fx_48_appendGfx.s
index 994f18096f..7b797b7306 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s
+++ b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0060450
+glabel fx_48_appendGfx
 /* 3635B0 E0060450 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 3635B4 E0060454 3C02DB06 */  lui       $v0, 0xdb06
 /* 3635B8 E0060458 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s
index 69a3424cad..42606a1ed2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s
@@ -12,14 +12,14 @@ glabel fx_48_main
 /* 36317C E006001C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 363180 E0060020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 363184 E0060024 4487C000 */  mtc1      $a3, $f24
-/* 363188 E0060028 3C02E006 */  lui       $v0, %hi(func_E00601D8)
-/* 36318C E006002C 244201D8 */  addiu     $v0, $v0, %lo(func_E00601D8)
+/* 363188 E0060028 3C02E006 */  lui       $v0, %hi(fx_48_init)
+/* 36318C E006002C 244201D8 */  addiu     $v0, $v0, %lo(fx_48_init)
 /* 363190 E0060030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 363194 E0060034 3C02E006 */  lui       $v0, %hi(func_E00601E0)
-/* 363198 E0060038 244201E0 */  addiu     $v0, $v0, %lo(func_E00601E0)
+/* 363194 E0060034 3C02E006 */  lui       $v0, %hi(fx_48_update)
+/* 363198 E0060038 244201E0 */  addiu     $v0, $v0, %lo(fx_48_update)
 /* 36319C E006003C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3631A0 E0060040 3C02E006 */  lui       $v0, %hi(func_E006040C)
-/* 3631A4 E0060044 2442040C */  addiu     $v0, $v0, %lo(func_E006040C)
+/* 3631A0 E0060040 3C02E006 */  lui       $v0, %hi(fx_48_render)
+/* 3631A4 E0060044 2442040C */  addiu     $v0, $v0, %lo(fx_48_render)
 /* 3631A8 E0060048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3631AC E006004C 24020030 */  addiu     $v0, $zero, 0x30
 /* 3631B0 E0060050 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s
rename to ver/us/asm/nonmatchings/effects/effect_48/fx_48_render.s
index 8cefefe5b6..91eb92b47d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006040C
+glabel fx_48_render
 /* 36356C E006040C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 363570 E0060410 3C02E006 */  lui       $v0, %hi(func_E0060450)
-/* 363574 E0060414 24420450 */  addiu     $v0, $v0, %lo(func_E0060450)
+/* 363570 E0060410 3C02E006 */  lui       $v0, %hi(fx_48_appendGfx)
+/* 363574 E0060414 24420450 */  addiu     $v0, $v0, %lo(fx_48_appendGfx)
 /* 363578 E0060418 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 36357C E006041C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 363580 E0060420 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s
rename to ver/us/asm/nonmatchings/effects/effect_48/fx_48_update.s
index 960633160d..6e59ca2a7c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00601E0
+glabel fx_48_update
 /* 363340 E00601E0 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 363344 E00601E4 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 363348 E00601E8 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s
rename to ver/us/asm/nonmatchings/effects/effect_49/fx_49_appendGfx.s
index f984e231d7..973b1bf3d2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00624EC
+glabel fx_49_appendGfx
 /* 3647EC E00624EC 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 3647F0 E00624F0 AFBE0100 */  sw        $fp, 0x100($sp)
 /* 3647F4 E00624F4 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s
index 285ce9099b..a19d454d1f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s
@@ -12,14 +12,14 @@ glabel fx_49_main
 /* 36431C E006201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 364320 E0062020 F7B80058 */  sdc1      $f24, 0x58($sp)
 /* 364324 E0062024 4487C000 */  mtc1      $a3, $f24
-/* 364328 E0062028 3C02E006 */  lui       $v0, %hi(func_E0062218)
-/* 36432C E006202C 24422218 */  addiu     $v0, $v0, %lo(func_E0062218)
+/* 364328 E0062028 3C02E006 */  lui       $v0, %hi(fx_49_init)
+/* 36432C E006202C 24422218 */  addiu     $v0, $v0, %lo(fx_49_init)
 /* 364330 E0062030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 364334 E0062034 3C02E006 */  lui       $v0, %hi(func_E0062220)
-/* 364338 E0062038 24422220 */  addiu     $v0, $v0, %lo(func_E0062220)
+/* 364334 E0062034 3C02E006 */  lui       $v0, %hi(fx_49_update)
+/* 364338 E0062038 24422220 */  addiu     $v0, $v0, %lo(fx_49_update)
 /* 36433C E006203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 364340 E0062040 3C02E006 */  lui       $v0, %hi(func_E00624A8)
-/* 364344 E0062044 244224A8 */  addiu     $v0, $v0, %lo(func_E00624A8)
+/* 364340 E0062040 3C02E006 */  lui       $v0, %hi(fx_49_render)
+/* 364344 E0062044 244224A8 */  addiu     $v0, $v0, %lo(fx_49_render)
 /* 364348 E0062048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36434C E006204C 24020031 */  addiu     $v0, $zero, 0x31
 /* 364350 E0062050 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s
rename to ver/us/asm/nonmatchings/effects/effect_49/fx_49_render.s
index 3a585fa465..cdffe5ee52 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00624A8
+glabel fx_49_render
 /* 3647A8 E00624A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3647AC E00624AC 3C02E006 */  lui       $v0, %hi(func_E00624EC)
-/* 3647B0 E00624B0 244224EC */  addiu     $v0, $v0, %lo(func_E00624EC)
+/* 3647AC E00624AC 3C02E006 */  lui       $v0, %hi(fx_49_appendGfx)
+/* 3647B0 E00624B0 244224EC */  addiu     $v0, $v0, %lo(fx_49_appendGfx)
 /* 3647B4 E00624B4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3647B8 E00624B8 24020028 */  addiu     $v0, $zero, 0x28
 /* 3647BC E00624BC AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s
rename to ver/us/asm/nonmatchings/effects/effect_49/fx_49_update.s
index 0b214b9a93..8f8e18b246 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s
+++ b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0062220
+glabel fx_49_update
 /* 364520 E0062220 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 364524 E0062224 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 364528 E0062228 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s
rename to ver/us/asm/nonmatchings/effects/effect_50/fx_50_appendGfx.s
index 4e309b8dcd..e5f26473b8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s
+++ b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0064414
+glabel fx_50_appendGfx
 /* 365324 E0064414 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 365328 E0064418 AFB300E4 */  sw        $s3, 0xe4($sp)
 /* 36532C E006441C 3C13800A */  lui       $s3, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s
index afe2021b22..30670e2d1f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s
@@ -23,15 +23,15 @@ glabel fx_50_main
 /* 364F58 E0064048 24110004 */  addiu     $s1, $zero, 4
 .LE006404C:
 /* 364F5C E006404C 26310001 */  addiu     $s1, $s1, 1
-/* 364F60 E0064050 3C02E006 */  lui       $v0, %hi(func_E006419C)
-/* 364F64 E0064054 2442419C */  addiu     $v0, $v0, %lo(func_E006419C)
+/* 364F60 E0064050 3C02E006 */  lui       $v0, %hi(fx_50_init)
+/* 364F64 E0064054 2442419C */  addiu     $v0, $v0, %lo(fx_50_init)
 /* 364F68 E0064058 AFA00010 */  sw        $zero, 0x10($sp)
 /* 364F6C E006405C AC820008 */  sw        $v0, 8($a0)
-/* 364F70 E0064060 3C02E006 */  lui       $v0, %hi(func_E00641A4)
-/* 364F74 E0064064 244241A4 */  addiu     $v0, $v0, %lo(func_E00641A4)
+/* 364F70 E0064060 3C02E006 */  lui       $v0, %hi(fx_50_update)
+/* 364F74 E0064064 244241A4 */  addiu     $v0, $v0, %lo(fx_50_update)
 /* 364F78 E0064068 AC82000C */  sw        $v0, 0xc($a0)
-/* 364F7C E006406C 3C02E006 */  lui       $v0, %hi(func_E00643DC)
-/* 364F80 E0064070 244243DC */  addiu     $v0, $v0, %lo(func_E00643DC)
+/* 364F7C E006406C 3C02E006 */  lui       $v0, %hi(fx_50_render)
+/* 364F80 E0064070 244243DC */  addiu     $v0, $v0, %lo(fx_50_render)
 /* 364F84 E0064074 AC820010 */  sw        $v0, 0x10($a0)
 /* 364F88 E0064078 24020032 */  addiu     $v0, $zero, 0x32
 /* 364F8C E006407C AC800014 */  sw        $zero, 0x14($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_render.s
similarity index 82%
rename from ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s
rename to ver/us/asm/nonmatchings/effects/effect_50/fx_50_render.s
index 24ed0122df..a7d983786f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00643DC
+glabel fx_50_render
 /* 3652EC E00643DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3652F0 E00643E0 3C02E006 */  lui       $v0, %hi(func_E0064414)
-/* 3652F4 E00643E4 24424414 */  addiu     $v0, $v0, %lo(func_E0064414)
+/* 3652F0 E00643E0 3C02E006 */  lui       $v0, %hi(fx_50_appendGfx)
+/* 3652F4 E00643E4 24424414 */  addiu     $v0, $v0, %lo(fx_50_appendGfx)
 /* 3652F8 E00643E8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3652FC E00643EC 24020028 */  addiu     $v0, $zero, 0x28
 /* 365300 E00643F0 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s
rename to ver/us/asm/nonmatchings/effects/effect_50/fx_50_update.s
index f6a78ae7af..23b1905479 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00641A4
+glabel fx_50_update
 /* 3650B4 E00641A4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3650B8 E00641A8 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3650BC E00641AC 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s
rename to ver/us/asm/nonmatchings/effects/effect_51/fx_51_appendGfx.s
index e97476c8a9..f570855bf0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s
+++ b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0066770
+glabel fx_51_appendGfx
 /* 3667A0 E0066770 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3667A4 E0066774 AFB700C4 */  sw        $s7, 0xc4($sp)
 /* 3667A8 E0066778 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s
index fc3b6afc15..bf0774314e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s
@@ -14,14 +14,14 @@ glabel fx_51_main
 /* 366054 E0066024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 366058 E0066028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 36605C E006602C 8FB00064 */  lw        $s0, 0x64($sp)
-/* 366060 E0066030 3C02E006 */  lui       $v0, %hi(func_E0066490)
-/* 366064 E0066034 24426490 */  addiu     $v0, $v0, %lo(func_E0066490)
+/* 366060 E0066030 3C02E006 */  lui       $v0, %hi(fx_51_init)
+/* 366064 E0066034 24426490 */  addiu     $v0, $v0, %lo(fx_51_init)
 /* 366068 E0066038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 36606C E006603C 3C02E006 */  lui       $v0, %hi(func_E0066498)
-/* 366070 E0066040 24426498 */  addiu     $v0, $v0, %lo(func_E0066498)
+/* 36606C E006603C 3C02E006 */  lui       $v0, %hi(fx_51_update)
+/* 366070 E0066040 24426498 */  addiu     $v0, $v0, %lo(fx_51_update)
 /* 366074 E0066044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 366078 E0066048 3C02E006 */  lui       $v0, %hi(func_E006672C)
-/* 36607C E006604C 2442672C */  addiu     $v0, $v0, %lo(func_E006672C)
+/* 366078 E0066048 3C02E006 */  lui       $v0, %hi(fx_51_render)
+/* 36607C E006604C 2442672C */  addiu     $v0, $v0, %lo(fx_51_render)
 /* 366080 E0066050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 366084 E0066054 24020033 */  addiu     $v0, $zero, 0x33
 /* 366088 E0066058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s
rename to ver/us/asm/nonmatchings/effects/effect_51/fx_51_render.s
index 276843de7b..7a6ea29d61 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006672C
+glabel fx_51_render
 /* 36675C E006672C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 366760 E0066730 3C02E006 */  lui       $v0, %hi(func_E0066770)
-/* 366764 E0066734 24426770 */  addiu     $v0, $v0, %lo(func_E0066770)
+/* 366760 E0066730 3C02E006 */  lui       $v0, %hi(fx_51_appendGfx)
+/* 366764 E0066734 24426770 */  addiu     $v0, $v0, %lo(fx_51_appendGfx)
 /* 366768 E0066738 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 36676C E006673C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 366770 E0066740 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s
rename to ver/us/asm/nonmatchings/effects/effect_51/fx_51_update.s
index 247bca7b6e..5aa8cbe597 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s
+++ b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0066498
+glabel fx_51_update
 /* 3664C8 E0066498 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3664CC E006649C AFB1003C */  sw        $s1, 0x3c($sp)
 /* 3664D0 E00664A0 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s
rename to ver/us/asm/nonmatchings/effects/effect_52/fx_52_appendGfx.s
index 2e413875b0..87b13efa11 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s
+++ b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0068234
+glabel fx_52_appendGfx
 /* 36AB04 E0068234 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 36AB08 E0068238 3C07DB06 */  lui       $a3, 0xdb06
 /* 36AB0C E006823C AFB10064 */  sw        $s1, 0x64($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s
index d2ee712c50..3147f09a85 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s
@@ -14,14 +14,14 @@ glabel fx_52_main
 /* 36A8F4 E0068024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 36A8F8 E0068028 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 36A8FC E006802C C7B40068 */  lwc1      $f20, 0x68($sp)
-/* 36A900 E0068030 3C02E007 */  lui       $v0, %hi(func_E0068140)
-/* 36A904 E0068034 24428140 */  addiu     $v0, $v0, %lo(func_E0068140)
+/* 36A900 E0068030 3C02E007 */  lui       $v0, %hi(fx_52_init)
+/* 36A904 E0068034 24428140 */  addiu     $v0, $v0, %lo(fx_52_init)
 /* 36A908 E0068038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 36A90C E006803C 3C02E007 */  lui       $v0, %hi(func_E0068148)
-/* 36A910 E0068040 24428148 */  addiu     $v0, $v0, %lo(func_E0068148)
+/* 36A90C E006803C 3C02E007 */  lui       $v0, %hi(fx_52_update)
+/* 36A910 E0068040 24428148 */  addiu     $v0, $v0, %lo(fx_52_update)
 /* 36A914 E0068044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 36A918 E0068048 3C02E007 */  lui       $v0, %hi(func_E00681D8)
-/* 36A91C E006804C 244281D8 */  addiu     $v0, $v0, %lo(func_E00681D8)
+/* 36A918 E0068048 3C02E007 */  lui       $v0, %hi(fx_52_render)
+/* 36A91C E006804C 244281D8 */  addiu     $v0, $v0, %lo(fx_52_render)
 /* 36A920 E0068050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36A924 E0068054 24020034 */  addiu     $v0, $zero, 0x34
 /* 36A928 E0068058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_render.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s
rename to ver/us/asm/nonmatchings/effects/effect_52/fx_52_render.s
index 178938dce6..32b04300e7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_render.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00681D8
+glabel fx_52_render
 /* 36AAA8 E00681D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 36AAAC E00681DC AFBF0020 */  sw        $ra, 0x20($sp)
 /* 36AAB0 E00681E0 8C83000C */  lw        $v1, 0xc($a0)
-/* 36AAB4 E00681E4 3C02E007 */  lui       $v0, %hi(func_E0068234)
-/* 36AAB8 E00681E8 24428234 */  addiu     $v0, $v0, %lo(func_E0068234)
+/* 36AAB4 E00681E4 3C02E007 */  lui       $v0, %hi(fx_52_appendGfx)
+/* 36AAB8 E00681E8 24428234 */  addiu     $v0, $v0, %lo(fx_52_appendGfx)
 /* 36AABC E00681EC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 36AAC0 E00681F0 2402000A */  addiu     $v0, $zero, 0xa
 /* 36AAC4 E00681F4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s
rename to ver/us/asm/nonmatchings/effects/effect_52/fx_52_update.s
index c46f261b67..abc7a18048 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s
+++ b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0068148
+glabel fx_52_update
 /* 36AA18 E0068148 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 36AA1C E006814C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 36AA20 E0068150 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s
rename to ver/us/asm/nonmatchings/effects/effect_53/fx_53_appendGfx.s
index 720f858e9c..0c1ec1810b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006A94C
+glabel fx_53_appendGfx
 /* 36D96C E006A94C 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 36D970 E006A950 AFA40120 */  sw        $a0, 0x120($sp)
 /* 36D974 E006A954 8FA80120 */  lw        $t0, 0x120($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s
index 84b78f316b..b8bafeedef 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s
@@ -27,14 +27,14 @@ glabel fx_53_main
 /* 36D260 E006A240 AFB1002C */   sw       $s1, 0x2c($sp)
 /* 36D264 E006A244 24120009 */  addiu     $s2, $zero, 9
 .LE006A248:
-/* 36D268 E006A248 3C02E007 */  lui       $v0, %hi(func_E006A45C)
-/* 36D26C E006A24C 2442A45C */  addiu     $v0, $v0, %lo(func_E006A45C)
+/* 36D268 E006A248 3C02E007 */  lui       $v0, %hi(fx_53_init)
+/* 36D26C E006A24C 2442A45C */  addiu     $v0, $v0, %lo(fx_53_init)
 /* 36D270 E006A250 AFA20018 */  sw        $v0, 0x18($sp)
-/* 36D274 E006A254 3C02E007 */  lui       $v0, %hi(func_E006A580)
-/* 36D278 E006A258 2442A580 */  addiu     $v0, $v0, %lo(func_E006A580)
+/* 36D274 E006A254 3C02E007 */  lui       $v0, %hi(fx_53_update)
+/* 36D278 E006A258 2442A580 */  addiu     $v0, $v0, %lo(fx_53_update)
 /* 36D27C E006A25C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 36D280 E006A260 3C02E007 */  lui       $v0, %hi(func_E006A814)
-/* 36D284 E006A264 2442A814 */  addiu     $v0, $v0, %lo(func_E006A814)
+/* 36D280 E006A260 3C02E007 */  lui       $v0, %hi(fx_53_render)
+/* 36D284 E006A264 2442A814 */  addiu     $v0, $v0, %lo(fx_53_render)
 /* 36D288 E006A268 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36D28C E006A26C 24020035 */  addiu     $v0, $zero, 0x35
 /* 36D290 E006A270 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s
rename to ver/us/asm/nonmatchings/effects/effect_53/fx_53_render.s
index 611d26deb7..49c367576b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s
+++ b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006A814
+glabel fx_53_render
 /* 36D834 E006A814 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 36D838 E006A818 3C02E007 */  lui       $v0, %hi(func_E006A94C)
-/* 36D83C E006A81C 2442A94C */  addiu     $v0, $v0, %lo(func_E006A94C)
+/* 36D838 E006A818 3C02E007 */  lui       $v0, %hi(fx_53_appendGfx)
+/* 36D83C E006A81C 2442A94C */  addiu     $v0, $v0, %lo(fx_53_appendGfx)
 /* 36D840 E006A820 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 36D844 E006A824 2402000A */  addiu     $v0, $zero, 0xa
 /* 36D848 E006A828 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s
rename to ver/us/asm/nonmatchings/effects/effect_53/fx_53_update.s
index 798107dd65..068f024f51 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s
+++ b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006A580
+glabel fx_53_update
 /* 36D5A0 E006A580 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 36D5A4 E006A584 AFB40020 */  sw        $s4, 0x20($sp)
 /* 36D5A8 E006A588 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s
rename to ver/us/asm/nonmatchings/effects/effect_54/fx_54_appendGfx.s
index cf8126c7be..98ab83dd2c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006C5E8
+glabel fx_54_appendGfx
 /* 36E7B8 E006C5E8 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 36E7BC E006C5EC 3C05DB06 */  lui       $a1, 0xdb06
 /* 36E7C0 E006C5F0 AFB400C0 */  sw        $s4, 0xc0($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s
index 8dc3bfe7fa..9dfd8c2034 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s
@@ -12,14 +12,14 @@ glabel fx_54_main
 /* 36E1EC E006C01C 27A40018 */  addiu     $a0, $sp, 0x18
 /* 36E1F0 E006C020 F7BA0060 */  sdc1      $f26, 0x60($sp)
 /* 36E1F4 E006C024 4487D000 */  mtc1      $a3, $f26
-/* 36E1F8 E006C028 3C02E007 */  lui       $v0, %hi(func_E006C298)
-/* 36E1FC E006C02C 2442C298 */  addiu     $v0, $v0, %lo(func_E006C298)
+/* 36E1F8 E006C028 3C02E007 */  lui       $v0, %hi(fx_54_init)
+/* 36E1FC E006C02C 2442C298 */  addiu     $v0, $v0, %lo(fx_54_init)
 /* 36E200 E006C030 AFA20020 */  sw        $v0, 0x20($sp)
-/* 36E204 E006C034 3C02E007 */  lui       $v0, %hi(func_E006C2A0)
-/* 36E208 E006C038 2442C2A0 */  addiu     $v0, $v0, %lo(func_E006C2A0)
+/* 36E204 E006C034 3C02E007 */  lui       $v0, %hi(fx_54_update)
+/* 36E208 E006C038 2442C2A0 */  addiu     $v0, $v0, %lo(fx_54_update)
 /* 36E20C E006C03C AFA20024 */  sw        $v0, 0x24($sp)
-/* 36E210 E006C040 3C02E007 */  lui       $v0, %hi(func_E006C5A0)
-/* 36E214 E006C044 2442C5A0 */  addiu     $v0, $v0, %lo(func_E006C5A0)
+/* 36E210 E006C040 3C02E007 */  lui       $v0, %hi(fx_54_render)
+/* 36E214 E006C044 2442C5A0 */  addiu     $v0, $v0, %lo(fx_54_render)
 /* 36E218 E006C048 AFA20028 */  sw        $v0, 0x28($sp)
 /* 36E21C E006C04C 24020036 */  addiu     $v0, $zero, 0x36
 /* 36E220 E006C050 AFBF0044 */  sw        $ra, 0x44($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s
rename to ver/us/asm/nonmatchings/effects/effect_54/fx_54_render.s
index ddf0d9a032..5d47fc6a67 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006C5A0
+glabel fx_54_render
 /* 36E770 E006C5A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 36E774 E006C5A4 3C02E007 */  lui       $v0, %hi(func_E006C5E8)
-/* 36E778 E006C5A8 2442C5E8 */  addiu     $v0, $v0, %lo(func_E006C5E8)
+/* 36E774 E006C5A4 3C02E007 */  lui       $v0, %hi(fx_54_appendGfx)
+/* 36E778 E006C5A8 2442C5E8 */  addiu     $v0, $v0, %lo(fx_54_appendGfx)
 /* 36E77C E006C5AC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 36E780 E006C5B0 2402000A */  addiu     $v0, $zero, 0xa
 /* 36E784 E006C5B4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s
rename to ver/us/asm/nonmatchings/effects/effect_54/fx_54_update.s
index 3059ece0e7..dd2eddd1ea 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006C2A0
+glabel fx_54_update
 /* 36E470 E006C2A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 36E474 E006C2A4 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 36E478 E006C2A8 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s
rename to ver/us/asm/nonmatchings/effects/effect_55/fx_55_appendGfx.s
index 0ce84e9d61..b8856fd581 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s
+++ b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006E764
+glabel fx_55_appendGfx
 /* 372EF4 E006E764 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 372EF8 E006E768 3C07DB06 */  lui       $a3, 0xdb06
 /* 372EFC E006E76C AFB500B4 */  sw        $s5, 0xb4($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s
index 62e384d730..234c8370dd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s
@@ -22,14 +22,14 @@ glabel fx_55_main
 /* 3727D4 E006E044 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3727D8 E006E048 AFB40038 */  sw        $s4, 0x38($sp)
 /* 3727DC E006E04C 8FB40094 */  lw        $s4, 0x94($sp)
-/* 3727E0 E006E050 3C02E007 */  lui       $v0, %hi(func_E006E354)
-/* 3727E4 E006E054 2442E354 */  addiu     $v0, $v0, %lo(func_E006E354)
+/* 3727E0 E006E050 3C02E007 */  lui       $v0, %hi(fx_55_init)
+/* 3727E4 E006E054 2442E354 */  addiu     $v0, $v0, %lo(fx_55_init)
 /* 3727E8 E006E058 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3727EC E006E05C 3C02E007 */  lui       $v0, %hi(func_E006E35C)
-/* 3727F0 E006E060 2442E35C */  addiu     $v0, $v0, %lo(func_E006E35C)
+/* 3727EC E006E05C 3C02E007 */  lui       $v0, %hi(fx_55_update)
+/* 3727F0 E006E060 2442E35C */  addiu     $v0, $v0, %lo(fx_55_update)
 /* 3727F4 E006E064 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3727F8 E006E068 3C02E007 */  lui       $v0, %hi(func_E006E6E4)
-/* 3727FC E006E06C 2442E6E4 */  addiu     $v0, $v0, %lo(func_E006E6E4)
+/* 3727F8 E006E068 3C02E007 */  lui       $v0, %hi(fx_55_render)
+/* 3727FC E006E06C 2442E6E4 */  addiu     $v0, $v0, %lo(fx_55_render)
 /* 372800 E006E070 AFA20020 */  sw        $v0, 0x20($sp)
 /* 372804 E006E074 24020037 */  addiu     $v0, $zero, 0x37
 /* 372808 E006E078 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_render.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s
rename to ver/us/asm/nonmatchings/effects/effect_55/fx_55_render.s
index e5fddbbf61..662154e5cc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_render.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006E6E4
+glabel fx_55_render
 /* 372E74 E006E6E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 372E78 E006E6E8 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 372E7C E006E6EC 8C85000C */  lw        $a1, 0xc($a0)
-/* 372E80 E006E6F0 3C02E007 */  lui       $v0, %hi(func_E006E764)
-/* 372E84 E006E6F4 2442E764 */  addiu     $v0, $v0, %lo(func_E006E764)
+/* 372E80 E006E6F0 3C02E007 */  lui       $v0, %hi(fx_55_appendGfx)
+/* 372E84 E006E6F4 2442E764 */  addiu     $v0, $v0, %lo(fx_55_appendGfx)
 /* 372E88 E006E6F8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 372E8C E006E6FC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* 372E90 E006E700 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s
rename to ver/us/asm/nonmatchings/effects/effect_55/fx_55_update.s
index 28adb6021e..0d5876136b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E006E35C
+glabel fx_55_update
 /* 372AEC E006E35C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 372AF0 E006E360 AFBF0034 */  sw        $ra, 0x34($sp)
 /* 372AF4 E006E364 AFB20030 */  sw        $s2, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s
rename to ver/us/asm/nonmatchings/effects/effect_56/fx_56_appendGfx.s
index f4ea1ddeaa..d5263f99c2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s
+++ b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0070740
+glabel fx_56_appendGfx
 /* 3747F0 E0070740 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3747F4 E0070744 3C06DB06 */  lui       $a2, 0xdb06
 /* 3747F8 E0070748 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s
index bb7899c57d..e0438e516b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s
@@ -14,14 +14,14 @@ glabel fx_56_main
 /* 3740D4 E0070024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3740D8 E0070028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3740DC E007002C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3740E0 E0070030 3C02E007 */  lui       $v0, %hi(func_E00701EC)
-/* 3740E4 E0070034 244201EC */  addiu     $v0, $v0, %lo(func_E00701EC)
+/* 3740E0 E0070030 3C02E007 */  lui       $v0, %hi(fx_56_init)
+/* 3740E4 E0070034 244201EC */  addiu     $v0, $v0, %lo(fx_56_init)
 /* 3740E8 E0070038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3740EC E007003C 3C02E007 */  lui       $v0, %hi(func_E00701F4)
-/* 3740F0 E0070040 244201F4 */  addiu     $v0, $v0, %lo(func_E00701F4)
+/* 3740EC E007003C 3C02E007 */  lui       $v0, %hi(fx_56_update)
+/* 3740F0 E0070040 244201F4 */  addiu     $v0, $v0, %lo(fx_56_update)
 /* 3740F4 E0070044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3740F8 E0070048 3C02E007 */  lui       $v0, %hi(func_E00706F0)
-/* 3740FC E007004C 244206F0 */  addiu     $v0, $v0, %lo(func_E00706F0)
+/* 3740F8 E0070048 3C02E007 */  lui       $v0, %hi(fx_56_render)
+/* 3740FC E007004C 244206F0 */  addiu     $v0, $v0, %lo(fx_56_render)
 /* 374100 E0070050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 374104 E0070054 24020038 */  addiu     $v0, $zero, 0x38
 /* 374108 E0070058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s
rename to ver/us/asm/nonmatchings/effects/effect_56/fx_56_render.s
index fa6223ed9c..c532344c32 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00706F0
+glabel fx_56_render
 /* 3747A0 E00706F0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3747A4 E00706F4 3C02E007 */  lui       $v0, %hi(func_E0070740)
-/* 3747A8 E00706F8 24420740 */  addiu     $v0, $v0, %lo(func_E0070740)
+/* 3747A4 E00706F4 3C02E007 */  lui       $v0, %hi(fx_56_appendGfx)
+/* 3747A8 E00706F8 24420740 */  addiu     $v0, $v0, %lo(fx_56_appendGfx)
 /* 3747AC E00706FC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3747B0 E0070700 2402000A */  addiu     $v0, $zero, 0xa
 /* 3747B4 E0070704 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s
rename to ver/us/asm/nonmatchings/effects/effect_56/fx_56_update.s
index 0142c6c27b..0a53230864 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00701F4
+glabel fx_56_update
 /* 3742A4 E00701F4 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 3742A8 E00701F8 AFB20028 */  sw        $s2, 0x28($sp)
 /* 3742AC E00701FC 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s
rename to ver/us/asm/nonmatchings/effects/effect_57/fx_57_appendGfx.s
index 165ac9cbc8..155278ddb2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00723D4
+glabel fx_57_appendGfx
 /* 375224 E00723D4 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 375228 E00723D8 3C03DB06 */  lui       $v1, 0xdb06
 /* 37522C E00723DC 34630024 */  ori       $v1, $v1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s
index 93219aceb9..f9696a59b0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s
@@ -12,14 +12,14 @@ glabel fx_57_main
 /* 374E6C E007201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 374E70 E0072020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 374E74 E0072024 4487C000 */  mtc1      $a3, $f24
-/* 374E78 E0072028 3C02E007 */  lui       $v0, %hi(func_E0072148)
-/* 374E7C E007202C 24422148 */  addiu     $v0, $v0, %lo(func_E0072148)
+/* 374E78 E0072028 3C02E007 */  lui       $v0, %hi(fx_57_init)
+/* 374E7C E007202C 24422148 */  addiu     $v0, $v0, %lo(fx_57_init)
 /* 374E80 E0072030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 374E84 E0072034 3C02E007 */  lui       $v0, %hi(func_E0072150)
-/* 374E88 E0072038 24422150 */  addiu     $v0, $v0, %lo(func_E0072150)
+/* 374E84 E0072034 3C02E007 */  lui       $v0, %hi(fx_57_update)
+/* 374E88 E0072038 24422150 */  addiu     $v0, $v0, %lo(fx_57_update)
 /* 374E8C E007203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 374E90 E0072040 3C02E007 */  lui       $v0, %hi(func_E007238C)
-/* 374E94 E0072044 2442238C */  addiu     $v0, $v0, %lo(func_E007238C)
+/* 374E90 E0072040 3C02E007 */  lui       $v0, %hi(fx_57_render)
+/* 374E94 E0072044 2442238C */  addiu     $v0, $v0, %lo(fx_57_render)
 /* 374E98 E0072048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 374E9C E007204C 24020039 */  addiu     $v0, $zero, 0x39
 /* 374EA0 E0072050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s
rename to ver/us/asm/nonmatchings/effects/effect_57/fx_57_render.s
index fbb02f4f89..100ced8ba4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007238C
+glabel fx_57_render
 /* 3751DC E007238C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3751E0 E0072390 3C02E007 */  lui       $v0, %hi(func_E00723D4)
-/* 3751E4 E0072394 244223D4 */  addiu     $v0, $v0, %lo(func_E00723D4)
+/* 3751E0 E0072390 3C02E007 */  lui       $v0, %hi(fx_57_appendGfx)
+/* 3751E4 E0072394 244223D4 */  addiu     $v0, $v0, %lo(fx_57_appendGfx)
 /* 3751E8 E0072398 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3751EC E007239C 2402000A */  addiu     $v0, $zero, 0xa
 /* 3751F0 E00723A0 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s
rename to ver/us/asm/nonmatchings/effects/effect_57/fx_57_update.s
index 85b19dd161..b4ecb45d24 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s
+++ b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0072150
+glabel fx_57_update
 /* 374FA0 E0072150 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 374FA4 E0072154 AFBF002C */  sw        $ra, 0x2c($sp)
 /* 374FA8 E0072158 AFB20028 */  sw        $s2, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s
rename to ver/us/asm/nonmatchings/effects/effect_58/fx_58_appendGfx.s
index f29c50be0d..434701bd52 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00745E0
+glabel fx_58_appendGfx
 /* 376A40 E00745E0 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 376A44 E00745E4 3C06DB06 */  lui       $a2, 0xdb06
 /* 376A48 E00745E8 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s
index f42aeb1baa..8bb6135497 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s
@@ -16,14 +16,14 @@ glabel fx_58_main
 /* 37648C E007402C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 376490 E0074030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 376494 E0074034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 376498 E0074038 3C02E007 */  lui       $v0, %hi(func_E00741E0)
-/* 37649C E007403C 244241E0 */  addiu     $v0, $v0, %lo(func_E00741E0)
+/* 376498 E0074038 3C02E007 */  lui       $v0, %hi(fx_58_init)
+/* 37649C E007403C 244241E0 */  addiu     $v0, $v0, %lo(fx_58_init)
 /* 3764A0 E0074040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3764A4 E0074044 3C02E007 */  lui       $v0, %hi(func_E00741E8)
-/* 3764A8 E0074048 244241E8 */  addiu     $v0, $v0, %lo(func_E00741E8)
+/* 3764A4 E0074044 3C02E007 */  lui       $v0, %hi(fx_58_update)
+/* 3764A8 E0074048 244241E8 */  addiu     $v0, $v0, %lo(fx_58_update)
 /* 3764AC E007404C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3764B0 E0074050 3C02E007 */  lui       $v0, %hi(func_E0074598)
-/* 3764B4 E0074054 24424598 */  addiu     $v0, $v0, %lo(func_E0074598)
+/* 3764B0 E0074050 3C02E007 */  lui       $v0, %hi(fx_58_render)
+/* 3764B4 E0074054 24424598 */  addiu     $v0, $v0, %lo(fx_58_render)
 /* 3764B8 E0074058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3764BC E007405C 2402003A */  addiu     $v0, $zero, 0x3a
 /* 3764C0 E0074060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s
rename to ver/us/asm/nonmatchings/effects/effect_58/fx_58_render.s
index e449217f9f..b0a0b70eb7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s
+++ b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0074598
+glabel fx_58_render
 /* 3769F8 E0074598 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3769FC E007459C 3C02E007 */  lui       $v0, %hi(func_E00745E0)
-/* 376A00 E00745A0 244245E0 */  addiu     $v0, $v0, %lo(func_E00745E0)
+/* 3769FC E007459C 3C02E007 */  lui       $v0, %hi(fx_58_appendGfx)
+/* 376A00 E00745A0 244245E0 */  addiu     $v0, $v0, %lo(fx_58_appendGfx)
 /* 376A04 E00745A4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 376A08 E00745A8 2402000A */  addiu     $v0, $zero, 0xa
 /* 376A0C E00745AC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s
rename to ver/us/asm/nonmatchings/effects/effect_58/fx_58_update.s
index e88d7b004a..878c8e0b1d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00741E8
+glabel fx_58_update
 /* 376648 E00741E8 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 37664C E00741EC AFB20020 */  sw        $s2, 0x20($sp)
 /* 376650 E00741F0 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s
rename to ver/us/asm/nonmatchings/effects/effect_59/fx_59_appendGfx.s
index 116b9ae57e..7bb86c0da1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007685C
+glabel fx_59_appendGfx
 /* 3778CC E007685C 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 3778D0 E0076860 3C02DB06 */  lui       $v0, 0xdb06
 /* 3778D4 E0076864 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s
index 322c605249..27414ed97d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s
@@ -14,14 +14,14 @@ glabel fx_59_main
 /* 377094 E0076024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 377098 E0076028 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 37709C E007602C C7B40068 */  lwc1      $f20, 0x68($sp)
-/* 3770A0 E0076030 3C02E007 */  lui       $v0, %hi(func_E0076370)
-/* 3770A4 E0076034 24426370 */  addiu     $v0, $v0, %lo(func_E0076370)
+/* 3770A0 E0076030 3C02E007 */  lui       $v0, %hi(fx_59_init)
+/* 3770A4 E0076034 24426370 */  addiu     $v0, $v0, %lo(fx_59_init)
 /* 3770A8 E0076038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3770AC E007603C 3C02E007 */  lui       $v0, %hi(func_E0076378)
-/* 3770B0 E0076040 24426378 */  addiu     $v0, $v0, %lo(func_E0076378)
+/* 3770AC E007603C 3C02E007 */  lui       $v0, %hi(fx_59_update)
+/* 3770B0 E0076040 24426378 */  addiu     $v0, $v0, %lo(fx_59_update)
 /* 3770B4 E0076044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3770B8 E0076048 3C02E007 */  lui       $v0, %hi(func_E0076808)
-/* 3770BC E007604C 24426808 */  addiu     $v0, $v0, %lo(func_E0076808)
+/* 3770B8 E0076048 3C02E007 */  lui       $v0, %hi(fx_59_render)
+/* 3770BC E007604C 24426808 */  addiu     $v0, $v0, %lo(fx_59_render)
 /* 3770C0 E0076050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3770C4 E0076054 2402003B */  addiu     $v0, $zero, 0x3b
 /* 3770C8 E0076058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s
rename to ver/us/asm/nonmatchings/effects/effect_59/fx_59_render.s
index 03f9b7538c..dbeff5090c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s
+++ b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0076808
+glabel fx_59_render
 /* 377878 E0076808 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 37787C E007680C 3C02E007 */  lui       $v0, %hi(func_E007685C)
-/* 377880 E0076810 2442685C */  addiu     $v0, $v0, %lo(func_E007685C)
+/* 37787C E007680C 3C02E007 */  lui       $v0, %hi(fx_59_appendGfx)
+/* 377880 E0076810 2442685C */  addiu     $v0, $v0, %lo(fx_59_appendGfx)
 /* 377884 E0076814 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 377888 E0076818 2402002D */  addiu     $v0, $zero, 0x2d
 /* 37788C E007681C AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s
rename to ver/us/asm/nonmatchings/effects/effect_59/fx_59_update.s
index 8653a8208a..233c682ff7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s
+++ b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0076378
+glabel fx_59_update
 /* 3773E8 E0076378 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3773EC E007637C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3773F0 E0076380 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s
rename to ver/us/asm/nonmatchings/effects/effect_60/fx_60_appendGfx.s
index 2a3389961c..7236ac9667 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007827C
+glabel fx_60_appendGfx
 /* 37A66C E007827C 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 37A670 E0078280 0080302D */  daddu     $a2, $a0, $zero
 /* 37A674 E0078284 AFBF005C */  sw        $ra, 0x5c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s
index 118ca7f5eb..3f5457ff80 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s
@@ -12,14 +12,14 @@ glabel fx_60_main
 /* 37A40C E007801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 37A410 E0078020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 37A414 E0078024 4487C000 */  mtc1      $a3, $f24
-/* 37A418 E0078028 3C02E008 */  lui       $v0, %hi(func_E0078124)
-/* 37A41C E007802C 24428124 */  addiu     $v0, $v0, %lo(func_E0078124)
+/* 37A418 E0078028 3C02E008 */  lui       $v0, %hi(fx_60_init)
+/* 37A41C E007802C 24428124 */  addiu     $v0, $v0, %lo(fx_60_init)
 /* 37A420 E0078030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 37A424 E0078034 3C02E008 */  lui       $v0, %hi(func_E007812C)
-/* 37A428 E0078038 2442812C */  addiu     $v0, $v0, %lo(func_E007812C)
+/* 37A424 E0078034 3C02E008 */  lui       $v0, %hi(fx_60_update)
+/* 37A428 E0078038 2442812C */  addiu     $v0, $v0, %lo(fx_60_update)
 /* 37A42C E007803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 37A430 E0078040 3C02E008 */  lui       $v0, %hi(func_E0078210)
-/* 37A434 E0078044 24428210 */  addiu     $v0, $v0, %lo(func_E0078210)
+/* 37A430 E0078040 3C02E008 */  lui       $v0, %hi(fx_60_render)
+/* 37A434 E0078044 24428210 */  addiu     $v0, $v0, %lo(fx_60_render)
 /* 37A438 E0078048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 37A43C E007804C 2402003C */  addiu     $v0, $zero, 0x3c
 /* 37A440 E0078050 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_render.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s
rename to ver/us/asm/nonmatchings/effects/effect_60/fx_60_render.s
index 4edac94552..61f4a1dae1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s
+++ b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_render.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0078210
+glabel fx_60_render
 /* 37A600 E0078210 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 37A604 E0078214 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 37A608 E0078218 8C83000C */  lw        $v1, 0xc($a0)
-/* 37A60C E007821C 3C02E008 */  lui       $v0, %hi(func_E007827C)
-/* 37A610 E0078220 2442827C */  addiu     $v0, $v0, %lo(func_E007827C)
+/* 37A60C E007821C 3C02E008 */  lui       $v0, %hi(fx_60_appendGfx)
+/* 37A610 E0078220 2442827C */  addiu     $v0, $v0, %lo(fx_60_appendGfx)
 /* 37A614 E0078224 AFA40018 */  sw        $a0, 0x18($sp)
 /* 37A618 E0078228 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 37A61C E007822C 8C630000 */  lw        $v1, ($v1)
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s
rename to ver/us/asm/nonmatchings/effects/effect_60/fx_60_update.s
index 0d6d8dd37c..0c54566ef1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007812C
+glabel fx_60_update
 /* 37A51C E007812C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37A520 E0078130 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 37A524 E0078134 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s
rename to ver/us/asm/nonmatchings/effects/effect_61/fx_61_appendGfx.s
index 8d1356785a..9dd738282f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007A88C
+glabel fx_61_appendGfx
 /* 37CDCC E007A88C 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 37CDD0 E007A890 AFBE00B8 */  sw        $fp, 0xb8($sp)
 /* 37CDD4 E007A894 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s
index 2515cd1252..3845863bd6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s
@@ -119,16 +119,16 @@ glabel fx_61_main
 /* 37C6FC E007A1BC 4600F782 */  mul.s     $f30, $f30, $f0
 /* 37C700 E007A1C0 00000000 */  nop
 /* 37C704 E007A1C4 0200202D */  daddu     $a0, $s0, $zero
-/* 37C708 E007A1C8 3C02E008 */  lui       $v0, %hi(func_E007A504)
-/* 37C70C E007A1CC 2442A504 */  addiu     $v0, $v0, %lo(func_E007A504)
+/* 37C708 E007A1C8 3C02E008 */  lui       $v0, %hi(fx_61_init)
+/* 37C70C E007A1CC 2442A504 */  addiu     $v0, $v0, %lo(fx_61_init)
 /* 37C710 E007A1D0 AC820008 */  sw        $v0, 8($a0)
 /* 37C714 E007A1D4 46008402 */  mul.s     $f16, $f16, $f0
 /* 37C718 E007A1D8 00000000 */  nop
-/* 37C71C E007A1DC 3C02E008 */  lui       $v0, %hi(func_E007A50C)
-/* 37C720 E007A1E0 2442A50C */  addiu     $v0, $v0, %lo(func_E007A50C)
+/* 37C71C E007A1DC 3C02E008 */  lui       $v0, %hi(fx_61_update)
+/* 37C720 E007A1E0 2442A50C */  addiu     $v0, $v0, %lo(fx_61_update)
 /* 37C724 E007A1E4 AC82000C */  sw        $v0, 0xc($a0)
-/* 37C728 E007A1E8 3C02E008 */  lui       $v0, %hi(func_E007A840)
-/* 37C72C E007A1EC 2442A840 */  addiu     $v0, $v0, %lo(func_E007A840)
+/* 37C728 E007A1E8 3C02E008 */  lui       $v0, %hi(fx_61_render)
+/* 37C72C E007A1EC 2442A840 */  addiu     $v0, $v0, %lo(fx_61_render)
 /* 37C730 E007A1F0 AC800000 */  sw        $zero, ($a0)
 /* 37C734 E007A1F4 4600E702 */  mul.s     $f28, $f28, $f0
 /* 37C738 E007A1F8 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s
rename to ver/us/asm/nonmatchings/effects/effect_61/fx_61_render.s
index d3b52eb6c7..163a13ef7a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s
+++ b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007A840
+glabel fx_61_render
 /* 37CD80 E007A840 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 37CD84 E007A844 3C02E008 */  lui       $v0, %hi(func_E007A88C)
-/* 37CD88 E007A848 2442A88C */  addiu     $v0, $v0, %lo(func_E007A88C)
+/* 37CD84 E007A844 3C02E008 */  lui       $v0, %hi(fx_61_appendGfx)
+/* 37CD88 E007A848 2442A88C */  addiu     $v0, $v0, %lo(fx_61_appendGfx)
 /* 37CD8C E007A84C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 37CD90 E007A850 2402002D */  addiu     $v0, $zero, 0x2d
 /* 37CD94 E007A854 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s
rename to ver/us/asm/nonmatchings/effects/effect_61/fx_61_update.s
index 2350348680..1d3f751b30 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007A50C
+glabel fx_61_update
 /* 37CA4C E007A50C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37CA50 E007A510 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 37CA54 E007A514 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s
rename to ver/us/asm/nonmatchings/effects/effect_62/fx_62_appendGfx.s
index 1018fdb0ff..ac501e5917 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007C1F4
+glabel fx_62_appendGfx
 /* 37D684 E007C1F4 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 37D688 E007C1F8 0080302D */  daddu     $a2, $a0, $zero
 /* 37D68C E007C1FC 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s
index bbcc475a42..b14ba10c82 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s
@@ -14,14 +14,14 @@ glabel fx_62_main
 /* 37D4B4 E007C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 37D4B8 E007C028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 37D4BC E007C02C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 37D4C0 E007C030 3C02E008 */  lui       $v0, %hi(func_E007C128)
-/* 37D4C4 E007C034 2442C128 */  addiu     $v0, $v0, %lo(func_E007C128)
+/* 37D4C0 E007C030 3C02E008 */  lui       $v0, %hi(fx_62_init)
+/* 37D4C4 E007C034 2442C128 */  addiu     $v0, $v0, %lo(fx_62_init)
 /* 37D4C8 E007C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 37D4CC E007C03C 3C02E008 */  lui       $v0, %hi(func_E007C130)
-/* 37D4D0 E007C040 2442C130 */  addiu     $v0, $v0, %lo(func_E007C130)
+/* 37D4CC E007C03C 3C02E008 */  lui       $v0, %hi(fx_62_update)
+/* 37D4D0 E007C040 2442C130 */  addiu     $v0, $v0, %lo(fx_62_update)
 /* 37D4D4 E007C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 37D4D8 E007C048 3C02E008 */  lui       $v0, %hi(func_E007C1B0)
-/* 37D4DC E007C04C 2442C1B0 */  addiu     $v0, $v0, %lo(func_E007C1B0)
+/* 37D4D8 E007C048 3C02E008 */  lui       $v0, %hi(fx_62_render)
+/* 37D4DC E007C04C 2442C1B0 */  addiu     $v0, $v0, %lo(fx_62_render)
 /* 37D4E0 E007C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 37D4E4 E007C054 2402003E */  addiu     $v0, $zero, 0x3e
 /* 37D4E8 E007C058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s
rename to ver/us/asm/nonmatchings/effects/effect_62/fx_62_render.s
index 240b5b653d..8c35ade947 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007C1B0
+glabel fx_62_render
 /* 37D640 E007C1B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 37D644 E007C1B4 3C02E008 */  lui       $v0, %hi(func_E007C1F4)
-/* 37D648 E007C1B8 2442C1F4 */  addiu     $v0, $v0, %lo(func_E007C1F4)
+/* 37D644 E007C1B4 3C02E008 */  lui       $v0, %hi(fx_62_appendGfx)
+/* 37D648 E007C1B8 2442C1F4 */  addiu     $v0, $v0, %lo(fx_62_appendGfx)
 /* 37D64C E007C1BC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 37D650 E007C1C0 24020028 */  addiu     $v0, $zero, 0x28
 /* 37D654 E007C1C4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s
rename to ver/us/asm/nonmatchings/effects/effect_62/fx_62_update.s
index 59c2daaadf..404b683f7b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s
+++ b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007C130
+glabel fx_62_update
 /* 37D5C0 E007C130 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37D5C4 E007C134 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 37D5C8 E007C138 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s
rename to ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s
index 2101069fdb..19d249d04a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007E54C
+glabel fx_63_appendGfx
 /* 37FC6C E007E54C 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 37FC70 E007E550 3C06DB06 */  lui       $a2, 0xdb06
 /* 37FC74 E007E554 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s
index 1e940b3de7..da8a0008b1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s
@@ -12,14 +12,14 @@ glabel fx_63_main
 /* 37F73C E007E01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 37F740 E007E020 F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 37F744 E007E024 4487C000 */  mtc1      $a3, $f24
-/* 37F748 E007E028 3C02E008 */  lui       $v0, %hi(func_E007E1FC)
-/* 37F74C E007E02C 2442E1FC */  addiu     $v0, $v0, %lo(func_E007E1FC)
+/* 37F748 E007E028 3C02E008 */  lui       $v0, %hi(fx_63_init)
+/* 37F74C E007E02C 2442E1FC */  addiu     $v0, $v0, %lo(fx_63_init)
 /* 37F750 E007E030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 37F754 E007E034 3C02E008 */  lui       $v0, %hi(func_E007E204)
-/* 37F758 E007E038 2442E204 */  addiu     $v0, $v0, %lo(func_E007E204)
+/* 37F754 E007E034 3C02E008 */  lui       $v0, %hi(fx_63_update)
+/* 37F758 E007E038 2442E204 */  addiu     $v0, $v0, %lo(fx_63_update)
 /* 37F75C E007E03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 37F760 E007E040 3C02E008 */  lui       $v0, %hi(func_E007E508)
-/* 37F764 E007E044 2442E508 */  addiu     $v0, $v0, %lo(func_E007E508)
+/* 37F760 E007E040 3C02E008 */  lui       $v0, %hi(fx_63_render)
+/* 37F764 E007E044 2442E508 */  addiu     $v0, $v0, %lo(fx_63_render)
 /* 37F768 E007E048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 37F76C E007E04C 2402003F */  addiu     $v0, $zero, 0x3f
 /* 37F770 E007E050 AFBF0048 */  sw        $ra, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s
rename to ver/us/asm/nonmatchings/effects/effect_63/fx_63_render.s
index d36989d971..0bc2bfc4ed 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007E508
+glabel fx_63_render
 /* 37FC28 E007E508 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 37FC2C E007E50C 3C02E008 */  lui       $v0, %hi(func_E007E54C)
-/* 37FC30 E007E510 2442E54C */  addiu     $v0, $v0, %lo(func_E007E54C)
+/* 37FC2C E007E50C 3C02E008 */  lui       $v0, %hi(fx_63_appendGfx)
+/* 37FC30 E007E510 2442E54C */  addiu     $v0, $v0, %lo(fx_63_appendGfx)
 /* 37FC34 E007E514 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 37FC38 E007E518 2402002D */  addiu     $v0, $zero, 0x2d
 /* 37FC3C E007E51C AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s
rename to ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s
index e2244fcb6a..95cdb910f5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E007E204
+glabel fx_63_update
 /* 37F924 E007E204 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 37F928 E007E208 AFB1001C */  sw        $s1, 0x1c($sp)
 /* 37F92C E007E20C 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s b/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s
index 68c4c5a5ad..e70a19d6d3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s
@@ -14,14 +14,14 @@ glabel fx_64_main
 /* 3812E4 E0080024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3812E8 E0080028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3812EC E008002C 8FB00068 */  lw        $s0, 0x68($sp)
-/* 3812F0 E0080030 3C02E008 */  lui       $v0, %hi(func_E00801C8)
-/* 3812F4 E0080034 244201C8 */  addiu     $v0, $v0, %lo(func_E00801C8)
+/* 3812F0 E0080030 3C02E008 */  lui       $v0, %hi(fx_64_init)
+/* 3812F4 E0080034 244201C8 */  addiu     $v0, $v0, %lo(fx_64_init)
 /* 3812F8 E0080038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3812FC E008003C 3C02E008 */  lui       $v0, %hi(func_E00801D0)
-/* 381300 E0080040 244201D0 */  addiu     $v0, $v0, %lo(func_E00801D0)
+/* 3812FC E008003C 3C02E008 */  lui       $v0, %hi(fx_64_update)
+/* 381300 E0080040 244201D0 */  addiu     $v0, $v0, %lo(fx_64_update)
 /* 381304 E0080044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 381308 E0080048 3C02E008 */  lui       $v0, %hi(func_E0080424)
-/* 38130C E008004C 24420424 */  addiu     $v0, $v0, %lo(func_E0080424)
+/* 381308 E0080048 3C02E008 */  lui       $v0, %hi(fx_64_render)
+/* 38130C E008004C 24420424 */  addiu     $v0, $v0, %lo(fx_64_render)
 /* 381310 E0080050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 381314 E0080054 3C02E008 */  lui       $v0, %hi(func_E008042C)
 /* 381318 E0080058 2442042C */  addiu     $v0, $v0, %lo(func_E008042C)
diff --git a/ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s b/ver/us/asm/nonmatchings/effects/effect_64/fx_64_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s
rename to ver/us/asm/nonmatchings/effects/effect_64/fx_64_update.s
index 9c82b2410f..5cb1044606 100644
--- a/ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_64/fx_64_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00801D0
+glabel fx_64_update
 /* 381490 E00801D0 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 381494 E00801D4 AFB50024 */  sw        $s5, 0x24($sp)
 /* 381498 E00801D8 0080A82D */  daddu     $s5, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s
index 46402aef38..930effb1b8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s
@@ -12,14 +12,14 @@ glabel fx_65_main
 /* 38565C E008201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 385660 E0082020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 385664 E0082024 4487C000 */  mtc1      $a3, $f24
-/* 385668 E0082028 3C02E008 */  lui       $v0, %hi(func_E00821B0)
-/* 38566C E008202C 244221B0 */  addiu     $v0, $v0, %lo(func_E00821B0)
+/* 385668 E0082028 3C02E008 */  lui       $v0, %hi(fx_65_init)
+/* 38566C E008202C 244221B0 */  addiu     $v0, $v0, %lo(fx_65_init)
 /* 385670 E0082030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 385674 E0082034 3C02E008 */  lui       $v0, %hi(func_E00821B8)
-/* 385678 E0082038 244221B8 */  addiu     $v0, $v0, %lo(func_E00821B8)
+/* 385674 E0082034 3C02E008 */  lui       $v0, %hi(fx_65_update)
+/* 385678 E0082038 244221B8 */  addiu     $v0, $v0, %lo(fx_65_update)
 /* 38567C E008203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 385680 E0082040 3C02E008 */  lui       $v0, %hi(func_E0082520)
-/* 385684 E0082044 24422520 */  addiu     $v0, $v0, %lo(func_E0082520)
+/* 385680 E0082040 3C02E008 */  lui       $v0, %hi(fx_65_render)
+/* 385684 E0082044 24422520 */  addiu     $v0, $v0, %lo(fx_65_render)
 /* 385688 E0082048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38568C E008204C 3C02E008 */  lui       $v0, %hi(func_E0082528)
 /* 385690 E0082050 24422528 */  addiu     $v0, $v0, %lo(func_E0082528)
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s
rename to ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s
index 621dc4785c..cca746d8bd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00821B8
+glabel fx_65_update
 /* 3857F8 E00821B8 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3857FC E00821BC AFB40028 */  sw        $s4, 0x28($sp)
 /* 385800 E00821C0 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s
rename to ver/us/asm/nonmatchings/effects/effect_66/fx_66_appendGfx.s
index 74ce63f416..1657abc05e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s
+++ b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0084928
+glabel fx_66_appendGfx
 /* 3892F8 E0084928 27BDFF58 */  addiu     $sp, $sp, -0xa8
 /* 3892FC E008492C 3C06DB06 */  lui       $a2, 0xdb06
 /* 389300 E0084930 AFA400A8 */  sw        $a0, 0xa8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s
index 7504589400..1252a4a645 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s
@@ -91,15 +91,15 @@ glabel fx_66_main
 /* 388BA4 E00841D4 46201082 */  mul.d     $f2, $f2, $f0
 /* 388BA8 E00841D8 00000000 */  nop
 /* 388BAC E00841DC 0200202D */  daddu     $a0, $s0, $zero
-/* 388BB0 E00841E0 3C02E008 */  lui       $v0, %hi(func_E0084658)
-/* 388BB4 E00841E4 24424658 */  addiu     $v0, $v0, %lo(func_E0084658)
+/* 388BB0 E00841E0 3C02E008 */  lui       $v0, %hi(fx_66_init)
+/* 388BB4 E00841E4 24424658 */  addiu     $v0, $v0, %lo(fx_66_init)
 /* 388BB8 E00841E8 AFA20028 */  sw        $v0, 0x28($sp)
 /* 388BBC E00841EC 02530018 */  mult      $s2, $s3
-/* 388BC0 E00841F0 3C02E008 */  lui       $v0, %hi(func_E0084660)
-/* 388BC4 E00841F4 24424660 */  addiu     $v0, $v0, %lo(func_E0084660)
+/* 388BC0 E00841F0 3C02E008 */  lui       $v0, %hi(fx_66_update)
+/* 388BC4 E00841F4 24424660 */  addiu     $v0, $v0, %lo(fx_66_update)
 /* 388BC8 E00841F8 AFA2002C */  sw        $v0, 0x2c($sp)
-/* 388BCC E00841FC 3C02E008 */  lui       $v0, %hi(func_E00848E4)
-/* 388BD0 E0084200 244248E4 */  addiu     $v0, $v0, %lo(func_E00848E4)
+/* 388BCC E00841FC 3C02E008 */  lui       $v0, %hi(fx_66_render)
+/* 388BD0 E0084200 244248E4 */  addiu     $v0, $v0, %lo(fx_66_render)
 /* 388BD4 E0084204 AFA20030 */  sw        $v0, 0x30($sp)
 /* 388BD8 E0084208 00004012 */  mflo      $t0
 /* 388BDC E008420C 24020042 */  addiu     $v0, $zero, 0x42
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s
rename to ver/us/asm/nonmatchings/effects/effect_66/fx_66_render.s
index 5f8efb1a8d..8b952ec91e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00848E4
+glabel fx_66_render
 /* 3892B4 E00848E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3892B8 E00848E8 3C02E008 */  lui       $v0, %hi(func_E0084928)
-/* 3892BC E00848EC 24424928 */  addiu     $v0, $v0, %lo(func_E0084928)
+/* 3892B8 E00848E8 3C02E008 */  lui       $v0, %hi(fx_66_appendGfx)
+/* 3892BC E00848EC 24424928 */  addiu     $v0, $v0, %lo(fx_66_appendGfx)
 /* 3892C0 E00848F0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3892C4 E00848F4 24020028 */  addiu     $v0, $zero, 0x28
 /* 3892C8 E00848F8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s
rename to ver/us/asm/nonmatchings/effects/effect_66/fx_66_update.s
index 6b30d9a644..949027b3f2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s
+++ b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0084660
+glabel fx_66_update
 /* 389030 E0084660 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 389034 E0084664 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 389038 E0084668 F7B80028 */  sdc1      $f24, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s b/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s
index e118ed1ffd..4270d0ac97 100644
--- a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s
@@ -15,14 +15,14 @@ glabel fx_67_main
 /* 389878 E0086028 F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 38987C E008602C 4487C000 */  mtc1      $a3, $f24
 /* 389880 E0086030 8FA3007C */  lw        $v1, 0x7c($sp)
-/* 389884 E0086034 3C02E008 */  lui       $v0, %hi(func_E0086270)
-/* 389888 E0086038 24426270 */  addiu     $v0, $v0, %lo(func_E0086270)
+/* 389884 E0086034 3C02E008 */  lui       $v0, %hi(fx_67_init)
+/* 389888 E0086038 24426270 */  addiu     $v0, $v0, %lo(fx_67_init)
 /* 38988C E008603C AFA20018 */  sw        $v0, 0x18($sp)
-/* 389890 E0086040 3C02E008 */  lui       $v0, %hi(func_E0086278)
-/* 389894 E0086044 24426278 */  addiu     $v0, $v0, %lo(func_E0086278)
+/* 389890 E0086040 3C02E008 */  lui       $v0, %hi(fx_67_update)
+/* 389894 E0086044 24426278 */  addiu     $v0, $v0, %lo(fx_67_update)
 /* 389898 E0086048 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38989C E008604C 3C02E008 */  lui       $v0, %hi(func_E0086390)
-/* 3898A0 E0086050 24426390 */  addiu     $v0, $v0, %lo(func_E0086390)
+/* 38989C E008604C 3C02E008 */  lui       $v0, %hi(fx_67_render)
+/* 3898A0 E0086050 24426390 */  addiu     $v0, $v0, %lo(fx_67_render)
 /* 3898A4 E0086054 AFBF0048 */  sw        $ra, 0x48($sp)
 /* 3898A8 E0086058 AFB70044 */  sw        $s7, 0x44($sp)
 /* 3898AC E008605C AFB60040 */  sw        $s6, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s b/ver/us/asm/nonmatchings/effects/effect_67/fx_67_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s
rename to ver/us/asm/nonmatchings/effects/effect_67/fx_67_update.s
index b78ba21757..c86144f640 100644
--- a/ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s
+++ b/ver/us/asm/nonmatchings/effects/effect_67/fx_67_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0086278
+glabel fx_67_update
 /* 389AC8 E0086278 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 389ACC E008627C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 389AD0 E0086280 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s
rename to ver/us/asm/nonmatchings/effects/effect_68/fx_68_appendGfx.s
index 0637691515..50b51ce6c4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00887E0
+glabel fx_68_appendGfx
 /* 38B5D0 E00887E0 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 38B5D4 E00887E4 0080382D */  daddu     $a3, $a0, $zero
 /* 38B5D8 E00887E8 3C08DB06 */  lui       $t0, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s
index 581d4688a3..e60faaaa74 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s
@@ -68,14 +68,14 @@ glabel LE0088250_38B040
 /* 38B048 E0088258 00000000 */  nop
 /* 38B04C E008825C E7B00028 */  swc1      $f16, 0x28($sp)
 .LE0088260:
-/* 38B050 E0088260 3C02E009 */  lui       $v0, %hi(func_E00885A0)
-/* 38B054 E0088264 244285A0 */  addiu     $v0, $v0, %lo(func_E00885A0)
+/* 38B050 E0088260 3C02E009 */  lui       $v0, %hi(fx_68_init)
+/* 38B054 E0088264 244285A0 */  addiu     $v0, $v0, %lo(fx_68_init)
 /* 38B058 E0088268 AC820008 */  sw        $v0, 8($a0)
-/* 38B05C E008826C 3C02E009 */  lui       $v0, %hi(func_E00885A8)
-/* 38B060 E0088270 244285A8 */  addiu     $v0, $v0, %lo(func_E00885A8)
+/* 38B05C E008826C 3C02E009 */  lui       $v0, %hi(fx_68_update)
+/* 38B060 E0088270 244285A8 */  addiu     $v0, $v0, %lo(fx_68_update)
 /* 38B064 E0088274 AC82000C */  sw        $v0, 0xc($a0)
-/* 38B068 E0088278 3C02E009 */  lui       $v0, %hi(func_E00887A8)
-/* 38B06C E008827C 244287A8 */  addiu     $v0, $v0, %lo(func_E00887A8)
+/* 38B068 E0088278 3C02E009 */  lui       $v0, %hi(fx_68_render)
+/* 38B06C E008827C 244287A8 */  addiu     $v0, $v0, %lo(fx_68_render)
 /* 38B070 E0088280 AC820010 */  sw        $v0, 0x10($a0)
 /* 38B074 E0088284 24020044 */  addiu     $v0, $zero, 0x44
 /* 38B078 E0088288 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_render.s
similarity index 82%
rename from ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s
rename to ver/us/asm/nonmatchings/effects/effect_68/fx_68_render.s
index 58f9b05afe..a14688a604 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00887A8
+glabel fx_68_render
 /* 38B598 E00887A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 38B59C E00887AC 3C02E009 */  lui       $v0, %hi(func_E00887E0)
-/* 38B5A0 E00887B0 244287E0 */  addiu     $v0, $v0, %lo(func_E00887E0)
+/* 38B59C E00887AC 3C02E009 */  lui       $v0, %hi(fx_68_appendGfx)
+/* 38B5A0 E00887B0 244287E0 */  addiu     $v0, $v0, %lo(fx_68_appendGfx)
 /* 38B5A4 E00887B4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 38B5A8 E00887B8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 38B5AC E00887BC AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s
rename to ver/us/asm/nonmatchings/effects/effect_68/fx_68_update.s
index 7b2414c646..ce6ddd19bf 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00885A8
+glabel fx_68_update
 /* 38B398 E00885A8 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 38B39C E00885AC AFBF0028 */  sw        $ra, 0x28($sp)
 /* 38B3A0 E00885B0 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s
rename to ver/us/asm/nonmatchings/effects/effect_69/fx_69_appendGfx.s
index 23dbcb7655..53b92c36d7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s
+++ b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008A728
+glabel fx_69_appendGfx
 /* 38CD18 E008A728 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 38CD1C E008A72C AFB1006C */  sw        $s1, 0x6c($sp)
 /* 38CD20 E008A730 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s
index b239efe64e..36b5159134 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s
@@ -8,14 +8,14 @@ glabel fx_69_main
 /* 38C784 E008A194 AFB30034 */  sw        $s3, 0x34($sp)
 /* 38C788 E008A198 00A0982D */  daddu     $s3, $a1, $zero
 /* 38C78C E008A19C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38C790 E008A1A0 3C02E009 */  lui       $v0, %hi(func_E008A288)
-/* 38C794 E008A1A4 2442A288 */  addiu     $v0, $v0, %lo(func_E008A288)
+/* 38C790 E008A1A0 3C02E009 */  lui       $v0, %hi(fx_69_init)
+/* 38C794 E008A1A4 2442A288 */  addiu     $v0, $v0, %lo(fx_69_init)
 /* 38C798 E008A1A8 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38C79C E008A1AC 3C02E009 */  lui       $v0, %hi(func_E008A53C)
-/* 38C7A0 E008A1B0 2442A53C */  addiu     $v0, $v0, %lo(func_E008A53C)
+/* 38C79C E008A1AC 3C02E009 */  lui       $v0, %hi(fx_69_update)
+/* 38C7A0 E008A1B0 2442A53C */  addiu     $v0, $v0, %lo(fx_69_update)
 /* 38C7A4 E008A1B4 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38C7A8 E008A1B8 3C02E009 */  lui       $v0, %hi(func_E008A6E4)
-/* 38C7AC E008A1BC 2442A6E4 */  addiu     $v0, $v0, %lo(func_E008A6E4)
+/* 38C7A8 E008A1B8 3C02E009 */  lui       $v0, %hi(fx_69_render)
+/* 38C7AC E008A1BC 2442A6E4 */  addiu     $v0, $v0, %lo(fx_69_render)
 /* 38C7B0 E008A1C0 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38C7B4 E008A1C4 24020045 */  addiu     $v0, $zero, 0x45
 /* 38C7B8 E008A1C8 AFB00028 */  sw        $s0, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s
rename to ver/us/asm/nonmatchings/effects/effect_69/fx_69_render.s
index d22d66ebbe..b6d78f4567 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008A6E4
+glabel fx_69_render
 /* 38CCD4 E008A6E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 38CCD8 E008A6E8 3C02E009 */  lui       $v0, %hi(func_E008A728)
-/* 38CCDC E008A6EC 2442A728 */  addiu     $v0, $v0, %lo(func_E008A728)
+/* 38CCD8 E008A6E8 3C02E009 */  lui       $v0, %hi(fx_69_appendGfx)
+/* 38CCDC E008A6EC 2442A728 */  addiu     $v0, $v0, %lo(fx_69_appendGfx)
 /* 38CCE0 E008A6F0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 38CCE4 E008A6F4 2402002D */  addiu     $v0, $zero, 0x2d
 /* 38CCE8 E008A6F8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s
rename to ver/us/asm/nonmatchings/effects/effect_69/fx_69_update.s
index cfbd5cc32c..6aaba6f1fb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008A53C
+glabel fx_69_update
 /* 38CB2C E008A53C 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 38CB30 E008A540 0080282D */  daddu     $a1, $a0, $zero
 /* 38CB34 E008A544 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s
rename to ver/us/asm/nonmatchings/effects/effect_70/fx_70_appendGfx.s
index 1918eaecd4..582e81c8c9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008C6FC
+glabel fx_70_appendGfx
 /* 38E4FC E008C6FC 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 38E500 E008C700 AFBE00C8 */  sw        $fp, 0xc8($sp)
 /* 38E504 E008C704 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s
index a919d2b3d0..f299f63b6b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s
@@ -9,14 +9,14 @@ glabel fx_70_main
 /* 38DE10 E008C010 27A40010 */  addiu     $a0, $sp, 0x10
 /* 38DE14 E008C014 F7B40060 */  sdc1      $f20, 0x60($sp)
 /* 38DE18 E008C018 4486A000 */  mtc1      $a2, $f20
-/* 38DE1C E008C01C 3C02E009 */  lui       $v0, %hi(func_E008C3F4)
-/* 38DE20 E008C020 2442C3F4 */  addiu     $v0, $v0, %lo(func_E008C3F4)
+/* 38DE1C E008C01C 3C02E009 */  lui       $v0, %hi(fx_70_init)
+/* 38DE20 E008C020 2442C3F4 */  addiu     $v0, $v0, %lo(fx_70_init)
 /* 38DE24 E008C024 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38DE28 E008C028 3C02E009 */  lui       $v0, %hi(func_E008C3FC)
-/* 38DE2C E008C02C 2442C3FC */  addiu     $v0, $v0, %lo(func_E008C3FC)
+/* 38DE28 E008C028 3C02E009 */  lui       $v0, %hi(fx_70_update)
+/* 38DE2C E008C02C 2442C3FC */  addiu     $v0, $v0, %lo(fx_70_update)
 /* 38DE30 E008C030 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38DE34 E008C034 3C02E009 */  lui       $v0, %hi(func_E008C6B8)
-/* 38DE38 E008C038 2442C6B8 */  addiu     $v0, $v0, %lo(func_E008C6B8)
+/* 38DE34 E008C034 3C02E009 */  lui       $v0, %hi(fx_70_render)
+/* 38DE38 E008C038 2442C6B8 */  addiu     $v0, $v0, %lo(fx_70_render)
 /* 38DE3C E008C03C AFA20020 */  sw        $v0, 0x20($sp)
 /* 38DE40 E008C040 24020046 */  addiu     $v0, $zero, 0x46
 /* 38DE44 E008C044 AFBF005C */  sw        $ra, 0x5c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s
rename to ver/us/asm/nonmatchings/effects/effect_70/fx_70_render.s
index bf3fd8f8c9..3a4b4b60ea 100644
--- a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008C6B8
+glabel fx_70_render
 /* 38E4B8 E008C6B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 38E4BC E008C6BC 3C02E009 */  lui       $v0, %hi(func_E008C6FC)
-/* 38E4C0 E008C6C0 2442C6FC */  addiu     $v0, $v0, %lo(func_E008C6FC)
+/* 38E4BC E008C6BC 3C02E009 */  lui       $v0, %hi(fx_70_appendGfx)
+/* 38E4C0 E008C6C0 2442C6FC */  addiu     $v0, $v0, %lo(fx_70_appendGfx)
 /* 38E4C4 E008C6C4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 38E4C8 E008C6C8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 38E4CC E008C6CC AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s
rename to ver/us/asm/nonmatchings/effects/effect_70/fx_70_update.s
index eb3f8ecc17..5145a8afe3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008C3FC
+glabel fx_70_update
 /* 38E1FC E008C3FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 38E200 E008C400 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 38E204 E008C404 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s
rename to ver/us/asm/nonmatchings/effects/effect_71/fx_71_appendGfx.s
index cd8bdebd47..defa70d5fe 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008E4E0
+glabel fx_71_appendGfx
 /* 38F340 E008E4E0 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 38F344 E008E4E4 3C05DB06 */  lui       $a1, 0xdb06
 /* 38F348 E008E4E8 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s
index 964d8119ee..64805c47ce 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s
@@ -14,14 +14,14 @@ glabel fx_71_main
 /* 38EE84 E008E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 38EE88 E008E028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 38EE8C E008E02C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 38EE90 E008E030 3C02E009 */  lui       $v0, %hi(func_E008E1FC)
-/* 38EE94 E008E034 2442E1FC */  addiu     $v0, $v0, %lo(func_E008E1FC)
+/* 38EE90 E008E030 3C02E009 */  lui       $v0, %hi(fx_71_init)
+/* 38EE94 E008E034 2442E1FC */  addiu     $v0, $v0, %lo(fx_71_init)
 /* 38EE98 E008E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38EE9C E008E03C 3C02E009 */  lui       $v0, %hi(func_E008E204)
-/* 38EEA0 E008E040 2442E204 */  addiu     $v0, $v0, %lo(func_E008E204)
+/* 38EE9C E008E03C 3C02E009 */  lui       $v0, %hi(fx_71_update)
+/* 38EEA0 E008E040 2442E204 */  addiu     $v0, $v0, %lo(fx_71_update)
 /* 38EEA4 E008E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38EEA8 E008E048 3C02E009 */  lui       $v0, %hi(func_E008E498)
-/* 38EEAC E008E04C 2442E498 */  addiu     $v0, $v0, %lo(func_E008E498)
+/* 38EEA8 E008E048 3C02E009 */  lui       $v0, %hi(fx_71_render)
+/* 38EEAC E008E04C 2442E498 */  addiu     $v0, $v0, %lo(fx_71_render)
 /* 38EEB0 E008E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38EEB4 E008E054 24020047 */  addiu     $v0, $zero, 0x47
 /* 38EEB8 E008E058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s
rename to ver/us/asm/nonmatchings/effects/effect_71/fx_71_render.s
index f056e9c226..29843df6bc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s
+++ b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008E498
+glabel fx_71_render
 /* 38F2F8 E008E498 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 38F2FC E008E49C 3C02E009 */  lui       $v0, %hi(func_E008E4E0)
-/* 38F300 E008E4A0 2442E4E0 */  addiu     $v0, $v0, %lo(func_E008E4E0)
+/* 38F2FC E008E49C 3C02E009 */  lui       $v0, %hi(fx_71_appendGfx)
+/* 38F300 E008E4A0 2442E4E0 */  addiu     $v0, $v0, %lo(fx_71_appendGfx)
 /* 38F304 E008E4A4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 38F308 E008E4A8 2402000A */  addiu     $v0, $zero, 0xa
 /* 38F30C E008E4AC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s
rename to ver/us/asm/nonmatchings/effects/effect_71/fx_71_update.s
index f139421d5f..a1baf0ab19 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s
+++ b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E008E204
+glabel fx_71_update
 /* 38F064 E008E204 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 38F068 E008E208 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 38F06C E008E20C 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s b/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s
index 475140a02b..ceb2844d06 100644
--- a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s
@@ -16,14 +16,14 @@ glabel fx_72_main
 /* 38F92C E009002C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 38F930 E0090030 AFB30034 */  sw        $s3, 0x34($sp)
 /* 38F934 E0090034 8FB3007C */  lw        $s3, 0x7c($sp)
-/* 38F938 E0090038 3C02E009 */  lui       $v0, %hi(func_E00901C0)
-/* 38F93C E009003C 244201C0 */  addiu     $v0, $v0, %lo(func_E00901C0)
+/* 38F938 E0090038 3C02E009 */  lui       $v0, %hi(fx_72_init)
+/* 38F93C E009003C 244201C0 */  addiu     $v0, $v0, %lo(fx_72_init)
 /* 38F940 E0090040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38F944 E0090044 3C02E009 */  lui       $v0, %hi(func_E00901C8)
-/* 38F948 E0090048 244201C8 */  addiu     $v0, $v0, %lo(func_E00901C8)
+/* 38F944 E0090044 3C02E009 */  lui       $v0, %hi(fx_72_update)
+/* 38F948 E0090048 244201C8 */  addiu     $v0, $v0, %lo(fx_72_update)
 /* 38F94C E009004C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38F950 E0090050 3C02E009 */  lui       $v0, %hi(func_E0090420)
-/* 38F954 E0090054 24420420 */  addiu     $v0, $v0, %lo(func_E0090420)
+/* 38F950 E0090050 3C02E009 */  lui       $v0, %hi(fx_72_render)
+/* 38F954 E0090054 24420420 */  addiu     $v0, $v0, %lo(fx_72_render)
 /* 38F958 E0090058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38F95C E009005C 3C02E009 */  lui       $v0, %hi(func_E0090428)
 /* 38F960 E0090060 24420428 */  addiu     $v0, $v0, %lo(func_E0090428)
diff --git a/ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s b/ver/us/asm/nonmatchings/effects/effect_72/fx_72_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s
rename to ver/us/asm/nonmatchings/effects/effect_72/fx_72_update.s
index 4df5f7c8ec..237bb6b323 100644
--- a/ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_72/fx_72_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00901C8
+glabel fx_72_update
 /* 38FAC8 E00901C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 38FACC E00901CC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 38FAD0 E00901D0 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s b/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s
deleted file mode 100644
index 9a813251cd..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E00921B4
-/* 391EE4 E00921B4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 391EE8 E00921B8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 391EEC E00921BC 8C85000C */  lw        $a1, 0xc($a0)
-/* 391EF0 E00921C0 8CA20014 */  lw        $v0, 0x14($a1)
-/* 391EF4 E00921C4 2442FFFF */  addiu     $v0, $v0, -1
-/* 391EF8 E00921C8 ACA20014 */  sw        $v0, 0x14($a1)
-/* 391EFC E00921CC 8CA20018 */  lw        $v0, 0x18($a1)
-/* 391F00 E00921D0 8CA30014 */  lw        $v1, 0x14($a1)
-/* 391F04 E00921D4 24420001 */  addiu     $v0, $v0, 1
-/* 391F08 E00921D8 04610005 */  bgez      $v1, .LE00921F0
-/* 391F0C E00921DC ACA20018 */   sw       $v0, 0x18($a1)
-/* 391F10 E00921E0 0C080128 */  jal       shim_remove_effect
-/* 391F14 E00921E4 00000000 */   nop
-/* 391F18 E00921E8 08024893 */  j         .LE009224C
-/* 391F1C E00921EC 00000000 */   nop
-.LE00921F0:
-/* 391F20 E00921F0 8C820008 */  lw        $v0, 8($a0)
-/* 391F24 E00921F4 24060001 */  addiu     $a2, $zero, 1
-/* 391F28 E00921F8 00C2102A */  slt       $v0, $a2, $v0
-/* 391F2C E00921FC 10400013 */  beqz      $v0, .LE009224C
-/* 391F30 E0092200 24A50024 */   addiu    $a1, $a1, 0x24
-/* 391F34 E0092204 2407FFFF */  addiu     $a3, $zero, -1
-/* 391F38 E0092208 24A30020 */  addiu     $v1, $a1, 0x20
-.LE009220C:
-/* 391F3C E009220C 8C620000 */  lw        $v0, ($v1)
-/* 391F40 E0092210 18400003 */  blez      $v0, .LE0092220
-/* 391F44 E0092214 2442FFFF */   addiu    $v0, $v0, -1
-/* 391F48 E0092218 1C400007 */  bgtz      $v0, .LE0092238
-/* 391F4C E009221C AC620000 */   sw       $v0, ($v1)
-.LE0092220:
-/* 391F50 E0092220 8C62FFE4 */  lw        $v0, -0x1c($v1)
-/* 391F54 E0092224 24420001 */  addiu     $v0, $v0, 1
-/* 391F58 E0092228 AC62FFE4 */  sw        $v0, -0x1c($v1)
-/* 391F5C E009222C 2842000A */  slti      $v0, $v0, 0xa
-/* 391F60 E0092230 50400001 */  beql      $v0, $zero, .LE0092238
-/* 391F64 E0092234 AC670000 */   sw       $a3, ($v1)
-.LE0092238:
-/* 391F68 E0092238 24C60001 */  addiu     $a2, $a2, 1
-/* 391F6C E009223C 8C820008 */  lw        $v0, 8($a0)
-/* 391F70 E0092240 00C2102A */  slt       $v0, $a2, $v0
-/* 391F74 E0092244 1440FFF1 */  bnez      $v0, .LE009220C
-/* 391F78 E0092248 24630024 */   addiu    $v1, $v1, 0x24
-.LE009224C:
-/* 391F7C E009224C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 391F80 E0092250 03E00008 */  jr        $ra
-/* 391F84 E0092254 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s b/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s
deleted file mode 100644
index 90d85b2a65..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E0092258
-/* 391F88 E0092258 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 391F8C E009225C 3C02E009 */  lui       $v0, %hi(func_E00922A0)
-/* 391F90 E0092260 244222A0 */  addiu     $v0, $v0, %lo(func_E00922A0)
-/* 391F94 E0092264 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 391F98 E0092268 2402000A */  addiu     $v0, $zero, 0xa
-/* 391F9C E009226C AFA20014 */  sw        $v0, 0x14($sp)
-/* 391FA0 E0092270 2402002D */  addiu     $v0, $zero, 0x2d
-/* 391FA4 E0092274 AFA40018 */  sw        $a0, 0x18($sp)
-/* 391FA8 E0092278 27A40010 */  addiu     $a0, $sp, 0x10
-/* 391FAC E009227C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 391FB0 E0092280 0C080120 */  jal       shim_queue_render_task
-/* 391FB4 E0092284 AFA20010 */   sw       $v0, 0x10($sp)
-/* 391FB8 E0092288 8C430000 */  lw        $v1, ($v0)
-/* 391FBC E009228C 34630002 */  ori       $v1, $v1, 2
-/* 391FC0 E0092290 AC430000 */  sw        $v1, ($v0)
-/* 391FC4 E0092294 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 391FC8 E0092298 03E00008 */  jr        $ra
-/* 391FCC E009229C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s b/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s
deleted file mode 100644
index fba066231a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s
+++ /dev/null
@@ -1,260 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E00922A0
-/* 391FD0 E00922A0 44800000 */  mtc1      $zero, $f0
-/* 391FD4 E00922A4 27BDFEE8 */  addiu     $sp, $sp, -0x118
-/* 391FD8 E00922A8 AFB000E0 */  sw        $s0, 0xe0($sp)
-/* 391FDC E00922AC 27B00098 */  addiu     $s0, $sp, 0x98
-/* 391FE0 E00922B0 AFA40118 */  sw        $a0, 0x118($sp)
-/* 391FE4 E00922B4 8FA90118 */  lw        $t1, 0x118($sp)
-/* 391FE8 E00922B8 0200202D */  daddu     $a0, $s0, $zero
-/* 391FEC E00922BC AFB100E4 */  sw        $s1, 0xe4($sp)
-/* 391FF0 E00922C0 3C110001 */  lui       $s1, 1
-/* 391FF4 E00922C4 F7B40108 */  sdc1      $f20, 0x108($sp)
-/* 391FF8 E00922C8 3C013F80 */  lui       $at, 0x3f80
-/* 391FFC E00922CC 4481A000 */  mtc1      $at, $f20
-/* 392000 E00922D0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 392004 E00922D4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 392008 E00922D8 36311630 */  ori       $s1, $s1, 0x1630
-/* 39200C E00922DC AFBF0104 */  sw        $ra, 0x104($sp)
-/* 392010 E00922E0 AFBE0100 */  sw        $fp, 0x100($sp)
-/* 392014 E00922E4 AFB700FC */  sw        $s7, 0xfc($sp)
-/* 392018 E00922E8 AFB600F8 */  sw        $s6, 0xf8($sp)
-/* 39201C E00922EC AFB500F4 */  sw        $s5, 0xf4($sp)
-/* 392020 E00922F0 AFB400F0 */  sw        $s4, 0xf0($sp)
-/* 392024 E00922F4 AFB300EC */  sw        $s3, 0xec($sp)
-/* 392028 E00922F8 AFB200E8 */  sw        $s2, 0xe8($sp)
-/* 39202C E00922FC F7B60110 */  sdc1      $f22, 0x110($sp)
-/* 392030 E0092300 00031080 */  sll       $v0, $v1, 2
-/* 392034 E0092304 00431021 */  addu      $v0, $v0, $v1
-/* 392038 E0092308 00021080 */  sll       $v0, $v0, 2
-/* 39203C E009230C 00431023 */  subu      $v0, $v0, $v1
-/* 392040 E0092310 000218C0 */  sll       $v1, $v0, 3
-/* 392044 E0092314 00431021 */  addu      $v0, $v0, $v1
-/* 392048 E0092318 000210C0 */  sll       $v0, $v0, 3
-/* 39204C E009231C 8D34000C */  lw        $s4, 0xc($t1)
-/* 392050 E0092320 44060000 */  mfc1      $a2, $f0
-/* 392054 E0092324 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 392058 E0092328 00220821 */  addu      $at, $at, $v0
-/* 39205C E009232C C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* 392060 E0092330 4407A000 */  mfc1      $a3, $f20
-/* 392064 E0092334 46000007 */  neg.s     $f0, $f0
-/* 392068 E0092338 44050000 */  mfc1      $a1, $f0
-/* 39206C E009233C 24130001 */  addiu     $s3, $zero, 1
-/* 392070 E0092340 0C080104 */  jal       shim_guRotateF
-/* 392074 E0092344 AFA60010 */   sw       $a2, 0x10($sp)
-/* 392078 E0092348 0200202D */  daddu     $a0, $s0, $zero
-/* 39207C E009234C 3C128007 */  lui       $s2, %hi(gMatrixListPos)
-/* 392080 E0092350 265241F0 */  addiu     $s2, $s2, %lo(gMatrixListPos)
-/* 392084 E0092354 3C16800A */  lui       $s6, %hi(gDisplayContext)
-/* 392088 E0092358 26D6A674 */  addiu     $s6, $s6, %lo(gDisplayContext)
-/* 39208C E009235C 96450000 */  lhu       $a1, ($s2)
-/* 392090 E0092360 8EC20000 */  lw        $v0, ($s6)
-/* 392094 E0092364 00052980 */  sll       $a1, $a1, 6
-/* 392098 E0092368 00B12821 */  addu      $a1, $a1, $s1
-/* 39209C E009236C 0C080118 */  jal       shim_guMtxF2L
-/* 3920A0 E0092370 00452821 */   addu     $a1, $v0, $a1
-/* 3920A4 E0092374 3C06DB06 */  lui       $a2, 0xdb06
-/* 3920A8 E0092378 34C60024 */  ori       $a2, $a2, 0x24
-/* 3920AC E009237C 3C10800A */  lui       $s0, %hi(gMasterGfxPos)
-/* 3920B0 E0092380 2610A66C */  addiu     $s0, $s0, %lo(gMasterGfxPos)
-/* 3920B4 E0092384 27A40018 */  addiu     $a0, $sp, 0x18
-/* 3920B8 E0092388 8E050000 */  lw        $a1, ($s0)
-/* 3920BC E009238C 96480000 */  lhu       $t0, ($s2)
-/* 3920C0 E0092390 00A0182D */  daddu     $v1, $a1, $zero
-/* 3920C4 E0092394 24A50008 */  addiu     $a1, $a1, 8
-/* 3920C8 E0092398 01131021 */  addu      $v0, $t0, $s3
-/* 3920CC E009239C A6420000 */  sh        $v0, ($s2)
-/* 3920D0 E00923A0 3C02E700 */  lui       $v0, 0xe700
-/* 3920D4 E00923A4 AE050000 */  sw        $a1, ($s0)
-/* 3920D8 E00923A8 AC620000 */  sw        $v0, ($v1)
-/* 3920DC E00923AC 24A20008 */  addiu     $v0, $a1, 8
-/* 3920E0 E00923B0 3108FFFF */  andi      $t0, $t0, 0xffff
-/* 3920E4 E00923B4 AC600004 */  sw        $zero, 4($v1)
-/* 3920E8 E00923B8 ACA60000 */  sw        $a2, ($a1)
-/* 3920EC E00923BC 8FA90118 */  lw        $t1, 0x118($sp)
-/* 3920F0 E00923C0 00084180 */  sll       $t0, $t0, 6
-/* 3920F4 E00923C4 8D230010 */  lw        $v1, 0x10($t1)
-/* 3920F8 E00923C8 01114021 */  addu      $t0, $t0, $s1
-/* 3920FC E00923CC AE020000 */  sw        $v0, ($s0)
-/* 392100 E00923D0 8C62001C */  lw        $v0, 0x1c($v1)
-/* 392104 E00923D4 3C038000 */  lui       $v1, 0x8000
-/* 392108 E00923D8 00431021 */  addu      $v0, $v0, $v1
-/* 39210C E00923DC ACA20004 */  sw        $v0, 4($a1)
-/* 392110 E00923E0 8E850008 */  lw        $a1, 8($s4)
-/* 392114 E00923E4 8E86000C */  lw        $a2, 0xc($s4)
-/* 392118 E00923E8 8EC20000 */  lw        $v0, ($s6)
-/* 39211C E00923EC 8E870010 */  lw        $a3, 0x10($s4)
-/* 392120 E00923F0 00481021 */  addu      $v0, $v0, $t0
-/* 392124 E00923F4 0C080108 */  jal       shim_guTranslateF
-/* 392128 E00923F8 AFA200D8 */   sw       $v0, 0xd8($sp)
-/* 39212C E00923FC 27A40018 */  addiu     $a0, $sp, 0x18
-/* 392130 E0092400 96450000 */  lhu       $a1, ($s2)
-/* 392134 E0092404 8EC20000 */  lw        $v0, ($s6)
-/* 392138 E0092408 00052980 */  sll       $a1, $a1, 6
-/* 39213C E009240C 00B12821 */  addu      $a1, $a1, $s1
-/* 392140 E0092410 0C080118 */  jal       shim_guMtxF2L
-/* 392144 E0092414 00452821 */   addu     $a1, $v0, $a1
-/* 392148 E0092418 3C03DA38 */  lui       $v1, 0xda38
-/* 39214C E009241C 34630002 */  ori       $v1, $v1, 2
-/* 392150 E0092420 3C06FFFF */  lui       $a2, 0xffff
-/* 392154 E0092424 34C60FFF */  ori       $a2, $a2, 0xfff
-/* 392158 E0092428 8E040000 */  lw        $a0, ($s0)
-/* 39215C E009242C 96420000 */  lhu       $v0, ($s2)
-/* 392160 E0092430 0080282D */  daddu     $a1, $a0, $zero
-/* 392164 E0092434 24840008 */  addiu     $a0, $a0, 8
-/* 392168 E0092438 AE040000 */  sw        $a0, ($s0)
-/* 39216C E009243C ACA30000 */  sw        $v1, ($a1)
-/* 392170 E0092440 00531821 */  addu      $v1, $v0, $s3
-/* 392174 E0092444 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 392178 E0092448 00021180 */  sll       $v0, $v0, 6
-/* 39217C E009244C A6430000 */  sh        $v1, ($s2)
-/* 392180 E0092450 8EC30000 */  lw        $v1, ($s6)
-/* 392184 E0092454 00511021 */  addu      $v0, $v0, $s1
-/* 392188 E0092458 00621821 */  addu      $v1, $v1, $v0
-/* 39218C E009245C 24820008 */  addiu     $v0, $a0, 8
-/* 392190 E0092460 ACA30004 */  sw        $v1, 4($a1)
-/* 392194 E0092464 AE020000 */  sw        $v0, ($s0)
-/* 392198 E0092468 3C02DE00 */  lui       $v0, 0xde00
-/* 39219C E009246C AC820000 */  sw        $v0, ($a0)
-/* 3921A0 E0092470 3C020900 */  lui       $v0, 0x900
-/* 3921A4 E0092474 244202C0 */  addiu     $v0, $v0, 0x2c0
-/* 3921A8 E0092478 AC820004 */  sw        $v0, 4($a0)
-/* 3921AC E009247C 3C02FA00 */  lui       $v0, 0xfa00
-/* 3921B0 E0092480 AC820008 */  sw        $v0, 8($a0)
-/* 3921B4 E0092484 AC86000C */  sw        $a2, 0xc($a0)
-/* 3921B8 E0092488 8FA90118 */  lw        $t1, 0x118($sp)
-/* 3921BC E009248C 26940024 */  addiu     $s4, $s4, 0x24
-/* 3921C0 E0092490 8D220008 */  lw        $v0, 8($t1)
-/* 3921C4 E0092494 24840010 */  addiu     $a0, $a0, 0x10
-/* 3921C8 E0092498 0262102A */  slt       $v0, $s3, $v0
-/* 3921CC E009249C 1040005B */  beqz      $v0, .LE009260C
-/* 3921D0 E00924A0 AE040000 */   sw       $a0, ($s0)
-/* 3921D4 E00924A4 4600A586 */  mov.s     $f22, $f20
-/* 3921D8 E00924A8 27B50058 */  addiu     $s5, $sp, 0x58
-/* 3921DC E00924AC 02C0F02D */  daddu     $fp, $s6, $zero
-/* 3921E0 E00924B0 0240B02D */  daddu     $s6, $s2, $zero
-/* 3921E4 E00924B4 3C120001 */  lui       $s2, 1
-/* 3921E8 E00924B8 36521630 */  ori       $s2, $s2, 0x1630
-/* 3921EC E00924BC 0200882D */  daddu     $s1, $s0, $zero
-/* 3921F0 E00924C0 3C17DE00 */  lui       $s7, 0xde00
-/* 3921F4 E00924C4 26900004 */  addiu     $s0, $s4, 4
-.LE00924C8:
-/* 3921F8 E00924C8 8E02001C */  lw        $v0, 0x1c($s0)
-/* 3921FC E00924CC 14400049 */  bnez      $v0, .LE00925F4
-/* 392200 E00924D0 00000000 */   nop
-/* 392204 E00924D4 8E050004 */  lw        $a1, 4($s0)
-/* 392208 E00924D8 8E060008 */  lw        $a2, 8($s0)
-/* 39220C E00924DC 8E07000C */  lw        $a3, 0xc($s0)
-/* 392210 E00924E0 C6140018 */  lwc1      $f20, 0x18($s0)
-/* 392214 E00924E4 0C080108 */  jal       shim_guTranslateF
-/* 392218 E00924E8 27A40018 */   addiu    $a0, $sp, 0x18
-/* 39221C E00924EC 4616A032 */  c.eq.s    $f20, $f22
-/* 392220 E00924F0 00000000 */  nop
-/* 392224 E00924F4 4501000B */  bc1t      .LE0092524
-/* 392228 E00924F8 27A40018 */   addiu    $a0, $sp, 0x18
-/* 39222C E00924FC 02A0202D */  daddu     $a0, $s5, $zero
-/* 392230 E0092500 4405A000 */  mfc1      $a1, $f20
-/* 392234 E0092504 4407B000 */  mfc1      $a3, $f22
-/* 392238 E0092508 0C080110 */  jal       shim_guScaleF
-/* 39223C E009250C 00A0302D */   daddu    $a2, $a1, $zero
-/* 392240 E0092510 02A0202D */  daddu     $a0, $s5, $zero
-/* 392244 E0092514 27A50018 */  addiu     $a1, $sp, 0x18
-/* 392248 E0092518 0C080114 */  jal       shim_guMtxCatF
-/* 39224C E009251C 00A0302D */   daddu    $a2, $a1, $zero
-/* 392250 E0092520 27A40018 */  addiu     $a0, $sp, 0x18
-.LE0092524:
-/* 392254 E0092524 96C50000 */  lhu       $a1, ($s6)
-/* 392258 E0092528 8FC20000 */  lw        $v0, ($fp)
-/* 39225C E009252C 00052980 */  sll       $a1, $a1, 6
-/* 392260 E0092530 00B22821 */  addu      $a1, $a1, $s2
-/* 392264 E0092534 0C080118 */  jal       shim_guMtxF2L
-/* 392268 E0092538 00452821 */   addu     $a1, $v0, $a1
-/* 39226C E009253C 3C06DA38 */  lui       $a2, 0xda38
-/* 392270 E0092540 34C60001 */  ori       $a2, $a2, 1
-/* 392274 E0092544 3C07D838 */  lui       $a3, 0xd838
-/* 392278 E0092548 8E240000 */  lw        $a0, ($s1)
-/* 39227C E009254C 34E70002 */  ori       $a3, $a3, 2
-/* 392280 E0092550 0080282D */  daddu     $a1, $a0, $zero
-/* 392284 E0092554 24840008 */  addiu     $a0, $a0, 8
-/* 392288 E0092558 AE240000 */  sw        $a0, ($s1)
-/* 39228C E009255C 96C20000 */  lhu       $v0, ($s6)
-/* 392290 E0092560 3C03DA38 */  lui       $v1, 0xda38
-/* 392294 E0092564 ACA30000 */  sw        $v1, ($a1)
-/* 392298 E0092568 24430001 */  addiu     $v1, $v0, 1
-/* 39229C E009256C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 3922A0 E0092570 00021180 */  sll       $v0, $v0, 6
-/* 3922A4 E0092574 A6C30000 */  sh        $v1, ($s6)
-/* 3922A8 E0092578 8FC30000 */  lw        $v1, ($fp)
-/* 3922AC E009257C 00521021 */  addu      $v0, $v0, $s2
-/* 3922B0 E0092580 00621821 */  addu      $v1, $v1, $v0
-/* 3922B4 E0092584 24820008 */  addiu     $v0, $a0, 8
-/* 3922B8 E0092588 ACA30004 */  sw        $v1, 4($a1)
-/* 3922BC E009258C AE220000 */  sw        $v0, ($s1)
-/* 3922C0 E0092590 24820010 */  addiu     $v0, $a0, 0x10
-/* 3922C4 E0092594 AC860000 */  sw        $a2, ($a0)
-/* 3922C8 E0092598 8FA900D8 */  lw        $t1, 0xd8($sp)
-/* 3922CC E009259C 24830018 */  addiu     $v1, $a0, 0x18
-/* 3922D0 E00925A0 AC890004 */  sw        $t1, 4($a0)
-/* 3922D4 E00925A4 AE220000 */  sw        $v0, ($s1)
-/* 3922D8 E00925A8 AC970008 */  sw        $s7, 8($a0)
-/* 3922DC E00925AC 8E020000 */  lw        $v0, ($s0)
-/* 3922E0 E00925B0 3C09E009 */  lui       $t1, %hi(D_E0092690)
-/* 3922E4 E00925B4 25292690 */  addiu     $t1, $t1, %lo(D_E0092690)
-/* 3922E8 E00925B8 AE230000 */  sw        $v1, ($s1)
-/* 3922EC E00925BC 00021043 */  sra       $v0, $v0, 1
-/* 3922F0 E00925C0 00021080 */  sll       $v0, $v0, 2
-/* 3922F4 E00925C4 00491021 */  addu      $v0, $v0, $t1
-/* 3922F8 E00925C8 8C430000 */  lw        $v1, ($v0)
-/* 3922FC E00925CC 24820020 */  addiu     $v0, $a0, 0x20
-/* 392300 E00925D0 AE220000 */  sw        $v0, ($s1)
-/* 392304 E00925D4 3C020900 */  lui       $v0, 0x900
-/* 392308 E00925D8 24420470 */  addiu     $v0, $v0, 0x470
-/* 39230C E00925DC AC820014 */  sw        $v0, 0x14($a0)
-/* 392310 E00925E0 24020040 */  addiu     $v0, $zero, 0x40
-/* 392314 E00925E4 AC970010 */  sw        $s7, 0x10($a0)
-/* 392318 E00925E8 AC870018 */  sw        $a3, 0x18($a0)
-/* 39231C E00925EC AC82001C */  sw        $v0, 0x1c($a0)
-/* 392320 E00925F0 AC83000C */  sw        $v1, 0xc($a0)
-.LE00925F4:
-/* 392324 E00925F4 8FA90118 */  lw        $t1, 0x118($sp)
-/* 392328 E00925F8 26730001 */  addiu     $s3, $s3, 1
-/* 39232C E00925FC 8D220008 */  lw        $v0, 8($t1)
-/* 392330 E0092600 0262102A */  slt       $v0, $s3, $v0
-/* 392334 E0092604 1440FFB0 */  bnez      $v0, .LE00924C8
-/* 392338 E0092608 26100024 */   addiu    $s0, $s0, 0x24
-.LE009260C:
-/* 39233C E009260C 3C03D838 */  lui       $v1, 0xd838
-/* 392340 E0092610 3C04800A */  lui       $a0, %hi(gMasterGfxPos)
-/* 392344 E0092614 2484A66C */  addiu     $a0, $a0, %lo(gMasterGfxPos)
-/* 392348 E0092618 8C820000 */  lw        $v0, ($a0)
-/* 39234C E009261C 34630002 */  ori       $v1, $v1, 2
-/* 392350 E0092620 0040282D */  daddu     $a1, $v0, $zero
-/* 392354 E0092624 24420008 */  addiu     $v0, $v0, 8
-/* 392358 E0092628 AC820000 */  sw        $v0, ($a0)
-/* 39235C E009262C ACA30000 */  sw        $v1, ($a1)
-/* 392360 E0092630 24030040 */  addiu     $v1, $zero, 0x40
-/* 392364 E0092634 ACA30004 */  sw        $v1, 4($a1)
-/* 392368 E0092638 24430008 */  addiu     $v1, $v0, 8
-/* 39236C E009263C AC830000 */  sw        $v1, ($a0)
-/* 392370 E0092640 3C03E700 */  lui       $v1, 0xe700
-/* 392374 E0092644 AC430000 */  sw        $v1, ($v0)
-/* 392378 E0092648 AC400004 */  sw        $zero, 4($v0)
-/* 39237C E009264C 8FBF0104 */  lw        $ra, 0x104($sp)
-/* 392380 E0092650 8FBE0100 */  lw        $fp, 0x100($sp)
-/* 392384 E0092654 8FB700FC */  lw        $s7, 0xfc($sp)
-/* 392388 E0092658 8FB600F8 */  lw        $s6, 0xf8($sp)
-/* 39238C E009265C 8FB500F4 */  lw        $s5, 0xf4($sp)
-/* 392390 E0092660 8FB400F0 */  lw        $s4, 0xf0($sp)
-/* 392394 E0092664 8FB300EC */  lw        $s3, 0xec($sp)
-/* 392398 E0092668 8FB200E8 */  lw        $s2, 0xe8($sp)
-/* 39239C E009266C 8FB100E4 */  lw        $s1, 0xe4($sp)
-/* 3923A0 E0092670 8FB000E0 */  lw        $s0, 0xe0($sp)
-/* 3923A4 E0092674 D7B60110 */  ldc1      $f22, 0x110($sp)
-/* 3923A8 E0092678 D7B40108 */  ldc1      $f20, 0x108($sp)
-/* 3923AC E009267C 03E00008 */  jr        $ra
-/* 3923B0 E0092680 27BD0118 */   addiu    $sp, $sp, 0x118
-/* 3923B4 E0092684 00000000 */  nop
-/* 3923B8 E0092688 00000000 */  nop
-/* 3923BC E009268C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s b/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s
deleted file mode 100644
index 44b0163f13..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s
+++ /dev/null
@@ -1,115 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_73_main
-/* 391D30 E0092000 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 391D34 E0092004 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 391D38 E0092008 4485A000 */  mtc1      $a1, $f20
-/* 391D3C E009200C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 391D40 E0092010 4486B000 */  mtc1      $a2, $f22
-/* 391D44 E0092014 AFB20030 */  sw        $s2, 0x30($sp)
-/* 391D48 E0092018 0080902D */  daddu     $s2, $a0, $zero
-/* 391D4C E009201C F7B80048 */  sdc1      $f24, 0x48($sp)
-/* 391D50 E0092020 4487C000 */  mtc1      $a3, $f24
-/* 391D54 E0092024 27A40010 */  addiu     $a0, $sp, 0x10
-/* 391D58 E0092028 F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* 391D5C E009202C C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* 391D60 E0092030 3C02E009 */  lui       $v0, %hi(func_E00921AC)
-/* 391D64 E0092034 244221AC */  addiu     $v0, $v0, %lo(func_E00921AC)
-/* 391D68 E0092038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 391D6C E009203C 3C02E009 */  lui       $v0, %hi(func_E00921B4)
-/* 391D70 E0092040 244221B4 */  addiu     $v0, $v0, %lo(func_E00921B4)
-/* 391D74 E0092044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 391D78 E0092048 3C02E009 */  lui       $v0, %hi(func_E0092258)
-/* 391D7C E009204C 24422258 */  addiu     $v0, $v0, %lo(func_E0092258)
-/* 391D80 E0092050 AFA20020 */  sw        $v0, 0x20($sp)
-/* 391D84 E0092054 24020049 */  addiu     $v0, $zero, 0x49
-/* 391D88 E0092058 AFBF0034 */  sw        $ra, 0x34($sp)
-/* 391D8C E009205C AFB1002C */  sw        $s1, 0x2c($sp)
-/* 391D90 E0092060 AFB00028 */  sw        $s0, 0x28($sp)
-/* 391D94 E0092064 AFA00010 */  sw        $zero, 0x10($sp)
-/* 391D98 E0092068 AFA00024 */  sw        $zero, 0x24($sp)
-/* 391D9C E009206C 0C080124 */  jal       shim_create_effect_instance
-/* 391DA0 E0092070 AFA20014 */   sw       $v0, 0x14($sp)
-/* 391DA4 E0092074 240400B4 */  addiu     $a0, $zero, 0xb4
-/* 391DA8 E0092078 24110005 */  addiu     $s1, $zero, 5
-/* 391DAC E009207C 0040802D */  daddu     $s0, $v0, $zero
-/* 391DB0 E0092080 0C08012C */  jal       shim_general_heap_malloc
-/* 391DB4 E0092084 AE110008 */   sw       $s1, 8($s0)
-/* 391DB8 E0092088 0040182D */  daddu     $v1, $v0, $zero
-/* 391DBC E009208C 14600003 */  bnez      $v1, .LE009209C
-/* 391DC0 E0092090 AE03000C */   sw       $v1, 0xc($s0)
-.LE0092094:
-/* 391DC4 E0092094 08024825 */  j         .LE0092094
-/* 391DC8 E0092098 00000000 */   nop
-.LE009209C:
-/* 391DCC E009209C 2402000E */  addiu     $v0, $zero, 0xe
-/* 391DD0 E00920A0 AC720000 */  sw        $s2, ($v1)
-/* 391DD4 E00920A4 AC600018 */  sw        $zero, 0x18($v1)
-/* 391DD8 E00920A8 AC620014 */  sw        $v0, 0x14($v1)
-/* 391DDC E00920AC E4740008 */  swc1      $f20, 8($v1)
-/* 391DE0 E00920B0 E476000C */  swc1      $f22, 0xc($v1)
-/* 391DE4 E00920B4 E4780010 */  swc1      $f24, 0x10($v1)
-/* 391DE8 E00920B8 24040001 */  addiu     $a0, $zero, 1
-/* 391DEC E00920BC 0091102A */  slt       $v0, $a0, $s1
-/* 391DF0 E00920C0 1040002F */  beqz      $v0, .LE0092180
-/* 391DF4 E00920C4 24630024 */   addiu    $v1, $v1, 0x24
-/* 391DF8 E00920C8 3C08E009 */  lui       $t0, %hi(D_E00926A4)
-/* 391DFC E00920CC 250826A4 */  addiu     $t0, $t0, %lo(D_E00926A4)
-/* 391E00 E00920D0 240BFFFF */  addiu     $t3, $zero, -1
-/* 391E04 E00920D4 3C01E009 */  lui       $at, %hi(D_E0092700)
-/* 391E08 E00920D8 D4222700 */  ldc1      $f2, %lo(D_E0092700)($at)
-/* 391E0C E00920DC 2463001C */  addiu     $v1, $v1, 0x1c
-/* 391E10 E00920E0 240A0010 */  addiu     $t2, $zero, 0x10
-/* 391E14 E00920E4 0000482D */  daddu     $t1, $zero, $zero
-/* 391E18 E00920E8 2407000C */  addiu     $a3, $zero, 0xc
-/* 391E1C E00920EC 24060008 */  addiu     $a2, $zero, 8
-/* 391E20 E00920F0 24050004 */  addiu     $a1, $zero, 4
-.LE00920F4:
-/* 391E24 E00920F4 00A81021 */  addu      $v0, $a1, $t0
-/* 391E28 E00920F8 C4400000 */  lwc1      $f0, ($v0)
-/* 391E2C E00920FC 46800020 */  cvt.s.w   $f0, $f0
-/* 391E30 E0092100 00C81021 */  addu      $v0, $a2, $t0
-/* 391E34 E0092104 E460FFEC */  swc1      $f0, -0x14($v1)
-/* 391E38 E0092108 C4400000 */  lwc1      $f0, ($v0)
-/* 391E3C E009210C 46800020 */  cvt.s.w   $f0, $f0
-/* 391E40 E0092110 00E81021 */  addu      $v0, $a3, $t0
-/* 391E44 E0092114 E460FFF0 */  swc1      $f0, -0x10($v1)
-/* 391E48 E0092118 C4400000 */  lwc1      $f0, ($v0)
-/* 391E4C E009211C 46800020 */  cvt.s.w   $f0, $f0
-/* 391E50 E0092120 01281021 */  addu      $v0, $t1, $t0
-/* 391E54 E0092124 E460FFF4 */  swc1      $f0, -0xc($v1)
-/* 391E58 E0092128 AC6BFFE8 */  sw        $t3, -0x18($v1)
-/* 391E5C E009212C 8C420000 */  lw        $v0, ($v0)
-/* 391E60 E0092130 AC620004 */  sw        $v0, 4($v1)
-/* 391E64 E0092134 01481021 */  addu      $v0, $t2, $t0
-/* 391E68 E0092138 C4400000 */  lwc1      $f0, ($v0)
-/* 391E6C E009213C 46800020 */  cvt.s.w   $f0, $f0
-/* 391E70 E0092140 4600D002 */  mul.s     $f0, $f26, $f0
-/* 391E74 E0092144 00000000 */  nop
-/* 391E78 E0092148 46000021 */  cvt.d.s   $f0, $f0
-/* 391E7C E009214C 46220002 */  mul.d     $f0, $f0, $f2
-/* 391E80 E0092150 00000000 */  nop
-/* 391E84 E0092154 25290014 */  addiu     $t1, $t1, 0x14
-/* 391E88 E0092158 24E70014 */  addiu     $a3, $a3, 0x14
-/* 391E8C E009215C 24C60014 */  addiu     $a2, $a2, 0x14
-/* 391E90 E0092160 24A50014 */  addiu     $a1, $a1, 0x14
-/* 391E94 E0092164 24840001 */  addiu     $a0, $a0, 1
-/* 391E98 E0092168 254A0014 */  addiu     $t2, $t2, 0x14
-/* 391E9C E009216C 0091102A */  slt       $v0, $a0, $s1
-/* 391EA0 E0092170 46200020 */  cvt.s.d   $f0, $f0
-/* 391EA4 E0092174 E4600000 */  swc1      $f0, ($v1)
-/* 391EA8 E0092178 1440FFDE */  bnez      $v0, .LE00920F4
-/* 391EAC E009217C 24630024 */   addiu    $v1, $v1, 0x24
-.LE0092180:
-/* 391EB0 E0092180 0200102D */  daddu     $v0, $s0, $zero
-/* 391EB4 E0092184 8FBF0034 */  lw        $ra, 0x34($sp)
-/* 391EB8 E0092188 8FB20030 */  lw        $s2, 0x30($sp)
-/* 391EBC E009218C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 391EC0 E0092190 8FB00028 */  lw        $s0, 0x28($sp)
-/* 391EC4 E0092194 D7BA0050 */  ldc1      $f26, 0x50($sp)
-/* 391EC8 E0092198 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* 391ECC E009219C D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 391ED0 E00921A0 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 391ED4 E00921A4 03E00008 */  jr        $ra
-/* 391ED8 E00921A8 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s
rename to ver/us/asm/nonmatchings/effects/effect_74/fx_74_appendGfx.s
index 6667b9ef00..5096706e28 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00942FC
+glabel fx_74_appendGfx
 /* 392BCC E00942FC 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 392BD0 E0094300 AFB000D8 */  sw        $s0, 0xd8($sp)
 /* 392BD4 E0094304 0080802D */  daddu     $s0, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s
index c6dd276cbd..2812add5a9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s
@@ -12,14 +12,14 @@ glabel fx_74_main
 /* 3928EC E009401C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3928F0 E0094020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3928F4 E0094024 4487C000 */  mtc1      $a3, $f24
-/* 3928F8 E0094028 3C02E009 */  lui       $v0, %hi(func_E0094190)
-/* 3928FC E009402C 24424190 */  addiu     $v0, $v0, %lo(func_E0094190)
+/* 3928F8 E0094028 3C02E009 */  lui       $v0, %hi(fx_74_init)
+/* 3928FC E009402C 24424190 */  addiu     $v0, $v0, %lo(fx_74_init)
 /* 392900 E0094030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 392904 E0094034 3C02E009 */  lui       $v0, %hi(func_E0094198)
-/* 392908 E0094038 24424198 */  addiu     $v0, $v0, %lo(func_E0094198)
+/* 392904 E0094034 3C02E009 */  lui       $v0, %hi(fx_74_update)
+/* 392908 E0094038 24424198 */  addiu     $v0, $v0, %lo(fx_74_update)
 /* 39290C E009403C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 392910 E0094040 3C02E009 */  lui       $v0, %hi(func_E00942C0)
-/* 392914 E0094044 244242C0 */  addiu     $v0, $v0, %lo(func_E00942C0)
+/* 392910 E0094040 3C02E009 */  lui       $v0, %hi(fx_74_render)
+/* 392914 E0094044 244242C0 */  addiu     $v0, $v0, %lo(fx_74_render)
 /* 392918 E0094048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39291C E009404C 2402004A */  addiu     $v0, $zero, 0x4a
 /* 392920 E0094050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s
rename to ver/us/asm/nonmatchings/effects/effect_74/fx_74_render.s
index e296ef00e0..dacb0ec9a4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00942C0
+glabel fx_74_render
 /* 392B90 E00942C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 392B94 E00942C4 3C02E009 */  lui       $v0, %hi(func_E00942FC)
-/* 392B98 E00942C8 244242FC */  addiu     $v0, $v0, %lo(func_E00942FC)
+/* 392B94 E00942C4 3C02E009 */  lui       $v0, %hi(fx_74_appendGfx)
+/* 392B98 E00942C8 244242FC */  addiu     $v0, $v0, %lo(fx_74_appendGfx)
 /* 392B9C E00942CC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 392BA0 E00942D0 2402000A */  addiu     $v0, $zero, 0xa
 /* 392BA4 E00942D4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s
rename to ver/us/asm/nonmatchings/effects/effect_74/fx_74_update.s
index 73f49312d1..5bca92469b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s
+++ b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0094198
+glabel fx_74_update
 /* 392A68 E0094198 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 392A6C E009419C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 392A70 E00941A0 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s b/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s
deleted file mode 100644
index 68fd75bb1a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E00960F4
-/* 394374 E00960F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 394378 E00960F8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 39437C E00960FC 8C85000C */  lw        $a1, 0xc($a0)
-/* 394380 E0096100 8CA2001C */  lw        $v0, 0x1c($a1)
-/* 394384 E0096104 2442FFFF */  addiu     $v0, $v0, -1
-/* 394388 E0096108 ACA2001C */  sw        $v0, 0x1c($a1)
-/* 39438C E009610C 8CA20020 */  lw        $v0, 0x20($a1)
-/* 394390 E0096110 8CA3001C */  lw        $v1, 0x1c($a1)
-/* 394394 E0096114 24420001 */  addiu     $v0, $v0, 1
-/* 394398 E0096118 04610005 */  bgez      $v1, .LE0096130
-/* 39439C E009611C ACA20020 */   sw       $v0, 0x20($a1)
-/* 3943A0 E0096120 0C080128 */  jal       shim_remove_effect
-/* 3943A4 E0096124 00000000 */   nop
-/* 3943A8 E0096128 0802585B */  j         .LE009616C
-/* 3943AC E009612C 00000000 */   nop
-.LE0096130:
-/* 3943B0 E0096130 C4A00010 */  lwc1      $f0, 0x10($a1)
-/* 3943B4 E0096134 C4A20014 */  lwc1      $f2, 0x14($a1)
-/* 3943B8 E0096138 46020000 */  add.s     $f0, $f0, $f2
-/* 3943BC E009613C 3C014000 */  lui       $at, 0x4000
-/* 3943C0 E0096140 44811000 */  mtc1      $at, $f2
-/* 3943C4 E0096144 00000000 */  nop
-/* 3943C8 E0096148 4600103C */  c.lt.s    $f2, $f0
-/* 3943CC E009614C 00000000 */  nop
-/* 3943D0 E0096150 45000002 */  bc1f      .LE009615C
-/* 3943D4 E0096154 E4A00010 */   swc1     $f0, 0x10($a1)
-/* 3943D8 E0096158 E4A20010 */  swc1      $f2, 0x10($a1)
-.LE009615C:
-/* 3943DC E009615C C4A00008 */  lwc1      $f0, 8($a1)
-/* 3943E0 E0096160 C4A20010 */  lwc1      $f2, 0x10($a1)
-/* 3943E4 E0096164 46020000 */  add.s     $f0, $f0, $f2
-/* 3943E8 E0096168 E4A00008 */  swc1      $f0, 8($a1)
-.LE009616C:
-/* 3943EC E009616C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 3943F0 E0096170 03E00008 */  jr        $ra
-/* 3943F4 E0096174 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s b/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s
deleted file mode 100644
index 44962cb3c6..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E0096178
-/* 3943F8 E0096178 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3943FC E009617C 3C02E009 */  lui       $v0, %hi(func_E00961BC)
-/* 394400 E0096180 244261BC */  addiu     $v0, $v0, %lo(func_E00961BC)
-/* 394404 E0096184 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 394408 E0096188 24020001 */  addiu     $v0, $zero, 1
-/* 39440C E009618C AFA40018 */  sw        $a0, 0x18($sp)
-/* 394410 E0096190 27A40010 */  addiu     $a0, $sp, 0x10
-/* 394414 E0096194 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 394418 E0096198 AFA00014 */  sw        $zero, 0x14($sp)
-/* 39441C E009619C 0C080120 */  jal       shim_queue_render_task
-/* 394420 E00961A0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 394424 E00961A4 8C430000 */  lw        $v1, ($v0)
-/* 394428 E00961A8 34630002 */  ori       $v1, $v1, 2
-/* 39442C E00961AC AC430000 */  sw        $v1, ($v0)
-/* 394430 E00961B0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 394434 E00961B4 03E00008 */  jr        $ra
-/* 394438 E00961B8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s b/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s
deleted file mode 100644
index 56502e8c02..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s
+++ /dev/null
@@ -1,141 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E00961BC
-/* 39443C E00961BC 27BDFF40 */  addiu     $sp, $sp, -0xc0
-/* 394440 E00961C0 0080182D */  daddu     $v1, $a0, $zero
-/* 394444 E00961C4 3C05DB06 */  lui       $a1, 0xdb06
-/* 394448 E00961C8 34A50024 */  ori       $a1, $a1, 0x24
-/* 39444C E00961CC 27A40018 */  addiu     $a0, $sp, 0x18
-/* 394450 E00961D0 AFB1009C */  sw        $s1, 0x9c($sp)
-/* 394454 E00961D4 3C11800A */  lui       $s1, %hi(gMasterGfxPos)
-/* 394458 E00961D8 2631A66C */  addiu     $s1, $s1, %lo(gMasterGfxPos)
-/* 39445C E00961DC AFB400A8 */  sw        $s4, 0xa8($sp)
-/* 394460 E00961E0 3C140001 */  lui       $s4, 1
-/* 394464 E00961E4 AFB500AC */  sw        $s5, 0xac($sp)
-/* 394468 E00961E8 3C15E700 */  lui       $s5, 0xe700
-/* 39446C E00961EC AFBF00B0 */  sw        $ra, 0xb0($sp)
-/* 394470 E00961F0 AFB300A4 */  sw        $s3, 0xa4($sp)
-/* 394474 E00961F4 AFB200A0 */  sw        $s2, 0xa0($sp)
-/* 394478 E00961F8 AFB00098 */  sw        $s0, 0x98($sp)
-/* 39447C E00961FC F7B400B8 */  sdc1      $f20, 0xb8($sp)
-/* 394480 E0096200 8E280000 */  lw        $t0, ($s1)
-/* 394484 E0096204 8C72000C */  lw        $s2, 0xc($v1)
-/* 394488 E0096208 0100102D */  daddu     $v0, $t0, $zero
-/* 39448C E009620C 8E530000 */  lw        $s3, ($s2)
-/* 394490 E0096210 25080008 */  addiu     $t0, $t0, 8
-/* 394494 E0096214 AC550000 */  sw        $s5, ($v0)
-/* 394498 E0096218 AC400004 */  sw        $zero, 4($v0)
-/* 39449C E009621C AD050000 */  sw        $a1, ($t0)
-/* 3944A0 E0096220 8C620010 */  lw        $v0, 0x10($v1)
-/* 3944A4 E0096224 36941630 */  ori       $s4, $s4, 0x1630
-/* 3944A8 E0096228 AE280000 */  sw        $t0, ($s1)
-/* 3944AC E009622C 8C42001C */  lw        $v0, 0x1c($v0)
-/* 3944B0 E0096230 3C038000 */  lui       $v1, 0x8000
-/* 3944B4 E0096234 00431021 */  addu      $v0, $v0, $v1
-/* 3944B8 E0096238 AD020004 */  sw        $v0, 4($t0)
-/* 3944BC E009623C 8E450004 */  lw        $a1, 4($s2)
-/* 3944C0 E0096240 8E460008 */  lw        $a2, 8($s2)
-/* 3944C4 E0096244 8E47000C */  lw        $a3, 0xc($s2)
-/* 3944C8 E0096248 25080008 */  addiu     $t0, $t0, 8
-/* 3944CC E009624C 0C080108 */  jal       shim_guTranslateF
-/* 3944D0 E0096250 AE280000 */   sw       $t0, ($s1)
-/* 3944D4 E0096254 27B00058 */  addiu     $s0, $sp, 0x58
-/* 3944D8 E0096258 3C013F80 */  lui       $at, 0x3f80
-/* 3944DC E009625C 4481A000 */  mtc1      $at, $f20
-/* 3944E0 E0096260 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 3944E4 E0096264 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 3944E8 E0096268 44800000 */  mtc1      $zero, $f0
-/* 3944EC E009626C 00031080 */  sll       $v0, $v1, 2
-/* 3944F0 E0096270 00431021 */  addu      $v0, $v0, $v1
-/* 3944F4 E0096274 00021080 */  sll       $v0, $v0, 2
-/* 3944F8 E0096278 00431023 */  subu      $v0, $v0, $v1
-/* 3944FC E009627C 000218C0 */  sll       $v1, $v0, 3
-/* 394500 E0096280 00431021 */  addu      $v0, $v0, $v1
-/* 394504 E0096284 000210C0 */  sll       $v0, $v0, 3
-/* 394508 E0096288 44060000 */  mfc1      $a2, $f0
-/* 39450C E009628C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 394510 E0096290 00220821 */  addu      $at, $at, $v0
-/* 394514 E0096294 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* 394518 E0096298 4407A000 */  mfc1      $a3, $f20
-/* 39451C E009629C 46000007 */  neg.s     $f0, $f0
-/* 394520 E00962A0 44050000 */  mfc1      $a1, $f0
-/* 394524 E00962A4 0200202D */  daddu     $a0, $s0, $zero
-/* 394528 E00962A8 0C080104 */  jal       shim_guRotateF
-/* 39452C E00962AC AFA60010 */   sw       $a2, 0x10($sp)
-/* 394530 E00962B0 0200202D */  daddu     $a0, $s0, $zero
-/* 394534 E00962B4 27A50018 */  addiu     $a1, $sp, 0x18
-/* 394538 E00962B8 0C080114 */  jal       shim_guMtxCatF
-/* 39453C E00962BC 00A0302D */   daddu    $a2, $a1, $zero
-/* 394540 E00962C0 0200202D */  daddu     $a0, $s0, $zero
-/* 394544 E00962C4 8E450018 */  lw        $a1, 0x18($s2)
-/* 394548 E00962C8 4407A000 */  mfc1      $a3, $f20
-/* 39454C E00962CC 0C080110 */  jal       shim_guScaleF
-/* 394550 E00962D0 00A0302D */   daddu    $a2, $a1, $zero
-/* 394554 E00962D4 0200202D */  daddu     $a0, $s0, $zero
-/* 394558 E00962D8 27A50018 */  addiu     $a1, $sp, 0x18
-/* 39455C E00962DC 0C080114 */  jal       shim_guMtxCatF
-/* 394560 E00962E0 00A0302D */   daddu    $a2, $a1, $zero
-/* 394564 E00962E4 27A40018 */  addiu     $a0, $sp, 0x18
-/* 394568 E00962E8 3C108007 */  lui       $s0, %hi(gMatrixListPos)
-/* 39456C E00962EC 261041F0 */  addiu     $s0, $s0, %lo(gMatrixListPos)
-/* 394570 E00962F0 3C12800A */  lui       $s2, %hi(gDisplayContext)
-/* 394574 E00962F4 2652A674 */  addiu     $s2, $s2, %lo(gDisplayContext)
-/* 394578 E00962F8 96050000 */  lhu       $a1, ($s0)
-/* 39457C E00962FC 8E420000 */  lw        $v0, ($s2)
-/* 394580 E0096300 00052980 */  sll       $a1, $a1, 6
-/* 394584 E0096304 00B42821 */  addu      $a1, $a1, $s4
-/* 394588 E0096308 0C080118 */  jal       shim_guMtxF2L
-/* 39458C E009630C 00452821 */   addu     $a1, $v0, $a1
-/* 394590 E0096310 3C06D838 */  lui       $a2, 0xd838
-/* 394594 E0096314 34C60002 */  ori       $a2, $a2, 2
-/* 394598 E0096318 8E240000 */  lw        $a0, ($s1)
-/* 39459C E009631C 3C03DA38 */  lui       $v1, 0xda38
-/* 3945A0 E0096320 0080282D */  daddu     $a1, $a0, $zero
-/* 3945A4 E0096324 24840008 */  addiu     $a0, $a0, 8
-/* 3945A8 E0096328 AE240000 */  sw        $a0, ($s1)
-/* 3945AC E009632C 96020000 */  lhu       $v0, ($s0)
-/* 3945B0 E0096330 00139880 */  sll       $s3, $s3, 2
-/* 3945B4 E0096334 ACA30000 */  sw        $v1, ($a1)
-/* 3945B8 E0096338 24430001 */  addiu     $v1, $v0, 1
-/* 3945BC E009633C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 3945C0 E0096340 00021180 */  sll       $v0, $v0, 6
-/* 3945C4 E0096344 A6030000 */  sh        $v1, ($s0)
-/* 3945C8 E0096348 8E430000 */  lw        $v1, ($s2)
-/* 3945CC E009634C 00541021 */  addu      $v0, $v0, $s4
-/* 3945D0 E0096350 00621821 */  addu      $v1, $v1, $v0
-/* 3945D4 E0096354 24820008 */  addiu     $v0, $a0, 8
-/* 3945D8 E0096358 ACA30004 */  sw        $v1, 4($a1)
-/* 3945DC E009635C 3C03DE00 */  lui       $v1, 0xde00
-/* 3945E0 E0096360 AE220000 */  sw        $v0, ($s1)
-/* 3945E4 E0096364 AC830000 */  sw        $v1, ($a0)
-/* 3945E8 E0096368 3C05E009 */  lui       $a1, %hi(D_E00963E0)
-/* 3945EC E009636C 00B32821 */  addu      $a1, $a1, $s3
-/* 3945F0 E0096370 8CA563E0 */  lw        $a1, %lo(D_E00963E0)($a1)
-/* 3945F4 E0096374 24820010 */  addiu     $v0, $a0, 0x10
-/* 3945F8 E0096378 AE220000 */  sw        $v0, ($s1)
-/* 3945FC E009637C 3C020900 */  lui       $v0, 0x900
-/* 394600 E0096380 24421508 */  addiu     $v0, $v0, 0x1508
-/* 394604 E0096384 AC82000C */  sw        $v0, 0xc($a0)
-/* 394608 E0096388 24820018 */  addiu     $v0, $a0, 0x18
-/* 39460C E009638C AC830008 */  sw        $v1, 8($a0)
-/* 394610 E0096390 AE220000 */  sw        $v0, ($s1)
-/* 394614 E0096394 24020040 */  addiu     $v0, $zero, 0x40
-/* 394618 E0096398 AC820014 */  sw        $v0, 0x14($a0)
-/* 39461C E009639C 24820020 */  addiu     $v0, $a0, 0x20
-/* 394620 E00963A0 AC860010 */  sw        $a2, 0x10($a0)
-/* 394624 E00963A4 AE220000 */  sw        $v0, ($s1)
-/* 394628 E00963A8 AC950018 */  sw        $s5, 0x18($a0)
-/* 39462C E00963AC AC80001C */  sw        $zero, 0x1c($a0)
-/* 394630 E00963B0 AC850004 */  sw        $a1, 4($a0)
-/* 394634 E00963B4 8FBF00B0 */  lw        $ra, 0xb0($sp)
-/* 394638 E00963B8 8FB500AC */  lw        $s5, 0xac($sp)
-/* 39463C E00963BC 8FB400A8 */  lw        $s4, 0xa8($sp)
-/* 394640 E00963C0 8FB300A4 */  lw        $s3, 0xa4($sp)
-/* 394644 E00963C4 8FB200A0 */  lw        $s2, 0xa0($sp)
-/* 394648 E00963C8 8FB1009C */  lw        $s1, 0x9c($sp)
-/* 39464C E00963CC 8FB00098 */  lw        $s0, 0x98($sp)
-/* 394650 E00963D0 D7B400B8 */  ldc1      $f20, 0xb8($sp)
-/* 394654 E00963D4 03E00008 */  jr        $ra
-/* 394658 E00963D8 27BD00C0 */   addiu    $sp, $sp, 0xc0
-/* 39465C E00963DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s
deleted file mode 100644
index 40604d3a0e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_75_main
-/* 394280 E0096000 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* 394284 E0096004 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 394288 E0096008 4485A000 */  mtc1      $a1, $f20
-/* 39428C E009600C AFB1002C */  sw        $s1, 0x2c($sp)
-/* 394290 E0096010 0080882D */  daddu     $s1, $a0, $zero
-/* 394294 E0096014 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 394298 E0096018 4486B000 */  mtc1      $a2, $f22
-/* 39429C E009601C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3942A0 E0096020 F7B80048 */  sdc1      $f24, 0x48($sp)
-/* 3942A4 E0096024 4487C000 */  mtc1      $a3, $f24
-/* 3942A8 E0096028 3C02E009 */  lui       $v0, %hi(func_E00960EC)
-/* 3942AC E009602C 244260EC */  addiu     $v0, $v0, %lo(func_E00960EC)
-/* 3942B0 E0096030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3942B4 E0096034 3C02E009 */  lui       $v0, %hi(func_E00960F4)
-/* 3942B8 E0096038 244260F4 */  addiu     $v0, $v0, %lo(func_E00960F4)
-/* 3942BC E009603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3942C0 E0096040 3C02E009 */  lui       $v0, %hi(func_E0096178)
-/* 3942C4 E0096044 24426178 */  addiu     $v0, $v0, %lo(func_E0096178)
-/* 3942C8 E0096048 AFA20020 */  sw        $v0, 0x20($sp)
-/* 3942CC E009604C 2402004B */  addiu     $v0, $zero, 0x4b
-/* 3942D0 E0096050 AFBF0030 */  sw        $ra, 0x30($sp)
-/* 3942D4 E0096054 AFB00028 */  sw        $s0, 0x28($sp)
-/* 3942D8 E0096058 AFA00010 */  sw        $zero, 0x10($sp)
-/* 3942DC E009605C AFA00024 */  sw        $zero, 0x24($sp)
-/* 3942E0 E0096060 0C080124 */  jal       shim_create_effect_instance
-/* 3942E4 E0096064 AFA20014 */   sw       $v0, 0x14($sp)
-/* 3942E8 E0096068 24040024 */  addiu     $a0, $zero, 0x24
-/* 3942EC E009606C 24030001 */  addiu     $v1, $zero, 1
-/* 3942F0 E0096070 0040802D */  daddu     $s0, $v0, $zero
-/* 3942F4 E0096074 0C08012C */  jal       shim_general_heap_malloc
-/* 3942F8 E0096078 AE030008 */   sw       $v1, 8($s0)
-/* 3942FC E009607C 0040202D */  daddu     $a0, $v0, $zero
-/* 394300 E0096080 14800003 */  bnez      $a0, .LE0096090
-/* 394304 E0096084 AE02000C */   sw       $v0, 0xc($s0)
-.LE0096088:
-/* 394308 E0096088 08025822 */  j         .LE0096088
-/* 39430C E009608C 00000000 */   nop
-.LE0096090:
-/* 394310 E0096090 3C013F2B */  lui       $at, 0x3f2b
-/* 394314 E0096094 3421851F */  ori       $at, $at, 0x851f
-/* 394318 E0096098 44810000 */  mtc1      $at, $f0
-/* 39431C E009609C AC910000 */  sw        $s1, ($a0)
-/* 394320 E00960A0 E4940004 */  swc1      $f20, 4($a0)
-/* 394324 E00960A4 E4960008 */  swc1      $f22, 8($a0)
-/* 394328 E00960A8 E498000C */  swc1      $f24, 0xc($a0)
-/* 39432C E00960AC AC800010 */  sw        $zero, 0x10($a0)
-/* 394330 E00960B0 8FA30064 */  lw        $v1, 0x64($sp)
-/* 394334 E00960B4 AC800020 */  sw        $zero, 0x20($a0)
-/* 394338 E00960B8 AC83001C */  sw        $v1, 0x1c($a0)
-/* 39433C E00960BC C7A20060 */  lwc1      $f2, 0x60($sp)
-/* 394340 E00960C0 0200102D */  daddu     $v0, $s0, $zero
-/* 394344 E00960C4 E4800018 */  swc1      $f0, 0x18($a0)
-/* 394348 E00960C8 E4820014 */  swc1      $f2, 0x14($a0)
-/* 39434C E00960CC 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 394350 E00960D0 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 394354 E00960D4 8FB00028 */  lw        $s0, 0x28($sp)
-/* 394358 E00960D8 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* 39435C E00960DC D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 394360 E00960E0 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 394364 E00960E4 03E00008 */  jr        $ra
-/* 394368 E00960E8 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s
rename to ver/us/asm/nonmatchings/effects/effect_76/fx_76_appendGfx.s
index 955cd00b32..2ed761b24d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00982EC
+glabel fx_76_appendGfx
 /* 395E9C E00982EC 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 395EA0 E00982F0 3C05DB06 */  lui       $a1, 0xdb06
 /* 395EA4 E00982F4 AFB50074 */  sw        $s5, 0x74($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s
index 47f23a92be..6937bd7d52 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s
@@ -14,14 +14,14 @@ glabel fx_76_main
 /* 395BD4 E0098024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 395BD8 E0098028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 395BDC E009802C C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* 395BE0 E0098030 3C02E00A */  lui       $v0, %hi(func_E0098168)
-/* 395BE4 E0098034 24428168 */  addiu     $v0, $v0, %lo(func_E0098168)
+/* 395BE0 E0098030 3C02E00A */  lui       $v0, %hi(fx_76_init)
+/* 395BE4 E0098034 24428168 */  addiu     $v0, $v0, %lo(fx_76_init)
 /* 395BE8 E0098038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 395BEC E009803C 3C02E00A */  lui       $v0, %hi(func_E0098170)
-/* 395BF0 E0098040 24428170 */  addiu     $v0, $v0, %lo(func_E0098170)
+/* 395BEC E009803C 3C02E00A */  lui       $v0, %hi(fx_76_update)
+/* 395BF0 E0098040 24428170 */  addiu     $v0, $v0, %lo(fx_76_update)
 /* 395BF4 E0098044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 395BF8 E0098048 3C02E00A */  lui       $v0, %hi(func_E009829C)
-/* 395BFC E009804C 2442829C */  addiu     $v0, $v0, %lo(func_E009829C)
+/* 395BF8 E0098048 3C02E00A */  lui       $v0, %hi(fx_76_render)
+/* 395BFC E009804C 2442829C */  addiu     $v0, $v0, %lo(fx_76_render)
 /* 395C00 E0098050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 395C04 E0098054 2402004C */  addiu     $v0, $zero, 0x4c
 /* 395C08 E0098058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_render.s
similarity index 87%
rename from ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s
rename to ver/us/asm/nonmatchings/effects/effect_76/fx_76_render.s
index 1ccc168b8d..bafbc0f9cb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_render.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009829C
+glabel fx_76_render
 /* 395E4C E009829C 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 395E50 E00982A0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 395E54 E00982A4 8C83000C */  lw        $v1, 0xc($a0)
-/* 395E58 E00982A8 3C02E00A */  lui       $v0, %hi(func_E00982EC)
-/* 395E5C E00982AC 244282EC */  addiu     $v0, $v0, %lo(func_E00982EC)
+/* 395E58 E00982A8 3C02E00A */  lui       $v0, %hi(fx_76_appendGfx)
+/* 395E5C E00982AC 244282EC */  addiu     $v0, $v0, %lo(fx_76_appendGfx)
 /* 395E60 E00982B0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 395E64 E00982B4 2402002D */  addiu     $v0, $zero, 0x2d
 /* 395E68 E00982B8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s
rename to ver/us/asm/nonmatchings/effects/effect_76/fx_76_update.s
index f2b0aec176..f274b6205a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s
+++ b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E0098170
+glabel fx_76_update
 /* 395D20 E0098170 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 395D24 E0098174 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 395D28 E0098178 AFB1001C */  sw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s
rename to ver/us/asm/nonmatchings/effects/effect_77/fx_77_appendGfx.s
index 976bbb6ea7..fb4f923c8e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009A3E0
+glabel fx_77_appendGfx
 /* 396990 E009A3E0 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 396994 E009A3E4 0080482D */  daddu     $t1, $a0, $zero
 /* 396998 E009A3E8 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s
index 3dd16a0037..e48274637f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s
@@ -16,14 +16,14 @@ glabel fx_77_main
 /* 3965DC E009A02C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3965E0 E009A030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3965E4 E009A034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 3965E8 E009A038 3C02E00A */  lui       $v0, %hi(func_E009A138)
-/* 3965EC E009A03C 2442A138 */  addiu     $v0, $v0, %lo(func_E009A138)
+/* 3965E8 E009A038 3C02E00A */  lui       $v0, %hi(fx_77_init)
+/* 3965EC E009A03C 2442A138 */  addiu     $v0, $v0, %lo(fx_77_init)
 /* 3965F0 E009A040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3965F4 E009A044 3C02E00A */  lui       $v0, %hi(func_E009A140)
-/* 3965F8 E009A048 2442A140 */  addiu     $v0, $v0, %lo(func_E009A140)
+/* 3965F4 E009A044 3C02E00A */  lui       $v0, %hi(fx_77_update)
+/* 3965F8 E009A048 2442A140 */  addiu     $v0, $v0, %lo(fx_77_update)
 /* 3965FC E009A04C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 396600 E009A050 3C02E00A */  lui       $v0, %hi(func_E009A398)
-/* 396604 E009A054 2442A398 */  addiu     $v0, $v0, %lo(func_E009A398)
+/* 396600 E009A050 3C02E00A */  lui       $v0, %hi(fx_77_render)
+/* 396604 E009A054 2442A398 */  addiu     $v0, $v0, %lo(fx_77_render)
 /* 396608 E009A058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39660C E009A05C 2402004D */  addiu     $v0, $zero, 0x4d
 /* 396610 E009A060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s
rename to ver/us/asm/nonmatchings/effects/effect_77/fx_77_render.s
index 8c48be0259..fec916480b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s
+++ b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009A398
+glabel fx_77_render
 /* 396948 E009A398 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 39694C E009A39C 3C02E00A */  lui       $v0, %hi(func_E009A3E0)
-/* 396950 E009A3A0 2442A3E0 */  addiu     $v0, $v0, %lo(func_E009A3E0)
+/* 39694C E009A39C 3C02E00A */  lui       $v0, %hi(fx_77_appendGfx)
+/* 396950 E009A3A0 2442A3E0 */  addiu     $v0, $v0, %lo(fx_77_appendGfx)
 /* 396954 E009A3A4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 396958 E009A3A8 2402FFF6 */  addiu     $v0, $zero, -0xa
 /* 39695C E009A3AC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s
rename to ver/us/asm/nonmatchings/effects/effect_77/fx_77_update.s
index 478f218284..98ad93aeb0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s
+++ b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009A140
+glabel fx_77_update
 /* 3966F0 E009A140 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3966F4 E009A144 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 3966F8 E009A148 AFB1001C */  sw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s
rename to ver/us/asm/nonmatchings/effects/effect_78/fx_78_appendGfx.s
index e740ed19ab..8c5f4ef093 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s
+++ b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009C220
+glabel fx_78_appendGfx
 /* 398410 E009C220 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 398414 E009C224 0080182D */  daddu     $v1, $a0, $zero
 /* 398418 E009C228 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s
index a55806fa0a..6d5b0d83da 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s
@@ -12,14 +12,14 @@ glabel fx_78_main
 /* 39820C E009C01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 398210 E009C020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 398214 E009C024 4487C000 */  mtc1      $a3, $f24
-/* 398218 E009C028 3C02E00A */  lui       $v0, %hi(func_E009C100)
-/* 39821C E009C02C 2442C100 */  addiu     $v0, $v0, %lo(func_E009C100)
+/* 398218 E009C028 3C02E00A */  lui       $v0, %hi(fx_78_init)
+/* 39821C E009C02C 2442C100 */  addiu     $v0, $v0, %lo(fx_78_init)
 /* 398220 E009C030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 398224 E009C034 3C02E00A */  lui       $v0, %hi(func_E009C108)
-/* 398228 E009C038 2442C108 */  addiu     $v0, $v0, %lo(func_E009C108)
+/* 398224 E009C034 3C02E00A */  lui       $v0, %hi(fx_78_update)
+/* 398228 E009C038 2442C108 */  addiu     $v0, $v0, %lo(fx_78_update)
 /* 39822C E009C03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 398230 E009C040 3C02E00A */  lui       $v0, %hi(func_E009C1DC)
-/* 398234 E009C044 2442C1DC */  addiu     $v0, $v0, %lo(func_E009C1DC)
+/* 398230 E009C040 3C02E00A */  lui       $v0, %hi(fx_78_render)
+/* 398234 E009C044 2442C1DC */  addiu     $v0, $v0, %lo(fx_78_render)
 /* 398238 E009C048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39823C E009C04C 2402004E */  addiu     $v0, $zero, 0x4e
 /* 398240 E009C050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s
rename to ver/us/asm/nonmatchings/effects/effect_78/fx_78_render.s
index b7910ab2b2..1545144c8a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009C1DC
+glabel fx_78_render
 /* 3983CC E009C1DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3983D0 E009C1E0 3C02E00A */  lui       $v0, %hi(func_E009C220)
-/* 3983D4 E009C1E4 2442C220 */  addiu     $v0, $v0, %lo(func_E009C220)
+/* 3983D0 E009C1E0 3C02E00A */  lui       $v0, %hi(fx_78_appendGfx)
+/* 3983D4 E009C1E4 2442C220 */  addiu     $v0, $v0, %lo(fx_78_appendGfx)
 /* 3983D8 E009C1E8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3983DC E009C1EC 24020001 */  addiu     $v0, $zero, 1
 /* 3983E0 E009C1F0 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s
rename to ver/us/asm/nonmatchings/effects/effect_78/fx_78_update.s
index ebd1d981fc..20a1f8fc53 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s
+++ b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009C108
+glabel fx_78_update
 /* 3982F8 E009C108 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3982FC E009C10C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 398300 E009C110 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s
rename to ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s
index 9fe097b324..ea05e5139d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s
+++ b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009E424
+glabel fx_79_appendGfx
 /* 3A0344 E009E424 27BDFED0 */  addiu     $sp, $sp, -0x130
 /* 3A0348 E009E428 AFBF0104 */  sw        $ra, 0x104($sp)
 /* 3A034C E009E42C AFBE0100 */  sw        $fp, 0x100($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s
index 3674f285f1..38811fefb0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s
@@ -14,14 +14,14 @@ glabel fx_79_main
 /* 39FF44 E009E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 39FF48 E009E028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 39FF4C E009E02C 8FB0006C */  lw        $s0, 0x6c($sp)
-/* 39FF50 E009E030 3C02E00A */  lui       $v0, %hi(func_E009E1DC)
-/* 39FF54 E009E034 2442E1DC */  addiu     $v0, $v0, %lo(func_E009E1DC)
+/* 39FF50 E009E030 3C02E00A */  lui       $v0, %hi(fx_79_init)
+/* 39FF54 E009E034 2442E1DC */  addiu     $v0, $v0, %lo(fx_79_init)
 /* 39FF58 E009E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 39FF5C E009E03C 3C02E00A */  lui       $v0, %hi(func_E009E1E4)
-/* 39FF60 E009E040 2442E1E4 */  addiu     $v0, $v0, %lo(func_E009E1E4)
+/* 39FF5C E009E03C 3C02E00A */  lui       $v0, %hi(fx_79_update)
+/* 39FF60 E009E040 2442E1E4 */  addiu     $v0, $v0, %lo(fx_79_update)
 /* 39FF64 E009E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 39FF68 E009E048 3C02E00A */  lui       $v0, %hi(func_E009E3DC)
-/* 39FF6C E009E04C 2442E3DC */  addiu     $v0, $v0, %lo(func_E009E3DC)
+/* 39FF68 E009E048 3C02E00A */  lui       $v0, %hi(fx_79_render)
+/* 39FF6C E009E04C 2442E3DC */  addiu     $v0, $v0, %lo(fx_79_render)
 /* 39FF70 E009E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39FF74 E009E054 2402004F */  addiu     $v0, $zero, 0x4f
 /* 39FF78 E009E058 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s
rename to ver/us/asm/nonmatchings/effects/effect_79/fx_79_render.s
index 7c86dffa22..9e00049586 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009E3DC
+glabel fx_79_render
 /* 3A02FC E009E3DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3A0300 E009E3E0 3C02E00A */  lui       $v0, %hi(func_E009E424)
-/* 3A0304 E009E3E4 2442E424 */  addiu     $v0, $v0, %lo(func_E009E424)
+/* 3A0300 E009E3E0 3C02E00A */  lui       $v0, %hi(fx_79_appendGfx)
+/* 3A0304 E009E3E4 2442E424 */  addiu     $v0, $v0, %lo(fx_79_appendGfx)
 /* 3A0308 E009E3E8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3A030C E009E3EC 2402000A */  addiu     $v0, $zero, 0xa
 /* 3A0310 E009E3F0 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s
rename to ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s
index 5b03b93e0d..7636efd2e4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E009E1E4
+glabel fx_79_update
 /* 3A0104 E009E1E4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3A0108 E009E1E8 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3A010C E009E1EC 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s
rename to ver/us/asm/nonmatchings/effects/effect_81/fx_81_appendGfx.s
index a6055bb881..f5146a02a7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A223C
+glabel fx_81_appendGfx
 /* 3A2BCC E00A223C 27BDFF60 */  addiu     $sp, $sp, -0xa0
 /* 3A2BD0 E00A2240 3C07DB06 */  lui       $a3, 0xdb06
 /* 3A2BD4 E00A2244 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s
index 6857b39f68..440cdfd0de 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s
@@ -14,14 +14,14 @@ glabel fx_81_main
 /* 3A29B4 E00A2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A29B8 E00A2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3A29BC E00A202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3A29C0 E00A2030 3C02E00A */  lui       $v0, %hi(func_E00A2118)
-/* 3A29C4 E00A2034 24422118 */  addiu     $v0, $v0, %lo(func_E00A2118)
+/* 3A29C0 E00A2030 3C02E00A */  lui       $v0, %hi(fx_81_init)
+/* 3A29C4 E00A2034 24422118 */  addiu     $v0, $v0, %lo(fx_81_init)
 /* 3A29C8 E00A2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A29CC E00A203C 3C02E00A */  lui       $v0, %hi(func_E00A2120)
-/* 3A29D0 E00A2040 24422120 */  addiu     $v0, $v0, %lo(func_E00A2120)
+/* 3A29CC E00A203C 3C02E00A */  lui       $v0, %hi(fx_81_update)
+/* 3A29D0 E00A2040 24422120 */  addiu     $v0, $v0, %lo(fx_81_update)
 /* 3A29D4 E00A2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A29D8 E00A2048 3C02E00A */  lui       $v0, %hi(func_E00A21EC)
-/* 3A29DC E00A204C 244221EC */  addiu     $v0, $v0, %lo(func_E00A21EC)
+/* 3A29D8 E00A2048 3C02E00A */  lui       $v0, %hi(fx_81_render)
+/* 3A29DC E00A204C 244221EC */  addiu     $v0, $v0, %lo(fx_81_render)
 /* 3A29E0 E00A2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A29E4 E00A2054 24020051 */  addiu     $v0, $zero, 0x51
 /* 3A29E8 E00A2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s
rename to ver/us/asm/nonmatchings/effects/effect_81/fx_81_render.s
index 47a28e3753..b1578017ad 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A21EC
+glabel fx_81_render
 /* 3A2B7C E00A21EC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3A2B80 E00A21F0 3C02E00A */  lui       $v0, %hi(func_E00A223C)
-/* 3A2B84 E00A21F4 2442223C */  addiu     $v0, $v0, %lo(func_E00A223C)
+/* 3A2B80 E00A21F0 3C02E00A */  lui       $v0, %hi(fx_81_appendGfx)
+/* 3A2B84 E00A21F4 2442223C */  addiu     $v0, $v0, %lo(fx_81_appendGfx)
 /* 3A2B88 E00A21F8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3A2B8C E00A21FC 24020064 */  addiu     $v0, $zero, 0x64
 /* 3A2B90 E00A2200 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s
rename to ver/us/asm/nonmatchings/effects/effect_81/fx_81_update.s
index 894361448d..db4b054a45 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s
+++ b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A2120
+glabel fx_81_update
 /* 3A2AB0 E00A2120 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3A2AB4 E00A2124 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3A2AB8 E00A2128 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s
rename to ver/us/asm/nonmatchings/effects/effect_82/fx_82_appendGfx.s
index e47d89cf9e..7c8e4430f6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s
+++ b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A4650
+glabel fx_82_appendGfx
 /* 3A3E30 E00A4650 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3A3E34 E00A4654 0080302D */  daddu     $a2, $a0, $zero
 /* 3A3E38 E00A4658 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s
index 87c300289d..2040f30e99 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s
@@ -16,14 +16,14 @@ glabel fx_82_main
 /* 3A380C E00A402C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A3810 E00A4030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3A3814 E00A4034 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3A3818 E00A4038 3C02E00A */  lui       $v0, %hi(func_E00A41A4)
-/* 3A381C E00A403C 244241A4 */  addiu     $v0, $v0, %lo(func_E00A41A4)
+/* 3A3818 E00A4038 3C02E00A */  lui       $v0, %hi(fx_82_init)
+/* 3A381C E00A403C 244241A4 */  addiu     $v0, $v0, %lo(fx_82_init)
 /* 3A3820 E00A4040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A3824 E00A4044 3C02E00A */  lui       $v0, %hi(func_E00A41AC)
-/* 3A3828 E00A4048 244241AC */  addiu     $v0, $v0, %lo(func_E00A41AC)
+/* 3A3824 E00A4044 3C02E00A */  lui       $v0, %hi(fx_82_update)
+/* 3A3828 E00A4048 244241AC */  addiu     $v0, $v0, %lo(fx_82_update)
 /* 3A382C E00A404C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A3830 E00A4050 3C02E00A */  lui       $v0, %hi(func_E00A45DC)
-/* 3A3834 E00A4054 244245DC */  addiu     $v0, $v0, %lo(func_E00A45DC)
+/* 3A3830 E00A4050 3C02E00A */  lui       $v0, %hi(fx_82_render)
+/* 3A3834 E00A4054 244245DC */  addiu     $v0, $v0, %lo(fx_82_render)
 /* 3A3838 E00A4058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A383C E00A405C 24020052 */  addiu     $v0, $zero, 0x52
 /* 3A3840 E00A4060 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_render.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s
rename to ver/us/asm/nonmatchings/effects/effect_82/fx_82_render.s
index 221d38fc97..cd6ffa2aa0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_render.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A45DC
+glabel fx_82_render
 /* 3A3DBC E00A45DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3A3DC0 E00A45E0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 3A3DC4 E00A45E4 8C83000C */  lw        $v1, 0xc($a0)
-/* 3A3DC8 E00A45E8 3C02E00A */  lui       $v0, %hi(func_E00A4650)
-/* 3A3DCC E00A45EC 24424650 */  addiu     $v0, $v0, %lo(func_E00A4650)
+/* 3A3DC8 E00A45E8 3C02E00A */  lui       $v0, %hi(fx_82_appendGfx)
+/* 3A3DCC E00A45EC 24424650 */  addiu     $v0, $v0, %lo(fx_82_appendGfx)
 /* 3A3DD0 E00A45F0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3A3DD4 E00A45F4 2402000A */  addiu     $v0, $zero, 0xa
 /* 3A3DD8 E00A45F8 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s
rename to ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s
index 95cc5e6b76..478e9a3d12 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A41AC
+glabel fx_82_update
 /* 3A398C E00A41AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 3A3990 E00A41B0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 3A3994 E00A41B4 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s
rename to ver/us/asm/nonmatchings/effects/effect_83/fx_83_appendGfx.s
index cc0fe6748d..a88822fffe 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A63A4
+glabel fx_83_appendGfx
 /* 3A58F4 E00A63A4 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 3A58F8 E00A63A8 0080182D */  daddu     $v1, $a0, $zero
 /* 3A58FC E00A63AC 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s
index 73e2738ab6..bfd5f9b5d3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s
@@ -12,14 +12,14 @@ glabel fx_83_main
 /* 3A556C E00A601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A5570 E00A6020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3A5574 E00A6024 4487C000 */  mtc1      $a3, $f24
-/* 3A5578 E00A6028 3C02E00A */  lui       $v0, %hi(func_E00A611C)
-/* 3A557C E00A602C 2442611C */  addiu     $v0, $v0, %lo(func_E00A611C)
+/* 3A5578 E00A6028 3C02E00A */  lui       $v0, %hi(fx_83_init)
+/* 3A557C E00A602C 2442611C */  addiu     $v0, $v0, %lo(fx_83_init)
 /* 3A5580 E00A6030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A5584 E00A6034 3C02E00A */  lui       $v0, %hi(func_E00A6124)
-/* 3A5588 E00A6038 24426124 */  addiu     $v0, $v0, %lo(func_E00A6124)
+/* 3A5584 E00A6034 3C02E00A */  lui       $v0, %hi(fx_83_update)
+/* 3A5588 E00A6038 24426124 */  addiu     $v0, $v0, %lo(fx_83_update)
 /* 3A558C E00A603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A5590 E00A6040 3C02E00A */  lui       $v0, %hi(func_E00A6358)
-/* 3A5594 E00A6044 24426358 */  addiu     $v0, $v0, %lo(func_E00A6358)
+/* 3A5590 E00A6040 3C02E00A */  lui       $v0, %hi(fx_83_render)
+/* 3A5594 E00A6044 24426358 */  addiu     $v0, $v0, %lo(fx_83_render)
 /* 3A5598 E00A6048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A559C E00A604C 24020053 */  addiu     $v0, $zero, 0x53
 /* 3A55A0 E00A6050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s
rename to ver/us/asm/nonmatchings/effects/effect_83/fx_83_render.s
index 5c40af2dda..4ae2b80c5f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s
+++ b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A6358
+glabel fx_83_render
 /* 3A58A8 E00A6358 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3A58AC E00A635C 3C02E00A */  lui       $v0, %hi(func_E00A63A4)
-/* 3A58B0 E00A6360 244263A4 */  addiu     $v0, $v0, %lo(func_E00A63A4)
+/* 3A58AC E00A635C 3C02E00A */  lui       $v0, %hi(fx_83_appendGfx)
+/* 3A58B0 E00A6360 244263A4 */  addiu     $v0, $v0, %lo(fx_83_appendGfx)
 /* 3A58B4 E00A6364 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3A58B8 E00A6368 2402002D */  addiu     $v0, $zero, 0x2d
 /* 3A58BC E00A636C AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s
rename to ver/us/asm/nonmatchings/effects/effect_83/fx_83_update.s
index 8dae646e06..87a24b6bb1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s
+++ b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A6124
+glabel fx_83_update
 /* 3A5674 E00A6124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3A5678 E00A6128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3A567C E00A612C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s
rename to ver/us/asm/nonmatchings/effects/effect_84/fx_84_appendGfx.s
index df48df6c95..9185c8794c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s
+++ b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A8320
+glabel fx_84_appendGfx
 /* 3A7410 E00A8320 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3A7414 E00A8324 0080302D */  daddu     $a2, $a0, $zero
 /* 3A7418 E00A8328 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s
index 052d24711c..ae71afe519 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s
@@ -12,14 +12,14 @@ glabel fx_84_main
 /* 3A710C E00A801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A7110 E00A8020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3A7114 E00A8024 4487C000 */  mtc1      $a3, $f24
-/* 3A7118 E00A8028 3C02E00B */  lui       $v0, %hi(func_E00A80FC)
-/* 3A711C E00A802C 244280FC */  addiu     $v0, $v0, %lo(func_E00A80FC)
+/* 3A7118 E00A8028 3C02E00B */  lui       $v0, %hi(fx_84_init)
+/* 3A711C E00A802C 244280FC */  addiu     $v0, $v0, %lo(fx_84_init)
 /* 3A7120 E00A8030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A7124 E00A8034 3C02E00B */  lui       $v0, %hi(func_E00A8104)
-/* 3A7128 E00A8038 24428104 */  addiu     $v0, $v0, %lo(func_E00A8104)
+/* 3A7124 E00A8034 3C02E00B */  lui       $v0, %hi(fx_84_update)
+/* 3A7128 E00A8038 24428104 */  addiu     $v0, $v0, %lo(fx_84_update)
 /* 3A712C E00A803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A7130 E00A8040 3C02E00B */  lui       $v0, %hi(func_E00A82D4)
-/* 3A7134 E00A8044 244282D4 */  addiu     $v0, $v0, %lo(func_E00A82D4)
+/* 3A7130 E00A8040 3C02E00B */  lui       $v0, %hi(fx_84_render)
+/* 3A7134 E00A8044 244282D4 */  addiu     $v0, $v0, %lo(fx_84_render)
 /* 3A7138 E00A8048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A713C E00A804C 24020054 */  addiu     $v0, $zero, 0x54
 /* 3A7140 E00A8050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s
rename to ver/us/asm/nonmatchings/effects/effect_84/fx_84_render.s
index 7bc7298c85..074d50bb28 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A82D4
+glabel fx_84_render
 /* 3A73C4 E00A82D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3A73C8 E00A82D8 3C02E00B */  lui       $v0, %hi(func_E00A8320)
-/* 3A73CC E00A82DC 24428320 */  addiu     $v0, $v0, %lo(func_E00A8320)
+/* 3A73C8 E00A82D8 3C02E00B */  lui       $v0, %hi(fx_84_appendGfx)
+/* 3A73CC E00A82DC 24428320 */  addiu     $v0, $v0, %lo(fx_84_appendGfx)
 /* 3A73D0 E00A82E0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3A73D4 E00A82E4 2402002D */  addiu     $v0, $zero, 0x2d
 /* 3A73D8 E00A82E8 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s
rename to ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s
index 5189af826f..5393479a9e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s
+++ b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00A8104
+glabel fx_84_update
 /* 3A71F4 E00A8104 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3A71F8 E00A8108 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 3A71FC E00A810C AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s
rename to ver/us/asm/nonmatchings/effects/effect_85/fx_85_appendGfx.s
index 5dde66452f..85f6353e0d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s
+++ b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AA404
+glabel fx_85_appendGfx
 /* 3AAD24 E00AA404 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3AAD28 E00AA408 3C03DB06 */  lui       $v1, 0xdb06
 /* 3AAD2C E00AA40C AFB1009C */  sw        $s1, 0x9c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s
index 7a66351fc9..f2d5af5c79 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s
@@ -12,14 +12,14 @@ glabel fx_85_main
 /* 3AA93C E00AA01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3AA940 E00AA020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3AA944 E00AA024 4487C000 */  mtc1      $a3, $f24
-/* 3AA948 E00AA028 3C02E00B */  lui       $v0, %hi(func_E00AA104)
-/* 3AA94C E00AA02C 2442A104 */  addiu     $v0, $v0, %lo(func_E00AA104)
+/* 3AA948 E00AA028 3C02E00B */  lui       $v0, %hi(fx_85_init)
+/* 3AA94C E00AA02C 2442A104 */  addiu     $v0, $v0, %lo(fx_85_init)
 /* 3AA950 E00AA030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3AA954 E00AA034 3C02E00B */  lui       $v0, %hi(func_E00AA10C)
-/* 3AA958 E00AA038 2442A10C */  addiu     $v0, $v0, %lo(func_E00AA10C)
+/* 3AA954 E00AA034 3C02E00B */  lui       $v0, %hi(fx_85_update)
+/* 3AA958 E00AA038 2442A10C */  addiu     $v0, $v0, %lo(fx_85_update)
 /* 3AA95C E00AA03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3AA960 E00AA040 3C02E00B */  lui       $v0, %hi(func_E00AA3C0)
-/* 3AA964 E00AA044 2442A3C0 */  addiu     $v0, $v0, %lo(func_E00AA3C0)
+/* 3AA960 E00AA040 3C02E00B */  lui       $v0, %hi(fx_85_render)
+/* 3AA964 E00AA044 2442A3C0 */  addiu     $v0, $v0, %lo(fx_85_render)
 /* 3AA968 E00AA048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3AA96C E00AA04C 24020055 */  addiu     $v0, $zero, 0x55
 /* 3AA970 E00AA050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_render.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s
rename to ver/us/asm/nonmatchings/effects/effect_85/fx_85_render.s
index bc61efa301..4033bbfc45 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AA3C0
+glabel fx_85_render
 /* 3AACE0 E00AA3C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3AACE4 E00AA3C4 3C02E00B */  lui       $v0, %hi(func_E00AA404)
-/* 3AACE8 E00AA3C8 2442A404 */  addiu     $v0, $v0, %lo(func_E00AA404)
+/* 3AACE4 E00AA3C4 3C02E00B */  lui       $v0, %hi(fx_85_appendGfx)
+/* 3AACE8 E00AA3C8 2442A404 */  addiu     $v0, $v0, %lo(fx_85_appendGfx)
 /* 3AACEC E00AA3CC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3AACF0 E00AA3D0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 3AACF4 E00AA3D4 AFA40018 */  sw        $a0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s
rename to ver/us/asm/nonmatchings/effects/effect_85/fx_85_update.s
index 8a7c5732da..d0ee56e215 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AA10C
+glabel fx_85_update
 /* 3AAA2C E00AA10C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3AAA30 E00AA110 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3AAA34 E00AA114 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s b/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s
index d3f4e0a5f9..bc05f98bc9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s
@@ -12,14 +12,14 @@ glabel fx_86_main
 /* 3AEE3C E00AC01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3AEE40 E00AC020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3AEE44 E00AC024 4487C000 */  mtc1      $a3, $f24
-/* 3AEE48 E00AC028 3C02E00B */  lui       $v0, %hi(func_E00AC11C)
-/* 3AEE4C E00AC02C 2442C11C */  addiu     $v0, $v0, %lo(func_E00AC11C)
+/* 3AEE48 E00AC028 3C02E00B */  lui       $v0, %hi(fx_86_init)
+/* 3AEE4C E00AC02C 2442C11C */  addiu     $v0, $v0, %lo(fx_86_init)
 /* 3AEE50 E00AC030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3AEE54 E00AC034 3C02E00B */  lui       $v0, %hi(func_E00AC124)
-/* 3AEE58 E00AC038 2442C124 */  addiu     $v0, $v0, %lo(func_E00AC124)
+/* 3AEE54 E00AC034 3C02E00B */  lui       $v0, %hi(fx_86_update)
+/* 3AEE58 E00AC038 2442C124 */  addiu     $v0, $v0, %lo(fx_86_update)
 /* 3AEE5C E00AC03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3AEE60 E00AC040 3C02E00B */  lui       $v0, %hi(func_E00AC280)
-/* 3AEE64 E00AC044 2442C280 */  addiu     $v0, $v0, %lo(func_E00AC280)
+/* 3AEE60 E00AC040 3C02E00B */  lui       $v0, %hi(fx_86_render)
+/* 3AEE64 E00AC044 2442C280 */  addiu     $v0, $v0, %lo(fx_86_render)
 /* 3AEE68 E00AC048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3AEE6C E00AC04C 3C02E00B */  lui       $v0, %hi(func_E00AC288)
 /* 3AEE70 E00AC050 2442C288 */  addiu     $v0, $v0, %lo(func_E00AC288)
diff --git a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s b/ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s
rename to ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s
index 5e84c42e6c..17327bf4be 100644
--- a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s
+++ b/ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AC124
+glabel fx_86_update
 /* 3AEF44 E00AC124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3AEF48 E00AC128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3AEF4C E00AC12C 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s
rename to ver/us/asm/nonmatchings/effects/effect_87/fx_87_appendGfx.s
index af80fd5ff4..9b80ecd488 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AE54C
+glabel fx_87_appendGfx
 /* 3B289C E00AE54C 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3B28A0 E00AE550 3C06DB06 */  lui       $a2, 0xdb06
 /* 3B28A4 E00AE554 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s
index 4982721f68..c922db1a4e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s
@@ -14,14 +14,14 @@ glabel fx_87_main
 /* 3B2374 E00AE024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B2378 E00AE028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3B237C E00AE02C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3B2380 E00AE030 3C02E00B */  lui       $v0, %hi(func_E00AE1AC)
-/* 3B2384 E00AE034 2442E1AC */  addiu     $v0, $v0, %lo(func_E00AE1AC)
+/* 3B2380 E00AE030 3C02E00B */  lui       $v0, %hi(fx_87_init)
+/* 3B2384 E00AE034 2442E1AC */  addiu     $v0, $v0, %lo(fx_87_init)
 /* 3B2388 E00AE038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B238C E00AE03C 3C02E00B */  lui       $v0, %hi(func_E00AE1B4)
-/* 3B2390 E00AE040 2442E1B4 */  addiu     $v0, $v0, %lo(func_E00AE1B4)
+/* 3B238C E00AE03C 3C02E00B */  lui       $v0, %hi(fx_87_update)
+/* 3B2390 E00AE040 2442E1B4 */  addiu     $v0, $v0, %lo(fx_87_update)
 /* 3B2394 E00AE044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B2398 E00AE048 3C02E00B */  lui       $v0, %hi(func_E00AE4FC)
-/* 3B239C E00AE04C 2442E4FC */  addiu     $v0, $v0, %lo(func_E00AE4FC)
+/* 3B2398 E00AE048 3C02E00B */  lui       $v0, %hi(fx_87_render)
+/* 3B239C E00AE04C 2442E4FC */  addiu     $v0, $v0, %lo(fx_87_render)
 /* 3B23A0 E00AE050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B23A4 E00AE054 24020057 */  addiu     $v0, $zero, 0x57
 /* 3B23A8 E00AE058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s
rename to ver/us/asm/nonmatchings/effects/effect_87/fx_87_render.s
index 0bc296433a..b524dc2e0b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AE4FC
+glabel fx_87_render
 /* 3B284C E00AE4FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B2850 E00AE500 3C02E00B */  lui       $v0, %hi(func_E00AE54C)
-/* 3B2854 E00AE504 2442E54C */  addiu     $v0, $v0, %lo(func_E00AE54C)
+/* 3B2850 E00AE500 3C02E00B */  lui       $v0, %hi(fx_87_appendGfx)
+/* 3B2854 E00AE504 2442E54C */  addiu     $v0, $v0, %lo(fx_87_appendGfx)
 /* 3B2858 E00AE508 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B285C E00AE50C 2402000A */  addiu     $v0, $zero, 0xa
 /* 3B2860 E00AE510 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s
rename to ver/us/asm/nonmatchings/effects/effect_87/fx_87_update.s
index 1fbad75261..48b13813e0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00AE1B4
+glabel fx_87_update
 /* 3B2504 E00AE1B4 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B2508 E00AE1B8 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 3B250C E00AE1BC 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s
rename to ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s
index d5ab944568..aa6c6192ad 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s
+++ b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B0234
+glabel fx_88_appendGfx
 /* 3B40E4 E00B0234 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3B40E8 E00B0238 0080402D */  daddu     $t0, $a0, $zero
 /* 3B40EC E00B023C 3C09DB06 */  lui       $t1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s
index 025584aa02..d852a58b43 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s
@@ -14,14 +14,14 @@ glabel fx_88_main
 /* 3B3ED4 E00B0024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B3ED8 E00B0028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B3EDC E00B002C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B3EE0 E00B0030 3C02E00B */  lui       $v0, %hi(func_E00B011C)
-/* 3B3EE4 E00B0034 2442011C */  addiu     $v0, $v0, %lo(func_E00B011C)
+/* 3B3EE0 E00B0030 3C02E00B */  lui       $v0, %hi(fx_88_init)
+/* 3B3EE4 E00B0034 2442011C */  addiu     $v0, $v0, %lo(fx_88_init)
 /* 3B3EE8 E00B0038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B3EEC E00B003C 3C02E00B */  lui       $v0, %hi(func_E00B0124)
-/* 3B3EF0 E00B0040 24420124 */  addiu     $v0, $v0, %lo(func_E00B0124)
+/* 3B3EEC E00B003C 3C02E00B */  lui       $v0, %hi(fx_88_update)
+/* 3B3EF0 E00B0040 24420124 */  addiu     $v0, $v0, %lo(fx_88_update)
 /* 3B3EF4 E00B0044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B3EF8 E00B0048 3C02E00B */  lui       $v0, %hi(func_E00B01F8)
-/* 3B3EFC E00B004C 244201F8 */  addiu     $v0, $v0, %lo(func_E00B01F8)
+/* 3B3EF8 E00B0048 3C02E00B */  lui       $v0, %hi(fx_88_render)
+/* 3B3EFC E00B004C 244201F8 */  addiu     $v0, $v0, %lo(fx_88_render)
 /* 3B3F00 E00B0050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B3F04 E00B0054 24020058 */  addiu     $v0, $zero, 0x58
 /* 3B3F08 E00B0058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s
rename to ver/us/asm/nonmatchings/effects/effect_88/fx_88_render.s
index 4a41c27e99..8eaa14e68e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B01F8
+glabel fx_88_render
 /* 3B40A8 E00B01F8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B40AC E00B01FC 3C02E00B */  lui       $v0, %hi(func_E00B0234)
-/* 3B40B0 E00B0200 24420234 */  addiu     $v0, $v0, %lo(func_E00B0234)
+/* 3B40AC E00B01FC 3C02E00B */  lui       $v0, %hi(fx_88_appendGfx)
+/* 3B40B0 E00B0200 24420234 */  addiu     $v0, $v0, %lo(fx_88_appendGfx)
 /* 3B40B4 E00B0204 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B40B8 E00B0208 2402000A */  addiu     $v0, $zero, 0xa
 /* 3B40BC E00B020C AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s
rename to ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s
index 9105de90c1..f6b90baeb7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s
+++ b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B0124
+glabel fx_88_update
 /* 3B3FD4 E00B0124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3B3FD8 E00B0128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3B3FDC E00B012C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s
rename to ver/us/asm/nonmatchings/effects/effect_89/fx_89_appendGfx.s
index b03913fe8d..3940a92f33 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B24B0
+glabel fx_89_appendGfx
 /* 3B4C40 E00B24B0 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 3B4C44 E00B24B4 0080482D */  daddu     $t1, $a0, $zero
 /* 3B4C48 E00B24B8 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s
index dc988d9407..be9c15fde4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s
@@ -14,14 +14,14 @@ glabel fx_89_main
 /* 3B47B4 E00B2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B47B8 E00B2028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3B47BC E00B202C 8FB00070 */  lw        $s0, 0x70($sp)
-/* 3B47C0 E00B2030 3C02E00B */  lui       $v0, %hi(func_E00B21DC)
-/* 3B47C4 E00B2034 244221DC */  addiu     $v0, $v0, %lo(func_E00B21DC)
+/* 3B47C0 E00B2030 3C02E00B */  lui       $v0, %hi(fx_89_init)
+/* 3B47C4 E00B2034 244221DC */  addiu     $v0, $v0, %lo(fx_89_init)
 /* 3B47C8 E00B2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B47CC E00B203C 3C02E00B */  lui       $v0, %hi(func_E00B21E4)
-/* 3B47D0 E00B2040 244221E4 */  addiu     $v0, $v0, %lo(func_E00B21E4)
+/* 3B47CC E00B203C 3C02E00B */  lui       $v0, %hi(fx_89_update)
+/* 3B47D0 E00B2040 244221E4 */  addiu     $v0, $v0, %lo(fx_89_update)
 /* 3B47D4 E00B2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B47D8 E00B2048 3C02E00B */  lui       $v0, %hi(func_E00B2460)
-/* 3B47DC E00B204C 24422460 */  addiu     $v0, $v0, %lo(func_E00B2460)
+/* 3B47D8 E00B2048 3C02E00B */  lui       $v0, %hi(fx_89_render)
+/* 3B47DC E00B204C 24422460 */  addiu     $v0, $v0, %lo(fx_89_render)
 /* 3B47E0 E00B2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B47E4 E00B2054 24020059 */  addiu     $v0, $zero, 0x59
 /* 3B47E8 E00B2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s
rename to ver/us/asm/nonmatchings/effects/effect_89/fx_89_render.s
index 0fb969352c..ed53edd3b8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s
+++ b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B2460
+glabel fx_89_render
 /* 3B4BF0 E00B2460 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B4BF4 E00B2464 3C02E00B */  lui       $v0, %hi(func_E00B24B0)
-/* 3B4BF8 E00B2468 244224B0 */  addiu     $v0, $v0, %lo(func_E00B24B0)
+/* 3B4BF4 E00B2464 3C02E00B */  lui       $v0, %hi(fx_89_appendGfx)
+/* 3B4BF8 E00B2468 244224B0 */  addiu     $v0, $v0, %lo(fx_89_appendGfx)
 /* 3B4BFC E00B246C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B4C00 E00B2470 2402000A */  addiu     $v0, $zero, 0xa
 /* 3B4C04 E00B2474 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s
rename to ver/us/asm/nonmatchings/effects/effect_89/fx_89_update.s
index 2dab84cd74..1932ccf0e2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B21E4
+glabel fx_89_update
 /* 3B4974 E00B21E4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3B4978 E00B21E8 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3B497C E00B21EC AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012104.s b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012104.s
deleted file mode 100644
index f7c3419bc5..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012104.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_E0012104
-/* 32DE14 E0012104 94820004 */  lhu       $v0, 4($a0)
-/* 32DE18 E0012108 14400010 */  bnez      $v0, .LE001214C
-/* 32DE1C E001210C 00000000 */   nop
-/* 32DE20 E0012110 C4820078 */  lwc1      $f2, 0x78($a0)
-/* 32DE24 E0012114 44800000 */  mtc1      $zero, $f0
-/* 32DE28 E0012118 00000000 */  nop
-/* 32DE2C E001211C 46001032 */  c.eq.s    $f2, $f0
-/* 32DE30 E0012120 00000000 */  nop
-/* 32DE34 E0012124 45010009 */  bc1t      .LE001214C
-/* 32DE38 E0012128 00000000 */   nop
-/* 32DE3C E001212C 3C028011 */  lui       $v0, %hi(gPlayerActionState)
-/* 32DE40 E0012130 8042F07C */  lb        $v0, %lo(gPlayerActionState)($v0)
-/* 32DE44 E0012134 14400005 */  bnez      $v0, .LE001214C
-/* 32DE48 E0012138 00000000 */   nop
-/* 32DE4C E001213C 94820006 */  lhu       $v0, 6($a0)
-/* 32DE50 E0012140 24420001 */  addiu     $v0, $v0, 1
-/* 32DE54 E0012144 03E00008 */  jr        $ra
-/* 32DE58 E0012148 A4820006 */   sh       $v0, 6($a0)
-.LE001214C:
-/* 32DE5C E001214C C48E0088 */  lwc1      $f14, 0x88($a0)
-/* 32DE60 E0012150 C480008C */  lwc1      $f0, 0x8c($a0)
-/* 32DE64 E0012154 46007380 */  add.s     $f14, $f14, $f0
-/* 32DE68 E0012158 C48C0084 */  lwc1      $f12, 0x84($a0)
-/* 32DE6C E001215C 460E6300 */  add.s     $f12, $f12, $f14
-/* 32DE70 E0012160 C4800080 */  lwc1      $f0, 0x80($a0)
-/* 32DE74 E0012164 460C0000 */  add.s     $f0, $f0, $f12
-/* 32DE78 E0012168 C48A0070 */  lwc1      $f10, 0x70($a0)
-/* 32DE7C E001216C 460A0282 */  mul.s     $f10, $f0, $f10
-/* 32DE80 E0012170 00000000 */  nop
-/* 32DE84 E0012174 E4800080 */  swc1      $f0, 0x80($a0)
-/* 32DE88 E0012178 46000186 */  mov.s     $f6, $f0
-/* 32DE8C E001217C C4800074 */  lwc1      $f0, 0x74($a0)
-/* 32DE90 E0012180 46003182 */  mul.s     $f6, $f6, $f0
-/* 32DE94 E0012184 00000000 */  nop
-/* 32DE98 E0012188 C4800090 */  lwc1      $f0, 0x90($a0)
-/* 32DE9C E001218C 46003182 */  mul.s     $f6, $f6, $f0
-/* 32DEA0 E0012190 00000000 */  nop
-/* 32DEA4 E0012194 C4880080 */  lwc1      $f8, 0x80($a0)
-/* 32DEA8 E0012198 C4800074 */  lwc1      $f0, 0x74($a0)
-/* 32DEAC E001219C 46004202 */  mul.s     $f8, $f8, $f0
-/* 32DEB0 E00121A0 00000000 */  nop
-/* 32DEB4 E00121A4 C4800094 */  lwc1      $f0, 0x94($a0)
-/* 32DEB8 E00121A8 90820008 */  lbu       $v0, 8($a0)
-/* 32DEBC E00121AC 46004202 */  mul.s     $f8, $f8, $f0
-/* 32DEC0 E00121B0 00000000 */  nop
-/* 32DEC4 E00121B4 C482002C */  lwc1      $f2, 0x2c($a0)
-/* 32DEC8 E00121B8 C484000C */  lwc1      $f4, 0xc($a0)
-/* 32DECC E00121BC 2442FFF4 */  addiu     $v0, $v0, -0xc
-/* 32DED0 E00121C0 A0820008 */  sb        $v0, 8($a0)
-/* 32DED4 E00121C4 460A1080 */  add.s     $f2, $f2, $f10
-/* 32DED8 E00121C8 E48E0088 */  swc1      $f14, 0x88($a0)
-/* 32DEDC E00121CC 44805000 */  mtc1      $zero, $f10
-/* 32DEE0 E00121D0 46062101 */  sub.s     $f4, $f4, $f6
-/* 32DEE4 E00121D4 C4800014 */  lwc1      $f0, 0x14($a0)
-/* 32DEE8 E00121D8 C4860080 */  lwc1      $f6, 0x80($a0)
-/* 32DEEC E00121DC 46080001 */  sub.s     $f0, $f0, $f8
-/* 32DEF0 E00121E0 E48C0084 */  swc1      $f12, 0x84($a0)
-/* 32DEF4 E00121E4 E482002C */  swc1      $f2, 0x2c($a0)
-/* 32DEF8 E00121E8 460A303C */  c.lt.s    $f6, $f10
-/* 32DEFC E00121EC E484000C */  swc1      $f4, 0xc($a0)
-/* 32DF00 E00121F0 45000002 */  bc1f      .LE00121FC
-/* 32DF04 E00121F4 E4800014 */   swc1     $f0, 0x14($a0)
-/* 32DF08 E00121F8 E48A0078 */  swc1      $f10, 0x78($a0)
-.LE00121FC:
-/* 32DF0C E00121FC 03E00008 */  jr        $ra
-/* 32DF10 E0012200 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_9/fx_9_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_9/fx_9_appendGfx.s
deleted file mode 100644
index a568a373be..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_9/fx_9_appendGfx.s
+++ /dev/null
@@ -1,144 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_9_appendGfx
-/* 32E274 E0012564 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 32E278 E0012568 0080602D */  daddu     $t4, $a0, $zero
-/* 32E27C E001256C 3C05DB06 */  lui       $a1, 0xdb06
-/* 32E280 E0012570 34A50024 */  ori       $a1, $a1, 0x24
-/* 32E284 E0012574 3C06800A */  lui       $a2, %hi(gMasterGfxPos)
-/* 32E288 E0012578 24C6A66C */  addiu     $a2, $a2, %lo(gMasterGfxPos)
-/* 32E28C E001257C 3C02E700 */  lui       $v0, 0xe700
-/* 32E290 E0012580 AFB7001C */  sw        $s7, 0x1c($sp)
-/* 32E294 E0012584 AFB60018 */  sw        $s6, 0x18($sp)
-/* 32E298 E0012588 AFB50014 */  sw        $s5, 0x14($sp)
-/* 32E29C E001258C AFB40010 */  sw        $s4, 0x10($sp)
-/* 32E2A0 E0012590 AFB3000C */  sw        $s3, 0xc($sp)
-/* 32E2A4 E0012594 AFB20008 */  sw        $s2, 8($sp)
-/* 32E2A8 E0012598 AFB10004 */  sw        $s1, 4($sp)
-/* 32E2AC E001259C AFB00000 */  sw        $s0, ($sp)
-/* 32E2B0 E00125A0 8CC40000 */  lw        $a0, ($a2)
-/* 32E2B4 E00125A4 8D87000C */  lw        $a3, 0xc($t4)
-/* 32E2B8 E00125A8 0080182D */  daddu     $v1, $a0, $zero
-/* 32E2BC E00125AC 24840008 */  addiu     $a0, $a0, 8
-/* 32E2C0 E00125B0 AC620000 */  sw        $v0, ($v1)
-/* 32E2C4 E00125B4 AC600004 */  sw        $zero, 4($v1)
-/* 32E2C8 E00125B8 AC850000 */  sw        $a1, ($a0)
-/* 32E2CC E00125BC 8D820010 */  lw        $v0, 0x10($t4)
-/* 32E2D0 E00125C0 0000482D */  daddu     $t1, $zero, $zero
-/* 32E2D4 E00125C4 ACC40000 */  sw        $a0, ($a2)
-/* 32E2D8 E00125C8 8C42001C */  lw        $v0, 0x1c($v0)
-/* 32E2DC E00125CC 3C038000 */  lui       $v1, 0x8000
-/* 32E2E0 E00125D0 00431021 */  addu      $v0, $v0, $v1
-/* 32E2E4 E00125D4 AC820004 */  sw        $v0, 4($a0)
-/* 32E2E8 E00125D8 8D820008 */  lw        $v0, 8($t4)
-/* 32E2EC E00125DC 24840008 */  addiu     $a0, $a0, 8
-/* 32E2F0 E00125E0 18400053 */  blez      $v0, .LE0012730
-/* 32E2F4 E00125E4 ACC40000 */   sw       $a0, ($a2)
-/* 32E2F8 E00125E8 3C0E800A */  lui       $t6, %hi(gDisplayContext)
-/* 32E2FC E00125EC 25CEA674 */  addiu     $t6, $t6, %lo(gDisplayContext)
-/* 32E300 E00125F0 3C0D8007 */  lui       $t5, %hi(gMatrixListPos)
-/* 32E304 E00125F4 25AD41F0 */  addiu     $t5, $t5, %lo(gMatrixListPos)
-/* 32E308 E00125F8 3C0B0001 */  lui       $t3, 1
-/* 32E30C E00125FC 356B1630 */  ori       $t3, $t3, 0x1630
-/* 32E310 E0012600 00C0502D */  daddu     $t2, $a2, $zero
-/* 32E314 E0012604 3C13E700 */  lui       $s3, 0xe700
-/* 32E318 E0012608 3C12FA00 */  lui       $s2, 0xfa00
-/* 32E31C E001260C 3C187060 */  lui       $t8, 0x7060
-/* 32E320 E0012610 37181800 */  ori       $t8, $t8, 0x1800
-/* 32E324 E0012614 3C11DA38 */  lui       $s1, 0xda38
-/* 32E328 E0012618 3C10DE00 */  lui       $s0, 0xde00
-/* 32E32C E001261C 3C0FD838 */  lui       $t7, 0xd838
-/* 32E330 E0012620 35EF0002 */  ori       $t7, $t7, 2
-/* 32E334 E0012624 24190040 */  addiu     $t9, $zero, 0x40
-/* 32E338 E0012628 24E60008 */  addiu     $a2, $a3, 8
-.LE001262C:
-/* 32E33C E001262C 8CE20000 */  lw        $v0, ($a3)
-/* 32E340 E0012630 5040003A */  beql      $v0, $zero, .LE001271C
-/* 32E344 E0012634 25290001 */   addiu    $t1, $t1, 1
-/* 32E348 E0012638 80C20001 */  lb        $v0, 1($a2)
-/* 32E34C E001263C 3C080900 */  lui       $t0, 0x900
-/* 32E350 E0012640 25080E38 */  addiu     $t0, $t0, 0xe38
-/* 32E354 E0012644 10400003 */  beqz      $v0, .LE0012654
-/* 32E358 E0012648 24E40030 */   addiu    $a0, $a3, 0x30
-/* 32E35C E001264C 3C080900 */  lui       $t0, 0x900
-/* 32E360 E0012650 25080E20 */  addiu     $t0, $t0, 0xe20
-.LE0012654:
-/* 32E364 E0012654 24E50070 */  addiu     $a1, $a3, 0x70
-/* 32E368 E0012658 95A20000 */  lhu       $v0, ($t5)
-/* 32E36C E001265C 8DC30000 */  lw        $v1, ($t6)
-/* 32E370 E0012660 00021180 */  sll       $v0, $v0, 6
-/* 32E374 E0012664 00621821 */  addu      $v1, $v1, $v0
-/* 32E378 E0012668 006B1821 */  addu      $v1, $v1, $t3
-.LE001266C:
-/* 32E37C E001266C 8C940000 */  lw        $s4, ($a0)
-/* 32E380 E0012670 8C950004 */  lw        $s5, 4($a0)
-/* 32E384 E0012674 8C960008 */  lw        $s6, 8($a0)
-/* 32E388 E0012678 8C97000C */  lw        $s7, 0xc($a0)
-/* 32E38C E001267C AC740000 */  sw        $s4, ($v1)
-/* 32E390 E0012680 AC750004 */  sw        $s5, 4($v1)
-/* 32E394 E0012684 AC760008 */  sw        $s6, 8($v1)
-/* 32E398 E0012688 AC77000C */  sw        $s7, 0xc($v1)
-/* 32E39C E001268C 24840010 */  addiu     $a0, $a0, 0x10
-/* 32E3A0 E0012690 1485FFF6 */  bne       $a0, $a1, .LE001266C
-/* 32E3A4 E0012694 24630010 */   addiu    $v1, $v1, 0x10
-/* 32E3A8 E0012698 8D440000 */  lw        $a0, ($t2)
-/* 32E3AC E001269C 0080102D */  daddu     $v0, $a0, $zero
-/* 32E3B0 E00126A0 24840008 */  addiu     $a0, $a0, 8
-/* 32E3B4 E00126A4 AD440000 */  sw        $a0, ($t2)
-/* 32E3B8 E00126A8 AC530000 */  sw        $s3, ($v0)
-/* 32E3BC E00126AC AC400004 */  sw        $zero, 4($v0)
-/* 32E3C0 E00126B0 24820008 */  addiu     $v0, $a0, 8
-/* 32E3C4 E00126B4 AD420000 */  sw        $v0, ($t2)
-/* 32E3C8 E00126B8 AC920000 */  sw        $s2, ($a0)
-/* 32E3CC E00126BC 90C50000 */  lbu       $a1, ($a2)
-/* 32E3D0 E00126C0 95A30000 */  lhu       $v1, ($t5)
-/* 32E3D4 E00126C4 24820010 */  addiu     $v0, $a0, 0x10
-/* 32E3D8 E00126C8 AD420000 */  sw        $v0, ($t2)
-/* 32E3DC E00126CC AC910008 */  sw        $s1, 8($a0)
-/* 32E3E0 E00126D0 24620001 */  addiu     $v0, $v1, 1
-/* 32E3E4 E00126D4 3063FFFF */  andi      $v1, $v1, 0xffff
-/* 32E3E8 E00126D8 00031980 */  sll       $v1, $v1, 6
-/* 32E3EC E00126DC 006B1821 */  addu      $v1, $v1, $t3
-/* 32E3F0 E00126E0 A5A20000 */  sh        $v0, ($t5)
-/* 32E3F4 E00126E4 8DC20000 */  lw        $v0, ($t6)
-/* 32E3F8 E00126E8 00B82825 */  or        $a1, $a1, $t8
-/* 32E3FC E00126EC 00431021 */  addu      $v0, $v0, $v1
-/* 32E400 E00126F0 AC82000C */  sw        $v0, 0xc($a0)
-/* 32E404 E00126F4 24820018 */  addiu     $v0, $a0, 0x18
-/* 32E408 E00126F8 AD420000 */  sw        $v0, ($t2)
-/* 32E40C E00126FC 24820020 */  addiu     $v0, $a0, 0x20
-/* 32E410 E0012700 AC900010 */  sw        $s0, 0x10($a0)
-/* 32E414 E0012704 AC880014 */  sw        $t0, 0x14($a0)
-/* 32E418 E0012708 AD420000 */  sw        $v0, ($t2)
-/* 32E41C E001270C AC8F0018 */  sw        $t7, 0x18($a0)
-/* 32E420 E0012710 AC99001C */  sw        $t9, 0x1c($a0)
-/* 32E424 E0012714 AC850004 */  sw        $a1, 4($a0)
-/* 32E428 E0012718 25290001 */  addiu     $t1, $t1, 1
-.LE001271C:
-/* 32E42C E001271C 24C60098 */  addiu     $a2, $a2, 0x98
-/* 32E430 E0012720 8D820008 */  lw        $v0, 8($t4)
-/* 32E434 E0012724 0122102A */  slt       $v0, $t1, $v0
-/* 32E438 E0012728 1440FFC0 */  bnez      $v0, .LE001262C
-/* 32E43C E001272C 24E70098 */   addiu    $a3, $a3, 0x98
-.LE0012730:
-/* 32E440 E0012730 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 32E444 E0012734 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 32E448 E0012738 8C620000 */  lw        $v0, ($v1)
-/* 32E44C E001273C 0040202D */  daddu     $a0, $v0, $zero
-/* 32E450 E0012740 24420008 */  addiu     $v0, $v0, 8
-/* 32E454 E0012744 AC620000 */  sw        $v0, ($v1)
-/* 32E458 E0012748 3C02E700 */  lui       $v0, 0xe700
-/* 32E45C E001274C AC820000 */  sw        $v0, ($a0)
-/* 32E460 E0012750 AC800004 */  sw        $zero, 4($a0)
-/* 32E464 E0012754 8FB7001C */  lw        $s7, 0x1c($sp)
-/* 32E468 E0012758 8FB60018 */  lw        $s6, 0x18($sp)
-/* 32E46C E001275C 8FB50014 */  lw        $s5, 0x14($sp)
-/* 32E470 E0012760 8FB40010 */  lw        $s4, 0x10($sp)
-/* 32E474 E0012764 8FB3000C */  lw        $s3, 0xc($sp)
-/* 32E478 E0012768 8FB20008 */  lw        $s2, 8($sp)
-/* 32E47C E001276C 8FB10004 */  lw        $s1, 4($sp)
-/* 32E480 E0012770 8FB00000 */  lw        $s0, ($sp)
-/* 32E484 E0012774 03E00008 */  jr        $ra
-/* 32E488 E0012778 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 32E48C E001277C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s b/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s
deleted file mode 100644
index 6a4d8aa37b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s
+++ /dev/null
@@ -1,154 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_9_main
-/* 32DF14 E0012204 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* 32DF18 E0012208 F7BE0068 */  sdc1      $f30, 0x68($sp)
-/* 32DF1C E001220C 4485F000 */  mtc1      $a1, $f30
-/* 32DF20 E0012210 AFB40038 */  sw        $s4, 0x38($sp)
-/* 32DF24 E0012214 0080A02D */  daddu     $s4, $a0, $zero
-/* 32DF28 E0012218 F7BA0058 */  sdc1      $f26, 0x58($sp)
-/* 32DF2C E001221C C7BA0080 */  lwc1      $f26, 0x80($sp)
-/* 32DF30 E0012220 27A40010 */  addiu     $a0, $sp, 0x10
-/* 32DF34 E0012224 F7BC0060 */  sdc1      $f28, 0x60($sp)
-/* 32DF38 E0012228 C7BC0084 */  lwc1      $f28, 0x84($sp)
-/* 32DF3C E001222C 3C02E001 */  lui       $v0, %hi(func_E0012440)
-/* 32DF40 E0012230 24422440 */  addiu     $v0, $v0, %lo(func_E0012440)
-/* 32DF44 E0012234 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32DF48 E0012238 3C02E001 */  lui       $v0, %hi(fx_9_update)
-/* 32DF4C E001223C 24422448 */  addiu     $v0, $v0, %lo(fx_9_update)
-/* 32DF50 E0012240 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32DF54 E0012244 3C02E001 */  lui       $v0, %hi(fx_9_render)
-/* 32DF58 E0012248 24422504 */  addiu     $v0, $v0, %lo(fx_9_render)
-/* 32DF5C E001224C AFA20020 */  sw        $v0, 0x20($sp)
-/* 32DF60 E0012250 24020009 */  addiu     $v0, $zero, 9
-/* 32DF64 E0012254 AFBF003C */  sw        $ra, 0x3c($sp)
-/* 32DF68 E0012258 AFB30034 */  sw        $s3, 0x34($sp)
-/* 32DF6C E001225C AFB20030 */  sw        $s2, 0x30($sp)
-/* 32DF70 E0012260 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 32DF74 E0012264 AFB00028 */  sw        $s0, 0x28($sp)
-/* 32DF78 E0012268 F7B80050 */  sdc1      $f24, 0x50($sp)
-/* 32DF7C E001226C F7B60048 */  sdc1      $f22, 0x48($sp)
-/* 32DF80 E0012270 F7B40040 */  sdc1      $f20, 0x40($sp)
-/* 32DF84 E0012274 AFA60078 */  sw        $a2, 0x78($sp)
-/* 32DF88 E0012278 AFA7007C */  sw        $a3, 0x7c($sp)
-/* 32DF8C E001227C AFA00010 */  sw        $zero, 0x10($sp)
-/* 32DF90 E0012280 AFA00024 */  sw        $zero, 0x24($sp)
-/* 32DF94 E0012284 0C080124 */  jal       shim_create_effect_instance
-/* 32DF98 E0012288 AFA20014 */   sw       $v0, 0x14($sp)
-/* 32DF9C E001228C 24040098 */  addiu     $a0, $zero, 0x98
-/* 32DFA0 E0012290 24130001 */  addiu     $s3, $zero, 1
-/* 32DFA4 E0012294 0040802D */  daddu     $s0, $v0, $zero
-/* 32DFA8 E0012298 0C08012C */  jal       shim_general_heap_malloc
-/* 32DFAC E001229C AE130008 */   sw       $s3, 8($s0)
-/* 32DFB0 E00122A0 0040882D */  daddu     $s1, $v0, $zero
-/* 32DFB4 E00122A4 16200003 */  bnez      $s1, .LE00122B4
-/* 32DFB8 E00122A8 AE11000C */   sw       $s1, 0xc($s0)
-.LE00122AC:
-/* 32DFBC E00122AC 080048AB */  j         .LE00122AC
-/* 32DFC0 E00122B0 00000000 */   nop
-.LE00122B4:
-/* 32DFC4 E00122B4 0220202D */  daddu     $a0, $s1, $zero
-/* 32DFC8 E00122B8 00132880 */  sll       $a1, $s3, 2
-/* 32DFCC E00122BC 00B32821 */  addu      $a1, $a1, $s3
-/* 32DFD0 E00122C0 00052880 */  sll       $a1, $a1, 2
-/* 32DFD4 E00122C4 00B32823 */  subu      $a1, $a1, $s3
-/* 32DFD8 E00122C8 0C080130 */  jal       shim_mem_clear
-/* 32DFDC E00122CC 000528C0 */   sll      $a1, $a1, 3
-/* 32DFE0 E00122D0 0000902D */  daddu     $s2, $zero, $zero
-/* 32DFE4 E00122D4 0253102A */  slt       $v0, $s2, $s3
-/* 32DFE8 E00122D8 1040004B */  beqz      $v0, .LE0012408
-/* 32DFEC E00122DC 26300094 */   addiu    $s0, $s1, 0x94
-/* 32DFF0 E00122E0 3C013F80 */  lui       $at, 0x3f80
-/* 32DFF4 E00122E4 4481B000 */  mtc1      $at, $f22
-/* 32DFF8 E00122E8 4480C000 */  mtc1      $zero, $f24
-.LE00122EC:
-/* 32DFFC E00122EC 24020001 */  addiu     $v0, $zero, 1
-/* 32E000 E00122F0 AE220000 */  sw        $v0, ($s1)
-/* 32E004 E00122F4 A614FF70 */  sh        $s4, -0x90($s0)
-/* 32E008 E00122F8 AE00FFE8 */  sw        $zero, -0x18($s0)
-/* 32E00C E00122FC E61EFF78 */  swc1      $f30, -0x88($s0)
-/* 32E010 E0012300 C7A60078 */  lwc1      $f6, 0x78($sp)
-/* 32E014 E0012304 3C0140AC */  lui       $at, 0x40ac
-/* 32E018 E0012308 3421CCCD */  ori       $at, $at, 0xcccd
-/* 32E01C E001230C 44810000 */  mtc1      $at, $f0
-/* 32E020 E0012310 240200FF */  addiu     $v0, $zero, 0xff
-/* 32E024 E0012314 E606FF7C */  swc1      $f6, -0x84($s0)
-/* 32E028 E0012318 C7A6007C */  lwc1      $f6, 0x7c($sp)
-/* 32E02C E001231C 4618E032 */  c.eq.s    $f28, $f24
-/* 32E030 E0012320 E616FF84 */  swc1      $f22, -0x7c($s0)
-/* 32E034 E0012324 E616FF88 */  swc1      $f22, -0x78($s0)
-/* 32E038 E0012328 E616FF8C */  swc1      $f22, -0x74($s0)
-/* 32E03C E001232C A202FF74 */  sb        $v0, -0x8c($s0)
-/* 32E040 E0012330 E616FFE4 */  swc1      $f22, -0x1c($s0)
-/* 32E044 E0012334 E600FFE0 */  swc1      $f0, -0x20($s0)
-/* 32E048 E0012338 45010005 */  bc1t      .LE0012350
-/* 32E04C E001233C E606FF80 */   swc1     $f6, -0x80($s0)
-/* 32E050 E0012340 3C01C120 */  lui       $at, 0xc120
-/* 32E054 E0012344 44810000 */  mtc1      $at, $f0
-/* 32E058 E0012348 080048D8 */  j         .LE0012360
-/* 32E05C E001234C E600FFDC */   swc1     $f0, -0x24($s0)
-.LE0012350:
-/* 32E060 E0012350 3C014120 */  lui       $at, 0x4120
-/* 32E064 E0012354 44810000 */  mtc1      $at, $f0
-/* 32E068 E0012358 00000000 */  nop
-/* 32E06C E001235C E600FFDC */  swc1      $f0, -0x24($s0)
-.LE0012360:
-/* 32E070 E0012360 24040064 */  addiu     $a0, $zero, 0x64
-/* 32E074 E0012364 3C013F00 */  lui       $at, 0x3f00
-/* 32E078 E0012368 44810000 */  mtc1      $at, $f0
-/* 32E07C E001236C 3C01BD8F */  lui       $at, 0xbd8f
-/* 32E080 E0012370 34215C29 */  ori       $at, $at, 0x5c29
-/* 32E084 E0012374 44811000 */  mtc1      $at, $f2
-/* 32E088 E0012378 3C013B44 */  lui       $at, 0x3b44
-/* 32E08C E001237C 34219BA6 */  ori       $at, $at, 0x9ba6
-/* 32E090 E0012380 44812000 */  mtc1      $at, $f4
-/* 32E094 E0012384 2402000F */  addiu     $v0, $zero, 0xf
-/* 32E098 E0012388 AE00FFF8 */  sw        $zero, -8($s0)
-/* 32E09C E001238C A602FF72 */  sh        $v0, -0x8e($s0)
-/* 32E0A0 E0012390 E61AFF94 */  swc1      $f26, -0x6c($s0)
-/* 32E0A4 E0012394 AE00FF90 */  sw        $zero, -0x70($s0)
-/* 32E0A8 E0012398 AE00FF98 */  sw        $zero, -0x68($s0)
-/* 32E0AC E001239C E600FFEC */  swc1      $f0, -0x14($s0)
-/* 32E0B0 E00123A0 E602FFF0 */  swc1      $f2, -0x10($s0)
-/* 32E0B4 E00123A4 0C080138 */  jal       shim_rand_int
-/* 32E0B8 E00123A8 E604FFF4 */   swc1     $f4, -0xc($s0)
-/* 32E0BC E00123AC 00021103 */  sra       $v0, $v0, 4
-/* 32E0C0 E00123B0 30420001 */  andi      $v0, $v0, 1
-/* 32E0C4 E00123B4 4618E032 */  c.eq.s    $f28, $f24
-/* 32E0C8 E00123B8 3C0142B4 */  lui       $at, 0x42b4
-/* 32E0CC E00123BC 44810000 */  mtc1      $at, $f0
-/* 32E0D0 E00123C0 45010003 */  bc1t      .LE00123D0
-/* 32E0D4 E00123C4 A202FF75 */   sb       $v0, -0x8b($s0)
-/* 32E0D8 E00123C8 3C01C2B4 */  lui       $at, 0xc2b4
-/* 32E0DC E00123CC 44810000 */  mtc1      $at, $f0
-.LE00123D0:
-/* 32E0E0 E00123D0 0C08013C */  jal       shim_clamp_angle
-/* 32E0E4 E00123D4 4600D300 */   add.s    $f12, $f26, $f0
-/* 32E0E8 E00123D8 46000506 */  mov.s     $f20, $f0
-/* 32E0EC E00123DC 0C080140 */  jal       shim_sin_deg
-/* 32E0F0 E00123E0 4600A306 */   mov.s    $f12, $f20
-/* 32E0F4 E00123E4 4600A306 */  mov.s     $f12, $f20
-/* 32E0F8 E00123E8 0C080144 */  jal       shim_cos_deg
-/* 32E0FC E00123EC E600FFFC */   swc1     $f0, -4($s0)
-/* 32E100 E00123F0 26520001 */  addiu     $s2, $s2, 1
-/* 32E104 E00123F4 E6000000 */  swc1      $f0, ($s0)
-/* 32E108 E00123F8 26100098 */  addiu     $s0, $s0, 0x98
-/* 32E10C E00123FC 0253102A */  slt       $v0, $s2, $s3
-/* 32E110 E0012400 1440FFBA */  bnez      $v0, .LE00122EC
-/* 32E114 E0012404 26310098 */   addiu    $s1, $s1, 0x98
-.LE0012408:
-/* 32E118 E0012408 8FBF003C */  lw        $ra, 0x3c($sp)
-/* 32E11C E001240C 8FB40038 */  lw        $s4, 0x38($sp)
-/* 32E120 E0012410 8FB30034 */  lw        $s3, 0x34($sp)
-/* 32E124 E0012414 8FB20030 */  lw        $s2, 0x30($sp)
-/* 32E128 E0012418 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 32E12C E001241C 8FB00028 */  lw        $s0, 0x28($sp)
-/* 32E130 E0012420 D7BE0068 */  ldc1      $f30, 0x68($sp)
-/* 32E134 E0012424 D7BC0060 */  ldc1      $f28, 0x60($sp)
-/* 32E138 E0012428 D7BA0058 */  ldc1      $f26, 0x58($sp)
-/* 32E13C E001242C D7B80050 */  ldc1      $f24, 0x50($sp)
-/* 32E140 E0012430 D7B60048 */  ldc1      $f22, 0x48($sp)
-/* 32E144 E0012434 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* 32E148 E0012438 03E00008 */  jr        $ra
-/* 32E14C E001243C 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s
rename to ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s
index 65252dac3d..24d84462c8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B457C
+glabel fx_90_appendGfx
 /* 3B626C E00B457C 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 3B6270 E00B4580 0080282D */  daddu     $a1, $a0, $zero
 /* 3B6274 E00B4584 3C06DB06 */  lui       $a2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s
index d6e03574ab..6cf6767132 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s
@@ -14,14 +14,14 @@ glabel fx_90_main
 /* 3B5D14 E00B4024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B5D18 E00B4028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B5D1C E00B402C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B5D20 E00B4030 3C02E00B */  lui       $v0, %hi(func_E00B4134)
-/* 3B5D24 E00B4034 24424134 */  addiu     $v0, $v0, %lo(func_E00B4134)
+/* 3B5D20 E00B4030 3C02E00B */  lui       $v0, %hi(fx_90_init)
+/* 3B5D24 E00B4034 24424134 */  addiu     $v0, $v0, %lo(fx_90_init)
 /* 3B5D28 E00B4038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B5D2C E00B403C 3C02E00B */  lui       $v0, %hi(func_E00B413C)
-/* 3B5D30 E00B4040 2442413C */  addiu     $v0, $v0, %lo(func_E00B413C)
+/* 3B5D2C E00B403C 3C02E00B */  lui       $v0, %hi(fx_90_update)
+/* 3B5D30 E00B4040 2442413C */  addiu     $v0, $v0, %lo(fx_90_update)
 /* 3B5D34 E00B4044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B5D38 E00B4048 3C02E00B */  lui       $v0, %hi(func_E00B452C)
-/* 3B5D3C E00B404C 2442452C */  addiu     $v0, $v0, %lo(func_E00B452C)
+/* 3B5D38 E00B4048 3C02E00B */  lui       $v0, %hi(fx_90_render)
+/* 3B5D3C E00B404C 2442452C */  addiu     $v0, $v0, %lo(fx_90_render)
 /* 3B5D40 E00B4050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B5D44 E00B4054 2402005A */  addiu     $v0, $zero, 0x5a
 /* 3B5D48 E00B4058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s
rename to ver/us/asm/nonmatchings/effects/effect_90/fx_90_render.s
index ac01abb2bf..529a0c057f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B452C
+glabel fx_90_render
 /* 3B621C E00B452C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B6220 E00B4530 3C02E00B */  lui       $v0, %hi(func_E00B457C)
-/* 3B6224 E00B4534 2442457C */  addiu     $v0, $v0, %lo(func_E00B457C)
+/* 3B6220 E00B4530 3C02E00B */  lui       $v0, %hi(fx_90_appendGfx)
+/* 3B6224 E00B4534 2442457C */  addiu     $v0, $v0, %lo(fx_90_appendGfx)
 /* 3B6228 E00B4538 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B622C E00B453C 24020014 */  addiu     $v0, $zero, 0x14
 /* 3B6230 E00B4540 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s
rename to ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s
index fe29464608..5c2f75a555 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B413C
+glabel fx_90_update
 /* 3B5E2C E00B413C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3B5E30 E00B4140 AFB20020 */  sw        $s2, 0x20($sp)
 /* 3B5E34 E00B4144 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s
rename to ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s
index deb68693b0..a4438efca6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B62E0
+glabel fx_91_appendGfx
 /* 3B7440 E00B62E0 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3B7444 E00B62E4 0080302D */  daddu     $a2, $a0, $zero
 /* 3B7448 E00B62E8 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s
index 7e209cd39f..b10d4e1aa7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s
@@ -14,14 +14,14 @@ glabel fx_91_main
 /* 3B7184 E00B6024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B7188 E00B6028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3B718C E00B602C 8FB00074 */  lw        $s0, 0x74($sp)
-/* 3B7190 E00B6030 3C02E00B */  lui       $v0, %hi(func_E00B6178)
-/* 3B7194 E00B6034 24426178 */  addiu     $v0, $v0, %lo(func_E00B6178)
+/* 3B7190 E00B6030 3C02E00B */  lui       $v0, %hi(fx_91_init)
+/* 3B7194 E00B6034 24426178 */  addiu     $v0, $v0, %lo(fx_91_init)
 /* 3B7198 E00B6038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B719C E00B603C 3C02E00B */  lui       $v0, %hi(func_E00B6180)
-/* 3B71A0 E00B6040 24426180 */  addiu     $v0, $v0, %lo(func_E00B6180)
+/* 3B719C E00B603C 3C02E00B */  lui       $v0, %hi(fx_91_update)
+/* 3B71A0 E00B6040 24426180 */  addiu     $v0, $v0, %lo(fx_91_update)
 /* 3B71A4 E00B6044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B71A8 E00B6048 3C02E00B */  lui       $v0, %hi(func_E00B629C)
-/* 3B71AC E00B604C 2442629C */  addiu     $v0, $v0, %lo(func_E00B629C)
+/* 3B71A8 E00B6048 3C02E00B */  lui       $v0, %hi(fx_91_render)
+/* 3B71AC E00B604C 2442629C */  addiu     $v0, $v0, %lo(fx_91_render)
 /* 3B71B0 E00B6050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B71B4 E00B6054 2402005B */  addiu     $v0, $zero, 0x5b
 /* 3B71B8 E00B6058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s
rename to ver/us/asm/nonmatchings/effects/effect_91/fx_91_render.s
index 9e521461ab..e53a09d49a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B629C
+glabel fx_91_render
 /* 3B73FC E00B629C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B7400 E00B62A0 3C02E00B */  lui       $v0, %hi(func_E00B62E0)
-/* 3B7404 E00B62A4 244262E0 */  addiu     $v0, $v0, %lo(func_E00B62E0)
+/* 3B7400 E00B62A0 3C02E00B */  lui       $v0, %hi(fx_91_appendGfx)
+/* 3B7404 E00B62A4 244262E0 */  addiu     $v0, $v0, %lo(fx_91_appendGfx)
 /* 3B7408 E00B62A8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B740C E00B62AC 2402000A */  addiu     $v0, $zero, 0xa
 /* 3B7410 E00B62B0 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s
rename to ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s
index d9490fce86..a2d5d3c222 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s
+++ b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B6180
+glabel fx_91_update
 /* 3B72E0 E00B6180 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3B72E4 E00B6184 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3B72E8 E00B6188 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s
rename to ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s
index 88068c246c..acc232d20f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s
+++ b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B8208
+glabel fx_92_appendGfx
 /* 3B7D88 E00B8208 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 3B7D8C E00B820C 0080302D */  daddu     $a2, $a0, $zero
 /* 3B7D90 E00B8210 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s
index f1c0f6ee85..33d0f989b9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s
@@ -14,14 +14,14 @@ glabel fx_92_main
 /* 3B7BA4 E00B8024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B7BA8 E00B8028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B7BAC E00B802C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B7BB0 E00B8030 3C02E00C */  lui       $v0, %hi(func_E00B812C)
-/* 3B7BB4 E00B8034 2442812C */  addiu     $v0, $v0, %lo(func_E00B812C)
+/* 3B7BB0 E00B8030 3C02E00C */  lui       $v0, %hi(fx_92_init)
+/* 3B7BB4 E00B8034 2442812C */  addiu     $v0, $v0, %lo(fx_92_init)
 /* 3B7BB8 E00B8038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B7BBC E00B803C 3C02E00C */  lui       $v0, %hi(func_E00B8134)
-/* 3B7BC0 E00B8040 24428134 */  addiu     $v0, $v0, %lo(func_E00B8134)
+/* 3B7BBC E00B803C 3C02E00C */  lui       $v0, %hi(fx_92_update)
+/* 3B7BC0 E00B8040 24428134 */  addiu     $v0, $v0, %lo(fx_92_update)
 /* 3B7BC4 E00B8044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B7BC8 E00B8048 3C02E00C */  lui       $v0, %hi(func_E00B81B8)
-/* 3B7BCC E00B804C 244281B8 */  addiu     $v0, $v0, %lo(func_E00B81B8)
+/* 3B7BC8 E00B8048 3C02E00C */  lui       $v0, %hi(fx_92_render)
+/* 3B7BCC E00B804C 244281B8 */  addiu     $v0, $v0, %lo(fx_92_render)
 /* 3B7BD0 E00B8050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B7BD4 E00B8054 2402005C */  addiu     $v0, $zero, 0x5c
 /* 3B7BD8 E00B8058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s
rename to ver/us/asm/nonmatchings/effects/effect_92/fx_92_render.s
index 7ec6157536..4ae2063e32 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B81B8
+glabel fx_92_render
 /* 3B7D38 E00B81B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B7D3C E00B81BC 3C02E00C */  lui       $v0, %hi(func_E00B8208)
-/* 3B7D40 E00B81C0 24428208 */  addiu     $v0, $v0, %lo(func_E00B8208)
+/* 3B7D3C E00B81BC 3C02E00C */  lui       $v0, %hi(fx_92_appendGfx)
+/* 3B7D40 E00B81C0 24428208 */  addiu     $v0, $v0, %lo(fx_92_appendGfx)
 /* 3B7D44 E00B81C4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B7D48 E00B81C8 2402000A */  addiu     $v0, $zero, 0xa
 /* 3B7D4C E00B81CC AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s
rename to ver/us/asm/nonmatchings/effects/effect_92/fx_92_update.s
index e65bab3490..5a8529fd43 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s
+++ b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00B8134
+glabel fx_92_update
 /* 3B7CB4 E00B8134 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3B7CB8 E00B8138 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3B7CBC E00B813C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s
rename to ver/us/asm/nonmatchings/effects/effect_93/fx_93_appendGfx.s
index 6fe2b4b13c..270d4fd58f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s
+++ b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BA620
+glabel fx_93_appendGfx
 /* 3B91F0 E00BA620 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3B91F4 E00BA624 3C06DB06 */  lui       $a2, 0xdb06
 /* 3B91F8 E00BA628 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s
index 135481d43e..29fef03c89 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s
@@ -14,14 +14,14 @@ glabel fx_93_main
 /* 3B8BF4 E00BA024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B8BF8 E00BA028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B8BFC E00BA02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B8C00 E00BA030 3C02E00C */  lui       $v0, %hi(func_E00BA16C)
-/* 3B8C04 E00BA034 2442A16C */  addiu     $v0, $v0, %lo(func_E00BA16C)
+/* 3B8C00 E00BA030 3C02E00C */  lui       $v0, %hi(fx_93_init)
+/* 3B8C04 E00BA034 2442A16C */  addiu     $v0, $v0, %lo(fx_93_init)
 /* 3B8C08 E00BA038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B8C0C E00BA03C 3C02E00C */  lui       $v0, %hi(func_E00BA174)
-/* 3B8C10 E00BA040 2442A174 */  addiu     $v0, $v0, %lo(func_E00BA174)
+/* 3B8C0C E00BA03C 3C02E00C */  lui       $v0, %hi(fx_93_update)
+/* 3B8C10 E00BA040 2442A174 */  addiu     $v0, $v0, %lo(fx_93_update)
 /* 3B8C14 E00BA044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B8C18 E00BA048 3C02E00C */  lui       $v0, %hi(func_E00BA5DC)
-/* 3B8C1C E00BA04C 2442A5DC */  addiu     $v0, $v0, %lo(func_E00BA5DC)
+/* 3B8C18 E00BA048 3C02E00C */  lui       $v0, %hi(fx_93_render)
+/* 3B8C1C E00BA04C 2442A5DC */  addiu     $v0, $v0, %lo(fx_93_render)
 /* 3B8C20 E00BA050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B8C24 E00BA054 2402005D */  addiu     $v0, $zero, 0x5d
 /* 3B8C28 E00BA058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s
rename to ver/us/asm/nonmatchings/effects/effect_93/fx_93_render.s
index c03d4fc403..9d5e4d6e26 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BA5DC
+glabel fx_93_render
 /* 3B91AC E00BA5DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3B91B0 E00BA5E0 3C02E00C */  lui       $v0, %hi(func_E00BA620)
-/* 3B91B4 E00BA5E4 2442A620 */  addiu     $v0, $v0, %lo(func_E00BA620)
+/* 3B91B0 E00BA5E0 3C02E00C */  lui       $v0, %hi(fx_93_appendGfx)
+/* 3B91B4 E00BA5E4 2442A620 */  addiu     $v0, $v0, %lo(fx_93_appendGfx)
 /* 3B91B8 E00BA5E8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3B91BC E00BA5EC 24020064 */  addiu     $v0, $zero, 0x64
 /* 3B91C0 E00BA5F0 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s
rename to ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s
index 43b02f719a..a9add86207 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s
+++ b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BA174
+glabel fx_93_update
 /* 3B8D44 E00BA174 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3B8D48 E00BA178 AFBF0024 */  sw        $ra, 0x24($sp)
 /* 3B8D4C E00BA17C AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s
rename to ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s
index 88c0e619b2..56dced69f7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s
+++ b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BC374
+glabel fx_94_appendGfx
 /* 3BA3A4 E00BC374 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 3BA3A8 E00BC378 0080482D */  daddu     $t1, $a0, $zero
 /* 3BA3AC E00BC37C 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s
index e32ce50c15..2e7daba7f1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s
@@ -20,14 +20,14 @@ glabel fx_94_main
 /* 3BA06C E00BC03C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3BA070 E00BC040 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3BA074 E00BC044 8FB10090 */  lw        $s1, 0x90($sp)
-/* 3BA078 E00BC048 3C02E00C */  lui       $v0, %hi(func_E00BC1D0)
-/* 3BA07C E00BC04C 2442C1D0 */  addiu     $v0, $v0, %lo(func_E00BC1D0)
+/* 3BA078 E00BC048 3C02E00C */  lui       $v0, %hi(fx_94_init)
+/* 3BA07C E00BC04C 2442C1D0 */  addiu     $v0, $v0, %lo(fx_94_init)
 /* 3BA080 E00BC050 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3BA084 E00BC054 3C02E00C */  lui       $v0, %hi(func_E00BC238)
-/* 3BA088 E00BC058 2442C238 */  addiu     $v0, $v0, %lo(func_E00BC238)
+/* 3BA084 E00BC054 3C02E00C */  lui       $v0, %hi(fx_94_update)
+/* 3BA088 E00BC058 2442C238 */  addiu     $v0, $v0, %lo(fx_94_update)
 /* 3BA08C E00BC05C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3BA090 E00BC060 3C02E00C */  lui       $v0, %hi(func_E00BC2E8)
-/* 3BA094 E00BC064 2442C2E8 */  addiu     $v0, $v0, %lo(func_E00BC2E8)
+/* 3BA090 E00BC060 3C02E00C */  lui       $v0, %hi(fx_94_render)
+/* 3BA094 E00BC064 2442C2E8 */  addiu     $v0, $v0, %lo(fx_94_render)
 /* 3BA098 E00BC068 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3BA09C E00BC06C 2402005E */  addiu     $v0, $zero, 0x5e
 /* 3BA0A0 E00BC070 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_render.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s
rename to ver/us/asm/nonmatchings/effects/effect_94/fx_94_render.s
index 9dacc7e0f6..c11b169102 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s
+++ b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_render.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BC2E8
+glabel fx_94_render
 /* 3BA318 E00BC2E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3BA31C E00BC2EC AFBF0020 */  sw        $ra, 0x20($sp)
 /* 3BA320 E00BC2F0 8C85000C */  lw        $a1, 0xc($a0)
-/* 3BA324 E00BC2F4 3C02E00C */  lui       $v0, %hi(func_E00BC374)
-/* 3BA328 E00BC2F8 2442C374 */  addiu     $v0, $v0, %lo(func_E00BC374)
+/* 3BA324 E00BC2F4 3C02E00C */  lui       $v0, %hi(fx_94_appendGfx)
+/* 3BA328 E00BC2F8 2442C374 */  addiu     $v0, $v0, %lo(fx_94_appendGfx)
 /* 3BA32C E00BC2FC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3BA330 E00BC300 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* 3BA334 E00BC304 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s
rename to ver/us/asm/nonmatchings/effects/effect_94/fx_94_update.s
index bd91735257..09db93580f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s
+++ b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BC238
+glabel fx_94_update
 /* 3BA268 E00BC238 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3BA26C E00BC23C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3BA270 E00BC240 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s
rename to ver/us/asm/nonmatchings/effects/effect_95/fx_95_appendGfx.s
index bdcdcb024d..7b930dad01 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BE5BC
+glabel fx_95_appendGfx
 /* 3BC51C E00BE5BC 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3BC520 E00BE5C0 3C05DB06 */  lui       $a1, 0xdb06
 /* 3BC524 E00BE5C4 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s
index bbe6b39063..5be56a5806 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s
@@ -30,14 +30,14 @@ glabel fx_95_main
 .LE00BE064:
 /* 3BBFC4 E00BE064 2410000B */  addiu     $s0, $zero, 0xb
 .LE00BE068:
-/* 3BBFC8 E00BE068 3C02E00C */  lui       $v0, %hi(func_E00BE39C)
-/* 3BBFCC E00BE06C 2442E39C */  addiu     $v0, $v0, %lo(func_E00BE39C)
+/* 3BBFC8 E00BE068 3C02E00C */  lui       $v0, %hi(fx_95_init)
+/* 3BBFCC E00BE06C 2442E39C */  addiu     $v0, $v0, %lo(fx_95_init)
 /* 3BBFD0 E00BE070 AC820008 */  sw        $v0, 8($a0)
-/* 3BBFD4 E00BE074 3C02E00C */  lui       $v0, %hi(func_E00BE3A4)
-/* 3BBFD8 E00BE078 2442E3A4 */  addiu     $v0, $v0, %lo(func_E00BE3A4)
+/* 3BBFD4 E00BE074 3C02E00C */  lui       $v0, %hi(fx_95_update)
+/* 3BBFD8 E00BE078 2442E3A4 */  addiu     $v0, $v0, %lo(fx_95_update)
 /* 3BBFDC E00BE07C AC82000C */  sw        $v0, 0xc($a0)
-/* 3BBFE0 E00BE080 3C02E00C */  lui       $v0, %hi(func_E00BE578)
-/* 3BBFE4 E00BE084 2442E578 */  addiu     $v0, $v0, %lo(func_E00BE578)
+/* 3BBFE0 E00BE080 3C02E00C */  lui       $v0, %hi(fx_95_render)
+/* 3BBFE4 E00BE084 2442E578 */  addiu     $v0, $v0, %lo(fx_95_render)
 /* 3BBFE8 E00BE088 AC820010 */  sw        $v0, 0x10($a0)
 /* 3BBFEC E00BE08C 2402005F */  addiu     $v0, $zero, 0x5f
 /* 3BBFF0 E00BE090 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s
rename to ver/us/asm/nonmatchings/effects/effect_95/fx_95_render.s
index 221a7f8bf3..076eeae222 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s
+++ b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BE578
+glabel fx_95_render
 /* 3BC4D8 E00BE578 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3BC4DC E00BE57C 3C02E00C */  lui       $v0, %hi(func_E00BE5BC)
-/* 3BC4E0 E00BE580 2442E5BC */  addiu     $v0, $v0, %lo(func_E00BE5BC)
+/* 3BC4DC E00BE57C 3C02E00C */  lui       $v0, %hi(fx_95_appendGfx)
+/* 3BC4E0 E00BE580 2442E5BC */  addiu     $v0, $v0, %lo(fx_95_appendGfx)
 /* 3BC4E4 E00BE584 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3BC4E8 E00BE588 2402000A */  addiu     $v0, $zero, 0xa
 /* 3BC4EC E00BE58C AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s
rename to ver/us/asm/nonmatchings/effects/effect_95/fx_95_update.s
index 9ab2165e4e..027ac719b2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00BE3A4
+glabel fx_95_update
 /* 3BC304 E00BE3A4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 3BC308 E00BE3A8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3BC30C E00BE3AC F7B40018 */  sdc1      $f20, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s
rename to ver/us/asm/nonmatchings/effects/effect_96/fx_96_appendGfx.s
index 21ebc6b8ab..14c3dacca0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s
+++ b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C0760
+glabel fx_96_appendGfx
 /* 3BD4C0 E00C0760 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3BD4C4 E00C0764 0080282D */  daddu     $a1, $a0, $zero
 /* 3BD4C8 E00C0768 3C06DB06 */  lui       $a2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s
index 24b3bfd187..4dcfe5a832 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s
@@ -14,14 +14,14 @@ glabel fx_96_main
 /* 3BCD84 E00C0024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3BCD88 E00C0028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3BCD8C E00C002C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3BCD90 E00C0030 3C02E00C */  lui       $v0, %hi(func_E00C0158)
-/* 3BCD94 E00C0034 24420158 */  addiu     $v0, $v0, %lo(func_E00C0158)
+/* 3BCD90 E00C0030 3C02E00C */  lui       $v0, %hi(fx_96_init)
+/* 3BCD94 E00C0034 24420158 */  addiu     $v0, $v0, %lo(fx_96_init)
 /* 3BCD98 E00C0038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3BCD9C E00C003C 3C02E00C */  lui       $v0, %hi(func_E00C0160)
-/* 3BCDA0 E00C0040 24420160 */  addiu     $v0, $v0, %lo(func_E00C0160)
+/* 3BCD9C E00C003C 3C02E00C */  lui       $v0, %hi(fx_96_update)
+/* 3BCDA0 E00C0040 24420160 */  addiu     $v0, $v0, %lo(fx_96_update)
 /* 3BCDA4 E00C0044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3BCDA8 E00C0048 3C02E00C */  lui       $v0, %hi(func_E00C0710)
-/* 3BCDAC E00C004C 24420710 */  addiu     $v0, $v0, %lo(func_E00C0710)
+/* 3BCDA8 E00C0048 3C02E00C */  lui       $v0, %hi(fx_96_render)
+/* 3BCDAC E00C004C 24420710 */  addiu     $v0, $v0, %lo(fx_96_render)
 /* 3BCDB0 E00C0050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3BCDB4 E00C0054 24020060 */  addiu     $v0, $zero, 0x60
 /* 3BCDB8 E00C0058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s
rename to ver/us/asm/nonmatchings/effects/effect_96/fx_96_render.s
index 81a6841014..0fbb22a897 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s
+++ b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C0710
+glabel fx_96_render
 /* 3BD470 E00C0710 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3BD474 E00C0714 3C02E00C */  lui       $v0, %hi(func_E00C0760)
-/* 3BD478 E00C0718 24420760 */  addiu     $v0, $v0, %lo(func_E00C0760)
+/* 3BD474 E00C0714 3C02E00C */  lui       $v0, %hi(fx_96_appendGfx)
+/* 3BD478 E00C0718 24420760 */  addiu     $v0, $v0, %lo(fx_96_appendGfx)
 /* 3BD47C E00C071C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3BD480 E00C0720 2402FFF6 */  addiu     $v0, $zero, -0xa
 /* 3BD484 E00C0724 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s
rename to ver/us/asm/nonmatchings/effects/effect_96/fx_96_update.s
index 6a5697113e..6beaa4b078 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s
+++ b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C0160
+glabel fx_96_update
 /* 3BCEC0 E00C0160 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3BCEC4 E00C0164 AFBF002C */  sw        $ra, 0x2c($sp)
 /* 3BCEC8 E00C0168 AFB00028 */  sw        $s0, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s
rename to ver/us/asm/nonmatchings/effects/effect_97/fx_97_appendGfx.s
index afbc9078d5..b31d67b7d3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C221C
+glabel fx_97_appendGfx
 /* 3C13EC E00C221C 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3C13F0 E00C2220 0080302D */  daddu     $a2, $a0, $zero
 /* 3C13F4 E00C2224 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s
index cb3551a23b..353b7cf42e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s
@@ -14,14 +14,14 @@ glabel fx_97_main
 /* 3C11F4 E00C2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3C11F8 E00C2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3C11FC E00C202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3C1200 E00C2030 3C02E00C */  lui       $v0, %hi(func_E00C2124)
-/* 3C1204 E00C2034 24422124 */  addiu     $v0, $v0, %lo(func_E00C2124)
+/* 3C1200 E00C2030 3C02E00C */  lui       $v0, %hi(fx_97_init)
+/* 3C1204 E00C2034 24422124 */  addiu     $v0, $v0, %lo(fx_97_init)
 /* 3C1208 E00C2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3C120C E00C203C 3C02E00C */  lui       $v0, %hi(func_E00C212C)
-/* 3C1210 E00C2040 2442212C */  addiu     $v0, $v0, %lo(func_E00C212C)
+/* 3C120C E00C203C 3C02E00C */  lui       $v0, %hi(fx_97_update)
+/* 3C1210 E00C2040 2442212C */  addiu     $v0, $v0, %lo(fx_97_update)
 /* 3C1214 E00C2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3C1218 E00C2048 3C02E00C */  lui       $v0, %hi(func_E00C21CC)
-/* 3C121C E00C204C 244221CC */  addiu     $v0, $v0, %lo(func_E00C21CC)
+/* 3C1218 E00C2048 3C02E00C */  lui       $v0, %hi(fx_97_render)
+/* 3C121C E00C204C 244221CC */  addiu     $v0, $v0, %lo(fx_97_render)
 /* 3C1220 E00C2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3C1224 E00C2054 24020061 */  addiu     $v0, $zero, 0x61
 /* 3C1228 E00C2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s
rename to ver/us/asm/nonmatchings/effects/effect_97/fx_97_render.s
index c3606f7b5a..0114004b8e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s
+++ b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C21CC
+glabel fx_97_render
 /* 3C139C E00C21CC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3C13A0 E00C21D0 3C02E00C */  lui       $v0, %hi(func_E00C221C)
-/* 3C13A4 E00C21D4 2442221C */  addiu     $v0, $v0, %lo(func_E00C221C)
+/* 3C13A0 E00C21D0 3C02E00C */  lui       $v0, %hi(fx_97_appendGfx)
+/* 3C13A4 E00C21D4 2442221C */  addiu     $v0, $v0, %lo(fx_97_appendGfx)
 /* 3C13A8 E00C21D8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3C13AC E00C21DC 2402000A */  addiu     $v0, $zero, 0xa
 /* 3C13B0 E00C21E0 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s
rename to ver/us/asm/nonmatchings/effects/effect_97/fx_97_update.s
index c714c986d6..bf5f6e407e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C212C
+glabel fx_97_update
 /* 3C12FC E00C212C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3C1300 E00C2130 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3C1304 E00C2134 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s
rename to ver/us/asm/nonmatchings/effects/effect_98/fx_98_appendGfx.s
index a1a2973d66..93451670d9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s
+++ b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C4308
+glabel fx_98_appendGfx
 /* 3CB0F8 E00C4308 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 3CB0FC E00C430C 0080302D */  daddu     $a2, $a0, $zero
 /* 3CB100 E00C4310 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s
index 839f888f6b..10e7d212ff 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s
@@ -14,14 +14,14 @@ glabel fx_98_main
 /* 3CAE14 E00C4024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3CAE18 E00C4028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3CAE1C E00C402C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3CAE20 E00C4030 3C02E00C */  lui       $v0, %hi(func_E00C4170)
-/* 3CAE24 E00C4034 24424170 */  addiu     $v0, $v0, %lo(func_E00C4170)
+/* 3CAE20 E00C4030 3C02E00C */  lui       $v0, %hi(fx_98_init)
+/* 3CAE24 E00C4034 24424170 */  addiu     $v0, $v0, %lo(fx_98_init)
 /* 3CAE28 E00C4038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3CAE2C E00C403C 3C02E00C */  lui       $v0, %hi(func_E00C4178)
-/* 3CAE30 E00C4040 24424178 */  addiu     $v0, $v0, %lo(func_E00C4178)
+/* 3CAE2C E00C403C 3C02E00C */  lui       $v0, %hi(fx_98_update)
+/* 3CAE30 E00C4040 24424178 */  addiu     $v0, $v0, %lo(fx_98_update)
 /* 3CAE34 E00C4044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3CAE38 E00C4048 3C02E00C */  lui       $v0, %hi(func_E00C42C4)
-/* 3CAE3C E00C404C 244242C4 */  addiu     $v0, $v0, %lo(func_E00C42C4)
+/* 3CAE38 E00C4048 3C02E00C */  lui       $v0, %hi(fx_98_render)
+/* 3CAE3C E00C404C 244242C4 */  addiu     $v0, $v0, %lo(fx_98_render)
 /* 3CAE40 E00C4050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3CAE44 E00C4054 24020062 */  addiu     $v0, $zero, 0x62
 /* 3CAE48 E00C4058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_render.s
similarity index 83%
rename from ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s
rename to ver/us/asm/nonmatchings/effects/effect_98/fx_98_render.s
index 2cf0887906..4b9a1bafb3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s
+++ b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C42C4
+glabel fx_98_render
 /* 3CB0B4 E00C42C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3CB0B8 E00C42C8 3C02E00C */  lui       $v0, %hi(func_E00C4308)
-/* 3CB0BC E00C42CC 24424308 */  addiu     $v0, $v0, %lo(func_E00C4308)
+/* 3CB0B8 E00C42C8 3C02E00C */  lui       $v0, %hi(fx_98_appendGfx)
+/* 3CB0BC E00C42CC 24424308 */  addiu     $v0, $v0, %lo(fx_98_appendGfx)
 /* 3CB0C0 E00C42D0 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3CB0C4 E00C42D4 2402000A */  addiu     $v0, $zero, 0xa
 /* 3CB0C8 E00C42D8 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s
rename to ver/us/asm/nonmatchings/effects/effect_98/fx_98_update.s
index 5d7d2136b8..9745ab37f0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s
+++ b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C4178
+glabel fx_98_update
 /* 3CAF68 E00C4178 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3CAF6C E00C417C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3CAF70 E00C4180 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s
rename to ver/us/asm/nonmatchings/effects/effect_99/fx_99_appendGfx.s
index 10f3f0b882..07f1c199d6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s
+++ b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C67B0
+glabel fx_99_appendGfx
 /* 3CD190 E00C67B0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
 /* 3CD194 E00C67B4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
 /* 3CD198 E00C67B8 27BDFF00 */  addiu     $sp, $sp, -0x100
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s
index 1c550c2a27..f9d8d7b263 100644
--- a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s
@@ -28,14 +28,14 @@ glabel fx_99_main
 /* 3CCA3C E00C605C AFA70084 */   sw       $a3, 0x84($sp)
 /* 3CCA40 E00C6060 24130008 */  addiu     $s3, $zero, 8
 .LE00C6064:
-/* 3CCA44 E00C6064 3C02E00C */  lui       $v0, %hi(func_E00C6394)
-/* 3CCA48 E00C6068 24426394 */  addiu     $v0, $v0, %lo(func_E00C6394)
+/* 3CCA44 E00C6064 3C02E00C */  lui       $v0, %hi(fx_99_init)
+/* 3CCA48 E00C6068 24426394 */  addiu     $v0, $v0, %lo(fx_99_init)
 /* 3CCA4C E00C606C AFA20018 */  sw        $v0, 0x18($sp)
-/* 3CCA50 E00C6070 3C02E00C */  lui       $v0, %hi(func_E00C639C)
-/* 3CCA54 E00C6074 2442639C */  addiu     $v0, $v0, %lo(func_E00C639C)
+/* 3CCA50 E00C6070 3C02E00C */  lui       $v0, %hi(fx_99_update)
+/* 3CCA54 E00C6074 2442639C */  addiu     $v0, $v0, %lo(fx_99_update)
 /* 3CCA58 E00C6078 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3CCA5C E00C607C 3C02E00C */  lui       $v0, %hi(func_E00C6768)
-/* 3CCA60 E00C6080 24426768 */  addiu     $v0, $v0, %lo(func_E00C6768)
+/* 3CCA5C E00C607C 3C02E00C */  lui       $v0, %hi(fx_99_render)
+/* 3CCA60 E00C6080 24426768 */  addiu     $v0, $v0, %lo(fx_99_render)
 /* 3CCA64 E00C6084 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3CCA68 E00C6088 24020063 */  addiu     $v0, $zero, 0x63
 /* 3CCA6C E00C608C AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_render.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s
rename to ver/us/asm/nonmatchings/effects/effect_99/fx_99_render.s
index f0309dae92..c35011a99a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s
+++ b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_render.s
@@ -1,10 +1,10 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C6768
+glabel fx_99_render
 /* 3CD148 E00C6768 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3CD14C E00C676C 3C02E00C */  lui       $v0, %hi(func_E00C67B0)
-/* 3CD150 E00C6770 244267B0 */  addiu     $v0, $v0, %lo(func_E00C67B0)
+/* 3CD14C E00C676C 3C02E00C */  lui       $v0, %hi(fx_99_appendGfx)
+/* 3CD150 E00C6770 244267B0 */  addiu     $v0, $v0, %lo(fx_99_appendGfx)
 /* 3CD154 E00C6774 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3CD158 E00C6778 2402000A */  addiu     $v0, $zero, 0xa
 /* 3CD15C E00C677C AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s
rename to ver/us/asm/nonmatchings/effects/effect_99/fx_99_update.s
index f249ab0652..df463fa63d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s
+++ b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_E00C639C
+glabel fx_99_update
 /* 3CCD7C E00C639C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3CCD80 E00C63A0 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3CCD84 E00C63A4 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSendMesg.s b/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSendMesg.s
index bb85eaaae6..7f6719215c 100644
--- a/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSendMesg.s
+++ b/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSendMesg.s
@@ -12,7 +12,7 @@ glabel osSendMesg
 /* 40C3C 8006583C AFBF0028 */  sw        $ra, 0x28($sp)
 /* 40C40 80065840 AFB40020 */  sw        $s4, 0x20($sp)
 /* 40C44 80065844 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 40C48 80065848 0C01ACD8 */  jal       osDisableInt
+/* 40C48 80065848 0C01ACD8 */  jal       __osDisableInt
 /* 40C4C 8006584C AFB10014 */   sw       $s1, 0x14($sp)
 /* 40C50 80065850 8E030008 */  lw        $v1, 8($s0)
 /* 40C54 80065854 8E040010 */  lw        $a0, 0x10($s0)
@@ -24,7 +24,7 @@ glabel osSendMesg
 .L8006586C:
 /* 40C6C 8006586C 12540005 */  beq       $s2, $s4, .L80065884
 /* 40C70 80065870 26040004 */   addiu    $a0, $s0, 4
-/* 40C74 80065874 0C01ACF4 */  jal       osRestoreInt
+/* 40C74 80065874 0C01ACF4 */  jal       __osRestoreInt
 /* 40C78 80065878 02202021 */   addu     $a0, $s1, $zero
 /* 40C7C 8006587C 0801964B */  j         .L8006592C
 /* 40C80 80065880 2402FFFF */   addiu    $v0, $zero, -1
@@ -72,7 +72,7 @@ glabel osSendMesg
 /* 40D18 80065918 0C019808 */  jal       osStartThread
 /* 40D1C 8006591C 00402021 */   addu     $a0, $v0, $zero
 .L80065920:
-/* 40D20 80065920 0C01ACF4 */  jal       osRestoreInt
+/* 40D20 80065920 0C01ACF4 */  jal       __osRestoreInt
 /* 40D24 80065924 02202021 */   addu     $a0, $s1, $zero
 /* 40D28 80065928 00001021 */  addu      $v0, $zero, $zero
 .L8006592C:
diff --git a/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSetEventMesg.s b/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSetEventMesg.s
index 14e387cd3d..7d38ac1e4f 100644
--- a/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSetEventMesg.s
+++ b/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSetEventMesg.s
@@ -10,7 +10,7 @@ glabel osSetEventMesg
 /* 40D64 80065964 AFB20018 */  sw        $s2, 0x18($sp)
 /* 40D68 80065968 00C09021 */  addu      $s2, $a2, $zero
 /* 40D6C 8006596C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 40D70 80065970 0C01ACD8 */  jal       osDisableInt
+/* 40D70 80065970 0C01ACD8 */  jal       __osDisableInt
 /* 40D74 80065974 AFB3001C */   sw       $s3, 0x1c($sp)
 /* 40D78 80065978 001018C0 */  sll       $v1, $s0, 3
 /* 40D7C 8006597C 3C04800E */  lui       $a0, %hi(D_800D9F80)
@@ -38,7 +38,7 @@ glabel osSetEventMesg
 /* 40DD0 800659D0 3C018009 */  lui       $at, %hi(__osPreNMI)
 /* 40DD4 800659D4 AC224630 */  sw        $v0, %lo(__osPreNMI)($at)
 .L800659D8:
-/* 40DD8 800659D8 0C01ACF4 */  jal       osRestoreInt
+/* 40DD8 800659D8 0C01ACF4 */  jal       __osRestoreInt
 /* 40DDC 800659DC 02602021 */   addu     $a0, $s3, $zero
 /* 40DE0 800659E0 8FBF0020 */  lw        $ra, 0x20($sp)
 /* 40DE4 800659E4 8FB3001C */  lw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/os/41420_len_120/osStartThread.s b/ver/us/asm/nonmatchings/os/41420_len_120/osStartThread.s
index b63f6f2909..0db501b7c4 100644
--- a/ver/us/asm/nonmatchings/os/41420_len_120/osStartThread.s
+++ b/ver/us/asm/nonmatchings/os/41420_len_120/osStartThread.s
@@ -7,7 +7,7 @@ glabel osStartThread
 /* 41428 80066028 00808021 */  addu      $s0, $a0, $zero
 /* 4142C 8006602C AFBF001C */  sw        $ra, 0x1c($sp)
 /* 41430 80066030 AFB20018 */  sw        $s2, 0x18($sp)
-/* 41434 80066034 0C01ACD8 */  jal       osDisableInt
+/* 41434 80066034 0C01ACD8 */  jal       __osDisableInt
 /* 41438 80066038 AFB10014 */   sw       $s1, 0x14($sp)
 /* 4143C 8006603C 96030010 */  lhu       $v1, 0x10($s0)
 /* 41440 80066040 00409021 */  addu      $s2, $v0, $zero
@@ -71,7 +71,7 @@ glabel osStartThread
 /* 41510 80066110 0C01AC1B */  jal       osEnqueueAndYield
 /* 41514 80066114 24844658 */   addiu    $a0, $a0, %lo(__osRunQueue)
 .L80066118:
-/* 41518 80066118 0C01ACF4 */  jal       osRestoreInt
+/* 41518 80066118 0C01ACF4 */  jal       __osRestoreInt
 /* 4151C 8006611C 02402021 */   addu     $a0, $s2, $zero
 /* 41520 80066120 8FBF001C */  lw        $ra, 0x1c($sp)
 /* 41524 80066124 8FB20018 */  lw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/os/41540_len_c0/osStopThread.s b/ver/us/asm/nonmatchings/os/41540_len_c0/osStopThread.s
index b531fc72ed..082610c1b0 100644
--- a/ver/us/asm/nonmatchings/os/41540_len_c0/osStopThread.s
+++ b/ver/us/asm/nonmatchings/os/41540_len_c0/osStopThread.s
@@ -6,7 +6,7 @@ glabel osStopThread
 /* 41544 80066144 AFB00010 */  sw        $s0, 0x10($sp)
 /* 41548 80066148 00808021 */  addu      $s0, $a0, $zero
 /* 4154C 8006614C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 41550 80066150 0C01ACD8 */  jal       osDisableInt
+/* 41550 80066150 0C01ACD8 */  jal       __osDisableInt
 /* 41554 80066154 AFB10014 */   sw       $s1, 0x14($sp)
 /* 41558 80066158 24030004 */  addiu     $v1, $zero, 4
 /* 4155C 8006615C 12000002 */  beqz      $s0, .L80066168
@@ -45,7 +45,7 @@ glabel osStopThread
 /* 415D0 800661D0 0C019880 */  jal       osDequeueThread
 /* 415D4 800661D4 A6020010 */   sh       $v0, 0x10($s0)
 .L800661D8:
-/* 415D8 800661D8 0C01ACF4 */  jal       osRestoreInt
+/* 415D8 800661D8 0C01ACF4 */  jal       __osRestoreInt
 /* 415DC 800661DC 02202021 */   addu     $a0, $s1, $zero
 /* 415E0 800661E0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 415E4 800661E4 8FB10014 */  lw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/os/41640_len_50/osYieldThread.s b/ver/us/asm/nonmatchings/os/41640_len_50/osYieldThread.s
index b949da5c9e..8cc115014c 100644
--- a/ver/us/asm/nonmatchings/os/41640_len_50/osYieldThread.s
+++ b/ver/us/asm/nonmatchings/os/41640_len_50/osYieldThread.s
@@ -4,7 +4,7 @@
 glabel osYieldThread
 /* 41640 80066240 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41644 80066244 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 41648 80066248 0C01ACD8 */  jal       osDisableInt
+/* 41648 80066248 0C01ACD8 */  jal       __osDisableInt
 /* 4164C 8006624C AFB00010 */   sw       $s0, 0x10($sp)
 /* 41650 80066250 3C038009 */  lui       $v1, %hi(__osRunningThread)
 /* 41654 80066254 8C634660 */  lw        $v1, %lo(__osRunningThread)($v1)
@@ -14,7 +14,7 @@ glabel osYieldThread
 /* 41664 80066264 00408021 */  addu      $s0, $v0, $zero
 /* 41668 80066268 0C01AC1B */  jal       osEnqueueAndYield
 /* 4166C 8006626C A4650010 */   sh       $a1, 0x10($v1)
-/* 41670 80066270 0C01ACF4 */  jal       osRestoreInt
+/* 41670 80066270 0C01ACF4 */  jal       __osRestoreInt
 /* 41674 80066274 02002021 */   addu     $a0, $s0, $zero
 /* 41678 80066278 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 4167C 8006627C 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/416a0_len_90/osGetTime.s b/ver/us/asm/nonmatchings/os/416a0_len_90/osGetTime.s
index 2fb414ed97..4574cef33f 100644
--- a/ver/us/asm/nonmatchings/os/416a0_len_90/osGetTime.s
+++ b/ver/us/asm/nonmatchings/os/416a0_len_90/osGetTime.s
@@ -8,7 +8,7 @@ glabel osGetTime
 /* 416AC 800662AC AFB3001C */  sw        $s3, 0x1c($sp)
 /* 416B0 800662B0 AFB20018 */  sw        $s2, 0x18($sp)
 /* 416B4 800662B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 416B8 800662B8 0C01ACD8 */  jal       osDisableInt
+/* 416B8 800662B8 0C01ACD8 */  jal       __osDisableInt
 /* 416BC 800662BC AFB00010 */   sw       $s0, 0x10($sp)
 /* 416C0 800662C0 0C019680 */  jal       osGetCount
 /* 416C4 800662C4 0040A021 */   addu     $s4, $v0, $zero
@@ -19,7 +19,7 @@ glabel osGetTime
 /* 416D8 800662D8 3C13800A */  lui       $s3, %hi(D_8009A60C)
 /* 416DC 800662DC 8E73A60C */  lw        $s3, %lo(D_8009A60C)($s3)
 /* 416E0 800662E0 02802021 */  addu      $a0, $s4, $zero
-/* 416E4 800662E4 0C01ACF4 */  jal       osRestoreInt
+/* 416E4 800662E4 0C01ACF4 */  jal       __osRestoreInt
 /* 416E8 800662E8 00438023 */   subu     $s0, $v0, $v1
 /* 416EC 800662EC 02008821 */  addu      $s1, $s0, $zero
 /* 416F0 800662F0 00008021 */  addu      $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/os/41750_len_450/osSetTimer.s b/ver/us/asm/nonmatchings/os/41750_len_450/osSetTimer.s
index d86ec51a03..d939c1b306 100644
--- a/ver/us/asm/nonmatchings/os/41750_len_450/osSetTimer.s
+++ b/ver/us/asm/nonmatchings/os/41750_len_450/osSetTimer.s
@@ -26,7 +26,7 @@ glabel osSetTimer
 /* 417A4 800663A4 AE030014 */  sw        $v1, 0x14($s0)
 /* 417A8 800663A8 AE040018 */  sw        $a0, 0x18($s0)
 .L800663AC:
-/* 417AC 800663AC 0C01ACD8 */  jal       osDisableInt
+/* 417AC 800663AC 0C01ACD8 */  jal       __osDisableInt
 /* 417B0 800663B0 AE05001C */   sw       $a1, 0x1c($s0)
 /* 417B4 800663B4 3C038009 */  lui       $v1, %hi(D_80094670)
 /* 417B8 800663B8 8C634670 */  lw        $v1, %lo(D_80094670)($v1)
@@ -73,7 +73,7 @@ glabel osSetTimer
 /* 4184C 8006644C 8C440010 */  lw        $a0, 0x10($v0)
 /* 41850 80066450 0C019984 */  jal       osSetTimerIntr
 /* 41854 80066454 8C450014 */   lw       $a1, 0x14($v0)
-/* 41858 80066458 0C01ACF4 */  jal       osRestoreInt
+/* 41858 80066458 0C01ACF4 */  jal       __osRestoreInt
 /* 4185C 8006645C 02402021 */   addu     $a0, $s2, $zero
 /* 41860 80066460 00001021 */  addu      $v0, $zero, $zero
 /* 41864 80066464 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/os/41880/osInsertTimer.s b/ver/us/asm/nonmatchings/os/41880/osInsertTimer.s
index 245945d5ee..ee5a6fe0dd 100644
--- a/ver/us/asm/nonmatchings/os/41880/osInsertTimer.s
+++ b/ver/us/asm/nonmatchings/os/41880/osInsertTimer.s
@@ -7,7 +7,7 @@ glabel osInsertTimer
 /* 41A98 80066698 00809021 */  addu      $s2, $a0, $zero
 /* 41A9C 8006669C AFBF001C */  sw        $ra, 0x1c($sp)
 /* 41AA0 800666A0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 41AA4 800666A4 0C01ACD8 */  jal       osDisableInt
+/* 41AA4 800666A4 0C01ACD8 */  jal       __osDisableInt
 /* 41AA8 800666A8 AFB00010 */   sw       $s0, 0x10($sp)
 /* 41AAC 800666AC 3C038009 */  lui       $v1, %hi(D_80094670)
 /* 41AB0 800666B0 8C634670 */  lw        $v1, %lo(D_80094670)($v1)
@@ -62,7 +62,7 @@ glabel osInsertTimer
 /* 41B64 80066764 8CC20004 */  lw        $v0, 4($a2)
 /* 41B68 80066768 00E02021 */  addu      $a0, $a3, $zero
 /* 41B6C 8006676C AC520000 */  sw        $s2, ($v0)
-/* 41B70 80066770 0C01ACF4 */  jal       osRestoreInt
+/* 41B70 80066770 0C01ACF4 */  jal       __osRestoreInt
 /* 41B74 80066774 ACD20004 */   sw       $s2, 4($a2)
 /* 41B78 80066778 02001021 */  addu      $v0, $s0, $zero
 /* 41B7C 8006677C 02201821 */  addu      $v1, $s1, $zero
diff --git a/ver/us/asm/nonmatchings/os/41880/osSetTimerIntr.s b/ver/us/asm/nonmatchings/os/41880/osSetTimerIntr.s
index 9deae48f16..ec1a81b983 100644
--- a/ver/us/asm/nonmatchings/os/41880/osSetTimerIntr.s
+++ b/ver/us/asm/nonmatchings/os/41880/osSetTimerIntr.s
@@ -18,7 +18,7 @@ glabel osSetTimerIntr
 /* 41A40 80066640 24120000 */  addiu     $s2, $zero, 0
 /* 41A44 80066644 241301D4 */  addiu     $s3, $zero, 0x1d4
 .L80066648:
-/* 41A48 80066648 0C01ACD8 */  jal       osDisableInt
+/* 41A48 80066648 0C01ACD8 */  jal       __osDisableInt
 /* 41A4C 8006664C 00000000 */   nop
 /* 41A50 80066650 0C019680 */  jal       osGetCount
 /* 41A54 80066654 00408021 */   addu     $s0, $v0, $zero
@@ -28,7 +28,7 @@ glabel osSetTimerIntr
 /* 41A64 80066664 00002021 */  addu      $a0, $zero, $zero
 /* 41A68 80066668 0C01B1A0 */  jal       osSetCompare
 /* 41A6C 8006666C 02652021 */   addu     $a0, $s3, $a1
-/* 41A70 80066670 0C01ACF4 */  jal       osRestoreInt
+/* 41A70 80066670 0C01ACF4 */  jal       __osRestoreInt
 /* 41A74 80066674 02002021 */   addu     $a0, $s0, $zero
 /* 41A78 80066678 8FBF0024 */  lw        $ra, 0x24($sp)
 /* 41A7C 8006667C 8FB30020 */  lw        $s3, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/os/41db0_len_40/osViGetCurrentFramebuffer.s b/ver/us/asm/nonmatchings/os/41db0_len_40/osViGetCurrentFramebuffer.s
index 69fd5476f2..0cc5f205ac 100644
--- a/ver/us/asm/nonmatchings/os/41db0_len_40/osViGetCurrentFramebuffer.s
+++ b/ver/us/asm/nonmatchings/os/41db0_len_40/osViGetCurrentFramebuffer.s
@@ -4,12 +4,12 @@
 glabel osViGetCurrentFramebuffer
 /* 41DB0 800669B0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41DB4 800669B4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 41DB8 800669B8 0C01ACD8 */  jal       osDisableInt
+/* 41DB8 800669B8 0C01ACD8 */  jal       __osDisableInt
 /* 41DBC 800669BC AFB00010 */   sw       $s0, 0x10($sp)
 /* 41DC0 800669C0 3C038009 */  lui       $v1, %hi(D_800959D0)
 /* 41DC4 800669C4 8C6359D0 */  lw        $v1, %lo(D_800959D0)($v1)
 /* 41DC8 800669C8 8C700004 */  lw        $s0, 4($v1)
-/* 41DCC 800669CC 0C01ACF4 */  jal       osRestoreInt
+/* 41DCC 800669CC 0C01ACF4 */  jal       __osRestoreInt
 /* 41DD0 800669D0 00402021 */   addu     $a0, $v0, $zero
 /* 41DD4 800669D4 02001021 */  addu      $v0, $s0, $zero
 /* 41DD8 800669D8 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/os/41df0_len_40/osViGetNextFramebuffer.s b/ver/us/asm/nonmatchings/os/41df0_len_40/osViGetNextFramebuffer.s
index 3e218b1163..263ae4ad1b 100644
--- a/ver/us/asm/nonmatchings/os/41df0_len_40/osViGetNextFramebuffer.s
+++ b/ver/us/asm/nonmatchings/os/41df0_len_40/osViGetNextFramebuffer.s
@@ -4,12 +4,12 @@
 glabel osViGetNextFramebuffer
 /* 41DF0 800669F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41DF4 800669F4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 41DF8 800669F8 0C01ACD8 */  jal       osDisableInt
+/* 41DF8 800669F8 0C01ACD8 */  jal       __osDisableInt
 /* 41DFC 800669FC AFB00010 */   sw       $s0, 0x10($sp)
 /* 41E00 80066A00 3C038009 */  lui       $v1, %hi(D_800959D4)
 /* 41E04 80066A04 8C6359D4 */  lw        $v1, %lo(D_800959D4)($v1)
 /* 41E08 80066A08 8C700004 */  lw        $s0, 4($v1)
-/* 41E0C 80066A0C 0C01ACF4 */  jal       osRestoreInt
+/* 41E0C 80066A0C 0C01ACF4 */  jal       __osRestoreInt
 /* 41E10 80066A10 00402021 */   addu     $a0, $v0, $zero
 /* 41E14 80066A14 02001021 */  addu      $v0, $s0, $zero
 /* 41E18 80066A18 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/os/41e30_len_40/osViGetCurrentMode.s b/ver/us/asm/nonmatchings/os/41e30_len_40/osViGetCurrentMode.s
index 1f26531d80..487209d97e 100644
--- a/ver/us/asm/nonmatchings/os/41e30_len_40/osViGetCurrentMode.s
+++ b/ver/us/asm/nonmatchings/os/41e30_len_40/osViGetCurrentMode.s
@@ -4,13 +4,13 @@
 glabel osViGetCurrentMode
 /* 41E30 80066A30 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41E34 80066A34 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 41E38 80066A38 0C01ACD8 */  jal       osDisableInt
+/* 41E38 80066A38 0C01ACD8 */  jal       __osDisableInt
 /* 41E3C 80066A3C AFB00010 */   sw       $s0, 0x10($sp)
 /* 41E40 80066A40 3C038009 */  lui       $v1, %hi(D_800959D0)
 /* 41E44 80066A44 8C6359D0 */  lw        $v1, %lo(D_800959D0)($v1)
 /* 41E48 80066A48 8C630008 */  lw        $v1, 8($v1)
 /* 41E4C 80066A4C 90700000 */  lbu       $s0, ($v1)
-/* 41E50 80066A50 0C01ACF4 */  jal       osRestoreInt
+/* 41E50 80066A50 0C01ACF4 */  jal       __osRestoreInt
 /* 41E54 80066A54 00402021 */   addu     $a0, $v0, $zero
 /* 41E58 80066A58 02001021 */  addu      $v0, $s0, $zero
 /* 41E5C 80066A5C 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/os/41e70_len_340/osCreateViManager.s b/ver/us/asm/nonmatchings/os/41e70_len_340/osCreateViManager.s
index 3647f3fb50..0e492b4b16 100644
--- a/ver/us/asm/nonmatchings/os/41e70_len_340/osCreateViManager.s
+++ b/ver/us/asm/nonmatchings/os/41e70_len_340/osCreateViManager.s
@@ -59,7 +59,7 @@ glabel osCreateViManager
 /* 41F48 80066B48 0C0197D4 */  jal       osSetThreadPri
 /* 41F4C 80066B4C 02202821 */   addu     $a1, $s1, $zero
 .L80066B50:
-/* 41F50 80066B50 0C01ACD8 */  jal       osDisableInt
+/* 41F50 80066B50 0C01ACD8 */  jal       __osDisableInt
 /* 41F54 80066B54 00000000 */   nop
 /* 41F58 80066B58 3C10800B */  lui       $s0, %hi(D_800AF918)
 /* 41F5C 80066B5C 2610F918 */  addiu     $s0, $s0, %lo(D_800AF918)
@@ -92,7 +92,7 @@ glabel osCreateViManager
 /* 41FC8 80066BC8 00000000 */   nop
 /* 41FCC 80066BCC 0C019808 */  jal       osStartThread
 /* 41FD0 80066BD0 02002021 */   addu     $a0, $s0, $zero
-/* 41FD4 80066BD4 0C01ACF4 */  jal       osRestoreInt
+/* 41FD4 80066BD4 0C01ACF4 */  jal       __osRestoreInt
 /* 41FD8 80066BD8 02202021 */   addu     $a0, $s1, $zero
 /* 41FDC 80066BDC 2402FFFF */  addiu     $v0, $zero, -1
 /* 41FE0 80066BE0 12420003 */  beq       $s2, $v0, .L80066BF0
diff --git a/ver/us/asm/nonmatchings/os/421b0_len_60/osViSetEvent.s b/ver/us/asm/nonmatchings/os/421b0_len_60/osViSetEvent.s
index 7831c32376..8f5f0573b5 100644
--- a/ver/us/asm/nonmatchings/os/421b0_len_60/osViSetEvent.s
+++ b/ver/us/asm/nonmatchings/os/421b0_len_60/osViSetEvent.s
@@ -9,14 +9,14 @@ glabel osViSetEvent
 /* 421C0 80066DC0 00A08821 */  addu      $s1, $a1, $zero
 /* 421C4 80066DC4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 421C8 80066DC8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 421CC 80066DCC 0C01ACD8 */  jal       osDisableInt
+/* 421CC 80066DCC 0C01ACD8 */  jal       __osDisableInt
 /* 421D0 80066DD0 00C09021 */   addu     $s2, $a2, $zero
 /* 421D4 80066DD4 3C038009 */  lui       $v1, %hi(D_800959D4)
 /* 421D8 80066DD8 8C6359D4 */  lw        $v1, %lo(D_800959D4)($v1)
 /* 421DC 80066DDC 00402021 */  addu      $a0, $v0, $zero
 /* 421E0 80066DE0 AC700010 */  sw        $s0, 0x10($v1)
 /* 421E4 80066DE4 AC710014 */  sw        $s1, 0x14($v1)
-/* 421E8 80066DE8 0C01ACF4 */  jal       osRestoreInt
+/* 421E8 80066DE8 0C01ACF4 */  jal       __osRestoreInt
 /* 421EC 80066DEC A4720002 */   sh       $s2, 2($v1)
 /* 421F0 80066DF0 8FBF001C */  lw        $ra, 0x1c($sp)
 /* 421F4 80066DF4 8FB20018 */  lw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/os/42210_len_50/osViSetMode.s b/ver/us/asm/nonmatchings/os/42210_len_50/osViSetMode.s
index c9c6d51c30..113a194cc6 100644
--- a/ver/us/asm/nonmatchings/os/42210_len_50/osViSetMode.s
+++ b/ver/us/asm/nonmatchings/os/42210_len_50/osViSetMode.s
@@ -5,7 +5,7 @@ glabel osViSetMode
 /* 42210 80066E10 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 42214 80066E14 AFB00010 */  sw        $s0, 0x10($sp)
 /* 42218 80066E18 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 4221C 80066E1C 0C01ACD8 */  jal       osDisableInt
+/* 4221C 80066E1C 0C01ACD8 */  jal       __osDisableInt
 /* 42220 80066E20 00808021 */   addu     $s0, $a0, $zero
 /* 42224 80066E24 3C048009 */  lui       $a0, %hi(D_800959D4)
 /* 42228 80066E28 8C8459D4 */  lw        $a0, %lo(D_800959D4)($a0)
@@ -15,7 +15,7 @@ glabel osViSetMode
 /* 42238 80066E38 A4830000 */  sh        $v1, ($a0)
 /* 4223C 80066E3C 8CA30004 */  lw        $v1, 4($a1)
 /* 42240 80066E40 AC83000C */  sw        $v1, 0xc($a0)
-/* 42244 80066E44 0C01ACF4 */  jal       osRestoreInt
+/* 42244 80066E44 0C01ACF4 */  jal       __osRestoreInt
 /* 42248 80066E48 00402021 */   addu     $a0, $v0, $zero
 /* 4224C 80066E4C 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 42250 80066E50 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/42260_len_170/osViSetSpecialFeatures.s b/ver/us/asm/nonmatchings/os/42260_len_170/osViSetSpecialFeatures.s
index f127482230..d7d93a1839 100644
--- a/ver/us/asm/nonmatchings/os/42260_len_170/osViSetSpecialFeatures.s
+++ b/ver/us/asm/nonmatchings/os/42260_len_170/osViSetSpecialFeatures.s
@@ -5,7 +5,7 @@ glabel osViSetSpecialFeatures
 /* 42260 80066E60 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 42264 80066E64 AFB00010 */  sw        $s0, 0x10($sp)
 /* 42268 80066E68 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 4226C 80066E6C 0C01ACD8 */  jal       osDisableInt
+/* 4226C 80066E6C 0C01ACD8 */  jal       __osDisableInt
 /* 42270 80066E70 00808021 */   addu     $s0, $a0, $zero
 /* 42274 80066E74 00403021 */  addu      $a2, $v0, $zero
 /* 42278 80066E78 32020001 */  andi      $v0, $s0, 1
@@ -93,7 +93,7 @@ glabel osViSetSpecialFeatures
 /* 423A0 80066FA0 94620000 */  lhu       $v0, ($v1)
 /* 423A4 80066FA4 00C02021 */  addu      $a0, $a2, $zero
 /* 423A8 80066FA8 34420008 */  ori       $v0, $v0, 8
-/* 423AC 80066FAC 0C01ACF4 */  jal       osRestoreInt
+/* 423AC 80066FAC 0C01ACF4 */  jal       __osRestoreInt
 /* 423B0 80066FB0 A4620000 */   sh       $v0, ($v1)
 /* 423B4 80066FB4 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 423B8 80066FB8 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/423d0_len_50/osViSetYScale.s b/ver/us/asm/nonmatchings/os/423d0_len_50/osViSetYScale.s
index 34c7994f12..8b2f4e5ed2 100644
--- a/ver/us/asm/nonmatchings/os/423d0_len_50/osViSetYScale.s
+++ b/ver/us/asm/nonmatchings/os/423d0_len_50/osViSetYScale.s
@@ -5,7 +5,7 @@ glabel osViSetYScale
 /* 423D0 80066FD0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 423D4 80066FD4 F7B40018 */  sdc1      $f20, 0x18($sp)
 /* 423D8 80066FD8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 423DC 80066FDC 0C01ACD8 */  jal       osDisableInt
+/* 423DC 80066FDC 0C01ACD8 */  jal       __osDisableInt
 /* 423E0 80066FE0 46006506 */   mov.s    $f20, $f12
 /* 423E4 80066FE4 3C048009 */  lui       $a0, %hi(D_800959D4)
 /* 423E8 80066FE8 8C8459D4 */  lw        $a0, %lo(D_800959D4)($a0)
@@ -13,7 +13,7 @@ glabel osViSetYScale
 /* 423F0 80066FF0 E4940024 */  swc1      $f20, 0x24($a0)
 /* 423F4 80066FF4 34630004 */  ori       $v1, $v1, 4
 /* 423F8 80066FF8 A4830000 */  sh        $v1, ($a0)
-/* 423FC 80066FFC 0C01ACF4 */  jal       osRestoreInt
+/* 423FC 80066FFC 0C01ACF4 */  jal       __osRestoreInt
 /* 42400 80067000 00402021 */   addu     $a0, $v0, $zero
 /* 42404 80067004 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 42408 80067008 D7B40018 */  ldc1      $f20, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/os/42420_len_50/osViSwapBuffer.s b/ver/us/asm/nonmatchings/os/42420_len_50/osViSwapBuffer.s
index 0e0ac240b4..ededfd2ec7 100644
--- a/ver/us/asm/nonmatchings/os/42420_len_50/osViSwapBuffer.s
+++ b/ver/us/asm/nonmatchings/os/42420_len_50/osViSwapBuffer.s
@@ -5,7 +5,7 @@ glabel osViSwapBuffer
 /* 42420 80067020 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 42424 80067024 AFB00010 */  sw        $s0, 0x10($sp)
 /* 42428 80067028 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 4242C 8006702C 0C01ACD8 */  jal       osDisableInt
+/* 4242C 8006702C 0C01ACD8 */  jal       __osDisableInt
 /* 42430 80067030 00808021 */   addu     $s0, $a0, $zero
 /* 42434 80067034 3C048009 */  lui       $a0, %hi(D_800959D4)
 /* 42438 80067038 8C8459D4 */  lw        $a0, %lo(D_800959D4)($a0)
@@ -13,7 +13,7 @@ glabel osViSwapBuffer
 /* 42440 80067040 AC900004 */  sw        $s0, 4($a0)
 /* 42444 80067044 34630010 */  ori       $v1, $v1, 0x10
 /* 42448 80067048 A4830000 */  sh        $v1, ($a0)
-/* 4244C 8006704C 0C01ACF4 */  jal       osRestoreInt
+/* 4244C 8006704C 0C01ACF4 */  jal       __osRestoreInt
 /* 42450 80067050 00402021 */   addu     $a0, $v0, $zero
 /* 42454 80067054 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 42458 80067058 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/42780_len_120/osViBlack.s b/ver/us/asm/nonmatchings/os/42780_len_120/osViBlack.s
index 5f2c4c0eea..845b900cd8 100644
--- a/ver/us/asm/nonmatchings/os/42780_len_120/osViBlack.s
+++ b/ver/us/asm/nonmatchings/os/42780_len_120/osViBlack.s
@@ -5,7 +5,7 @@ glabel osViBlack
 /* 42780 80067380 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 42784 80067384 AFB00010 */  sw        $s0, 0x10($sp)
 /* 42788 80067388 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 4278C 8006738C 0C01ACD8 */  jal       osDisableInt
+/* 4278C 8006738C 0C01ACD8 */  jal       __osDisableInt
 /* 42790 80067390 00808021 */   addu     $s0, $a0, $zero
 /* 42794 80067394 321000FF */  andi      $s0, $s0, 0xff
 /* 42798 80067398 12000006 */  beqz      $s0, .L800673B4
@@ -21,7 +21,7 @@ glabel osViBlack
 /* 427BC 800673BC 94620000 */  lhu       $v0, ($v1)
 /* 427C0 800673C0 3042FFDF */  andi      $v0, $v0, 0xffdf
 .L800673C4:
-/* 427C4 800673C4 0C01ACF4 */  jal       osRestoreInt
+/* 427C4 800673C4 0C01ACF4 */  jal       __osRestoreInt
 /* 427C8 800673C8 A4620000 */   sh       $v0, ($v1)
 /* 427CC 800673CC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 427D0 800673D0 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/467f0_len_90/osResetGlobalIntMask.s b/ver/us/asm/nonmatchings/os/467f0_len_90/osResetGlobalIntMask.s
index 6ec20cc89d..74f12f692b 100644
--- a/ver/us/asm/nonmatchings/os/467f0_len_90/osResetGlobalIntMask.s
+++ b/ver/us/asm/nonmatchings/os/467f0_len_90/osResetGlobalIntMask.s
@@ -5,7 +5,7 @@ glabel osResetGlobalIntMask
 /* 46830 8006B430 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 46834 8006B434 AFB00010 */  sw        $s0, 0x10($sp)
 /* 46838 8006B438 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 4683C 8006B43C 0C01ACD8 */  jal       osDisableInt
+/* 4683C 8006B43C 0C01ACD8 */  jal       __osDisableInt
 /* 46840 8006B440 00808021 */   addu     $s0, $a0, $zero
 /* 46844 8006B444 3C038009 */  lui       $v1, %hi(D_80095900)
 /* 46848 8006B448 8C635900 */  lw        $v1, %lo(D_80095900)($v1)
@@ -14,7 +14,7 @@ glabel osResetGlobalIntMask
 /* 46854 8006B454 00701824 */  and       $v1, $v1, $s0
 /* 46858 8006B458 3C018009 */  lui       $at, %hi(D_80095900)
 /* 4685C 8006B45C AC235900 */  sw        $v1, %lo(D_80095900)($at)
-/* 46860 8006B460 0C01ACF4 */  jal       osRestoreInt
+/* 46860 8006B460 0C01ACF4 */  jal       __osRestoreInt
 /* 46864 8006B464 00402021 */   addu     $a0, $v0, $zero
 /* 46868 8006B468 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 4686C 8006B46C 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/467f0_len_90/osSetGlobalIntMask.s b/ver/us/asm/nonmatchings/os/467f0_len_90/osSetGlobalIntMask.s
index 5d942f1142..562b5f2c1b 100644
--- a/ver/us/asm/nonmatchings/os/467f0_len_90/osSetGlobalIntMask.s
+++ b/ver/us/asm/nonmatchings/os/467f0_len_90/osSetGlobalIntMask.s
@@ -5,14 +5,14 @@ glabel osSetGlobalIntMask
 /* 467F0 8006B3F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 467F4 8006B3F4 AFB00010 */  sw        $s0, 0x10($sp)
 /* 467F8 8006B3F8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 467FC 8006B3FC 0C01ACD8 */  jal       osDisableInt
+/* 467FC 8006B3FC 0C01ACD8 */  jal       __osDisableInt
 /* 46800 8006B400 00808021 */   addu     $s0, $a0, $zero
 /* 46804 8006B404 3C038009 */  lui       $v1, %hi(D_80095900)
 /* 46808 8006B408 8C635900 */  lw        $v1, %lo(D_80095900)($v1)
 /* 4680C 8006B40C 00701825 */  or        $v1, $v1, $s0
 /* 46810 8006B410 3C018009 */  lui       $at, %hi(D_80095900)
 /* 46814 8006B414 AC235900 */  sw        $v1, %lo(D_80095900)($at)
-/* 46818 8006B418 0C01ACF4 */  jal       osRestoreInt
+/* 46818 8006B418 0C01ACF4 */  jal       __osRestoreInt
 /* 4681C 8006B41C 00402021 */   addu     $a0, $v0, $zero
 /* 46820 8006B420 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 46824 8006B424 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/47d50_len_e0/osDestroyThread.s b/ver/us/asm/nonmatchings/os/47d50_len_e0/osDestroyThread.s
index 4465685e27..f3d2574e3c 100644
--- a/ver/us/asm/nonmatchings/os/47d50_len_e0/osDestroyThread.s
+++ b/ver/us/asm/nonmatchings/os/47d50_len_e0/osDestroyThread.s
@@ -6,7 +6,7 @@ glabel osDestroyThread
 /* 47D54 8006C954 AFB00010 */  sw        $s0, 0x10($sp)
 /* 47D58 8006C958 00808021 */  addu      $s0, $a0, $zero
 /* 47D5C 8006C95C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 47D60 8006C960 0C01ACD8 */  jal       osDisableInt
+/* 47D60 8006C960 0C01ACD8 */  jal       __osDisableInt
 /* 47D64 8006C964 AFB10014 */   sw       $s1, 0x14($sp)
 /* 47D68 8006C968 16000004 */  bnez      $s0, .L8006C97C
 /* 47D6C 8006C96C 00408821 */   addu     $s1, $v0, $zero
@@ -56,7 +56,7 @@ glabel osDestroyThread
 /* 47E04 8006CA04 0C01AC75 */  jal       osDispatchThread
 /* 47E08 8006CA08 00000000 */   nop
 .L8006CA0C:
-/* 47E0C 8006CA0C 0C01ACF4 */  jal       osRestoreInt
+/* 47E0C 8006CA0C 0C01ACF4 */  jal       __osRestoreInt
 /* 47E10 8006CA10 02202021 */   addu     $a0, $s1, $zero
 /* 47E14 8006CA14 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 47E18 8006CA18 8FB10014 */  lw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/os/controller/osContInit.s b/ver/us/asm/nonmatchings/os/controller/osContInit.s
index d8ce4af7f3..69c40390e0 100644
--- a/ver/us/asm/nonmatchings/os/controller/osContInit.s
+++ b/ver/us/asm/nonmatchings/os/controller/osContInit.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel osContInit
-/* 3CF80 80061B80 3C028009 */  lui       $v0, %hi(D_80093DB0)
-/* 3CF84 80061B84 8C423DB0 */  lw        $v0, %lo(D_80093DB0)($v0)
+/* 3CF80 80061B80 3C028009 */  lui       $v0, %hi(__osContinitialized)
+/* 3CF84 80061B84 8C423DB0 */  lw        $v0, %lo(__osContinitialized)($v0)
 /* 3CF88 80061B88 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 3CF8C 80061B8C AFB40070 */  sw        $s4, 0x70($sp)
 /* 3CF90 80061B90 0080A021 */  addu      $s4, $a0, $zero
@@ -21,9 +21,9 @@ glabel osContInit
 /* 3CFC0 80061BC0 00001021 */   addu     $v0, $zero, $zero
 .L80061BC4:
 /* 3CFC4 80061BC4 24020001 */  addiu     $v0, $zero, 1
-/* 3CFC8 80061BC8 3C018009 */  lui       $at, %hi(D_80093DB0)
+/* 3CFC8 80061BC8 3C018009 */  lui       $at, %hi(__osContinitialized)
 /* 3CFCC 80061BCC 0C0198A8 */  jal       osGetTime
-/* 3CFD0 80061BD0 AC223DB0 */   sw       $v0, %lo(D_80093DB0)($at)
+/* 3CFD0 80061BD0 AC223DB0 */   sw       $v0, %lo(__osContinitialized)($at)
 /* 3CFD4 80061BD4 00409021 */  addu      $s2, $v0, $zero
 /* 3CFD8 80061BD8 00609821 */  addu      $s3, $v1, $zero
 /* 3CFDC 80061BDC 56400022 */  bnel      $s2, $zero, .L80061C68
diff --git a/ver/us/asm/nonmatchings/os/osCartRomInit/osCartRomInit.s b/ver/us/asm/nonmatchings/os/osCartRomInit/osCartRomInit.s
index 58e22a635f..6f01c66516 100644
--- a/ver/us/asm/nonmatchings/os/osCartRomInit/osCartRomInit.s
+++ b/ver/us/asm/nonmatchings/os/osCartRomInit/osCartRomInit.s
@@ -80,14 +80,14 @@ glabel osCartRomInit
 /* 3C434 80061034 A022430F */  sb        $v0, %lo(D_800B430F)($at)
 /* 3C438 80061038 3C01800B */  lui       $at, %hi(D_800B4310)
 /* 3C43C 8006103C A0234310 */  sb        $v1, %lo(D_800B4310)($at)
-/* 3C440 80061040 0C01ACD8 */  jal       osDisableInt
+/* 3C440 80061040 0C01ACD8 */  jal       __osDisableInt
 /* 3C444 80061044 2630FFF4 */   addiu    $s0, $s1, -0xc
 /* 3C448 80061048 3C038009 */  lui       $v1, %hi(__osPiTable)
 /* 3C44C 8006104C 8C633D6C */  lw        $v1, %lo(__osPiTable)($v1)
 /* 3C450 80061050 00402021 */  addu      $a0, $v0, $zero
 /* 3C454 80061054 3C018009 */  lui       $at, %hi(__osPiTable)
 /* 3C458 80061058 AC303D6C */  sw        $s0, %lo(__osPiTable)($at)
-/* 3C45C 8006105C 0C01ACF4 */  jal       osRestoreInt
+/* 3C45C 8006105C 0C01ACF4 */  jal       __osRestoreInt
 /* 3C460 80061060 AE23FFF4 */   sw       $v1, -0xc($s1)
 .L80061064:
 /* 3C464 80061064 0C018544 */  jal       osPiRelAccess
diff --git a/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s b/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s
index 471e483ead..d393aa39ec 100644
--- a/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s
+++ b/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s
@@ -51,7 +51,7 @@ glabel osCreatePiManager
 /* 3BE94 80060A94 0C0197D4 */  jal       osSetThreadPri
 /* 3BE98 80060A98 02002821 */   addu     $a1, $s0, $zero
 .L80060A9C:
-/* 3BE9C 80060A9C 0C01ACD8 */  jal       osDisableInt
+/* 3BE9C 80060A9C 0C01ACD8 */  jal       __osDisableInt
 /* 3BEA0 80060AA0 00000000 */   nop
 /* 3BEA4 80060AA4 3C11800B */  lui       $s1, %hi(piMgrThread)
 /* 3BEA8 80060AA8 2631E6E0 */  addiu     $s1, $s1, %lo(piMgrThread)
@@ -88,7 +88,7 @@ glabel osCreatePiManager
 /* 3BF24 80060B24 AFA30010 */   sw       $v1, 0x10($sp)
 /* 3BF28 80060B28 0C019808 */  jal       osStartThread
 /* 3BF2C 80060B2C 02202021 */   addu     $a0, $s1, $zero
-/* 3BF30 80060B30 0C01ACF4 */  jal       osRestoreInt
+/* 3BF30 80060B30 0C01ACF4 */  jal       __osRestoreInt
 /* 3BF34 80060B34 02002021 */   addu     $a0, $s0, $zero
 /* 3BF38 80060B38 2402FFFF */  addiu     $v0, $zero, -1
 /* 3BF3C 80060B3C 12420003 */  beq       $s2, $v0, .L80060B4C
diff --git a/ver/us/asm/nonmatchings/os/osCreateThread/osCreateThread.s b/ver/us/asm/nonmatchings/os/osCreateThread/osCreateThread.s
index 213c41fba4..2d8d334dbe 100644
--- a/ver/us/asm/nonmatchings/os/osCreateThread/osCreateThread.s
+++ b/ver/us/asm/nonmatchings/os/osCreateThread/osCreateThread.s
@@ -41,14 +41,14 @@ glabel osCreateThread
 /* 412F0 80065EF0 254AFFFF */  addiu     $t2, $t2, -1
 /* 412F4 80065EF4 01425021 */  addu      $t2, $t2, $v0
 /* 412F8 80065EF8 AE0A00F0 */  sw        $t2, 0xf0($s0)
-/* 412FC 80065EFC 0C01ACD8 */  jal       osDisableInt
+/* 412FC 80065EFC 0C01ACD8 */  jal       __osDisableInt
 /* 41300 80065F00 AE0B00F4 */   sw       $t3, 0xf4($s0)
 /* 41304 80065F04 3C038009 */  lui       $v1, %hi(__osActiveQueue)
 /* 41308 80065F08 8C63465C */  lw        $v1, %lo(__osActiveQueue)($v1)
 /* 4130C 80065F0C 00402021 */  addu      $a0, $v0, $zero
 /* 41310 80065F10 3C018009 */  lui       $at, %hi(__osActiveQueue)
 /* 41314 80065F14 AC30465C */  sw        $s0, %lo(__osActiveQueue)($at)
-/* 41318 80065F18 0C01ACF4 */  jal       osRestoreInt
+/* 41318 80065F18 0C01ACF4 */  jal       __osRestoreInt
 /* 4131C 80065F1C AE03000C */   sw       $v1, 0xc($s0)
 /* 41320 80065F20 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 41324 80065F24 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/osJamMesg/osJamMesg.s b/ver/us/asm/nonmatchings/os/osJamMesg/osJamMesg.s
index 2e9310ee18..6b7de77f08 100644
--- a/ver/us/asm/nonmatchings/os/osJamMesg/osJamMesg.s
+++ b/ver/us/asm/nonmatchings/os/osJamMesg/osJamMesg.s
@@ -12,7 +12,7 @@ glabel osJamMesg
 /* 409CC 800655CC AFBF0028 */  sw        $ra, 0x28($sp)
 /* 409D0 800655D0 AFB40020 */  sw        $s4, 0x20($sp)
 /* 409D4 800655D4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 409D8 800655D8 0C01ACD8 */  jal       osDisableInt
+/* 409D8 800655D8 0C01ACD8 */  jal       __osDisableInt
 /* 409DC 800655DC AFB10014 */   sw       $s1, 0x14($sp)
 /* 409E0 800655E0 8E030008 */  lw        $v1, 8($s0)
 /* 409E4 800655E4 8E040010 */  lw        $a0, 0x10($s0)
@@ -24,7 +24,7 @@ glabel osJamMesg
 .L800655FC:
 /* 409FC 800655FC 12540005 */  beq       $s2, $s4, .L80065614
 /* 40A00 80065600 26040004 */   addiu    $a0, $s0, 4
-/* 40A04 80065604 0C01ACF4 */  jal       osRestoreInt
+/* 40A04 80065604 0C01ACF4 */  jal       __osRestoreInt
 /* 40A08 80065608 02202021 */   addu     $a0, $s1, $zero
 /* 40A0C 8006560C 080195B0 */  j         .L800656C0
 /* 40A10 80065610 2402FFFF */   addiu    $v0, $zero, -1
@@ -73,7 +73,7 @@ glabel osJamMesg
 /* 40AAC 800656AC 0C019808 */  jal       osStartThread
 /* 40AB0 800656B0 00402021 */   addu     $a0, $v0, $zero
 .L800656B4:
-/* 40AB4 800656B4 0C01ACF4 */  jal       osRestoreInt
+/* 40AB4 800656B4 0C01ACF4 */  jal       __osRestoreInt
 /* 40AB8 800656B8 02202021 */   addu     $a0, $s1, $zero
 /* 40ABC 800656BC 00001021 */  addu      $v0, $zero, $zero
 .L800656C0:
diff --git a/ver/us/asm/nonmatchings/os/osRecvMesg/osRecvMesg.s b/ver/us/asm/nonmatchings/os/osRecvMesg/osRecvMesg.s
index 0113b3cd3b..41e1d4379c 100644
--- a/ver/us/asm/nonmatchings/os/osRecvMesg/osRecvMesg.s
+++ b/ver/us/asm/nonmatchings/os/osRecvMesg/osRecvMesg.s
@@ -11,7 +11,7 @@ glabel osRecvMesg
 /* 40B08 80065708 00C08821 */  addu      $s1, $a2, $zero
 /* 40B0C 8006570C AFBF0024 */  sw        $ra, 0x24($sp)
 /* 40B10 80065710 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 40B14 80065714 0C01ACD8 */  jal       osDisableInt
+/* 40B14 80065714 0C01ACD8 */  jal       __osDisableInt
 /* 40B18 80065718 AFB20018 */   sw       $s2, 0x18($sp)
 /* 40B1C 8006571C 8E030008 */  lw        $v1, 8($s0)
 /* 40B20 80065720 1460000F */  bnez      $v1, .L80065760
@@ -20,7 +20,7 @@ glabel osRecvMesg
 .L8006572C:
 /* 40B2C 8006572C 16200005 */  bnez      $s1, .L80065744
 /* 40B30 80065730 02002021 */   addu     $a0, $s0, $zero
-/* 40B34 80065734 0C01ACF4 */  jal       osRestoreInt
+/* 40B34 80065734 0C01ACF4 */  jal       __osRestoreInt
 /* 40B38 80065738 02402021 */   addu     $a0, $s2, $zero
 /* 40B3C 8006573C 080195FD */  j         .L800657F4
 /* 40B40 80065740 2402FFFF */   addiu    $v0, $zero, -1
@@ -71,7 +71,7 @@ glabel osRecvMesg
 /* 40BE0 800657E0 0C019808 */  jal       osStartThread
 /* 40BE4 800657E4 00402021 */   addu     $a0, $v0, $zero
 .L800657E8:
-/* 40BE8 800657E8 0C01ACF4 */  jal       osRestoreInt
+/* 40BE8 800657E8 0C01ACF4 */  jal       __osRestoreInt
 /* 40BEC 800657EC 02402021 */   addu     $a0, $s2, $zero
 /* 40BF0 800657F0 00001021 */  addu      $v0, $zero, $zero
 .L800657F4:
diff --git a/ver/us/asm/nonmatchings/os/osViRepeatLine/osViRepeatLine.s b/ver/us/asm/nonmatchings/os/osViRepeatLine/osViRepeatLine.s
index 326e15fa49..99d59eee8c 100644
--- a/ver/us/asm/nonmatchings/os/osViRepeatLine/osViRepeatLine.s
+++ b/ver/us/asm/nonmatchings/os/osViRepeatLine/osViRepeatLine.s
@@ -5,7 +5,7 @@ glabel osViRepeatLine
 /* 427E0 800673E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 427E4 800673E4 AFB00010 */  sw        $s0, 0x10($sp)
 /* 427E8 800673E8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 427EC 800673EC 0C01ACD8 */  jal       osDisableInt
+/* 427EC 800673EC 0C01ACD8 */  jal       __osDisableInt
 /* 427F0 800673F0 00808021 */   addu     $s0, $a0, $zero
 /* 427F4 800673F4 321000FF */  andi      $s0, $s0, 0xff
 /* 427F8 800673F8 12000006 */  beqz      $s0, .L80067414
@@ -21,7 +21,7 @@ glabel osViRepeatLine
 /* 4281C 8006741C 94620000 */  lhu       $v0, ($v1)
 /* 42820 80067420 3042FFBF */  andi      $v0, $v0, 0xffbf
 .L80067424:
-/* 42824 80067424 0C01ACF4 */  jal       osRestoreInt
+/* 42824 80067424 0C01ACF4 */  jal       __osRestoreInt
 /* 42828 80067428 A4620000 */   sh       $v0, ($v1)
 /* 4282C 8006742C 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 42830 80067430 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s
deleted file mode 100644
index f7db43ba12..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802425E0_A1D6E0
-/* A1D6E0 802425E0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* A1D6E4 802425E4 AFB10024 */  sw        $s1, 0x24($sp)
-/* A1D6E8 802425E8 0080882D */  daddu     $s1, $a0, $zero
-/* A1D6EC 802425EC 3C05F840 */  lui       $a1, 0xf840
-/* A1D6F0 802425F0 AFBF0044 */  sw        $ra, 0x44($sp)
-/* A1D6F4 802425F4 AFBE0040 */  sw        $fp, 0x40($sp)
-/* A1D6F8 802425F8 AFB7003C */  sw        $s7, 0x3c($sp)
-/* A1D6FC 802425FC AFB60038 */  sw        $s6, 0x38($sp)
-/* A1D700 80242600 AFB50034 */  sw        $s5, 0x34($sp)
-/* A1D704 80242604 AFB40030 */  sw        $s4, 0x30($sp)
-/* A1D708 80242608 AFB3002C */  sw        $s3, 0x2c($sp)
-/* A1D70C 8024260C AFB20028 */  sw        $s2, 0x28($sp)
-/* A1D710 80242610 AFB00020 */  sw        $s0, 0x20($sp)
-/* A1D714 80242614 8E3E0148 */  lw        $fp, 0x148($s1)
-/* A1D718 80242618 0C0B1EAF */  jal       evt_get_variable
-/* A1D71C 8024261C 34A56268 */   ori      $a1, $a1, 0x6268
-/* A1D720 80242620 0040802D */  daddu     $s0, $v0, $zero
-/* A1D724 80242624 0220202D */  daddu     $a0, $s1, $zero
-/* A1D728 80242628 3C05F840 */  lui       $a1, 0xf840
-/* A1D72C 8024262C 0C0B1EAF */  jal       evt_get_variable
-/* A1D730 80242630 34A56269 */   ori      $a1, $a1, 0x6269
-/* A1D734 80242634 0040B82D */  daddu     $s7, $v0, $zero
-/* A1D738 80242638 0220202D */  daddu     $a0, $s1, $zero
-/* A1D73C 8024263C 3C05F5DE */  lui       $a1, 0xf5de
-/* A1D740 80242640 0C0B1EAF */  jal       evt_get_variable
-/* A1D744 80242644 34A502DE */   ori      $a1, $a1, 0x2de
-/* A1D748 80242648 0040B02D */  daddu     $s6, $v0, $zero
-/* A1D74C 8024264C 0220202D */  daddu     $a0, $s1, $zero
-/* A1D750 80242650 3C05F5DE */  lui       $a1, 0xf5de
-/* A1D754 80242654 0C0B1EAF */  jal       evt_get_variable
-/* A1D758 80242658 34A502DF */   ori      $a1, $a1, 0x2df
-/* A1D75C 8024265C 0040A82D */  daddu     $s5, $v0, $zero
-/* A1D760 80242660 93D3006D */  lbu       $s3, 0x6d($fp)
-/* A1D764 80242664 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* A1D768 80242668 A7B30010 */  sh        $s3, 0x10($sp)
-/* A1D76C 8024266C 93D2006E */  lbu       $s2, 0x6e($fp)
-/* A1D770 80242670 93C7006F */  lbu       $a3, 0x6f($fp)
-/* A1D774 80242674 3274FFFF */  andi      $s4, $s3, 0xffff
-/* A1D778 80242678 12820003 */  beq       $s4, $v0, .L80242688
-/* A1D77C 8024267C A7A7001E */   sh       $a3, 0x1e($sp)
-/* A1D780 80242680 0000B82D */  daddu     $s7, $zero, $zero
-/* A1D784 80242684 02E0802D */  daddu     $s0, $s7, $zero
-.L80242688:
-/* A1D788 80242688 3202FFFF */  andi      $v0, $s0, 0xffff
-/* A1D78C 8024268C 14400016 */  bnez      $v0, .L802426E8
-/* A1D790 80242690 0220202D */   daddu    $a0, $s1, $zero
-/* A1D794 80242694 0C00A67F */  jal       rand_int
-/* A1D798 80242698 24040064 */   addiu    $a0, $zero, 0x64
-/* A1D79C 8024269C 2842001E */  slti      $v0, $v0, 0x1e
-/* A1D7A0 802426A0 10400011 */  beqz      $v0, .L802426E8
-/* A1D7A4 802426A4 0220202D */   daddu    $a0, $s1, $zero
-/* A1D7A8 802426A8 0C00A67F */  jal       rand_int
-/* A1D7AC 802426AC 2644FFFF */   addiu    $a0, $s2, -1
-/* A1D7B0 802426B0 0040A82D */  daddu     $s5, $v0, $zero
-/* A1D7B4 802426B4 0260B02D */  daddu     $s6, $s3, $zero
-/* A1D7B8 802426B8 0220202D */  daddu     $a0, $s1, $zero
-/* A1D7BC 802426BC 3C05F5DE */  lui       $a1, 0xf5de
-/* A1D7C0 802426C0 34A502DE */  ori       $a1, $a1, 0x2de
-/* A1D7C4 802426C4 0C0B2026 */  jal       evt_set_variable
-/* A1D7C8 802426C8 0280302D */   daddu    $a2, $s4, $zero
-/* A1D7CC 802426CC 0220202D */  daddu     $a0, $s1, $zero
-/* A1D7D0 802426D0 3C05F5DE */  lui       $a1, 0xf5de
-/* A1D7D4 802426D4 34A502DF */  ori       $a1, $a1, 0x2df
-/* A1D7D8 802426D8 0C0B2026 */  jal       evt_set_variable
-/* A1D7DC 802426DC 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* A1D7E0 802426E0 24100001 */  addiu     $s0, $zero, 1
-/* A1D7E4 802426E4 0220202D */  daddu     $a0, $s1, $zero
-.L802426E8:
-/* A1D7E8 802426E8 3C05F840 */  lui       $a1, 0xf840
-/* A1D7EC 802426EC 34A56268 */  ori       $a1, $a1, 0x6268
-/* A1D7F0 802426F0 0C0B2026 */  jal       evt_set_variable
-/* A1D7F4 802426F4 3206FFFF */   andi     $a2, $s0, 0xffff
-/* A1D7F8 802426F8 0220202D */  daddu     $a0, $s1, $zero
-/* A1D7FC 802426FC 3C05F840 */  lui       $a1, 0xf840
-/* A1D800 80242700 34A56269 */  ori       $a1, $a1, 0x6269
-/* A1D804 80242704 0C0B2026 */  jal       evt_set_variable
-/* A1D808 80242708 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* A1D80C 8024270C 0000202D */  daddu     $a0, $zero, $zero
-/* A1D810 80242710 3C05F5DE */  lui       $a1, 0xf5de
-/* A1D814 80242714 0C0B1EAF */  jal       evt_get_variable
-/* A1D818 80242718 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* A1D81C 8024271C 0000202D */  daddu     $a0, $zero, $zero
-/* A1D820 80242720 3C05F5DE */  lui       $a1, 0xf5de
-/* A1D824 80242724 34A50180 */  ori       $a1, $a1, 0x180
-/* A1D828 80242728 0C0B1EAF */  jal       evt_get_variable
-/* A1D82C 8024272C 0040802D */   daddu    $s0, $v0, $zero
-/* A1D830 80242730 0040282D */  daddu     $a1, $v0, $zero
-/* A1D834 80242734 0000182D */  daddu     $v1, $zero, $zero
-/* A1D838 80242738 3C068025 */  lui       $a2, %hi(D_802480C0_A231C0)
-/* A1D83C 8024273C 24C680C0 */  addiu     $a2, $a2, %lo(D_802480C0_A231C0)
-/* A1D840 80242740 00C0202D */  daddu     $a0, $a2, $zero
-.L80242744:
-/* A1D844 80242744 8C820000 */  lw        $v0, ($a0)
-/* A1D848 80242748 00A2102A */  slt       $v0, $a1, $v0
-/* A1D84C 8024274C 14400006 */  bnez      $v0, .L80242768
-/* A1D850 80242750 000310C0 */   sll      $v0, $v1, 3
-/* A1D854 80242754 24630001 */  addiu     $v1, $v1, 1
-/* A1D858 80242758 28620008 */  slti      $v0, $v1, 8
-/* A1D85C 8024275C 1440FFF9 */  bnez      $v0, .L80242744
-/* A1D860 80242760 24840008 */   addiu    $a0, $a0, 8
-/* A1D864 80242764 000310C0 */  sll       $v0, $v1, 3
-.L80242768:
-/* A1D868 80242768 00461021 */  addu      $v0, $v0, $a2
-/* A1D86C 8024276C 8C420004 */  lw        $v0, 4($v0)
-/* A1D870 80242770 97A30010 */  lhu       $v1, 0x10($sp)
-/* A1D874 80242774 0202202A */  slt       $a0, $s0, $v0
-/* A1D878 80242778 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* A1D87C 8024277C 14620008 */  bne       $v1, $v0, .L802427A0
-/* A1D880 80242780 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* A1D884 80242784 97A7001E */  lhu       $a3, 0x1e($sp)
-/* A1D888 80242788 14E20005 */  bne       $a3, $v0, .L802427A0
-/* A1D88C 8024278C 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* A1D890 80242790 14400003 */  bnez      $v0, .L802427A0
-/* A1D894 80242794 00000000 */   nop
-/* A1D898 80242798 14800008 */  bnez      $a0, .L802427BC
-/* A1D89C 8024279C 24020001 */   addiu    $v0, $zero, 1
-.L802427A0:
-/* A1D8A0 802427A0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* A1D8A4 802427A4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* A1D8A8 802427A8 80420075 */  lb        $v0, 0x75($v0)
-/* A1D8AC 802427AC 10400005 */  beqz      $v0, .L802427C4
-/* A1D8B0 802427B0 00000000 */   nop
-/* A1D8B4 802427B4 10800003 */  beqz      $a0, .L802427C4
-/* A1D8B8 802427B8 24020001 */   addiu    $v0, $zero, 1
-.L802427BC:
-/* A1D8BC 802427BC 080909F4 */  j         .L802427D0
-/* A1D8C0 802427C0 AE220084 */   sw       $v0, 0x84($s1)
-.L802427C4:
-/* A1D8C4 802427C4 0C00F9EB */  jal       kill_enemy
-/* A1D8C8 802427C8 03C0202D */   daddu    $a0, $fp, $zero
-/* A1D8CC 802427CC AE200084 */  sw        $zero, 0x84($s1)
-.L802427D0:
-/* A1D8D0 802427D0 8FBF0044 */  lw        $ra, 0x44($sp)
-/* A1D8D4 802427D4 8FBE0040 */  lw        $fp, 0x40($sp)
-/* A1D8D8 802427D8 8FB7003C */  lw        $s7, 0x3c($sp)
-/* A1D8DC 802427DC 8FB60038 */  lw        $s6, 0x38($sp)
-/* A1D8E0 802427E0 8FB50034 */  lw        $s5, 0x34($sp)
-/* A1D8E4 802427E4 8FB40030 */  lw        $s4, 0x30($sp)
-/* A1D8E8 802427E8 8FB3002C */  lw        $s3, 0x2c($sp)
-/* A1D8EC 802427EC 8FB20028 */  lw        $s2, 0x28($sp)
-/* A1D8F0 802427F0 8FB10024 */  lw        $s1, 0x24($sp)
-/* A1D8F4 802427F4 8FB00020 */  lw        $s0, 0x20($sp)
-/* A1D8F8 802427F8 24020002 */  addiu     $v0, $zero, 2
-/* A1D8FC 802427FC 03E00008 */  jr        $ra
-/* A1D900 80242800 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s
deleted file mode 100644
index 0c0aeb9516..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241750_B2DBC0
-/* B2DBC0 80241750 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* B2DBC4 80241754 AFB10024 */  sw        $s1, 0x24($sp)
-/* B2DBC8 80241758 0080882D */  daddu     $s1, $a0, $zero
-/* B2DBCC 8024175C 3C05F840 */  lui       $a1, 0xf840
-/* B2DBD0 80241760 AFBF0044 */  sw        $ra, 0x44($sp)
-/* B2DBD4 80241764 AFBE0040 */  sw        $fp, 0x40($sp)
-/* B2DBD8 80241768 AFB7003C */  sw        $s7, 0x3c($sp)
-/* B2DBDC 8024176C AFB60038 */  sw        $s6, 0x38($sp)
-/* B2DBE0 80241770 AFB50034 */  sw        $s5, 0x34($sp)
-/* B2DBE4 80241774 AFB40030 */  sw        $s4, 0x30($sp)
-/* B2DBE8 80241778 AFB3002C */  sw        $s3, 0x2c($sp)
-/* B2DBEC 8024177C AFB20028 */  sw        $s2, 0x28($sp)
-/* B2DBF0 80241780 AFB00020 */  sw        $s0, 0x20($sp)
-/* B2DBF4 80241784 8E3E0148 */  lw        $fp, 0x148($s1)
-/* B2DBF8 80241788 0C0B1EAF */  jal       evt_get_variable
-/* B2DBFC 8024178C 34A56268 */   ori      $a1, $a1, 0x6268
-/* B2DC00 80241790 0040802D */  daddu     $s0, $v0, $zero
-/* B2DC04 80241794 0220202D */  daddu     $a0, $s1, $zero
-/* B2DC08 80241798 3C05F840 */  lui       $a1, 0xf840
-/* B2DC0C 8024179C 0C0B1EAF */  jal       evt_get_variable
-/* B2DC10 802417A0 34A56269 */   ori      $a1, $a1, 0x6269
-/* B2DC14 802417A4 0040B82D */  daddu     $s7, $v0, $zero
-/* B2DC18 802417A8 0220202D */  daddu     $a0, $s1, $zero
-/* B2DC1C 802417AC 3C05F5DE */  lui       $a1, 0xf5de
-/* B2DC20 802417B0 0C0B1EAF */  jal       evt_get_variable
-/* B2DC24 802417B4 34A502DE */   ori      $a1, $a1, 0x2de
-/* B2DC28 802417B8 0040B02D */  daddu     $s6, $v0, $zero
-/* B2DC2C 802417BC 0220202D */  daddu     $a0, $s1, $zero
-/* B2DC30 802417C0 3C05F5DE */  lui       $a1, 0xf5de
-/* B2DC34 802417C4 0C0B1EAF */  jal       evt_get_variable
-/* B2DC38 802417C8 34A502DF */   ori      $a1, $a1, 0x2df
-/* B2DC3C 802417CC 0040A82D */  daddu     $s5, $v0, $zero
-/* B2DC40 802417D0 93D3006D */  lbu       $s3, 0x6d($fp)
-/* B2DC44 802417D4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* B2DC48 802417D8 A7B30010 */  sh        $s3, 0x10($sp)
-/* B2DC4C 802417DC 93D2006E */  lbu       $s2, 0x6e($fp)
-/* B2DC50 802417E0 93C7006F */  lbu       $a3, 0x6f($fp)
-/* B2DC54 802417E4 3274FFFF */  andi      $s4, $s3, 0xffff
-/* B2DC58 802417E8 12820003 */  beq       $s4, $v0, .L802417F8
-/* B2DC5C 802417EC A7A7001E */   sh       $a3, 0x1e($sp)
-/* B2DC60 802417F0 0000B82D */  daddu     $s7, $zero, $zero
-/* B2DC64 802417F4 02E0802D */  daddu     $s0, $s7, $zero
-.L802417F8:
-/* B2DC68 802417F8 3202FFFF */  andi      $v0, $s0, 0xffff
-/* B2DC6C 802417FC 14400016 */  bnez      $v0, .L80241858
-/* B2DC70 80241800 0220202D */   daddu    $a0, $s1, $zero
-/* B2DC74 80241804 0C00A67F */  jal       rand_int
-/* B2DC78 80241808 24040064 */   addiu    $a0, $zero, 0x64
-/* B2DC7C 8024180C 2842001E */  slti      $v0, $v0, 0x1e
-/* B2DC80 80241810 10400011 */  beqz      $v0, .L80241858
-/* B2DC84 80241814 0220202D */   daddu    $a0, $s1, $zero
-/* B2DC88 80241818 0C00A67F */  jal       rand_int
-/* B2DC8C 8024181C 2644FFFF */   addiu    $a0, $s2, -1
-/* B2DC90 80241820 0040A82D */  daddu     $s5, $v0, $zero
-/* B2DC94 80241824 0260B02D */  daddu     $s6, $s3, $zero
-/* B2DC98 80241828 0220202D */  daddu     $a0, $s1, $zero
-/* B2DC9C 8024182C 3C05F5DE */  lui       $a1, 0xf5de
-/* B2DCA0 80241830 34A502DE */  ori       $a1, $a1, 0x2de
-/* B2DCA4 80241834 0C0B2026 */  jal       evt_set_variable
-/* B2DCA8 80241838 0280302D */   daddu    $a2, $s4, $zero
-/* B2DCAC 8024183C 0220202D */  daddu     $a0, $s1, $zero
-/* B2DCB0 80241840 3C05F5DE */  lui       $a1, 0xf5de
-/* B2DCB4 80241844 34A502DF */  ori       $a1, $a1, 0x2df
-/* B2DCB8 80241848 0C0B2026 */  jal       evt_set_variable
-/* B2DCBC 8024184C 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* B2DCC0 80241850 24100001 */  addiu     $s0, $zero, 1
-/* B2DCC4 80241854 0220202D */  daddu     $a0, $s1, $zero
-.L80241858:
-/* B2DCC8 80241858 3C05F840 */  lui       $a1, 0xf840
-/* B2DCCC 8024185C 34A56268 */  ori       $a1, $a1, 0x6268
-/* B2DCD0 80241860 0C0B2026 */  jal       evt_set_variable
-/* B2DCD4 80241864 3206FFFF */   andi     $a2, $s0, 0xffff
-/* B2DCD8 80241868 0220202D */  daddu     $a0, $s1, $zero
-/* B2DCDC 8024186C 3C05F840 */  lui       $a1, 0xf840
-/* B2DCE0 80241870 34A56269 */  ori       $a1, $a1, 0x6269
-/* B2DCE4 80241874 0C0B2026 */  jal       evt_set_variable
-/* B2DCE8 80241878 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* B2DCEC 8024187C 0000202D */  daddu     $a0, $zero, $zero
-/* B2DCF0 80241880 3C05F5DE */  lui       $a1, 0xf5de
-/* B2DCF4 80241884 0C0B1EAF */  jal       evt_get_variable
-/* B2DCF8 80241888 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* B2DCFC 8024188C 0000202D */  daddu     $a0, $zero, $zero
-/* B2DD00 80241890 3C05F5DE */  lui       $a1, 0xf5de
-/* B2DD04 80241894 34A50180 */  ori       $a1, $a1, 0x180
-/* B2DD08 80241898 0C0B1EAF */  jal       evt_get_variable
-/* B2DD0C 8024189C 0040802D */   daddu    $s0, $v0, $zero
-/* B2DD10 802418A0 0040282D */  daddu     $a1, $v0, $zero
-/* B2DD14 802418A4 0000182D */  daddu     $v1, $zero, $zero
-/* B2DD18 802418A8 3C068024 */  lui       $a2, %hi(D_80243288_B2F6F8)
-/* B2DD1C 802418AC 24C63288 */  addiu     $a2, $a2, %lo(D_80243288_B2F6F8)
-/* B2DD20 802418B0 00C0202D */  daddu     $a0, $a2, $zero
-.L802418B4:
-/* B2DD24 802418B4 8C820000 */  lw        $v0, ($a0)
-/* B2DD28 802418B8 00A2102A */  slt       $v0, $a1, $v0
-/* B2DD2C 802418BC 14400006 */  bnez      $v0, .L802418D8
-/* B2DD30 802418C0 000310C0 */   sll      $v0, $v1, 3
-/* B2DD34 802418C4 24630001 */  addiu     $v1, $v1, 1
-/* B2DD38 802418C8 28620008 */  slti      $v0, $v1, 8
-/* B2DD3C 802418CC 1440FFF9 */  bnez      $v0, .L802418B4
-/* B2DD40 802418D0 24840008 */   addiu    $a0, $a0, 8
-/* B2DD44 802418D4 000310C0 */  sll       $v0, $v1, 3
-.L802418D8:
-/* B2DD48 802418D8 00461021 */  addu      $v0, $v0, $a2
-/* B2DD4C 802418DC 8C420004 */  lw        $v0, 4($v0)
-/* B2DD50 802418E0 97A30010 */  lhu       $v1, 0x10($sp)
-/* B2DD54 802418E4 0202202A */  slt       $a0, $s0, $v0
-/* B2DD58 802418E8 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* B2DD5C 802418EC 14620008 */  bne       $v1, $v0, .L80241910
-/* B2DD60 802418F0 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* B2DD64 802418F4 97A7001E */  lhu       $a3, 0x1e($sp)
-/* B2DD68 802418F8 14E20005 */  bne       $a3, $v0, .L80241910
-/* B2DD6C 802418FC 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* B2DD70 80241900 14400003 */  bnez      $v0, .L80241910
-/* B2DD74 80241904 00000000 */   nop
-/* B2DD78 80241908 14800008 */  bnez      $a0, .L8024192C
-/* B2DD7C 8024190C 24020001 */   addiu    $v0, $zero, 1
-.L80241910:
-/* B2DD80 80241910 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* B2DD84 80241914 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* B2DD88 80241918 80420075 */  lb        $v0, 0x75($v0)
-/* B2DD8C 8024191C 10400005 */  beqz      $v0, .L80241934
-/* B2DD90 80241920 00000000 */   nop
-/* B2DD94 80241924 10800003 */  beqz      $a0, .L80241934
-/* B2DD98 80241928 24020001 */   addiu    $v0, $zero, 1
-.L8024192C:
-/* B2DD9C 8024192C 08090650 */  j         .L80241940
-/* B2DDA0 80241930 AE220084 */   sw       $v0, 0x84($s1)
-.L80241934:
-/* B2DDA4 80241934 0C00F9EB */  jal       kill_enemy
-/* B2DDA8 80241938 03C0202D */   daddu    $a0, $fp, $zero
-/* B2DDAC 8024193C AE200084 */  sw        $zero, 0x84($s1)
-.L80241940:
-/* B2DDB0 80241940 8FBF0044 */  lw        $ra, 0x44($sp)
-/* B2DDB4 80241944 8FBE0040 */  lw        $fp, 0x40($sp)
-/* B2DDB8 80241948 8FB7003C */  lw        $s7, 0x3c($sp)
-/* B2DDBC 8024194C 8FB60038 */  lw        $s6, 0x38($sp)
-/* B2DDC0 80241950 8FB50034 */  lw        $s5, 0x34($sp)
-/* B2DDC4 80241954 8FB40030 */  lw        $s4, 0x30($sp)
-/* B2DDC8 80241958 8FB3002C */  lw        $s3, 0x2c($sp)
-/* B2DDCC 8024195C 8FB20028 */  lw        $s2, 0x28($sp)
-/* B2DDD0 80241960 8FB10024 */  lw        $s1, 0x24($sp)
-/* B2DDD4 80241964 8FB00020 */  lw        $s0, 0x20($sp)
-/* B2DDD8 80241968 24020002 */  addiu     $v0, $zero, 2
-/* B2DDDC 8024196C 03E00008 */  jr        $ra
-/* B2DDE0 80241970 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s
deleted file mode 100644
index c505c7ebda..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241CD8_B368A8
-/* B368A8 80241CD8 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* B368AC 80241CDC AFB10024 */  sw        $s1, 0x24($sp)
-/* B368B0 80241CE0 0080882D */  daddu     $s1, $a0, $zero
-/* B368B4 80241CE4 3C05F840 */  lui       $a1, 0xf840
-/* B368B8 80241CE8 AFBF0044 */  sw        $ra, 0x44($sp)
-/* B368BC 80241CEC AFBE0040 */  sw        $fp, 0x40($sp)
-/* B368C0 80241CF0 AFB7003C */  sw        $s7, 0x3c($sp)
-/* B368C4 80241CF4 AFB60038 */  sw        $s6, 0x38($sp)
-/* B368C8 80241CF8 AFB50034 */  sw        $s5, 0x34($sp)
-/* B368CC 80241CFC AFB40030 */  sw        $s4, 0x30($sp)
-/* B368D0 80241D00 AFB3002C */  sw        $s3, 0x2c($sp)
-/* B368D4 80241D04 AFB20028 */  sw        $s2, 0x28($sp)
-/* B368D8 80241D08 AFB00020 */  sw        $s0, 0x20($sp)
-/* B368DC 80241D0C 8E3E0148 */  lw        $fp, 0x148($s1)
-/* B368E0 80241D10 0C0B1EAF */  jal       evt_get_variable
-/* B368E4 80241D14 34A56268 */   ori      $a1, $a1, 0x6268
-/* B368E8 80241D18 0040802D */  daddu     $s0, $v0, $zero
-/* B368EC 80241D1C 0220202D */  daddu     $a0, $s1, $zero
-/* B368F0 80241D20 3C05F840 */  lui       $a1, 0xf840
-/* B368F4 80241D24 0C0B1EAF */  jal       evt_get_variable
-/* B368F8 80241D28 34A56269 */   ori      $a1, $a1, 0x6269
-/* B368FC 80241D2C 0040B82D */  daddu     $s7, $v0, $zero
-/* B36900 80241D30 0220202D */  daddu     $a0, $s1, $zero
-/* B36904 80241D34 3C05F5DE */  lui       $a1, 0xf5de
-/* B36908 80241D38 0C0B1EAF */  jal       evt_get_variable
-/* B3690C 80241D3C 34A502DE */   ori      $a1, $a1, 0x2de
-/* B36910 80241D40 0040B02D */  daddu     $s6, $v0, $zero
-/* B36914 80241D44 0220202D */  daddu     $a0, $s1, $zero
-/* B36918 80241D48 3C05F5DE */  lui       $a1, 0xf5de
-/* B3691C 80241D4C 0C0B1EAF */  jal       evt_get_variable
-/* B36920 80241D50 34A502DF */   ori      $a1, $a1, 0x2df
-/* B36924 80241D54 0040A82D */  daddu     $s5, $v0, $zero
-/* B36928 80241D58 93D3006D */  lbu       $s3, 0x6d($fp)
-/* B3692C 80241D5C 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* B36930 80241D60 A7B30010 */  sh        $s3, 0x10($sp)
-/* B36934 80241D64 93D2006E */  lbu       $s2, 0x6e($fp)
-/* B36938 80241D68 93C7006F */  lbu       $a3, 0x6f($fp)
-/* B3693C 80241D6C 3274FFFF */  andi      $s4, $s3, 0xffff
-/* B36940 80241D70 12820003 */  beq       $s4, $v0, .L80241D80
-/* B36944 80241D74 A7A7001E */   sh       $a3, 0x1e($sp)
-/* B36948 80241D78 0000B82D */  daddu     $s7, $zero, $zero
-/* B3694C 80241D7C 02E0802D */  daddu     $s0, $s7, $zero
-.L80241D80:
-/* B36950 80241D80 3202FFFF */  andi      $v0, $s0, 0xffff
-/* B36954 80241D84 14400016 */  bnez      $v0, .L80241DE0
-/* B36958 80241D88 0220202D */   daddu    $a0, $s1, $zero
-/* B3695C 80241D8C 0C00A67F */  jal       rand_int
-/* B36960 80241D90 24040064 */   addiu    $a0, $zero, 0x64
-/* B36964 80241D94 2842001E */  slti      $v0, $v0, 0x1e
-/* B36968 80241D98 10400011 */  beqz      $v0, .L80241DE0
-/* B3696C 80241D9C 0220202D */   daddu    $a0, $s1, $zero
-/* B36970 80241DA0 0C00A67F */  jal       rand_int
-/* B36974 80241DA4 2644FFFF */   addiu    $a0, $s2, -1
-/* B36978 80241DA8 0040A82D */  daddu     $s5, $v0, $zero
-/* B3697C 80241DAC 0260B02D */  daddu     $s6, $s3, $zero
-/* B36980 80241DB0 0220202D */  daddu     $a0, $s1, $zero
-/* B36984 80241DB4 3C05F5DE */  lui       $a1, 0xf5de
-/* B36988 80241DB8 34A502DE */  ori       $a1, $a1, 0x2de
-/* B3698C 80241DBC 0C0B2026 */  jal       evt_set_variable
-/* B36990 80241DC0 0280302D */   daddu    $a2, $s4, $zero
-/* B36994 80241DC4 0220202D */  daddu     $a0, $s1, $zero
-/* B36998 80241DC8 3C05F5DE */  lui       $a1, 0xf5de
-/* B3699C 80241DCC 34A502DF */  ori       $a1, $a1, 0x2df
-/* B369A0 80241DD0 0C0B2026 */  jal       evt_set_variable
-/* B369A4 80241DD4 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* B369A8 80241DD8 24100001 */  addiu     $s0, $zero, 1
-/* B369AC 80241DDC 0220202D */  daddu     $a0, $s1, $zero
-.L80241DE0:
-/* B369B0 80241DE0 3C05F840 */  lui       $a1, 0xf840
-/* B369B4 80241DE4 34A56268 */  ori       $a1, $a1, 0x6268
-/* B369B8 80241DE8 0C0B2026 */  jal       evt_set_variable
-/* B369BC 80241DEC 3206FFFF */   andi     $a2, $s0, 0xffff
-/* B369C0 80241DF0 0220202D */  daddu     $a0, $s1, $zero
-/* B369C4 80241DF4 3C05F840 */  lui       $a1, 0xf840
-/* B369C8 80241DF8 34A56269 */  ori       $a1, $a1, 0x6269
-/* B369CC 80241DFC 0C0B2026 */  jal       evt_set_variable
-/* B369D0 80241E00 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* B369D4 80241E04 0000202D */  daddu     $a0, $zero, $zero
-/* B369D8 80241E08 3C05F5DE */  lui       $a1, 0xf5de
-/* B369DC 80241E0C 0C0B1EAF */  jal       evt_get_variable
-/* B369E0 80241E10 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* B369E4 80241E14 0000202D */  daddu     $a0, $zero, $zero
-/* B369E8 80241E18 3C05F5DE */  lui       $a1, 0xf5de
-/* B369EC 80241E1C 34A50180 */  ori       $a1, $a1, 0x180
-/* B369F0 80241E20 0C0B1EAF */  jal       evt_get_variable
-/* B369F4 80241E24 0040802D */   daddu    $s0, $v0, $zero
-/* B369F8 80241E28 0040282D */  daddu     $a1, $v0, $zero
-/* B369FC 80241E2C 0000182D */  daddu     $v1, $zero, $zero
-/* B36A00 80241E30 3C068024 */  lui       $a2, %hi(D_80247808_B3C3D8)
-/* B36A04 80241E34 24C67808 */  addiu     $a2, $a2, %lo(D_80247808_B3C3D8)
-/* B36A08 80241E38 00C0202D */  daddu     $a0, $a2, $zero
-.L80241E3C:
-/* B36A0C 80241E3C 8C820000 */  lw        $v0, ($a0)
-/* B36A10 80241E40 00A2102A */  slt       $v0, $a1, $v0
-/* B36A14 80241E44 14400006 */  bnez      $v0, .L80241E60
-/* B36A18 80241E48 000310C0 */   sll      $v0, $v1, 3
-/* B36A1C 80241E4C 24630001 */  addiu     $v1, $v1, 1
-/* B36A20 80241E50 28620008 */  slti      $v0, $v1, 8
-/* B36A24 80241E54 1440FFF9 */  bnez      $v0, .L80241E3C
-/* B36A28 80241E58 24840008 */   addiu    $a0, $a0, 8
-/* B36A2C 80241E5C 000310C0 */  sll       $v0, $v1, 3
-.L80241E60:
-/* B36A30 80241E60 00461021 */  addu      $v0, $v0, $a2
-/* B36A34 80241E64 8C420004 */  lw        $v0, 4($v0)
-/* B36A38 80241E68 97A30010 */  lhu       $v1, 0x10($sp)
-/* B36A3C 80241E6C 0202202A */  slt       $a0, $s0, $v0
-/* B36A40 80241E70 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* B36A44 80241E74 14620008 */  bne       $v1, $v0, .L80241E98
-/* B36A48 80241E78 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* B36A4C 80241E7C 97A7001E */  lhu       $a3, 0x1e($sp)
-/* B36A50 80241E80 14E20005 */  bne       $a3, $v0, .L80241E98
-/* B36A54 80241E84 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* B36A58 80241E88 14400003 */  bnez      $v0, .L80241E98
-/* B36A5C 80241E8C 00000000 */   nop
-/* B36A60 80241E90 14800008 */  bnez      $a0, .L80241EB4
-/* B36A64 80241E94 24020001 */   addiu    $v0, $zero, 1
-.L80241E98:
-/* B36A68 80241E98 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* B36A6C 80241E9C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* B36A70 80241EA0 80420075 */  lb        $v0, 0x75($v0)
-/* B36A74 80241EA4 10400005 */  beqz      $v0, .L80241EBC
-/* B36A78 80241EA8 00000000 */   nop
-/* B36A7C 80241EAC 10800003 */  beqz      $a0, .L80241EBC
-/* B36A80 80241EB0 24020001 */   addiu    $v0, $zero, 1
-.L80241EB4:
-/* B36A84 80241EB4 080907B2 */  j         .L80241EC8
-/* B36A88 80241EB8 AE220084 */   sw       $v0, 0x84($s1)
-.L80241EBC:
-/* B36A8C 80241EBC 0C00F9EB */  jal       kill_enemy
-/* B36A90 80241EC0 03C0202D */   daddu    $a0, $fp, $zero
-/* B36A94 80241EC4 AE200084 */  sw        $zero, 0x84($s1)
-.L80241EC8:
-/* B36A98 80241EC8 8FBF0044 */  lw        $ra, 0x44($sp)
-/* B36A9C 80241ECC 8FBE0040 */  lw        $fp, 0x40($sp)
-/* B36AA0 80241ED0 8FB7003C */  lw        $s7, 0x3c($sp)
-/* B36AA4 80241ED4 8FB60038 */  lw        $s6, 0x38($sp)
-/* B36AA8 80241ED8 8FB50034 */  lw        $s5, 0x34($sp)
-/* B36AAC 80241EDC 8FB40030 */  lw        $s4, 0x30($sp)
-/* B36AB0 80241EE0 8FB3002C */  lw        $s3, 0x2c($sp)
-/* B36AB4 80241EE4 8FB20028 */  lw        $s2, 0x28($sp)
-/* B36AB8 80241EE8 8FB10024 */  lw        $s1, 0x24($sp)
-/* B36ABC 80241EEC 8FB00020 */  lw        $s0, 0x20($sp)
-/* B36AC0 80241EF0 24020002 */  addiu     $v0, $zero, 2
-/* B36AC4 80241EF4 03E00008 */  jr        $ra
-/* B36AC8 80241EF8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s
deleted file mode 100644
index a6040cde00..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404CC_8B053C
-/* 8B053C 802404CC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8B0540 802404D0 AFB10024 */  sw        $s1, 0x24($sp)
-/* 8B0544 802404D4 0080882D */  daddu     $s1, $a0, $zero
-/* 8B0548 802404D8 3C05F840 */  lui       $a1, 0xf840
-/* 8B054C 802404DC AFBF0044 */  sw        $ra, 0x44($sp)
-/* 8B0550 802404E0 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 8B0554 802404E4 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 8B0558 802404E8 AFB60038 */  sw        $s6, 0x38($sp)
-/* 8B055C 802404EC AFB50034 */  sw        $s5, 0x34($sp)
-/* 8B0560 802404F0 AFB40030 */  sw        $s4, 0x30($sp)
-/* 8B0564 802404F4 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 8B0568 802404F8 AFB20028 */  sw        $s2, 0x28($sp)
-/* 8B056C 802404FC AFB00020 */  sw        $s0, 0x20($sp)
-/* 8B0570 80240500 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 8B0574 80240504 0C0B1EAF */  jal       evt_get_variable
-/* 8B0578 80240508 34A56268 */   ori      $a1, $a1, 0x6268
-/* 8B057C 8024050C 0040802D */  daddu     $s0, $v0, $zero
-/* 8B0580 80240510 0220202D */  daddu     $a0, $s1, $zero
-/* 8B0584 80240514 3C05F840 */  lui       $a1, 0xf840
-/* 8B0588 80240518 0C0B1EAF */  jal       evt_get_variable
-/* 8B058C 8024051C 34A56269 */   ori      $a1, $a1, 0x6269
-/* 8B0590 80240520 0040B82D */  daddu     $s7, $v0, $zero
-/* 8B0594 80240524 0220202D */  daddu     $a0, $s1, $zero
-/* 8B0598 80240528 3C05F5DE */  lui       $a1, 0xf5de
-/* 8B059C 8024052C 0C0B1EAF */  jal       evt_get_variable
-/* 8B05A0 80240530 34A502DE */   ori      $a1, $a1, 0x2de
-/* 8B05A4 80240534 0040B02D */  daddu     $s6, $v0, $zero
-/* 8B05A8 80240538 0220202D */  daddu     $a0, $s1, $zero
-/* 8B05AC 8024053C 3C05F5DE */  lui       $a1, 0xf5de
-/* 8B05B0 80240540 0C0B1EAF */  jal       evt_get_variable
-/* 8B05B4 80240544 34A502DF */   ori      $a1, $a1, 0x2df
-/* 8B05B8 80240548 0040A82D */  daddu     $s5, $v0, $zero
-/* 8B05BC 8024054C 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 8B05C0 80240550 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 8B05C4 80240554 A7B30010 */  sh        $s3, 0x10($sp)
-/* 8B05C8 80240558 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 8B05CC 8024055C 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 8B05D0 80240560 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 8B05D4 80240564 12820003 */  beq       $s4, $v0, .L80240574
-/* 8B05D8 80240568 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 8B05DC 8024056C 0000B82D */  daddu     $s7, $zero, $zero
-/* 8B05E0 80240570 02E0802D */  daddu     $s0, $s7, $zero
-.L80240574:
-/* 8B05E4 80240574 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 8B05E8 80240578 14400016 */  bnez      $v0, .L802405D4
-/* 8B05EC 8024057C 0220202D */   daddu    $a0, $s1, $zero
-/* 8B05F0 80240580 0C00A67F */  jal       rand_int
-/* 8B05F4 80240584 24040064 */   addiu    $a0, $zero, 0x64
-/* 8B05F8 80240588 2842001E */  slti      $v0, $v0, 0x1e
-/* 8B05FC 8024058C 10400011 */  beqz      $v0, .L802405D4
-/* 8B0600 80240590 0220202D */   daddu    $a0, $s1, $zero
-/* 8B0604 80240594 0C00A67F */  jal       rand_int
-/* 8B0608 80240598 2644FFFF */   addiu    $a0, $s2, -1
-/* 8B060C 8024059C 0040A82D */  daddu     $s5, $v0, $zero
-/* 8B0610 802405A0 0260B02D */  daddu     $s6, $s3, $zero
-/* 8B0614 802405A4 0220202D */  daddu     $a0, $s1, $zero
-/* 8B0618 802405A8 3C05F5DE */  lui       $a1, 0xf5de
-/* 8B061C 802405AC 34A502DE */  ori       $a1, $a1, 0x2de
-/* 8B0620 802405B0 0C0B2026 */  jal       evt_set_variable
-/* 8B0624 802405B4 0280302D */   daddu    $a2, $s4, $zero
-/* 8B0628 802405B8 0220202D */  daddu     $a0, $s1, $zero
-/* 8B062C 802405BC 3C05F5DE */  lui       $a1, 0xf5de
-/* 8B0630 802405C0 34A502DF */  ori       $a1, $a1, 0x2df
-/* 8B0634 802405C4 0C0B2026 */  jal       evt_set_variable
-/* 8B0638 802405C8 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 8B063C 802405CC 24100001 */  addiu     $s0, $zero, 1
-/* 8B0640 802405D0 0220202D */  daddu     $a0, $s1, $zero
-.L802405D4:
-/* 8B0644 802405D4 3C05F840 */  lui       $a1, 0xf840
-/* 8B0648 802405D8 34A56268 */  ori       $a1, $a1, 0x6268
-/* 8B064C 802405DC 0C0B2026 */  jal       evt_set_variable
-/* 8B0650 802405E0 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 8B0654 802405E4 0220202D */  daddu     $a0, $s1, $zero
-/* 8B0658 802405E8 3C05F840 */  lui       $a1, 0xf840
-/* 8B065C 802405EC 34A56269 */  ori       $a1, $a1, 0x6269
-/* 8B0660 802405F0 0C0B2026 */  jal       evt_set_variable
-/* 8B0664 802405F4 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 8B0668 802405F8 0000202D */  daddu     $a0, $zero, $zero
-/* 8B066C 802405FC 3C05F5DE */  lui       $a1, 0xf5de
-/* 8B0670 80240600 0C0B1EAF */  jal       evt_get_variable
-/* 8B0674 80240604 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 8B0678 80240608 0000202D */  daddu     $a0, $zero, $zero
-/* 8B067C 8024060C 3C05F5DE */  lui       $a1, 0xf5de
-/* 8B0680 80240610 34A50180 */  ori       $a1, $a1, 0x180
-/* 8B0684 80240614 0C0B1EAF */  jal       evt_get_variable
-/* 8B0688 80240618 0040802D */   daddu    $s0, $v0, $zero
-/* 8B068C 8024061C 0040282D */  daddu     $a1, $v0, $zero
-/* 8B0690 80240620 0000182D */  daddu     $v1, $zero, $zero
-/* 8B0694 80240624 3C068024 */  lui       $a2, %hi(D_80245674_8B56E4)
-/* 8B0698 80240628 24C65674 */  addiu     $a2, $a2, %lo(D_80245674_8B56E4)
-/* 8B069C 8024062C 00C0202D */  daddu     $a0, $a2, $zero
-.L80240630:
-/* 8B06A0 80240630 8C820000 */  lw        $v0, ($a0)
-/* 8B06A4 80240634 00A2102A */  slt       $v0, $a1, $v0
-/* 8B06A8 80240638 14400006 */  bnez      $v0, .L80240654
-/* 8B06AC 8024063C 000310C0 */   sll      $v0, $v1, 3
-/* 8B06B0 80240640 24630001 */  addiu     $v1, $v1, 1
-/* 8B06B4 80240644 28620008 */  slti      $v0, $v1, 8
-/* 8B06B8 80240648 1440FFF9 */  bnez      $v0, .L80240630
-/* 8B06BC 8024064C 24840008 */   addiu    $a0, $a0, 8
-/* 8B06C0 80240650 000310C0 */  sll       $v0, $v1, 3
-.L80240654:
-/* 8B06C4 80240654 00461021 */  addu      $v0, $v0, $a2
-/* 8B06C8 80240658 8C420004 */  lw        $v0, 4($v0)
-/* 8B06CC 8024065C 97A30010 */  lhu       $v1, 0x10($sp)
-/* 8B06D0 80240660 0202202A */  slt       $a0, $s0, $v0
-/* 8B06D4 80240664 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 8B06D8 80240668 14620008 */  bne       $v1, $v0, .L8024068C
-/* 8B06DC 8024066C 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 8B06E0 80240670 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 8B06E4 80240674 14E20005 */  bne       $a3, $v0, .L8024068C
-/* 8B06E8 80240678 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 8B06EC 8024067C 14400003 */  bnez      $v0, .L8024068C
-/* 8B06F0 80240680 00000000 */   nop
-/* 8B06F4 80240684 14800008 */  bnez      $a0, .L802406A8
-/* 8B06F8 80240688 24020001 */   addiu    $v0, $zero, 1
-.L8024068C:
-/* 8B06FC 8024068C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8B0700 80240690 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8B0704 80240694 80420075 */  lb        $v0, 0x75($v0)
-/* 8B0708 80240698 10400005 */  beqz      $v0, .L802406B0
-/* 8B070C 8024069C 00000000 */   nop
-/* 8B0710 802406A0 10800003 */  beqz      $a0, .L802406B0
-/* 8B0714 802406A4 24020001 */   addiu    $v0, $zero, 1
-.L802406A8:
-/* 8B0718 802406A8 080901AF */  j         .L802406BC
-/* 8B071C 802406AC AE220084 */   sw       $v0, 0x84($s1)
-.L802406B0:
-/* 8B0720 802406B0 0C00F9EB */  jal       kill_enemy
-/* 8B0724 802406B4 03C0202D */   daddu    $a0, $fp, $zero
-/* 8B0728 802406B8 AE200084 */  sw        $zero, 0x84($s1)
-.L802406BC:
-/* 8B072C 802406BC 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 8B0730 802406C0 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 8B0734 802406C4 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 8B0738 802406C8 8FB60038 */  lw        $s6, 0x38($sp)
-/* 8B073C 802406CC 8FB50034 */  lw        $s5, 0x34($sp)
-/* 8B0740 802406D0 8FB40030 */  lw        $s4, 0x30($sp)
-/* 8B0744 802406D4 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 8B0748 802406D8 8FB20028 */  lw        $s2, 0x28($sp)
-/* 8B074C 802406DC 8FB10024 */  lw        $s1, 0x24($sp)
-/* 8B0750 802406E0 8FB00020 */  lw        $s0, 0x20($sp)
-/* 8B0754 802406E4 24020002 */  addiu     $v0, $zero, 2
-/* 8B0758 802406E8 03E00008 */  jr        $ra
-/* 8B075C 802406EC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s
deleted file mode 100644
index 4d36204ffd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024076C_7EB47C
-/* 7EB47C 8024076C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 7EB480 80240770 AFB10024 */  sw        $s1, 0x24($sp)
-/* 7EB484 80240774 0080882D */  daddu     $s1, $a0, $zero
-/* 7EB488 80240778 3C05F840 */  lui       $a1, 0xf840
-/* 7EB48C 8024077C AFBF0044 */  sw        $ra, 0x44($sp)
-/* 7EB490 80240780 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 7EB494 80240784 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 7EB498 80240788 AFB60038 */  sw        $s6, 0x38($sp)
-/* 7EB49C 8024078C AFB50034 */  sw        $s5, 0x34($sp)
-/* 7EB4A0 80240790 AFB40030 */  sw        $s4, 0x30($sp)
-/* 7EB4A4 80240794 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 7EB4A8 80240798 AFB20028 */  sw        $s2, 0x28($sp)
-/* 7EB4AC 8024079C AFB00020 */  sw        $s0, 0x20($sp)
-/* 7EB4B0 802407A0 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 7EB4B4 802407A4 0C0B1EAF */  jal       evt_get_variable
-/* 7EB4B8 802407A8 34A56268 */   ori      $a1, $a1, 0x6268
-/* 7EB4BC 802407AC 0040802D */  daddu     $s0, $v0, $zero
-/* 7EB4C0 802407B0 0220202D */  daddu     $a0, $s1, $zero
-/* 7EB4C4 802407B4 3C05F840 */  lui       $a1, 0xf840
-/* 7EB4C8 802407B8 0C0B1EAF */  jal       evt_get_variable
-/* 7EB4CC 802407BC 34A56269 */   ori      $a1, $a1, 0x6269
-/* 7EB4D0 802407C0 0040B82D */  daddu     $s7, $v0, $zero
-/* 7EB4D4 802407C4 0220202D */  daddu     $a0, $s1, $zero
-/* 7EB4D8 802407C8 3C05F5DE */  lui       $a1, 0xf5de
-/* 7EB4DC 802407CC 0C0B1EAF */  jal       evt_get_variable
-/* 7EB4E0 802407D0 34A502DE */   ori      $a1, $a1, 0x2de
-/* 7EB4E4 802407D4 0040B02D */  daddu     $s6, $v0, $zero
-/* 7EB4E8 802407D8 0220202D */  daddu     $a0, $s1, $zero
-/* 7EB4EC 802407DC 3C05F5DE */  lui       $a1, 0xf5de
-/* 7EB4F0 802407E0 0C0B1EAF */  jal       evt_get_variable
-/* 7EB4F4 802407E4 34A502DF */   ori      $a1, $a1, 0x2df
-/* 7EB4F8 802407E8 0040A82D */  daddu     $s5, $v0, $zero
-/* 7EB4FC 802407EC 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 7EB500 802407F0 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 7EB504 802407F4 A7B30010 */  sh        $s3, 0x10($sp)
-/* 7EB508 802407F8 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 7EB50C 802407FC 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 7EB510 80240800 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 7EB514 80240804 12820003 */  beq       $s4, $v0, .L80240814
-/* 7EB518 80240808 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 7EB51C 8024080C 0000B82D */  daddu     $s7, $zero, $zero
-/* 7EB520 80240810 02E0802D */  daddu     $s0, $s7, $zero
-.L80240814:
-/* 7EB524 80240814 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 7EB528 80240818 14400016 */  bnez      $v0, .L80240874
-/* 7EB52C 8024081C 0220202D */   daddu    $a0, $s1, $zero
-/* 7EB530 80240820 0C00A67F */  jal       rand_int
-/* 7EB534 80240824 24040064 */   addiu    $a0, $zero, 0x64
-/* 7EB538 80240828 2842001E */  slti      $v0, $v0, 0x1e
-/* 7EB53C 8024082C 10400011 */  beqz      $v0, .L80240874
-/* 7EB540 80240830 0220202D */   daddu    $a0, $s1, $zero
-/* 7EB544 80240834 0C00A67F */  jal       rand_int
-/* 7EB548 80240838 2644FFFF */   addiu    $a0, $s2, -1
-/* 7EB54C 8024083C 0040A82D */  daddu     $s5, $v0, $zero
-/* 7EB550 80240840 0260B02D */  daddu     $s6, $s3, $zero
-/* 7EB554 80240844 0220202D */  daddu     $a0, $s1, $zero
-/* 7EB558 80240848 3C05F5DE */  lui       $a1, 0xf5de
-/* 7EB55C 8024084C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 7EB560 80240850 0C0B2026 */  jal       evt_set_variable
-/* 7EB564 80240854 0280302D */   daddu    $a2, $s4, $zero
-/* 7EB568 80240858 0220202D */  daddu     $a0, $s1, $zero
-/* 7EB56C 8024085C 3C05F5DE */  lui       $a1, 0xf5de
-/* 7EB570 80240860 34A502DF */  ori       $a1, $a1, 0x2df
-/* 7EB574 80240864 0C0B2026 */  jal       evt_set_variable
-/* 7EB578 80240868 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 7EB57C 8024086C 24100001 */  addiu     $s0, $zero, 1
-/* 7EB580 80240870 0220202D */  daddu     $a0, $s1, $zero
-.L80240874:
-/* 7EB584 80240874 3C05F840 */  lui       $a1, 0xf840
-/* 7EB588 80240878 34A56268 */  ori       $a1, $a1, 0x6268
-/* 7EB58C 8024087C 0C0B2026 */  jal       evt_set_variable
-/* 7EB590 80240880 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 7EB594 80240884 0220202D */  daddu     $a0, $s1, $zero
-/* 7EB598 80240888 3C05F840 */  lui       $a1, 0xf840
-/* 7EB59C 8024088C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 7EB5A0 80240890 0C0B2026 */  jal       evt_set_variable
-/* 7EB5A4 80240894 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 7EB5A8 80240898 0000202D */  daddu     $a0, $zero, $zero
-/* 7EB5AC 8024089C 3C05F5DE */  lui       $a1, 0xf5de
-/* 7EB5B0 802408A0 0C0B1EAF */  jal       evt_get_variable
-/* 7EB5B4 802408A4 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 7EB5B8 802408A8 0000202D */  daddu     $a0, $zero, $zero
-/* 7EB5BC 802408AC 3C05F5DE */  lui       $a1, 0xf5de
-/* 7EB5C0 802408B0 34A50180 */  ori       $a1, $a1, 0x180
-/* 7EB5C4 802408B4 0C0B1EAF */  jal       evt_get_variable
-/* 7EB5C8 802408B8 0040802D */   daddu    $s0, $v0, $zero
-/* 7EB5CC 802408BC 0040282D */  daddu     $a1, $v0, $zero
-/* 7EB5D0 802408C0 0000182D */  daddu     $v1, $zero, $zero
-/* 7EB5D4 802408C4 3C068024 */  lui       $a2, %hi(D_80245E64_7F0B74)
-/* 7EB5D8 802408C8 24C65E64 */  addiu     $a2, $a2, %lo(D_80245E64_7F0B74)
-/* 7EB5DC 802408CC 00C0202D */  daddu     $a0, $a2, $zero
-.L802408D0:
-/* 7EB5E0 802408D0 8C820000 */  lw        $v0, ($a0)
-/* 7EB5E4 802408D4 00A2102A */  slt       $v0, $a1, $v0
-/* 7EB5E8 802408D8 14400006 */  bnez      $v0, .L802408F4
-/* 7EB5EC 802408DC 000310C0 */   sll      $v0, $v1, 3
-/* 7EB5F0 802408E0 24630001 */  addiu     $v1, $v1, 1
-/* 7EB5F4 802408E4 28620008 */  slti      $v0, $v1, 8
-/* 7EB5F8 802408E8 1440FFF9 */  bnez      $v0, .L802408D0
-/* 7EB5FC 802408EC 24840008 */   addiu    $a0, $a0, 8
-/* 7EB600 802408F0 000310C0 */  sll       $v0, $v1, 3
-.L802408F4:
-/* 7EB604 802408F4 00461021 */  addu      $v0, $v0, $a2
-/* 7EB608 802408F8 8C420004 */  lw        $v0, 4($v0)
-/* 7EB60C 802408FC 97A30010 */  lhu       $v1, 0x10($sp)
-/* 7EB610 80240900 0202202A */  slt       $a0, $s0, $v0
-/* 7EB614 80240904 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 7EB618 80240908 14620008 */  bne       $v1, $v0, .L8024092C
-/* 7EB61C 8024090C 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 7EB620 80240910 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 7EB624 80240914 14E20005 */  bne       $a3, $v0, .L8024092C
-/* 7EB628 80240918 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 7EB62C 8024091C 14400003 */  bnez      $v0, .L8024092C
-/* 7EB630 80240920 00000000 */   nop
-/* 7EB634 80240924 14800008 */  bnez      $a0, .L80240948
-/* 7EB638 80240928 24020001 */   addiu    $v0, $zero, 1
-.L8024092C:
-/* 7EB63C 8024092C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7EB640 80240930 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7EB644 80240934 80420075 */  lb        $v0, 0x75($v0)
-/* 7EB648 80240938 10400005 */  beqz      $v0, .L80240950
-/* 7EB64C 8024093C 00000000 */   nop
-/* 7EB650 80240940 10800003 */  beqz      $a0, .L80240950
-/* 7EB654 80240944 24020001 */   addiu    $v0, $zero, 1
-.L80240948:
-/* 7EB658 80240948 08090257 */  j         .L8024095C
-/* 7EB65C 8024094C AE220084 */   sw       $v0, 0x84($s1)
-.L80240950:
-/* 7EB660 80240950 0C00F9EB */  jal       kill_enemy
-/* 7EB664 80240954 03C0202D */   daddu    $a0, $fp, $zero
-/* 7EB668 80240958 AE200084 */  sw        $zero, 0x84($s1)
-.L8024095C:
-/* 7EB66C 8024095C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 7EB670 80240960 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 7EB674 80240964 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 7EB678 80240968 8FB60038 */  lw        $s6, 0x38($sp)
-/* 7EB67C 8024096C 8FB50034 */  lw        $s5, 0x34($sp)
-/* 7EB680 80240970 8FB40030 */  lw        $s4, 0x30($sp)
-/* 7EB684 80240974 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 7EB688 80240978 8FB20028 */  lw        $s2, 0x28($sp)
-/* 7EB68C 8024097C 8FB10024 */  lw        $s1, 0x24($sp)
-/* 7EB690 80240980 8FB00020 */  lw        $s0, 0x20($sp)
-/* 7EB694 80240984 24020002 */  addiu     $v0, $zero, 2
-/* 7EB698 80240988 03E00008 */  jr        $ra
-/* 7EB69C 8024098C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s
deleted file mode 100644
index dcb601de3f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024204C_8028CC
-/* 8028CC 8024204C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8028D0 80242050 AFB10024 */  sw        $s1, 0x24($sp)
-/* 8028D4 80242054 0080882D */  daddu     $s1, $a0, $zero
-/* 8028D8 80242058 3C05F840 */  lui       $a1, 0xf840
-/* 8028DC 8024205C AFBF0044 */  sw        $ra, 0x44($sp)
-/* 8028E0 80242060 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 8028E4 80242064 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 8028E8 80242068 AFB60038 */  sw        $s6, 0x38($sp)
-/* 8028EC 8024206C AFB50034 */  sw        $s5, 0x34($sp)
-/* 8028F0 80242070 AFB40030 */  sw        $s4, 0x30($sp)
-/* 8028F4 80242074 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 8028F8 80242078 AFB20028 */  sw        $s2, 0x28($sp)
-/* 8028FC 8024207C AFB00020 */  sw        $s0, 0x20($sp)
-/* 802900 80242080 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 802904 80242084 0C0B1EAF */  jal       evt_get_variable
-/* 802908 80242088 34A56268 */   ori      $a1, $a1, 0x6268
-/* 80290C 8024208C 0040802D */  daddu     $s0, $v0, $zero
-/* 802910 80242090 0220202D */  daddu     $a0, $s1, $zero
-/* 802914 80242094 3C05F840 */  lui       $a1, 0xf840
-/* 802918 80242098 0C0B1EAF */  jal       evt_get_variable
-/* 80291C 8024209C 34A56269 */   ori      $a1, $a1, 0x6269
-/* 802920 802420A0 0040B82D */  daddu     $s7, $v0, $zero
-/* 802924 802420A4 0220202D */  daddu     $a0, $s1, $zero
-/* 802928 802420A8 3C05F5DE */  lui       $a1, 0xf5de
-/* 80292C 802420AC 0C0B1EAF */  jal       evt_get_variable
-/* 802930 802420B0 34A502DE */   ori      $a1, $a1, 0x2de
-/* 802934 802420B4 0040B02D */  daddu     $s6, $v0, $zero
-/* 802938 802420B8 0220202D */  daddu     $a0, $s1, $zero
-/* 80293C 802420BC 3C05F5DE */  lui       $a1, 0xf5de
-/* 802940 802420C0 0C0B1EAF */  jal       evt_get_variable
-/* 802944 802420C4 34A502DF */   ori      $a1, $a1, 0x2df
-/* 802948 802420C8 0040A82D */  daddu     $s5, $v0, $zero
-/* 80294C 802420CC 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 802950 802420D0 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 802954 802420D4 A7B30010 */  sh        $s3, 0x10($sp)
-/* 802958 802420D8 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 80295C 802420DC 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 802960 802420E0 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 802964 802420E4 12820003 */  beq       $s4, $v0, .L802420F4
-/* 802968 802420E8 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 80296C 802420EC 0000B82D */  daddu     $s7, $zero, $zero
-/* 802970 802420F0 02E0802D */  daddu     $s0, $s7, $zero
-.L802420F4:
-/* 802974 802420F4 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 802978 802420F8 14400016 */  bnez      $v0, .L80242154
-/* 80297C 802420FC 0220202D */   daddu    $a0, $s1, $zero
-/* 802980 80242100 0C00A67F */  jal       rand_int
-/* 802984 80242104 24040064 */   addiu    $a0, $zero, 0x64
-/* 802988 80242108 2842001E */  slti      $v0, $v0, 0x1e
-/* 80298C 8024210C 10400011 */  beqz      $v0, .L80242154
-/* 802990 80242110 0220202D */   daddu    $a0, $s1, $zero
-/* 802994 80242114 0C00A67F */  jal       rand_int
-/* 802998 80242118 2644FFFF */   addiu    $a0, $s2, -1
-/* 80299C 8024211C 0040A82D */  daddu     $s5, $v0, $zero
-/* 8029A0 80242120 0260B02D */  daddu     $s6, $s3, $zero
-/* 8029A4 80242124 0220202D */  daddu     $a0, $s1, $zero
-/* 8029A8 80242128 3C05F5DE */  lui       $a1, 0xf5de
-/* 8029AC 8024212C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 8029B0 80242130 0C0B2026 */  jal       evt_set_variable
-/* 8029B4 80242134 0280302D */   daddu    $a2, $s4, $zero
-/* 8029B8 80242138 0220202D */  daddu     $a0, $s1, $zero
-/* 8029BC 8024213C 3C05F5DE */  lui       $a1, 0xf5de
-/* 8029C0 80242140 34A502DF */  ori       $a1, $a1, 0x2df
-/* 8029C4 80242144 0C0B2026 */  jal       evt_set_variable
-/* 8029C8 80242148 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 8029CC 8024214C 24100001 */  addiu     $s0, $zero, 1
-/* 8029D0 80242150 0220202D */  daddu     $a0, $s1, $zero
-.L80242154:
-/* 8029D4 80242154 3C05F840 */  lui       $a1, 0xf840
-/* 8029D8 80242158 34A56268 */  ori       $a1, $a1, 0x6268
-/* 8029DC 8024215C 0C0B2026 */  jal       evt_set_variable
-/* 8029E0 80242160 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 8029E4 80242164 0220202D */  daddu     $a0, $s1, $zero
-/* 8029E8 80242168 3C05F840 */  lui       $a1, 0xf840
-/* 8029EC 8024216C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 8029F0 80242170 0C0B2026 */  jal       evt_set_variable
-/* 8029F4 80242174 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 8029F8 80242178 0000202D */  daddu     $a0, $zero, $zero
-/* 8029FC 8024217C 3C05F5DE */  lui       $a1, 0xf5de
-/* 802A00 80242180 0C0B1EAF */  jal       evt_get_variable
-/* 802A04 80242184 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 802A08 80242188 0000202D */  daddu     $a0, $zero, $zero
-/* 802A0C 8024218C 3C05F5DE */  lui       $a1, 0xf5de
-/* 802A10 80242190 34A50180 */  ori       $a1, $a1, 0x180
-/* 802A14 80242194 0C0B1EAF */  jal       evt_get_variable
-/* 802A18 80242198 0040802D */   daddu    $s0, $v0, $zero
-/* 802A1C 8024219C 0040282D */  daddu     $a1, $v0, $zero
-/* 802A20 802421A0 0000182D */  daddu     $v1, $zero, $zero
-/* 802A24 802421A4 3C068025 */  lui       $a2, %hi(D_80248CD4_809554)
-/* 802A28 802421A8 24C68CD4 */  addiu     $a2, $a2, %lo(D_80248CD4_809554)
-/* 802A2C 802421AC 00C0202D */  daddu     $a0, $a2, $zero
-.L802421B0:
-/* 802A30 802421B0 8C820000 */  lw        $v0, ($a0)
-/* 802A34 802421B4 00A2102A */  slt       $v0, $a1, $v0
-/* 802A38 802421B8 14400006 */  bnez      $v0, .L802421D4
-/* 802A3C 802421BC 000310C0 */   sll      $v0, $v1, 3
-/* 802A40 802421C0 24630001 */  addiu     $v1, $v1, 1
-/* 802A44 802421C4 28620008 */  slti      $v0, $v1, 8
-/* 802A48 802421C8 1440FFF9 */  bnez      $v0, .L802421B0
-/* 802A4C 802421CC 24840008 */   addiu    $a0, $a0, 8
-/* 802A50 802421D0 000310C0 */  sll       $v0, $v1, 3
-.L802421D4:
-/* 802A54 802421D4 00461021 */  addu      $v0, $v0, $a2
-/* 802A58 802421D8 8C420004 */  lw        $v0, 4($v0)
-/* 802A5C 802421DC 97A30010 */  lhu       $v1, 0x10($sp)
-/* 802A60 802421E0 0202202A */  slt       $a0, $s0, $v0
-/* 802A64 802421E4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 802A68 802421E8 14620008 */  bne       $v1, $v0, .L8024220C
-/* 802A6C 802421EC 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 802A70 802421F0 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 802A74 802421F4 14E20005 */  bne       $a3, $v0, .L8024220C
-/* 802A78 802421F8 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 802A7C 802421FC 14400003 */  bnez      $v0, .L8024220C
-/* 802A80 80242200 00000000 */   nop
-/* 802A84 80242204 14800008 */  bnez      $a0, .L80242228
-/* 802A88 80242208 24020001 */   addiu    $v0, $zero, 1
-.L8024220C:
-/* 802A8C 8024220C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 802A90 80242210 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 802A94 80242214 80420075 */  lb        $v0, 0x75($v0)
-/* 802A98 80242218 10400005 */  beqz      $v0, .L80242230
-/* 802A9C 8024221C 00000000 */   nop
-/* 802AA0 80242220 10800003 */  beqz      $a0, .L80242230
-/* 802AA4 80242224 24020001 */   addiu    $v0, $zero, 1
-.L80242228:
-/* 802AA8 80242228 0809088F */  j         .L8024223C
-/* 802AAC 8024222C AE220084 */   sw       $v0, 0x84($s1)
-.L80242230:
-/* 802AB0 80242230 0C00F9EB */  jal       kill_enemy
-/* 802AB4 80242234 03C0202D */   daddu    $a0, $fp, $zero
-/* 802AB8 80242238 AE200084 */  sw        $zero, 0x84($s1)
-.L8024223C:
-/* 802ABC 8024223C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 802AC0 80242240 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 802AC4 80242244 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 802AC8 80242248 8FB60038 */  lw        $s6, 0x38($sp)
-/* 802ACC 8024224C 8FB50034 */  lw        $s5, 0x34($sp)
-/* 802AD0 80242250 8FB40030 */  lw        $s4, 0x30($sp)
-/* 802AD4 80242254 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 802AD8 80242258 8FB20028 */  lw        $s2, 0x28($sp)
-/* 802ADC 8024225C 8FB10024 */  lw        $s1, 0x24($sp)
-/* 802AE0 80242260 8FB00020 */  lw        $s0, 0x20($sp)
-/* 802AE4 80242264 24020002 */  addiu     $v0, $zero, 2
-/* 802AE8 80242268 03E00008 */  jr        $ra
-/* 802AEC 8024226C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s
deleted file mode 100644
index 35a4d7b6a0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418FC_824BBC
-/* 824BBC 802418FC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 824BC0 80241900 AFB10024 */  sw        $s1, 0x24($sp)
-/* 824BC4 80241904 0080882D */  daddu     $s1, $a0, $zero
-/* 824BC8 80241908 3C05F840 */  lui       $a1, 0xf840
-/* 824BCC 8024190C AFBF0044 */  sw        $ra, 0x44($sp)
-/* 824BD0 80241910 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 824BD4 80241914 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 824BD8 80241918 AFB60038 */  sw        $s6, 0x38($sp)
-/* 824BDC 8024191C AFB50034 */  sw        $s5, 0x34($sp)
-/* 824BE0 80241920 AFB40030 */  sw        $s4, 0x30($sp)
-/* 824BE4 80241924 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 824BE8 80241928 AFB20028 */  sw        $s2, 0x28($sp)
-/* 824BEC 8024192C AFB00020 */  sw        $s0, 0x20($sp)
-/* 824BF0 80241930 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 824BF4 80241934 0C0B1EAF */  jal       evt_get_variable
-/* 824BF8 80241938 34A56268 */   ori      $a1, $a1, 0x6268
-/* 824BFC 8024193C 0040802D */  daddu     $s0, $v0, $zero
-/* 824C00 80241940 0220202D */  daddu     $a0, $s1, $zero
-/* 824C04 80241944 3C05F840 */  lui       $a1, 0xf840
-/* 824C08 80241948 0C0B1EAF */  jal       evt_get_variable
-/* 824C0C 8024194C 34A56269 */   ori      $a1, $a1, 0x6269
-/* 824C10 80241950 0040B82D */  daddu     $s7, $v0, $zero
-/* 824C14 80241954 0220202D */  daddu     $a0, $s1, $zero
-/* 824C18 80241958 3C05F5DE */  lui       $a1, 0xf5de
-/* 824C1C 8024195C 0C0B1EAF */  jal       evt_get_variable
-/* 824C20 80241960 34A502DE */   ori      $a1, $a1, 0x2de
-/* 824C24 80241964 0040B02D */  daddu     $s6, $v0, $zero
-/* 824C28 80241968 0220202D */  daddu     $a0, $s1, $zero
-/* 824C2C 8024196C 3C05F5DE */  lui       $a1, 0xf5de
-/* 824C30 80241970 0C0B1EAF */  jal       evt_get_variable
-/* 824C34 80241974 34A502DF */   ori      $a1, $a1, 0x2df
-/* 824C38 80241978 0040A82D */  daddu     $s5, $v0, $zero
-/* 824C3C 8024197C 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 824C40 80241980 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 824C44 80241984 A7B30010 */  sh        $s3, 0x10($sp)
-/* 824C48 80241988 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 824C4C 8024198C 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 824C50 80241990 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 824C54 80241994 12820003 */  beq       $s4, $v0, .L802419A4
-/* 824C58 80241998 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 824C5C 8024199C 0000B82D */  daddu     $s7, $zero, $zero
-/* 824C60 802419A0 02E0802D */  daddu     $s0, $s7, $zero
-.L802419A4:
-/* 824C64 802419A4 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 824C68 802419A8 14400016 */  bnez      $v0, .L80241A04
-/* 824C6C 802419AC 0220202D */   daddu    $a0, $s1, $zero
-/* 824C70 802419B0 0C00A67F */  jal       rand_int
-/* 824C74 802419B4 24040064 */   addiu    $a0, $zero, 0x64
-/* 824C78 802419B8 2842001E */  slti      $v0, $v0, 0x1e
-/* 824C7C 802419BC 10400011 */  beqz      $v0, .L80241A04
-/* 824C80 802419C0 0220202D */   daddu    $a0, $s1, $zero
-/* 824C84 802419C4 0C00A67F */  jal       rand_int
-/* 824C88 802419C8 2644FFFF */   addiu    $a0, $s2, -1
-/* 824C8C 802419CC 0040A82D */  daddu     $s5, $v0, $zero
-/* 824C90 802419D0 0260B02D */  daddu     $s6, $s3, $zero
-/* 824C94 802419D4 0220202D */  daddu     $a0, $s1, $zero
-/* 824C98 802419D8 3C05F5DE */  lui       $a1, 0xf5de
-/* 824C9C 802419DC 34A502DE */  ori       $a1, $a1, 0x2de
-/* 824CA0 802419E0 0C0B2026 */  jal       evt_set_variable
-/* 824CA4 802419E4 0280302D */   daddu    $a2, $s4, $zero
-/* 824CA8 802419E8 0220202D */  daddu     $a0, $s1, $zero
-/* 824CAC 802419EC 3C05F5DE */  lui       $a1, 0xf5de
-/* 824CB0 802419F0 34A502DF */  ori       $a1, $a1, 0x2df
-/* 824CB4 802419F4 0C0B2026 */  jal       evt_set_variable
-/* 824CB8 802419F8 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 824CBC 802419FC 24100001 */  addiu     $s0, $zero, 1
-/* 824CC0 80241A00 0220202D */  daddu     $a0, $s1, $zero
-.L80241A04:
-/* 824CC4 80241A04 3C05F840 */  lui       $a1, 0xf840
-/* 824CC8 80241A08 34A56268 */  ori       $a1, $a1, 0x6268
-/* 824CCC 80241A0C 0C0B2026 */  jal       evt_set_variable
-/* 824CD0 80241A10 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 824CD4 80241A14 0220202D */  daddu     $a0, $s1, $zero
-/* 824CD8 80241A18 3C05F840 */  lui       $a1, 0xf840
-/* 824CDC 80241A1C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 824CE0 80241A20 0C0B2026 */  jal       evt_set_variable
-/* 824CE4 80241A24 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 824CE8 80241A28 0000202D */  daddu     $a0, $zero, $zero
-/* 824CEC 80241A2C 3C05F5DE */  lui       $a1, 0xf5de
-/* 824CF0 80241A30 0C0B1EAF */  jal       evt_get_variable
-/* 824CF4 80241A34 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 824CF8 80241A38 0000202D */  daddu     $a0, $zero, $zero
-/* 824CFC 80241A3C 3C05F5DE */  lui       $a1, 0xf5de
-/* 824D00 80241A40 34A50180 */  ori       $a1, $a1, 0x180
-/* 824D04 80241A44 0C0B1EAF */  jal       evt_get_variable
-/* 824D08 80241A48 0040802D */   daddu    $s0, $v0, $zero
-/* 824D0C 80241A4C 0040282D */  daddu     $a1, $v0, $zero
-/* 824D10 80241A50 0000182D */  daddu     $v1, $zero, $zero
-/* 824D14 80241A54 3C068024 */  lui       $a2, %hi(D_802461F4_8294B4)
-/* 824D18 80241A58 24C661F4 */  addiu     $a2, $a2, %lo(D_802461F4_8294B4)
-/* 824D1C 80241A5C 00C0202D */  daddu     $a0, $a2, $zero
-.L80241A60:
-/* 824D20 80241A60 8C820000 */  lw        $v0, ($a0)
-/* 824D24 80241A64 00A2102A */  slt       $v0, $a1, $v0
-/* 824D28 80241A68 14400006 */  bnez      $v0, .L80241A84
-/* 824D2C 80241A6C 000310C0 */   sll      $v0, $v1, 3
-/* 824D30 80241A70 24630001 */  addiu     $v1, $v1, 1
-/* 824D34 80241A74 28620008 */  slti      $v0, $v1, 8
-/* 824D38 80241A78 1440FFF9 */  bnez      $v0, .L80241A60
-/* 824D3C 80241A7C 24840008 */   addiu    $a0, $a0, 8
-/* 824D40 80241A80 000310C0 */  sll       $v0, $v1, 3
-.L80241A84:
-/* 824D44 80241A84 00461021 */  addu      $v0, $v0, $a2
-/* 824D48 80241A88 8C420004 */  lw        $v0, 4($v0)
-/* 824D4C 80241A8C 97A30010 */  lhu       $v1, 0x10($sp)
-/* 824D50 80241A90 0202202A */  slt       $a0, $s0, $v0
-/* 824D54 80241A94 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 824D58 80241A98 14620008 */  bne       $v1, $v0, .L80241ABC
-/* 824D5C 80241A9C 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 824D60 80241AA0 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 824D64 80241AA4 14E20005 */  bne       $a3, $v0, .L80241ABC
-/* 824D68 80241AA8 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 824D6C 80241AAC 14400003 */  bnez      $v0, .L80241ABC
-/* 824D70 80241AB0 00000000 */   nop
-/* 824D74 80241AB4 14800008 */  bnez      $a0, .L80241AD8
-/* 824D78 80241AB8 24020001 */   addiu    $v0, $zero, 1
-.L80241ABC:
-/* 824D7C 80241ABC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 824D80 80241AC0 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 824D84 80241AC4 80420075 */  lb        $v0, 0x75($v0)
-/* 824D88 80241AC8 10400005 */  beqz      $v0, .L80241AE0
-/* 824D8C 80241ACC 00000000 */   nop
-/* 824D90 80241AD0 10800003 */  beqz      $a0, .L80241AE0
-/* 824D94 80241AD4 24020001 */   addiu    $v0, $zero, 1
-.L80241AD8:
-/* 824D98 80241AD8 080906BB */  j         .L80241AEC
-/* 824D9C 80241ADC AE220084 */   sw       $v0, 0x84($s1)
-.L80241AE0:
-/* 824DA0 80241AE0 0C00F9EB */  jal       kill_enemy
-/* 824DA4 80241AE4 03C0202D */   daddu    $a0, $fp, $zero
-/* 824DA8 80241AE8 AE200084 */  sw        $zero, 0x84($s1)
-.L80241AEC:
-/* 824DAC 80241AEC 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 824DB0 80241AF0 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 824DB4 80241AF4 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 824DB8 80241AF8 8FB60038 */  lw        $s6, 0x38($sp)
-/* 824DBC 80241AFC 8FB50034 */  lw        $s5, 0x34($sp)
-/* 824DC0 80241B00 8FB40030 */  lw        $s4, 0x30($sp)
-/* 824DC4 80241B04 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 824DC8 80241B08 8FB20028 */  lw        $s2, 0x28($sp)
-/* 824DCC 80241B0C 8FB10024 */  lw        $s1, 0x24($sp)
-/* 824DD0 80241B10 8FB00020 */  lw        $s0, 0x20($sp)
-/* 824DD4 80241B14 24020002 */  addiu     $v0, $zero, 2
-/* 824DD8 80241B18 03E00008 */  jr        $ra
-/* 824DDC 80241B1C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s
deleted file mode 100644
index e8efc0ef31..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405EC_831DEC
-/* 831DEC 802405EC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 831DF0 802405F0 AFB10024 */  sw        $s1, 0x24($sp)
-/* 831DF4 802405F4 0080882D */  daddu     $s1, $a0, $zero
-/* 831DF8 802405F8 3C05F840 */  lui       $a1, 0xf840
-/* 831DFC 802405FC AFBF0044 */  sw        $ra, 0x44($sp)
-/* 831E00 80240600 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 831E04 80240604 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 831E08 80240608 AFB60038 */  sw        $s6, 0x38($sp)
-/* 831E0C 8024060C AFB50034 */  sw        $s5, 0x34($sp)
-/* 831E10 80240610 AFB40030 */  sw        $s4, 0x30($sp)
-/* 831E14 80240614 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 831E18 80240618 AFB20028 */  sw        $s2, 0x28($sp)
-/* 831E1C 8024061C AFB00020 */  sw        $s0, 0x20($sp)
-/* 831E20 80240620 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 831E24 80240624 0C0B1EAF */  jal       evt_get_variable
-/* 831E28 80240628 34A56268 */   ori      $a1, $a1, 0x6268
-/* 831E2C 8024062C 0040802D */  daddu     $s0, $v0, $zero
-/* 831E30 80240630 0220202D */  daddu     $a0, $s1, $zero
-/* 831E34 80240634 3C05F840 */  lui       $a1, 0xf840
-/* 831E38 80240638 0C0B1EAF */  jal       evt_get_variable
-/* 831E3C 8024063C 34A56269 */   ori      $a1, $a1, 0x6269
-/* 831E40 80240640 0040B82D */  daddu     $s7, $v0, $zero
-/* 831E44 80240644 0220202D */  daddu     $a0, $s1, $zero
-/* 831E48 80240648 3C05F5DE */  lui       $a1, 0xf5de
-/* 831E4C 8024064C 0C0B1EAF */  jal       evt_get_variable
-/* 831E50 80240650 34A502DE */   ori      $a1, $a1, 0x2de
-/* 831E54 80240654 0040B02D */  daddu     $s6, $v0, $zero
-/* 831E58 80240658 0220202D */  daddu     $a0, $s1, $zero
-/* 831E5C 8024065C 3C05F5DE */  lui       $a1, 0xf5de
-/* 831E60 80240660 0C0B1EAF */  jal       evt_get_variable
-/* 831E64 80240664 34A502DF */   ori      $a1, $a1, 0x2df
-/* 831E68 80240668 0040A82D */  daddu     $s5, $v0, $zero
-/* 831E6C 8024066C 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 831E70 80240670 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 831E74 80240674 A7B30010 */  sh        $s3, 0x10($sp)
-/* 831E78 80240678 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 831E7C 8024067C 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 831E80 80240680 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 831E84 80240684 12820003 */  beq       $s4, $v0, .L80240694
-/* 831E88 80240688 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 831E8C 8024068C 0000B82D */  daddu     $s7, $zero, $zero
-/* 831E90 80240690 02E0802D */  daddu     $s0, $s7, $zero
-.L80240694:
-/* 831E94 80240694 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 831E98 80240698 14400016 */  bnez      $v0, .L802406F4
-/* 831E9C 8024069C 0220202D */   daddu    $a0, $s1, $zero
-/* 831EA0 802406A0 0C00A67F */  jal       rand_int
-/* 831EA4 802406A4 24040064 */   addiu    $a0, $zero, 0x64
-/* 831EA8 802406A8 2842001E */  slti      $v0, $v0, 0x1e
-/* 831EAC 802406AC 10400011 */  beqz      $v0, .L802406F4
-/* 831EB0 802406B0 0220202D */   daddu    $a0, $s1, $zero
-/* 831EB4 802406B4 0C00A67F */  jal       rand_int
-/* 831EB8 802406B8 2644FFFF */   addiu    $a0, $s2, -1
-/* 831EBC 802406BC 0040A82D */  daddu     $s5, $v0, $zero
-/* 831EC0 802406C0 0260B02D */  daddu     $s6, $s3, $zero
-/* 831EC4 802406C4 0220202D */  daddu     $a0, $s1, $zero
-/* 831EC8 802406C8 3C05F5DE */  lui       $a1, 0xf5de
-/* 831ECC 802406CC 34A502DE */  ori       $a1, $a1, 0x2de
-/* 831ED0 802406D0 0C0B2026 */  jal       evt_set_variable
-/* 831ED4 802406D4 0280302D */   daddu    $a2, $s4, $zero
-/* 831ED8 802406D8 0220202D */  daddu     $a0, $s1, $zero
-/* 831EDC 802406DC 3C05F5DE */  lui       $a1, 0xf5de
-/* 831EE0 802406E0 34A502DF */  ori       $a1, $a1, 0x2df
-/* 831EE4 802406E4 0C0B2026 */  jal       evt_set_variable
-/* 831EE8 802406E8 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 831EEC 802406EC 24100001 */  addiu     $s0, $zero, 1
-/* 831EF0 802406F0 0220202D */  daddu     $a0, $s1, $zero
-.L802406F4:
-/* 831EF4 802406F4 3C05F840 */  lui       $a1, 0xf840
-/* 831EF8 802406F8 34A56268 */  ori       $a1, $a1, 0x6268
-/* 831EFC 802406FC 0C0B2026 */  jal       evt_set_variable
-/* 831F00 80240700 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 831F04 80240704 0220202D */  daddu     $a0, $s1, $zero
-/* 831F08 80240708 3C05F840 */  lui       $a1, 0xf840
-/* 831F0C 8024070C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 831F10 80240710 0C0B2026 */  jal       evt_set_variable
-/* 831F14 80240714 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 831F18 80240718 0000202D */  daddu     $a0, $zero, $zero
-/* 831F1C 8024071C 3C05F5DE */  lui       $a1, 0xf5de
-/* 831F20 80240720 0C0B1EAF */  jal       evt_get_variable
-/* 831F24 80240724 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 831F28 80240728 0000202D */  daddu     $a0, $zero, $zero
-/* 831F2C 8024072C 3C05F5DE */  lui       $a1, 0xf5de
-/* 831F30 80240730 34A50180 */  ori       $a1, $a1, 0x180
-/* 831F34 80240734 0C0B1EAF */  jal       evt_get_variable
-/* 831F38 80240738 0040802D */   daddu    $s0, $v0, $zero
-/* 831F3C 8024073C 0040282D */  daddu     $a1, $v0, $zero
-/* 831F40 80240740 0000182D */  daddu     $v1, $zero, $zero
-/* 831F44 80240744 3C068024 */  lui       $a2, %hi(D_802466E8_837EE8)
-/* 831F48 80240748 24C666E8 */  addiu     $a2, $a2, %lo(D_802466E8_837EE8)
-/* 831F4C 8024074C 00C0202D */  daddu     $a0, $a2, $zero
-.L80240750:
-/* 831F50 80240750 8C820000 */  lw        $v0, ($a0)
-/* 831F54 80240754 00A2102A */  slt       $v0, $a1, $v0
-/* 831F58 80240758 14400006 */  bnez      $v0, .L80240774
-/* 831F5C 8024075C 000310C0 */   sll      $v0, $v1, 3
-/* 831F60 80240760 24630001 */  addiu     $v1, $v1, 1
-/* 831F64 80240764 28620008 */  slti      $v0, $v1, 8
-/* 831F68 80240768 1440FFF9 */  bnez      $v0, .L80240750
-/* 831F6C 8024076C 24840008 */   addiu    $a0, $a0, 8
-/* 831F70 80240770 000310C0 */  sll       $v0, $v1, 3
-.L80240774:
-/* 831F74 80240774 00461021 */  addu      $v0, $v0, $a2
-/* 831F78 80240778 8C420004 */  lw        $v0, 4($v0)
-/* 831F7C 8024077C 97A30010 */  lhu       $v1, 0x10($sp)
-/* 831F80 80240780 0202202A */  slt       $a0, $s0, $v0
-/* 831F84 80240784 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 831F88 80240788 14620008 */  bne       $v1, $v0, .L802407AC
-/* 831F8C 8024078C 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 831F90 80240790 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 831F94 80240794 14E20005 */  bne       $a3, $v0, .L802407AC
-/* 831F98 80240798 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 831F9C 8024079C 14400003 */  bnez      $v0, .L802407AC
-/* 831FA0 802407A0 00000000 */   nop
-/* 831FA4 802407A4 14800008 */  bnez      $a0, .L802407C8
-/* 831FA8 802407A8 24020001 */   addiu    $v0, $zero, 1
-.L802407AC:
-/* 831FAC 802407AC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 831FB0 802407B0 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 831FB4 802407B4 80420075 */  lb        $v0, 0x75($v0)
-/* 831FB8 802407B8 10400005 */  beqz      $v0, .L802407D0
-/* 831FBC 802407BC 00000000 */   nop
-/* 831FC0 802407C0 10800003 */  beqz      $a0, .L802407D0
-/* 831FC4 802407C4 24020001 */   addiu    $v0, $zero, 1
-.L802407C8:
-/* 831FC8 802407C8 080901F7 */  j         .L802407DC
-/* 831FCC 802407CC AE220084 */   sw       $v0, 0x84($s1)
-.L802407D0:
-/* 831FD0 802407D0 0C00F9EB */  jal       kill_enemy
-/* 831FD4 802407D4 03C0202D */   daddu    $a0, $fp, $zero
-/* 831FD8 802407D8 AE200084 */  sw        $zero, 0x84($s1)
-.L802407DC:
-/* 831FDC 802407DC 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 831FE0 802407E0 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 831FE4 802407E4 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 831FE8 802407E8 8FB60038 */  lw        $s6, 0x38($sp)
-/* 831FEC 802407EC 8FB50034 */  lw        $s5, 0x34($sp)
-/* 831FF0 802407F0 8FB40030 */  lw        $s4, 0x30($sp)
-/* 831FF4 802407F4 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 831FF8 802407F8 8FB20028 */  lw        $s2, 0x28($sp)
-/* 831FFC 802407FC 8FB10024 */  lw        $s1, 0x24($sp)
-/* 832000 80240800 8FB00020 */  lw        $s0, 0x20($sp)
-/* 832004 80240804 24020002 */  addiu     $v0, $zero, 2
-/* 832008 80240808 03E00008 */  jr        $ra
-/* 83200C 8024080C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s
deleted file mode 100644
index 592b390e1f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024059C_84316C
-/* 84316C 8024059C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 843170 802405A0 AFB10024 */  sw        $s1, 0x24($sp)
-/* 843174 802405A4 0080882D */  daddu     $s1, $a0, $zero
-/* 843178 802405A8 3C05F840 */  lui       $a1, 0xf840
-/* 84317C 802405AC AFBF0044 */  sw        $ra, 0x44($sp)
-/* 843180 802405B0 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 843184 802405B4 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 843188 802405B8 AFB60038 */  sw        $s6, 0x38($sp)
-/* 84318C 802405BC AFB50034 */  sw        $s5, 0x34($sp)
-/* 843190 802405C0 AFB40030 */  sw        $s4, 0x30($sp)
-/* 843194 802405C4 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 843198 802405C8 AFB20028 */  sw        $s2, 0x28($sp)
-/* 84319C 802405CC AFB00020 */  sw        $s0, 0x20($sp)
-/* 8431A0 802405D0 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 8431A4 802405D4 0C0B1EAF */  jal       evt_get_variable
-/* 8431A8 802405D8 34A56268 */   ori      $a1, $a1, 0x6268
-/* 8431AC 802405DC 0040802D */  daddu     $s0, $v0, $zero
-/* 8431B0 802405E0 0220202D */  daddu     $a0, $s1, $zero
-/* 8431B4 802405E4 3C05F840 */  lui       $a1, 0xf840
-/* 8431B8 802405E8 0C0B1EAF */  jal       evt_get_variable
-/* 8431BC 802405EC 34A56269 */   ori      $a1, $a1, 0x6269
-/* 8431C0 802405F0 0040B82D */  daddu     $s7, $v0, $zero
-/* 8431C4 802405F4 0220202D */  daddu     $a0, $s1, $zero
-/* 8431C8 802405F8 3C05F5DE */  lui       $a1, 0xf5de
-/* 8431CC 802405FC 0C0B1EAF */  jal       evt_get_variable
-/* 8431D0 80240600 34A502DE */   ori      $a1, $a1, 0x2de
-/* 8431D4 80240604 0040B02D */  daddu     $s6, $v0, $zero
-/* 8431D8 80240608 0220202D */  daddu     $a0, $s1, $zero
-/* 8431DC 8024060C 3C05F5DE */  lui       $a1, 0xf5de
-/* 8431E0 80240610 0C0B1EAF */  jal       evt_get_variable
-/* 8431E4 80240614 34A502DF */   ori      $a1, $a1, 0x2df
-/* 8431E8 80240618 0040A82D */  daddu     $s5, $v0, $zero
-/* 8431EC 8024061C 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 8431F0 80240620 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 8431F4 80240624 A7B30010 */  sh        $s3, 0x10($sp)
-/* 8431F8 80240628 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 8431FC 8024062C 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 843200 80240630 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 843204 80240634 12820003 */  beq       $s4, $v0, .L80240644
-/* 843208 80240638 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 84320C 8024063C 0000B82D */  daddu     $s7, $zero, $zero
-/* 843210 80240640 02E0802D */  daddu     $s0, $s7, $zero
-.L80240644:
-/* 843214 80240644 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 843218 80240648 14400016 */  bnez      $v0, .L802406A4
-/* 84321C 8024064C 0220202D */   daddu    $a0, $s1, $zero
-/* 843220 80240650 0C00A67F */  jal       rand_int
-/* 843224 80240654 24040064 */   addiu    $a0, $zero, 0x64
-/* 843228 80240658 2842001E */  slti      $v0, $v0, 0x1e
-/* 84322C 8024065C 10400011 */  beqz      $v0, .L802406A4
-/* 843230 80240660 0220202D */   daddu    $a0, $s1, $zero
-/* 843234 80240664 0C00A67F */  jal       rand_int
-/* 843238 80240668 2644FFFF */   addiu    $a0, $s2, -1
-/* 84323C 8024066C 0040A82D */  daddu     $s5, $v0, $zero
-/* 843240 80240670 0260B02D */  daddu     $s6, $s3, $zero
-/* 843244 80240674 0220202D */  daddu     $a0, $s1, $zero
-/* 843248 80240678 3C05F5DE */  lui       $a1, 0xf5de
-/* 84324C 8024067C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 843250 80240680 0C0B2026 */  jal       evt_set_variable
-/* 843254 80240684 0280302D */   daddu    $a2, $s4, $zero
-/* 843258 80240688 0220202D */  daddu     $a0, $s1, $zero
-/* 84325C 8024068C 3C05F5DE */  lui       $a1, 0xf5de
-/* 843260 80240690 34A502DF */  ori       $a1, $a1, 0x2df
-/* 843264 80240694 0C0B2026 */  jal       evt_set_variable
-/* 843268 80240698 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 84326C 8024069C 24100001 */  addiu     $s0, $zero, 1
-/* 843270 802406A0 0220202D */  daddu     $a0, $s1, $zero
-.L802406A4:
-/* 843274 802406A4 3C05F840 */  lui       $a1, 0xf840
-/* 843278 802406A8 34A56268 */  ori       $a1, $a1, 0x6268
-/* 84327C 802406AC 0C0B2026 */  jal       evt_set_variable
-/* 843280 802406B0 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 843284 802406B4 0220202D */  daddu     $a0, $s1, $zero
-/* 843288 802406B8 3C05F840 */  lui       $a1, 0xf840
-/* 84328C 802406BC 34A56269 */  ori       $a1, $a1, 0x6269
-/* 843290 802406C0 0C0B2026 */  jal       evt_set_variable
-/* 843294 802406C4 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 843298 802406C8 0000202D */  daddu     $a0, $zero, $zero
-/* 84329C 802406CC 3C05F5DE */  lui       $a1, 0xf5de
-/* 8432A0 802406D0 0C0B1EAF */  jal       evt_get_variable
-/* 8432A4 802406D4 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 8432A8 802406D8 0000202D */  daddu     $a0, $zero, $zero
-/* 8432AC 802406DC 3C05F5DE */  lui       $a1, 0xf5de
-/* 8432B0 802406E0 34A50180 */  ori       $a1, $a1, 0x180
-/* 8432B4 802406E4 0C0B1EAF */  jal       evt_get_variable
-/* 8432B8 802406E8 0040802D */   daddu    $s0, $v0, $zero
-/* 8432BC 802406EC 0040282D */  daddu     $a1, $v0, $zero
-/* 8432C0 802406F0 0000182D */  daddu     $v1, $zero, $zero
-/* 8432C4 802406F4 3C068024 */  lui       $a2, %hi(D_8024408C_846C5C)
-/* 8432C8 802406F8 24C6408C */  addiu     $a2, $a2, %lo(D_8024408C_846C5C)
-/* 8432CC 802406FC 00C0202D */  daddu     $a0, $a2, $zero
-.L80240700:
-/* 8432D0 80240700 8C820000 */  lw        $v0, ($a0)
-/* 8432D4 80240704 00A2102A */  slt       $v0, $a1, $v0
-/* 8432D8 80240708 14400006 */  bnez      $v0, .L80240724
-/* 8432DC 8024070C 000310C0 */   sll      $v0, $v1, 3
-/* 8432E0 80240710 24630001 */  addiu     $v1, $v1, 1
-/* 8432E4 80240714 28620008 */  slti      $v0, $v1, 8
-/* 8432E8 80240718 1440FFF9 */  bnez      $v0, .L80240700
-/* 8432EC 8024071C 24840008 */   addiu    $a0, $a0, 8
-/* 8432F0 80240720 000310C0 */  sll       $v0, $v1, 3
-.L80240724:
-/* 8432F4 80240724 00461021 */  addu      $v0, $v0, $a2
-/* 8432F8 80240728 8C420004 */  lw        $v0, 4($v0)
-/* 8432FC 8024072C 97A30010 */  lhu       $v1, 0x10($sp)
-/* 843300 80240730 0202202A */  slt       $a0, $s0, $v0
-/* 843304 80240734 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 843308 80240738 14620008 */  bne       $v1, $v0, .L8024075C
-/* 84330C 8024073C 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 843310 80240740 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 843314 80240744 14E20005 */  bne       $a3, $v0, .L8024075C
-/* 843318 80240748 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 84331C 8024074C 14400003 */  bnez      $v0, .L8024075C
-/* 843320 80240750 00000000 */   nop
-/* 843324 80240754 14800008 */  bnez      $a0, .L80240778
-/* 843328 80240758 24020001 */   addiu    $v0, $zero, 1
-.L8024075C:
-/* 84332C 8024075C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 843330 80240760 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 843334 80240764 80420075 */  lb        $v0, 0x75($v0)
-/* 843338 80240768 10400005 */  beqz      $v0, .L80240780
-/* 84333C 8024076C 00000000 */   nop
-/* 843340 80240770 10800003 */  beqz      $a0, .L80240780
-/* 843344 80240774 24020001 */   addiu    $v0, $zero, 1
-.L80240778:
-/* 843348 80240778 080901E3 */  j         .L8024078C
-/* 84334C 8024077C AE220084 */   sw       $v0, 0x84($s1)
-.L80240780:
-/* 843350 80240780 0C00F9EB */  jal       kill_enemy
-/* 843354 80240784 03C0202D */   daddu    $a0, $fp, $zero
-/* 843358 80240788 AE200084 */  sw        $zero, 0x84($s1)
-.L8024078C:
-/* 84335C 8024078C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 843360 80240790 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 843364 80240794 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 843368 80240798 8FB60038 */  lw        $s6, 0x38($sp)
-/* 84336C 8024079C 8FB50034 */  lw        $s5, 0x34($sp)
-/* 843370 802407A0 8FB40030 */  lw        $s4, 0x30($sp)
-/* 843374 802407A4 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 843378 802407A8 8FB20028 */  lw        $s2, 0x28($sp)
-/* 84337C 802407AC 8FB10024 */  lw        $s1, 0x24($sp)
-/* 843380 802407B0 8FB00020 */  lw        $s0, 0x20($sp)
-/* 843384 802407B4 24020002 */  addiu     $v0, $zero, 2
-/* 843388 802407B8 03E00008 */  jr        $ra
-/* 84338C 802407BC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s
deleted file mode 100644
index aa2b41ded0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024145C_8535CC
-/* 8535CC 8024145C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8535D0 80241460 AFB10024 */  sw        $s1, 0x24($sp)
-/* 8535D4 80241464 0080882D */  daddu     $s1, $a0, $zero
-/* 8535D8 80241468 3C05F840 */  lui       $a1, 0xf840
-/* 8535DC 8024146C AFBF0044 */  sw        $ra, 0x44($sp)
-/* 8535E0 80241470 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 8535E4 80241474 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 8535E8 80241478 AFB60038 */  sw        $s6, 0x38($sp)
-/* 8535EC 8024147C AFB50034 */  sw        $s5, 0x34($sp)
-/* 8535F0 80241480 AFB40030 */  sw        $s4, 0x30($sp)
-/* 8535F4 80241484 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 8535F8 80241488 AFB20028 */  sw        $s2, 0x28($sp)
-/* 8535FC 8024148C AFB00020 */  sw        $s0, 0x20($sp)
-/* 853600 80241490 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 853604 80241494 0C0B1EAF */  jal       evt_get_variable
-/* 853608 80241498 34A56268 */   ori      $a1, $a1, 0x6268
-/* 85360C 8024149C 0040802D */  daddu     $s0, $v0, $zero
-/* 853610 802414A0 0220202D */  daddu     $a0, $s1, $zero
-/* 853614 802414A4 3C05F840 */  lui       $a1, 0xf840
-/* 853618 802414A8 0C0B1EAF */  jal       evt_get_variable
-/* 85361C 802414AC 34A56269 */   ori      $a1, $a1, 0x6269
-/* 853620 802414B0 0040B82D */  daddu     $s7, $v0, $zero
-/* 853624 802414B4 0220202D */  daddu     $a0, $s1, $zero
-/* 853628 802414B8 3C05F5DE */  lui       $a1, 0xf5de
-/* 85362C 802414BC 0C0B1EAF */  jal       evt_get_variable
-/* 853630 802414C0 34A502DE */   ori      $a1, $a1, 0x2de
-/* 853634 802414C4 0040B02D */  daddu     $s6, $v0, $zero
-/* 853638 802414C8 0220202D */  daddu     $a0, $s1, $zero
-/* 85363C 802414CC 3C05F5DE */  lui       $a1, 0xf5de
-/* 853640 802414D0 0C0B1EAF */  jal       evt_get_variable
-/* 853644 802414D4 34A502DF */   ori      $a1, $a1, 0x2df
-/* 853648 802414D8 0040A82D */  daddu     $s5, $v0, $zero
-/* 85364C 802414DC 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 853650 802414E0 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 853654 802414E4 A7B30010 */  sh        $s3, 0x10($sp)
-/* 853658 802414E8 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 85365C 802414EC 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 853660 802414F0 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 853664 802414F4 12820003 */  beq       $s4, $v0, .L80241504
-/* 853668 802414F8 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 85366C 802414FC 0000B82D */  daddu     $s7, $zero, $zero
-/* 853670 80241500 02E0802D */  daddu     $s0, $s7, $zero
-.L80241504:
-/* 853674 80241504 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 853678 80241508 14400016 */  bnez      $v0, .L80241564
-/* 85367C 8024150C 0220202D */   daddu    $a0, $s1, $zero
-/* 853680 80241510 0C00A67F */  jal       rand_int
-/* 853684 80241514 24040064 */   addiu    $a0, $zero, 0x64
-/* 853688 80241518 2842001E */  slti      $v0, $v0, 0x1e
-/* 85368C 8024151C 10400011 */  beqz      $v0, .L80241564
-/* 853690 80241520 0220202D */   daddu    $a0, $s1, $zero
-/* 853694 80241524 0C00A67F */  jal       rand_int
-/* 853698 80241528 2644FFFF */   addiu    $a0, $s2, -1
-/* 85369C 8024152C 0040A82D */  daddu     $s5, $v0, $zero
-/* 8536A0 80241530 0260B02D */  daddu     $s6, $s3, $zero
-/* 8536A4 80241534 0220202D */  daddu     $a0, $s1, $zero
-/* 8536A8 80241538 3C05F5DE */  lui       $a1, 0xf5de
-/* 8536AC 8024153C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 8536B0 80241540 0C0B2026 */  jal       evt_set_variable
-/* 8536B4 80241544 0280302D */   daddu    $a2, $s4, $zero
-/* 8536B8 80241548 0220202D */  daddu     $a0, $s1, $zero
-/* 8536BC 8024154C 3C05F5DE */  lui       $a1, 0xf5de
-/* 8536C0 80241550 34A502DF */  ori       $a1, $a1, 0x2df
-/* 8536C4 80241554 0C0B2026 */  jal       evt_set_variable
-/* 8536C8 80241558 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 8536CC 8024155C 24100001 */  addiu     $s0, $zero, 1
-/* 8536D0 80241560 0220202D */  daddu     $a0, $s1, $zero
-.L80241564:
-/* 8536D4 80241564 3C05F840 */  lui       $a1, 0xf840
-/* 8536D8 80241568 34A56268 */  ori       $a1, $a1, 0x6268
-/* 8536DC 8024156C 0C0B2026 */  jal       evt_set_variable
-/* 8536E0 80241570 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 8536E4 80241574 0220202D */  daddu     $a0, $s1, $zero
-/* 8536E8 80241578 3C05F840 */  lui       $a1, 0xf840
-/* 8536EC 8024157C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 8536F0 80241580 0C0B2026 */  jal       evt_set_variable
-/* 8536F4 80241584 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 8536F8 80241588 0000202D */  daddu     $a0, $zero, $zero
-/* 8536FC 8024158C 3C05F5DE */  lui       $a1, 0xf5de
-/* 853700 80241590 0C0B1EAF */  jal       evt_get_variable
-/* 853704 80241594 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 853708 80241598 0000202D */  daddu     $a0, $zero, $zero
-/* 85370C 8024159C 3C05F5DE */  lui       $a1, 0xf5de
-/* 853710 802415A0 34A50180 */  ori       $a1, $a1, 0x180
-/* 853714 802415A4 0C0B1EAF */  jal       evt_get_variable
-/* 853718 802415A8 0040802D */   daddu    $s0, $v0, $zero
-/* 85371C 802415AC 0040282D */  daddu     $a1, $v0, $zero
-/* 853720 802415B0 0000182D */  daddu     $v1, $zero, $zero
-/* 853724 802415B4 3C068024 */  lui       $a2, %hi(D_80245154_8572C4)
-/* 853728 802415B8 24C65154 */  addiu     $a2, $a2, %lo(D_80245154_8572C4)
-/* 85372C 802415BC 00C0202D */  daddu     $a0, $a2, $zero
-.L802415C0:
-/* 853730 802415C0 8C820000 */  lw        $v0, ($a0)
-/* 853734 802415C4 00A2102A */  slt       $v0, $a1, $v0
-/* 853738 802415C8 14400006 */  bnez      $v0, .L802415E4
-/* 85373C 802415CC 000310C0 */   sll      $v0, $v1, 3
-/* 853740 802415D0 24630001 */  addiu     $v1, $v1, 1
-/* 853744 802415D4 28620008 */  slti      $v0, $v1, 8
-/* 853748 802415D8 1440FFF9 */  bnez      $v0, .L802415C0
-/* 85374C 802415DC 24840008 */   addiu    $a0, $a0, 8
-/* 853750 802415E0 000310C0 */  sll       $v0, $v1, 3
-.L802415E4:
-/* 853754 802415E4 00461021 */  addu      $v0, $v0, $a2
-/* 853758 802415E8 8C420004 */  lw        $v0, 4($v0)
-/* 85375C 802415EC 97A30010 */  lhu       $v1, 0x10($sp)
-/* 853760 802415F0 0202202A */  slt       $a0, $s0, $v0
-/* 853764 802415F4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 853768 802415F8 14620008 */  bne       $v1, $v0, .L8024161C
-/* 85376C 802415FC 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 853770 80241600 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 853774 80241604 14E20005 */  bne       $a3, $v0, .L8024161C
-/* 853778 80241608 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 85377C 8024160C 14400003 */  bnez      $v0, .L8024161C
-/* 853780 80241610 00000000 */   nop
-/* 853784 80241614 14800008 */  bnez      $a0, .L80241638
-/* 853788 80241618 24020001 */   addiu    $v0, $zero, 1
-.L8024161C:
-/* 85378C 8024161C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 853790 80241620 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 853794 80241624 80420075 */  lb        $v0, 0x75($v0)
-/* 853798 80241628 10400005 */  beqz      $v0, .L80241640
-/* 85379C 8024162C 00000000 */   nop
-/* 8537A0 80241630 10800003 */  beqz      $a0, .L80241640
-/* 8537A4 80241634 24020001 */   addiu    $v0, $zero, 1
-.L80241638:
-/* 8537A8 80241638 08090593 */  j         .L8024164C
-/* 8537AC 8024163C AE220084 */   sw       $v0, 0x84($s1)
-.L80241640:
-/* 8537B0 80241640 0C00F9EB */  jal       kill_enemy
-/* 8537B4 80241644 03C0202D */   daddu    $a0, $fp, $zero
-/* 8537B8 80241648 AE200084 */  sw        $zero, 0x84($s1)
-.L8024164C:
-/* 8537BC 8024164C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 8537C0 80241650 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 8537C4 80241654 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 8537C8 80241658 8FB60038 */  lw        $s6, 0x38($sp)
-/* 8537CC 8024165C 8FB50034 */  lw        $s5, 0x34($sp)
-/* 8537D0 80241660 8FB40030 */  lw        $s4, 0x30($sp)
-/* 8537D4 80241664 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 8537D8 80241668 8FB20028 */  lw        $s2, 0x28($sp)
-/* 8537DC 8024166C 8FB10024 */  lw        $s1, 0x24($sp)
-/* 8537E0 80241670 8FB00020 */  lw        $s0, 0x20($sp)
-/* 8537E4 80241674 24020002 */  addiu     $v0, $zero, 2
-/* 8537E8 80241678 03E00008 */  jr        $ra
-/* 8537EC 8024167C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s
deleted file mode 100644
index db7f536069..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EA4_9C6284
-/* 9C6284 80240EA4 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 9C6288 80240EA8 AFB10024 */  sw        $s1, 0x24($sp)
-/* 9C628C 80240EAC 0080882D */  daddu     $s1, $a0, $zero
-/* 9C6290 80240EB0 3C05F840 */  lui       $a1, 0xf840
-/* 9C6294 80240EB4 AFBF0044 */  sw        $ra, 0x44($sp)
-/* 9C6298 80240EB8 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 9C629C 80240EBC AFB7003C */  sw        $s7, 0x3c($sp)
-/* 9C62A0 80240EC0 AFB60038 */  sw        $s6, 0x38($sp)
-/* 9C62A4 80240EC4 AFB50034 */  sw        $s5, 0x34($sp)
-/* 9C62A8 80240EC8 AFB40030 */  sw        $s4, 0x30($sp)
-/* 9C62AC 80240ECC AFB3002C */  sw        $s3, 0x2c($sp)
-/* 9C62B0 80240ED0 AFB20028 */  sw        $s2, 0x28($sp)
-/* 9C62B4 80240ED4 AFB00020 */  sw        $s0, 0x20($sp)
-/* 9C62B8 80240ED8 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 9C62BC 80240EDC 0C0B1EAF */  jal       evt_get_variable
-/* 9C62C0 80240EE0 34A56268 */   ori      $a1, $a1, 0x6268
-/* 9C62C4 80240EE4 0040802D */  daddu     $s0, $v0, $zero
-/* 9C62C8 80240EE8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C62CC 80240EEC 3C05F840 */  lui       $a1, 0xf840
-/* 9C62D0 80240EF0 0C0B1EAF */  jal       evt_get_variable
-/* 9C62D4 80240EF4 34A56269 */   ori      $a1, $a1, 0x6269
-/* 9C62D8 80240EF8 0040B82D */  daddu     $s7, $v0, $zero
-/* 9C62DC 80240EFC 0220202D */  daddu     $a0, $s1, $zero
-/* 9C62E0 80240F00 3C05F5DE */  lui       $a1, 0xf5de
-/* 9C62E4 80240F04 0C0B1EAF */  jal       evt_get_variable
-/* 9C62E8 80240F08 34A502DE */   ori      $a1, $a1, 0x2de
-/* 9C62EC 80240F0C 0040B02D */  daddu     $s6, $v0, $zero
-/* 9C62F0 80240F10 0220202D */  daddu     $a0, $s1, $zero
-/* 9C62F4 80240F14 3C05F5DE */  lui       $a1, 0xf5de
-/* 9C62F8 80240F18 0C0B1EAF */  jal       evt_get_variable
-/* 9C62FC 80240F1C 34A502DF */   ori      $a1, $a1, 0x2df
-/* 9C6300 80240F20 0040A82D */  daddu     $s5, $v0, $zero
-/* 9C6304 80240F24 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 9C6308 80240F28 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 9C630C 80240F2C A7B30010 */  sh        $s3, 0x10($sp)
-/* 9C6310 80240F30 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 9C6314 80240F34 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 9C6318 80240F38 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 9C631C 80240F3C 12820003 */  beq       $s4, $v0, .L80240F4C
-/* 9C6320 80240F40 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 9C6324 80240F44 0000B82D */  daddu     $s7, $zero, $zero
-/* 9C6328 80240F48 02E0802D */  daddu     $s0, $s7, $zero
-.L80240F4C:
-/* 9C632C 80240F4C 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 9C6330 80240F50 14400016 */  bnez      $v0, .L80240FAC
-/* 9C6334 80240F54 0220202D */   daddu    $a0, $s1, $zero
-/* 9C6338 80240F58 0C00A67F */  jal       rand_int
-/* 9C633C 80240F5C 24040064 */   addiu    $a0, $zero, 0x64
-/* 9C6340 80240F60 2842001E */  slti      $v0, $v0, 0x1e
-/* 9C6344 80240F64 10400011 */  beqz      $v0, .L80240FAC
-/* 9C6348 80240F68 0220202D */   daddu    $a0, $s1, $zero
-/* 9C634C 80240F6C 0C00A67F */  jal       rand_int
-/* 9C6350 80240F70 2644FFFF */   addiu    $a0, $s2, -1
-/* 9C6354 80240F74 0040A82D */  daddu     $s5, $v0, $zero
-/* 9C6358 80240F78 0260B02D */  daddu     $s6, $s3, $zero
-/* 9C635C 80240F7C 0220202D */  daddu     $a0, $s1, $zero
-/* 9C6360 80240F80 3C05F5DE */  lui       $a1, 0xf5de
-/* 9C6364 80240F84 34A502DE */  ori       $a1, $a1, 0x2de
-/* 9C6368 80240F88 0C0B2026 */  jal       evt_set_variable
-/* 9C636C 80240F8C 0280302D */   daddu    $a2, $s4, $zero
-/* 9C6370 80240F90 0220202D */  daddu     $a0, $s1, $zero
-/* 9C6374 80240F94 3C05F5DE */  lui       $a1, 0xf5de
-/* 9C6378 80240F98 34A502DF */  ori       $a1, $a1, 0x2df
-/* 9C637C 80240F9C 0C0B2026 */  jal       evt_set_variable
-/* 9C6380 80240FA0 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 9C6384 80240FA4 24100001 */  addiu     $s0, $zero, 1
-/* 9C6388 80240FA8 0220202D */  daddu     $a0, $s1, $zero
-.L80240FAC:
-/* 9C638C 80240FAC 3C05F840 */  lui       $a1, 0xf840
-/* 9C6390 80240FB0 34A56268 */  ori       $a1, $a1, 0x6268
-/* 9C6394 80240FB4 0C0B2026 */  jal       evt_set_variable
-/* 9C6398 80240FB8 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 9C639C 80240FBC 0220202D */  daddu     $a0, $s1, $zero
-/* 9C63A0 80240FC0 3C05F840 */  lui       $a1, 0xf840
-/* 9C63A4 80240FC4 34A56269 */  ori       $a1, $a1, 0x6269
-/* 9C63A8 80240FC8 0C0B2026 */  jal       evt_set_variable
-/* 9C63AC 80240FCC 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 9C63B0 80240FD0 0000202D */  daddu     $a0, $zero, $zero
-/* 9C63B4 80240FD4 3C05F5DE */  lui       $a1, 0xf5de
-/* 9C63B8 80240FD8 0C0B1EAF */  jal       evt_get_variable
-/* 9C63BC 80240FDC 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 9C63C0 80240FE0 0000202D */  daddu     $a0, $zero, $zero
-/* 9C63C4 80240FE4 3C05F5DE */  lui       $a1, 0xf5de
-/* 9C63C8 80240FE8 34A50180 */  ori       $a1, $a1, 0x180
-/* 9C63CC 80240FEC 0C0B1EAF */  jal       evt_get_variable
-/* 9C63D0 80240FF0 0040802D */   daddu    $s0, $v0, $zero
-/* 9C63D4 80240FF4 0040282D */  daddu     $a1, $v0, $zero
-/* 9C63D8 80240FF8 0000182D */  daddu     $v1, $zero, $zero
-/* 9C63DC 80240FFC 3C068024 */  lui       $a2, %hi(D_80245FE8_9CB3C8)
-/* 9C63E0 80241000 24C65FE8 */  addiu     $a2, $a2, %lo(D_80245FE8_9CB3C8)
-/* 9C63E4 80241004 00C0202D */  daddu     $a0, $a2, $zero
-.L80241008:
-/* 9C63E8 80241008 8C820000 */  lw        $v0, ($a0)
-/* 9C63EC 8024100C 00A2102A */  slt       $v0, $a1, $v0
-/* 9C63F0 80241010 14400006 */  bnez      $v0, .L8024102C
-/* 9C63F4 80241014 000310C0 */   sll      $v0, $v1, 3
-/* 9C63F8 80241018 24630001 */  addiu     $v1, $v1, 1
-/* 9C63FC 8024101C 28620008 */  slti      $v0, $v1, 8
-/* 9C6400 80241020 1440FFF9 */  bnez      $v0, .L80241008
-/* 9C6404 80241024 24840008 */   addiu    $a0, $a0, 8
-/* 9C6408 80241028 000310C0 */  sll       $v0, $v1, 3
-.L8024102C:
-/* 9C640C 8024102C 00461021 */  addu      $v0, $v0, $a2
-/* 9C6410 80241030 8C420004 */  lw        $v0, 4($v0)
-/* 9C6414 80241034 97A30010 */  lhu       $v1, 0x10($sp)
-/* 9C6418 80241038 0202202A */  slt       $a0, $s0, $v0
-/* 9C641C 8024103C 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 9C6420 80241040 14620008 */  bne       $v1, $v0, .L80241064
-/* 9C6424 80241044 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 9C6428 80241048 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 9C642C 8024104C 14E20005 */  bne       $a3, $v0, .L80241064
-/* 9C6430 80241050 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 9C6434 80241054 14400003 */  bnez      $v0, .L80241064
-/* 9C6438 80241058 00000000 */   nop
-/* 9C643C 8024105C 14800008 */  bnez      $a0, .L80241080
-/* 9C6440 80241060 24020001 */   addiu    $v0, $zero, 1
-.L80241064:
-/* 9C6444 80241064 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 9C6448 80241068 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 9C644C 8024106C 80420075 */  lb        $v0, 0x75($v0)
-/* 9C6450 80241070 10400005 */  beqz      $v0, .L80241088
-/* 9C6454 80241074 00000000 */   nop
-/* 9C6458 80241078 10800003 */  beqz      $a0, .L80241088
-/* 9C645C 8024107C 24020001 */   addiu    $v0, $zero, 1
-.L80241080:
-/* 9C6460 80241080 08090425 */  j         .L80241094
-/* 9C6464 80241084 AE220084 */   sw       $v0, 0x84($s1)
-.L80241088:
-/* 9C6468 80241088 0C00F9EB */  jal       kill_enemy
-/* 9C646C 8024108C 03C0202D */   daddu    $a0, $fp, $zero
-/* 9C6470 80241090 AE200084 */  sw        $zero, 0x84($s1)
-.L80241094:
-/* 9C6474 80241094 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 9C6478 80241098 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 9C647C 8024109C 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 9C6480 802410A0 8FB60038 */  lw        $s6, 0x38($sp)
-/* 9C6484 802410A4 8FB50034 */  lw        $s5, 0x34($sp)
-/* 9C6488 802410A8 8FB40030 */  lw        $s4, 0x30($sp)
-/* 9C648C 802410AC 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 9C6490 802410B0 8FB20028 */  lw        $s2, 0x28($sp)
-/* 9C6494 802410B4 8FB10024 */  lw        $s1, 0x24($sp)
-/* 9C6498 802410B8 8FB00020 */  lw        $s0, 0x20($sp)
-/* 9C649C 802410BC 24020002 */  addiu     $v0, $zero, 2
-/* 9C64A0 802410C0 03E00008 */  jr        $ra
-/* 9C64A4 802410C4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s
deleted file mode 100644
index 4262ae24be..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A4C_9D8A6C
-/* 9D8A6C 80241A4C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 9D8A70 80241A50 AFB10024 */  sw        $s1, 0x24($sp)
-/* 9D8A74 80241A54 0080882D */  daddu     $s1, $a0, $zero
-/* 9D8A78 80241A58 3C05F840 */  lui       $a1, 0xf840
-/* 9D8A7C 80241A5C AFBF0044 */  sw        $ra, 0x44($sp)
-/* 9D8A80 80241A60 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 9D8A84 80241A64 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 9D8A88 80241A68 AFB60038 */  sw        $s6, 0x38($sp)
-/* 9D8A8C 80241A6C AFB50034 */  sw        $s5, 0x34($sp)
-/* 9D8A90 80241A70 AFB40030 */  sw        $s4, 0x30($sp)
-/* 9D8A94 80241A74 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 9D8A98 80241A78 AFB20028 */  sw        $s2, 0x28($sp)
-/* 9D8A9C 80241A7C AFB00020 */  sw        $s0, 0x20($sp)
-/* 9D8AA0 80241A80 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 9D8AA4 80241A84 0C0B1EAF */  jal       evt_get_variable
-/* 9D8AA8 80241A88 34A56268 */   ori      $a1, $a1, 0x6268
-/* 9D8AAC 80241A8C 0040802D */  daddu     $s0, $v0, $zero
-/* 9D8AB0 80241A90 0220202D */  daddu     $a0, $s1, $zero
-/* 9D8AB4 80241A94 3C05F840 */  lui       $a1, 0xf840
-/* 9D8AB8 80241A98 0C0B1EAF */  jal       evt_get_variable
-/* 9D8ABC 80241A9C 34A56269 */   ori      $a1, $a1, 0x6269
-/* 9D8AC0 80241AA0 0040B82D */  daddu     $s7, $v0, $zero
-/* 9D8AC4 80241AA4 0220202D */  daddu     $a0, $s1, $zero
-/* 9D8AC8 80241AA8 3C05F5DE */  lui       $a1, 0xf5de
-/* 9D8ACC 80241AAC 0C0B1EAF */  jal       evt_get_variable
-/* 9D8AD0 80241AB0 34A502DE */   ori      $a1, $a1, 0x2de
-/* 9D8AD4 80241AB4 0040B02D */  daddu     $s6, $v0, $zero
-/* 9D8AD8 80241AB8 0220202D */  daddu     $a0, $s1, $zero
-/* 9D8ADC 80241ABC 3C05F5DE */  lui       $a1, 0xf5de
-/* 9D8AE0 80241AC0 0C0B1EAF */  jal       evt_get_variable
-/* 9D8AE4 80241AC4 34A502DF */   ori      $a1, $a1, 0x2df
-/* 9D8AE8 80241AC8 0040A82D */  daddu     $s5, $v0, $zero
-/* 9D8AEC 80241ACC 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 9D8AF0 80241AD0 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 9D8AF4 80241AD4 A7B30010 */  sh        $s3, 0x10($sp)
-/* 9D8AF8 80241AD8 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 9D8AFC 80241ADC 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 9D8B00 80241AE0 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 9D8B04 80241AE4 12820003 */  beq       $s4, $v0, .L80241AF4
-/* 9D8B08 80241AE8 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 9D8B0C 80241AEC 0000B82D */  daddu     $s7, $zero, $zero
-/* 9D8B10 80241AF0 02E0802D */  daddu     $s0, $s7, $zero
-.L80241AF4:
-/* 9D8B14 80241AF4 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 9D8B18 80241AF8 14400016 */  bnez      $v0, .L80241B54
-/* 9D8B1C 80241AFC 0220202D */   daddu    $a0, $s1, $zero
-/* 9D8B20 80241B00 0C00A67F */  jal       rand_int
-/* 9D8B24 80241B04 24040064 */   addiu    $a0, $zero, 0x64
-/* 9D8B28 80241B08 2842001E */  slti      $v0, $v0, 0x1e
-/* 9D8B2C 80241B0C 10400011 */  beqz      $v0, .L80241B54
-/* 9D8B30 80241B10 0220202D */   daddu    $a0, $s1, $zero
-/* 9D8B34 80241B14 0C00A67F */  jal       rand_int
-/* 9D8B38 80241B18 2644FFFF */   addiu    $a0, $s2, -1
-/* 9D8B3C 80241B1C 0040A82D */  daddu     $s5, $v0, $zero
-/* 9D8B40 80241B20 0260B02D */  daddu     $s6, $s3, $zero
-/* 9D8B44 80241B24 0220202D */  daddu     $a0, $s1, $zero
-/* 9D8B48 80241B28 3C05F5DE */  lui       $a1, 0xf5de
-/* 9D8B4C 80241B2C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 9D8B50 80241B30 0C0B2026 */  jal       evt_set_variable
-/* 9D8B54 80241B34 0280302D */   daddu    $a2, $s4, $zero
-/* 9D8B58 80241B38 0220202D */  daddu     $a0, $s1, $zero
-/* 9D8B5C 80241B3C 3C05F5DE */  lui       $a1, 0xf5de
-/* 9D8B60 80241B40 34A502DF */  ori       $a1, $a1, 0x2df
-/* 9D8B64 80241B44 0C0B2026 */  jal       evt_set_variable
-/* 9D8B68 80241B48 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 9D8B6C 80241B4C 24100001 */  addiu     $s0, $zero, 1
-/* 9D8B70 80241B50 0220202D */  daddu     $a0, $s1, $zero
-.L80241B54:
-/* 9D8B74 80241B54 3C05F840 */  lui       $a1, 0xf840
-/* 9D8B78 80241B58 34A56268 */  ori       $a1, $a1, 0x6268
-/* 9D8B7C 80241B5C 0C0B2026 */  jal       evt_set_variable
-/* 9D8B80 80241B60 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 9D8B84 80241B64 0220202D */  daddu     $a0, $s1, $zero
-/* 9D8B88 80241B68 3C05F840 */  lui       $a1, 0xf840
-/* 9D8B8C 80241B6C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 9D8B90 80241B70 0C0B2026 */  jal       evt_set_variable
-/* 9D8B94 80241B74 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 9D8B98 80241B78 0000202D */  daddu     $a0, $zero, $zero
-/* 9D8B9C 80241B7C 3C05F5DE */  lui       $a1, 0xf5de
-/* 9D8BA0 80241B80 0C0B1EAF */  jal       evt_get_variable
-/* 9D8BA4 80241B84 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 9D8BA8 80241B88 0000202D */  daddu     $a0, $zero, $zero
-/* 9D8BAC 80241B8C 3C05F5DE */  lui       $a1, 0xf5de
-/* 9D8BB0 80241B90 34A50180 */  ori       $a1, $a1, 0x180
-/* 9D8BB4 80241B94 0C0B1EAF */  jal       evt_get_variable
-/* 9D8BB8 80241B98 0040802D */   daddu    $s0, $v0, $zero
-/* 9D8BBC 80241B9C 0040282D */  daddu     $a1, $v0, $zero
-/* 9D8BC0 80241BA0 0000182D */  daddu     $v1, $zero, $zero
-/* 9D8BC4 80241BA4 3C068024 */  lui       $a2, %hi(D_8024716C_9DE18C)
-/* 9D8BC8 80241BA8 24C6716C */  addiu     $a2, $a2, %lo(D_8024716C_9DE18C)
-/* 9D8BCC 80241BAC 00C0202D */  daddu     $a0, $a2, $zero
-.L80241BB0:
-/* 9D8BD0 80241BB0 8C820000 */  lw        $v0, ($a0)
-/* 9D8BD4 80241BB4 00A2102A */  slt       $v0, $a1, $v0
-/* 9D8BD8 80241BB8 14400006 */  bnez      $v0, .L80241BD4
-/* 9D8BDC 80241BBC 000310C0 */   sll      $v0, $v1, 3
-/* 9D8BE0 80241BC0 24630001 */  addiu     $v1, $v1, 1
-/* 9D8BE4 80241BC4 28620008 */  slti      $v0, $v1, 8
-/* 9D8BE8 80241BC8 1440FFF9 */  bnez      $v0, .L80241BB0
-/* 9D8BEC 80241BCC 24840008 */   addiu    $a0, $a0, 8
-/* 9D8BF0 80241BD0 000310C0 */  sll       $v0, $v1, 3
-.L80241BD4:
-/* 9D8BF4 80241BD4 00461021 */  addu      $v0, $v0, $a2
-/* 9D8BF8 80241BD8 8C420004 */  lw        $v0, 4($v0)
-/* 9D8BFC 80241BDC 97A30010 */  lhu       $v1, 0x10($sp)
-/* 9D8C00 80241BE0 0202202A */  slt       $a0, $s0, $v0
-/* 9D8C04 80241BE4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 9D8C08 80241BE8 14620008 */  bne       $v1, $v0, .L80241C0C
-/* 9D8C0C 80241BEC 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 9D8C10 80241BF0 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 9D8C14 80241BF4 14E20005 */  bne       $a3, $v0, .L80241C0C
-/* 9D8C18 80241BF8 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 9D8C1C 80241BFC 14400003 */  bnez      $v0, .L80241C0C
-/* 9D8C20 80241C00 00000000 */   nop
-/* 9D8C24 80241C04 14800008 */  bnez      $a0, .L80241C28
-/* 9D8C28 80241C08 24020001 */   addiu    $v0, $zero, 1
-.L80241C0C:
-/* 9D8C2C 80241C0C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 9D8C30 80241C10 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 9D8C34 80241C14 80420075 */  lb        $v0, 0x75($v0)
-/* 9D8C38 80241C18 10400005 */  beqz      $v0, .L80241C30
-/* 9D8C3C 80241C1C 00000000 */   nop
-/* 9D8C40 80241C20 10800003 */  beqz      $a0, .L80241C30
-/* 9D8C44 80241C24 24020001 */   addiu    $v0, $zero, 1
-.L80241C28:
-/* 9D8C48 80241C28 0809070F */  j         .L80241C3C
-/* 9D8C4C 80241C2C AE220084 */   sw       $v0, 0x84($s1)
-.L80241C30:
-/* 9D8C50 80241C30 0C00F9EB */  jal       kill_enemy
-/* 9D8C54 80241C34 03C0202D */   daddu    $a0, $fp, $zero
-/* 9D8C58 80241C38 AE200084 */  sw        $zero, 0x84($s1)
-.L80241C3C:
-/* 9D8C5C 80241C3C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 9D8C60 80241C40 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 9D8C64 80241C44 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 9D8C68 80241C48 8FB60038 */  lw        $s6, 0x38($sp)
-/* 9D8C6C 80241C4C 8FB50034 */  lw        $s5, 0x34($sp)
-/* 9D8C70 80241C50 8FB40030 */  lw        $s4, 0x30($sp)
-/* 9D8C74 80241C54 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 9D8C78 80241C58 8FB20028 */  lw        $s2, 0x28($sp)
-/* 9D8C7C 80241C5C 8FB10024 */  lw        $s1, 0x24($sp)
-/* 9D8C80 80241C60 8FB00020 */  lw        $s0, 0x20($sp)
-/* 9D8C84 80241C64 24020002 */  addiu     $v0, $zero, 2
-/* 9D8C88 80241C68 03E00008 */  jr        $ra
-/* 9D8C8C 80241C6C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s
deleted file mode 100644
index 6860318e46..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024083C_CF83AC
-/* CF83AC 8024083C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* CF83B0 80240840 AFB10024 */  sw        $s1, 0x24($sp)
-/* CF83B4 80240844 0080882D */  daddu     $s1, $a0, $zero
-/* CF83B8 80240848 3C05F840 */  lui       $a1, 0xf840
-/* CF83BC 8024084C AFBF0044 */  sw        $ra, 0x44($sp)
-/* CF83C0 80240850 AFBE0040 */  sw        $fp, 0x40($sp)
-/* CF83C4 80240854 AFB7003C */  sw        $s7, 0x3c($sp)
-/* CF83C8 80240858 AFB60038 */  sw        $s6, 0x38($sp)
-/* CF83CC 8024085C AFB50034 */  sw        $s5, 0x34($sp)
-/* CF83D0 80240860 AFB40030 */  sw        $s4, 0x30($sp)
-/* CF83D4 80240864 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CF83D8 80240868 AFB20028 */  sw        $s2, 0x28($sp)
-/* CF83DC 8024086C AFB00020 */  sw        $s0, 0x20($sp)
-/* CF83E0 80240870 8E3E0148 */  lw        $fp, 0x148($s1)
-/* CF83E4 80240874 0C0B1EAF */  jal       evt_get_variable
-/* CF83E8 80240878 34A56268 */   ori      $a1, $a1, 0x6268
-/* CF83EC 8024087C 0040802D */  daddu     $s0, $v0, $zero
-/* CF83F0 80240880 0220202D */  daddu     $a0, $s1, $zero
-/* CF83F4 80240884 3C05F840 */  lui       $a1, 0xf840
-/* CF83F8 80240888 0C0B1EAF */  jal       evt_get_variable
-/* CF83FC 8024088C 34A56269 */   ori      $a1, $a1, 0x6269
-/* CF8400 80240890 0040B82D */  daddu     $s7, $v0, $zero
-/* CF8404 80240894 0220202D */  daddu     $a0, $s1, $zero
-/* CF8408 80240898 3C05F5DE */  lui       $a1, 0xf5de
-/* CF840C 8024089C 0C0B1EAF */  jal       evt_get_variable
-/* CF8410 802408A0 34A502DE */   ori      $a1, $a1, 0x2de
-/* CF8414 802408A4 0040B02D */  daddu     $s6, $v0, $zero
-/* CF8418 802408A8 0220202D */  daddu     $a0, $s1, $zero
-/* CF841C 802408AC 3C05F5DE */  lui       $a1, 0xf5de
-/* CF8420 802408B0 0C0B1EAF */  jal       evt_get_variable
-/* CF8424 802408B4 34A502DF */   ori      $a1, $a1, 0x2df
-/* CF8428 802408B8 0040A82D */  daddu     $s5, $v0, $zero
-/* CF842C 802408BC 93D3006D */  lbu       $s3, 0x6d($fp)
-/* CF8430 802408C0 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* CF8434 802408C4 A7B30010 */  sh        $s3, 0x10($sp)
-/* CF8438 802408C8 93D2006E */  lbu       $s2, 0x6e($fp)
-/* CF843C 802408CC 93C7006F */  lbu       $a3, 0x6f($fp)
-/* CF8440 802408D0 3274FFFF */  andi      $s4, $s3, 0xffff
-/* CF8444 802408D4 12820003 */  beq       $s4, $v0, .L802408E4
-/* CF8448 802408D8 A7A7001E */   sh       $a3, 0x1e($sp)
-/* CF844C 802408DC 0000B82D */  daddu     $s7, $zero, $zero
-/* CF8450 802408E0 02E0802D */  daddu     $s0, $s7, $zero
-.L802408E4:
-/* CF8454 802408E4 3202FFFF */  andi      $v0, $s0, 0xffff
-/* CF8458 802408E8 14400016 */  bnez      $v0, .L80240944
-/* CF845C 802408EC 0220202D */   daddu    $a0, $s1, $zero
-/* CF8460 802408F0 0C00A67F */  jal       rand_int
-/* CF8464 802408F4 24040064 */   addiu    $a0, $zero, 0x64
-/* CF8468 802408F8 2842001E */  slti      $v0, $v0, 0x1e
-/* CF846C 802408FC 10400011 */  beqz      $v0, .L80240944
-/* CF8470 80240900 0220202D */   daddu    $a0, $s1, $zero
-/* CF8474 80240904 0C00A67F */  jal       rand_int
-/* CF8478 80240908 2644FFFF */   addiu    $a0, $s2, -1
-/* CF847C 8024090C 0040A82D */  daddu     $s5, $v0, $zero
-/* CF8480 80240910 0260B02D */  daddu     $s6, $s3, $zero
-/* CF8484 80240914 0220202D */  daddu     $a0, $s1, $zero
-/* CF8488 80240918 3C05F5DE */  lui       $a1, 0xf5de
-/* CF848C 8024091C 34A502DE */  ori       $a1, $a1, 0x2de
-/* CF8490 80240920 0C0B2026 */  jal       evt_set_variable
-/* CF8494 80240924 0280302D */   daddu    $a2, $s4, $zero
-/* CF8498 80240928 0220202D */  daddu     $a0, $s1, $zero
-/* CF849C 8024092C 3C05F5DE */  lui       $a1, 0xf5de
-/* CF84A0 80240930 34A502DF */  ori       $a1, $a1, 0x2df
-/* CF84A4 80240934 0C0B2026 */  jal       evt_set_variable
-/* CF84A8 80240938 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* CF84AC 8024093C 24100001 */  addiu     $s0, $zero, 1
-/* CF84B0 80240940 0220202D */  daddu     $a0, $s1, $zero
-.L80240944:
-/* CF84B4 80240944 3C05F840 */  lui       $a1, 0xf840
-/* CF84B8 80240948 34A56268 */  ori       $a1, $a1, 0x6268
-/* CF84BC 8024094C 0C0B2026 */  jal       evt_set_variable
-/* CF84C0 80240950 3206FFFF */   andi     $a2, $s0, 0xffff
-/* CF84C4 80240954 0220202D */  daddu     $a0, $s1, $zero
-/* CF84C8 80240958 3C05F840 */  lui       $a1, 0xf840
-/* CF84CC 8024095C 34A56269 */  ori       $a1, $a1, 0x6269
-/* CF84D0 80240960 0C0B2026 */  jal       evt_set_variable
-/* CF84D4 80240964 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* CF84D8 80240968 0000202D */  daddu     $a0, $zero, $zero
-/* CF84DC 8024096C 3C05F5DE */  lui       $a1, 0xf5de
-/* CF84E0 80240970 0C0B1EAF */  jal       evt_get_variable
-/* CF84E4 80240974 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* CF84E8 80240978 0000202D */  daddu     $a0, $zero, $zero
-/* CF84EC 8024097C 3C05F5DE */  lui       $a1, 0xf5de
-/* CF84F0 80240980 34A50180 */  ori       $a1, $a1, 0x180
-/* CF84F4 80240984 0C0B1EAF */  jal       evt_get_variable
-/* CF84F8 80240988 0040802D */   daddu    $s0, $v0, $zero
-/* CF84FC 8024098C 0040282D */  daddu     $a1, $v0, $zero
-/* CF8500 80240990 0000182D */  daddu     $v1, $zero, $zero
-/* CF8504 80240994 3C068024 */  lui       $a2, %hi(D_8024373C_CFB2AC)
-/* CF8508 80240998 24C6373C */  addiu     $a2, $a2, %lo(D_8024373C_CFB2AC)
-/* CF850C 8024099C 00C0202D */  daddu     $a0, $a2, $zero
-.L802409A0:
-/* CF8510 802409A0 8C820000 */  lw        $v0, ($a0)
-/* CF8514 802409A4 00A2102A */  slt       $v0, $a1, $v0
-/* CF8518 802409A8 14400006 */  bnez      $v0, .L802409C4
-/* CF851C 802409AC 000310C0 */   sll      $v0, $v1, 3
-/* CF8520 802409B0 24630001 */  addiu     $v1, $v1, 1
-/* CF8524 802409B4 28620008 */  slti      $v0, $v1, 8
-/* CF8528 802409B8 1440FFF9 */  bnez      $v0, .L802409A0
-/* CF852C 802409BC 24840008 */   addiu    $a0, $a0, 8
-/* CF8530 802409C0 000310C0 */  sll       $v0, $v1, 3
-.L802409C4:
-/* CF8534 802409C4 00461021 */  addu      $v0, $v0, $a2
-/* CF8538 802409C8 8C420004 */  lw        $v0, 4($v0)
-/* CF853C 802409CC 97A30010 */  lhu       $v1, 0x10($sp)
-/* CF8540 802409D0 0202202A */  slt       $a0, $s0, $v0
-/* CF8544 802409D4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* CF8548 802409D8 14620008 */  bne       $v1, $v0, .L802409FC
-/* CF854C 802409DC 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* CF8550 802409E0 97A7001E */  lhu       $a3, 0x1e($sp)
-/* CF8554 802409E4 14E20005 */  bne       $a3, $v0, .L802409FC
-/* CF8558 802409E8 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* CF855C 802409EC 14400003 */  bnez      $v0, .L802409FC
-/* CF8560 802409F0 00000000 */   nop
-/* CF8564 802409F4 14800008 */  bnez      $a0, .L80240A18
-/* CF8568 802409F8 24020001 */   addiu    $v0, $zero, 1
-.L802409FC:
-/* CF856C 802409FC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* CF8570 80240A00 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* CF8574 80240A04 80420075 */  lb        $v0, 0x75($v0)
-/* CF8578 80240A08 10400005 */  beqz      $v0, .L80240A20
-/* CF857C 80240A0C 00000000 */   nop
-/* CF8580 80240A10 10800003 */  beqz      $a0, .L80240A20
-/* CF8584 80240A14 24020001 */   addiu    $v0, $zero, 1
-.L80240A18:
-/* CF8588 80240A18 0809028B */  j         .L80240A2C
-/* CF858C 80240A1C AE220084 */   sw       $v0, 0x84($s1)
-.L80240A20:
-/* CF8590 80240A20 0C00F9EB */  jal       kill_enemy
-/* CF8594 80240A24 03C0202D */   daddu    $a0, $fp, $zero
-/* CF8598 80240A28 AE200084 */  sw        $zero, 0x84($s1)
-.L80240A2C:
-/* CF859C 80240A2C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* CF85A0 80240A30 8FBE0040 */  lw        $fp, 0x40($sp)
-/* CF85A4 80240A34 8FB7003C */  lw        $s7, 0x3c($sp)
-/* CF85A8 80240A38 8FB60038 */  lw        $s6, 0x38($sp)
-/* CF85AC 80240A3C 8FB50034 */  lw        $s5, 0x34($sp)
-/* CF85B0 80240A40 8FB40030 */  lw        $s4, 0x30($sp)
-/* CF85B4 80240A44 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CF85B8 80240A48 8FB20028 */  lw        $s2, 0x28($sp)
-/* CF85BC 80240A4C 8FB10024 */  lw        $s1, 0x24($sp)
-/* CF85C0 80240A50 8FB00020 */  lw        $s0, 0x20($sp)
-/* CF85C4 80240A54 24020002 */  addiu     $v0, $zero, 2
-/* CF85C8 80240A58 03E00008 */  jr        $ra
-/* CF85CC 80240A5C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s
deleted file mode 100644
index 7a44b6d3f8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C68_D06398
-/* D06398 80240C68 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D0639C 80240C6C AFB10024 */  sw        $s1, 0x24($sp)
-/* D063A0 80240C70 0080882D */  daddu     $s1, $a0, $zero
-/* D063A4 80240C74 3C05F840 */  lui       $a1, 0xf840
-/* D063A8 80240C78 AFBF0044 */  sw        $ra, 0x44($sp)
-/* D063AC 80240C7C AFBE0040 */  sw        $fp, 0x40($sp)
-/* D063B0 80240C80 AFB7003C */  sw        $s7, 0x3c($sp)
-/* D063B4 80240C84 AFB60038 */  sw        $s6, 0x38($sp)
-/* D063B8 80240C88 AFB50034 */  sw        $s5, 0x34($sp)
-/* D063BC 80240C8C AFB40030 */  sw        $s4, 0x30($sp)
-/* D063C0 80240C90 AFB3002C */  sw        $s3, 0x2c($sp)
-/* D063C4 80240C94 AFB20028 */  sw        $s2, 0x28($sp)
-/* D063C8 80240C98 AFB00020 */  sw        $s0, 0x20($sp)
-/* D063CC 80240C9C 8E3E0148 */  lw        $fp, 0x148($s1)
-/* D063D0 80240CA0 0C0B1EAF */  jal       evt_get_variable
-/* D063D4 80240CA4 34A56268 */   ori      $a1, $a1, 0x6268
-/* D063D8 80240CA8 0040802D */  daddu     $s0, $v0, $zero
-/* D063DC 80240CAC 0220202D */  daddu     $a0, $s1, $zero
-/* D063E0 80240CB0 3C05F840 */  lui       $a1, 0xf840
-/* D063E4 80240CB4 0C0B1EAF */  jal       evt_get_variable
-/* D063E8 80240CB8 34A56269 */   ori      $a1, $a1, 0x6269
-/* D063EC 80240CBC 0040B82D */  daddu     $s7, $v0, $zero
-/* D063F0 80240CC0 0220202D */  daddu     $a0, $s1, $zero
-/* D063F4 80240CC4 3C05F5DE */  lui       $a1, 0xf5de
-/* D063F8 80240CC8 0C0B1EAF */  jal       evt_get_variable
-/* D063FC 80240CCC 34A502DE */   ori      $a1, $a1, 0x2de
-/* D06400 80240CD0 0040B02D */  daddu     $s6, $v0, $zero
-/* D06404 80240CD4 0220202D */  daddu     $a0, $s1, $zero
-/* D06408 80240CD8 3C05F5DE */  lui       $a1, 0xf5de
-/* D0640C 80240CDC 0C0B1EAF */  jal       evt_get_variable
-/* D06410 80240CE0 34A502DF */   ori      $a1, $a1, 0x2df
-/* D06414 80240CE4 0040A82D */  daddu     $s5, $v0, $zero
-/* D06418 80240CE8 93D3006D */  lbu       $s3, 0x6d($fp)
-/* D0641C 80240CEC 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* D06420 80240CF0 A7B30010 */  sh        $s3, 0x10($sp)
-/* D06424 80240CF4 93D2006E */  lbu       $s2, 0x6e($fp)
-/* D06428 80240CF8 93C7006F */  lbu       $a3, 0x6f($fp)
-/* D0642C 80240CFC 3274FFFF */  andi      $s4, $s3, 0xffff
-/* D06430 80240D00 12820003 */  beq       $s4, $v0, .L80240D10
-/* D06434 80240D04 A7A7001E */   sh       $a3, 0x1e($sp)
-/* D06438 80240D08 0000B82D */  daddu     $s7, $zero, $zero
-/* D0643C 80240D0C 02E0802D */  daddu     $s0, $s7, $zero
-.L80240D10:
-/* D06440 80240D10 3202FFFF */  andi      $v0, $s0, 0xffff
-/* D06444 80240D14 14400016 */  bnez      $v0, .L80240D70
-/* D06448 80240D18 0220202D */   daddu    $a0, $s1, $zero
-/* D0644C 80240D1C 0C00A67F */  jal       rand_int
-/* D06450 80240D20 24040064 */   addiu    $a0, $zero, 0x64
-/* D06454 80240D24 2842001E */  slti      $v0, $v0, 0x1e
-/* D06458 80240D28 10400011 */  beqz      $v0, .L80240D70
-/* D0645C 80240D2C 0220202D */   daddu    $a0, $s1, $zero
-/* D06460 80240D30 0C00A67F */  jal       rand_int
-/* D06464 80240D34 2644FFFF */   addiu    $a0, $s2, -1
-/* D06468 80240D38 0040A82D */  daddu     $s5, $v0, $zero
-/* D0646C 80240D3C 0260B02D */  daddu     $s6, $s3, $zero
-/* D06470 80240D40 0220202D */  daddu     $a0, $s1, $zero
-/* D06474 80240D44 3C05F5DE */  lui       $a1, 0xf5de
-/* D06478 80240D48 34A502DE */  ori       $a1, $a1, 0x2de
-/* D0647C 80240D4C 0C0B2026 */  jal       evt_set_variable
-/* D06480 80240D50 0280302D */   daddu    $a2, $s4, $zero
-/* D06484 80240D54 0220202D */  daddu     $a0, $s1, $zero
-/* D06488 80240D58 3C05F5DE */  lui       $a1, 0xf5de
-/* D0648C 80240D5C 34A502DF */  ori       $a1, $a1, 0x2df
-/* D06490 80240D60 0C0B2026 */  jal       evt_set_variable
-/* D06494 80240D64 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* D06498 80240D68 24100001 */  addiu     $s0, $zero, 1
-/* D0649C 80240D6C 0220202D */  daddu     $a0, $s1, $zero
-.L80240D70:
-/* D064A0 80240D70 3C05F840 */  lui       $a1, 0xf840
-/* D064A4 80240D74 34A56268 */  ori       $a1, $a1, 0x6268
-/* D064A8 80240D78 0C0B2026 */  jal       evt_set_variable
-/* D064AC 80240D7C 3206FFFF */   andi     $a2, $s0, 0xffff
-/* D064B0 80240D80 0220202D */  daddu     $a0, $s1, $zero
-/* D064B4 80240D84 3C05F840 */  lui       $a1, 0xf840
-/* D064B8 80240D88 34A56269 */  ori       $a1, $a1, 0x6269
-/* D064BC 80240D8C 0C0B2026 */  jal       evt_set_variable
-/* D064C0 80240D90 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* D064C4 80240D94 0000202D */  daddu     $a0, $zero, $zero
-/* D064C8 80240D98 3C05F5DE */  lui       $a1, 0xf5de
-/* D064CC 80240D9C 0C0B1EAF */  jal       evt_get_variable
-/* D064D0 80240DA0 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* D064D4 80240DA4 0000202D */  daddu     $a0, $zero, $zero
-/* D064D8 80240DA8 3C05F5DE */  lui       $a1, 0xf5de
-/* D064DC 80240DAC 34A50180 */  ori       $a1, $a1, 0x180
-/* D064E0 80240DB0 0C0B1EAF */  jal       evt_get_variable
-/* D064E4 80240DB4 0040802D */   daddu    $s0, $v0, $zero
-/* D064E8 80240DB8 0040282D */  daddu     $a1, $v0, $zero
-/* D064EC 80240DBC 0000182D */  daddu     $v1, $zero, $zero
-/* D064F0 80240DC0 3C068024 */  lui       $a2, %hi(D_80246C04_D0C334)
-/* D064F4 80240DC4 24C66C04 */  addiu     $a2, $a2, %lo(D_80246C04_D0C334)
-/* D064F8 80240DC8 00C0202D */  daddu     $a0, $a2, $zero
-.L80240DCC:
-/* D064FC 80240DCC 8C820000 */  lw        $v0, ($a0)
-/* D06500 80240DD0 00A2102A */  slt       $v0, $a1, $v0
-/* D06504 80240DD4 14400006 */  bnez      $v0, .L80240DF0
-/* D06508 80240DD8 000310C0 */   sll      $v0, $v1, 3
-/* D0650C 80240DDC 24630001 */  addiu     $v1, $v1, 1
-/* D06510 80240DE0 28620008 */  slti      $v0, $v1, 8
-/* D06514 80240DE4 1440FFF9 */  bnez      $v0, .L80240DCC
-/* D06518 80240DE8 24840008 */   addiu    $a0, $a0, 8
-/* D0651C 80240DEC 000310C0 */  sll       $v0, $v1, 3
-.L80240DF0:
-/* D06520 80240DF0 00461021 */  addu      $v0, $v0, $a2
-/* D06524 80240DF4 8C420004 */  lw        $v0, 4($v0)
-/* D06528 80240DF8 97A30010 */  lhu       $v1, 0x10($sp)
-/* D0652C 80240DFC 0202202A */  slt       $a0, $s0, $v0
-/* D06530 80240E00 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* D06534 80240E04 14620008 */  bne       $v1, $v0, .L80240E28
-/* D06538 80240E08 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* D0653C 80240E0C 97A7001E */  lhu       $a3, 0x1e($sp)
-/* D06540 80240E10 14E20005 */  bne       $a3, $v0, .L80240E28
-/* D06544 80240E14 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* D06548 80240E18 14400003 */  bnez      $v0, .L80240E28
-/* D0654C 80240E1C 00000000 */   nop
-/* D06550 80240E20 14800008 */  bnez      $a0, .L80240E44
-/* D06554 80240E24 24020001 */   addiu    $v0, $zero, 1
-.L80240E28:
-/* D06558 80240E28 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* D0655C 80240E2C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* D06560 80240E30 80420075 */  lb        $v0, 0x75($v0)
-/* D06564 80240E34 10400005 */  beqz      $v0, .L80240E4C
-/* D06568 80240E38 00000000 */   nop
-/* D0656C 80240E3C 10800003 */  beqz      $a0, .L80240E4C
-/* D06570 80240E40 24020001 */   addiu    $v0, $zero, 1
-.L80240E44:
-/* D06574 80240E44 08090396 */  j         .L80240E58
-/* D06578 80240E48 AE220084 */   sw       $v0, 0x84($s1)
-.L80240E4C:
-/* D0657C 80240E4C 0C00F9EB */  jal       kill_enemy
-/* D06580 80240E50 03C0202D */   daddu    $a0, $fp, $zero
-/* D06584 80240E54 AE200084 */  sw        $zero, 0x84($s1)
-.L80240E58:
-/* D06588 80240E58 8FBF0044 */  lw        $ra, 0x44($sp)
-/* D0658C 80240E5C 8FBE0040 */  lw        $fp, 0x40($sp)
-/* D06590 80240E60 8FB7003C */  lw        $s7, 0x3c($sp)
-/* D06594 80240E64 8FB60038 */  lw        $s6, 0x38($sp)
-/* D06598 80240E68 8FB50034 */  lw        $s5, 0x34($sp)
-/* D0659C 80240E6C 8FB40030 */  lw        $s4, 0x30($sp)
-/* D065A0 80240E70 8FB3002C */  lw        $s3, 0x2c($sp)
-/* D065A4 80240E74 8FB20028 */  lw        $s2, 0x28($sp)
-/* D065A8 80240E78 8FB10024 */  lw        $s1, 0x24($sp)
-/* D065AC 80240E7C 8FB00020 */  lw        $s0, 0x20($sp)
-/* D065B0 80240E80 24020002 */  addiu     $v0, $zero, 2
-/* D065B4 80240E84 03E00008 */  jr        $ra
-/* D065B8 80240E88 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s
deleted file mode 100644
index eea6cb6693..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024090C_D3AEDC
-/* D3AEDC 8024090C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D3AEE0 80240910 AFB10024 */  sw        $s1, 0x24($sp)
-/* D3AEE4 80240914 0080882D */  daddu     $s1, $a0, $zero
-/* D3AEE8 80240918 3C05F840 */  lui       $a1, 0xf840
-/* D3AEEC 8024091C AFBF0044 */  sw        $ra, 0x44($sp)
-/* D3AEF0 80240920 AFBE0040 */  sw        $fp, 0x40($sp)
-/* D3AEF4 80240924 AFB7003C */  sw        $s7, 0x3c($sp)
-/* D3AEF8 80240928 AFB60038 */  sw        $s6, 0x38($sp)
-/* D3AEFC 8024092C AFB50034 */  sw        $s5, 0x34($sp)
-/* D3AF00 80240930 AFB40030 */  sw        $s4, 0x30($sp)
-/* D3AF04 80240934 AFB3002C */  sw        $s3, 0x2c($sp)
-/* D3AF08 80240938 AFB20028 */  sw        $s2, 0x28($sp)
-/* D3AF0C 8024093C AFB00020 */  sw        $s0, 0x20($sp)
-/* D3AF10 80240940 8E3E0148 */  lw        $fp, 0x148($s1)
-/* D3AF14 80240944 0C0B1EAF */  jal       evt_get_variable
-/* D3AF18 80240948 34A56268 */   ori      $a1, $a1, 0x6268
-/* D3AF1C 8024094C 0040802D */  daddu     $s0, $v0, $zero
-/* D3AF20 80240950 0220202D */  daddu     $a0, $s1, $zero
-/* D3AF24 80240954 3C05F840 */  lui       $a1, 0xf840
-/* D3AF28 80240958 0C0B1EAF */  jal       evt_get_variable
-/* D3AF2C 8024095C 34A56269 */   ori      $a1, $a1, 0x6269
-/* D3AF30 80240960 0040B82D */  daddu     $s7, $v0, $zero
-/* D3AF34 80240964 0220202D */  daddu     $a0, $s1, $zero
-/* D3AF38 80240968 3C05F5DE */  lui       $a1, 0xf5de
-/* D3AF3C 8024096C 0C0B1EAF */  jal       evt_get_variable
-/* D3AF40 80240970 34A502DE */   ori      $a1, $a1, 0x2de
-/* D3AF44 80240974 0040B02D */  daddu     $s6, $v0, $zero
-/* D3AF48 80240978 0220202D */  daddu     $a0, $s1, $zero
-/* D3AF4C 8024097C 3C05F5DE */  lui       $a1, 0xf5de
-/* D3AF50 80240980 0C0B1EAF */  jal       evt_get_variable
-/* D3AF54 80240984 34A502DF */   ori      $a1, $a1, 0x2df
-/* D3AF58 80240988 0040A82D */  daddu     $s5, $v0, $zero
-/* D3AF5C 8024098C 93D3006D */  lbu       $s3, 0x6d($fp)
-/* D3AF60 80240990 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* D3AF64 80240994 A7B30010 */  sh        $s3, 0x10($sp)
-/* D3AF68 80240998 93D2006E */  lbu       $s2, 0x6e($fp)
-/* D3AF6C 8024099C 93C7006F */  lbu       $a3, 0x6f($fp)
-/* D3AF70 802409A0 3274FFFF */  andi      $s4, $s3, 0xffff
-/* D3AF74 802409A4 12820003 */  beq       $s4, $v0, .L802409B4
-/* D3AF78 802409A8 A7A7001E */   sh       $a3, 0x1e($sp)
-/* D3AF7C 802409AC 0000B82D */  daddu     $s7, $zero, $zero
-/* D3AF80 802409B0 02E0802D */  daddu     $s0, $s7, $zero
-.L802409B4:
-/* D3AF84 802409B4 3202FFFF */  andi      $v0, $s0, 0xffff
-/* D3AF88 802409B8 14400016 */  bnez      $v0, .L80240A14
-/* D3AF8C 802409BC 0220202D */   daddu    $a0, $s1, $zero
-/* D3AF90 802409C0 0C00A67F */  jal       rand_int
-/* D3AF94 802409C4 24040064 */   addiu    $a0, $zero, 0x64
-/* D3AF98 802409C8 2842001E */  slti      $v0, $v0, 0x1e
-/* D3AF9C 802409CC 10400011 */  beqz      $v0, .L80240A14
-/* D3AFA0 802409D0 0220202D */   daddu    $a0, $s1, $zero
-/* D3AFA4 802409D4 0C00A67F */  jal       rand_int
-/* D3AFA8 802409D8 2644FFFF */   addiu    $a0, $s2, -1
-/* D3AFAC 802409DC 0040A82D */  daddu     $s5, $v0, $zero
-/* D3AFB0 802409E0 0260B02D */  daddu     $s6, $s3, $zero
-/* D3AFB4 802409E4 0220202D */  daddu     $a0, $s1, $zero
-/* D3AFB8 802409E8 3C05F5DE */  lui       $a1, 0xf5de
-/* D3AFBC 802409EC 34A502DE */  ori       $a1, $a1, 0x2de
-/* D3AFC0 802409F0 0C0B2026 */  jal       evt_set_variable
-/* D3AFC4 802409F4 0280302D */   daddu    $a2, $s4, $zero
-/* D3AFC8 802409F8 0220202D */  daddu     $a0, $s1, $zero
-/* D3AFCC 802409FC 3C05F5DE */  lui       $a1, 0xf5de
-/* D3AFD0 80240A00 34A502DF */  ori       $a1, $a1, 0x2df
-/* D3AFD4 80240A04 0C0B2026 */  jal       evt_set_variable
-/* D3AFD8 80240A08 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* D3AFDC 80240A0C 24100001 */  addiu     $s0, $zero, 1
-/* D3AFE0 80240A10 0220202D */  daddu     $a0, $s1, $zero
-.L80240A14:
-/* D3AFE4 80240A14 3C05F840 */  lui       $a1, 0xf840
-/* D3AFE8 80240A18 34A56268 */  ori       $a1, $a1, 0x6268
-/* D3AFEC 80240A1C 0C0B2026 */  jal       evt_set_variable
-/* D3AFF0 80240A20 3206FFFF */   andi     $a2, $s0, 0xffff
-/* D3AFF4 80240A24 0220202D */  daddu     $a0, $s1, $zero
-/* D3AFF8 80240A28 3C05F840 */  lui       $a1, 0xf840
-/* D3AFFC 80240A2C 34A56269 */  ori       $a1, $a1, 0x6269
-/* D3B000 80240A30 0C0B2026 */  jal       evt_set_variable
-/* D3B004 80240A34 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* D3B008 80240A38 0000202D */  daddu     $a0, $zero, $zero
-/* D3B00C 80240A3C 3C05F5DE */  lui       $a1, 0xf5de
-/* D3B010 80240A40 0C0B1EAF */  jal       evt_get_variable
-/* D3B014 80240A44 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* D3B018 80240A48 0000202D */  daddu     $a0, $zero, $zero
-/* D3B01C 80240A4C 3C05F5DE */  lui       $a1, 0xf5de
-/* D3B020 80240A50 34A50180 */  ori       $a1, $a1, 0x180
-/* D3B024 80240A54 0C0B1EAF */  jal       evt_get_variable
-/* D3B028 80240A58 0040802D */   daddu    $s0, $v0, $zero
-/* D3B02C 80240A5C 0040282D */  daddu     $a1, $v0, $zero
-/* D3B030 80240A60 0000182D */  daddu     $v1, $zero, $zero
-/* D3B034 80240A64 3C068024 */  lui       $a2, %hi(D_8024501C_D3F5EC)
-/* D3B038 80240A68 24C6501C */  addiu     $a2, $a2, %lo(D_8024501C_D3F5EC)
-/* D3B03C 80240A6C 00C0202D */  daddu     $a0, $a2, $zero
-.L80240A70:
-/* D3B040 80240A70 8C820000 */  lw        $v0, ($a0)
-/* D3B044 80240A74 00A2102A */  slt       $v0, $a1, $v0
-/* D3B048 80240A78 14400006 */  bnez      $v0, .L80240A94
-/* D3B04C 80240A7C 000310C0 */   sll      $v0, $v1, 3
-/* D3B050 80240A80 24630001 */  addiu     $v1, $v1, 1
-/* D3B054 80240A84 28620008 */  slti      $v0, $v1, 8
-/* D3B058 80240A88 1440FFF9 */  bnez      $v0, .L80240A70
-/* D3B05C 80240A8C 24840008 */   addiu    $a0, $a0, 8
-/* D3B060 80240A90 000310C0 */  sll       $v0, $v1, 3
-.L80240A94:
-/* D3B064 80240A94 00461021 */  addu      $v0, $v0, $a2
-/* D3B068 80240A98 8C420004 */  lw        $v0, 4($v0)
-/* D3B06C 80240A9C 97A30010 */  lhu       $v1, 0x10($sp)
-/* D3B070 80240AA0 0202202A */  slt       $a0, $s0, $v0
-/* D3B074 80240AA4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* D3B078 80240AA8 14620008 */  bne       $v1, $v0, .L80240ACC
-/* D3B07C 80240AAC 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* D3B080 80240AB0 97A7001E */  lhu       $a3, 0x1e($sp)
-/* D3B084 80240AB4 14E20005 */  bne       $a3, $v0, .L80240ACC
-/* D3B088 80240AB8 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* D3B08C 80240ABC 14400003 */  bnez      $v0, .L80240ACC
-/* D3B090 80240AC0 00000000 */   nop
-/* D3B094 80240AC4 14800008 */  bnez      $a0, .L80240AE8
-/* D3B098 80240AC8 24020001 */   addiu    $v0, $zero, 1
-.L80240ACC:
-/* D3B09C 80240ACC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* D3B0A0 80240AD0 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* D3B0A4 80240AD4 80420075 */  lb        $v0, 0x75($v0)
-/* D3B0A8 80240AD8 10400005 */  beqz      $v0, .L80240AF0
-/* D3B0AC 80240ADC 00000000 */   nop
-/* D3B0B0 80240AE0 10800003 */  beqz      $a0, .L80240AF0
-/* D3B0B4 80240AE4 24020001 */   addiu    $v0, $zero, 1
-.L80240AE8:
-/* D3B0B8 80240AE8 080902BF */  j         .L80240AFC
-/* D3B0BC 80240AEC AE220084 */   sw       $v0, 0x84($s1)
-.L80240AF0:
-/* D3B0C0 80240AF0 0C00F9EB */  jal       kill_enemy
-/* D3B0C4 80240AF4 03C0202D */   daddu    $a0, $fp, $zero
-/* D3B0C8 80240AF8 AE200084 */  sw        $zero, 0x84($s1)
-.L80240AFC:
-/* D3B0CC 80240AFC 8FBF0044 */  lw        $ra, 0x44($sp)
-/* D3B0D0 80240B00 8FBE0040 */  lw        $fp, 0x40($sp)
-/* D3B0D4 80240B04 8FB7003C */  lw        $s7, 0x3c($sp)
-/* D3B0D8 80240B08 8FB60038 */  lw        $s6, 0x38($sp)
-/* D3B0DC 80240B0C 8FB50034 */  lw        $s5, 0x34($sp)
-/* D3B0E0 80240B10 8FB40030 */  lw        $s4, 0x30($sp)
-/* D3B0E4 80240B14 8FB3002C */  lw        $s3, 0x2c($sp)
-/* D3B0E8 80240B18 8FB20028 */  lw        $s2, 0x28($sp)
-/* D3B0EC 80240B1C 8FB10024 */  lw        $s1, 0x24($sp)
-/* D3B0F0 80240B20 8FB00020 */  lw        $s0, 0x20($sp)
-/* D3B0F4 80240B24 24020002 */  addiu     $v0, $zero, 2
-/* D3B0F8 80240B28 03E00008 */  jr        $ra
-/* D3B0FC 80240B2C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/os/osDisableInt.s b/ver/us/asm/os/__osDisableInt.s
similarity index 98%
rename from ver/us/asm/os/osDisableInt.s
rename to ver/us/asm/os/__osDisableInt.s
index 6c86da8989..c7d142bc64 100644
--- a/ver/us/asm/os/osDisableInt.s
+++ b/ver/us/asm/os/__osDisableInt.s
@@ -7,7 +7,7 @@
 
 .section .text, "ax"
 
-glabel osDisableInt
+glabel __osDisableInt
 /* 46760 8006B360 3C0A8009 */  lui       $t2, %hi(D_80095900)
 /* 46764 8006B364 254A5900 */  addiu     $t2, $t2, %lo(D_80095900)
 /* 46768 8006B368 8D4B0000 */  lw        $t3, ($t2)
diff --git a/ver/us/asm/os/osRestoreInt.s b/ver/us/asm/os/__osRestoreInt.s
similarity index 96%
rename from ver/us/asm/os/osRestoreInt.s
rename to ver/us/asm/os/__osRestoreInt.s
index 167af9d208..45a119ca70 100644
--- a/ver/us/asm/os/osRestoreInt.s
+++ b/ver/us/asm/os/__osRestoreInt.s
@@ -7,7 +7,7 @@
 
 .section .text, "ax"
 
-glabel osRestoreInt
+glabel __osRestoreInt
 /* 467D0 8006B3D0 40086000 */  mfc0      $t0, $12
 /* 467D4 8006B3D4 01044025 */  or        $t0, $t0, $a0
 /* 467D8 8006B3D8 40886000 */  mtc0      $t0, $12
diff --git a/ver/us/asm/nonmatchings/os/guOrtho/guOrtho.s b/ver/us/asm/os/guOrtho/guOrtho.s
similarity index 96%
rename from ver/us/asm/nonmatchings/os/guOrtho/guOrtho.s
rename to ver/us/asm/os/guOrtho/guOrtho.s
index 97cc89bd2d..cea09c1f2e 100644
--- a/ver/us/asm/nonmatchings/os/guOrtho/guOrtho.s
+++ b/ver/us/asm/os/guOrtho/guOrtho.s
@@ -27,14 +27,14 @@ glabel guOrtho
 /* 3EE98 80063A98 461AC001 */  sub.s     $f0, $f24, $f26
 /* 3EE9C 80063A9C 3C014000 */  lui       $at, 0x4000
 /* 3EEA0 80063AA0 44811000 */  mtc1      $at, $f2
-/* 3EEA4 80063AA4 00000000 */  nop       
+/* 3EEA4 80063AA4 00000000 */  nop
 /* 3EEA8 80063AA8 46001283 */  div.s     $f10, $f2, $f0
 /* 3EEAC 80063AAC 461EB181 */  sub.s     $f6, $f22, $f30
 /* 3EEB0 80063AB0 46061083 */  div.s     $f2, $f2, $f6
 /* 3EEB4 80063AB4 461CA201 */  sub.s     $f8, $f20, $f28
 /* 3EEB8 80063AB8 3C01C000 */  lui       $at, 0xc000
 /* 3EEBC 80063ABC 44812000 */  mtc1      $at, $f4
-/* 3EEC0 80063AC0 00000000 */  nop       
+/* 3EEC0 80063AC0 00000000 */  nop
 /* 3EEC4 80063AC4 46082103 */  div.s     $f4, $f4, $f8
 /* 3EEC8 80063AC8 461AC600 */  add.s     $f24, $f24, $f26
 /* 3EECC 80063ACC 4600C607 */  neg.s     $f24, $f24
@@ -61,7 +61,7 @@ glabel guOrtho
 .L80063B1C:
 /* 3EF1C 80063B1C C4600000 */  lwc1      $f0, ($v1)
 /* 3EF20 80063B20 44916000 */  mtc1      $s1, $f12
-/* 3EF24 80063B24 00000000 */  nop       
+/* 3EF24 80063B24 00000000 */  nop
 /* 3EF28 80063B28 460C0002 */  mul.s     $f0, $f0, $f12
 /* 3EF2C 80063B2C 24840001 */  addiu     $a0, $a0, 1
 /* 3EF30 80063B30 28820004 */  slti      $v0, $a0, 4
@@ -87,4 +87,4 @@ glabel guOrtho
 /* 3EF80 80063B80 D7B40060 */  ldc1      $f20, 0x60($sp)
 /* 3EF84 80063B84 03E00008 */  jr        $ra
 /* 3EF88 80063B88 27BD0090 */   addiu    $sp, $sp, 0x90
-/* 3EF8C 80063B8C 00000000 */  nop       
+/* 3EF8C 80063B8C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/os/guOrtho/guOrthoF.s b/ver/us/asm/os/guOrtho/guOrthoF.s
similarity index 97%
rename from ver/us/asm/nonmatchings/os/guOrtho/guOrthoF.s
rename to ver/us/asm/os/guOrtho/guOrthoF.s
index d3ced60133..8f0d620375 100644
--- a/ver/us/asm/nonmatchings/os/guOrtho/guOrthoF.s
+++ b/ver/us/asm/os/guOrtho/guOrthoF.s
@@ -24,14 +24,14 @@ glabel guOrthoF
 /* 3ED5C 8006395C 461AA001 */  sub.s     $f0, $f20, $f26
 /* 3ED60 80063960 3C014000 */  lui       $at, 0x4000
 /* 3ED64 80063964 44811000 */  mtc1      $at, $f2
-/* 3ED68 80063968 00000000 */  nop       
+/* 3ED68 80063968 00000000 */  nop
 /* 3ED6C 8006396C 46001283 */  div.s     $f10, $f2, $f0
 /* 3ED70 80063970 461CC181 */  sub.s     $f6, $f24, $f28
 /* 3ED74 80063974 46061083 */  div.s     $f2, $f2, $f6
 /* 3ED78 80063978 461EB201 */  sub.s     $f8, $f22, $f30
 /* 3ED7C 8006397C 3C01C000 */  lui       $at, 0xc000
 /* 3ED80 80063980 44812000 */  mtc1      $at, $f4
-/* 3ED84 80063984 00000000 */  nop       
+/* 3ED84 80063984 00000000 */  nop
 /* 3ED88 80063988 46082103 */  div.s     $f4, $f4, $f8
 /* 3ED8C 8006398C 461AA500 */  add.s     $f20, $f20, $f26
 /* 3ED90 80063990 4600A507 */  neg.s     $f20, $f20
@@ -58,7 +58,7 @@ glabel guOrthoF
 .L800639E0:
 /* 3EDE0 800639E0 C4600000 */  lwc1      $f0, ($v1)
 /* 3EDE4 800639E4 44916000 */  mtc1      $s1, $f12
-/* 3EDE8 800639E8 00000000 */  nop       
+/* 3EDE8 800639E8 00000000 */  nop
 /* 3EDEC 800639EC 460C0002 */  mul.s     $f0, $f0, $f12
 /* 3EDF0 800639F0 24840001 */  addiu     $a0, $a0, 1
 /* 3EDF4 800639F4 28820004 */  slti      $v0, $a0, 4
diff --git a/ver/us/asm/nonmatchings/os/guRotate/guRotate.s b/ver/us/asm/os/guRotate/guRotate.s
similarity index 100%
rename from ver/us/asm/nonmatchings/os/guRotate/guRotate.s
rename to ver/us/asm/os/guRotate/guRotate.s
diff --git a/ver/us/asm/nonmatchings/os/guRotate/guRotateF.s b/ver/us/asm/os/guRotate/guRotateF.s
similarity index 100%
rename from ver/us/asm/nonmatchings/os/guRotate/guRotateF.s
rename to ver/us/asm/os/guRotate/guRotateF.s
diff --git a/ver/us/asm/nonmatchings/os/osEPiLinkHandle/osEPiLinkHandle.s b/ver/us/asm/os/osEPiLinkHandle/osEPiLinkHandle.s
similarity index 90%
rename from ver/us/asm/nonmatchings/os/osEPiLinkHandle/osEPiLinkHandle.s
rename to ver/us/asm/os/osEPiLinkHandle/osEPiLinkHandle.s
index 9217f7bf41..13b1f26f58 100644
--- a/ver/us/asm/nonmatchings/os/osEPiLinkHandle/osEPiLinkHandle.s
+++ b/ver/us/asm/os/osEPiLinkHandle/osEPiLinkHandle.s
@@ -5,14 +5,14 @@ glabel osEPiLinkHandle
 /* 3C2C0 80060EC0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3C2C4 80060EC4 AFB00010 */  sw        $s0, 0x10($sp)
 /* 3C2C8 80060EC8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 3C2CC 80060ECC 0C01ACD8 */  jal       osDisableInt
+/* 3C2CC 80060ECC 0C01ACD8 */  jal       __osDisableInt
 /* 3C2D0 80060ED0 00808021 */   addu     $s0, $a0, $zero
 /* 3C2D4 80060ED4 3C038009 */  lui       $v1, %hi(__osPiTable)
 /* 3C2D8 80060ED8 8C633D6C */  lw        $v1, %lo(__osPiTable)($v1)
 /* 3C2DC 80060EDC 00402021 */  addu      $a0, $v0, $zero
 /* 3C2E0 80060EE0 3C018009 */  lui       $at, %hi(__osPiTable)
 /* 3C2E4 80060EE4 AC303D6C */  sw        $s0, %lo(__osPiTable)($at)
-/* 3C2E8 80060EE8 0C01ACF4 */  jal       osRestoreInt
+/* 3C2E8 80060EE8 0C01ACF4 */  jal       __osRestoreInt
 /* 3C2EC 80060EEC AE030000 */   sw       $v1, ($s0)
 /* 3C2F0 80060EF0 00001021 */  addu      $v0, $zero, $zero
 /* 3C2F4 80060EF4 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 1c704d259c..b850f7126a 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -125,10 +125,10 @@ segments:
     - [0x3BD20, c, os/nusys/nuContQueryRead]
     - [0x3BD40, hasm, os/osSetIntMask]
     - [0x3BDE0, c, os/osCreatePiManager]
-    - [0x3C160, c, os/osEPiWriteIo] # MOVE_ADDU
-    - [0x3C1C0, c, os/osEPiReadIo] # MOVE_ADDU
-    - [0x3C220, c, os/osEPiStartDma] # MOVE_ADDU
-    - [0x3C2C0, c, os/osEPiLinkHandle]
+    - [0x3C160, c, os/osEPiWriteIo, kmc -O3]
+    - [0x3C1C0, c, os/osEPiReadIo, kmc -O3]
+    - [0x3C220, c, os/osEPiStartDma, kmc -O3]
+    - [0x3C2C0, c, os/osEPiLinkHandle, kmc -O3]
     - [0x3C310, c, os/osCartRomInit]
     - [0x3C490, c, os/3c490_len_3c0]
     - [0x3C850, c, os/3c850_len_f0]
@@ -147,7 +147,7 @@ segments:
     - [0x3D5B0, c, os/guLookAt]
     - [0x3DCC0, c, os/3dcc0_len_a60]
     - [0x3E720, c, os/3e720_len_5f0]
-    - [0x3ED10, c, os/guOrtho]
+    - [0x3ED10, c, os/guOrtho, kmc -O3]
     - [0x3EF90, c, os/3ef90_len_600]
     - [0x3F310, c, os/3f310_len_3c0]
     - [0x3F6D0, c, os/3f6d0_len_320]
@@ -204,7 +204,7 @@ segments:
     - [0x42D60, c, os/42d60_len_80]
     - [0x42DE0, c, os/42de0_len_90]
     - [0x42E70, c, os/42e70_len_390]
-    - [0x42F20, c, os/guRotate]
+    - [0x42F20, c, os/guRotate, kmc -O3]
     - [0x43200, c, os/43200_len_7c0]
     - [0x43590, c, os/43590]
     - [0x439C0, c, os/439c0_len_220]
@@ -221,8 +221,8 @@ segments:
     - [0x45A30, c, os/45a30_len_20]
     - [0x45A50, c, os/45a50_len_3a0]
     - [0x45DF0, hasm, os/exceptasm]
-    - [0x46760, hasm, os/osDisableInt]
-    - [0x467D0, hasm, os/osRestoreInt]
+    - [0x46760, hasm, os/__osDisableInt]
+    - [0x467D0, hasm, os/__osRestoreInt]
     - [0x467F0, c, os/467f0_len_90]
     - [0x46880, c, os/46880_len_260]
     - [0x46AE0, c, os/46ae0_len_170]
@@ -2224,7 +2224,7 @@ segments:
     vram: 0xE000E000
     subsegments:
     - [0x32C110, c, effect_7]
-    - [0x32c770]
+    - [0x32C770]
   - name: effect_8
     dir: effects
     type: code
@@ -2803,7 +2803,7 @@ segments:
     vram: 0xE0092000
     subsegments:
     - [0x391D30, c, effect_73]
-    - [0x3923C0, data]
+    - [0x3923C0]
   - [0x392440, bin] # effect 73 gfx
   - name: effect_74
     dir: effects
@@ -2821,7 +2821,7 @@ segments:
     vram: 0xE0096000
     subsegments:
     - [0x394280, c, effect_75]
-    - [0x394660, data]
+    - [0x394660]
   - [0x394670, bin] # effect 75 gfx
   - name: effect_76
     dir: effects
@@ -10866,6 +10866,18 @@ segments:
     - [0xE31380, data]
     - [0xE314C0]
   - [0xE31530, bin] # unk data
+  - [0xE32420, bin] # unk data
+  - [0xE35670, bin] # unk data
+  - [0xE38890, bin] # unk data
+  - [0xE3B870, bin] # unk data
+  - [0xE3E260, bin] # unk data
+  - [0xE42240, bin] # unk data
+  - [0xE4B2E0, bin] # unk data
+  - [0xE4E7F0, bin] # unk data
+  - [0xE62370, bin] # unk data
+  - [0xE62AC0, bin] # unk data
+  - [0xE639C0, bin] # unk data
+  - [0xE648D0, bin] # unk data
   - type: code
     start: 0xEA0900
     vram: 0x80240000
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index ee136a07af..b840a07250 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -881,7 +881,7 @@ contPakFileDelete = 0x8005F864; // type:func rom:0x3AC64
 contPakFileState = 0x8005F8A4; // type:func rom:0x3ACA4
 contPakFileNum = 0x8005F8D0; // type:func rom:0x3ACD0
 contPakRepairId = 0x8005F8FC; // type:func rom:0x3ACFC
-osMotorStop = 0x8005F920; // type:func rom:0x3AD20
+contRmbControl = 0x8005F920; // type:func rom:0x3AD20
 contRmbRetrace = 0x8005FB10; // type:func rom:0x3AF10
 nuContRmbMgrInit = 0x8005FC8C; // type:func rom:0x3B08C
 nuContRmbMgrRemove = 0x8005FCEC; // type:func rom:0x3B0EC
@@ -1072,8 +1072,8 @@ osEnqueueThread = 0x8006B174; // rom:0x46574 !
 osPopThread = 0x8006B1BC; // rom:0x465BC !
 osDispatchThread = 0x8006B1D4; // rom:0x465D4 !
 osCleanupThread = 0x8006B350; // type:func rom:0x46750
-osDisableInt = 0x8006B360; // rom:0x46760
-osRestoreInt = 0x8006B3D0; // rom:0x467D0
+__osDisableInt = 0x8006B360; // rom:0x46760
+__osRestoreInt = 0x8006B3D0; // rom:0x467D0
 osSetGlobalIntMask = 0x8006B3F0; // type:func rom:0x467F0
 osResetGlobalIntMask = 0x8006B430; // type:func rom:0x46830
 osPiRawStartDma = 0x8006B480; // type:func rom:0x46880
@@ -1123,9 +1123,10 @@ strcpy = 0x8006ED40; // type:func rom:0x4A140
 strcmp = 0x8006ED70; // type:func rom:0x4A170
 memset = 0x8006EDB0; // type:func rom:0x4A1B0
 decode_yay0 = 0x8006EDF0; // type:func rom:0x4A1F0
+osFlashReInit = 0x8006EEA0; // type:func rom:0x4A2A0
 func_8006EF18 = 0x8006EF18; // type:func rom:0x4A318
 func_8006EF20 = 0x8006EF20; // type:func rom:0x4A320
-func_8006EF28 = 0x8006EF28; // type:func rom:0x4A328
+osFlashChange = 0x8006EF28; // type:func rom:0x4A328
 func_8006EF58 = 0x8006EF58; // type:func rom:0x4A358
 func_8006EF60 = 0x8006EF60; // type:func rom:0x4A360
 osFlashInit = 0x8006EF68; // type:func rom:0x4A368
@@ -1309,7 +1310,7 @@ D_800743E0 = 0x800743E0; // type:data rom:0x4F7E0
 gRandSeed = 0x80074410; // rom:0x4F810
 D_80074414 = 0x80074414; // type:data rom:0x4F814
 D_80074580 = 0x80074580; // type:data rom:0x4F980
-magicSaveMsg = 0x800745D0; // type:data rom:0x4F9D0
+magicSaveString = 0x800745D0; // type:data rom:0x4F9D0
 sprite_unk_checkers_png = 0x800745E0; // type:data rom:0x4F9E0
 D_800746E0 = 0x800746E0; // type:data rom:0x4FAE0
 sprite_curtains_png = 0x80074730; // type:data rom:0x4FB30
@@ -1336,8 +1337,8 @@ D_800760C0 = 0x800760C0; // type:data rom:0x514C0
 ui_no_controller_png = 0x80076140; // type:data rom:0x51540
 D_80077140 = 0x80077140; // type:data rom:0x52540
 D_800771E8 = 0x800771E8; // type:data rom:0x525E8
-D_80077210 = 0x80077210; // type:data rom:0x52610
-D_80077290 = 0x80077290; // type:data rom:0x52690
+gCrashScreencharToGlyph = 0x80077210; // type:data rom:0x52610
+gCrashScreenFont = 0x80077290; // type:data rom:0x52690
 gFaultCauses = 0x80077390; // type:data rom:0x52790
 gFPCSRFaultCauses = 0x800773D8; // type:data rom:0x527D8
 nuGfxCfbNum = 0x800773F0; // type:data rom:0x527F0
@@ -1367,6 +1368,7 @@ D_80077828 = 0x80077828; // type:data rom:0x52C28
 D_8007783C = 0x8007783C; // type:data rom:0x52C3C
 gameModeMap = 0x80077850; // type:data rom:0x52C50
 D_800778A0 = 0x800778A0; // type:data rom:0x52CA0
+D_800778AC = 0x800778AC; // type:data rom:0x52CAC
 D_800778C8 = 0x800778C8; // type:data rom:0x52CC8
 D_80077908 = 0x80077908; // type:data rom:0x52D08
 D_80077950 = 0x80077950; // type:data rom:0x52D50
@@ -1391,7 +1393,7 @@ D_80077A34 = 0x80077A34; // type:data rom:0x52E34
 D_80077A40 = 0x80077A40; // type:data rom:0x52E40
 D_80077A50 = 0x80077A50; // type:data rom:0x52E50
 D_80077AE0 = 0x80077AE0; // type:data rom:0x52EE0
-versionMsg = 0x80077BD0; // type:data rom:0x52FD0
+versionString = 0x80077BD0; // type:data rom:0x52FD0
 SCRIPT_NpcDefeat = 0x80077E38; // rom:0x53238
 D_80078170 = 0x80078170; // type:data rom:0x53570
 nuAuPreNMIFunc = 0x80078174; // rom:0x53574
@@ -1600,6 +1602,7 @@ D_80099E40 = 0x80099E40; // type:data rom:0x75240
 D_80099F40 = 0x80099F40; // type:data rom:0x75340
 D_8009A040 = 0x8009A040; // type:data rom:0x75440
 D_8009A140 = 0x8009A140; // type:data rom:0x75540
+nuIdleFunc = 0x8009A5A8; // type:data rom:0x759A8
 npc_raycast_down = 0x800DC500; // type:func rom:0x759B0
 npc_raycast_down_ahead = 0x800DC778; // type:func rom:0x75C28
 npc_raycast_down_sides = 0x800DCB7C; // type:func rom:0x7602C
@@ -1936,6 +1939,10 @@ D_800F8340 = 0x800F8340; // type:data rom:0x917F0
 D_800F8344 = 0x800F8344; // type:data rom:0x917F4
 gPartnerAnimations = 0x800F8348; // rom:0x917F8 size:0x1B0
 D_800F84F8 = 0x800F84F8; // type:data rom:0x919A8
+D_801041A0 = 0x801041A0; // type:data rom:0x9D650
+ui_stat_heart_png = 0x801041A8; // type:data rom:0x9D658
+D_801045A8 = 0x801045A8; // type:data rom:0x9DA58
+ui_stat_flower_png = 0x801045B0; // type:data rom:0x9DA60
 D_80108A64 = 0x80108A64; // type:data rom:0xA1F14
 D_8010BC50 = 0x8010BC50; // type:data rom:0xA5100
 D_8010BD30 = 0x8010BD30; // type:data rom:0xA51E0
@@ -3532,8 +3539,11 @@ D_802E9874 = 0x802E9874; // type:data rom:0x10B0F4
 D_802E9898 = 0x802E9898; // type:data rom:0x10B118
 D_802E98BC = 0x802E98BC; // type:data rom:0x10B13C
 D_802E98DC = 0x802E98DC; // type:data rom:0x10B15C
+D_802E98E0 = 0x802E98E0; // type:data rom:0x10B160
 D_802E9900 = 0x802E9900; // type:data rom:0x10B180
+D_802E9904 = 0x802E9904; // type:data rom:0x10B184
 D_802E9924 = 0x802E9924; // type:data rom:0x10B1A4
+D_802E9928 = 0x802E9928; // type:data rom:0x10B1A8
 D_802E9930 = 0x802E9930; // type:data rom:0x10B1B0
 D_802E99FC = 0x802E99FC; // type:data rom:0x10B27C
 D_802E9A18 = 0x802E9A18; // type:data rom:0x10B298
@@ -3715,7 +3725,28 @@ gPauseMenuTargetPosY = 0x8024EFAC; // rom:0x1422EC
 gPauseMenuCursorTargetOpacity = 0x8024EFB0; // rom:0x1422F0
 gPauseMenuTextScrollInterpEasingLUT = 0x8024F0AC; // rom:0x1423EC
 gPauseMenuPageScrollInterpEasingLUT = 0x8024F0BC; // rom:0x1423FC
+D_8026FF80 = 0x8026FF80; // type:data rom:0x1632C0
+D_8026FF88 = 0x8026FF88; // type:data rom:0x1632C8
+D_8026FF90 = 0x8026FF90; // type:data rom:0x1632D0
+D_8026FF98 = 0x8026FF98; // type:data rom:0x1632D8
+D_8026FFA0 = 0x8026FFA0; // type:data rom:0x1632E0
+D_8026FFA8 = 0x8026FFA8; // type:data rom:0x1632E8
+D_8026FFB0 = 0x8026FFB0; // type:data rom:0x1632F0
+D_80270040 = 0x80270040; // type:data rom:0x163380
+D_80270048 = 0x80270048; // type:data rom:0x163388
+D_80270050 = 0x80270050; // type:data rom:0x163390
+D_80270058 = 0x80270058; // type:data rom:0x163398
+D_80270060 = 0x80270060; // type:data rom:0x1633A0
+D_80270068 = 0x80270068; // type:data rom:0x1633A8
+D_80270070 = 0x80270070; // type:data rom:0x1633B0
 mainmenu_draw_rect = 0x80242BA0; // type:func rom:0x163400
+gPauseMenuPressedButtons = 0x802700C4; // type:data rom:0x163404
+gPauseMenuCurrentDescMsg = 0x802700C8; // type:data rom:0x163408
+gPauseMenuCurrentDescIconScript = 0x802700CC; // type:data rom:0x16340C
+D_802700D0 = 0x802700D0; // type:data rom:0x163410
+gPauseMenuCurrentTab = 0x802700D4; // type:data rom:0x163414
+D_802700D = 0x802700D8; // type:data rom:0x163418
+D_802700E0 = 0x802700E0; // type:data rom:0x163420
 filemenu_set_selected = 0x80242D94; // type:func rom:0x1635F4
 filemenu_set_cursor_alpha = 0x80242DEC; // type:func rom:0x16364C
 filemenu_set_cursor_goal_pos = 0x80242E00; // type:func rom:0x163660
@@ -3786,7 +3817,49 @@ filemenu_draw_char = 0x80249380; // type:func rom:0x169BE0
 filemenu_draw_message = 0x8024997C; // type:func rom:0x16A1DC
 filemenu_get_menu_message = 0x80249AA4; // type:func rom:0x16A304
 filemenu_draw_file_name = 0x80249AB8; // type:func rom:0x16A318
+D_80249B80 = 0x80249B80; // type:data rom:0x16A3E0
+filemenu_menus = 0x80249B84; // type:data rom:0x16A3E4
+D_80249B94 = 0x80249B94; // type:data rom:0x16A3F4
+D_80249B98 = 0x80249B98; // type:data rom:0x16A3F8
+D_80249B9C = 0x80249B9C; // type:data rom:0x16A3FC
+D_80249BA0 = 0x80249BA0; // type:data rom:0x16A400
+D_80249BA4 = 0x80249BA4; // type:data rom:0x16A404
+filemenu_cursorGoalAlpha = 0x80249BA8; // type:data rom:0x16A408
+filemenu_cursorGoalAlpha2 = 0x80249BAC; // type:data rom:0x16A40C
+D_80249BB0 = 0x80249BB0; // type:data rom:0x16A410
+D_80249BB8 = 0x80249BB8; // type:data rom:0x16A418
+D_80249BBC = 0x80249BBC; // type:data rom:0x16A41C
+D_80249BDC = 0x80249BDC; // type:data rom:0x16A43C
+D_80249BFC = 0x80249BFC; // type:data rom:0x16A45C
+D_80249C1C = 0x80249C1C; // type:data rom:0x16A47C
+D_80249C3C = 0x80249C3C; // type:data rom:0x16A49C
+D_80249C5C = 0x80249C5C; // type:data rom:0x16A4BC
+D_80249C7C = 0x80249C7C; // type:data rom:0x16A4DC
+D_80249C90 = 0x80249C90; // type:data rom:0x16A4F0
+D_80249CA4 = 0x80249CA4; // type:data rom:0x16A504
+D_80249CB8 = 0x80249CB8; // type:data rom:0x16A518
+D_80249CCC = 0x80249CCC; // type:data rom:0x16A52C
+D_80249CE0 = 0x80249CE0; // type:data rom:0x16A540
+D_80249CF4 = 0x80249CF4; // type:data rom:0x16A554
+D_80249D14 = 0x80249D14; // type:data rom:0x16A574
+D_80249D34 = 0x80249D34; // type:data rom:0x16A594
+D_80249D48 = 0x80249D48; // type:data rom:0x16A5A8
+D_80249D4C = 0x80249D5C; // type:data rom:0x16A5BC
+D_80249D60 = 0x80249D60; // type:data rom:0x16A5C0
+D_80249D70 = 0x80249D70; // type:data rom:0x16A5D0
+D_80249DAC = 0x80249DAC; // type:data rom:0x16A60C
+D_80249DCC = 0x80249DCC; // type:data rom:0x16A62C
 get_dpad_input_radial = 0x8023E000; // type:func rom:0x16C8E0
+filemenu_pressedButtons = 0x8024C084; // type:data rom:0x16C8E4
+filemenu_8024C088 = 0x8024C088; // type:data rom:0x16C8E8
+filemenu_heldButtons = 0x8024C08C; // type:data rom:0x16C8EC
+filemenu_8024C090 = 0x8024C090; // type:data rom:0x16C8F0
+filemenu_loadedFileIdx = 0x8024C094; // type:data rom:0x16C8F4
+filemenu_8024C098 = 0x8024C098; // type:data rom:0x16C8F8
+filemenu_cursorHudElemID = 0x8024C0A0; // type:data rom:0x16C900
+filemenu_8024C0A4 = 0x8024C0A4; // type:data rom:0x16C904
+filemenu_hudElemIDs = 0x8024C0B0; // type:data rom:0x16C910
+filemenu_8024C100 = 0x8024C100; // type:data rom:0x16C960
 func_8023E104 = 0x8023E104; // type:func rom:0x16C9E4
 func_8023E11C = 0x8023E11C; // type:func rom:0x16C9FC
 initialize_battle = 0x8023E130; // type:func rom:0x16CA10
@@ -4895,12 +4968,15 @@ fx_6_main = 0xE000C160; // type:func rom:0x328270
 fx_6_init = 0xE000C64C; // type:func rom:0x32875C
 fx_6_update = 0xE000C654; // type:func rom:0x328764
 fx_6_render = 0xE000C754; // type:func rom:0x328864
-func_E000C798 = 0xE000C798; // type:func rom:0x3288A8
+fx_6_appendGfx = 0xE000C798; // type:func rom:0x3288A8
 fx_7_main = 0xE000E000; // type:func rom:0x32C110
 fx_7_init = 0xE000E16C; // type:func rom:0x32C27C
 fx_7_update = 0xE000E174; // type:func rom:0x32C284
 fx_7_render = 0xE000E244; // type:func rom:0x32C354
 fx_7_appendGfx = 0xE000E288; // type:func rom:0x32C398
+D_E000E660 = 0xE000E660; // type:data rom:0x32C770
+D_E000E670 = 0xE000E670; // type:data rom:0x32C780
+D_E000E684 = 0xE000E684; // type:data rom:0x32C794
 func_E0010000 = 0xE0010000; // type:func rom:0x32C7A0
 func_E0010104 = 0xE0010104; // type:func rom:0x32C8A4
 fx_8_main = 0xE00101E8; // type:func rom:0x32C988
@@ -4912,303 +4988,303 @@ fx_8_appendGfx = 0xE0010510; // type:func rom:0x32CCB0
 func_E0012000 = 0xE0012000; // type:func rom:0x32DD10
 func_E0012104 = 0xE0012104; // type:func rom:0x32DE14
 fx_9_main = 0xE0012204; // type:func rom:0x32DF14
-func_E0012440 = 0xE0012440; // type:func rom:0x32E150
+fx_9_init = 0xE0012440; // type:func rom:0x32E150
 fx_9_update = 0xE0012448; // type:func rom:0x32E158
 fx_9_render = 0xE0012504; // type:func rom:0x32E214
 func_E0012548 = 0xE0012548; // type:func rom:0x32E258
 fx_9_appendGfx = 0xE0012564; // type:func rom:0x32E274
 fx_10_main = 0xE0014000; // type:func rom:0x32E490
-func_E0014258 = 0xE0014258; // type:func rom:0x32E6E8
-func_E0014260 = 0xE0014260; // type:func rom:0x32E6F0
-func_E001449C = 0xE001449C; // type:func rom:0x32E92C
-func_E00144E0 = 0xE00144E0; // type:func rom:0x32E970
+fx_10_init = 0xE0014258; // type:func rom:0x32E6E8
+fx_10_update = 0xE0014260; // type:func rom:0x32E6F0
+fx_10_render = 0xE001449C; // type:func rom:0x32E92C
+fx_10_appendGfx = 0xE00144E0; // type:func rom:0x32E970
 fx_11_main = 0xE0016000; // type:func rom:0x32EE30
-func_E0016220 = 0xE0016220; // type:func rom:0x32F050
-func_E0016228 = 0xE0016228; // type:func rom:0x32F058
-func_E0016410 = 0xE0016410; // type:func rom:0x32F240
-func_E0016454 = 0xE0016454; // type:func rom:0x32F284
+fx_11_init = 0xE0016220; // type:func rom:0x32F050
+fx_11_update = 0xE0016228; // type:func rom:0x32F058
+fx_11_render = 0xE0016410; // type:func rom:0x32F240
+fx_11_appendGfx = 0xE0016454; // type:func rom:0x32F284
 func_E0018000 = 0xE0018000; // type:func rom:0x32F580
 fx_12_main = 0xE0018078; // type:func rom:0x32F5F8
-func_E00182AC = 0xE00182AC; // type:func rom:0x32F82C
-func_E00182B4 = 0xE00182B4; // type:func rom:0x32F834
-func_E0018378 = 0xE0018378; // type:func rom:0x32F8F8
+fx_12_init = 0xE00182AC; // type:func rom:0x32F82C
+fx_12_update = 0xE00182B4; // type:func rom:0x32F834
+fx_12_render = 0xE0018378; // type:func rom:0x32F8F8
 func_E00183BC = 0xE00183BC; // type:func rom:0x32F93C
-func_E00183D8 = 0xE00183D8; // type:func rom:0x32F958
+fx_12_appendGfx = 0xE00183D8; // type:func rom:0x32F958
 fx_13_main = 0xE001A000; // type:func rom:0x32FE30
-func_E001A21C = 0xE001A21C; // type:func rom:0x33004C
-func_E001A224 = 0xE001A224; // type:func rom:0x330054
-func_E001A3FC = 0xE001A3FC; // type:func rom:0x33022C
-func_E001A440 = 0xE001A440; // type:func rom:0x330270
+fx_13_init = 0xE001A21C; // type:func rom:0x33004C
+fx_13_update = 0xE001A224; // type:func rom:0x330054
+fx_13_render = 0xE001A3FC; // type:func rom:0x33022C
+fx_13_appendGfx = 0xE001A440; // type:func rom:0x330270
 fx_14_main = 0xE001C000; // type:func rom:0x330910
-func_E001C120 = 0xE001C120; // type:func rom:0x330A30
-func_E001C128 = 0xE001C128; // type:func rom:0x330A38
-func_E001C200 = 0xE001C200; // type:func rom:0x330B10
-func_E001C30C = 0xE001C30C; // type:func rom:0x330C1C
+fx_14_init = 0xE001C120; // type:func rom:0x330A30
+fx_14_update = 0xE001C128; // type:func rom:0x330A38
+fx_14_render = 0xE001C200; // type:func rom:0x330B10
+fx_14_appendGfx = 0xE001C30C; // type:func rom:0x330C1C
 fx_15_main = 0xE001E000; // type:func rom:0x331940
-func_E001E370 = 0xE001E370; // type:func rom:0x331CB0
-func_E001E378 = 0xE001E378; // type:func rom:0x331CB8
-func_E001E6E8 = 0xE001E6E8; // type:func rom:0x332028
-func_E001E730 = 0xE001E730; // type:func rom:0x332070
+fx_15_init = 0xE001E370; // type:func rom:0x331CB0
+fx_15_update = 0xE001E378; // type:func rom:0x331CB8
+fx_15_render = 0xE001E6E8; // type:func rom:0x332028
+fx_15_appendGfx = 0xE001E730; // type:func rom:0x332070
 func_E0020000 = 0xE0020000; // type:func rom:0x333EC0
 fx_16_main = 0xE00202CC; // type:func rom:0x33418C
-func_E0020460 = 0xE0020460; // type:func rom:0x334320
-func_E0020468 = 0xE0020468; // type:func rom:0x334328
-func_E002058C = 0xE002058C; // type:func rom:0x33444C
-func_E00205D0 = 0xE00205D0; // type:func rom:0x334490
+fx_16_init = 0xE0020460; // type:func rom:0x334320
+fx_16_update = 0xE0020468; // type:func rom:0x334328
+fx_16_render = 0xE002058C; // type:func rom:0x33444C
+fx_16_appendGfx = 0xE00205D0; // type:func rom:0x334490
 fx_17_main = 0xE0022000; // type:func rom:0x337240
-func_E0022544 = 0xE0022544; // type:func rom:0x337784
-func_E002254C = 0xE002254C; // type:func rom:0x33778C
-func_E0022960 = 0xE0022960; // type:func rom:0x337BA0
-func_E0022998 = 0xE0022998; // type:func rom:0x337BD8
+fx_17_init = 0xE0022544; // type:func rom:0x337784
+fx_17_update = 0xE002254C; // type:func rom:0x33778C
+fx_17_render = 0xE0022960; // type:func rom:0x337BA0
+fx_17_appendGfx = 0xE0022998; // type:func rom:0x337BD8
 fx_18_main = 0xE0024000; // type:func rom:0x339250
-func_E0024180 = 0xE0024180; // type:func rom:0x3393D0
-func_E0024188 = 0xE0024188; // type:func rom:0x3393D8
-func_E00242E0 = 0xE00242E0; // type:func rom:0x339530
+fx_18_init = 0xE0024180; // type:func rom:0x3393D0
+fx_18_update = 0xE0024188; // type:func rom:0x3393D8
+fx_18_render = 0xE00242E0; // type:func rom:0x339530
 func_E0024324 = 0xE0024324; // type:func rom:0x339574
 func_E00243BC = 0xE00243BC; // type:func rom:0x33960C
-func_E0024454 = 0xE0024454; // type:func rom:0x3396A4
+fx_18_appendGfx = 0xE0024454; // type:func rom:0x3396A4
 fx_19_main = 0xE0026000; // type:func rom:0x33B180
-func_E0026184 = 0xE0026184; // type:func rom:0x33B304
-func_E002618C = 0xE002618C; // type:func rom:0x33B30C
-func_E00264B0 = 0xE00264B0; // type:func rom:0x33B630
-func_E00264F4 = 0xE00264F4; // type:func rom:0x33B674
+fx_19_init = 0xE0026184; // type:func rom:0x33B304
+fx_19_update = 0xE002618C; // type:func rom:0x33B30C
+fx_19_render = 0xE00264B0; // type:func rom:0x33B630
+fx_19_appendGfx = 0xE00264F4; // type:func rom:0x33B674
 fx_20_main = 0xE0028000; // type:func rom:0x33CDF0
-func_E0028240 = 0xE0028240; // type:func rom:0x33D030
-func_E0028248 = 0xE0028248; // type:func rom:0x33D038
-func_E00284E8 = 0xE00284E8; // type:func rom:0x33D2D8
-func_E002852C = 0xE002852C; // type:func rom:0x33D31C
+fx_20_init = 0xE0028240; // type:func rom:0x33D030
+fx_20_update = 0xE0028248; // type:func rom:0x33D038
+fx_20_render = 0xE00284E8; // type:func rom:0x33D2D8
+fx_20_appendGfx = 0xE002852C; // type:func rom:0x33D31C
 fx_21_main = 0xE002A000; // type:func rom:0x33E8C0
-func_E002A284 = 0xE002A284; // type:func rom:0x33EB44
-func_E002A28C = 0xE002A28C; // type:func rom:0x33EB4C
-func_E002A380 = 0xE002A380; // type:func rom:0x33EC40
-func_E002A3C4 = 0xE002A3C4; // type:func rom:0x33EC84
+fx_21_init = 0xE002A284; // type:func rom:0x33EB44
+fx_21_update = 0xE002A28C; // type:func rom:0x33EB4C
+fx_21_render = 0xE002A380; // type:func rom:0x33EC40
+fx_21_appendGfx = 0xE002A3C4; // type:func rom:0x33EC84
 fx_22_main = 0xE002C000; // type:func rom:0x33FE80
-func_E002C234 = 0xE002C234; // type:func rom:0x3400B4
-func_E002C23C = 0xE002C23C; // type:func rom:0x3400BC
-func_E002C3D0 = 0xE002C3D0; // type:func rom:0x340250
-func_E002C414 = 0xE002C414; // type:func rom:0x340294
+fx_22_init = 0xE002C234; // type:func rom:0x3400B4
+fx_22_update = 0xE002C23C; // type:func rom:0x3400BC
+fx_22_render = 0xE002C3D0; // type:func rom:0x340250
+fx_22_appendGfx = 0xE002C414; // type:func rom:0x340294
 fx_23_main = 0xE002E000; // type:func rom:0x3419E0
-func_E002E248 = 0xE002E248; // type:func rom:0x341C28
-func_E002E250 = 0xE002E250; // type:func rom:0x341C30
-func_E002E330 = 0xE002E330; // type:func rom:0x341D10
-func_E002E368 = 0xE002E368; // type:func rom:0x341D48
+fx_23_init = 0xE002E248; // type:func rom:0x341C28
+fx_23_update = 0xE002E250; // type:func rom:0x341C30
+fx_23_render = 0xE002E330; // type:func rom:0x341D10
+fx_23_appendGfx = 0xE002E368; // type:func rom:0x341D48
 fx_24_main = 0xE0030000; // type:func rom:0x342140
-func_E0030728 = 0xE0030728; // type:func rom:0x342868
-func_E0030730 = 0xE0030730; // type:func rom:0x342870
-func_E0030A24 = 0xE0030A24; // type:func rom:0x342B64
-func_E0030A68 = 0xE0030A68; // type:func rom:0x342BA8
+fx_24_init = 0xE0030728; // type:func rom:0x342868
+fx_24_update = 0xE0030730; // type:func rom:0x342870
+fx_24_render = 0xE0030A24; // type:func rom:0x342B64
+fx_24_appendGfx = 0xE0030A68; // type:func rom:0x342BA8
 fx_25_main = 0xE0032000; // type:func rom:0x343680
-func_E00321D0 = 0xE00321D0; // type:func rom:0x343850
-func_E00321D8 = 0xE00321D8; // type:func rom:0x343858
-func_E0032420 = 0xE0032420; // type:func rom:0x343AA0
-func_E003245C = 0xE003245C; // type:func rom:0x343ADC
+fx_25_init = 0xE00321D0; // type:func rom:0x343850
+fx_25_update = 0xE00321D8; // type:func rom:0x343858
+fx_25_render = 0xE0032420; // type:func rom:0x343AA0
+fx_25_appendGfx = 0xE003245C; // type:func rom:0x343ADC
 fx_26_main = 0xE0034000; // type:func rom:0x344A10
-func_E0034108 = 0xE0034108; // type:func rom:0x344B18
-func_E0034110 = 0xE0034110; // type:func rom:0x344B20
-func_E00342C8 = 0xE00342C8; // type:func rom:0x344CD8
-func_E0034310 = 0xE0034310; // type:func rom:0x344D20
+fx_26_init = 0xE0034108; // type:func rom:0x344B18
+fx_26_update = 0xE0034110; // type:func rom:0x344B20
+fx_26_render = 0xE00342C8; // type:func rom:0x344CD8
+fx_26_appendGfx = 0xE0034310; // type:func rom:0x344D20
 fx_27_main = 0xE0036000; // type:func rom:0x3454E0
-func_E00360DC = 0xE00360DC; // type:func rom:0x3455BC
-func_E00360E4 = 0xE00360E4; // type:func rom:0x3455C4
-func_E00361D8 = 0xE00361D8; // type:func rom:0x3456B8
+fx_27_init = 0xE00360DC; // type:func rom:0x3455BC
+fx_27_update = 0xE00360E4; // type:func rom:0x3455C4
+fx_27_render = 0xE00361D8; // type:func rom:0x3456B8
 func_E003621C = 0xE003621C; // type:func rom:0x3456FC
-func_E0036224 = 0xE0036224; // type:func rom:0x345704
+fx_27_appendGfx = 0xE0036224; // type:func rom:0x345704
 fx_28_main = 0xE0038000; // type:func rom:0x34DD20
-func_E003841C = 0xE003841C; // type:func rom:0x34E13C
-func_E0038424 = 0xE0038424; // type:func rom:0x34E144
-func_E0038704 = 0xE0038704; // type:func rom:0x34E424
-func_E0038748 = 0xE0038748; // type:func rom:0x34E468
+fx_28_init = 0xE003841C; // type:func rom:0x34E13C
+fx_28_update = 0xE0038424; // type:func rom:0x34E144
+fx_28_render = 0xE0038704; // type:func rom:0x34E424
+fx_28_appendGfx = 0xE0038748; // type:func rom:0x34E468
 fx_29_main = 0xE003A000; // type:func rom:0x34EC80
-func_E003A1D4 = 0xE003A1D4; // type:func rom:0x34EE54
-func_E003A1DC = 0xE003A1DC; // type:func rom:0x34EE5C
-func_E003A310 = 0xE003A310; // type:func rom:0x34EF90
-func_E003A354 = 0xE003A354; // type:func rom:0x34EFD4
+fx_29_init = 0xE003A1D4; // type:func rom:0x34EE54
+fx_29_update = 0xE003A1DC; // type:func rom:0x34EE5C
+fx_29_render = 0xE003A310; // type:func rom:0x34EF90
+fx_29_appendGfx = 0xE003A354; // type:func rom:0x34EFD4
 fx_30_main = 0xE003C000; // type:func rom:0x34F4C0
-func_E003C23C = 0xE003C23C; // type:func rom:0x34F6FC
-func_E003C244 = 0xE003C244; // type:func rom:0x34F704
-func_E003C474 = 0xE003C474; // type:func rom:0x34F934
+fx_30_init = 0xE003C23C; // type:func rom:0x34F6FC
+fx_30_update = 0xE003C244; // type:func rom:0x34F704
+fx_30_render = 0xE003C474; // type:func rom:0x34F934
 func_E003C47C = 0xE003C47C; // type:func rom:0x34F93C
 func_E003C498 = 0xE003C498; // type:func rom:0x34F958
 fx_31_main = 0xE003E000; // type:func rom:0x352440
-func_E003E3F8 = 0xE003E3F8; // type:func rom:0x352838
-func_E003E400 = 0xE003E400; // type:func rom:0x352840
-func_E003E5F4 = 0xE003E5F4; // type:func rom:0x352A34
-func_E003E638 = 0xE003E638; // type:func rom:0x352A78
+fx_31_init = 0xE003E3F8; // type:func rom:0x352838
+fx_31_update = 0xE003E400; // type:func rom:0x352840
+fx_31_render = 0xE003E5F4; // type:func rom:0x352A34
+fx_31_appendGfx = 0xE003E638; // type:func rom:0x352A78
 fx_32_main = 0xE0040000; // type:func rom:0x353300
-func_E0040148 = 0xE0040148; // type:func rom:0x353448
-func_E0040150 = 0xE0040150; // type:func rom:0x353450
-func_E0040210 = 0xE0040210; // type:func rom:0x353510
-func_E0040348 = 0xE0040348; // type:func rom:0x353648
+fx_32_init = 0xE0040148; // type:func rom:0x353448
+fx_32_update = 0xE0040150; // type:func rom:0x353450
+fx_32_render = 0xE0040210; // type:func rom:0x353510
+fx_32_appendGfx = 0xE0040348; // type:func rom:0x353648
 fx_33_main = 0xE0042000; // type:func rom:0x3547A0
-func_E004222C = 0xE004222C; // type:func rom:0x3549CC
-func_E0042234 = 0xE0042234; // type:func rom:0x3549D4
-func_E0042374 = 0xE0042374; // type:func rom:0x354B14
-func_E00423B8 = 0xE00423B8; // type:func rom:0x354B58
+fx_33_init = 0xE004222C; // type:func rom:0x3549CC
+fx_33_update = 0xE0042234; // type:func rom:0x3549D4
+fx_33_render = 0xE0042374; // type:func rom:0x354B14
+fx_33_appendGfx = 0xE00423B8; // type:func rom:0x354B58
 fx_34_main = 0xE0044000; // type:func rom:0x354F60
-func_E004441C = 0xE004441C; // type:func rom:0x35537C
-func_E0044424 = 0xE0044424; // type:func rom:0x355384
-func_E00448E4 = 0xE00448E4; // type:func rom:0x355844
-func_E004491C = 0xE004491C; // type:func rom:0x35587C
+fx_34_init = 0xE004441C; // type:func rom:0x35537C
+fx_34_update = 0xE0044424; // type:func rom:0x355384
+fx_34_render = 0xE00448E4; // type:func rom:0x355844
+fx_34_appendGfx = 0xE004491C; // type:func rom:0x35587C
 fx_35_main = 0xE0046000; // type:func rom:0x355EE0
-func_E0046158 = 0xE0046158; // type:func rom:0x356038
-func_E0046160 = 0xE0046160; // type:func rom:0x356040
-func_E004627C = 0xE004627C; // type:func rom:0x35615C
-func_E00462C0 = 0xE00462C0; // type:func rom:0x3561A0
+fx_35_init = 0xE0046158; // type:func rom:0x356038
+fx_35_update = 0xE0046160; // type:func rom:0x356040
+fx_35_render = 0xE004627C; // type:func rom:0x35615C
+fx_35_appendGfx = 0xE00462C0; // type:func rom:0x3561A0
 fx_36_main = 0xE0048000; // type:func rom:0x356980
-func_E0048128 = 0xE0048128; // type:func rom:0x356AA8
-func_E0048130 = 0xE0048130; // type:func rom:0x356AB0
-func_E00481D4 = 0xE00481D4; // type:func rom:0x356B54
-func_E0048218 = 0xE0048218; // type:func rom:0x356B98
+fx_36_init = 0xE0048128; // type:func rom:0x356AA8
+fx_36_update = 0xE0048130; // type:func rom:0x356AB0
+fx_36_render = 0xE00481D4; // type:func rom:0x356B54
+fx_36_appendGfx = 0xE0048218; // type:func rom:0x356B98
 fx_37_main = 0xE004A000; // type:func rom:0x3584C0
-func_E004A328 = 0xE004A328; // type:func rom:0x3587E8
-func_E004A330 = 0xE004A330; // type:func rom:0x3587F0
-func_E004A748 = 0xE004A748; // type:func rom:0x358C08
-func_E004A78C = 0xE004A78C; // type:func rom:0x358C4C
+fx_37_init = 0xE004A328; // type:func rom:0x3587E8
+fx_37_update = 0xE004A330; // type:func rom:0x3587F0
+fx_37_render = 0xE004A748; // type:func rom:0x358C08
+fx_37_appendGfx = 0xE004A78C; // type:func rom:0x358C4C
 fx_38_main = 0xE004C000; // type:func rom:0x359F20
-func_E004C204 = 0xE004C204; // type:func rom:0x35A124
-func_E004C20C = 0xE004C20C; // type:func rom:0x35A12C
-func_E004C364 = 0xE004C364; // type:func rom:0x35A284
-func_E004C3A8 = 0xE004C3A8; // type:func rom:0x35A2C8
+fx_38_init = 0xE004C204; // type:func rom:0x35A124
+fx_38_update = 0xE004C20C; // type:func rom:0x35A12C
+fx_38_render = 0xE004C364; // type:func rom:0x35A284
+fx_38_appendGfx = 0xE004C3A8; // type:func rom:0x35A2C8
 fx_39_main = 0xE004E000; // type:func rom:0x35B9D0
-func_E004E15C = 0xE004E15C; // type:func rom:0x35BB2C
-func_E004E164 = 0xE004E164; // type:func rom:0x35BB34
-func_E004E1D0 = 0xE004E1D0; // type:func rom:0x35BBA0
-func_E004E214 = 0xE004E214; // type:func rom:0x35BBE4
+fx_39_init = 0xE004E15C; // type:func rom:0x35BB2C
+fx_39_update = 0xE004E164; // type:func rom:0x35BB34
+fx_39_render = 0xE004E1D0; // type:func rom:0x35BBA0
+fx_39_appendGfx = 0xE004E214; // type:func rom:0x35BBE4
 fx_40_main = 0xE0050000; // type:func rom:0x35BFD0
-func_E00501D0 = 0xE00501D0; // type:func rom:0x35C1A0
-func_E00501D8 = 0xE00501D8; // type:func rom:0x35C1A8
-func_E00502C4 = 0xE00502C4; // type:func rom:0x35C294
-func_E0050308 = 0xE0050308; // type:func rom:0x35C2D8
+fx_40_init = 0xE00501D0; // type:func rom:0x35C1A0
+fx_40_update = 0xE00501D8; // type:func rom:0x35C1A8
+fx_40_render = 0xE00502C4; // type:func rom:0x35C294
+fx_40_appendGfx = 0xE0050308; // type:func rom:0x35C2D8
 fx_41_main = 0xE0052000; // type:func rom:0x35CA80
-func_E00520E8 = 0xE00520E8; // type:func rom:0x35CB68
-func_E00520F0 = 0xE00520F0; // type:func rom:0x35CB70
-func_E005241C = 0xE005241C; // type:func rom:0x35CE9C
-func_E0052460 = 0xE0052460; // type:func rom:0x35CEE0
+fx_41_init = 0xE00520E8; // type:func rom:0x35CB68
+fx_41_update = 0xE00520F0; // type:func rom:0x35CB70
+fx_41_render = 0xE005241C; // type:func rom:0x35CE9C
+fx_41_appendGfx = 0xE0052460; // type:func rom:0x35CEE0
 fx_43_main = 0xE0056000; // type:func rom:0x35DA00
-func_E0056304 = 0xE0056304; // type:func rom:0x35DD04
-func_E005630C = 0xE005630C; // type:func rom:0x35DD0C
-func_E0056B8C = 0xE0056B8C; // type:func rom:0x35E58C
-func_E0056BD0 = 0xE0056BD0; // type:func rom:0x35E5D0
+fx_43_init = 0xE0056304; // type:func rom:0x35DD04
+fx_43_update = 0xE005630C; // type:func rom:0x35DD0C
+fx_43_render = 0xE0056B8C; // type:func rom:0x35E58C
+fx_43_appendGfx = 0xE0056BD0; // type:func rom:0x35E5D0
 fx_44_main = 0xE0058000; // type:func rom:0x35E920
-func_E00581AC = 0xE00581AC; // type:func rom:0x35EACC
-func_E00581B4 = 0xE00581B4; // type:func rom:0x35EAD4
-func_E0058490 = 0xE0058490; // type:func rom:0x35EDB0
-func_E00584D4 = 0xE00584D4; // type:func rom:0x35EDF4
+fx_44_init = 0xE00581AC; // type:func rom:0x35EACC
+fx_44_update = 0xE00581B4; // type:func rom:0x35EAD4
+fx_44_render = 0xE0058490; // type:func rom:0x35EDB0
+fx_44_appendGfx = 0xE00584D4; // type:func rom:0x35EDF4
 fx_45_main = 0xE005A000; // type:func rom:0x3602C0
-func_E005A1F4 = 0xE005A1F4; // type:func rom:0x3604B4
-func_E005A1FC = 0xE005A1FC; // type:func rom:0x3604BC
-func_E005A3B0 = 0xE005A3B0; // type:func rom:0x360670
-func_E005A3F4 = 0xE005A3F4; // type:func rom:0x3606B4
+fx_45_init = 0xE005A1F4; // type:func rom:0x3604B4
+fx_45_update = 0xE005A1FC; // type:func rom:0x3604BC
+fx_45_render = 0xE005A3B0; // type:func rom:0x360670
+fx_45_appendGfx = 0xE005A3F4; // type:func rom:0x3606B4
 fx_46_main = 0xE005C000; // type:func rom:0x360F40
-func_E005C178 = 0xE005C178; // type:func rom:0x3610B8
-func_E005C180 = 0xE005C180; // type:func rom:0x3610C0
-func_E005C2B4 = 0xE005C2B4; // type:func rom:0x3611F4
-func_E005C2F8 = 0xE005C2F8; // type:func rom:0x361238
+fx_46_init = 0xE005C178; // type:func rom:0x3610B8
+fx_46_update = 0xE005C180; // type:func rom:0x3610C0
+fx_46_render = 0xE005C2B4; // type:func rom:0x3611F4
+fx_46_appendGfx = 0xE005C2F8; // type:func rom:0x361238
 fx_47_main = 0xE005E000; // type:func rom:0x3625C0
-func_E005E1B0 = 0xE005E1B0; // type:func rom:0x362770
-func_E005E1B8 = 0xE005E1B8; // type:func rom:0x362778
-func_E005E310 = 0xE005E310; // type:func rom:0x3628D0
+fx_47_init = 0xE005E1B0; // type:func rom:0x362770
+fx_47_update = 0xE005E1B8; // type:func rom:0x362778
+fx_47_render = 0xE005E310; // type:func rom:0x3628D0
 func_E005E318 = 0xE005E318; // type:func rom:0x3628D8
 func_E005E334 = 0xE005E334; // type:func rom:0x3628F4
 fx_48_main = 0xE0060000; // type:func rom:0x363160
-func_E00601D8 = 0xE00601D8; // type:func rom:0x363338
-func_E00601E0 = 0xE00601E0; // type:func rom:0x363340
-func_E006040C = 0xE006040C; // type:func rom:0x36356C
-func_E0060450 = 0xE0060450; // type:func rom:0x3635B0
+fx_48_init = 0xE00601D8; // type:func rom:0x363338
+fx_48_update = 0xE00601E0; // type:func rom:0x363340
+fx_48_render = 0xE006040C; // type:func rom:0x36356C
+fx_48_appendGfx = 0xE0060450; // type:func rom:0x3635B0
 fx_49_main = 0xE0062000; // type:func rom:0x364300
-func_E0062218 = 0xE0062218; // type:func rom:0x364518
-func_E0062220 = 0xE0062220; // type:func rom:0x364520
-func_E00624A8 = 0xE00624A8; // type:func rom:0x3647A8
-func_E00624EC = 0xE00624EC; // type:func rom:0x3647EC
+fx_49_init = 0xE0062218; // type:func rom:0x364518
+fx_49_update = 0xE0062220; // type:func rom:0x364520
+fx_49_render = 0xE00624A8; // type:func rom:0x3647A8
+fx_49_appendGfx = 0xE00624EC; // type:func rom:0x3647EC
 fx_50_main = 0xE0064000; // type:func rom:0x364F10
-func_E006419C = 0xE006419C; // type:func rom:0x3650AC
-func_E00641A4 = 0xE00641A4; // type:func rom:0x3650B4
-func_E00643DC = 0xE00643DC; // type:func rom:0x3652EC
-func_E0064414 = 0xE0064414; // type:func rom:0x365324
+fx_50_init = 0xE006419C; // type:func rom:0x3650AC
+fx_50_update = 0xE00641A4; // type:func rom:0x3650B4
+fx_50_render = 0xE00643DC; // type:func rom:0x3652EC
+fx_50_appendGfx = 0xE0064414; // type:func rom:0x365324
 fx_51_main = 0xE0066000; // type:func rom:0x366030
-func_E0066490 = 0xE0066490; // type:func rom:0x3664C0
-func_E0066498 = 0xE0066498; // type:func rom:0x3664C8
-func_E006672C = 0xE006672C; // type:func rom:0x36675C
-func_E0066770 = 0xE0066770; // type:func rom:0x3667A0
+fx_51_init = 0xE0066490; // type:func rom:0x3664C0
+fx_51_update = 0xE0066498; // type:func rom:0x3664C8
+fx_51_render = 0xE006672C; // type:func rom:0x36675C
+fx_51_appendGfx = 0xE0066770; // type:func rom:0x3667A0
 fx_52_main = 0xE0068000; // type:func rom:0x36A8D0
-func_E0068140 = 0xE0068140; // type:func rom:0x36AA10
-func_E0068148 = 0xE0068148; // type:func rom:0x36AA18
-func_E00681D8 = 0xE00681D8; // type:func rom:0x36AAA8
-func_E0068234 = 0xE0068234; // type:func rom:0x36AB04
+fx_52_init = 0xE0068140; // type:func rom:0x36AA10
+fx_52_update = 0xE0068148; // type:func rom:0x36AA18
+fx_52_render = 0xE00681D8; // type:func rom:0x36AAA8
+fx_52_appendGfx = 0xE0068234; // type:func rom:0x36AB04
 func_E006A000 = 0xE006A000; // type:func rom:0x36D020
 func_E006A0BC = 0xE006A0BC; // type:func rom:0x36D0DC
 fx_53_main = 0xE006A1E8; // type:func rom:0x36D208
-func_E006A45C = 0xE006A45C; // type:func rom:0x36D47C
+fx_53_init = 0xE006A45C; // type:func rom:0x36D47C
 func_E006A464 = 0xE006A464; // type:func rom:0x36D484
-func_E006A580 = 0xE006A580; // type:func rom:0x36D5A0
-func_E006A814 = 0xE006A814; // type:func rom:0x36D834
+fx_53_update = 0xE006A580; // type:func rom:0x36D5A0
+fx_53_render = 0xE006A814; // type:func rom:0x36D834
 func_E006A85C = 0xE006A85C; // type:func rom:0x36D87C
-func_E006A94C = 0xE006A94C; // type:func rom:0x36D96C
+fx_53_appendGfx = 0xE006A94C; // type:func rom:0x36D96C
 fx_54_main = 0xE006C000; // type:func rom:0x36E1D0
-func_E006C298 = 0xE006C298; // type:func rom:0x36E468
-func_E006C2A0 = 0xE006C2A0; // type:func rom:0x36E470
-func_E006C5A0 = 0xE006C5A0; // type:func rom:0x36E770
-func_E006C5E8 = 0xE006C5E8; // type:func rom:0x36E7B8
+fx_54_init = 0xE006C298; // type:func rom:0x36E468
+fx_54_update = 0xE006C2A0; // type:func rom:0x36E470
+fx_54_render = 0xE006C5A0; // type:func rom:0x36E770
+fx_54_appendGfx = 0xE006C5E8; // type:func rom:0x36E7B8
 fx_55_main = 0xE006E000; // type:func rom:0x372790
-func_E006E354 = 0xE006E354; // type:func rom:0x372AE4
-func_E006E35C = 0xE006E35C; // type:func rom:0x372AEC
-func_E006E6E4 = 0xE006E6E4; // type:func rom:0x372E74
-func_E006E764 = 0xE006E764; // type:func rom:0x372EF4
+fx_55_init = 0xE006E354; // type:func rom:0x372AE4
+fx_55_update = 0xE006E35C; // type:func rom:0x372AEC
+fx_55_render = 0xE006E6E4; // type:func rom:0x372E74
+fx_55_appendGfx = 0xE006E764; // type:func rom:0x372EF4
 fx_56_main = 0xE0070000; // type:func rom:0x3740B0
-func_E00701EC = 0xE00701EC; // type:func rom:0x37429C
-func_E00701F4 = 0xE00701F4; // type:func rom:0x3742A4
-func_E00706F0 = 0xE00706F0; // type:func rom:0x3747A0
+fx_56_init = 0xE00701EC; // type:func rom:0x37429C
+fx_56_update = 0xE00701F4; // type:func rom:0x3742A4
+fx_56_render = 0xE00706F0; // type:func rom:0x3747A0
 func_E0070738 = 0xE0070738; // type:func rom:0x3747E8
-func_E0070740 = 0xE0070740; // type:func rom:0x3747F0
+fx_56_appendGfx = 0xE0070740; // type:func rom:0x3747F0
 fx_57_main = 0xE0072000; // type:func rom:0x374E50
-func_E0072148 = 0xE0072148; // type:func rom:0x374F98
-func_E0072150 = 0xE0072150; // type:func rom:0x374FA0
-func_E007238C = 0xE007238C; // type:func rom:0x3751DC
-func_E00723D4 = 0xE00723D4; // type:func rom:0x375224
+fx_57_init = 0xE0072148; // type:func rom:0x374F98
+fx_57_update = 0xE0072150; // type:func rom:0x374FA0
+fx_57_render = 0xE007238C; // type:func rom:0x3751DC
+fx_57_appendGfx = 0xE00723D4; // type:func rom:0x375224
 fx_58_main = 0xE0074000; // type:func rom:0x376460
-func_E00741E0 = 0xE00741E0; // type:func rom:0x376640
-func_E00741E8 = 0xE00741E8; // type:func rom:0x376648
-func_E0074598 = 0xE0074598; // type:func rom:0x3769F8
-func_E00745E0 = 0xE00745E0; // type:func rom:0x376A40
+fx_58_init = 0xE00741E0; // type:func rom:0x376640
+fx_58_update = 0xE00741E8; // type:func rom:0x376648
+fx_58_render = 0xE0074598; // type:func rom:0x3769F8
+fx_58_appendGfx = 0xE00745E0; // type:func rom:0x376A40
 fx_59_main = 0xE0076000; // type:func rom:0x377070
-func_E0076370 = 0xE0076370; // type:func rom:0x3773E0
-func_E0076378 = 0xE0076378; // type:func rom:0x3773E8
-func_E0076808 = 0xE0076808; // type:func rom:0x377878
+fx_59_init = 0xE0076370; // type:func rom:0x3773E0
+fx_59_update = 0xE0076378; // type:func rom:0x3773E8
+fx_59_render = 0xE0076808; // type:func rom:0x377878
 func_E007684C = 0xE007684C; // type:func rom:0x3778BC
 func_E0076854 = 0xE0076854; // type:func rom:0x3778C4
-func_E007685C = 0xE007685C; // type:func rom:0x3778CC
+fx_59_appendGfx = 0xE007685C; // type:func rom:0x3778CC
 fx_60_main = 0xE0078000; // type:func rom:0x37A3F0
-func_E0078124 = 0xE0078124; // type:func rom:0x37A514
-func_E007812C = 0xE007812C; // type:func rom:0x37A51C
-func_E0078210 = 0xE0078210; // type:func rom:0x37A600
+fx_60_init = 0xE0078124; // type:func rom:0x37A514
+fx_60_update = 0xE007812C; // type:func rom:0x37A51C
+fx_60_render = 0xE0078210; // type:func rom:0x37A600
 func_E0078274 = 0xE0078274; // type:func rom:0x37A664
-func_E007827C = 0xE007827C; // type:func rom:0x37A66C
+fx_60_appendGfx = 0xE007827C; // type:func rom:0x37A66C
 fx_61_main = 0xE007A000; // type:func rom:0x37C540
-func_E007A504 = 0xE007A504; // type:func rom:0x37CA44
-func_E007A50C = 0xE007A50C; // type:func rom:0x37CA4C
-func_E007A840 = 0xE007A840; // type:func rom:0x37CD80
+fx_61_init = 0xE007A504; // type:func rom:0x37CA44
+fx_61_update = 0xE007A50C; // type:func rom:0x37CA4C
+fx_61_render = 0xE007A840; // type:func rom:0x37CD80
 func_E007A884 = 0xE007A884; // type:func rom:0x37CDC4
-func_E007A88C = 0xE007A88C; // type:func rom:0x37CDCC
+fx_61_appendGfx = 0xE007A88C; // type:func rom:0x37CDCC
 fx_62_main = 0xE007C000; // type:func rom:0x37D490
-func_E007C128 = 0xE007C128; // type:func rom:0x37D5B8
-func_E007C130 = 0xE007C130; // type:func rom:0x37D5C0
-func_E007C1B0 = 0xE007C1B0; // type:func rom:0x37D640
-func_E007C1F4 = 0xE007C1F4; // type:func rom:0x37D684
+fx_62_init = 0xE007C128; // type:func rom:0x37D5B8
+fx_62_update = 0xE007C130; // type:func rom:0x37D5C0
+fx_62_render = 0xE007C1B0; // type:func rom:0x37D640
+fx_62_appendGfx = 0xE007C1F4; // type:func rom:0x37D684
 fx_63_main = 0xE007E000; // type:func rom:0x37F720
-func_E007E1FC = 0xE007E1FC; // type:func rom:0x37F91C
-func_E007E204 = 0xE007E204; // type:func rom:0x37F924
-func_E007E508 = 0xE007E508; // type:func rom:0x37FC28
-func_E007E54C = 0xE007E54C; // type:func rom:0x37FC6C
+fx_63_init = 0xE007E1FC; // type:func rom:0x37F91C
+fx_63_update = 0xE007E204; // type:func rom:0x37F924
+fx_63_render = 0xE007E508; // type:func rom:0x37FC28
+fx_63_appendGfx = 0xE007E54C; // type:func rom:0x37FC6C
 fx_64_main = 0xE0080000; // type:func rom:0x3812C0
-func_E00801C8 = 0xE00801C8; // type:func rom:0x381488
-func_E00801D0 = 0xE00801D0; // type:func rom:0x381490
-func_E0080424 = 0xE0080424; // type:func rom:0x3816E4
+fx_64_init = 0xE00801C8; // type:func rom:0x381488
+fx_64_update = 0xE00801D0; // type:func rom:0x381490
+fx_64_render = 0xE0080424; // type:func rom:0x3816E4
 func_E008042C = 0xE008042C; // type:func rom:0x3816EC
 func_E0080448 = 0xE0080448; // type:func rom:0x381708
 fx_65_main = 0xE0082000; // type:func rom:0x385640
-func_E00821B0 = 0xE00821B0; // type:func rom:0x3857F0
-func_E00821B8 = 0xE00821B8; // type:func rom:0x3857F8
-func_E0082520 = 0xE0082520; // type:func rom:0x385B60
+fx_65_init = 0xE00821B0; // type:func rom:0x3857F0
+fx_65_update = 0xE00821B8; // type:func rom:0x3857F8
+fx_65_render = 0xE0082520; // type:func rom:0x385B60
 func_E0082528 = 0xE0082528; // type:func rom:0x385B68
 func_E0082580 = 0xE0082580; // type:func rom:0x385BC0
 func_E00826C4 = 0xE00826C4; // type:func rom:0x385D04
@@ -5218,380 +5294,380 @@ func_E0084000 = 0xE0084000; // type:func rom:0x3889D0
 func_E008403C = 0xE008403C; // type:func rom:0x388A0C
 func_E0084060 = 0xE0084060; // type:func rom:0x388A30
 fx_66_main = 0xE0084084; // type:func rom:0x388A54
-func_E0084658 = 0xE0084658; // type:func rom:0x389028
-func_E0084660 = 0xE0084660; // type:func rom:0x389030
-func_E00848E4 = 0xE00848E4; // type:func rom:0x3892B4
-func_E0084928 = 0xE0084928; // type:func rom:0x3892F8
+fx_66_init = 0xE0084658; // type:func rom:0x389028
+fx_66_update = 0xE0084660; // type:func rom:0x389030
+fx_66_render = 0xE00848E4; // type:func rom:0x3892B4
+fx_66_appendGfx = 0xE0084928; // type:func rom:0x3892F8
 fx_67_main = 0xE0086000; // type:func rom:0x389850
-func_E0086270 = 0xE0086270; // type:func rom:0x389AC0
-func_E0086278 = 0xE0086278; // type:func rom:0x389AC8
-func_E0086390 = 0xE0086390; // type:func rom:0x389BE0
+fx_67_init = 0xE0086270; // type:func rom:0x389AC0
+fx_67_update = 0xE0086278; // type:func rom:0x389AC8
+fx_67_render = 0xE0086390; // type:func rom:0x389BE0
 func_E0086398 = 0xE0086398; // type:func rom:0x389BE8
 func_E00863B4 = 0xE00863B4; // type:func rom:0x389C04
 func_E0088000 = 0xE0088000; // type:func rom:0x38ADF0
 fx_68_main = 0xE008817C; // type:func rom:0x38AF6C
-func_E00885A0 = 0xE00885A0; // type:func rom:0x38B390
-func_E00885A8 = 0xE00885A8; // type:func rom:0x38B398
-func_E00887A8 = 0xE00887A8; // type:func rom:0x38B598
-func_E00887E0 = 0xE00887E0; // type:func rom:0x38B5D0
+fx_68_init = 0xE00885A0; // type:func rom:0x38B390
+fx_68_update = 0xE00885A8; // type:func rom:0x38B398
+fx_68_render = 0xE00887A8; // type:func rom:0x38B598
+fx_68_appendGfx = 0xE00887E0; // type:func rom:0x38B5D0
 func_E008A000 = 0xE008A000; // type:func rom:0x38C5F0
 fx_69_main = 0xE008A188; // type:func rom:0x38C778
-func_E008A288 = 0xE008A288; // type:func rom:0x38C878
+fx_69_init = 0xE008A288; // type:func rom:0x38C878
 func_E008A290 = 0xE008A290; // type:func rom:0x38C880
-func_E008A53C = 0xE008A53C; // type:func rom:0x38CB2C
-func_E008A6E4 = 0xE008A6E4; // type:func rom:0x38CCD4
-func_E008A728 = 0xE008A728; // type:func rom:0x38CD18
+fx_69_update = 0xE008A53C; // type:func rom:0x38CB2C
+fx_69_render = 0xE008A6E4; // type:func rom:0x38CCD4
+fx_69_appendGfx = 0xE008A728; // type:func rom:0x38CD18
 fx_70_main = 0xE008C000; // type:func rom:0x38DE00
-func_E008C3F4 = 0xE008C3F4; // type:func rom:0x38E1F4
-func_E008C3FC = 0xE008C3FC; // type:func rom:0x38E1FC
-func_E008C6B8 = 0xE008C6B8; // type:func rom:0x38E4B8
-func_E008C6FC = 0xE008C6FC; // type:func rom:0x38E4FC
+fx_70_init = 0xE008C3F4; // type:func rom:0x38E1F4
+fx_70_update = 0xE008C3FC; // type:func rom:0x38E1FC
+fx_70_render = 0xE008C6B8; // type:func rom:0x38E4B8
+fx_70_appendGfx = 0xE008C6FC; // type:func rom:0x38E4FC
 fx_71_main = 0xE008E000; // type:func rom:0x38EE60
-func_E008E1FC = 0xE008E1FC; // type:func rom:0x38F05C
-func_E008E204 = 0xE008E204; // type:func rom:0x38F064
-func_E008E498 = 0xE008E498; // type:func rom:0x38F2F8
-func_E008E4E0 = 0xE008E4E0; // type:func rom:0x38F340
+fx_71_init = 0xE008E1FC; // type:func rom:0x38F05C
+fx_71_update = 0xE008E204; // type:func rom:0x38F064
+fx_71_render = 0xE008E498; // type:func rom:0x38F2F8
+fx_71_appendGfx = 0xE008E4E0; // type:func rom:0x38F340
 fx_72_main = 0xE0090000; // type:func rom:0x38F900
-func_E00901C0 = 0xE00901C0; // type:func rom:0x38FAC0
-func_E00901C8 = 0xE00901C8; // type:func rom:0x38FAC8
-func_E0090420 = 0xE0090420; // type:func rom:0x38FD20
+fx_72_init = 0xE00901C0; // type:func rom:0x38FAC0
+fx_72_update = 0xE00901C8; // type:func rom:0x38FAC8
+fx_72_render = 0xE0090420; // type:func rom:0x38FD20
 func_E0090428 = 0xE0090428; // type:func rom:0x38FD28
 func_E0090444 = 0xE0090444; // type:func rom:0x38FD44
 fx_73_main = 0xE0092000; // type:func rom:0x391D30
-func_E00921AC = 0xE00921AC; // type:func rom:0x391EDC
-func_E00921B4 = 0xE00921B4; // type:func rom:0x391EE4
-func_E0092258 = 0xE0092258; // type:func rom:0x391F88
-func_E00922A0 = 0xE00922A0; // type:func rom:0x391FD0
+fx_73_init = 0xE00921AC; // type:func rom:0x391EDC
+fx_73_update = 0xE00921B4; // type:func rom:0x391EE4
+fx_73_render = 0xE0092258; // type:func rom:0x391F88
+fx_73_appendGfx = 0xE00922A0; // type:func rom:0x391FD0
 fx_74_main = 0xE0094000; // type:func rom:0x3928D0
-func_E0094190 = 0xE0094190; // type:func rom:0x392A60
-func_E0094198 = 0xE0094198; // type:func rom:0x392A68
-func_E00942C0 = 0xE00942C0; // type:func rom:0x392B90
-func_E00942FC = 0xE00942FC; // type:func rom:0x392BCC
+fx_74_init = 0xE0094190; // type:func rom:0x392A60
+fx_74_update = 0xE0094198; // type:func rom:0x392A68
+fx_74_render = 0xE00942C0; // type:func rom:0x392B90
+fx_74_appendGfx = 0xE00942FC; // type:func rom:0x392BCC
 fx_75_main = 0xE0096000; // type:func rom:0x394280
-func_E00960EC = 0xE00960EC; // type:func rom:0x39436C
-func_E00960F4 = 0xE00960F4; // type:func rom:0x394374
-func_E0096178 = 0xE0096178; // type:func rom:0x3943F8
-func_E00961BC = 0xE00961BC; // type:func rom:0x39443C
+fx_75_init = 0xE00960EC; // type:func rom:0x39436C
+fx_75_update = 0xE00960F4; // type:func rom:0x394374
+fx_75_render = 0xE0096178; // type:func rom:0x3943F8
+fx_75_appendGfx = 0xE00961BC; // type:func rom:0x39443C
 fx_76_main = 0xE0098000; // type:func rom:0x395BB0
-func_E0098168 = 0xE0098168; // type:func rom:0x395D18
-func_E0098170 = 0xE0098170; // type:func rom:0x395D20
-func_E009829C = 0xE009829C; // type:func rom:0x395E4C
-func_E00982EC = 0xE00982EC; // type:func rom:0x395E9C
+fx_76_init = 0xE0098168; // type:func rom:0x395D18
+fx_76_update = 0xE0098170; // type:func rom:0x395D20
+fx_76_render = 0xE009829C; // type:func rom:0x395E4C
+fx_76_appendGfx = 0xE00982EC; // type:func rom:0x395E9C
 fx_77_main = 0xE009A000; // type:func rom:0x3965B0
-func_E009A138 = 0xE009A138; // type:func rom:0x3966E8
-func_E009A140 = 0xE009A140; // type:func rom:0x3966F0
-func_E009A398 = 0xE009A398; // type:func rom:0x396948
-func_E009A3E0 = 0xE009A3E0; // type:func rom:0x396990
+fx_77_init = 0xE009A138; // type:func rom:0x3966E8
+fx_77_update = 0xE009A140; // type:func rom:0x3966F0
+fx_77_render = 0xE009A398; // type:func rom:0x396948
+fx_77_appendGfx = 0xE009A3E0; // type:func rom:0x396990
 fx_78_main = 0xE009C000; // type:func rom:0x3981F0
-func_E009C100 = 0xE009C100; // type:func rom:0x3982F0
-func_E009C108 = 0xE009C108; // type:func rom:0x3982F8
-func_E009C1DC = 0xE009C1DC; // type:func rom:0x3983CC
-func_E009C220 = 0xE009C220; // type:func rom:0x398410
+fx_78_init = 0xE009C100; // type:func rom:0x3982F0
+fx_78_update = 0xE009C108; // type:func rom:0x3982F8
+fx_78_render = 0xE009C1DC; // type:func rom:0x3983CC
+fx_78_appendGfx = 0xE009C220; // type:func rom:0x398410
 fx_79_main = 0xE009E000; // type:func rom:0x39FF20
-func_E009E1DC = 0xE009E1DC; // type:func rom:0x3A00FC
-func_E009E1E4 = 0xE009E1E4; // type:func rom:0x3A0104
-func_E009E3DC = 0xE009E3DC; // type:func rom:0x3A02FC
-func_E009E424 = 0xE009E424; // type:func rom:0x3A0344
+fx_79_init = 0xE009E1DC; // type:func rom:0x3A00FC
+fx_79_update = 0xE009E1E4; // type:func rom:0x3A0104
+fx_79_render = 0xE009E3DC; // type:func rom:0x3A02FC
+fx_79_appendGfx = 0xE009E424; // type:func rom:0x3A0344
 fx_80_main = 0xE00A0000; // type:func rom:0x3A2290
 fx_81_main = 0xE00A2000; // type:func rom:0x3A2990
-func_E00A2118 = 0xE00A2118; // type:func rom:0x3A2AA8
-func_E00A2120 = 0xE00A2120; // type:func rom:0x3A2AB0
-func_E00A21EC = 0xE00A21EC; // type:func rom:0x3A2B7C
+fx_81_init = 0xE00A2118; // type:func rom:0x3A2AA8
+fx_81_update = 0xE00A2120; // type:func rom:0x3A2AB0
+fx_81_render = 0xE00A21EC; // type:func rom:0x3A2B7C
 func_E00A2234 = 0xE00A2234; // type:func rom:0x3A2BC4
-func_E00A223C = 0xE00A223C; // type:func rom:0x3A2BCC
+fx_81_appendGfx = 0xE00A223C; // type:func rom:0x3A2BCC
 fx_82_main = 0xE00A4000; // type:func rom:0x3A37E0
-func_E00A41A4 = 0xE00A41A4; // type:func rom:0x3A3984
-func_E00A41AC = 0xE00A41AC; // type:func rom:0x3A398C
-func_E00A45DC = 0xE00A45DC; // type:func rom:0x3A3DBC
+fx_82_init = 0xE00A41A4; // type:func rom:0x3A3984
+fx_82_update = 0xE00A41AC; // type:func rom:0x3A398C
+fx_82_render = 0xE00A45DC; // type:func rom:0x3A3DBC
 func_E00A4648 = 0xE00A4648; // type:func rom:0x3A3E28
-func_E00A4650 = 0xE00A4650; // type:func rom:0x3A3E30
+fx_82_appendGfx = 0xE00A4650; // type:func rom:0x3A3E30
 fx_83_main = 0xE00A6000; // type:func rom:0x3A5550
-func_E00A611C = 0xE00A611C; // type:func rom:0x3A566C
-func_E00A6124 = 0xE00A6124; // type:func rom:0x3A5674
-func_E00A6358 = 0xE00A6358; // type:func rom:0x3A58A8
+fx_83_init = 0xE00A611C; // type:func rom:0x3A566C
+fx_83_update = 0xE00A6124; // type:func rom:0x3A5674
+fx_83_render = 0xE00A6358; // type:func rom:0x3A58A8
 func_E00A639C = 0xE00A639C; // type:func rom:0x3A58EC
-func_E00A63A4 = 0xE00A63A4; // type:func rom:0x3A58F4
+fx_83_appendGfx = 0xE00A63A4; // type:func rom:0x3A58F4
 fx_84_main = 0xE00A8000; // type:func rom:0x3A70F0
-func_E00A80FC = 0xE00A80FC; // type:func rom:0x3A71EC
-func_E00A8104 = 0xE00A8104; // type:func rom:0x3A71F4
-func_E00A82D4 = 0xE00A82D4; // type:func rom:0x3A73C4
+fx_84_init = 0xE00A80FC; // type:func rom:0x3A71EC
+fx_84_update = 0xE00A8104; // type:func rom:0x3A71F4
+fx_84_render = 0xE00A82D4; // type:func rom:0x3A73C4
 func_E00A8318 = 0xE00A8318; // type:func rom:0x3A7408
-func_E00A8320 = 0xE00A8320; // type:func rom:0x3A7410
+fx_84_appendGfx = 0xE00A8320; // type:func rom:0x3A7410
 fx_85_main = 0xE00AA000; // type:func rom:0x3AA920
-func_E00AA104 = 0xE00AA104; // type:func rom:0x3AAA24
-func_E00AA10C = 0xE00AA10C; // type:func rom:0x3AAA2C
-func_E00AA3C0 = 0xE00AA3C0; // type:func rom:0x3AACE0
-func_E00AA404 = 0xE00AA404; // type:func rom:0x3AAD24
+fx_85_init = 0xE00AA104; // type:func rom:0x3AAA24
+fx_85_update = 0xE00AA10C; // type:func rom:0x3AAA2C
+fx_85_render = 0xE00AA3C0; // type:func rom:0x3AACE0
+fx_85_appendGfx = 0xE00AA404; // type:func rom:0x3AAD24
 fx_86_main = 0xE00AC000; // type:func rom:0x3AEE20
-func_E00AC11C = 0xE00AC11C; // type:func rom:0x3AEF3C
-func_E00AC124 = 0xE00AC124; // type:func rom:0x3AEF44
-func_E00AC280 = 0xE00AC280; // type:func rom:0x3AF0A0
+fx_86_init = 0xE00AC11C; // type:func rom:0x3AEF3C
+fx_86_update = 0xE00AC124; // type:func rom:0x3AEF44
+fx_86_render = 0xE00AC280; // type:func rom:0x3AF0A0
 func_E00AC288 = 0xE00AC288; // type:func rom:0x3AF0A8
 func_E00AC2A4 = 0xE00AC2A4; // type:func rom:0x3AF0C4
 fx_87_main = 0xE00AE000; // type:func rom:0x3B2350
-func_E00AE1AC = 0xE00AE1AC; // type:func rom:0x3B24FC
-func_E00AE1B4 = 0xE00AE1B4; // type:func rom:0x3B2504
-func_E00AE4FC = 0xE00AE4FC; // type:func rom:0x3B284C
+fx_87_init = 0xE00AE1AC; // type:func rom:0x3B24FC
+fx_87_update = 0xE00AE1B4; // type:func rom:0x3B2504
+fx_87_render = 0xE00AE4FC; // type:func rom:0x3B284C
 func_E00AE544 = 0xE00AE544; // type:func rom:0x3B2894
-func_E00AE54C = 0xE00AE54C; // type:func rom:0x3B289C
+fx_87_appendGfx = 0xE00AE54C; // type:func rom:0x3B289C
 fx_88_main = 0xE00B0000; // type:func rom:0x3B3EB0
-func_E00B011C = 0xE00B011C; // type:func rom:0x3B3FCC
-func_E00B0124 = 0xE00B0124; // type:func rom:0x3B3FD4
-func_E00B01F8 = 0xE00B01F8; // type:func rom:0x3B40A8
-func_E00B0234 = 0xE00B0234; // type:func rom:0x3B40E4
+fx_88_init = 0xE00B011C; // type:func rom:0x3B3FCC
+fx_88_update = 0xE00B0124; // type:func rom:0x3B3FD4
+fx_88_render = 0xE00B01F8; // type:func rom:0x3B40A8
+fx_88_appendGfx = 0xE00B0234; // type:func rom:0x3B40E4
 fx_89_main = 0xE00B2000; // type:func rom:0x3B4790
-func_E00B21DC = 0xE00B21DC; // type:func rom:0x3B496C
-func_E00B21E4 = 0xE00B21E4; // type:func rom:0x3B4974
-func_E00B2460 = 0xE00B2460; // type:func rom:0x3B4BF0
+fx_89_init = 0xE00B21DC; // type:func rom:0x3B496C
+fx_89_update = 0xE00B21E4; // type:func rom:0x3B4974
+fx_89_render = 0xE00B2460; // type:func rom:0x3B4BF0
 func_E00B24A8 = 0xE00B24A8; // type:func rom:0x3B4C38
-func_E00B24B0 = 0xE00B24B0; // type:func rom:0x3B4C40
+fx_89_appendGfx = 0xE00B24B0; // type:func rom:0x3B4C40
 fx_90_main = 0xE00B4000; // type:func rom:0x3B5CF0
-func_E00B4134 = 0xE00B4134; // type:func rom:0x3B5E24
-func_E00B413C = 0xE00B413C; // type:func rom:0x3B5E2C
-func_E00B452C = 0xE00B452C; // type:func rom:0x3B621C
+fx_90_init = 0xE00B4134; // type:func rom:0x3B5E24
+fx_90_update = 0xE00B413C; // type:func rom:0x3B5E2C
+fx_90_render = 0xE00B452C; // type:func rom:0x3B621C
 func_E00B4574 = 0xE00B4574; // type:func rom:0x3B6264
-func_E00B457C = 0xE00B457C; // type:func rom:0x3B626C
+fx_90_appendGfx = 0xE00B457C; // type:func rom:0x3B626C
 fx_91_main = 0xE00B6000; // type:func rom:0x3B7160
-func_E00B6178 = 0xE00B6178; // type:func rom:0x3B72D8
-func_E00B6180 = 0xE00B6180; // type:func rom:0x3B72E0
-func_E00B629C = 0xE00B629C; // type:func rom:0x3B73FC
+fx_91_init = 0xE00B6178; // type:func rom:0x3B72D8
+fx_91_update = 0xE00B6180; // type:func rom:0x3B72E0
+fx_91_render = 0xE00B629C; // type:func rom:0x3B73FC
 func_E00B62D8 = 0xE00B62D8; // type:func rom:0x3B7438
-func_E00B62E0 = 0xE00B62E0; // type:func rom:0x3B7440
+fx_91_appendGfx = 0xE00B62E0; // type:func rom:0x3B7440
 fx_92_main = 0xE00B8000; // type:func rom:0x3B7B80
-func_E00B812C = 0xE00B812C; // type:func rom:0x3B7CAC
-func_E00B8134 = 0xE00B8134; // type:func rom:0x3B7CB4
-func_E00B81B8 = 0xE00B81B8; // type:func rom:0x3B7D38
+fx_92_init = 0xE00B812C; // type:func rom:0x3B7CAC
+fx_92_update = 0xE00B8134; // type:func rom:0x3B7CB4
+fx_92_render = 0xE00B81B8; // type:func rom:0x3B7D38
 func_E00B8200 = 0xE00B8200; // type:func rom:0x3B7D80
-func_E00B8208 = 0xE00B8208; // type:func rom:0x3B7D88
+fx_92_appendGfx = 0xE00B8208; // type:func rom:0x3B7D88
 fx_93_main = 0xE00BA000; // type:func rom:0x3B8BD0
-func_E00BA16C = 0xE00BA16C; // type:func rom:0x3B8D3C
-func_E00BA174 = 0xE00BA174; // type:func rom:0x3B8D44
-func_E00BA5DC = 0xE00BA5DC; // type:func rom:0x3B91AC
+fx_93_init = 0xE00BA16C; // type:func rom:0x3B8D3C
+fx_93_update = 0xE00BA174; // type:func rom:0x3B8D44
+fx_93_render = 0xE00BA5DC; // type:func rom:0x3B91AC
 func_E00BA618 = 0xE00BA618; // type:func rom:0x3B91E8
-func_E00BA620 = 0xE00BA620; // type:func rom:0x3B91F0
+fx_93_appendGfx = 0xE00BA620; // type:func rom:0x3B91F0
 fx_94_main = 0xE00BC000; // type:func rom:0x3BA030
-func_E00BC1D0 = 0xE00BC1D0; // type:func rom:0x3BA200
+fx_94_init = 0xE00BC1D0; // type:func rom:0x3BA200
 func_E00BC1D8 = 0xE00BC1D8; // type:func rom:0x3BA208
-func_E00BC238 = 0xE00BC238; // type:func rom:0x3BA268
-func_E00BC2E8 = 0xE00BC2E8; // type:func rom:0x3BA318
+fx_94_update = 0xE00BC238; // type:func rom:0x3BA268
+fx_94_render = 0xE00BC2E8; // type:func rom:0x3BA318
 func_E00BC36C = 0xE00BC36C; // type:func rom:0x3BA39C
-func_E00BC374 = 0xE00BC374; // type:func rom:0x3BA3A4
+fx_94_appendGfx = 0xE00BC374; // type:func rom:0x3BA3A4
 fx_95_main = 0xE00BE000; // type:func rom:0x3BBF60
-func_E00BE39C = 0xE00BE39C; // type:func rom:0x3BC2FC
-func_E00BE3A4 = 0xE00BE3A4; // type:func rom:0x3BC304
-func_E00BE578 = 0xE00BE578; // type:func rom:0x3BC4D8
+fx_95_init = 0xE00BE39C; // type:func rom:0x3BC2FC
+fx_95_update = 0xE00BE3A4; // type:func rom:0x3BC304
+fx_95_render = 0xE00BE578; // type:func rom:0x3BC4D8
 func_E00BE5B4 = 0xE00BE5B4; // type:func rom:0x3BC514
-func_E00BE5BC = 0xE00BE5BC; // type:func rom:0x3BC51C
+fx_95_appendGfx = 0xE00BE5BC; // type:func rom:0x3BC51C
 fx_96_main = 0xE00C0000; // type:func rom:0x3BCD60
-func_E00C0158 = 0xE00C0158; // type:func rom:0x3BCEB8
-func_E00C0160 = 0xE00C0160; // type:func rom:0x3BCEC0
-func_E00C0710 = 0xE00C0710; // type:func rom:0x3BD470
+fx_96_init = 0xE00C0158; // type:func rom:0x3BCEB8
+fx_96_update = 0xE00C0160; // type:func rom:0x3BCEC0
+fx_96_render = 0xE00C0710; // type:func rom:0x3BD470
 func_E00C0758 = 0xE00C0758; // type:func rom:0x3BD4B8
-func_E00C0760 = 0xE00C0760; // type:func rom:0x3BD4C0
+fx_96_appendGfx = 0xE00C0760; // type:func rom:0x3BD4C0
 fx_97_main = 0xE00C2000; // type:func rom:0x3C11D0
-func_E00C2124 = 0xE00C2124; // type:func rom:0x3C12F4
-func_E00C212C = 0xE00C212C; // type:func rom:0x3C12FC
-func_E00C21CC = 0xE00C21CC; // type:func rom:0x3C139C
+fx_97_init = 0xE00C2124; // type:func rom:0x3C12F4
+fx_97_update = 0xE00C212C; // type:func rom:0x3C12FC
+fx_97_render = 0xE00C21CC; // type:func rom:0x3C139C
 func_E00C2214 = 0xE00C2214; // type:func rom:0x3C13E4
-func_E00C221C = 0xE00C221C; // type:func rom:0x3C13EC
+fx_97_appendGfx = 0xE00C221C; // type:func rom:0x3C13EC
 fx_98_main = 0xE00C4000; // type:func rom:0x3CADF0
-func_E00C4170 = 0xE00C4170; // type:func rom:0x3CAF60
-func_E00C4178 = 0xE00C4178; // type:func rom:0x3CAF68
-func_E00C42C4 = 0xE00C42C4; // type:func rom:0x3CB0B4
+fx_98_init = 0xE00C4170; // type:func rom:0x3CAF60
+fx_98_update = 0xE00C4178; // type:func rom:0x3CAF68
+fx_98_render = 0xE00C42C4; // type:func rom:0x3CB0B4
 func_E00C4300 = 0xE00C4300; // type:func rom:0x3CB0F0
-func_E00C4308 = 0xE00C4308; // type:func rom:0x3CB0F8
+fx_98_appendGfx = 0xE00C4308; // type:func rom:0x3CB0F8
 fx_99_main = 0xE00C6000; // type:func rom:0x3CC9E0
-func_E00C6394 = 0xE00C6394; // type:func rom:0x3CCD74
-func_E00C639C = 0xE00C639C; // type:func rom:0x3CCD7C
-func_E00C6768 = 0xE00C6768; // type:func rom:0x3CD148
-func_E00C67B0 = 0xE00C67B0; // type:func rom:0x3CD190
+fx_99_init = 0xE00C6394; // type:func rom:0x3CCD74
+fx_99_update = 0xE00C639C; // type:func rom:0x3CCD7C
+fx_99_render = 0xE00C6768; // type:func rom:0x3CD148
+fx_99_appendGfx = 0xE00C67B0; // type:func rom:0x3CD190
 fx_100_main = 0xE00C8000; // type:func rom:0x3CF3A0
-func_E00C8218 = 0xE00C8218; // type:func rom:0x3CF5B8
-func_E00C8220 = 0xE00C8220; // type:func rom:0x3CF5C0
-func_E00C8404 = 0xE00C8404; // type:func rom:0x3CF7A4
+fx_100_init = 0xE00C8218; // type:func rom:0x3CF5B8
+fx_100_update = 0xE00C8220; // type:func rom:0x3CF5C0
+fx_100_render = 0xE00C8404; // type:func rom:0x3CF7A4
 func_E00C844C = 0xE00C844C; // type:func rom:0x3CF7EC
-func_E00C8454 = 0xE00C8454; // type:func rom:0x3CF7F4
+fx_100_appendGfx = 0xE00C8454; // type:func rom:0x3CF7F4
 fx_101_main = 0xE00CA000; // type:func rom:0x3D0500
-func_E00CA240 = 0xE00CA240; // type:func rom:0x3D0740
-func_E00CA248 = 0xE00CA248; // type:func rom:0x3D0748
-func_E00CA484 = 0xE00CA484; // type:func rom:0x3D0984
-func_E00CA4CC = 0xE00CA4CC; // type:func rom:0x3D09CC
+fx_101_init = 0xE00CA240; // type:func rom:0x3D0740
+fx_101_update = 0xE00CA248; // type:func rom:0x3D0748
+fx_101_render = 0xE00CA484; // type:func rom:0x3D0984
+fx_101_appendGfx = 0xE00CA4CC; // type:func rom:0x3D09CC
 fx_102_main = 0xE00CC000; // type:func rom:0x3D1690
-func_E00CC250 = 0xE00CC250; // type:func rom:0x3D18E0
-func_E00CC258 = 0xE00CC258; // type:func rom:0x3D18E8
-func_E00CC980 = 0xE00CC980; // type:func rom:0x3D2010
+fx_102_init = 0xE00CC250; // type:func rom:0x3D18E0
+fx_102_update = 0xE00CC258; // type:func rom:0x3D18E8
+fx_102_render = 0xE00CC980; // type:func rom:0x3D2010
 func_E00CC9C8 = 0xE00CC9C8; // type:func rom:0x3D2058
-func_E00CC9D0 = 0xE00CC9D0; // type:func rom:0x3D2060
+fx_102_appendGfx = 0xE00CC9D0; // type:func rom:0x3D2060
 fx_103_main = 0xE00CE000; // type:func rom:0x3D2AC0
-func_E00CE21C = 0xE00CE21C; // type:func rom:0x3D2CDC
-func_E00CE224 = 0xE00CE224; // type:func rom:0x3D2CE4
-func_E00CE428 = 0xE00CE428; // type:func rom:0x3D2EE8
+fx_103_init = 0xE00CE21C; // type:func rom:0x3D2CDC
+fx_103_update = 0xE00CE224; // type:func rom:0x3D2CE4
+fx_103_render = 0xE00CE428; // type:func rom:0x3D2EE8
 func_E00CE470 = 0xE00CE470; // type:func rom:0x3D2F30
-func_E00CE478 = 0xE00CE478; // type:func rom:0x3D2F38
+fx_103_appendGfx = 0xE00CE478; // type:func rom:0x3D2F38
 fx_104_main = 0xE00D0000; // type:func rom:0x3D3E20
-func_E00D018C = 0xE00D018C; // type:func rom:0x3D3FAC
-func_E00D0194 = 0xE00D0194; // type:func rom:0x3D3FB4
-func_E00D0448 = 0xE00D0448; // type:func rom:0x3D4268
-func_E00D048C = 0xE00D048C; // type:func rom:0x3D42AC
+fx_104_init = 0xE00D018C; // type:func rom:0x3D3FAC
+fx_104_update = 0xE00D0194; // type:func rom:0x3D3FB4
+fx_104_render = 0xE00D0448; // type:func rom:0x3D4268
+fx_104_appendGfx = 0xE00D048C; // type:func rom:0x3D42AC
 fx_105_main = 0xE00D2000; // type:func rom:0x3D4970
-func_E00D2118 = 0xE00D2118; // type:func rom:0x3D4A88
-func_E00D2120 = 0xE00D2120; // type:func rom:0x3D4A90
-func_E00D2234 = 0xE00D2234; // type:func rom:0x3D4BA4
+fx_105_init = 0xE00D2118; // type:func rom:0x3D4A88
+fx_105_update = 0xE00D2120; // type:func rom:0x3D4A90
+fx_105_render = 0xE00D2234; // type:func rom:0x3D4BA4
 func_E00D227C = 0xE00D227C; // type:func rom:0x3D4BEC
-func_E00D2284 = 0xE00D2284; // type:func rom:0x3D4BF4
+fx_105_appendGfx = 0xE00D2284; // type:func rom:0x3D4BF4
 fx_107_main = 0xE00D6000; // type:func rom:0x3D5020
-func_E00D6718 = 0xE00D6718; // type:func rom:0x3D5738
-func_E00D6720 = 0xE00D6720; // type:func rom:0x3D5740
-func_E00D693C = 0xE00D693C; // type:func rom:0x3D595C
+fx_107_init = 0xE00D6718; // type:func rom:0x3D5738
+fx_107_update = 0xE00D6720; // type:func rom:0x3D5740
+fx_107_render = 0xE00D693C; // type:func rom:0x3D595C
 func_E00D6978 = 0xE00D6978; // type:func rom:0x3D5998
-func_E00D6980 = 0xE00D6980; // type:func rom:0x3D59A0
+fx_107_appendGfx = 0xE00D6980; // type:func rom:0x3D59A0
 fx_108_main = 0xE00D8000; // type:func rom:0x3D67C0
-func_E00D8120 = 0xE00D8120; // type:func rom:0x3D68E0
-func_E00D8128 = 0xE00D8128; // type:func rom:0x3D68E8
-func_E00D825C = 0xE00D825C; // type:func rom:0x3D6A1C
+fx_108_init = 0xE00D8120; // type:func rom:0x3D68E0
+fx_108_update = 0xE00D8128; // type:func rom:0x3D68E8
+fx_108_render = 0xE00D825C; // type:func rom:0x3D6A1C
 func_E00D8264 = 0xE00D8264; // type:func rom:0x3D6A24
 func_E00D8280 = 0xE00D8280; // type:func rom:0x3D6A40
 func_E00D8288 = 0xE00D8288; // type:func rom:0x3D6A48
 func_E00D8334 = 0xE00D8334; // type:func rom:0x3D6AF4
 func_E00D8630 = 0xE00D8630; // type:func rom:0x3D6DF0
 fx_109_main = 0xE00DA000; // type:func rom:0x3D7240
-func_E00DA0FC = 0xE00DA0FC; // type:func rom:0x3D733C
-func_E00DA104 = 0xE00DA104; // type:func rom:0x3D7344
-func_E00DA1E0 = 0xE00DA1E0; // type:func rom:0x3D7420
+fx_109_init = 0xE00DA0FC; // type:func rom:0x3D733C
+fx_109_update = 0xE00DA104; // type:func rom:0x3D7344
+fx_109_render = 0xE00DA1E0; // type:func rom:0x3D7420
 func_E00DA228 = 0xE00DA228; // type:func rom:0x3D7468
-func_E00DA230 = 0xE00DA230; // type:func rom:0x3D7470
+fx_109_appendGfx = 0xE00DA230; // type:func rom:0x3D7470
 fx_110_main = 0xE00DC000; // type:func rom:0x3D7A70
-func_E00DC190 = 0xE00DC190; // type:func rom:0x3D7C00
-func_E00DC198 = 0xE00DC198; // type:func rom:0x3D7C08
-func_E00DC2C0 = 0xE00DC2C0; // type:func rom:0x3D7D30
+fx_110_init = 0xE00DC190; // type:func rom:0x3D7C00
+fx_110_update = 0xE00DC198; // type:func rom:0x3D7C08
+fx_110_render = 0xE00DC2C0; // type:func rom:0x3D7D30
 func_E00DC2FC = 0xE00DC2FC; // type:func rom:0x3D7D6C
-func_E00DC304 = 0xE00DC304; // type:func rom:0x3D7D74
+fx_110_appendGfx = 0xE00DC304; // type:func rom:0x3D7D74
 fx_111_main = 0xE00DE000; // type:func rom:0x3D8720
-func_E00DE11C = 0xE00DE11C; // type:func rom:0x3D883C
-func_E00DE124 = 0xE00DE124; // type:func rom:0x3D8844
-func_E00DE260 = 0xE00DE260; // type:func rom:0x3D8980
-func_E00DE2A8 = 0xE00DE2A8; // type:func rom:0x3D89C8
+fx_111_init = 0xE00DE11C; // type:func rom:0x3D883C
+fx_111_update = 0xE00DE124; // type:func rom:0x3D8844
+fx_111_render = 0xE00DE260; // type:func rom:0x3D8980
+fx_111_appendGfx = 0xE00DE2A8; // type:func rom:0x3D89C8
 fx_112_main = 0xE00E0000; // type:func rom:0x3DB460
-func_E00E01D0 = 0xE00E01D0; // type:func rom:0x3DB630
-func_E00E01D8 = 0xE00E01D8; // type:func rom:0x3DB638
-func_E00E05B0 = 0xE00E05B0; // type:func rom:0x3DBA10
+fx_112_init = 0xE00E01D0; // type:func rom:0x3DB630
+fx_112_update = 0xE00E01D8; // type:func rom:0x3DB638
+fx_112_render = 0xE00E05B0; // type:func rom:0x3DBA10
 func_E00E05F8 = 0xE00E05F8; // type:func rom:0x3DBA58
-func_E00E0600 = 0xE00E0600; // type:func rom:0x3DBA60
+fx_112_appendGfx = 0xE00E0600; // type:func rom:0x3DBA60
 fx_113_main = 0xE00E2000; // type:func rom:0x3DC310
-func_E00E212C = 0xE00E212C; // type:func rom:0x3DC43C
-func_E00E2134 = 0xE00E2134; // type:func rom:0x3DC444
-func_E00E21C8 = 0xE00E21C8; // type:func rom:0x3DC4D8
+fx_113_init = 0xE00E212C; // type:func rom:0x3DC43C
+fx_113_update = 0xE00E2134; // type:func rom:0x3DC444
+fx_113_render = 0xE00E21C8; // type:func rom:0x3DC4D8
 func_E00E2210 = 0xE00E2210; // type:func rom:0x3DC520
-func_E00E2218 = 0xE00E2218; // type:func rom:0x3DC528
+fx_113_appendGfx = 0xE00E2218; // type:func rom:0x3DC528
 fx_114_main = 0xE00E4000; // type:func rom:0x3DE000
-func_E00E4288 = 0xE00E4288; // type:func rom:0x3DE288
-func_E00E4290 = 0xE00E4290; // type:func rom:0x3DE290
-func_E00E490C = 0xE00E490C; // type:func rom:0x3DE90C
+fx_114_init = 0xE00E4288; // type:func rom:0x3DE288
+fx_114_update = 0xE00E4290; // type:func rom:0x3DE290
+fx_114_render = 0xE00E490C; // type:func rom:0x3DE90C
 func_E00E4954 = 0xE00E4954; // type:func rom:0x3DE954
-func_E00E495C = 0xE00E495C; // type:func rom:0x3DE95C
+fx_114_appendGfx = 0xE00E495C; // type:func rom:0x3DE95C
 fx_115_main = 0xE00E6000; // type:func rom:0x3E0930
-func_E00E617C = 0xE00E617C; // type:func rom:0x3E0AAC
-func_E00E6184 = 0xE00E6184; // type:func rom:0x3E0AB4
-func_E00E64D4 = 0xE00E64D4; // type:func rom:0x3E0E04
+fx_115_init = 0xE00E617C; // type:func rom:0x3E0AAC
+fx_115_update = 0xE00E6184; // type:func rom:0x3E0AB4
+fx_115_render = 0xE00E64D4; // type:func rom:0x3E0E04
 func_E00E651C = 0xE00E651C; // type:func rom:0x3E0E4C
-func_E00E6524 = 0xE00E6524; // type:func rom:0x3E0E54
+fx_115_appendGfx = 0xE00E6524; // type:func rom:0x3E0E54
 fx_116_main = 0xE00E8000; // type:func rom:0x3E1690
-func_E00E825C = 0xE00E825C; // type:func rom:0x3E18EC
-func_E00E8264 = 0xE00E8264; // type:func rom:0x3E18F4
-func_E00E8374 = 0xE00E8374; // type:func rom:0x3E1A04
-func_E00E83BC = 0xE00E83BC; // type:func rom:0x3E1A4C
+fx_116_init = 0xE00E825C; // type:func rom:0x3E18EC
+fx_116_update = 0xE00E8264; // type:func rom:0x3E18F4
+fx_116_render = 0xE00E8374; // type:func rom:0x3E1A04
+fx_116_appendGfx = 0xE00E83BC; // type:func rom:0x3E1A4C
 fx_117_main = 0xE00EA000; // type:func rom:0x3E1EE0
-func_E00EA190 = 0xE00EA190; // type:func rom:0x3E2070
-func_E00EA198 = 0xE00EA198; // type:func rom:0x3E2078
-func_E00EA520 = 0xE00EA520; // type:func rom:0x3E2400
+fx_117_init = 0xE00EA190; // type:func rom:0x3E2070
+fx_117_update = 0xE00EA198; // type:func rom:0x3E2078
+fx_117_render = 0xE00EA520; // type:func rom:0x3E2400
 func_E00EA664 = 0xE00EA664; // type:func rom:0x3E2544
-func_E00EA66C = 0xE00EA66C; // type:func rom:0x3E254C
+fx_117_appendGfx = 0xE00EA66C; // type:func rom:0x3E254C
 fx_119_main = 0xE010A000; // type:func rom:0x3E43A0
-func_E010A184 = 0xE010A184; // type:func rom:0x3E4524
-func_E010A18C = 0xE010A18C; // type:func rom:0x3E452C
-func_E010A4A0 = 0xE010A4A0; // type:func rom:0x3E4840
-func_E010A4E8 = 0xE010A4E8; // type:func rom:0x3E4888
+fx_119_init = 0xE010A184; // type:func rom:0x3E4524
+fx_119_update = 0xE010A18C; // type:func rom:0x3E452C
+fx_119_render = 0xE010A4A0; // type:func rom:0x3E4840
+fx_119_appendGfx = 0xE010A4E8; // type:func rom:0x3E4888
 fx_120_main = 0xE010C000; // type:func rom:0x3E54C0
-func_E010C190 = 0xE010C190; // type:func rom:0x3E5650
-func_E010C198 = 0xE010C198; // type:func rom:0x3E5658
-func_E010C354 = 0xE010C354; // type:func rom:0x3E5814
-func_E010C39C = 0xE010C39C; // type:func rom:0x3E585C
+fx_120_init = 0xE010C190; // type:func rom:0x3E5650
+fx_120_update = 0xE010C198; // type:func rom:0x3E5658
+fx_120_render = 0xE010C354; // type:func rom:0x3E5814
+fx_120_appendGfx = 0xE010C39C; // type:func rom:0x3E585C
 func_E010E000 = 0xE010E000; // type:func rom:0x3EB4E0
 fx_121_main = 0xE010E32C; // type:func rom:0x3EB80C
-func_E010E4A0 = 0xE010E4A0; // type:func rom:0x3EB980
-func_E010E4A8 = 0xE010E4A8; // type:func rom:0x3EB988
-func_E010E510 = 0xE010E510; // type:func rom:0x3EB9F0
-func_E010E558 = 0xE010E558; // type:func rom:0x3EBA38
+fx_121_init = 0xE010E4A0; // type:func rom:0x3EB980
+fx_121_update = 0xE010E4A8; // type:func rom:0x3EB988
+fx_121_render = 0xE010E510; // type:func rom:0x3EB9F0
+fx_121_appendGfx = 0xE010E558; // type:func rom:0x3EBA38
 fx_122_main = 0xE0110000; // type:func rom:0x3F83F0
-func_E0110224 = 0xE0110224; // type:func rom:0x3F8614
-func_E011022C = 0xE011022C; // type:func rom:0x3F861C
-func_E01103A4 = 0xE01103A4; // type:func rom:0x3F8794
-func_E01103EC = 0xE01103EC; // type:func rom:0x3F87DC
+fx_122_init = 0xE0110224; // type:func rom:0x3F8614
+fx_122_update = 0xE011022C; // type:func rom:0x3F861C
+fx_122_render = 0xE01103A4; // type:func rom:0x3F8794
+fx_122_appendGfx = 0xE01103EC; // type:func rom:0x3F87DC
 fx_123_main = 0xE0112000; // type:func rom:0x3F9E50
-func_E01121B8 = 0xE01121B8; // type:func rom:0x3FA008
-func_E01121C0 = 0xE01121C0; // type:func rom:0x3FA010
-func_E01122E8 = 0xE01122E8; // type:func rom:0x3FA138
+fx_123_init = 0xE01121B8; // type:func rom:0x3FA008
+fx_123_update = 0xE01121C0; // type:func rom:0x3FA010
+fx_123_render = 0xE01122E8; // type:func rom:0x3FA138
 func_E0112330 = 0xE0112330; // type:func rom:0x3FA180
-func_E01124CC = 0xE01124CC; // type:func rom:0x3FA31C
+fx_123_appendGfx = 0xE01124CC; // type:func rom:0x3FA31C
 fx_124_main = 0xE0114000; // type:func rom:0x3FEAE0
-func_E01140D4 = 0xE01140D4; // type:func rom:0x3FEBB4
-func_E01140DC = 0xE01140DC; // type:func rom:0x3FEBBC
-func_E0114340 = 0xE0114340; // type:func rom:0x3FEE20
-func_E0114388 = 0xE0114388; // type:func rom:0x3FEE68
+fx_124_init = 0xE01140D4; // type:func rom:0x3FEBB4
+fx_124_update = 0xE01140DC; // type:func rom:0x3FEBBC
+fx_124_render = 0xE0114340; // type:func rom:0x3FEE20
+fx_124_appendGfx = 0xE0114388; // type:func rom:0x3FEE68
 fx_125_main = 0xE0116000; // type:func rom:0x402640
-func_E0116184 = 0xE0116184; // type:func rom:0x4027C4
-func_E011618C = 0xE011618C; // type:func rom:0x4027CC
-func_E01166A0 = 0xE01166A0; // type:func rom:0x402CE0
+fx_125_init = 0xE0116184; // type:func rom:0x4027C4
+fx_125_update = 0xE011618C; // type:func rom:0x4027CC
+fx_125_render = 0xE01166A0; // type:func rom:0x402CE0
 func_E01166E8 = 0xE01166E8; // type:func rom:0x402D28
-func_E0116884 = 0xE0116884; // type:func rom:0x402EC4
+fx_125_appendGfx = 0xE0116884; // type:func rom:0x402EC4
 fx_126_main = 0xE0118000; // type:func rom:0x403400
-func_E01182EC = 0xE01182EC; // type:func rom:0x4036EC
-func_E01182F4 = 0xE01182F4; // type:func rom:0x4036F4
-func_E0118454 = 0xE0118454; // type:func rom:0x403854
-func_E011849C = 0xE011849C; // type:func rom:0x40389C
+fx_126_init = 0xE01182EC; // type:func rom:0x4036EC
+fx_126_update = 0xE01182F4; // type:func rom:0x4036F4
+fx_126_render = 0xE0118454; // type:func rom:0x403854
+fx_126_appendGfx = 0xE011849C; // type:func rom:0x40389C
 fx_127_main = 0xE011A000; // type:func rom:0x404220
-func_E011A0FC = 0xE011A0FC; // type:func rom:0x40431C
-func_E011A104 = 0xE011A104; // type:func rom:0x404324
-func_E011A398 = 0xE011A398; // type:func rom:0x4045B8
+fx_127_init = 0xE011A0FC; // type:func rom:0x40431C
+fx_127_update = 0xE011A104; // type:func rom:0x404324
+fx_127_render = 0xE011A398; // type:func rom:0x4045B8
 func_E011A3A0 = 0xE011A3A0; // type:func rom:0x4045C0
 func_E011A3BC = 0xE011A3BC; // type:func rom:0x4045DC
 func_E011A48C = 0xE011A48C; // type:func rom:0x4046AC
 func_E011A700 = 0xE011A700; // type:func rom:0x404920
 fx_128_main = 0xE011C000; // type:func rom:0x406B40
-func_E011C0F4 = 0xE011C0F4; // type:func rom:0x406C34
-func_E011C0FC = 0xE011C0FC; // type:func rom:0x406C3C
-func_E011C17C = 0xE011C17C; // type:func rom:0x406CBC
-func_E011C1C4 = 0xE011C1C4; // type:func rom:0x406D04
+fx_128_init = 0xE011C0F4; // type:func rom:0x406C34
+fx_128_update = 0xE011C0FC; // type:func rom:0x406C3C
+fx_128_render = 0xE011C17C; // type:func rom:0x406CBC
+fx_128_appendGfx = 0xE011C1C4; // type:func rom:0x406D04
 fx_129_main = 0xE011E000; // type:func rom:0x409990
-func_E011E18C = 0xE011E18C; // type:func rom:0x409B1C
-func_E011E194 = 0xE011E194; // type:func rom:0x409B24
-func_E011E530 = 0xE011E530; // type:func rom:0x409EC0
-func_E011E578 = 0xE011E578; // type:func rom:0x409F08
+fx_129_init = 0xE011E18C; // type:func rom:0x409B1C
+fx_129_update = 0xE011E194; // type:func rom:0x409B24
+fx_129_render = 0xE011E530; // type:func rom:0x409EC0
+fx_129_appendGfx = 0xE011E578; // type:func rom:0x409F08
 fx_130_main = 0xE0120000; // type:func rom:0x40B3F0
-func_E0120134 = 0xE0120134; // type:func rom:0x40B524
-func_E012013C = 0xE012013C; // type:func rom:0x40B52C
-func_E012039C = 0xE012039C; // type:func rom:0x40B78C
-func_E01203E4 = 0xE01203E4; // type:func rom:0x40B7D4
+fx_130_init = 0xE0120134; // type:func rom:0x40B524
+fx_130_update = 0xE012013C; // type:func rom:0x40B52C
+fx_130_render = 0xE012039C; // type:func rom:0x40B78C
+fx_130_appendGfx = 0xE01203E4; // type:func rom:0x40B7D4
 fx_131_main = 0xE0122000; // type:func rom:0x40C5A0
-func_E0122174 = 0xE0122174; // type:func rom:0x40C714
-func_E012217C = 0xE012217C; // type:func rom:0x40C71C
-func_E01226C4 = 0xE01226C4; // type:func rom:0x40CC64
-func_E012270C = 0xE012270C; // type:func rom:0x40CCAC
+fx_131_init = 0xE0122174; // type:func rom:0x40C714
+fx_131_update = 0xE012217C; // type:func rom:0x40C71C
+fx_131_render = 0xE01226C4; // type:func rom:0x40CC64
+fx_131_appendGfx = 0xE012270C; // type:func rom:0x40CCAC
 fx_132_main = 0xE0124000; // type:func rom:0x412730
-func_E01242FC = 0xE01242FC; // type:func rom:0x412A2C
-func_E0124304 = 0xE0124304; // type:func rom:0x412A34
-func_E012448C = 0xE012448C; // type:func rom:0x412BBC
-func_E01244C4 = 0xE01244C4; // type:func rom:0x412BF4
+fx_132_init = 0xE01242FC; // type:func rom:0x412A2C
+fx_132_update = 0xE0124304; // type:func rom:0x412A34
+fx_132_render = 0xE012448C; // type:func rom:0x412BBC
+fx_132_appendGfx = 0xE01244C4; // type:func rom:0x412BF4
 fx_133_main = 0xE0126000; // type:func rom:0x413360
-func_E012612C = 0xE012612C; // type:func rom:0x41348C
-func_E0126134 = 0xE0126134; // type:func rom:0x413494
-func_E01264A4 = 0xE01264A4; // type:func rom:0x413804
-func_E01264EC = 0xE01264EC; // type:func rom:0x41384C
+fx_133_init = 0xE012612C; // type:func rom:0x41348C
+fx_133_update = 0xE0126134; // type:func rom:0x413494
+fx_133_render = 0xE01264A4; // type:func rom:0x413804
+fx_133_appendGfx = 0xE01264EC; // type:func rom:0x41384C
 fx_134_main = 0xE0128000; // type:func rom:0x414BA0
-func_E0128128 = 0xE0128128; // type:func rom:0x414CC8
-func_E0128130 = 0xE0128130; // type:func rom:0x414CD0
-func_E0128198 = 0xE0128198; // type:func rom:0x414D38
-func_E01281E0 = 0xE01281E0; // type:func rom:0x414D80
+fx_134_init = 0xE0128128; // type:func rom:0x414CC8
+fx_134_update = 0xE0128130; // type:func rom:0x414CD0
+fx_134_render = 0xE0128198; // type:func rom:0x414D38
+fx_134_appendGfx = 0xE01281E0; // type:func rom:0x414D80
 func_802A1000 = 0x802A1000; // type:func rom:0x415D90
 func_802A1030 = 0x802A1030; // type:func rom:0x415DC0
 func_802A1050 = 0x802A1050; // type:func rom:0x415DE0
@@ -5715,18 +5791,18 @@ func_802A9000_425B50 = 0x802A9000; // type:func rom:0x425B50
 func_802A916C_425CBC = 0x802A916C; // type:func rom:0x425CBC
 func_802A9228_425D78 = 0x802A9228; // type:func rom:0x425D78
 func_802A94D8_426028 = 0x802A94D8; // type:func rom:0x426028
-action_command_07_FreeHudElements = 0x802A959C; // type:func rom:0x4260EC
+action_command_07_free_hud_elements = 0x802A959C; // type:func rom:0x4260EC
 func_802A9000_426170 = 0x802A9000; // type:func rom:0x426170
 action_command_dizzy_shell_MashActionCommandInit = 0x802A9170; // type:func rom:0x4262E0
 func_802A928C_4263FC = 0x802A928C; // type:func rom:0x4263FC
 action_command_dizzy_shell_UnkActionCommandFunc1 = 0x802A96DC; // type:func rom:0x42684C
-action_command_dizzy_shell_FreeHudElements = 0x802A97BC; // type:func rom:0x42692C
+action_command_dizzy_shell_free_hud_elements = 0x802A97BC; // type:func rom:0x42692C
 D_802A9802_426972 = 0x802A9802; // type:data rom:0x426972
 func_802A9000_4269D0 = 0x802A9000; // type:func rom:0x4269D0
 action_command_fire_shell_MashActionCommandInit = 0x802A9178; // type:func rom:0x426B48
 func_802A9294_426C64 = 0x802A9294; // type:func rom:0x426C64
 action_command_fire_shell_UnkActionCommandFunc1 = 0x802A9834; // type:func rom:0x427204
-action_command_fire_shell_FreeHudElements = 0x802A9914; // type:func rom:0x4272E4
+action_command_fire_shell_free_hud_elements = 0x802A9914; // type:func rom:0x4272E4
 D_802A9952_427322 = 0x802A9952; // type:data rom:0x427322
 D_802A9964_427334 = 0x802A9964; // type:data rom:0x427334
 D_802A9974_427344 = 0x802A9974; // type:data rom:0x427344
@@ -5735,12 +5811,13 @@ func_802A9000_4273B0 = 0x802A9000; // type:func rom:0x4273B0
 action_command_0A_MashActionCommandInit = 0x802A9170; // type:func rom:0x427520
 func_802A928C_42763C = 0x802A928C; // type:func rom:0x42763C
 action_command_0A_UnkActionCommandFunc1 = 0x802A955C; // type:func rom:0x42790C
-action_command_0A_FreeHudElements = 0x802A963C; // type:func rom:0x4279EC
+action_command_0A_free_hud_elements = 0x802A963C; // type:func rom:0x4279EC
 func_802A9000_427A70 = 0x802A9000; // type:func rom:0x427A70
 action_command_bomb_MashActionCommandInit = 0x802A9170; // type:func rom:0x427BE0
 func_802A928C_427CFC = 0x802A928C; // type:func rom:0x427CFC
 action_command_bomb_UnkActionCommandFunc1 = 0x802A96EC; // type:func rom:0x42815C
-action_command_bomb_FreeHudElements = 0x802A97CC; // type:func rom:0x42823C
+action_command_bomb_free_hud_elements = 0x802A97CC; // type:func rom:0x42823C
+D_802A9812_428280 = 0x802A9810; // type:data rom:0x428280
 D_802A9812_428282 = 0x802A9812; // type:data rom:0x428282
 action_command_body_slam_CreateHudElements = 0x802A9000; // type:func rom:0x4282E0
 action_command_body_slam_MashActionCommandInit = 0x802A91B8; // type:func rom:0x428498
@@ -5751,13 +5828,13 @@ func_802A9000_428A70 = 0x802A9000; // type:func rom:0x428A70
 func_802A9184_428BF4 = 0x802A9184; // type:func rom:0x428BF4
 func_802A9278_428CE8 = 0x802A9278; // type:func rom:0x428CE8
 func_802A96EC_42915C = 0x802A96EC; // type:func rom:0x42915C
-action_command_air_lift_FreeHudElements = 0x802A9810; // type:func rom:0x429280
+action_command_air_lift_free_hud_elements = 0x802A9810; // type:func rom:0x429280
 D_802A9852_4292C2 = 0x802A9852; // type:data rom:0x4292C2
 func_802A9000_429320 = 0x802A9000; // type:func rom:0x429320
 action_command_air_raid_MashActionCommandInit = 0x802A9178; // type:func rom:0x429498
 func_802A9294_4295B4 = 0x802A9294; // type:func rom:0x4295B4
 action_command_air_raid_UnkActionCommandFunc1 = 0x802A984C; // type:func rom:0x429B6C
-action_command_air_raid_FreeHudElements = 0x802A992C; // type:func rom:0x429C4C
+action_command_air_raid_free_hud_elements = 0x802A992C; // type:func rom:0x429C4C
 D_802A9972_429C92 = 0x802A9972; // type:data rom:0x429C92
 D_802A9984_429CA4 = 0x802A9984; // type:data rom:0x429CA4
 D_802A9994_429CB4 = 0x802A9994; // type:data rom:0x429CB4
@@ -5788,7 +5865,7 @@ D_802A97C0_42CEB0 = 0x802A97C0; // type:data rom:0x42CEB0
 D_802A97CC_42CEBC = 0x802A97CC; // type:data rom:0x42CEBC
 action_command_power_shock_CreateHudElements = 0x802A9000; // type:func rom:0x42CF10
 func_802A9210_42D120 = 0x802A9210; // type:func rom:0x42D120
-action_command_power_shock_update = 0x802A9310; // type:func rom:0x42D220
+func_802A9310_42D220 = 0x802A9310; // type:func rom:0x42D220
 action_command_power_shock_draw_hud_elements = 0x802A98D0; // type:func rom:0x42D7E0
 action_command_power_shock_free_hud_elements = 0x802A9A54; // type:func rom:0x42D964
 D_802A9AA2_42D9B2 = 0x802A9AA2; // type:data rom:0x42D9B2
@@ -5797,13 +5874,14 @@ func_802A91A0_42DBB0 = 0x802A91A0; // type:func rom:0x42DBB0
 func_802A92A0_42DCB0 = 0x802A92A0; // type:func rom:0x42DCB0
 func_802A97F8_42E208 = 0x802A97F8; // type:func rom:0x42E208
 func_802A98E0_42E2F0 = 0x802A98E0; // type:func rom:0x42E2F0
+D_802A9930_42E340 = 0x802A9930; // type:data rom:0x42E340
 D_802A9932_42E342 = 0x802A9932; // type:data rom:0x42E342
 func_802A9000_42E3A0 = 0x802A9000; // type:func rom:0x42E3A0
 action_command_smack_MashActionCommandInit = 0x802A917C; // type:func rom:0x42E51C
 func_802A9298_42E638 = 0x802A9298; // type:func rom:0x42E638
 action_command_smack_UnkActionCommandFunc1 = 0x802A98B0; // type:func rom:0x42EC50
-action_command_smack_FreeHudElements = 0x802A9990; // type:func rom:0x42ED30
-D_802A99D2_42ED72 = 0x802A99D2; // type:data rom:0x42ED72
+action_command_smack_free_hud_elements = 0x802A9990; // type:func rom:0x42ED30
+D_802A99D2_42ED72 = 0x802A99D2; // type:data rom:0x42ED70
 D_802A99E4_42ED84 = 0x802A99E4; // type:data rom:0x42ED84
 D_802A99F4_42ED94 = 0x802A99F4; // type:data rom:0x42ED94
 D_802A9A08_42EDA8 = 0x802A9A08; // type:data rom:0x42EDA8
@@ -5812,7 +5890,7 @@ func_802A9000_42EE20 = 0x802A9000; // type:func rom:0x42EE20
 func_802A916C_42EF8C = 0x802A916C; // type:func rom:0x42EF8C
 func_802A9254_42F074 = 0x802A9254; // type:func rom:0x42F074
 action_command_spiny_surge_UnkActionCommandFunc1 = 0x802A973C; // type:func rom:0x42F55C
-action_command_spiny_surge_FreeHudElements = 0x802A981C; // type:func rom:0x42F63C
+action_command_spiny_surge_free_hud_elements = 0x802A981C; // type:func rom:0x42F63C
 D_802A9862_42F682 = 0x802A9862; // type:data rom:0x42F682
 func_802A9000_42F6E0 = 0x802A9000; // type:func rom:0x42F6E0
 func_802A91A0_42F880 = 0x802A91A0; // type:func rom:0x42F880
@@ -5824,7 +5902,7 @@ func_802A9000_430020 = 0x802A9000; // type:func rom:0x430020
 action_command_spook_MashActionCommandInit = 0x802A917C; // type:func rom:0x43019C
 func_802A9298_4302B8 = 0x802A9298; // type:func rom:0x4302B8
 action_command_spook_UnkActionCommandFunc1 = 0x802A97FC; // type:func rom:0x43081C
-action_command_spook_FreeHudElements = 0x802A98DC; // type:func rom:0x4308FC
+action_command_spook_free_hud_elements = 0x802A98DC; // type:func rom:0x4308FC
 D_802A9922_430942 = 0x802A9922; // type:data rom:0x430942
 b_area_kmr_part_1_goomba_angle_calculate = 0x80218000; // type:func rom:0x4309A0
 b_area_kmr_part_1_goomba_AngleCalculate = 0x8021818C; // type:func rom:0x430B2C
@@ -7655,7 +7733,7 @@ func_80240630_7EB340 = 0x80240630; // type:func rom:0x7EB340
 mac_00_GetItemName = 0x802406E4; // type:func rom:0x7EB3F4
 mac_00_Set80151310_1 = 0x80240748; // type:func rom:0x7EB458
 mac_00_Set80151310_0 = 0x8024075C; // type:func rom:0x7EB46C
-func_8024076C_7EB47C = 0x8024076C; // type:func rom:0x7EB47C
+mac_00_UnkQuizFunc = 0x8024076C; // type:func rom:0x7EB47C
 mac_00_UnkFunc31 = 0x80240990; // type:func rom:0x7EB6A0
 mac_00_GetNpcUnsafeOwner2 = 0x802409DC; // type:func rom:0x7EB6EC
 mac_00_UnkFunc28 = 0x802409FC; // type:func rom:0x7EB70C
@@ -7762,7 +7840,7 @@ func_80241F10_802790 = 0x80241F10; // type:func rom:0x802790
 mac_01_GetItemName = 0x80241FC4; // type:func rom:0x802844
 mac_01_Set80151310_1 = 0x80242028; // type:func rom:0x8028A8
 mac_01_Set80151310_0 = 0x8024203C; // type:func rom:0x8028BC
-func_8024204C_8028CC = 0x8024204C; // type:func rom:0x8028CC
+mac_01_UnkQuizFunc = 0x8024204C; // type:func rom:0x8028CC
 mac_01_UnkFunc31 = 0x80242270; // type:func rom:0x802AF0
 mac_01_GetNpcUnsafeOwner2 = 0x802422BC; // type:func rom:0x802B3C
 mac_01_UnkFunc28 = 0x802422DC; // type:func rom:0x802B5C
@@ -7899,7 +7977,7 @@ func_802417C0_824A80 = 0x802417C0; // type:func rom:0x824A80
 mac_02_GetItemName = 0x80241874; // type:func rom:0x824B34
 mac_02_Set80151310_1 = 0x802418D8; // type:func rom:0x824B98
 mac_02_Set80151310_0 = 0x802418EC; // type:func rom:0x824BAC
-func_802418FC_824BBC = 0x802418FC; // type:func rom:0x824BBC
+mac_02_UnkQuizFunc = 0x802418FC; // type:func rom:0x824BBC
 mac_02_UnkFunc31 = 0x80241B20; // type:func rom:0x824DE0
 mac_02_GetNpcUnsafeOwner2 = 0x80241B6C; // type:func rom:0x824E2C
 mac_02_UnkFunc28 = 0x80241B8C; // type:func rom:0x824E4C
@@ -7967,7 +8045,7 @@ func_802404B0_831CB0 = 0x802404B0; // type:func rom:0x831CB0
 mac_03_GetItemName = 0x80240564; // type:func rom:0x831D64
 mac_03_Set80151310_1 = 0x802405C8; // type:func rom:0x831DC8
 mac_03_Set80151310_0 = 0x802405DC; // type:func rom:0x831DDC
-func_802405EC_831DEC = 0x802405EC; // type:func rom:0x831DEC
+mac_03_UnkQuizFunc = 0x802405EC; // type:func rom:0x831DEC
 mac_03_UnkFunc31 = 0x80240810; // type:func rom:0x832010
 mac_03_GetNpcUnsafeOwner2 = 0x8024085C; // type:func rom:0x83205C
 mac_03_UnkFunc28 = 0x8024087C; // type:func rom:0x83207C
@@ -8031,7 +8109,7 @@ func_80240460_843030 = 0x80240460; // type:func rom:0x843030
 mac_04_GetItemName = 0x80240514; // type:func rom:0x8430E4
 mac_04_Set80151310_1 = 0x80240578; // type:func rom:0x843148
 mac_04_Set80151310_0 = 0x8024058C; // type:func rom:0x84315C
-func_8024059C_84316C = 0x8024059C; // type:func rom:0x84316C
+mac_04_UnkQuizFunc = 0x8024059C; // type:func rom:0x84316C
 mac_04_UnkFunc31 = 0x802407C0; // type:func rom:0x843390
 mac_04_GetNpcUnsafeOwner2 = 0x8024080C; // type:func rom:0x8433DC
 mac_04_UnkFunc28 = 0x8024082C; // type:func rom:0x8433FC
@@ -8105,7 +8183,7 @@ func_80241320_853490 = 0x80241320; // type:func rom:0x853490
 mac_05_GetItemName = 0x802413D4; // type:func rom:0x853544
 mac_05_Set80151310_1 = 0x80241438; // type:func rom:0x8535A8
 mac_05_Set80151310_0 = 0x8024144C; // type:func rom:0x8535BC
-func_8024145C_8535CC = 0x8024145C; // type:func rom:0x8535CC
+mac_05_UnkQuizFunc = 0x8024145C; // type:func rom:0x8535CC
 mac_05_UnkFunc31 = 0x80241680; // type:func rom:0x8537F0
 mac_05_GetNpcUnsafeOwner2 = 0x802416CC; // type:func rom:0x85383C
 mac_05_UnkFunc28 = 0x802416EC; // type:func rom:0x85385C
@@ -8611,7 +8689,7 @@ func_80240390_8B0400 = 0x80240390; // type:func rom:0x8B0400
 kmr_02_GetItemName = 0x80240444; // type:func rom:0x8B04B4
 kmr_02_Set80151310_1 = 0x802404A8; // type:func rom:0x8B0518
 kmr_02_Set80151310_0 = 0x802404BC; // type:func rom:0x8B052C
-func_802404CC_8B053C = 0x802404CC; // type:func rom:0x8B053C
+kmr_02_UnkQuizFunc = 0x802404CC; // type:func rom:0x8B053C
 kmr_02_UnkFunc31 = 0x802406F0; // type:func rom:0x8B0760
 kmr_02_GetNpcUnsafeOwner2 = 0x8024073C; // type:func rom:0x8B07AC
 kmr_02_UnkFunc28 = 0x8024075C; // type:func rom:0x8B07CC
@@ -9460,7 +9538,7 @@ dro_01_func_80241470_95C670 = 0x80241470; // type:func rom:0x95C670
 dro_01_GetItemName = 0x80241524; // type:func rom:0x95C724
 dro_01_Set80151310_1 = 0x80241588; // type:func rom:0x95C788
 dro_01_Set80151310_0 = 0x8024159C; // type:func rom:0x95C79C
-dro_01_func_802415AC_95C7AC = 0x802415AC; // type:func rom:0x95C7AC
+dro_01_UnkQuizFunc = 0x802415AC; // type:func rom:0x95C7AC
 dro_01_UnkFunc31 = 0x802417D0; // type:func rom:0x95C9D0
 dro_01_GetNpcUnsafeOwner2 = 0x8024181C; // type:func rom:0x95CA1C
 dro_01_UnkFunc28 = 0x8024183C; // type:func rom:0x95CA3C
@@ -9660,7 +9738,7 @@ dro_02_func_80240300_9694C0 = 0x80240300; // type:func rom:0x9694C0
 dro_02_GetItemName = 0x802403B4; // type:func rom:0x969574
 dro_02_Set80151310_1 = 0x80240418; // type:func rom:0x9695D8
 dro_02_Set80151310_0 = 0x8024042C; // type:func rom:0x9695EC
-dro_02_func_8024043C_9695FC = 0x8024043C; // type:func rom:0x9695FC
+dro_02_UnkQuizFunc = 0x8024043C; // type:func rom:0x9695FC
 dro_02_UnkFunc31 = 0x80240660; // type:func rom:0x969820
 dro_02_GetNpcUnsafeOwner2 = 0x802406AC; // type:func rom:0x96986C
 dro_02_UnkFunc28 = 0x802406CC; // type:func rom:0x96988C
@@ -10228,7 +10306,7 @@ func_80240D68_9C6148 = 0x80240D68; // type:func rom:0x9C6148
 nok_01_GetItemName = 0x80240E1C; // type:func rom:0x9C61FC
 nok_01_Set80151310_1 = 0x80240E80; // type:func rom:0x9C6260
 nok_01_Set80151310_0 = 0x80240E94; // type:func rom:0x9C6274
-func_80240EA4_9C6284 = 0x80240EA4; // type:func rom:0x9C6284
+nok_01_UnkQuizFunc = 0x80240EA4; // type:func rom:0x9C6284
 nok_01_UnkFunc31 = 0x802410C8; // type:func rom:0x9C64A8
 nok_01_GetNpcUnsafeOwner2 = 0x80241114; // type:func rom:0x9C64F4
 nok_01_UnkFunc28 = 0x80241134; // type:func rom:0x9C6514
@@ -10314,7 +10392,7 @@ func_80241910_9D8930 = 0x80241910; // type:func rom:0x9D8930
 nok_02_GetItemName = 0x802419C4; // type:func rom:0x9D89E4
 nok_02_Set80151310_1 = 0x80241A28; // type:func rom:0x9D8A48
 nok_02_Set80151310_0 = 0x80241A3C; // type:func rom:0x9D8A5C
-func_80241A4C_9D8A6C = 0x80241A4C; // type:func rom:0x9D8A6C
+nok_02_UnkQuizFunc = 0x80241A4C; // type:func rom:0x9D8A6C
 nok_02_UnkFunc31 = 0x80241C70; // type:func rom:0x9D8C90
 nok_02_GetNpcUnsafeOwner2 = 0x80241CBC; // type:func rom:0x9D8CDC
 nok_02_UnkFunc28 = 0x80241CDC; // type:func rom:0x9D8CFC
@@ -10685,7 +10763,7 @@ func_802424A4_A1D5A4 = 0x802424A4; // type:func rom:0xA1D5A4
 hos_03_GetItemName = 0x80242558; // type:func rom:0xA1D658
 hos_03_Set80151310_1 = 0x802425BC; // type:func rom:0xA1D6BC
 hos_03_Set80151310_0 = 0x802425D0; // type:func rom:0xA1D6D0
-func_802425E0_A1D6E0 = 0x802425E0; // type:func rom:0xA1D6E0
+hos_03_UnkQuizFunc = 0x802425E0; // type:func rom:0xA1D6E0
 hos_03_UnkFunc31 = 0x80242804; // type:func rom:0xA1D904
 hos_03_GetNpcUnsafeOwner2 = 0x80242850; // type:func rom:0xA1D950
 hos_03_UnkFunc28 = 0x80242870; // type:func rom:0xA1D970
@@ -11885,7 +11963,7 @@ func_80241614_B2DA84 = 0x80241614; // type:func rom:0xB2DA84
 jan_02_GetItemName = 0x802416C8; // type:func rom:0xB2DB38
 jan_02_Set80151310_1 = 0x8024172C; // type:func rom:0xB2DB9C
 jan_02_Set80151310_0 = 0x80241740; // type:func rom:0xB2DBB0
-func_80241750_B2DBC0 = 0x80241750; // type:func rom:0xB2DBC0
+jan_02_UnkQuizFunc = 0x80241750; // type:func rom:0xB2DBC0
 jan_02_UnkFunc31 = 0x80241974; // type:func rom:0xB2DDE4
 jan_02_GetNpcUnsafeOwner2 = 0x802419C0; // type:func rom:0xB2DE30
 jan_02_UnkFunc28 = 0x802419E0; // type:func rom:0xB2DE50
@@ -11962,7 +12040,7 @@ func_80241B9C_B3676C = 0x80241B9C; // type:func rom:0xB3676C
 jan_03_GetItemName = 0x80241C50; // type:func rom:0xB36820
 jan_03_Set80151310_1 = 0x80241CB4; // type:func rom:0xB36884
 jan_03_Set80151310_0 = 0x80241CC8; // type:func rom:0xB36898
-func_80241CD8_B368A8 = 0x80241CD8; // type:func rom:0xB368A8
+jan_03_UnkQuizFunc = 0x80241CD8; // type:func rom:0xB368A8
 jan_03_UnkFunc31 = 0x80241EFC; // type:func rom:0xB36ACC
 jan_03_GetNpcUnsafeOwner2 = 0x80241F48; // type:func rom:0xB36B18
 jan_03_UnkFunc28 = 0x80241F68; // type:func rom:0xB36B38
@@ -12702,7 +12780,7 @@ arn_03_func_80240B94_BDF924 = 0x80240B94; // type:func rom:0xBDF924
 arn_03_func_80240E90_BDFC20 = 0x80240E90; // type:func rom:0xBDFC20
 arn_03_func_80241068_BDFDF8 = 0x80241068; // type:func rom:0xBDFDF8
 arn_03_func_8024113C_BDFECC = 0x8024113C; // type:func rom:0xBDFECC
-arn_03_func_802412B0_BE0040 = 0x802412B0; // type:func rom:0xBE0040
+arn_03_StashVars = 0x802412B0; // type:func rom:0xBE0040
 arn_03_GetItemName = 0x80241364; // type:func rom:0xBE00F4
 arn_03_GetNpcCollisionHeight = 0x802413C8; // type:func rom:0xBE0158
 arn_03_AddPlayerHandsOffset = 0x80241424; // type:func rom:0xBE01B4
@@ -12896,12 +12974,12 @@ arn_05_npcGroupList_80244FC8 = 0x80244FC8; // type:data rom:0xBECBA8
 arn_05_makeEntities = 0x80245000; // type:data rom:0xBECBE0
 D_80245050_BECC30 = 0x80245050; // type:data rom:0xBECC30
 D_80245058_BECC38 = 0x80245058; // type:data rom:0xBECC38
-arn_07_arn_07_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0xBECDF0
-arn_07_arn_07_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0xBECE3C
-arn_07_arn_07_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xBECF9C
-arn_07_arn_07_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xBED3AC
-arn_07_arn_07_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xBED3EC
-arn_07_arn_07_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xBED4F8
+arn_07_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0xBECDF0
+arn_07_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0xBECE3C
+arn_07_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xBECF9C
+arn_07_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xBED3AC
+arn_07_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xBED3EC
+arn_07_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xBED4F8
 arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0
 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660
 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694
@@ -13834,7 +13912,7 @@ dgb_05_npcGroup_80241F2C = 0x80241F2C; // type:data rom:0xC3C93C
 dgb_05_npcGroupList_8024230C = 0x8024230C; // type:data rom:0xC3CD1C
 D_80242340_C3CD50 = 0x80242340; // type:data rom:0xC3CD50
 D_80242348_C3CD58 = 0x80242348; // type:data rom:0xC3CD58
-dgb_06_func_80240000_C3D080 = 0x80240000; // type:func rom:0xC3D080
+dgb_06_StashVars = 0x80240000; // type:func rom:0xC3D080
 dgb_06_GetItemName = 0x802400B4; // type:func rom:0xC3D134
 dgb_06_SomeItemEntityFunc = 0x80240118; // type:func rom:0xC3D198
 dgb_06_CheckItemFlags40 = 0x80240268; // type:func rom:0xC3D2E8
@@ -14110,7 +14188,7 @@ dgb_11_80240570 = 0x80240570; // type:data rom:0xC4D950
 dgb_11_80240600 = 0x80240600; // type:data rom:0xC4D9E0
 dgb_11_8024062C = 0x8024062C; // type:data rom:0xC4DA0C
 dgb_11_makeEntities = 0x80240A84; // type:data rom:0xC4DE64
-dgb_12_func_80240000_C4DEF0 = 0x80240000; // type:func rom:0xC4DEF0
+dgb_12_StashVars = 0x80240000; // type:func rom:0xC4DEF0
 dgb_12_GetItemName = 0x802400B4; // type:func rom:0xC4DFA4
 dgb_12_SomeItemEntityFunc = 0x80240118; // type:func rom:0xC4E008
 dgb_12_CheckItemFlags40 = 0x80240268; // type:func rom:0xC4E158
@@ -14558,7 +14636,7 @@ kzn_09_UnkNpcAIFunc26 = 0x80241228; // type:func rom:0xC77F08
 kzn_09_UnkFunc7 = 0x802413DC; // type:func rom:0xC780BC
 kzn_09_UnkNpcAIFunc27 = 0x8024163C; // type:func rom:0xC7831C
 kzn_09_UnkNpcAIFunc31 = 0x802418F0; // type:func rom:0xC785D0
-kzn_08_UnkNpcAIFunc32 = 0x8024195C; // type:func rom:0xC7863C
+kzn_09_UnkNpcAIFunc32 = 0x8024195C; // type:func rom:0xC7863C
 func_80241A58_C78738 = 0x80241A58; // type:func rom:0xC78738
 kzn_09_UnkNpcDurationFlagFunc3 = 0x80242498; // type:func rom:0xC79178
 kzn_09_UnkNpcAIFunc33 = 0x80242528; // type:func rom:0xC79208
@@ -15686,7 +15764,7 @@ flo_19_80242A2C = 0x80242A2C; // type:data rom:0xCE611C
 flo_19_80242FD0 = 0x80242FD0; // type:data rom:0xCE66C0
 flo_21_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0xCE6700
 flo_21_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0xCE674C
-flo_21_flo_21_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xCE68AC
+flo_21_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xCE68AC
 flo_21_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xCE6CBC
 flo_21_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xCE6CFC
 flo_21_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xCE6E08
@@ -15920,7 +15998,7 @@ func_80240700_CF8270 = 0x80240700; // type:func rom:0xCF8270
 sam_01_GetItemName = 0x802407B4; // type:func rom:0xCF8324
 sam_01_Set80151310_1 = 0x80240818; // type:func rom:0xCF8388
 sam_01_Set80151310_0 = 0x8024082C; // type:func rom:0xCF839C
-func_8024083C_CF83AC = 0x8024083C; // type:func rom:0xCF83AC
+sam_01_UnkQuizFunc = 0x8024083C; // type:func rom:0xCF83AC
 sam_01_UnkFunc31 = 0x80240A60; // type:func rom:0xCF85D0
 sam_01_GetNpcUnsafeOwner2 = 0x80240AAC; // type:func rom:0xCF861C
 sam_01_UnkFunc28 = 0x80240ACC; // type:func rom:0xCF863C
@@ -15985,7 +16063,7 @@ func_80240B2C_D0625C = 0x80240B2C; // type:func rom:0xD0625C
 sam_02_GetItemName = 0x80240BE0; // type:func rom:0xD06310
 sam_02_Set80151310_1 = 0x80240C44; // type:func rom:0xD06374
 sam_02_Set80151310_0 = 0x80240C58; // type:func rom:0xD06388
-func_80240C68_D06398 = 0x80240C68; // type:func rom:0xD06398
+sam_02_UnkQuizFunc = 0x80240C68; // type:func rom:0xD06398
 sam_02_UnkFunc31 = 0x80240E8C; // type:func rom:0xD065BC
 sam_02_GetNpcUnsafeOwner2 = 0x80240ED8; // type:func rom:0xD06608
 sam_02_UnkFunc28 = 0x80240EF8; // type:func rom:0xD06628
@@ -16204,7 +16282,7 @@ func_802407D0_D3ADA0 = 0x802407D0; // type:func rom:0xD3ADA0
 sam_11_GetItemName = 0x80240884; // type:func rom:0xD3AE54
 dup_sam_11_Set80151310_1 = 0x802408E8; // type:func rom:0xD3AEB8
 dup_sam_11_Set80151310_0 = 0x802408FC; // type:func rom:0xD3AECC
-func_8024090C_D3AEDC = 0x8024090C; // type:func rom:0xD3AEDC
+sam_11_UnkQuizFunc = 0x8024090C; // type:func rom:0xD3AEDC
 sam_11_UnkFunc31 = 0x80240B30; // type:func rom:0xD3B100
 sam_11_GetNpcUnsafeOwner2 = 0x80240B7C; // type:func rom:0xD3B14C
 sam_11_UnkFunc28 = 0x80240B9C; // type:func rom:0xD3B16C
@@ -17695,7 +17773,7 @@ func_802425B0_EA2EB0 = 0x802425B0; // type:func rom:0xEA2EB0
 func_80242608_EA2F08 = 0x80242608; // type:func rom:0xEA2F08
 func_8024267C_EA2F7C = 0x8024267C; // type:func rom:0xEA2F7C
 EA0C10_DeadGetItemName = 0x80242730; // type:func rom:0xEA3030
-func_802427F0_EA30F0 = 0x80242794; // type:func rom:0xEA3094
+EA0C10_GetNpcCollisionHeight = 0x80242794; // type:func rom:0xEA3094
 func_802427F0_EA30F0 = 0x802427F0; // type:func rom:0xEA30F0
 func_802429C0_EA32C0 = 0x802429C0; // type:func rom:0xEA32C0
 func_80242A14_EA3314 = 0x80242A14; // type:func rom:0xEA3314
@@ -17707,7 +17785,7 @@ func_80242DA8_EA36A8 = 0x80242DA8; // type:func rom:0xEA36A8
 EA36E0_SpinyTrompHit = 0x80242DE0; // type:func rom:0xEA36E0
 filemenu_set_cursor_goal_pos_EA3700 = 0x80242E00; // type:func rom:0xEA3700
 EA36E0_UnkFunc46 = 0x80242E2C; // type:func rom:0xEA372C
-EA36E0_UnkFunc47 = 0x80242EC4; // type:func rom:0xEA37C4
+func_80242EC4_EA37C4 = 0x80242EC4; // type:func rom:0xEA37C4
 EA36E0_UnkFunc48 = 0x80242F64; // type:func rom:0xEA3864
 EA36E0_UnkFunc49 = 0x80242F9C; // type:func rom:0xEA389C
 func_80243054_EA3954 = 0x80243054; // type:func rom:0xEA3954
@@ -17834,7 +17912,7 @@ EC2200_DeadUnk1 = 0x80240000; // type:func rom:0xEC2200
 func_80240040_EC2240 = 0x80240040; // type:func rom:0xEC2240
 EC2240_DeadGetItemName = 0x802400F4; // type:func rom:0xEC22F4
 func_80240158_EC2358 = 0x80240158; // type:func rom:0xEC2358
-EC2610_dead_foliage_setup_shear_mtx = 0x80240410; // type:func rom:0xEC2610
+EC2610_foliage_setup_shear_mtx = 0x80240410; // type:func rom:0xEC2610
 EC2610_DeadTransformFoliage = 0x80240480; // type:func rom:0xEC2680
 D_80240F28_EC3128 = 0x80240F28; // type:data rom:0xEC3128
 D_80244F88_EC7188 = 0x80244F88; // type:data rom:0xEC7188
@@ -17844,7 +17922,7 @@ EC71B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEC71B0
 EC71B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEC72D4
 func_8024030C_EC74BC = 0x8024030C; // type:func rom:0xEC74BC
 func_80240344_EC74F4 = 0x80240344; // type:func rom:0xEC74F4
-EC7590_dead_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590
+EC7590_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590
 EC7590_DeadTransformFoliage = 0x80240450; // type:func rom:0xEC7600
 func_8024061C_EC77CC = 0x8024061C; // type:func rom:0xEC77CC
 EC7590_DeadGetItemName = 0x802406D0; // type:func rom:0xEC7880
@@ -17880,7 +17958,7 @@ func_80241A28_ECB728 = 0x80241A28; // type:func rom:0xECB728
 func_80241AC4_ECB7C4 = 0x80241AC4; // type:func rom:0xECB7C4
 func_80241B88_ECB888 = 0x80241B88; // type:func rom:0xECB888
 func_80241BF8_ECB8F8 = 0x80241BF8; // type:func rom:0xECB8F8
-ECB930_dead_foliage_setup_shear_mtx = 0x80241C30; // type:func rom:0xECB930
+ECB930_foliage_setup_shear_mtx = 0x80241C30; // type:func rom:0xECB930
 ECB930_DeadTransformFoliage = 0x80241CA0; // type:func rom:0xECB9A0
 func_80241E70_ECBB70 = 0x80241E70; // type:func rom:0xECBB70
 D_80241FE0_ECBCE0 = 0x80241FE0; // type:data rom:0xECBCE0
@@ -17891,7 +17969,7 @@ D_802430B8_ECCDB8 = 0x802430B8; // type:data rom:0xECCDB8
 D_802430BC_ECCDBC = 0x802430BC; // type:data rom:0xECCDBC
 ECFFF0_DeadUnk1 = 0x80240000; // type:func rom:0xECFFF0
 func_80240040_ED0030 = 0x80240040; // type:func rom:0xED0030
-ED00D0_dead_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0
+ED00D0_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0
 ED00D0_DeadTransformFoliage = 0x80240150; // type:func rom:0xED0140
 ED0310_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xED0310
 func_802404D0_ED04C0 = 0x802404D0; // type:func rom:0xED04C0
@@ -17916,7 +17994,7 @@ ED42A0_DeadUnkTexturePanFunc = 0x80240198; // type:func rom:0xED43B8
 func_802402BC_ED44DC = 0x802402BC; // type:func rom:0xED44DC
 func_802404B0_ED46D0 = 0x802404B0; // type:func rom:0xED46D0
 func_80240B10_ED4D30 = 0x80240B10; // type:func rom:0xED4D30
-ED5540_dead_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540
+ED5540_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540
 ED5540_DeadTransformFoliage = 0x80241390; // type:func rom:0xED55B0
 D_80241DA0_ED5FC0 = 0x80241DA0; // type:data rom:0xED5FC0
 D_80244160_ED8380 = 0x80244160; // type:data rom:0xED8380
@@ -17931,7 +18009,7 @@ func_80240274_ED9094 = 0x80240274; // type:func rom:0xED9094
 func_80240318_ED9138 = 0x80240318; // type:func rom:0xED9138
 D_80243170_EDBF90 = 0x80243170; // type:data rom:0xEDBF90
 func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0
-EDC020_dead_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xEDC020
+EDC020_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xEDC020
 EDC020_DeadTransformFoliage = 0x802400B0; // type:func rom:0xEDC090
 func_8024027C_EDC25C = 0x8024027C; // type:func rom:0xEDC25C
 EDC020_DeadGetItemName = 0x80240330; // type:func rom:0xEDC310
@@ -18101,7 +18179,7 @@ EF7A80_DeadUnk1 = 0x8024030C; // type:func rom:0xEF7D8C
 func_80240340_EF7DC0 = 0x80240340; // type:func rom:0xEF7DC0
 EF7A80_DeadUnkFloatFunc = 0x80240394; // type:func rom:0xEF7E14
 func_80240530_EF7FB0 = 0x80240530; // type:func rom:0xEF7FB0
-EF8010_dead_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xEF8010
+EF8010_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xEF8010
 EF8010_DeadTransformFoliage = 0x80240600; // type:func rom:0xEF8080
 EFEB00_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEFEB00
 EFEB00_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEFEC24
@@ -18111,7 +18189,7 @@ func_802404D0_EFEFD0 = 0x802404D0; // type:func rom:0xEFEFD0
 func_80240540_EFF040 = 0x80240540; // type:func rom:0xEFF040
 func_80240660_EFF160 = 0x80240660; // type:func rom:0xEFF160
 func_80240784_EFF284 = 0x80240784; // type:func rom:0xEFF284
-func_802407B0_EFF2B0 = 0x802407B0; // type:func rom:0xEFF2B0
+EFEB00_DeadUnkFloatFunc = 0x802407B0; // type:func rom:0xEFF2B0
 D_00000094 = 0x94; // type:data
 D_00000094_2 = 0x94; // type:data
 D_000001E4 = 0x1E4; // type:data
@@ -18145,6 +18223,25 @@ kmr_20_config = 0x2800380; // type:data
 battle_item_insecticide_herb_temp = 0x28003C0; // type:data
 battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data
 battle_item_mystery_tempStc = 0x2800410; // type:data
+D_090002C0 = 0x90002C0; // type:data
+D_09000330 = 0x9000330; // type:data
+D_09000370 = 0x9000370; // type:data
+D_090003B0 = 0x90003B0; // type:data
+D_090003F0 = 0x90003F0; // type:data
+D_09000430 = 0x9000430; // type:data
+D_09000470 = 0x9000470; // type:data
+D_09000E08 = 0x9000E08; // type:data
+D_09000E20 = 0x9000E20; // type:data
+D_09000E38 = 0x9000E38; // type:data
+D_09001280 = 0x9001280; // type:data
+D_09001358 = 0x9001358; // type:data
+D_09001430 = 0x9001430; // type:data
+D_09001508 = 0x9001508; // type:data
+D_09002780 = 0x9002780; // type:data
+D_09002868 = 0x9002868; // type:data
+D_09002950 = 0x9002950; // type:data
+D_09002B20 = 0x9002B20; // type:data
+D_09002B40 = 0x9002B40; // type:data
 D_0A000328 = 0xA000328; // type:data
 D_0A000380 = 0xA000380; // type:data
 D_0A000740 = 0xA000740; // type:data
@@ -18175,6 +18272,7 @@ D_8000031C = 0x8000031C; // type:data
 D_80026AC7 = 0x80026AC7; // type:data
 dead_atan2 = 0x8002AF70; // type:data
 D_8004AA85 = 0x8004AA85; // type:data
+gcc2_compiled. = 0x80060D60; // type:data
 ai = 0x8006AD64; //
 si = 0x8006AD90; //
 dp = 0x8006AE0C; //
@@ -18203,6 +18301,7 @@ D_80082358 = 0x80082358; // type:data
 D_80082388 = 0x80082388; // type:data
 gItemTable = 0x800878E0; // size:0x2D80
 D_8008A680 = 0x8008A680; // type:data
+dead_gItemTable = 0x8008D2C0; // type:data
 D_8008DDD4 = 0x8008DDD4; // type:data
 D_8008E3D8 = 0x8008E3D8; // type:data
 D_8008E94C = 0x8008E94C; // type:data
@@ -18230,7 +18329,6 @@ D_8008FA8C = 0x8008FA8C; // type:data
 D_8008FC44 = 0x8008FC44; // type:data
 D_8008FEE0 = 0x8008FEE0; // type:data
 rdpstateinit_dl = 0x80093BB8; // type:data
-D_80093DB0 = 0x80093DB0; // type:data
 D_80094664 = 0x80094664; // type:data
 D_80094900 = 0x80094900; // type:data
 D_80097D60 = 0x80097D60; // type:data
@@ -18240,7 +18338,6 @@ D_80097D78 = 0x80097D78; // type:data
 D_80097D80 = 0x80097D80; // type:data
 D_80097D88 = 0x80097D88; // type:data
 pad = 0x80098474; // type:data
-nuIdleFunc = 0x8009A5A8; // type:data
 nuScPreNMIFlag = 0x8009A5B0; // type:data
 D_8009A5B8 = 0x8009A5B8; // type:data
 D_8009A5C0 = 0x8009A5C0; // type:data
@@ -18303,6 +18400,7 @@ gCurtainFadeGoal = 0x8009BA9C; //
 gCurtainDrawCallback = 0x8009BAA0; //
 D_8009BAA8 = 0x8009BAA8; // type:data
 D_8009BB30 = 0x8009BB30; // type:data
+gCrashScreen = 0x8009BB30; // type:data
 D_8009C4E0 = 0x8009C4E0; // type:data
 D_8009C4FC = 0x8009C4FC; // type:data
 nuGfxTask_ptr = 0x8009C510; // type:data
@@ -18312,6 +18410,7 @@ GfxTaskMgrThread = 0x8009C518; // type:data
 D_8009E6D0 = 0x8009E6D0; // type:data
 nuSiMesgBuf = 0x8009E6F0; // type:data
 siMgrThread = 0x8009E710; // type:data
+D_800A08C0 = 0x800A08C0; // type:data
 blendedCamSettings = 0x800A08C0; // type:data
 D_800A08DC = 0x800A08DC; // type:data
 D_800A08E0 = 0x800A08E0; // type:data
@@ -18819,7 +18918,6 @@ gSpinHistoryPosAngle = 0x8010F6B8; // type:data
 D_80117160 = 0x80117160; // type:data
 dead_gPartnerActionStatus = 0x80117163; // type:data
 dead_gPlayerStatus = 0x80117578; // type:data
-D_80117604 = 0x80117604; // type:data
 dead_gPlayerActionState = 0x8011762C; // type:data
 D_80117840 = 0x80117840; // type:data
 D_80117848 = 0x80117848; // type:data
@@ -19068,6 +19166,7 @@ D_80197000 = 0x80197000; // type:data
 D_801A6000 = 0x801A6000; // type:data
 D_801A7000 = 0x801A7000; // type:data
 D_801AA000 = 0x801AA000; // type:data
+D_80200000 = 0x80200000; // type:data
 gBackgroundImage = 0x80200000; //
 D_80210000 = 0x80210000; // type:data
 D_80219040 = 0x80219040; // type:data
@@ -19170,6 +19269,7 @@ arn_09_pad_4CC = 0x802404CC; // type:data
 flo_22_pad_518 = 0x80240518; // type:data
 dgb_11_pad_56C = 0x8024056C; // type:data
 arn_09_pad_5A8 = 0x802405A8; // type:data
+varTable.2 = 0x80240620; // type:data
 dgb_10_pad_66C = 0x8024066C; // type:data
 arn_11_pad_674 = 0x80240674; // type:data
 sbk_00_pad_78C = 0x8024078C; // type:data
@@ -19224,6 +19324,7 @@ flo_19_pad_1A68 = 0x80241A68; // type:data
 dgb_02_pad_1AA8 = 0x80241AA8; // type:data
 flo_11_pad_1AB8 = 0x80241AB8; // type:data
 arn_03_pad_1BB8 = 0x80241BB8; // type:data
+varTable.32 = 0x80241C68; // type:data
 flo_10_pad_1CA8 = 0x80241CA8; // type:data
 dgb_07_pad_1E74 = 0x80241E88; // type:data
 dgb_15_pad_1E94 = 0x80241E94; // type:data
@@ -19414,12 +19515,14 @@ D_802479F0 = 0x802479F0; // type:data
 D_80247AF0 = 0x80247AF0; // type:data
 D_80247B00 = 0x80247B00; // type:data
 flo_13_D_80247B00 = 0x80247B00; // type:data
+palette.2 = 0x80247B00; // type:data
 D_80247BB8 = 0x80247BB8; // type:data
 D_80247BF0 = 0x80247BF0; // type:data
 D_80247CA0 = 0x80247CA0; // type:data
 D_80247CB4 = 0x80247CB4; // type:data
 D_80247D00 = 0x80247D00; // type:data
 flo_13_D_80247D00 = 0x80247D00; // type:data
+raster.3 = 0x80247D00; // type:data
 D_80247DF0 = 0x80247DF0; // type:data
 D_80247E68 = 0x80247E68; // type:data
 D_80248380 = 0x80248380; // type:data
@@ -19454,6 +19557,7 @@ D_8024B9B4 = 0x8024B9B4; // type:data
 D_8024B9B8 = 0x8024B9B8; // type:data
 D_8024BA90 = 0x8024BA90; // type:data
 flo_13_D_8024BA90 = 0x8024BA90; // type:data
+images.4 = 0x8024BA90; // type:data
 D_8024BB80 = 0x8024BB80; // type:data
 D_8024BDD0 = 0x8024BDD0; // type:data
 D_8024BDE8 = 0x8024BDE8; // type:data
@@ -19463,13 +19567,9 @@ D_8024BDF8 = 0x8024BDF8; // type:data
 D_8024BEA0 = 0x8024BEA0; // type:data
 D_8024C068 = 0x8024C068; // type:data
 filemenu_iterFileIdx = 0x8024C080; // type:data
-filemenu_pressedButtons = 0x8024C084; // type:data
 D_8024C088 = 0x8024C088; // type:data
-filemenu_heldButtons = 0x8024C08C; // type:data
 D_8024C090 = 0x8024C090; // type:data
-filemenu_loadedFileIdx = 0x8024C094; // type:data
 D_8024C098 = 0x8024C098; // type:data
-filemenu_hudElemIDs = 0x8024C0B0; // type:data
 D_8024C100 = 0x8024C100; // type:data
 D_8024C108 = 0x8024C108; // type:data
 D_8024C110 = 0x8024C110; // type:data
@@ -19738,27 +19838,8 @@ D_8026FD98 = 0x8026FD98; // type:data
 D_8026FE78 = 0x8026FE78; // type:data
 D_8026FEE8 = 0x8026FEE8; // type:data
 D_8026FF60 = 0x8026FF60; // type:data
-D_8026FF80 = 0x8026FF80; // type:data
-D_8026FF88 = 0x8026FF88; // type:data
-D_8026FF90 = 0x8026FF90; // type:data
-D_8026FF98 = 0x8026FF98; // type:data
-D_8026FFA0 = 0x8026FFA0; // type:data
-D_8026FFA8 = 0x8026FFA8; // type:data
-D_8026FFB0 = 0x8026FFB0; // type:data
-D_80270040 = 0x80270040; // type:data
-D_80270048 = 0x80270048; // type:data
-D_80270050 = 0x80270050; // type:data
-D_80270058 = 0x80270058; // type:data
-D_80270060 = 0x80270060; // type:data
-D_80270068 = 0x80270068; // type:data
-D_80270070 = 0x80270070; // type:data
 gPauseMenuHeldButtons = 0x802700C0; // type:data
-gPauseMenuPressedButtons = 0x802700C4; // type:data
-gPauseMenuCurrentDescMsg = 0x802700C8; // type:data
-gPauseMenuCurrentDescIconScript = 0x802700CC; // type:data
-D_802700D0 = 0x802700D0; // type:data
-gPauseMenuCurrentTab = 0x802700D4; // type:data
-D_802700E0 = 0x802700E0; // type:data
+bss = 0x802700E4; // type:data
 gPauseMenuCommonIconIDs = 0x802700E8; // type:data
 D_80270108 = 0x80270108; // type:data
 D_8027010C = 0x8027010C; // type:data
@@ -20069,6 +20150,7 @@ D_802A1CD4 = 0x802A1CD4; // type:data
 D_802A1D60 = 0x802A1D60; // type:data
 D_802A21F0 = 0x802A21F0; // type:data
 D_802A2280 = 0x802A2280; // type:data
+itemIcon = 0x802A2410; // type:data
 D_802A25C8 = 0x802A25C8; // type:data
 D_802A25E4 = 0x802A25E4; // type:data
 D_802A25E8 = 0x802A25E8; // type:data
@@ -20469,8 +20551,6 @@ D_802E9170 = 0x802E9170; // type:data
 D_802E91F0 = 0x802E91F0; // type:data
 D_802E9270 = 0x802E9270; // type:data
 D_802E92B0 = 0x802E92B0; // type:data
-D_802E98E0 = 0x802E98E0; // type:data
-D_802E9904 = 0x802E9904; // type:data
 D_802E99DC = 0x802E99DC; // type:data
 D_802E9E54 = 0x802E9E54; // type:data
 D_802E9E80 = 0x802E9E80; // type:data
@@ -20574,13 +20654,19 @@ D_D9FCFFFF = 0xD9FCFFFF; // type:data
 D_E0002760 = 0xE0002760; // type:data
 D_E0002788 = 0xE0002788; // type:data
 D_E00027B0 = 0xE00027B0; // type:data
+sPartScales = 0xE00027B0; // type:data
 D_E00027D8 = 0xE00027D8; // type:data
+sPartYaws = 0xE00027D8; // type:data
 D_E0002800 = 0xE0002800; // type:data
+sDlists = 0xE0002800; // type:data
 D_E000CC10 = 0xE000CC10; // type:data
 sDlists2 = 0xE000CC24; // type:data
+D_E000CC38 = 0xE000CC38; // type:data
+D_E000CC48 = 0xE000CC48; // type:data
+D_E000CC5C = 0xE000CC5C; // type:data
+D_E000CCE0 = 0xE000CCE0; // type:data
 D_E000CD24 = 0xE000CD24; // type:data
 jtbl_E000CD70 = 0xE000CD70; // type:data
-D_E000E684 = 0xE000E684; // type:data
 D_E0010710 = 0xE0010710; // type:data
 D_E0014780 = 0xE0014780; // type:data
 D_E0014788 = 0xE0014788; // type:data
@@ -20953,6 +21039,7 @@ D_E0090AB8 = 0xE0090AB8; // type:data
 D_E0090AC0 = 0xE0090AC0; // type:data
 D_E0092690 = 0xE0092690; // type:data
 D_E00926A4 = 0xE00926A4; // type:data
+sPartParams = 0xE00926A4; // type:data
 D_E0092700 = 0xE0092700; // type:data
 D_E00947B0 = 0xE00947B0; // type:data
 D_E00947B8 = 0xE00947B8; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 2bcc1fee64..f0e288c9d9 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -1,6 +1,9 @@
+// plain values
 D_00000094 = 0x94;
 D_00000094_2 = 0x94;
 D_000001E4 = 0x1E4;
+
+// 0x0A
 D_0A000808 = 0x0A000808;
 D_0A000328 = 0x0A000328;
 D_0A000380 = 0x0A000380;
@@ -20,18 +23,50 @@ D_0A001218 = 0x0A001218;
 D_0A003F70 = 0x0A003F70;
 D_0A002318 = 0x0A002318;
 D_0A003508 = 0x0A003508;
-D_00E32420 = 0x00E32420;
-D_00E35670 = 0x00E35670;
-D_00E38890 = 0x00E38890;
-D_00E3B870 = 0x00E3B870;
-D_00E3E260 = 0x00E3E260;
-D_00E42240 = 0x00E42240;
-D_00E4B2E0 = 0x00E4B2E0;
-D_00E4E7F0 = 0x00E4E7F0;
-D_00E62370 = 0x00E62370;
-D_00E62AC0 = 0x00E62AC0;
-D_00E639C0 = 0x00E639C0;
-D_00E648D0 = 0x00E648D0;
+
+// Likely fake
+D_8887FFFB = 0x8887FFFB;
+D_A0000000 = 0xA0000000;
+D_A4000000 = 0xA4000000;
+D_A4000768 = 0xA4000768;
+D_A4001000 = 0xA4001000;
+D_A4040010 = 0xA4040010;
+D_A4300000 = 0xA4300000;
+D_A4300004 = 0xA4300004;
+D_A4300008 = 0xA4300008;
+D_A430000C = 0xA430000C;
+D_A4400010 = 0xA4400010;
+D_A450000C = 0xA450000C;
+D_A4600004 = 0xA4600004;
+D_A460000C = 0xA460000C;
+D_A4600010 = 0xA4600010;
+D_A4700000 = 0xA4700000;
+D_A4700010 = 0xA4700010;
+D_A4800018 = 0xA4800018;
+D_A6000000 = 0xA6000000;
+D_B0000000 = 0xB0000000;
+D_B0000008 = 0xB0000008;
+D_B0000010 = 0xB0000010;
+D_D9FCFFFF = 0xD9FCFFFF;
+D_E001C5E0 = 0xE001C5E0;
+D_E007EC2F = 0xE007EC2F;
+D_E00963E0 = 0xE00963E0;
+D_E1000010 = 0xE1000010;
+D_E7000008 = 0xE7000008;
+D_E8000008 = 0xE8000008;
+D_F0000008 = 0xF0000008;
+D_F1FFFFFF = 0xF1FFFFFF;
+D_F5000007 = 0xF5000007;
+D_F79DDD0F = 0xF79DDD0F;
+D_FA000028 = 0xFA000028;
+D_FD100008 = 0xFD100008;
+
+// Obfuscation symbols
+D_7012ACA1 = 0x7012ACA1;
+D_7012BC11 = 0x7012BC11;
+D_80026AC7 = 0x80026AC7;
+D_8004AA85 = 0x8004AA85;
+
 gBackgroundImage = 0x80200000;
 func_80242040_8B20B0 = 0x80242040;
 spiked_goomba = 0x8021B0AC;
@@ -40,10 +75,7 @@ D_802C05CC = 0x802C05CC;
 gPauseMenuMsgs = 0x8026F778;
 D_802442D0 = 0x802442D0;
 D_802AB513 = 0x802AB513;
-D_802E9904 = 0x802E9904;
-D_802E98E0 = 0x802E98E0;
 D_802E99DC = 0x802E99DC;
-D_80093DB0 = 0x80093DB0;
 D_80247AF0_CCB300 = 0x80247AF0;
 D_802491C0_CA70E0 = 0x802491C0;
 D_80246568_C8C018 = 0x80246568;
@@ -53,8 +85,6 @@ D_803B5000 = 0x803B5000;
 D_802EF0D0 = 0x802EF0D0;
 D_800FBB60 = 0x800FBB60;
 D_800FBBE0 = 0x800FBBE0;
-D_7012BC11 = 0x7012BC11;
-D_7012ACA1 = 0x7012ACA1;
 D_80200000 = 0x80200000;
 D_80000000 = 0x80000000;
 osTvType = 0x80000300;
@@ -62,16 +92,6 @@ D_80000308 = 0x80000308;
 D_8000030C = 0x8000030C;
 osMemSize = 0x80000318;
 D_8000031C = 0x8000031C;
-D_80026AC7 = 0x80026AC7;
-D_8004AA85 = 0x8004AA85;
-D_80117160 = 0x80117160;
-dead_gPartnerActionStatus = 0x80117163;
-dead_gPlayerStatus = 0x80117578;
-D_80117604 = 0x80117604;
-dead_gPlayerActionState = 0x8011762C;
-D_80117840 = 0x80117840;
-D_80117848 = 0x80117848;
-D_80117852 = 0x80117852;
 D_801512B0 = 0x801512B0;
 D_801512B4 = 0x801512B4;
 D_800A08C0 = 0x800A08C0;
@@ -1240,54 +1260,38 @@ D_802F4560 = 0x802F4560;
 D_802FB800 = 0x802FB800;
 gSpriteHeapPtr = 0x8034F800;
 D_803DA800 = 0x803DA800;
-D_8887FFFB = 0x8887FFFB;
-D_A0000000 = 0xA0000000;
-D_A4000000 = 0xA4000000;
-D_A4000768 = 0xA4000768;
-D_A4001000 = 0xA4001000;
-D_A4040010 = 0xA4040010;
-D_A4300000 = 0xA4300000;
-D_A4300004 = 0xA4300004;
-D_A4300008 = 0xA4300008;
-D_A430000C = 0xA430000C;
-D_A4400010 = 0xA4400010;
-D_A450000C = 0xA450000C;
-D_A4600004 = 0xA4600004;
-D_A460000C = 0xA460000C;
-D_A4600010 = 0xA4600010;
-D_A4700000 = 0xA4700000;
-D_A4700010 = 0xA4700010;
-D_A4800018 = 0xA4800018;
-D_A6000000 = 0xA6000000;
-D_B0000000 = 0xB0000000;
-D_B0000008 = 0xB0000008;
-D_B0000010 = 0xB0000010;
-D_D9FCFFFF = 0xD9FCFFFF;
-D_E001C5E0 = 0xE001C5E0;
-D_E007EC2F = 0xE007EC2F;
-D_E00963E0 = 0xE00963E0;
-D_E1000010 = 0xE1000010;
-D_E7000008 = 0xE7000008;
-D_E8000008 = 0xE8000008;
-D_F0000008 = 0xF0000008;
-D_F1FFFFFF = 0xF1FFFFFF;
-D_F5000007 = 0xF5000007;
-D_F79DDD0F = 0xF79DDD0F;
-D_FA000028 = 0xFA000028;
-D_FD100008 = 0xFD100008;
 D_802510B0 = 0x802510B0;
 D_8026A2B0 = 0x8026A2B0;
 
-// effect 7
+// effect_7
 D_09002780 = 0x09002780;
 D_09002868 = 0x09002868;
 D_09002950 = 0x09002950;
 D_09002B20 = 0x09002B20;
 D_09002B40 = 0x09002B40;
 
-// effect 8
+// effect_8
 D_09000E08 = 0x09000E08;
 
+// effect_9
+D_09000E20 = 0x09000E20;
+D_09000E38 = 0x09000E38;
+
+// effect_73
+D_090002C0 = 0x090002C0;
+D_09000330 = 0x09000330;
+D_09000370 = 0x09000370;
+D_090003B0 = 0x090003B0;
+D_090003F0 = 0x090003F0;
+D_09000430 = 0x09000430;
+D_09000470 = 0x09000470;
+
+// effect_75
+D_09001280 = 0x09001280;
+D_09001358 = 0x09001358;
+D_09001430 = 0x09001430;
+D_09001508 = 0x09001508;
+
 // BSS syms found in main overlay
 #ifndef NON_MATCHING
 nuScPreNMIFlag = 0x8009A5B0;
@@ -1831,3 +1835,10 @@ func_801266F8 = 0x801266F8;
 func_80126734 = 0x80126734;
 dead_set_screen_overlay_params_back = 0x80144194;
 dead_gItemTable = 0x8008D2C0;
+dead_gPartnerActionStatus = 0x80117163;
+dead_gPlayerStatus = 0x80117578;
+dead_gPlayerActionState = 0x8011762C;
+D_80117160 = 0x80117160;
+D_80117840 = 0x80117840;
+D_80117848 = 0x80117848;
+D_80117852 = 0x80117852;