diff --git a/include/effects_internal.h b/include/effects_internal.h
index 3f40caa49b..1ae7058720 100644
--- a/include/effects_internal.h
+++ b/include/effects_internal.h
@@ -20,5 +20,6 @@ void shim_guRotateF(float mf[4][4], float a, float x, float y, float z);
 void shim_guTranslateF(float mf[4][4], float x, float y, float z);
 void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z);
 void shim_mem_clear(s8* data, s32 numBytes);
-
+void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
+    
 #endif
diff --git a/include/enums.h b/include/enums.h
index 4ff39ee438..f588692458 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -1710,6 +1710,7 @@ enum RenderMode {
     RENDER_MODE_SURFACE_XLU_NO_ZB                = 0x00000014,
     RENDER_MODE_SURFXLU_ZB_ZUPD                  = 0x00000015,
     RENDER_MODE_SURFACE_XLU_LAYER2               = 0x00000016,
+    RENDER_MODE_17                               = 0x00000017,
     RENDER_MODE_DECAL_XLU                        = 0x0000001A,
     RENDER_MODE_DECAL_XLU_NOAA                   = 0x0000001C,
     RENDER_MODE_SHADOW                           = 0x00000020,
diff --git a/src/190B20.c b/src/190B20.c
index c984e74f6c..e304842527 100644
--- a/src/190B20.c
+++ b/src/190B20.c
@@ -1069,6 +1069,8 @@ s32 bActorMessages[] = {
 
 s32 D_802838F8 = 0;
 
+extern Gfx D_80293970[];
+
 extern Bytecode D_80293820[];
 
 void create_target_list(Actor* actor, s32 arg1);
@@ -2078,14 +2080,11 @@ void remove_player_buffs(s32 buffs) {
 
 INCLUDE_ASM(s32, "190B20", btl_update_ko_status);
 
-#ifdef NON_EQUIVALENT
-extern s32 D_80293970;
-
-void btl_appendGfx_prim_quad(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7) {
+void btl_appendGfx_prim_quad(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 right, u16 bottom) {
     gDPPipeSync(gMasterGfxPos++);
-    gSPDisplayList(gMasterGfxPos++, &D_80293970);
+    gSPDisplayList(gMasterGfxPos++, D_80293970);
 
-    if ((arg3 & 0xFF) == 0xFF) {
+    if (a == 255) {
         gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
         gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1);
     } else {
@@ -2093,17 +2092,13 @@ void btl_appendGfx_prim_quad(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4, s
         gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
     }
 
-    gDPSetPrimColor(gMasterGfxPos++, 0, 0, arg0, arg1, arg2, arg3);
-    gDPFillRectangle(gMasterGfxPos++, arg4, arg5, arg6, arg7);
-    gDPPipeSync(gMasterGfxPos++);
+    gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a);
+    gDPFillRectangle(gMasterGfxPos++, left, top, right, bottom);
 
+    gDPPipeSync(gMasterGfxPos++);
     gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2);
     gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA);
 }
-#else
-void btl_appendGfx_prim_quad(u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7);
-INCLUDE_ASM(s32, "190B20", btl_appendGfx_prim_quad, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7);
-#endif
 
 void btl_draw_prim_quad(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
     u16 new_var = arg4 + arg6;
diff --git a/src/43F0.c b/src/43F0.c
index a554220f67..780692f1e9 100644
--- a/src/43F0.c
+++ b/src/43F0.c
@@ -796,7 +796,6 @@ void appendGfx_startup_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16
     gDPPipeSync(gMasterGfxPos++);
     gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2);
     gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA);
-
 }
 
 void startup_draw_prim_rect_COPY(s16 left, s16 top, s16 right, s16 bottom, u16 r, u16 g, u16 b, u16 a) {
diff --git a/src/effects/effect_100.c b/src/effects/effect_100.c
index 8752805327..81d19fa52a 100644
--- a/src/effects/effect_100.c
+++ b/src/effects/effect_100.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_100_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_100", fx_100_main);
 
@@ -7,7 +10,18 @@ void fx_100_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_100", fx_100_update);
 
-INCLUDE_ASM(s32, "effects/effect_100", fx_100_render);
+void fx_100_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_100_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00C844C(void) {
 }
diff --git a/src/effects/effect_101.c b/src/effects/effect_101.c
index be9390e131..48c6c7c2f1 100644
--- a/src/effects/effect_101.c
+++ b/src/effects/effect_101.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_101_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_101", fx_101_main);
 
@@ -7,6 +10,17 @@ void fx_101_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_101", fx_101_update);
 
-INCLUDE_ASM(s32, "effects/effect_101", fx_101_render);
+void fx_101_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_101_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_101", fx_101_appendGfx);
diff --git a/src/effects/effect_102.c b/src/effects/effect_102.c
index e668a215b5..d013d9d6b2 100644
--- a/src/effects/effect_102.c
+++ b/src/effects/effect_102.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_102_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_102", fx_102_main);
 
@@ -7,7 +10,18 @@ void fx_102_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_102", fx_102_update);
 
-INCLUDE_ASM(s32, "effects/effect_102", fx_102_render);
+void fx_102_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_102_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00CC9C8(void) {
 }
diff --git a/src/effects/effect_103.c b/src/effects/effect_103.c
index c88e60d836..d1682d1db1 100644
--- a/src/effects/effect_103.c
+++ b/src/effects/effect_103.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_103_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_103", fx_103_main);
 
@@ -7,7 +10,18 @@ void fx_103_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_103", fx_103_update);
 
-INCLUDE_ASM(s32, "effects/effect_103", fx_103_render);
+void fx_103_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_103_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00CE470(void) {
 }
diff --git a/src/effects/effect_104.c b/src/effects/effect_104.c
index c6fc2fc205..2e690c3cf9 100644
--- a/src/effects/effect_104.c
+++ b/src/effects/effect_104.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_104_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_104", fx_104_main);
 
@@ -7,6 +10,17 @@ void fx_104_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_104", fx_104_update);
 
-INCLUDE_ASM(s32, "effects/effect_104", fx_104_render);
+void fx_104_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_104_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_104", fx_104_appendGfx);
diff --git a/src/effects/effect_105.c b/src/effects/effect_105.c
index 4afe0af763..33f5e6e7c8 100644
--- a/src/effects/effect_105.c
+++ b/src/effects/effect_105.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_105_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_105", fx_105_main);
 
@@ -7,7 +10,18 @@ void fx_105_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_105", fx_105_update);
 
-INCLUDE_ASM(s32, "effects/effect_105", fx_105_render);
+void fx_105_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_105_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00D227C(void) {
 }
diff --git a/src/effects/effect_107.c b/src/effects/effect_107.c
index 5050ae0deb..1afb5650f9 100644
--- a/src/effects/effect_107.c
+++ b/src/effects/effect_107.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_107_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_107", fx_107_main);
 
@@ -7,7 +10,17 @@ void fx_107_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_107", fx_107_update);
 
-INCLUDE_ASM(s32, "effects/effect_107", fx_107_render);
+void fx_107_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_107_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 void func_E00D6978(void) {
 }
diff --git a/src/effects/effect_108.c b/src/effects/effect_108.c
index d75f1b0f42..638228dc6b 100644
--- a/src/effects/effect_108.c
+++ b/src/effects/effect_108.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_108", fx_108_main);
 
diff --git a/src/effects/effect_109.c b/src/effects/effect_109.c
index 1512f854c7..c9e7b323a5 100644
--- a/src/effects/effect_109.c
+++ b/src/effects/effect_109.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_109_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_109", fx_109_main);
 
@@ -7,7 +10,18 @@ void fx_109_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_109", fx_109_update);
 
-INCLUDE_ASM(s32, "effects/effect_109", fx_109_render);
+void fx_109_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_109_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00DA228(void) {
 }
diff --git a/src/effects/effect_11.c b/src/effects/effect_11.c
index 0c6416f82e..ba8385d50d 100644
--- a/src/effects/effect_11.c
+++ b/src/effects/effect_11.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_11_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_11", fx_11_main);
 
@@ -7,6 +10,17 @@ void fx_11_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_11", fx_11_update);
 
-INCLUDE_ASM(s32, "effects/effect_11", fx_11_render);
+void fx_11_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_11_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_11", fx_11_appendGfx);
diff --git a/src/effects/effect_110.c b/src/effects/effect_110.c
index 255c103e51..b491b80544 100644
--- a/src/effects/effect_110.c
+++ b/src/effects/effect_110.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_110_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_110", fx_110_main);
 
@@ -7,7 +10,17 @@ void fx_110_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_110", fx_110_update);
 
-INCLUDE_ASM(s32, "effects/effect_110", fx_110_render);
+void fx_110_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_110_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 void func_E00DC2FC(void) {
 }
diff --git a/src/effects/effect_111.c b/src/effects/effect_111.c
index 877d247c71..4cf135d117 100644
--- a/src/effects/effect_111.c
+++ b/src/effects/effect_111.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_111_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_111", fx_111_main);
 
@@ -7,6 +10,17 @@ void fx_111_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_111", fx_111_update);
 
-INCLUDE_ASM(s32, "effects/effect_111", fx_111_render);
+void fx_111_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_111_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 6;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_111", fx_111_appendGfx);
diff --git a/src/effects/effect_112.c b/src/effects/effect_112.c
index f0a245cce6..773fcfae61 100644
--- a/src/effects/effect_112.c
+++ b/src/effects/effect_112.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_112_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_112", fx_112_main);
 
@@ -7,7 +10,18 @@ void fx_112_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_112", fx_112_update);
 
-INCLUDE_ASM(s32, "effects/effect_112", fx_112_render);
+void fx_112_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_112_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00E05F8(void) {
 }
diff --git a/src/effects/effect_113.c b/src/effects/effect_113.c
index 62da68a101..61cdf11c94 100644
--- a/src/effects/effect_113.c
+++ b/src/effects/effect_113.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_113_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_113", fx_113_main);
 
@@ -7,7 +10,18 @@ void fx_113_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_113", fx_113_update);
 
-INCLUDE_ASM(s32, "effects/effect_113", fx_113_render);
+void fx_113_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_113_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00E2210(void) {
 }
diff --git a/src/effects/effect_114.c b/src/effects/effect_114.c
index b4aae4d1a3..49433cc658 100644
--- a/src/effects/effect_114.c
+++ b/src/effects/effect_114.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_114_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_114", fx_114_main);
 
@@ -7,7 +10,18 @@ void fx_114_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_114", fx_114_update);
 
-INCLUDE_ASM(s32, "effects/effect_114", fx_114_render);
+void fx_114_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_114_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 7;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00E4954(void) {
 }
diff --git a/src/effects/effect_115.c b/src/effects/effect_115.c
index d0e2766ab5..20c5268c1d 100644
--- a/src/effects/effect_115.c
+++ b/src/effects/effect_115.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_115_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_115", fx_115_main);
 
@@ -7,7 +10,18 @@ void fx_115_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_115", fx_115_update);
 
-INCLUDE_ASM(s32, "effects/effect_115", fx_115_render);
+void fx_115_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_115_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00E651C(void) {
 }
diff --git a/src/effects/effect_116.c b/src/effects/effect_116.c
index 480176f802..a63742d4d8 100644
--- a/src/effects/effect_116.c
+++ b/src/effects/effect_116.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_116_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_116", fx_116_main);
 
@@ -7,6 +10,17 @@ void fx_116_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_116", fx_116_update);
 
-INCLUDE_ASM(s32, "effects/effect_116", fx_116_render);
+void fx_116_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_116_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_116", fx_116_appendGfx);
diff --git a/src/effects/effect_117.c b/src/effects/effect_117.c
index b167f17d2a..2134017f12 100644
--- a/src/effects/effect_117.c
+++ b/src/effects/effect_117.c
@@ -1,4 +1,18 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect117 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+} Effect117; // size = 0x??
+
+void fx_117_appendGfx(EffectInstance* effect);
+
+s32 D_E00EAA50[2] = { 0x09001A00, 0x09001A20 };
+
+s32 D_E00EAA58[2] = { 0x09001910, 0x00000000 };
 
 INCLUDE_ASM(s32, "effects/effect_117", fx_117_main);
 
@@ -7,7 +21,38 @@ void fx_117_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_117", fx_117_update);
 
-INCLUDE_ASM(s32, "effects/effect_117", fx_117_render);
+void fx_117_render(EffectInstance* effect) {
+    Effect117* effect117 = effect->data;
+    RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
+    RenderTask* retTask;
+    s32 outDist;
+    f32 outX;
+    f32 outY;
+    f32 outZ;
+    f32 outS;
+
+    shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix[0], effect117->unk_04, effect117->unk_08, effect117->unk_0C, 1.0f, &outX, &outY, &outZ, &outS);
+    
+    outDist = outZ + 5000;
+    if (outDist < 0) {
+        outDist = 0;
+    } else if (outDist > 10000) {
+        outDist = 10000;
+    }
+
+    if (outS < 0.01 && -0.01 < outS) {
+        outDist = 0;
+    }
+    
+    renderTaskPtr->appendGfx = fx_117_appendGfx;
+    renderTaskPtr->distance = -outDist;
+    renderTaskPtr->appendGfxArg = effect;
+    renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(renderTaskPtr);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00EA664(void) {
 }
diff --git a/src/effects/effect_119.c b/src/effects/effect_119.c
index 23f13bf7dc..0cfad33946 100644
--- a/src/effects/effect_119.c
+++ b/src/effects/effect_119.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_119_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_119", fx_119_main);
 
@@ -7,6 +10,17 @@ void fx_119_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_119", fx_119_update);
 
-INCLUDE_ASM(s32, "effects/effect_119", fx_119_render);
+void fx_119_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_119_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 700;
+    renderTask.renderMode =  RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_119", fx_119_appendGfx);
diff --git a/src/effects/effect_12.c b/src/effects/effect_12.c
index 25bd8b402d..3f2cc766fe 100644
--- a/src/effects/effect_12.c
+++ b/src/effects/effect_12.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_12_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_12", func_E0018000);
 
@@ -9,7 +12,18 @@ void fx_12_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_12", fx_12_update);
 
-INCLUDE_ASM(s32, "effects/effect_12", fx_12_render);
+void fx_12_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_12_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_12", func_E00183BC);
 
diff --git a/src/effects/effect_120.c b/src/effects/effect_120.c
index e9c1e04def..771e836348 100644
--- a/src/effects/effect_120.c
+++ b/src/effects/effect_120.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_120_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_120", fx_120_main);
 
@@ -7,6 +10,17 @@ void fx_120_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_120", fx_120_update);
 
-INCLUDE_ASM(s32, "effects/effect_120", fx_120_render);
+void fx_120_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_120_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_120", fx_120_appendGfx);
diff --git a/src/effects/effect_121.c b/src/effects/effect_121.c
index 400fee49ff..4969a6d493 100644
--- a/src/effects/effect_121.c
+++ b/src/effects/effect_121.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_121_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_121", func_E010E000);
 
@@ -9,6 +12,17 @@ void fx_121_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_121", fx_121_update);
 
-INCLUDE_ASM(s32, "effects/effect_121", fx_121_render);
+void fx_121_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_121_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_121", fx_121_appendGfx);
diff --git a/src/effects/effect_122.c b/src/effects/effect_122.c
index 54a6fb8b6c..2ff244686f 100644
--- a/src/effects/effect_122.c
+++ b/src/effects/effect_122.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_122_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_122", fx_122_main);
 
@@ -7,6 +10,17 @@ void fx_122_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_122", fx_122_update);
 
-INCLUDE_ASM(s32, "effects/effect_122", fx_122_render);
+void fx_122_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_122_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_122", fx_122_appendGfx);
diff --git a/src/effects/effect_123.c b/src/effects/effect_123.c
index c2c8877ba1..4d31b98f5b 100644
--- a/src/effects/effect_123.c
+++ b/src/effects/effect_123.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_123_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_123", fx_123_main);
 
@@ -7,7 +10,18 @@ void fx_123_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_123", fx_123_update);
 
-INCLUDE_ASM(s32, "effects/effect_123", fx_123_render);
+void fx_123_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_123_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_123", func_E0112330);
 
diff --git a/src/effects/effect_124.c b/src/effects/effect_124.c
index e5d308c300..e77b459556 100644
--- a/src/effects/effect_124.c
+++ b/src/effects/effect_124.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_124_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_124", fx_124_main);
 
@@ -7,6 +10,17 @@ void fx_124_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_124", fx_124_update);
 
-INCLUDE_ASM(s32, "effects/effect_124", fx_124_render);
+void fx_124_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_124_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_124", fx_124_appendGfx);
diff --git a/src/effects/effect_125.c b/src/effects/effect_125.c
index 6e036c77c4..93afc9990b 100644
--- a/src/effects/effect_125.c
+++ b/src/effects/effect_125.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_125_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_125", fx_125_main);
 
@@ -7,7 +10,18 @@ void fx_125_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_125", fx_125_update);
 
-INCLUDE_ASM(s32, "effects/effect_125", fx_125_render);
+void fx_125_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_125_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_125", func_E01166E8);
 
diff --git a/src/effects/effect_126.c b/src/effects/effect_126.c
index f9715350ea..25c79eeaea 100644
--- a/src/effects/effect_126.c
+++ b/src/effects/effect_126.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_126_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_126", fx_126_main);
 
@@ -7,6 +10,17 @@ void fx_126_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_126", fx_126_update);
 
-INCLUDE_ASM(s32, "effects/effect_126", fx_126_render);
+void fx_126_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_126_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_126", fx_126_appendGfx);
diff --git a/src/effects/effect_127.c b/src/effects/effect_127.c
index 999966cf0f..8642305236 100644
--- a/src/effects/effect_127.c
+++ b/src/effects/effect_127.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_127", fx_127_main);
 
diff --git a/src/effects/effect_128.c b/src/effects/effect_128.c
index cb2890da47..ec3390c8e0 100644
--- a/src/effects/effect_128.c
+++ b/src/effects/effect_128.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_128_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_128", fx_128_main);
 
@@ -7,6 +10,17 @@ void fx_128_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_128", fx_128_update);
 
-INCLUDE_ASM(s32, "effects/effect_128", fx_128_render);
+void fx_128_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_128_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_128", fx_128_appendGfx);
diff --git a/src/effects/effect_129.c b/src/effects/effect_129.c
index d0c4551c35..27c2a53727 100644
--- a/src/effects/effect_129.c
+++ b/src/effects/effect_129.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_129_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_129", fx_129_main);
 
@@ -7,6 +10,17 @@ void fx_129_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_129", fx_129_update);
 
-INCLUDE_ASM(s32, "effects/effect_129", fx_129_render);
+void fx_129_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_129_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 5;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_129", fx_129_appendGfx);
diff --git a/src/effects/effect_13.c b/src/effects/effect_13.c
index 3072c35576..f2c345507b 100644
--- a/src/effects/effect_13.c
+++ b/src/effects/effect_13.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_13_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_13", fx_13_main);
 
@@ -7,6 +10,17 @@ void fx_13_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_13", fx_13_update);
 
-INCLUDE_ASM(s32, "effects/effect_13", fx_13_render);
+void fx_13_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_13_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_13", fx_13_appendGfx);
diff --git a/src/effects/effect_130.c b/src/effects/effect_130.c
index 1980541003..47c6b19869 100644
--- a/src/effects/effect_130.c
+++ b/src/effects/effect_130.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_130_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_130", fx_130_main);
 
@@ -7,6 +10,17 @@ void fx_130_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_130", fx_130_update);
 
-INCLUDE_ASM(s32, "effects/effect_130", fx_130_render);
+void fx_130_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_130_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_130", fx_130_appendGfx);
diff --git a/src/effects/effect_131.c b/src/effects/effect_131.c
index 9c62349dab..e712d70670 100644
--- a/src/effects/effect_131.c
+++ b/src/effects/effect_131.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_131_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_131", fx_131_main);
 
@@ -7,6 +10,17 @@ void fx_131_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_131", fx_131_update);
 
-INCLUDE_ASM(s32, "effects/effect_131", fx_131_render);
+void fx_131_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_131_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_131", fx_131_appendGfx);
diff --git a/src/effects/effect_132.c b/src/effects/effect_132.c
index 10da8ef2e7..f9a4940f70 100644
--- a/src/effects/effect_132.c
+++ b/src/effects/effect_132.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_132_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_132", fx_132_main);
 
@@ -7,6 +10,16 @@ void fx_132_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_132", fx_132_update);
 
-INCLUDE_ASM(s32, "effects/effect_132", fx_132_render);
+void fx_132_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_132_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_132", fx_132_appendGfx);
diff --git a/src/effects/effect_133.c b/src/effects/effect_133.c
index d1d6d8fd72..4690b18474 100644
--- a/src/effects/effect_133.c
+++ b/src/effects/effect_133.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_133_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_133", fx_133_main);
 
@@ -7,6 +10,17 @@ void fx_133_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_133", fx_133_update);
 
-INCLUDE_ASM(s32, "effects/effect_133", fx_133_render);
+void fx_133_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_133_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_133", fx_133_appendGfx);
diff --git a/src/effects/effect_134.c b/src/effects/effect_134.c
index 7b75a31aea..8d0182f9c4 100644
--- a/src/effects/effect_134.c
+++ b/src/effects/effect_134.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_134_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_134", fx_134_main);
 
@@ -7,6 +10,17 @@ void fx_134_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_134", fx_134_update);
 
-INCLUDE_ASM(s32, "effects/effect_134", fx_134_render);
+void fx_134_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_134_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_134", fx_134_appendGfx);
diff --git a/src/effects/effect_14.c b/src/effects/effect_14.c
index 9b17ad5c16..09d8a43f3b 100644
--- a/src/effects/effect_14.c
+++ b/src/effects/effect_14.c
@@ -1,4 +1,13 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect14 {
+    /* 0x00 */ f32 xPos; //xPos
+    /* 0x04 */ f32 yPos; //yPos
+    /* 0x08 */ f32 zPos; //zPos
+} Effect14; // size = 0x??
+
+void fx_14_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_14", fx_14_main);
 
@@ -7,6 +16,40 @@ void fx_14_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_14", fx_14_update);
 
-INCLUDE_ASM(s32, "effects/effect_14", fx_14_render);
+void fx_14_render(EffectInstance* effect) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Effect14* effect14 = effect->data;
+    RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
+    RenderTask* retTask;
+    f32 effectPos = effect14->xPos;
+    f32 playerPos = playerStatus->position.x;
+    
+    if (effectPos - playerPos > 200) {
+        effect14->xPos = effectPos - 400;
+    } else {
+        if (playerPos - effectPos > 200) {
+            effect14->xPos = effectPos + 400;
+        }
+    }
+
+    effectPos = effect14->zPos;
+    playerPos = playerStatus->position.z;
+    if (effectPos - playerPos > 200) {
+        effect14->zPos = effectPos - 400;
+    } else {
+        if (playerPos - effectPos > 200) {
+            effect14->zPos = effectPos + 400;
+        }
+    }
+
+    renderTaskPtr->appendGfx = &fx_14_appendGfx;
+    renderTaskPtr->appendGfxArg = effect;
+    renderTaskPtr->distance = 0;
+    renderTaskPtr->renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(renderTaskPtr);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_14", fx_14_appendGfx);
diff --git a/src/effects/effect_15.c b/src/effects/effect_15.c
index e281ab7a5a..74b2faefa5 100644
--- a/src/effects/effect_15.c
+++ b/src/effects/effect_15.c
@@ -1,4 +1,12 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect15 {
+    /* 0x00 */ char unk_00[0x38];
+    /* 0x38 */ s32 unk_38;
+} Effect15; // size = 0x??
+
+void fx_15_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_15", fx_15_main);
 
@@ -7,6 +15,24 @@ void fx_15_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_15", fx_15_update);
 
-INCLUDE_ASM(s32, "effects/effect_15", fx_15_render);
+void fx_15_render(EffectInstance* effect) {
+    Effect15* effect15 = effect->data;
+    RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
+    RenderTask* retTask;
+    s32 renderModeTemp;
+
+    renderTask.appendGfxArg = effect;
+    renderTask.appendGfx = fx_15_appendGfx;
+    renderTask.distance = 0;
+    if (effect15->unk_38 != 0) {
+        renderModeTemp = RENDER_MODE_2D;
+    } else {
+        renderModeTemp = RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0;
+    }
+    renderTaskPtr->renderMode = renderModeTemp;
+    
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_15", fx_15_appendGfx);
diff --git a/src/effects/effect_16.c b/src/effects/effect_16.c
index 1fc51135f0..8a21698177 100644
--- a/src/effects/effect_16.c
+++ b/src/effects/effect_16.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_16_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_16", func_E0020000);
 
@@ -9,6 +12,17 @@ void fx_16_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_16", fx_16_update);
 
-INCLUDE_ASM(s32, "effects/effect_16", fx_16_render);
+void fx_16_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_16_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_16", fx_16_appendGfx);
diff --git a/src/effects/effect_17.c b/src/effects/effect_17.c
index 2ed48d8816..e6e3dfb247 100644
--- a/src/effects/effect_17.c
+++ b/src/effects/effect_17.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_17_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_17", fx_17_main);
 
@@ -7,6 +10,16 @@ void fx_17_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_17", fx_17_update);
 
-INCLUDE_ASM(s32, "effects/effect_17", fx_17_render);
+void fx_17_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_17_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_17", fx_17_appendGfx);
diff --git a/src/effects/effect_18.c b/src/effects/effect_18.c
index c75babda33..e87a5e10a1 100644
--- a/src/effects/effect_18.c
+++ b/src/effects/effect_18.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_18_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_18", fx_18_main);
 
@@ -7,7 +10,18 @@ void fx_18_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_18", fx_18_update);
 
-INCLUDE_ASM(s32, "effects/effect_18", fx_18_render);
+void fx_18_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_18_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_18", func_E0024324);
 
diff --git a/src/effects/effect_19.c b/src/effects/effect_19.c
index 6f65e43dd8..2798bb5741 100644
--- a/src/effects/effect_19.c
+++ b/src/effects/effect_19.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_19_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_19", fx_19_main);
 
@@ -7,6 +10,17 @@ void fx_19_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_19", fx_19_update);
 
-INCLUDE_ASM(s32, "effects/effect_19", fx_19_render);
+void fx_19_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_19_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_19", fx_19_appendGfx);
diff --git a/src/effects/effect_20.c b/src/effects/effect_20.c
index a4e16f77b4..409baef29d 100644
--- a/src/effects/effect_20.c
+++ b/src/effects/effect_20.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_20_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_20", fx_20_main);
 
@@ -7,6 +10,17 @@ void fx_20_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_20", fx_20_update);
 
-INCLUDE_ASM(s32, "effects/effect_20", fx_20_render);
+void fx_20_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_20_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_20", fx_20_appendGfx);
diff --git a/src/effects/effect_21.c b/src/effects/effect_21.c
index afab84669b..ddc4fa2126 100644
--- a/src/effects/effect_21.c
+++ b/src/effects/effect_21.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_21_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_21", fx_21_main);
 
@@ -7,6 +10,17 @@ void fx_21_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_21", fx_21_update);
 
-INCLUDE_ASM(s32, "effects/effect_21", fx_21_render);
+void fx_21_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_21_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_21", fx_21_appendGfx);
diff --git a/src/effects/effect_22.c b/src/effects/effect_22.c
index 5ad5087985..0d6f112d30 100644
--- a/src/effects/effect_22.c
+++ b/src/effects/effect_22.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_22_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_22", fx_22_main);
 
@@ -7,6 +10,17 @@ void fx_22_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_22", fx_22_update);
 
-INCLUDE_ASM(s32, "effects/effect_22", fx_22_render);
+void fx_22_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_22_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_22", fx_22_appendGfx);
diff --git a/src/effects/effect_23.c b/src/effects/effect_23.c
index 4dde157a67..a969bad883 100644
--- a/src/effects/effect_23.c
+++ b/src/effects/effect_23.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_23_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_23", fx_23_main);
 
@@ -7,6 +10,16 @@ void fx_23_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_23", fx_23_update);
 
-INCLUDE_ASM(s32, "effects/effect_23", fx_23_render);
+void fx_23_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_23_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_23", fx_23_appendGfx);
diff --git a/src/effects/effect_24.c b/src/effects/effect_24.c
index b84df57044..3d34a2d9fa 100644
--- a/src/effects/effect_24.c
+++ b/src/effects/effect_24.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_24_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_24", fx_24_main);
 
@@ -7,6 +10,17 @@ void fx_24_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_24", fx_24_update);
 
-INCLUDE_ASM(s32, "effects/effect_24", fx_24_render);
+void fx_24_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_24_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_24", fx_24_appendGfx);
diff --git a/src/effects/effect_25.c b/src/effects/effect_25.c
index 9b9671cb8c..309ae90108 100644
--- a/src/effects/effect_25.c
+++ b/src/effects/effect_25.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_25_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_25", fx_25_main);
 
@@ -7,6 +10,16 @@ void fx_25_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_25", fx_25_update);
 
-INCLUDE_ASM(s32, "effects/effect_25", fx_25_render);
+void fx_25_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_25_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_25", fx_25_appendGfx);
diff --git a/src/effects/effect_26.c b/src/effects/effect_26.c
index d8477f0dd9..504ec76ed1 100644
--- a/src/effects/effect_26.c
+++ b/src/effects/effect_26.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_26_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_26", fx_26_main);
 
@@ -7,6 +10,17 @@ void fx_26_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_26", fx_26_update);
 
-INCLUDE_ASM(s32, "effects/effect_26", fx_26_render);
+void fx_26_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_26_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 20;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_26", fx_26_appendGfx);
diff --git a/src/effects/effect_27.c b/src/effects/effect_27.c
index 241bab2dc7..1b4d5bb333 100644
--- a/src/effects/effect_27.c
+++ b/src/effects/effect_27.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_27_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_27", fx_27_main);
 
@@ -7,7 +10,18 @@ void fx_27_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_27", fx_27_update);
 
-INCLUDE_ASM(s32, "effects/effect_27", fx_27_render);
+void fx_27_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_27_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E003621C(void) {
 }
diff --git a/src/effects/effect_28.c b/src/effects/effect_28.c
index 19995f59a2..0a7228c968 100644
--- a/src/effects/effect_28.c
+++ b/src/effects/effect_28.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_28_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_28", fx_28_main);
 
@@ -7,6 +10,17 @@ void fx_28_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_28", fx_28_update);
 
-INCLUDE_ASM(s32, "effects/effect_28", fx_28_render);
+void fx_28_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_28_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_28", fx_28_appendGfx);
diff --git a/src/effects/effect_29.c b/src/effects/effect_29.c
index 88e16bb021..9cf407be01 100644
--- a/src/effects/effect_29.c
+++ b/src/effects/effect_29.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_29_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_29", fx_29_main);
 
@@ -7,6 +10,17 @@ void fx_29_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_29", fx_29_update);
 
-INCLUDE_ASM(s32, "effects/effect_29", fx_29_render);
+void fx_29_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_29_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_29", fx_29_appendGfx);
diff --git a/src/effects/effect_30.c b/src/effects/effect_30.c
index c249b07c4b..f0e343c50d 100644
--- a/src/effects/effect_30.c
+++ b/src/effects/effect_30.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_30", fx_30_main);
 
diff --git a/src/effects/effect_31.c b/src/effects/effect_31.c
index fbf07d7c67..245b159b9e 100644
--- a/src/effects/effect_31.c
+++ b/src/effects/effect_31.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_31_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_31", fx_31_main);
 
@@ -7,6 +10,17 @@ void fx_31_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_31", fx_31_update);
 
-INCLUDE_ASM(s32, "effects/effect_31", fx_31_render);
+void fx_31_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_31_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_31", fx_31_appendGfx);
diff --git a/src/effects/effect_32.c b/src/effects/effect_32.c
index 9a188d5b90..ab239cb597 100644
--- a/src/effects/effect_32.c
+++ b/src/effects/effect_32.c
@@ -1,4 +1,20 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect32 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+} Effect32; // size = 0x??
+
+void fx_32_appendGfx(EffectInstance* effect);
+
+u32 D_E0040840[2] = { 0xFF6DFF5C, 0x66BFFF4B };
+
+s8 D_E0040848[56] = { 0x32, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x20, 0x00, 0x4B, 0x64, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0x00, 0xFF, 0x5C, 0x6B, 0xA8, 0xFF, 0x4B, 0x0A, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0xFF, 0xFF, 0xF4, 0xF7, 0xAF, 0xAF, 0x16, 0x1E, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00 };
+
+s32 D_E0040880[4] = { 0, 0, 0, 0 };
 
 INCLUDE_ASM(s32, "effects/effect_32", fx_32_main);
 
@@ -7,6 +23,36 @@ void fx_32_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_32", fx_32_update);
 
-INCLUDE_ASM(s32, "effects/effect_32", fx_32_render);
+void fx_32_render(EffectInstance* effect) {
+    Effect32* effect32 = effect->data;
+    RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
+    RenderTask* retTask;
+    s32 outDist;
+    f32 outX;
+    f32 outY;
+    f32 outZ;
+    f32 outS;
+
+    shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix[0], effect32->unk_04, effect32->unk_08, effect32->unk_0C, 1.0f, &outX, &outY, &outZ, &outS);
+    
+    outDist = outZ + 5000;
+    if (outDist < 0) {
+        outDist = 0;
+    } else if (outDist > 10000) {
+        outDist = 10000;
+    }
+
+    if (outS < 0.01 && -0.01 < outS) {
+        outDist = 0;
+    }
+    
+    renderTaskPtr->appendGfx = fx_32_appendGfx;
+    renderTaskPtr->distance = -outDist;
+    renderTaskPtr->appendGfxArg = effect;
+    renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    shim_queue_render_task(renderTaskPtr);
+}
 
 INCLUDE_ASM(s32, "effects/effect_32", fx_32_appendGfx);
diff --git a/src/effects/effect_33.c b/src/effects/effect_33.c
index 307040ff6a..0c0144a90a 100644
--- a/src/effects/effect_33.c
+++ b/src/effects/effect_33.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_33_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_33", fx_33_main);
 
@@ -7,6 +10,17 @@ void fx_33_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_33", fx_33_update);
 
-INCLUDE_ASM(s32, "effects/effect_33", fx_33_render);
+void fx_33_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_33_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_33", fx_33_appendGfx);
diff --git a/src/effects/effect_34.c b/src/effects/effect_34.c
index 2fb4ba572b..9d4e2e8100 100644
--- a/src/effects/effect_34.c
+++ b/src/effects/effect_34.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_34_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_34", fx_34_main);
 
@@ -7,6 +10,16 @@ void fx_34_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_34", fx_34_update);
 
-INCLUDE_ASM(s32, "effects/effect_34", fx_34_render);
+void fx_34_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_34_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_34", fx_34_appendGfx);
diff --git a/src/effects/effect_35.c b/src/effects/effect_35.c
index 3147b17649..06b2040dd9 100644
--- a/src/effects/effect_35.c
+++ b/src/effects/effect_35.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_35_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_35", fx_35_main);
 
@@ -7,6 +10,17 @@ void fx_35_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_35", fx_35_update);
 
-INCLUDE_ASM(s32, "effects/effect_35", fx_35_render);
+void fx_35_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_35_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_35", fx_35_appendGfx);
diff --git a/src/effects/effect_36.c b/src/effects/effect_36.c
index c4a13b27ef..5e6c39177f 100644
--- a/src/effects/effect_36.c
+++ b/src/effects/effect_36.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_36_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_36", fx_36_main);
 
@@ -7,6 +10,17 @@ void fx_36_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_36", fx_36_update);
 
-INCLUDE_ASM(s32, "effects/effect_36", fx_36_render);
+void fx_36_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_36_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_36", fx_36_appendGfx);
diff --git a/src/effects/effect_37.c b/src/effects/effect_37.c
index e5ef579f80..0d4b1557b7 100644
--- a/src/effects/effect_37.c
+++ b/src/effects/effect_37.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_37_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_37", fx_37_main);
 
@@ -7,6 +10,17 @@ void fx_37_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_37", fx_37_update);
 
-INCLUDE_ASM(s32, "effects/effect_37", fx_37_render);
+void fx_37_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_37_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_37", fx_37_appendGfx);
diff --git a/src/effects/effect_38.c b/src/effects/effect_38.c
index 48f035a23e..e5a89d77bf 100644
--- a/src/effects/effect_38.c
+++ b/src/effects/effect_38.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_38_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_38", fx_38_main);
 
@@ -7,6 +10,17 @@ void fx_38_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_38", fx_38_update);
 
-INCLUDE_ASM(s32, "effects/effect_38", fx_38_render);
+void fx_38_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_38_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_38", fx_38_appendGfx);
diff --git a/src/effects/effect_39.c b/src/effects/effect_39.c
index aba7dfff17..479fa8c5c2 100644
--- a/src/effects/effect_39.c
+++ b/src/effects/effect_39.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_39_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_39", fx_39_main);
 
@@ -7,6 +10,17 @@ void fx_39_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_39", fx_39_update);
 
-INCLUDE_ASM(s32, "effects/effect_39", fx_39_render);
+void fx_39_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_39_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_39", fx_39_appendGfx);
diff --git a/src/effects/effect_40.c b/src/effects/effect_40.c
index 3e6a5a0444..154ccac505 100644
--- a/src/effects/effect_40.c
+++ b/src/effects/effect_40.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_40_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_40", fx_40_main);
 
@@ -7,6 +10,17 @@ void fx_40_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_40", fx_40_update);
 
-INCLUDE_ASM(s32, "effects/effect_40", fx_40_render);
+void fx_40_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_40_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_40", fx_40_appendGfx);
diff --git a/src/effects/effect_41.c b/src/effects/effect_41.c
index 7ba4fb4d68..65f83ebd0f 100644
--- a/src/effects/effect_41.c
+++ b/src/effects/effect_41.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_41_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_41", fx_41_main);
 
@@ -7,6 +10,17 @@ void fx_41_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_41", fx_41_update);
 
-INCLUDE_ASM(s32, "effects/effect_41", fx_41_render);
+void fx_41_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_41_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_41", fx_41_appendGfx);
diff --git a/src/effects/effect_43.c b/src/effects/effect_43.c
index 5ea0c09a18..e26c3643c9 100644
--- a/src/effects/effect_43.c
+++ b/src/effects/effect_43.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_43_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_43", fx_43_main);
 
@@ -7,6 +10,17 @@ void fx_43_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_43", fx_43_update);
 
-INCLUDE_ASM(s32, "effects/effect_43", fx_43_render);
+void fx_43_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_43_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_43", fx_43_appendGfx);
diff --git a/src/effects/effect_44.c b/src/effects/effect_44.c
index 8182729b21..39ed76a228 100644
--- a/src/effects/effect_44.c
+++ b/src/effects/effect_44.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_44_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_44", fx_44_main);
 
@@ -7,6 +10,17 @@ void fx_44_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_44", fx_44_update);
 
-INCLUDE_ASM(s32, "effects/effect_44", fx_44_render);
+void fx_44_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_44_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_44", fx_44_appendGfx);
diff --git a/src/effects/effect_45.c b/src/effects/effect_45.c
index a177405cd2..08b0f6c39e 100644
--- a/src/effects/effect_45.c
+++ b/src/effects/effect_45.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_45_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_45", fx_45_main);
 
@@ -7,6 +10,17 @@ void fx_45_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_45", fx_45_update);
 
-INCLUDE_ASM(s32, "effects/effect_45", fx_45_render);
+void fx_45_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_45_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_45", fx_45_appendGfx);
diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c
index 47cbce928b..d580d88226 100644
--- a/src/effects/effect_46.c
+++ b/src/effects/effect_46.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_46_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_46", fx_46_main);
 
@@ -7,6 +10,17 @@ void fx_46_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_46", fx_46_update);
 
-INCLUDE_ASM(s32, "effects/effect_46", fx_46_render);
+void fx_46_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_46_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_46", fx_46_appendGfx);
diff --git a/src/effects/effect_47.c b/src/effects/effect_47.c
index 91156a7b3d..25726c9cdf 100644
--- a/src/effects/effect_47.c
+++ b/src/effects/effect_47.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_47", fx_47_main);
 
diff --git a/src/effects/effect_48.c b/src/effects/effect_48.c
index 93b2c932a9..3f64d4a3fd 100644
--- a/src/effects/effect_48.c
+++ b/src/effects/effect_48.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_48_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_48", fx_48_main);
 
@@ -7,6 +10,17 @@ void fx_48_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_48", fx_48_update);
 
-INCLUDE_ASM(s32, "effects/effect_48", fx_48_render);
+void fx_48_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_48_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_48", fx_48_appendGfx);
diff --git a/src/effects/effect_49.c b/src/effects/effect_49.c
index c5dd9d2596..32ca7452e3 100644
--- a/src/effects/effect_49.c
+++ b/src/effects/effect_49.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_49_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_49", fx_49_main);
 
@@ -7,6 +10,17 @@ void fx_49_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_49", fx_49_update);
 
-INCLUDE_ASM(s32, "effects/effect_49", fx_49_render);
+void fx_49_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_49_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_49", fx_49_appendGfx);
diff --git a/src/effects/effect_50.c b/src/effects/effect_50.c
index b6e25c66f4..6f71c09261 100644
--- a/src/effects/effect_50.c
+++ b/src/effects/effect_50.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_50_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_50", fx_50_main);
 
@@ -7,6 +10,16 @@ void fx_50_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_50", fx_50_update);
 
-INCLUDE_ASM(s32, "effects/effect_50", fx_50_render);
+void fx_50_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_50_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_50", fx_50_appendGfx);
diff --git a/src/effects/effect_51.c b/src/effects/effect_51.c
index 39e0005761..4df446ac55 100644
--- a/src/effects/effect_51.c
+++ b/src/effects/effect_51.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_51_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_51", fx_51_main);
 
@@ -7,6 +10,17 @@ void fx_51_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_51", fx_51_update);
 
-INCLUDE_ASM(s32, "effects/effect_51", fx_51_render);
+void fx_51_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_51_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_51", fx_51_appendGfx);
diff --git a/src/effects/effect_52.c b/src/effects/effect_52.c
index 91cff87cb3..0eff5379b8 100644
--- a/src/effects/effect_52.c
+++ b/src/effects/effect_52.c
@@ -1,4 +1,11 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect52 {
+    /* 0x00 */ s32 unk_00;
+} Effect52; // size = 0x??
+
+void fx_52_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_52", fx_52_main);
 
@@ -7,6 +14,23 @@ void fx_52_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_52", fx_52_update);
 
-INCLUDE_ASM(s32, "effects/effect_52", fx_52_render);
+void fx_52_render(EffectInstance* effect) {
+    Effect52* effect52 = effect->data;
+    RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfxArg = effect;
+    renderTask.appendGfx = fx_52_appendGfx;
+    renderTask.distance = 10;
+    if (effect52->unk_00 == 0) {
+        renderTaskPtr->renderMode = RENDER_MODE_SURFACE_OPA;
+    } else {
+        renderTaskPtr->renderMode = RENDER_MODE_2D;
+    }
+    
+    retTask = shim_queue_render_task(renderTaskPtr);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_52", fx_52_appendGfx);
diff --git a/src/effects/effect_53.c b/src/effects/effect_53.c
index e57dc9f928..6e101377b9 100644
--- a/src/effects/effect_53.c
+++ b/src/effects/effect_53.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_53_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_53", func_E006A000);
 
@@ -13,7 +16,18 @@ INCLUDE_ASM(s32, "effects/effect_53", func_E006A464);
 
 INCLUDE_ASM(s32, "effects/effect_53", fx_53_update);
 
-INCLUDE_ASM(s32, "effects/effect_53", fx_53_render);
+void fx_53_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_53_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_53", func_E006A85C);
 
diff --git a/src/effects/effect_54.c b/src/effects/effect_54.c
index 3063b0ff31..2a5b411be0 100644
--- a/src/effects/effect_54.c
+++ b/src/effects/effect_54.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_54_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_54", fx_54_main);
 
@@ -7,6 +10,17 @@ void fx_54_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_54", fx_54_update);
 
-INCLUDE_ASM(s32, "effects/effect_54", fx_54_render);
+void fx_54_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_54_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_54", fx_54_appendGfx);
diff --git a/src/effects/effect_55.c b/src/effects/effect_55.c
index 0126388206..1adf292055 100644
--- a/src/effects/effect_55.c
+++ b/src/effects/effect_55.c
@@ -1,4 +1,12 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect55 {
+    /* 0x00 */ char unk_00[0x14];
+    /* 0x14 */ f32 unk_14;
+} Effect55; // size = 0x??
+
+void fx_55_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_55", fx_55_main);
 
@@ -7,6 +15,23 @@ void fx_55_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_55", fx_55_update);
 
-INCLUDE_ASM(s32, "effects/effect_55", fx_55_render);
+void fx_55_render(EffectInstance *effect) {
+    Effect55* effect55 = effect->data;
+    RenderTask renderTask;
+    RenderTask* retTask;
+    RenderTask* renderTaskPointer = &renderTask;
+
+    renderTask.appendGfx = fx_55_appendGfx;
+    renderTask.appendGfxArg = effect;
+    if (gGameStatusPtr->isBattle == 1) {
+        renderTask.distance = effect55->unk_14 + 1000.0f;
+    } else {
+        renderTask.distance = 0;
+    }
+
+    renderTaskPointer->renderMode = RENDER_MODE_2D;
+    retTask = shim_queue_render_task(renderTaskPointer);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_55", fx_55_appendGfx);
diff --git a/src/effects/effect_56.c b/src/effects/effect_56.c
index e5f7f69264..e37eb13e08 100644
--- a/src/effects/effect_56.c
+++ b/src/effects/effect_56.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_56_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_56", fx_56_main);
 
@@ -7,7 +10,18 @@ void fx_56_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_56", fx_56_update);
 
-INCLUDE_ASM(s32, "effects/effect_56", fx_56_render);
+void fx_56_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_56_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E0070738(void) {
 }
diff --git a/src/effects/effect_57.c b/src/effects/effect_57.c
index 04d5fe18e4..531cc3a3c8 100644
--- a/src/effects/effect_57.c
+++ b/src/effects/effect_57.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_57_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_57", fx_57_main);
 
@@ -7,6 +10,17 @@ void fx_57_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_57", fx_57_update);
 
-INCLUDE_ASM(s32, "effects/effect_57", fx_57_render);
+void fx_57_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_57_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_57", fx_57_appendGfx);
diff --git a/src/effects/effect_58.c b/src/effects/effect_58.c
index 463775fcbf..0b8bb67243 100644
--- a/src/effects/effect_58.c
+++ b/src/effects/effect_58.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_58_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_58", fx_58_main);
 
@@ -7,6 +10,17 @@ void fx_58_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_58", fx_58_update);
 
-INCLUDE_ASM(s32, "effects/effect_58", fx_58_render);
+void fx_58_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_58_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_58", fx_58_appendGfx);
diff --git a/src/effects/effect_59.c b/src/effects/effect_59.c
index 7f26a9ab97..e7ca3cf2df 100644
--- a/src/effects/effect_59.c
+++ b/src/effects/effect_59.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_59_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_59", fx_59_main);
 
@@ -7,7 +10,18 @@ void fx_59_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_59", fx_59_update);
 
-INCLUDE_ASM(s32, "effects/effect_59", fx_59_render);
+void fx_59_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_59_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E007684C(void) {
 }
diff --git a/src/effects/effect_60.c b/src/effects/effect_60.c
index bab0156cef..61f860d44d 100644
--- a/src/effects/effect_60.c
+++ b/src/effects/effect_60.c
@@ -1,4 +1,11 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect60 {
+    /* 0x00 */ s32 unk_00;
+} Effect60; // size = 0x??
+
+void fx_60_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_60", fx_60_main);
 
@@ -7,7 +14,25 @@ void fx_60_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_60", fx_60_update);
 
-INCLUDE_ASM(s32, "effects/effect_60", fx_60_render);
+void fx_60_render(EffectInstance* effect) {
+    Effect60* effect60 = effect->data;
+    RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfxArg = effect;
+    renderTask.appendGfx = fx_60_appendGfx;
+    if (effect60->unk_00 == 5) {
+        renderTask.distance = 0;
+        renderTaskPtr->renderMode = RENDER_MODE_SURFACE_OPA;
+    } else {
+        renderTask.distance = -100;
+        renderTaskPtr->renderMode = RENDER_MODE_2D;
+    }
+    
+    retTask = shim_queue_render_task(renderTaskPtr);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E0078274(void) {
 }
diff --git a/src/effects/effect_61.c b/src/effects/effect_61.c
index c238de7a6f..d7c85bf9fe 100644
--- a/src/effects/effect_61.c
+++ b/src/effects/effect_61.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_61_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_61", fx_61_main);
 
@@ -7,7 +10,18 @@ void fx_61_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_61", fx_61_update);
 
-INCLUDE_ASM(s32, "effects/effect_61", fx_61_render);
+void fx_61_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_61_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E007A884(void) {
 }
diff --git a/src/effects/effect_62.c b/src/effects/effect_62.c
index 6f10a3edee..685acdc384 100644
--- a/src/effects/effect_62.c
+++ b/src/effects/effect_62.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_62_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_62", fx_62_main);
 
@@ -7,6 +10,17 @@ void fx_62_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_62", fx_62_update);
 
-INCLUDE_ASM(s32, "effects/effect_62", fx_62_render);
+void fx_62_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_62_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_62", fx_62_appendGfx);
diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c
index cb5ca71f06..78336f48ac 100644
--- a/src/effects/effect_63.c
+++ b/src/effects/effect_63.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_63_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_63", fx_63_main);
 
@@ -7,6 +10,17 @@ void fx_63_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_63", fx_63_update);
 
-INCLUDE_ASM(s32, "effects/effect_63", fx_63_render);
+void fx_63_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_63_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_63", fx_63_appendGfx);
diff --git a/src/effects/effect_64.c b/src/effects/effect_64.c
index f8524de72d..dcd5e33d28 100644
--- a/src/effects/effect_64.c
+++ b/src/effects/effect_64.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_64", fx_64_main);
 
diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c
index 7c3e8167da..ee371a6ab3 100644
--- a/src/effects/effect_65.c
+++ b/src/effects/effect_65.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_65", fx_65_main);
 
diff --git a/src/effects/effect_66.c b/src/effects/effect_66.c
index 1662836061..e58f08ca98 100644
--- a/src/effects/effect_66.c
+++ b/src/effects/effect_66.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_66_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_66", func_E0084000);
 
@@ -13,6 +16,17 @@ void fx_66_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_66", fx_66_update);
 
-INCLUDE_ASM(s32, "effects/effect_66", fx_66_render);
+void fx_66_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_66_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_66", fx_66_appendGfx);
diff --git a/src/effects/effect_67.c b/src/effects/effect_67.c
index 7a68c967c6..da54b06666 100644
--- a/src/effects/effect_67.c
+++ b/src/effects/effect_67.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_67", fx_67_main);
 
diff --git a/src/effects/effect_68.c b/src/effects/effect_68.c
index 8c62e32435..1d910ceea2 100644
--- a/src/effects/effect_68.c
+++ b/src/effects/effect_68.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_68_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_68", func_E0088000);
 
@@ -9,6 +12,16 @@ void fx_68_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_68", fx_68_update);
 
-INCLUDE_ASM(s32, "effects/effect_68", fx_68_render);
+void fx_68_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_68_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_68", fx_68_appendGfx);
diff --git a/src/effects/effect_69.c b/src/effects/effect_69.c
index e9039bbc7c..2875d353d4 100644
--- a/src/effects/effect_69.c
+++ b/src/effects/effect_69.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_69_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_69", func_E008A000);
 
@@ -11,6 +14,17 @@ INCLUDE_ASM(s32, "effects/effect_69", func_E008A290);
 
 INCLUDE_ASM(s32, "effects/effect_69", fx_69_update);
 
-INCLUDE_ASM(s32, "effects/effect_69", fx_69_render);
+void fx_69_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_69_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_69", fx_69_appendGfx);
diff --git a/src/effects/effect_70.c b/src/effects/effect_70.c
index 6c7cfb24ae..dfa3e9ddbb 100644
--- a/src/effects/effect_70.c
+++ b/src/effects/effect_70.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_70_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_70", fx_70_main);
 
@@ -7,6 +10,17 @@ void fx_70_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_70", fx_70_update);
 
-INCLUDE_ASM(s32, "effects/effect_70", fx_70_render);
+void fx_70_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_70_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_70", fx_70_appendGfx);
diff --git a/src/effects/effect_71.c b/src/effects/effect_71.c
index 1bd6c728c5..796c3eb2f0 100644
--- a/src/effects/effect_71.c
+++ b/src/effects/effect_71.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_71_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_71", fx_71_main);
 
@@ -7,6 +10,17 @@ void fx_71_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_71", fx_71_update);
 
-INCLUDE_ASM(s32, "effects/effect_71", fx_71_render);
+void fx_71_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_71_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_71", fx_71_appendGfx);
diff --git a/src/effects/effect_72.c b/src/effects/effect_72.c
index 41d3e89e87..1a0818e62c 100644
--- a/src/effects/effect_72.c
+++ b/src/effects/effect_72.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_72", fx_72_main);
 
diff --git a/src/effects/effect_74.c b/src/effects/effect_74.c
index fbdef452b1..631816fe8e 100644
--- a/src/effects/effect_74.c
+++ b/src/effects/effect_74.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_74_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_74", fx_74_main);
 
@@ -7,6 +10,16 @@ void fx_74_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_74", fx_74_update);
 
-INCLUDE_ASM(s32, "effects/effect_74", fx_74_render);
+void fx_74_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_74_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_74", fx_74_appendGfx);
diff --git a/src/effects/effect_76.c b/src/effects/effect_76.c
index 5aff95f342..5afdcf4ad4 100644
--- a/src/effects/effect_76.c
+++ b/src/effects/effect_76.c
@@ -1,4 +1,12 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect76 {
+    /* 0x00 */ char unk_00[0xC];
+    /* 0x0C */ f32 unk_0C;
+} Effect76; // size = 0x??
+
+void fx_76_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_76", fx_76_main);
 
@@ -7,6 +15,18 @@ void fx_76_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_76", fx_76_update);
 
-INCLUDE_ASM(s32, "effects/effect_76", fx_76_render);
+void fx_76_render(EffectInstance *effect) {
+    Effect76* effect76 = effect->data;
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_76_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = effect76->unk_0C;
+    renderTask.renderMode = RENDER_MODE_2D;
+    
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_76", fx_76_appendGfx);
diff --git a/src/effects/effect_77.c b/src/effects/effect_77.c
index ddc6ede54c..17acbbe5b1 100644
--- a/src/effects/effect_77.c
+++ b/src/effects/effect_77.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_77_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_77", fx_77_main);
 
@@ -7,6 +10,17 @@ void fx_77_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_77", fx_77_update);
 
-INCLUDE_ASM(s32, "effects/effect_77", fx_77_render);
+void fx_77_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_77_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = -10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_77", fx_77_appendGfx);
diff --git a/src/effects/effect_78.c b/src/effects/effect_78.c
index 144709ab3b..f54af605b9 100644
--- a/src/effects/effect_78.c
+++ b/src/effects/effect_78.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_78_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_78", fx_78_main);
 
@@ -7,6 +10,17 @@ void fx_78_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_78", fx_78_update);
 
-INCLUDE_ASM(s32, "effects/effect_78", fx_78_render);
+void fx_78_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_78_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_78", fx_78_appendGfx);
diff --git a/src/effects/effect_79.c b/src/effects/effect_79.c
index 6b5faf4ed9..48d2c4e3cf 100644
--- a/src/effects/effect_79.c
+++ b/src/effects/effect_79.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_79_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_79", fx_79_main);
 
@@ -7,6 +10,17 @@ void fx_79_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_79", fx_79_update);
 
-INCLUDE_ASM(s32, "effects/effect_79", fx_79_render);
+void fx_79_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_79_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_79", fx_79_appendGfx);
diff --git a/src/effects/effect_80.c b/src/effects/effect_80.c
index 4bf07f0fee..9933bc8770 100644
--- a/src/effects/effect_80.c
+++ b/src/effects/effect_80.c
@@ -1,3 +1,4 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_80", fx_80_main);
diff --git a/src/effects/effect_81.c b/src/effects/effect_81.c
index 0aeb9c7a91..62ea865aa1 100644
--- a/src/effects/effect_81.c
+++ b/src/effects/effect_81.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_81_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_81", fx_81_main);
 
@@ -7,7 +10,18 @@ void fx_81_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_81", fx_81_update);
 
-INCLUDE_ASM(s32, "effects/effect_81", fx_81_render);
+void fx_81_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_81_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 100;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00A2234(void) {
 }
diff --git a/src/effects/effect_82.c b/src/effects/effect_82.c
index cbd1a63374..40010fadac 100644
--- a/src/effects/effect_82.c
+++ b/src/effects/effect_82.c
@@ -1,4 +1,11 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect82 {
+    /* 0x00 */ s32 unk_00;
+} Effect82; // size = ??
+
+void fx_82_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_82", fx_82_main);
 
@@ -7,7 +14,24 @@ void fx_82_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_82", fx_82_update);
 
-INCLUDE_ASM(s32, "effects/effect_82", fx_82_render);
+void fx_82_render(EffectInstance* effect) {
+    Effect82* effect82 = effect->data;
+    RenderTask renderTask;
+    RenderTask* retTask;
+    RenderTask* renderTaskPointer = &renderTask;
+
+    renderTask.appendGfx = fx_82_appendGfx;
+    renderTask.distance = 10;
+    renderTask.appendGfxArg = effect;
+    renderTask.renderMode = RENDER_MODE_2D;
+    if (effect82->unk_00 >= 3) {
+        shim_queue_render_task(renderTaskPointer);
+        return;
+    }
+
+    retTask = shim_queue_render_task(renderTaskPointer);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00A4648(void) {
 }
diff --git a/src/effects/effect_83.c b/src/effects/effect_83.c
index c2d076ee70..5f51035a91 100644
--- a/src/effects/effect_83.c
+++ b/src/effects/effect_83.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_83_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_83", fx_83_main);
 
@@ -7,7 +10,18 @@ void fx_83_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_83", fx_83_update);
 
-INCLUDE_ASM(s32, "effects/effect_83", fx_83_render);
+void fx_83_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_83_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00A639C(void) {
 }
diff --git a/src/effects/effect_84.c b/src/effects/effect_84.c
index b1453245bd..541d5dd4d0 100644
--- a/src/effects/effect_84.c
+++ b/src/effects/effect_84.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_84_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_84", fx_84_main);
 
@@ -7,7 +10,18 @@ void fx_84_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_84", fx_84_update);
 
-INCLUDE_ASM(s32, "effects/effect_84", fx_84_render);
+void fx_84_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_84_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00A8318(void) {
 }
diff --git a/src/effects/effect_85.c b/src/effects/effect_85.c
index 78ef0efbf3..161ce7e88b 100644
--- a/src/effects/effect_85.c
+++ b/src/effects/effect_85.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_85_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_85", fx_85_main);
 
@@ -7,6 +10,17 @@ void fx_85_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_85", fx_85_update);
 
-INCLUDE_ASM(s32, "effects/effect_85", fx_85_render);
+void fx_85_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_85_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_85", fx_85_appendGfx);
diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c
index 7e62179136..1c88ecf625 100644
--- a/src/effects/effect_86.c
+++ b/src/effects/effect_86.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "effects_internal.h"
 
 INCLUDE_ASM(s32, "effects/effect_86", fx_86_main);
 
diff --git a/src/effects/effect_87.c b/src/effects/effect_87.c
index 5b97e93f2d..9f53e4ae60 100644
--- a/src/effects/effect_87.c
+++ b/src/effects/effect_87.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_87_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_87", fx_87_main);
 
@@ -7,7 +10,18 @@ void fx_87_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_87", fx_87_update);
 
-INCLUDE_ASM(s32, "effects/effect_87", fx_87_render);
+void fx_87_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_87_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00AE544(void) {
 }
diff --git a/src/effects/effect_88.c b/src/effects/effect_88.c
index 4bc7c0bad4..8afbb18173 100644
--- a/src/effects/effect_88.c
+++ b/src/effects/effect_88.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_88_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_88", fx_88_main);
 
@@ -7,6 +10,16 @@ void fx_88_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_88", fx_88_update);
 
-INCLUDE_ASM(s32, "effects/effect_88", fx_88_render);
+void fx_88_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_88_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 INCLUDE_ASM(s32, "effects/effect_88", fx_88_appendGfx);
diff --git a/src/effects/effect_89.c b/src/effects/effect_89.c
index 513967c993..e8508da345 100644
--- a/src/effects/effect_89.c
+++ b/src/effects/effect_89.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_89_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_89", fx_89_main);
 
@@ -7,7 +10,18 @@ void fx_89_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_89", fx_89_update);
 
-INCLUDE_ASM(s32, "effects/effect_89", fx_89_render);
+void fx_89_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_89_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00B24A8(void) {
 }
diff --git a/src/effects/effect_90.c b/src/effects/effect_90.c
index 1008bce513..699bf05785 100644
--- a/src/effects/effect_90.c
+++ b/src/effects/effect_90.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_90_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_90", fx_90_main);
 
@@ -7,7 +10,18 @@ void fx_90_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_90", fx_90_update);
 
-INCLUDE_ASM(s32, "effects/effect_90", fx_90_render);
+void fx_90_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_90_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 20;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00B4574(void) {
 }
diff --git a/src/effects/effect_91.c b/src/effects/effect_91.c
index c8c84e6902..8dfbb48e14 100644
--- a/src/effects/effect_91.c
+++ b/src/effects/effect_91.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_91_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_91", fx_91_main);
 
@@ -7,7 +10,17 @@ void fx_91_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_91", fx_91_update);
 
-INCLUDE_ASM(s32, "effects/effect_91", fx_91_render);
+void fx_91_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_91_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 void func_E00B62D8(void) {
 }
diff --git a/src/effects/effect_92.c b/src/effects/effect_92.c
index 07bffa7c8f..63d1606d13 100644
--- a/src/effects/effect_92.c
+++ b/src/effects/effect_92.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_92_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_92", fx_92_main);
 
@@ -7,7 +10,18 @@ void fx_92_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_92", fx_92_update);
 
-INCLUDE_ASM(s32, "effects/effect_92", fx_92_render);
+void fx_92_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_92_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00B8200(void) {
 }
diff --git a/src/effects/effect_93.c b/src/effects/effect_93.c
index 575c8ce764..618b54de7b 100644
--- a/src/effects/effect_93.c
+++ b/src/effects/effect_93.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_93_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_93", fx_93_main);
 
@@ -7,7 +10,17 @@ void fx_93_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_93", fx_93_update);
 
-INCLUDE_ASM(s32, "effects/effect_93", fx_93_render);
+void fx_93_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_93_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 100;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 void func_E00BA618(void) {
 }
diff --git a/src/effects/effect_94.c b/src/effects/effect_94.c
index b063492605..96743d8827 100644
--- a/src/effects/effect_94.c
+++ b/src/effects/effect_94.c
@@ -1,4 +1,12 @@
 #include "common.h"
+#include "effects_internal.h"
+
+typedef struct Effect94 {
+    /* 0x00 */ char unk_00[0xC];
+    /* 0x0C */ f32 unk_0C;
+} Effect94; // size = 0x??
+
+void fx_94_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_94", fx_94_main);
 
@@ -11,7 +19,24 @@ f32 func_E00BC1D8(f32 arg0) {
 
 INCLUDE_ASM(s32, "effects/effect_94", fx_94_update);
 
-INCLUDE_ASM(s32, "effects/effect_94", fx_94_render);
+void fx_94_render(EffectInstance *effect) {
+    Effect94* effect94 = effect->data;
+    RenderTask renderTask;
+    RenderTask* retTask;
+    RenderTask* renderTaskPointer = &renderTask;
+
+    renderTask.appendGfx = fx_94_appendGfx;
+    renderTask.appendGfxArg = effect;
+    if (gGameStatusPtr->isBattle == TRUE) {
+        renderTask.distance = effect94->unk_0C + 1000.0f;
+    } else {
+        renderTask.distance = 10;
+    }
+
+    renderTaskPointer->renderMode = RENDER_MODE_2D;
+    retTask = shim_queue_render_task(renderTaskPointer);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00BC36C(void) {
 }
diff --git a/src/effects/effect_95.c b/src/effects/effect_95.c
index ca24bf04da..9fec458600 100644
--- a/src/effects/effect_95.c
+++ b/src/effects/effect_95.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_95_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_95", fx_95_main);
 
@@ -7,7 +10,17 @@ void fx_95_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_95", fx_95_update);
 
-INCLUDE_ASM(s32, "effects/effect_95", fx_95_render);
+void fx_95_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_95_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 void func_E00BE5B4(void) {
 }
diff --git a/src/effects/effect_96.c b/src/effects/effect_96.c
index a7c8967402..8dd9d7075f 100644
--- a/src/effects/effect_96.c
+++ b/src/effects/effect_96.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_96_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_96", fx_96_main);
 
@@ -7,7 +10,18 @@ void fx_96_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_96", fx_96_update);
 
-INCLUDE_ASM(s32, "effects/effect_96", fx_96_render);
+void fx_96_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_96_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = -10;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00C0758(void) {
 }
diff --git a/src/effects/effect_97.c b/src/effects/effect_97.c
index dae6ded3e1..f9e6ae7084 100644
--- a/src/effects/effect_97.c
+++ b/src/effects/effect_97.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_97_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_97", fx_97_main);
 
@@ -7,7 +10,18 @@ void fx_97_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_97", fx_97_update);
 
-INCLUDE_ASM(s32, "effects/effect_97", fx_97_render);
+void fx_97_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_97_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 void func_E00C2214(void) {
 }
diff --git a/src/effects/effect_98.c b/src/effects/effect_98.c
index 440b0a29df..fa4952b9ae 100644
--- a/src/effects/effect_98.c
+++ b/src/effects/effect_98.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_98_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_98", fx_98_main);
 
@@ -7,7 +10,17 @@ void fx_98_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_98", fx_98_update);
 
-INCLUDE_ASM(s32, "effects/effect_98", fx_98_render);
+void fx_98_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_98_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
 
 void func_E00C4300(void) {
 }
diff --git a/src/effects/effect_99.c b/src/effects/effect_99.c
index 1566efb6cc..6b7b206408 100644
--- a/src/effects/effect_99.c
+++ b/src/effects/effect_99.c
@@ -1,4 +1,7 @@
 #include "common.h"
+#include "effects_internal.h"
+
+void fx_99_appendGfx(EffectInstance* effect);
 
 INCLUDE_ASM(s32, "effects/effect_99", fx_99_main);
 
@@ -7,6 +10,17 @@ void fx_99_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_99", fx_99_update);
 
-INCLUDE_ASM(s32, "effects/effect_99", fx_99_render);
+void fx_99_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_99_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
 
 INCLUDE_ASM(s32, "effects/effect_99", fx_99_appendGfx);
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 9356532b8e..f289b4596f 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -80,7 +80,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241A64_844634);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241B90_844760);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241BB8_844788);
+ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 npcID = evt_get_variable(script, *args++);
+    f32 newShadowScale = evt_get_float_variable(script, *args++);
+
+    resolve_npc(script, npcID)->shadowScale = newShadowScale;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/Call800E9894.inc.c"
 
diff --git a/src/world/area_tst/tst_13/B1D760.c b/src/world/area_tst/tst_13/B1D760.c
index bacd1e5e81..bef55f7781 100644
--- a/src/world/area_tst/tst_13/B1D760.c
+++ b/src/world/area_tst/tst_13/B1D760.c
@@ -1,6 +1,20 @@
 #include "tst_13.h"
 
-INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_80240000_B1D760);
+ApiStatus func_80240000_B1D760(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    s32* array = script->array;
+    f32 distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[3]);
+
+    script->varTable[0] = 1;
+    if ((playerStatus->actionState != 14) && (playerStatus->actionState != 16)) {
+        script->varTable[0] = 0;
+    }
+    if (script->array[4] <= distance) {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_802400A0_B1D800);
 
diff --git a/ver/us/asm/data/effects/353B40.data.s b/ver/us/asm/data/effects/353B40.data.s
deleted file mode 100644
index 3766d16d50..0000000000
--- a/ver/us/asm/data/effects/353B40.data.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0040840
-.word 0xFF6DFF5C, 0x66BFFF4B
-
-dlabel D_E0040848
-.byte 0x32, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x20, 0x00, 0x4B, 0x64, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0x00, 0xFF, 0x5C, 0x6B, 0xA8, 0xFF, 0x4B, 0x0A, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0xFF, 0xFF, 0xF4, 0xF7, 0xAF, 0xAF, 0x16, 0x1E, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00
-
-dlabel D_E0040880
-.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E0040890
-.double 0.01
-
-dlabel D_E0040898
-.double 0.01
-
-dlabel D_E00408A0
-.double -0.01, 0.0
diff --git a/ver/us/asm/data/effects/3E2930.data.s b/ver/us/asm/data/effects/3E2930.data.s
deleted file mode 100644
index 66429d88bc..0000000000
--- a/ver/us/asm/data/effects/3E2930.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00EAA50
-.word 0x09001A00, 0x09001A20
-
-dlabel D_E00EAA58
-.word 0x09001910, 0x00000000
-
-dlabel D_E00EAA60
-.double 0.1
-
-dlabel D_E00EAA68
-.double 0.01
-
-dlabel D_E00EAA70
-.double -0.01, 0.0
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 1b6a9e75b7..fce01edbd4 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
@@ -183,7 +183,7 @@ dlabel D_80249184_84BD54
 .word 0x0000000A, 0x00000002, 0xF8405CA3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A8, 0x00000024, 0x00000002, 0xF8405CA3, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A9, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_Call800E9894, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AA, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000027, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AB, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B90_844760, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AC, 0x00000043, 0x00000002, ShowChoice, 0x001E000B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AD, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D1, 0x00000016, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D2, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D3, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600B1, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFD9, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x0000024B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C87, 0x0000001A, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60006, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60001, 0x00000043, 0x00000001, func_80241A64_844634, 0x00000043, 0x00000002, func_802418AC_84447C, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600AF, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600B0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002098, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF97188B2, 0x00000001, 0x00000043, 0x00000001, func_80241C60_844830, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802497B0_84C380
-.word 0x0000000A, 0x00000002, 0xF97188B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000026, 0x00000034, 0x00000043, 0x00000003, func_80241BB8_844788, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00010000, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249184_84BD54, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF97188B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000026, 0x00000034, 0x00000043, 0x00000003, mac_04_SetNpcShadowScale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00010000, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249184_84BD54, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249918_84C4E8
 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060006, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060007, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060008, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060009, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000A, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000B, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000C, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000D, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000E, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000F, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00060010, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00060011, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00060012, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840204, 0x00840201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/190B20/btl_appendGfx_prim_quad.s b/ver/us/asm/nonmatchings/190B20/btl_appendGfx_prim_quad.s
deleted file mode 100644
index 87d12a479a..0000000000
--- a/ver/us/asm/nonmatchings/190B20/btl_appendGfx_prim_quad.s
+++ /dev/null
@@ -1,118 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_appendGfx_prim_quad
-/* 19615C 8026787C 27BDFFF8 */  addiu     $sp, $sp, -8
-/* 196160 80267880 0080602D */  daddu     $t4, $a0, $zero
-/* 196164 80267884 00A0682D */  daddu     $t5, $a1, $zero
-/* 196168 80267888 00E0582D */  daddu     $t3, $a3, $zero
-/* 19616C 8026788C 3C08800A */  lui       $t0, %hi(gMasterGfxPos)
-/* 196170 80267890 2508A66C */  addiu     $t0, $t0, %lo(gMasterGfxPos)
-/* 196174 80267894 3C02E700 */  lui       $v0, 0xe700
-/* 196178 80267898 AFB00000 */  sw        $s0, ($sp)
-/* 19617C 8026789C 8D070000 */  lw        $a3, ($t0)
-/* 196180 802678A0 97B9001A */  lhu       $t9, 0x1a($sp)
-/* 196184 802678A4 97B0001E */  lhu       $s0, 0x1e($sp)
-/* 196188 802678A8 97AF0022 */  lhu       $t7, 0x22($sp)
-/* 19618C 802678AC 97B80026 */  lhu       $t8, 0x26($sp)
-/* 196190 802678B0 00E0182D */  daddu     $v1, $a3, $zero
-/* 196194 802678B4 24E70008 */  addiu     $a3, $a3, 8
-/* 196198 802678B8 AD070000 */  sw        $a3, ($t0)
-/* 19619C 802678BC AC620000 */  sw        $v0, ($v1)
-/* 1961A0 802678C0 24E20008 */  addiu     $v0, $a3, 8
-/* 1961A4 802678C4 AC600004 */  sw        $zero, 4($v1)
-/* 1961A8 802678C8 AD020000 */  sw        $v0, ($t0)
-/* 1961AC 802678CC 3C02DE00 */  lui       $v0, 0xde00
-/* 1961B0 802678D0 ACE20000 */  sw        $v0, ($a3)
-/* 1961B4 802678D4 3C028029 */  lui       $v0, %hi(D_80293970)
-/* 1961B8 802678D8 24423970 */  addiu     $v0, $v0, %lo(D_80293970)
-/* 1961BC 802678DC 316300FF */  andi      $v1, $t3, 0xff
-/* 1961C0 802678E0 ACE20004 */  sw        $v0, 4($a3)
-/* 1961C4 802678E4 240200FF */  addiu     $v0, $zero, 0xff
-/* 1961C8 802678E8 1462000A */  bne       $v1, $v0, .L80267914
-/* 1961CC 802678EC 00C0702D */   daddu    $t6, $a2, $zero
-/* 1961D0 802678F0 3C05E200 */  lui       $a1, 0xe200
-/* 1961D4 802678F4 34A5001C */  ori       $a1, $a1, 0x1c
-/* 1961D8 802678F8 3C030F0A */  lui       $v1, 0xf0a
-/* 1961DC 802678FC 34634000 */  ori       $v1, $v1, 0x4000
-/* 1961E0 80267900 3C06FCFF */  lui       $a2, 0xfcff
-/* 1961E4 80267904 34C6FFFF */  ori       $a2, $a2, 0xffff
-/* 1961E8 80267908 3C04FFFD */  lui       $a0, 0xfffd
-/* 1961EC 8026790C 08099E4D */  j         .L80267934
-/* 1961F0 80267910 3484FCFE */   ori      $a0, $a0, 0xfcfe
-.L80267914:
-/* 1961F4 80267914 3C05E200 */  lui       $a1, 0xe200
-/* 1961F8 80267918 34A5001C */  ori       $a1, $a1, 0x1c
-/* 1961FC 8026791C 3C030050 */  lui       $v1, 0x50
-/* 196200 80267920 34634240 */  ori       $v1, $v1, 0x4240
-/* 196204 80267924 3C06FCFF */  lui       $a2, 0xfcff
-/* 196208 80267928 34C6FFFF */  ori       $a2, $a2, 0xffff
-/* 19620C 8026792C 3C04FFFD */  lui       $a0, 0xfffd
-/* 196210 80267930 3484F6FB */  ori       $a0, $a0, 0xf6fb
-.L80267934:
-/* 196214 80267934 24E20010 */  addiu     $v0, $a3, 0x10
-/* 196218 80267938 AD020000 */  sw        $v0, ($t0)
-/* 19621C 8026793C 24E20018 */  addiu     $v0, $a3, 0x18
-/* 196220 80267940 ACE50008 */  sw        $a1, 8($a3)
-/* 196224 80267944 ACE3000C */  sw        $v1, 0xc($a3)
-/* 196228 80267948 AD020000 */  sw        $v0, ($t0)
-/* 19622C 8026794C ACE60010 */  sw        $a2, 0x10($a3)
-/* 196230 80267950 ACE40014 */  sw        $a0, 0x14($a3)
-/* 196234 80267954 3C09E200 */  lui       $t1, 0xe200
-/* 196238 80267958 3529001C */  ori       $t1, $t1, 0x1c
-/* 19623C 8026795C 3C070F0A */  lui       $a3, 0xf0a
-/* 196240 80267960 34E77008 */  ori       $a3, $a3, 0x7008
-/* 196244 80267964 3C0AFCFF */  lui       $t2, 0xfcff
-/* 196248 80267968 354AFFFF */  ori       $t2, $t2, 0xffff
-/* 19624C 8026796C 3C08FFFC */  lui       $t0, 0xfffc
-/* 196250 80267970 3C06800A */  lui       $a2, %hi(gMasterGfxPos)
-/* 196254 80267974 24C6A66C */  addiu     $a2, $a2, %lo(gMasterGfxPos)
-/* 196258 80267978 3508F279 */  ori       $t0, $t0, 0xf279
-/* 19625C 8026797C 3C02FA00 */  lui       $v0, 0xfa00
-/* 196260 80267980 8CC50000 */  lw        $a1, ($a2)
-/* 196264 80267984 000C1E00 */  sll       $v1, $t4, 0x18
-/* 196268 80267988 00A0202D */  daddu     $a0, $a1, $zero
-/* 19626C 8026798C 24A50008 */  addiu     $a1, $a1, 8
-/* 196270 80267990 ACC50000 */  sw        $a1, ($a2)
-/* 196274 80267994 AC820000 */  sw        $v0, ($a0)
-/* 196278 80267998 31A200FF */  andi      $v0, $t5, 0xff
-/* 19627C 8026799C 00021400 */  sll       $v0, $v0, 0x10
-/* 196280 802679A0 00621825 */  or        $v1, $v1, $v0
-/* 196284 802679A4 31C200FF */  andi      $v0, $t6, 0xff
-/* 196288 802679A8 00021200 */  sll       $v0, $v0, 8
-/* 19628C 802679AC 00621825 */  or        $v1, $v1, $v0
-/* 196290 802679B0 316200FF */  andi      $v0, $t3, 0xff
-/* 196294 802679B4 00621825 */  or        $v1, $v1, $v0
-/* 196298 802679B8 24A20008 */  addiu     $v0, $a1, 8
-/* 19629C 802679BC AC830004 */  sw        $v1, 4($a0)
-/* 1962A0 802679C0 31E403FF */  andi      $a0, $t7, 0x3ff
-/* 1962A4 802679C4 00042380 */  sll       $a0, $a0, 0xe
-/* 1962A8 802679C8 ACC20000 */  sw        $v0, ($a2)
-/* 1962AC 802679CC 330203FF */  andi      $v0, $t8, 0x3ff
-/* 1962B0 802679D0 00021080 */  sll       $v0, $v0, 2
-/* 1962B4 802679D4 3C03F600 */  lui       $v1, 0xf600
-/* 1962B8 802679D8 00431025 */  or        $v0, $v0, $v1
-/* 1962BC 802679DC 00822025 */  or        $a0, $a0, $v0
-/* 1962C0 802679E0 332303FF */  andi      $v1, $t9, 0x3ff
-/* 1962C4 802679E4 00031B80 */  sll       $v1, $v1, 0xe
-/* 1962C8 802679E8 320203FF */  andi      $v0, $s0, 0x3ff
-/* 1962CC 802679EC 00021080 */  sll       $v0, $v0, 2
-/* 1962D0 802679F0 00621825 */  or        $v1, $v1, $v0
-/* 1962D4 802679F4 24A20010 */  addiu     $v0, $a1, 0x10
-/* 1962D8 802679F8 ACA40000 */  sw        $a0, ($a1)
-/* 1962DC 802679FC ACA30004 */  sw        $v1, 4($a1)
-/* 1962E0 80267A00 ACC20000 */  sw        $v0, ($a2)
-/* 1962E4 80267A04 3C02E700 */  lui       $v0, 0xe700
-/* 1962E8 80267A08 ACA20008 */  sw        $v0, 8($a1)
-/* 1962EC 80267A0C 24A20018 */  addiu     $v0, $a1, 0x18
-/* 1962F0 80267A10 ACA0000C */  sw        $zero, 0xc($a1)
-/* 1962F4 80267A14 ACC20000 */  sw        $v0, ($a2)
-/* 1962F8 80267A18 24A20020 */  addiu     $v0, $a1, 0x20
-/* 1962FC 80267A1C ACA90010 */  sw        $t1, 0x10($a1)
-/* 196300 80267A20 ACA70014 */  sw        $a3, 0x14($a1)
-/* 196304 80267A24 ACC20000 */  sw        $v0, ($a2)
-/* 196308 80267A28 ACAA0018 */  sw        $t2, 0x18($a1)
-/* 19630C 80267A2C ACA8001C */  sw        $t0, 0x1c($a1)
-/* 196310 80267A30 8FB00000 */  lw        $s0, ($sp)
-/* 196314 80267A34 03E00008 */  jr        $ra
-/* 196318 80267A38 27BD0008 */   addiu    $sp, $sp, 8
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_render.s b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_render.s
deleted file mode 100644
index 567757a535..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_100_render
-/* 3CF7A4 E00C8404 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3CF7BC E00C841C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3CF7C0 E00C8420 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3CF7C4 E00C8424 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3CF7C8 E00C8428 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3CF7CC E00C842C 0C080120 */  jal       shim_queue_render_task
-/* 3CF7D0 E00C8430 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3CF7D4 E00C8434 8C430000 */  lw        $v1, ($v0)
-/* 3CF7D8 E00C8438 34630002 */  ori       $v1, $v1, 2
-/* 3CF7DC E00C843C AC430000 */  sw        $v1, ($v0)
-/* 3CF7E0 E00C8440 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3CF7E4 E00C8444 03E00008 */  jr        $ra
-/* 3CF7E8 E00C8448 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_render.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_render.s
deleted file mode 100644
index fcf37dd5e6..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_101_render
-/* 3D0984 E00CA484 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D099C E00CA49C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D09A0 E00CA4A0 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D09A4 E00CA4A4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D09A8 E00CA4A8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D09AC E00CA4AC 0C080120 */  jal       shim_queue_render_task
-/* 3D09B0 E00CA4B0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D09B4 E00CA4B4 8C430000 */  lw        $v1, ($v0)
-/* 3D09B8 E00CA4B8 34630002 */  ori       $v1, $v1, 2
-/* 3D09BC E00CA4BC AC430000 */  sw        $v1, ($v0)
-/* 3D09C0 E00CA4C0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D09C4 E00CA4C4 03E00008 */  jr        $ra
-/* 3D09C8 E00CA4C8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_render.s b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_render.s
deleted file mode 100644
index c246e82ca8..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_102_render
-/* 3D2010 E00CC980 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D2028 E00CC998 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D202C E00CC99C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D2030 E00CC9A0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D2034 E00CC9A4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D2038 E00CC9A8 0C080120 */  jal       shim_queue_render_task
-/* 3D203C E00CC9AC AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D2040 E00CC9B0 8C430000 */  lw        $v1, ($v0)
-/* 3D2044 E00CC9B4 34630002 */  ori       $v1, $v1, 2
-/* 3D2048 E00CC9B8 AC430000 */  sw        $v1, ($v0)
-/* 3D204C E00CC9BC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D2050 E00CC9C0 03E00008 */  jr        $ra
-/* 3D2054 E00CC9C4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_render.s b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_render.s
deleted file mode 100644
index fa39d5ba9b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_103_render
-/* 3D2EE8 E00CE428 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D2F00 E00CE440 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D2F04 E00CE444 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D2F08 E00CE448 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D2F0C E00CE44C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D2F10 E00CE450 0C080120 */  jal       shim_queue_render_task
-/* 3D2F14 E00CE454 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D2F18 E00CE458 8C430000 */  lw        $v1, ($v0)
-/* 3D2F1C E00CE45C 34630002 */  ori       $v1, $v1, 2
-/* 3D2F20 E00CE460 AC430000 */  sw        $v1, ($v0)
-/* 3D2F24 E00CE464 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D2F28 E00CE468 03E00008 */  jr        $ra
-/* 3D2F2C E00CE46C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_render.s b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_render.s
deleted file mode 100644
index d64342d954..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_104_render
-/* 3D4268 E00D0448 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D4280 E00D0460 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D4284 E00D0464 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D4288 E00D0468 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3D428C E00D046C 0C080120 */  jal       shim_queue_render_task
-/* 3D4290 E00D0470 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D4294 E00D0474 8C430000 */  lw        $v1, ($v0)
-/* 3D4298 E00D0478 34630002 */  ori       $v1, $v1, 2
-/* 3D429C E00D047C AC430000 */  sw        $v1, ($v0)
-/* 3D42A0 E00D0480 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D42A4 E00D0484 03E00008 */  jr        $ra
-/* 3D42A8 E00D0488 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_render.s b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_render.s
deleted file mode 100644
index a5a564a15a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_105_render
-/* 3D4BA4 E00D2234 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D4BBC E00D224C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D4BC0 E00D2250 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D4BC4 E00D2254 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D4BC8 E00D2258 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D4BCC E00D225C 0C080120 */  jal       shim_queue_render_task
-/* 3D4BD0 E00D2260 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D4BD4 E00D2264 8C430000 */  lw        $v1, ($v0)
-/* 3D4BD8 E00D2268 34630002 */  ori       $v1, $v1, 2
-/* 3D4BDC E00D226C AC430000 */  sw        $v1, ($v0)
-/* 3D4BE0 E00D2270 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D4BE4 E00D2274 03E00008 */  jr        $ra
-/* 3D4BE8 E00D2278 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_render.s b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_render.s
deleted file mode 100644
index 2865272dec..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_107_render
-/* 3D595C E00D693C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D5974 E00D6954 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D5978 E00D6958 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D597C E00D695C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D5980 E00D6960 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D5984 E00D6964 0C080120 */  jal       shim_queue_render_task
-/* 3D5988 E00D6968 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D598C E00D696C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D5990 E00D6970 03E00008 */  jr        $ra
-/* 3D5994 E00D6974 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_render.s b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_render.s
deleted file mode 100644
index fd508b6c7e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_109_render
-/* 3D7420 E00DA1E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D7438 E00DA1F8 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D743C E00DA1FC AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D7440 E00DA200 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D7444 E00DA204 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D7448 E00DA208 0C080120 */  jal       shim_queue_render_task
-/* 3D744C E00DA20C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D7450 E00DA210 8C430000 */  lw        $v1, ($v0)
-/* 3D7454 E00DA214 34630002 */  ori       $v1, $v1, 2
-/* 3D7458 E00DA218 AC430000 */  sw        $v1, ($v0)
-/* 3D745C E00DA21C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D7460 E00DA220 03E00008 */  jr        $ra
-/* 3D7464 E00DA224 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_11/fx_11_render.s b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_render.s
deleted file mode 100644
index f227236f44..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_11/fx_11_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_11_render
-/* 32F240 E0016410 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 32F258 E0016428 27A40010 */  addiu     $a0, $sp, 0x10
-/* 32F25C E001642C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 32F260 E0016430 AFA00014 */  sw        $zero, 0x14($sp)
-/* 32F264 E0016434 0C080120 */  jal       shim_queue_render_task
-/* 32F268 E0016438 AFA20010 */   sw       $v0, 0x10($sp)
-/* 32F26C E001643C 8C430000 */  lw        $v1, ($v0)
-/* 32F270 E0016440 34630002 */  ori       $v1, $v1, 2
-/* 32F274 E0016444 AC430000 */  sw        $v1, ($v0)
-/* 32F278 E0016448 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 32F27C E001644C 03E00008 */  jr        $ra
-/* 32F280 E0016450 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_render.s b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_render.s
deleted file mode 100644
index 884105866f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_110_render
-/* 3D7D30 E00DC2C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D7D48 E00DC2D8 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D7D4C E00DC2DC AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D7D50 E00DC2E0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D7D54 E00DC2E4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D7D58 E00DC2E8 0C080120 */  jal       shim_queue_render_task
-/* 3D7D5C E00DC2EC AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D7D60 E00DC2F0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D7D64 E00DC2F4 03E00008 */  jr        $ra
-/* 3D7D68 E00DC2F8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_render.s b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_render.s
deleted file mode 100644
index 8bd7754de1..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_111_render
-/* 3D8980 E00DE260 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3D8998 E00DE278 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D899C E00DE27C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3D89A0 E00DE280 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D89A4 E00DE284 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3D89A8 E00DE288 0C080120 */  jal       shim_queue_render_task
-/* 3D89AC E00DE28C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3D89B0 E00DE290 8C430000 */  lw        $v1, ($v0)
-/* 3D89B4 E00DE294 34630002 */  ori       $v1, $v1, 2
-/* 3D89B8 E00DE298 AC430000 */  sw        $v1, ($v0)
-/* 3D89BC E00DE29C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3D89C0 E00DE2A0 03E00008 */  jr        $ra
-/* 3D89C4 E00DE2A4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_render.s b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_render.s
deleted file mode 100644
index 7ac2e4f467..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_112_render
-/* 3DBA10 E00E05B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3DBA28 E00E05C8 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3DBA2C E00E05CC AFA40018 */  sw        $a0, 0x18($sp)
-/* 3DBA30 E00E05D0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3DBA34 E00E05D4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3DBA38 E00E05D8 0C080120 */  jal       shim_queue_render_task
-/* 3DBA3C E00E05DC AFA20010 */   sw       $v0, 0x10($sp)
-/* 3DBA40 E00E05E0 8C430000 */  lw        $v1, ($v0)
-/* 3DBA44 E00E05E4 34630002 */  ori       $v1, $v1, 2
-/* 3DBA48 E00E05E8 AC430000 */  sw        $v1, ($v0)
-/* 3DBA4C E00E05EC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3DBA50 E00E05F0 03E00008 */  jr        $ra
-/* 3DBA54 E00E05F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_render.s b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_render.s
deleted file mode 100644
index a275a45d73..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_113_render
-/* 3DC4D8 E00E21C8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3DC4F0 E00E21E0 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3DC4F4 E00E21E4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3DC4F8 E00E21E8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3DC4FC E00E21EC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3DC500 E00E21F0 0C080120 */  jal       shim_queue_render_task
-/* 3DC504 E00E21F4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3DC508 E00E21F8 8C430000 */  lw        $v1, ($v0)
-/* 3DC50C E00E21FC 34630002 */  ori       $v1, $v1, 2
-/* 3DC510 E00E2200 AC430000 */  sw        $v1, ($v0)
-/* 3DC514 E00E2204 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3DC518 E00E2208 03E00008 */  jr        $ra
-/* 3DC51C E00E220C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_render.s b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_render.s
deleted file mode 100644
index 65bb30d736..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_114_render
-/* 3DE90C E00E490C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3DE924 E00E4924 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3DE928 E00E4928 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3DE92C E00E492C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3DE930 E00E4930 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3DE934 E00E4934 0C080120 */  jal       shim_queue_render_task
-/* 3DE938 E00E4938 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3DE93C E00E493C 8C430000 */  lw        $v1, ($v0)
-/* 3DE940 E00E4940 34630002 */  ori       $v1, $v1, 2
-/* 3DE944 E00E4944 AC430000 */  sw        $v1, ($v0)
-/* 3DE948 E00E4948 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3DE94C E00E494C 03E00008 */  jr        $ra
-/* 3DE950 E00E4950 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_render.s b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_render.s
deleted file mode 100644
index b67fe36f9f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_115_render
-/* 3E0E04 E00E64D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3E0E1C E00E64EC 24020001 */  addiu     $v0, $zero, 1
-/* 3E0E20 E00E64F0 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3E0E24 E00E64F4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3E0E28 E00E64F8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3E0E2C E00E64FC 0C080120 */  jal       shim_queue_render_task
-/* 3E0E30 E00E6500 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3E0E34 E00E6504 8C430000 */  lw        $v1, ($v0)
-/* 3E0E38 E00E6508 34630002 */  ori       $v1, $v1, 2
-/* 3E0E3C E00E650C AC430000 */  sw        $v1, ($v0)
-/* 3E0E40 E00E6510 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3E0E44 E00E6514 03E00008 */  jr        $ra
-/* 3E0E48 E00E6518 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_render.s b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_render.s
deleted file mode 100644
index f5b059c30f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_116_render
-/* 3E1A04 E00E8374 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3E1A1C E00E838C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3E1A20 E00E8390 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3E1A24 E00E8394 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3E1A28 E00E8398 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3E1A2C E00E839C 0C080120 */  jal       shim_queue_render_task
-/* 3E1A30 E00E83A0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3E1A34 E00E83A4 8C430000 */  lw        $v1, ($v0)
-/* 3E1A38 E00E83A8 34630002 */  ori       $v1, $v1, 2
-/* 3E1A3C E00E83AC AC430000 */  sw        $v1, ($v0)
-/* 3E1A40 E00E83B0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3E1A44 E00E83B4 03E00008 */  jr        $ra
-/* 3E1A48 E00E83B8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_render.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_render.s
deleted file mode 100644
index af12eeab06..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_render.s
+++ /dev/null
@@ -1,88 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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
-/* 3E240C E00EA52C AFBF0050 */  sw        $ra, 0x50($sp)
-/* 3E2410 E00EA530 AFB00048 */  sw        $s0, 0x48($sp)
-/* 3E2414 E00EA534 8E27000C */  lw        $a3, 0xc($s1)
-/* 3E2418 E00EA538 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 3E241C E00EA53C 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 3E2420 E00EA540 3C013F80 */  lui       $at, 0x3f80
-/* 3E2424 E00EA544 44810000 */  mtc1      $at, $f0
-/* 3E2428 E00EA548 27A20038 */  addiu     $v0, $sp, 0x38
-/* 3E242C E00EA54C AFA20014 */  sw        $v0, 0x14($sp)
-/* 3E2430 E00EA550 27A2003C */  addiu     $v0, $sp, 0x3c
-/* 3E2434 E00EA554 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E2438 E00EA558 27A20040 */  addiu     $v0, $sp, 0x40
-/* 3E243C E00EA55C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E2440 E00EA560 27A20044 */  addiu     $v0, $sp, 0x44
-/* 3E2444 E00EA564 AFA20020 */  sw        $v0, 0x20($sp)
-/* 3E2448 E00EA568 00032080 */  sll       $a0, $v1, 2
-/* 3E244C E00EA56C 00832021 */  addu      $a0, $a0, $v1
-/* 3E2450 E00EA570 00042080 */  sll       $a0, $a0, 2
-/* 3E2454 E00EA574 00832023 */  subu      $a0, $a0, $v1
-/* 3E2458 E00EA578 000410C0 */  sll       $v0, $a0, 3
-/* 3E245C E00EA57C 00822021 */  addu      $a0, $a0, $v0
-/* 3E2460 E00EA580 000420C0 */  sll       $a0, $a0, 3
-/* 3E2464 E00EA584 3C02800B */  lui       $v0, %hi(gCameras+0xD4)
-/* 3E2468 E00EA588 24421E54 */  addiu     $v0, $v0, %lo(gCameras+0xD4)
-/* 3E246C E00EA58C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 3E2470 E00EA590 8CE50004 */  lw        $a1, 4($a3)
-/* 3E2474 E00EA594 8CE60008 */  lw        $a2, 8($a3)
-/* 3E2478 E00EA598 8CE7000C */  lw        $a3, 0xc($a3)
-/* 3E247C E00EA59C 0C080168 */  jal       shim_transform_point
-/* 3E2480 E00EA5A0 00822021 */   addu     $a0, $a0, $v0
-/* 3E2484 E00EA5A4 C7A00040 */  lwc1      $f0, 0x40($sp)
-/* 3E2488 E00EA5A8 3C01459C */  lui       $at, 0x459c
-/* 3E248C E00EA5AC 34214000 */  ori       $at, $at, 0x4000
-/* 3E2490 E00EA5B0 44811000 */  mtc1      $at, $f2
-/* 3E2494 E00EA5B4 00000000 */  nop
-/* 3E2498 E00EA5B8 46020000 */  add.s     $f0, $f0, $f2
-/* 3E249C E00EA5BC 4600010D */  trunc.w.s $f4, $f0
-/* 3E24A0 E00EA5C0 44032000 */  mfc1      $v1, $f4
-/* 3E24A4 E00EA5C4 00000000 */  nop
-/* 3E24A8 E00EA5C8 04610003 */  bgez      $v1, .LE00EA5D8
-/* 3E24AC E00EA5CC 27B00028 */   addiu    $s0, $sp, 0x28
-/* 3E24B0 E00EA5D0 0803A979 */  j         .LE00EA5E4
-/* 3E24B4 E00EA5D4 0000182D */   daddu    $v1, $zero, $zero
-.LE00EA5D8:
-/* 3E24B8 E00EA5D8 28622711 */  slti      $v0, $v1, 0x2711
-/* 3E24BC E00EA5DC 50400001 */  beql      $v0, $zero, .LE00EA5E4
-/* 3E24C0 E00EA5E0 24032710 */   addiu    $v1, $zero, 0x2710
-.LE00EA5E4:
-/* 3E24C4 E00EA5E4 C7A20044 */  lwc1      $f2, 0x44($sp)
-/* 3E24C8 E00EA5E8 3C01E00F */  lui       $at, %hi(D_E00EAA68)
-/* 3E24CC E00EA5EC D420AA68 */  ldc1      $f0, %lo(D_E00EAA68)($at)
-/* 3E24D0 E00EA5F0 460010A1 */  cvt.d.s   $f2, $f2
-/* 3E24D4 E00EA5F4 4620103C */  c.lt.d    $f2, $f0
-/* 3E24D8 E00EA5F8 00000000 */  nop
-/* 3E24DC E00EA5FC 45000008 */  bc1f      .LE00EA620
-/* 3E24E0 E00EA600 0200202D */   daddu    $a0, $s0, $zero
-/* 3E24E4 E00EA604 3C01E00F */  lui       $at, %hi(D_E00EAA70)
-/* 3E24E8 E00EA608 D420AA70 */  ldc1      $f0, %lo(D_E00EAA70)($at)
-/* 3E24EC E00EA60C 4622003C */  c.lt.d    $f0, $f2
-/* 3E24F0 E00EA610 00000000 */  nop
-/* 3E24F4 E00EA614 45030002 */  bc1tl     .LE00EA620
-/* 3E24F8 E00EA618 0000182D */   daddu    $v1, $zero, $zero
-/* 3E24FC E00EA61C 0200202D */  daddu     $a0, $s0, $zero
-.LE00EA620:
-/* 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)
-/* 3E2514 E00EA634 24020011 */  addiu     $v0, $zero, 0x11
-/* 3E2518 E00EA638 AC910008 */  sw        $s1, 8($a0)
-/* 3E251C E00EA63C 0C080120 */  jal       shim_queue_render_task
-/* 3E2520 E00EA640 AC820000 */   sw       $v0, ($a0)
-/* 3E2524 E00EA644 8C430000 */  lw        $v1, ($v0)
-/* 3E2528 E00EA648 34630002 */  ori       $v1, $v1, 2
-/* 3E252C E00EA64C AC430000 */  sw        $v1, ($v0)
-/* 3E2530 E00EA650 8FBF0050 */  lw        $ra, 0x50($sp)
-/* 3E2534 E00EA654 8FB1004C */  lw        $s1, 0x4c($sp)
-/* 3E2538 E00EA658 8FB00048 */  lw        $s0, 0x48($sp)
-/* 3E253C E00EA65C 03E00008 */  jr        $ra
-/* 3E2540 E00EA660 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
index daed28776f..0276edb265 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
@@ -1,6 +1,11 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+dlabel D_E00EAA60
+.double 0.1
+
+.section .text
 glabel fx_117_update
 /* 3E2078 E00EA198 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3E207C E00EA19C AFBF0014 */  sw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_render.s b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_render.s
deleted file mode 100644
index e4fc07264f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_119_render
-/* 3E4840 E010A4A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3E4858 E010A4B8 24020001 */  addiu     $v0, $zero, 1
-/* 3E485C E010A4BC AFA40018 */  sw        $a0, 0x18($sp)
-/* 3E4860 E010A4C0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3E4864 E010A4C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3E4868 E010A4C8 0C080120 */  jal       shim_queue_render_task
-/* 3E486C E010A4CC AFA20010 */   sw       $v0, 0x10($sp)
-/* 3E4870 E010A4D0 8C430000 */  lw        $v1, ($v0)
-/* 3E4874 E010A4D4 34630002 */  ori       $v1, $v1, 2
-/* 3E4878 E010A4D8 AC430000 */  sw        $v1, ($v0)
-/* 3E487C E010A4DC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3E4880 E010A4E0 03E00008 */  jr        $ra
-/* 3E4884 E010A4E4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_12/fx_12_render.s b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_render.s
deleted file mode 100644
index a769374d49..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_12/fx_12_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_12_render
-/* 32F8F8 E0018378 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 32F910 E0018390 27A40010 */  addiu     $a0, $sp, 0x10
-/* 32F914 E0018394 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 32F918 E0018398 AFA00014 */  sw        $zero, 0x14($sp)
-/* 32F91C E001839C 0C080120 */  jal       shim_queue_render_task
-/* 32F920 E00183A0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 32F924 E00183A4 8C430000 */  lw        $v1, ($v0)
-/* 32F928 E00183A8 34630002 */  ori       $v1, $v1, 2
-/* 32F92C E00183AC AC430000 */  sw        $v1, ($v0)
-/* 32F930 E00183B0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 32F934 E00183B4 03E00008 */  jr        $ra
-/* 32F938 E00183B8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_render.s b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_render.s
deleted file mode 100644
index 195d3e0ede..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_120_render
-/* 3E5814 E010C354 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3E582C E010C36C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3E5830 E010C370 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3E5834 E010C374 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3E5838 E010C378 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3E583C E010C37C 0C080120 */  jal       shim_queue_render_task
-/* 3E5840 E010C380 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3E5844 E010C384 8C430000 */  lw        $v1, ($v0)
-/* 3E5848 E010C388 34630002 */  ori       $v1, $v1, 2
-/* 3E584C E010C38C AC430000 */  sw        $v1, ($v0)
-/* 3E5850 E010C390 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3E5854 E010C394 03E00008 */  jr        $ra
-/* 3E5858 E010C398 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_render.s b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_render.s
deleted file mode 100644
index d2c7cfc6d6..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_121_render
-/* 3EB9F0 E010E510 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3EBA08 E010E528 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3EBA0C E010E52C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3EBA10 E010E530 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3EBA14 E010E534 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3EBA18 E010E538 0C080120 */  jal       shim_queue_render_task
-/* 3EBA1C E010E53C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3EBA20 E010E540 8C430000 */  lw        $v1, ($v0)
-/* 3EBA24 E010E544 34630002 */  ori       $v1, $v1, 2
-/* 3EBA28 E010E548 AC430000 */  sw        $v1, ($v0)
-/* 3EBA2C E010E54C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3EBA30 E010E550 03E00008 */  jr        $ra
-/* 3EBA34 E010E554 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_render.s b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_render.s
deleted file mode 100644
index 217c1dfc33..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_122_render
-/* 3F8794 E01103A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3F87AC E01103BC 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3F87B0 E01103C0 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3F87B4 E01103C4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3F87B8 E01103C8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3F87BC E01103CC 0C080120 */  jal       shim_queue_render_task
-/* 3F87C0 E01103D0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3F87C4 E01103D4 8C430000 */  lw        $v1, ($v0)
-/* 3F87C8 E01103D8 34630002 */  ori       $v1, $v1, 2
-/* 3F87CC E01103DC AC430000 */  sw        $v1, ($v0)
-/* 3F87D0 E01103E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3F87D4 E01103E4 03E00008 */  jr        $ra
-/* 3F87D8 E01103E8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_render.s b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_render.s
deleted file mode 100644
index cd6d2c394e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_123_render
-/* 3FA138 E01122E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3FA150 E0112300 24020011 */  addiu     $v0, $zero, 0x11
-/* 3FA154 E0112304 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3FA158 E0112308 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3FA15C E011230C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3FA160 E0112310 0C080120 */  jal       shim_queue_render_task
-/* 3FA164 E0112314 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3FA168 E0112318 8C430000 */  lw        $v1, ($v0)
-/* 3FA16C E011231C 34630002 */  ori       $v1, $v1, 2
-/* 3FA170 E0112320 AC430000 */  sw        $v1, ($v0)
-/* 3FA174 E0112324 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3FA178 E0112328 03E00008 */  jr        $ra
-/* 3FA17C E011232C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_render.s b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_render.s
deleted file mode 100644
index 17f3dd99b2..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_124_render
-/* 3FEE20 E0114340 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3FEE38 E0114358 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3FEE3C E011435C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3FEE40 E0114360 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3FEE44 E0114364 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3FEE48 E0114368 0C080120 */  jal       shim_queue_render_task
-/* 3FEE4C E011436C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3FEE50 E0114370 8C430000 */  lw        $v1, ($v0)
-/* 3FEE54 E0114374 34630002 */  ori       $v1, $v1, 2
-/* 3FEE58 E0114378 AC430000 */  sw        $v1, ($v0)
-/* 3FEE5C E011437C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3FEE60 E0114380 03E00008 */  jr        $ra
-/* 3FEE64 E0114384 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_render.s b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_render.s
deleted file mode 100644
index 1756201efe..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_125_render
-/* 402CE0 E01166A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 402CF8 E01166B8 24020011 */  addiu     $v0, $zero, 0x11
-/* 402CFC E01166BC AFA40018 */  sw        $a0, 0x18($sp)
-/* 402D00 E01166C0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 402D04 E01166C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 402D08 E01166C8 0C080120 */  jal       shim_queue_render_task
-/* 402D0C E01166CC AFA20010 */   sw       $v0, 0x10($sp)
-/* 402D10 E01166D0 8C430000 */  lw        $v1, ($v0)
-/* 402D14 E01166D4 34630002 */  ori       $v1, $v1, 2
-/* 402D18 E01166D8 AC430000 */  sw        $v1, ($v0)
-/* 402D1C E01166DC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 402D20 E01166E0 03E00008 */  jr        $ra
-/* 402D24 E01166E4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_render.s b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_render.s
deleted file mode 100644
index 1eb96e77e5..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_126_render
-/* 403854 E0118454 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 40386C E011846C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 403870 E0118470 AFA40018 */  sw        $a0, 0x18($sp)
-/* 403874 E0118474 27A40010 */  addiu     $a0, $sp, 0x10
-/* 403878 E0118478 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 40387C E011847C 0C080120 */  jal       shim_queue_render_task
-/* 403880 E0118480 AFA20010 */   sw       $v0, 0x10($sp)
-/* 403884 E0118484 8C430000 */  lw        $v1, ($v0)
-/* 403888 E0118488 34630002 */  ori       $v1, $v1, 2
-/* 40388C E011848C AC430000 */  sw        $v1, ($v0)
-/* 403890 E0118490 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 403894 E0118494 03E00008 */  jr        $ra
-/* 403898 E0118498 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_render.s b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_render.s
deleted file mode 100644
index 4cda84b27d..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_128_render
-/* 406CBC E011C17C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 406CD4 E011C194 2402002D */  addiu     $v0, $zero, 0x2d
-/* 406CD8 E011C198 AFA40018 */  sw        $a0, 0x18($sp)
-/* 406CDC E011C19C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 406CE0 E011C1A0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 406CE4 E011C1A4 0C080120 */  jal       shim_queue_render_task
-/* 406CE8 E011C1A8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 406CEC E011C1AC 8C430000 */  lw        $v1, ($v0)
-/* 406CF0 E011C1B0 34630002 */  ori       $v1, $v1, 2
-/* 406CF4 E011C1B4 AC430000 */  sw        $v1, ($v0)
-/* 406CF8 E011C1B8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 406CFC E011C1BC 03E00008 */  jr        $ra
-/* 406D00 E011C1C0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_render.s b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_render.s
deleted file mode 100644
index fe361df2fa..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_129_render
-/* 409EC0 E011E530 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 409ED8 E011E548 2402002D */  addiu     $v0, $zero, 0x2d
-/* 409EDC E011E54C AFA40018 */  sw        $a0, 0x18($sp)
-/* 409EE0 E011E550 27A40010 */  addiu     $a0, $sp, 0x10
-/* 409EE4 E011E554 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 409EE8 E011E558 0C080120 */  jal       shim_queue_render_task
-/* 409EEC E011E55C AFA20010 */   sw       $v0, 0x10($sp)
-/* 409EF0 E011E560 8C430000 */  lw        $v1, ($v0)
-/* 409EF4 E011E564 34630002 */  ori       $v1, $v1, 2
-/* 409EF8 E011E568 AC430000 */  sw        $v1, ($v0)
-/* 409EFC E011E56C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 409F00 E011E570 03E00008 */  jr        $ra
-/* 409F04 E011E574 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_render.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_render.s
deleted file mode 100644
index 438c7ced09..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_13_render
-/* 33022C E001A3FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 330244 E001A414 27A40010 */  addiu     $a0, $sp, 0x10
-/* 330248 E001A418 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 33024C E001A41C AFA00014 */  sw        $zero, 0x14($sp)
-/* 330250 E001A420 0C080120 */  jal       shim_queue_render_task
-/* 330254 E001A424 AFA20010 */   sw       $v0, 0x10($sp)
-/* 330258 E001A428 8C430000 */  lw        $v1, ($v0)
-/* 33025C E001A42C 34630002 */  ori       $v1, $v1, 2
-/* 330260 E001A430 AC430000 */  sw        $v1, ($v0)
-/* 330264 E001A434 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 330268 E001A438 03E00008 */  jr        $ra
-/* 33026C E001A43C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_render.s b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_render.s
deleted file mode 100644
index 238394ac40..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_130_render
-/* 40B78C E012039C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 40B7A4 E01203B4 2402002D */  addiu     $v0, $zero, 0x2d
-/* 40B7A8 E01203B8 AFA40018 */  sw        $a0, 0x18($sp)
-/* 40B7AC E01203BC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 40B7B0 E01203C0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 40B7B4 E01203C4 0C080120 */  jal       shim_queue_render_task
-/* 40B7B8 E01203C8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 40B7BC E01203CC 8C430000 */  lw        $v1, ($v0)
-/* 40B7C0 E01203D0 34630002 */  ori       $v1, $v1, 2
-/* 40B7C4 E01203D4 AC430000 */  sw        $v1, ($v0)
-/* 40B7C8 E01203D8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 40B7CC E01203DC 03E00008 */  jr        $ra
-/* 40B7D0 E01203E0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_render.s b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_render.s
deleted file mode 100644
index fe92aedb5d..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_131_render
-/* 40CC64 E01226C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 40CC7C E01226DC 2402002D */  addiu     $v0, $zero, 0x2d
-/* 40CC80 E01226E0 AFA40018 */  sw        $a0, 0x18($sp)
-/* 40CC84 E01226E4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 40CC88 E01226E8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 40CC8C E01226EC 0C080120 */  jal       shim_queue_render_task
-/* 40CC90 E01226F0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 40CC94 E01226F4 8C430000 */  lw        $v1, ($v0)
-/* 40CC98 E01226F8 34630002 */  ori       $v1, $v1, 2
-/* 40CC9C E01226FC AC430000 */  sw        $v1, ($v0)
-/* 40CCA0 E0122700 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 40CCA4 E0122704 03E00008 */  jr        $ra
-/* 40CCA8 E0122708 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_render.s b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_render.s
deleted file mode 100644
index 5e5daf1ee4..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_render.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_132_render
-/* 412BBC E012448C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 412BD4 E01244A4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 412BD8 E01244A8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 412BDC E01244AC AFA00014 */  sw        $zero, 0x14($sp)
-/* 412BE0 E01244B0 0C080120 */  jal       shim_queue_render_task
-/* 412BE4 E01244B4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 412BE8 E01244B8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 412BEC E01244BC 03E00008 */  jr        $ra
-/* 412BF0 E01244C0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_render.s b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_render.s
deleted file mode 100644
index 239afaf8d5..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_133_render
-/* 413804 E01264A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 41381C E01264BC 2402002D */  addiu     $v0, $zero, 0x2d
-/* 413820 E01264C0 AFA40018 */  sw        $a0, 0x18($sp)
-/* 413824 E01264C4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 413828 E01264C8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 41382C E01264CC 0C080120 */  jal       shim_queue_render_task
-/* 413830 E01264D0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 413834 E01264D4 8C430000 */  lw        $v1, ($v0)
-/* 413838 E01264D8 34630002 */  ori       $v1, $v1, 2
-/* 41383C E01264DC AC430000 */  sw        $v1, ($v0)
-/* 413840 E01264E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 413844 E01264E4 03E00008 */  jr        $ra
-/* 413848 E01264E8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_render.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_render.s
deleted file mode 100644
index d46f67dc89..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_134_render
-/* 414D38 E0128198 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 414D50 E01281B0 2402002D */  addiu     $v0, $zero, 0x2d
-/* 414D54 E01281B4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 414D58 E01281B8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 414D5C E01281BC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 414D60 E01281C0 0C080120 */  jal       shim_queue_render_task
-/* 414D64 E01281C4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 414D68 E01281C8 8C430000 */  lw        $v1, ($v0)
-/* 414D6C E01281CC 34630002 */  ori       $v1, $v1, 2
-/* 414D70 E01281D0 AC430000 */  sw        $v1, ($v0)
-/* 414D74 E01281D4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 414D78 E01281D8 03E00008 */  jr        $ra
-/* 414D7C E01281DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_render.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_render.s
deleted file mode 100644
index aea5abb209..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_render.s
+++ /dev/null
@@ -1,77 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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)
-/* 330B1C E001C20C 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 330B20 E001C210 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 330B24 E001C214 8CA2000C */  lw        $v0, 0xc($a1)
-/* 330B28 E001C218 C4640028 */  lwc1      $f4, 0x28($v1)
-/* 330B2C E001C21C C4420000 */  lwc1      $f2, ($v0)
-/* 330B30 E001C220 46041001 */  sub.s     $f0, $f2, $f4
-/* 330B34 E001C224 3C014348 */  lui       $at, 0x4348
-/* 330B38 E001C228 44813000 */  mtc1      $at, $f6
-/* 330B3C E001C22C 00000000 */  nop
-/* 330B40 E001C230 4600303C */  c.lt.s    $f6, $f0
-/* 330B44 E001C234 00000000 */  nop
-/* 330B48 E001C238 45000005 */  bc1f      .LE001C250
-/* 330B4C E001C23C 27A40010 */   addiu    $a0, $sp, 0x10
-/* 330B50 E001C240 3C0143C8 */  lui       $at, 0x43c8
-/* 330B54 E001C244 44810000 */  mtc1      $at, $f0
-/* 330B58 E001C248 0800709D */  j         .LE001C274
-/* 330B5C E001C24C 46001001 */   sub.s    $f0, $f2, $f0
-.LE001C250:
-/* 330B60 E001C250 46022001 */  sub.s     $f0, $f4, $f2
-/* 330B64 E001C254 4600303C */  c.lt.s    $f6, $f0
-/* 330B68 E001C258 00000000 */  nop
-/* 330B6C E001C25C 45000006 */  bc1f      .LE001C278
-/* 330B70 E001C260 00000000 */   nop
-/* 330B74 E001C264 3C0143C8 */  lui       $at, 0x43c8
-/* 330B78 E001C268 44810000 */  mtc1      $at, $f0
-/* 330B7C E001C26C 00000000 */  nop
-/* 330B80 E001C270 46001000 */  add.s     $f0, $f2, $f0
-.LE001C274:
-/* 330B84 E001C274 E4400000 */  swc1      $f0, ($v0)
-.LE001C278:
-/* 330B88 E001C278 C4420008 */  lwc1      $f2, 8($v0)
-/* 330B8C E001C27C C4640030 */  lwc1      $f4, 0x30($v1)
-/* 330B90 E001C280 46041001 */  sub.s     $f0, $f2, $f4
-/* 330B94 E001C284 3C014348 */  lui       $at, 0x4348
-/* 330B98 E001C288 44813000 */  mtc1      $at, $f6
-/* 330B9C E001C28C 00000000 */  nop
-/* 330BA0 E001C290 4600303C */  c.lt.s    $f6, $f0
-/* 330BA4 E001C294 00000000 */  nop
-/* 330BA8 E001C298 45020005 */  bc1fl     .LE001C2B0
-/* 330BAC E001C29C 46022001 */   sub.s    $f0, $f4, $f2
-/* 330BB0 E001C2A0 3C0143C8 */  lui       $at, 0x43c8
-/* 330BB4 E001C2A4 44810000 */  mtc1      $at, $f0
-/* 330BB8 E001C2A8 080070B4 */  j         .LE001C2D0
-/* 330BBC E001C2AC 46001001 */   sub.s    $f0, $f2, $f0
-.LE001C2B0:
-/* 330BC0 E001C2B0 4600303C */  c.lt.s    $f6, $f0
-/* 330BC4 E001C2B4 00000000 */  nop
-/* 330BC8 E001C2B8 45000006 */  bc1f      .LE001C2D4
-/* 330BCC E001C2BC 00000000 */   nop
-/* 330BD0 E001C2C0 3C0143C8 */  lui       $at, 0x43c8
-/* 330BD4 E001C2C4 44810000 */  mtc1      $at, $f0
-/* 330BD8 E001C2C8 00000000 */  nop
-/* 330BDC E001C2CC 46001000 */  add.s     $f0, $f2, $f0
-.LE001C2D0:
-/* 330BE0 E001C2D0 E4400008 */  swc1      $f0, 8($v0)
-.LE001C2D4:
-/* 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)
-/* 330BF8 E001C2E8 AC800004 */  sw        $zero, 4($a0)
-/* 330BFC E001C2EC 0C080120 */  jal       shim_queue_render_task
-/* 330C00 E001C2F0 AC820000 */   sw       $v0, ($a0)
-/* 330C04 E001C2F4 8C430000 */  lw        $v1, ($v0)
-/* 330C08 E001C2F8 34630002 */  ori       $v1, $v1, 2
-/* 330C0C E001C2FC AC430000 */  sw        $v1, ($v0)
-/* 330C10 E001C300 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 330C14 E001C304 03E00008 */  jr        $ra
-/* 330C18 E001C308 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_render.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_render.s
deleted file mode 100644
index 0336829f04..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_render.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 33204C E001E70C 8C620038 */  lw        $v0, 0x38($v1)
-/* 332050 E001E710 10400002 */  beqz      $v0, .LE001E71C
-/* 332054 E001E714 27A40010 */   addiu    $a0, $sp, 0x10
-/* 332058 E001E718 2405002D */  addiu     $a1, $zero, 0x2d
-.LE001E71C:
-/* 33205C E001E71C 0C080120 */  jal       shim_queue_render_task
-/* 332060 E001E720 AFA50010 */   sw       $a1, 0x10($sp)
-/* 332064 E001E724 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 332068 E001E728 03E00008 */  jr        $ra
-/* 33206C E001E72C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_render.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_render.s
deleted file mode 100644
index 4542107c5c..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_16_render
-/* 33444C E002058C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 334464 E00205A4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 334468 E00205A8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 33446C E00205AC AFA00014 */  sw        $zero, 0x14($sp)
-/* 334470 E00205B0 0C080120 */  jal       shim_queue_render_task
-/* 334474 E00205B4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 334478 E00205B8 8C430000 */  lw        $v1, ($v0)
-/* 33447C E00205BC 34630002 */  ori       $v1, $v1, 2
-/* 334480 E00205C0 AC430000 */  sw        $v1, ($v0)
-/* 334484 E00205C4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 334488 E00205C8 03E00008 */  jr        $ra
-/* 33448C E00205CC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_render.s b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_render.s
deleted file mode 100644
index 9e4b5529c0..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_render.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_17_render
-/* 337BA0 E0022960 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 337BB8 E0022978 27A40010 */  addiu     $a0, $sp, 0x10
-/* 337BBC E002297C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 337BC0 E0022980 AFA00014 */  sw        $zero, 0x14($sp)
-/* 337BC4 E0022984 0C080120 */  jal       shim_queue_render_task
-/* 337BC8 E0022988 AFA20010 */   sw       $v0, 0x10($sp)
-/* 337BCC E002298C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 337BD0 E0022990 03E00008 */  jr        $ra
-/* 337BD4 E0022994 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_render.s b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_render.s
deleted file mode 100644
index c5affe05c5..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_18_render
-/* 339530 E00242E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 339548 E00242F8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 33954C E00242FC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 339550 E0024300 AFA00014 */  sw        $zero, 0x14($sp)
-/* 339554 E0024304 0C080120 */  jal       shim_queue_render_task
-/* 339558 E0024308 AFA20010 */   sw       $v0, 0x10($sp)
-/* 33955C E002430C 8C430000 */  lw        $v1, ($v0)
-/* 339560 E0024310 34630002 */  ori       $v1, $v1, 2
-/* 339564 E0024314 AC430000 */  sw        $v1, ($v0)
-/* 339568 E0024318 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 33956C E002431C 03E00008 */  jr        $ra
-/* 339570 E0024320 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_render.s b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_render.s
deleted file mode 100644
index 9eb9f1421e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_19_render
-/* 33B630 E00264B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 33B648 E00264C8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 33B64C E00264CC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 33B650 E00264D0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 33B654 E00264D4 0C080120 */  jal       shim_queue_render_task
-/* 33B658 E00264D8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 33B65C E00264DC 8C430000 */  lw        $v1, ($v0)
-/* 33B660 E00264E0 34630002 */  ori       $v1, $v1, 2
-/* 33B664 E00264E4 AC430000 */  sw        $v1, ($v0)
-/* 33B668 E00264E8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 33B66C E00264EC 03E00008 */  jr        $ra
-/* 33B670 E00264F0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_render.s b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_render.s
deleted file mode 100644
index fda008b901..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_20_render
-/* 33D2D8 E00284E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 33D2F0 E0028500 27A40010 */  addiu     $a0, $sp, 0x10
-/* 33D2F4 E0028504 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 33D2F8 E0028508 AFA00014 */  sw        $zero, 0x14($sp)
-/* 33D2FC E002850C 0C080120 */  jal       shim_queue_render_task
-/* 33D300 E0028510 AFA20010 */   sw       $v0, 0x10($sp)
-/* 33D304 E0028514 8C430000 */  lw        $v1, ($v0)
-/* 33D308 E0028518 34630002 */  ori       $v1, $v1, 2
-/* 33D30C E002851C AC430000 */  sw        $v1, ($v0)
-/* 33D310 E0028520 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 33D314 E0028524 03E00008 */  jr        $ra
-/* 33D318 E0028528 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_render.s b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_render.s
deleted file mode 100644
index a5cc7bdf9e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_21_render
-/* 33EC40 E002A380 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 33EC58 E002A398 27A40010 */  addiu     $a0, $sp, 0x10
-/* 33EC5C E002A39C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 33EC60 E002A3A0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 33EC64 E002A3A4 0C080120 */  jal       shim_queue_render_task
-/* 33EC68 E002A3A8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 33EC6C E002A3AC 8C430000 */  lw        $v1, ($v0)
-/* 33EC70 E002A3B0 34630002 */  ori       $v1, $v1, 2
-/* 33EC74 E002A3B4 AC430000 */  sw        $v1, ($v0)
-/* 33EC78 E002A3B8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 33EC7C E002A3BC 03E00008 */  jr        $ra
-/* 33EC80 E002A3C0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_render.s b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_render.s
deleted file mode 100644
index a80d595149..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_22_render
-/* 340250 E002C3D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 340268 E002C3E8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 34026C E002C3EC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 340270 E002C3F0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 340274 E002C3F4 0C080120 */  jal       shim_queue_render_task
-/* 340278 E002C3F8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 34027C E002C3FC 8C430000 */  lw        $v1, ($v0)
-/* 340280 E002C400 34630002 */  ori       $v1, $v1, 2
-/* 340284 E002C404 AC430000 */  sw        $v1, ($v0)
-/* 340288 E002C408 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 34028C E002C40C 03E00008 */  jr        $ra
-/* 340290 E002C410 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_render.s b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_render.s
deleted file mode 100644
index 7cc216b5fc..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_render.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_23_render
-/* 341D10 E002E330 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 341D28 E002E348 27A40010 */  addiu     $a0, $sp, 0x10
-/* 341D2C E002E34C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 341D30 E002E350 AFA00014 */  sw        $zero, 0x14($sp)
-/* 341D34 E002E354 0C080120 */  jal       shim_queue_render_task
-/* 341D38 E002E358 AFA20010 */   sw       $v0, 0x10($sp)
-/* 341D3C E002E35C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 341D40 E002E360 03E00008 */  jr        $ra
-/* 341D44 E002E364 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_render.s b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_render.s
deleted file mode 100644
index 782c869e82..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_24_render
-/* 342B64 E0030A24 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 342B7C E0030A3C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 342B80 E0030A40 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 342B84 E0030A44 AFA00014 */  sw        $zero, 0x14($sp)
-/* 342B88 E0030A48 0C080120 */  jal       shim_queue_render_task
-/* 342B8C E0030A4C AFA20010 */   sw       $v0, 0x10($sp)
-/* 342B90 E0030A50 8C430000 */  lw        $v1, ($v0)
-/* 342B94 E0030A54 34630002 */  ori       $v1, $v1, 2
-/* 342B98 E0030A58 AC430000 */  sw        $v1, ($v0)
-/* 342B9C E0030A5C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 342BA0 E0030A60 03E00008 */  jr        $ra
-/* 342BA4 E0030A64 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_render.s b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_render.s
deleted file mode 100644
index 4b8aabb126..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_25_render
-/* 343AA0 E0032420 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 343AB8 E0032438 2402002D */  addiu     $v0, $zero, 0x2d
-/* 343ABC E003243C AFA40018 */  sw        $a0, 0x18($sp)
-/* 343AC0 E0032440 27A40010 */  addiu     $a0, $sp, 0x10
-/* 343AC4 E0032444 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 343AC8 E0032448 0C080120 */  jal       shim_queue_render_task
-/* 343ACC E003244C AFA20010 */   sw       $v0, 0x10($sp)
-/* 343AD0 E0032450 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 343AD4 E0032454 03E00008 */  jr        $ra
-/* 343AD8 E0032458 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_render.s b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_render.s
deleted file mode 100644
index da9a3209ab..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_26_render
-/* 344CD8 E00342C8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 344CF0 E00342E0 2402002D */  addiu     $v0, $zero, 0x2d
-/* 344CF4 E00342E4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 344CF8 E00342E8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 344CFC E00342EC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 344D00 E00342F0 0C080120 */  jal       shim_queue_render_task
-/* 344D04 E00342F4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 344D08 E00342F8 8C430000 */  lw        $v1, ($v0)
-/* 344D0C E00342FC 34630002 */  ori       $v1, $v1, 2
-/* 344D10 E0034300 AC430000 */  sw        $v1, ($v0)
-/* 344D14 E0034304 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 344D18 E0034308 03E00008 */  jr        $ra
-/* 344D1C E003430C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_render.s b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_render.s
deleted file mode 100644
index c1276297c0..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_27_render
-/* 3456B8 E00361D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3456D0 E00361F0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3456D4 E00361F4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3456D8 E00361F8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3456DC E00361FC 0C080120 */  jal       shim_queue_render_task
-/* 3456E0 E0036200 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3456E4 E0036204 8C430000 */  lw        $v1, ($v0)
-/* 3456E8 E0036208 34630002 */  ori       $v1, $v1, 2
-/* 3456EC E003620C AC430000 */  sw        $v1, ($v0)
-/* 3456F0 E0036210 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3456F4 E0036214 03E00008 */  jr        $ra
-/* 3456F8 E0036218 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_render.s b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_render.s
deleted file mode 100644
index 12fd636bec..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_28_render
-/* 34E424 E0038704 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 34E43C E003871C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 34E440 E0038720 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 34E444 E0038724 AFA00014 */  sw        $zero, 0x14($sp)
-/* 34E448 E0038728 0C080120 */  jal       shim_queue_render_task
-/* 34E44C E003872C AFA20010 */   sw       $v0, 0x10($sp)
-/* 34E450 E0038730 8C430000 */  lw        $v1, ($v0)
-/* 34E454 E0038734 34630002 */  ori       $v1, $v1, 2
-/* 34E458 E0038738 AC430000 */  sw        $v1, ($v0)
-/* 34E45C E003873C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 34E460 E0038740 03E00008 */  jr        $ra
-/* 34E464 E0038744 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_render.s b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_render.s
deleted file mode 100644
index fd6bcd369b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_29_render
-/* 34EF90 E003A310 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 34EFA8 E003A328 27A40010 */  addiu     $a0, $sp, 0x10
-/* 34EFAC E003A32C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 34EFB0 E003A330 AFA00014 */  sw        $zero, 0x14($sp)
-/* 34EFB4 E003A334 0C080120 */  jal       shim_queue_render_task
-/* 34EFB8 E003A338 AFA20010 */   sw       $v0, 0x10($sp)
-/* 34EFBC E003A33C 8C430000 */  lw        $v1, ($v0)
-/* 34EFC0 E003A340 34630002 */  ori       $v1, $v1, 2
-/* 34EFC4 E003A344 AC430000 */  sw        $v1, ($v0)
-/* 34EFC8 E003A348 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 34EFCC E003A34C 03E00008 */  jr        $ra
-/* 34EFD0 E003A350 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_render.s b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_render.s
deleted file mode 100644
index 5a709ddf4b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_31_render
-/* 352A34 E003E5F4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 352A4C E003E60C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 352A50 E003E610 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 352A54 E003E614 AFA00014 */  sw        $zero, 0x14($sp)
-/* 352A58 E003E618 0C080120 */  jal       shim_queue_render_task
-/* 352A5C E003E61C AFA20010 */   sw       $v0, 0x10($sp)
-/* 352A60 E003E620 8C430000 */  lw        $v1, ($v0)
-/* 352A64 E003E624 34630002 */  ori       $v1, $v1, 2
-/* 352A68 E003E628 AC430000 */  sw        $v1, ($v0)
-/* 352A6C E003E62C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 352A70 E003E630 03E00008 */  jr        $ra
-/* 352A74 E003E634 27BD0028 */   addiu    $sp, $sp, 0x28
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 7cf224c155..f3bbae73a2 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
@@ -1,6 +1,11 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+dlabel D_E0040890
+.double 0.01
+
+.section .text
 glabel fx_32_main
 /* 353300 E0040000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 353304 E0040004 F7B40038 */  sdc1      $f20, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_render.s b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_render.s
deleted file mode 100644
index 5187e0d08e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_render.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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
-/* 35351C E004021C AFBF0050 */  sw        $ra, 0x50($sp)
-/* 353520 E0040220 AFB00048 */  sw        $s0, 0x48($sp)
-/* 353524 E0040224 8E27000C */  lw        $a3, 0xc($s1)
-/* 353528 E0040228 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 35352C E004022C 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 353530 E0040230 3C013F80 */  lui       $at, 0x3f80
-/* 353534 E0040234 44810000 */  mtc1      $at, $f0
-/* 353538 E0040238 27A20038 */  addiu     $v0, $sp, 0x38
-/* 35353C E004023C AFA20014 */  sw        $v0, 0x14($sp)
-/* 353540 E0040240 27A2003C */  addiu     $v0, $sp, 0x3c
-/* 353544 E0040244 AFA20018 */  sw        $v0, 0x18($sp)
-/* 353548 E0040248 27A20040 */  addiu     $v0, $sp, 0x40
-/* 35354C E004024C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 353550 E0040250 27A20044 */  addiu     $v0, $sp, 0x44
-/* 353554 E0040254 AFA20020 */  sw        $v0, 0x20($sp)
-/* 353558 E0040258 00032080 */  sll       $a0, $v1, 2
-/* 35355C E004025C 00832021 */  addu      $a0, $a0, $v1
-/* 353560 E0040260 00042080 */  sll       $a0, $a0, 2
-/* 353564 E0040264 00832023 */  subu      $a0, $a0, $v1
-/* 353568 E0040268 000410C0 */  sll       $v0, $a0, 3
-/* 35356C E004026C 00822021 */  addu      $a0, $a0, $v0
-/* 353570 E0040270 000420C0 */  sll       $a0, $a0, 3
-/* 353574 E0040274 3C02800B */  lui       $v0, %hi(gCameras+0xD4)
-/* 353578 E0040278 24421E54 */  addiu     $v0, $v0, %lo(gCameras+0xD4)
-/* 35357C E004027C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 353580 E0040280 8CE50004 */  lw        $a1, 4($a3)
-/* 353584 E0040284 8CE60008 */  lw        $a2, 8($a3)
-/* 353588 E0040288 8CE7000C */  lw        $a3, 0xc($a3)
-/* 35358C E004028C 0C080168 */  jal       shim_transform_point
-/* 353590 E0040290 00822021 */   addu     $a0, $a0, $v0
-/* 353594 E0040294 C7A00040 */  lwc1      $f0, 0x40($sp)
-/* 353598 E0040298 3C01459C */  lui       $at, 0x459c
-/* 35359C E004029C 34214000 */  ori       $at, $at, 0x4000
-/* 3535A0 E00402A0 44811000 */  mtc1      $at, $f2
-/* 3535A4 E00402A4 00000000 */  nop
-/* 3535A8 E00402A8 46020000 */  add.s     $f0, $f0, $f2
-/* 3535AC E00402AC 4600010D */  trunc.w.s $f4, $f0
-/* 3535B0 E00402B0 44032000 */  mfc1      $v1, $f4
-/* 3535B4 E00402B4 00000000 */  nop
-/* 3535B8 E00402B8 04610003 */  bgez      $v1, .LE00402C8
-/* 3535BC E00402BC 27B00028 */   addiu    $s0, $sp, 0x28
-/* 3535C0 E00402C0 080100B5 */  j         .LE00402D4
-/* 3535C4 E00402C4 0000182D */   daddu    $v1, $zero, $zero
-.LE00402C8:
-/* 3535C8 E00402C8 28622711 */  slti      $v0, $v1, 0x2711
-/* 3535CC E00402CC 50400001 */  beql      $v0, $zero, .LE00402D4
-/* 3535D0 E00402D0 24032710 */   addiu    $v1, $zero, 0x2710
-.LE00402D4:
-/* 3535D4 E00402D4 C7A20044 */  lwc1      $f2, 0x44($sp)
-/* 3535D8 E00402D8 3C01E004 */  lui       $at, %hi(D_E0040898)
-/* 3535DC E00402DC D4200898 */  ldc1      $f0, %lo(D_E0040898)($at)
-/* 3535E0 E00402E0 460010A1 */  cvt.d.s   $f2, $f2
-/* 3535E4 E00402E4 4620103C */  c.lt.d    $f2, $f0
-/* 3535E8 E00402E8 00000000 */  nop
-/* 3535EC E00402EC 45000008 */  bc1f      .LE0040310
-/* 3535F0 E00402F0 0200202D */   daddu    $a0, $s0, $zero
-/* 3535F4 E00402F4 3C01E004 */  lui       $at, %hi(D_E00408A0)
-/* 3535F8 E00402F8 D42008A0 */  ldc1      $f0, %lo(D_E00408A0)($at)
-/* 3535FC E00402FC 4622003C */  c.lt.d    $f0, $f2
-/* 353600 E0040300 00000000 */  nop
-/* 353604 E0040304 45030002 */  bc1tl     .LE0040310
-/* 353608 E0040308 0000182D */   daddu    $v1, $zero, $zero
-/* 35360C E004030C 0200202D */  daddu     $a0, $s0, $zero
-.LE0040310:
-/* 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)
-/* 353624 E0040324 24020011 */  addiu     $v0, $zero, 0x11
-/* 353628 E0040328 AC910008 */  sw        $s1, 8($a0)
-/* 35362C E004032C 0C080120 */  jal       shim_queue_render_task
-/* 353630 E0040330 AC820000 */   sw       $v0, ($a0)
-/* 353634 E0040334 8FBF0050 */  lw        $ra, 0x50($sp)
-/* 353638 E0040338 8FB1004C */  lw        $s1, 0x4c($sp)
-/* 35363C E004033C 8FB00048 */  lw        $s0, 0x48($sp)
-/* 353640 E0040340 03E00008 */  jr        $ra
-/* 353644 E0040344 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_render.s b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_render.s
deleted file mode 100644
index 9f9867620b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_33_render
-/* 354B14 E0042374 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 354B2C E004238C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 354B30 E0042390 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 354B34 E0042394 AFA00014 */  sw        $zero, 0x14($sp)
-/* 354B38 E0042398 0C080120 */  jal       shim_queue_render_task
-/* 354B3C E004239C AFA20010 */   sw       $v0, 0x10($sp)
-/* 354B40 E00423A0 8C430000 */  lw        $v1, ($v0)
-/* 354B44 E00423A4 34630002 */  ori       $v1, $v1, 2
-/* 354B48 E00423A8 AC430000 */  sw        $v1, ($v0)
-/* 354B4C E00423AC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 354B50 E00423B0 03E00008 */  jr        $ra
-/* 354B54 E00423B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_render.s b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_render.s
deleted file mode 100644
index f84b31ff76..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_render.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_34_render
-/* 355844 E00448E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35585C E00448FC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 355860 E0044900 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 355864 E0044904 AFA00014 */  sw        $zero, 0x14($sp)
-/* 355868 E0044908 0C080120 */  jal       shim_queue_render_task
-/* 35586C E004490C AFA20010 */   sw       $v0, 0x10($sp)
-/* 355870 E0044910 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 355874 E0044914 03E00008 */  jr        $ra
-/* 355878 E0044918 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_render.s b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_render.s
deleted file mode 100644
index caf362822d..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_35_render
-/* 35615C E004627C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 356174 E0046294 27A40010 */  addiu     $a0, $sp, 0x10
-/* 356178 E0046298 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35617C E004629C AFA00014 */  sw        $zero, 0x14($sp)
-/* 356180 E00462A0 0C080120 */  jal       shim_queue_render_task
-/* 356184 E00462A4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 356188 E00462A8 8C430000 */  lw        $v1, ($v0)
-/* 35618C E00462AC 34630002 */  ori       $v1, $v1, 2
-/* 356190 E00462B0 AC430000 */  sw        $v1, ($v0)
-/* 356194 E00462B4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 356198 E00462B8 03E00008 */  jr        $ra
-/* 35619C E00462BC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_render.s b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_render.s
deleted file mode 100644
index c72196c8b0..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_36_render
-/* 356B54 E00481D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 356B6C E00481EC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 356B70 E00481F0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 356B74 E00481F4 AFA00014 */  sw        $zero, 0x14($sp)
-/* 356B78 E00481F8 0C080120 */  jal       shim_queue_render_task
-/* 356B7C E00481FC AFA20010 */   sw       $v0, 0x10($sp)
-/* 356B80 E0048200 8C430000 */  lw        $v1, ($v0)
-/* 356B84 E0048204 34630002 */  ori       $v1, $v1, 2
-/* 356B88 E0048208 AC430000 */  sw        $v1, ($v0)
-/* 356B8C E004820C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 356B90 E0048210 03E00008 */  jr        $ra
-/* 356B94 E0048214 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_render.s b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_render.s
deleted file mode 100644
index b8e36a128c..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_37_render
-/* 358C08 E004A748 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 358C20 E004A760 27A40010 */  addiu     $a0, $sp, 0x10
-/* 358C24 E004A764 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 358C28 E004A768 AFA00014 */  sw        $zero, 0x14($sp)
-/* 358C2C E004A76C 0C080120 */  jal       shim_queue_render_task
-/* 358C30 E004A770 AFA20010 */   sw       $v0, 0x10($sp)
-/* 358C34 E004A774 8C430000 */  lw        $v1, ($v0)
-/* 358C38 E004A778 34630002 */  ori       $v1, $v1, 2
-/* 358C3C E004A77C AC430000 */  sw        $v1, ($v0)
-/* 358C40 E004A780 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 358C44 E004A784 03E00008 */  jr        $ra
-/* 358C48 E004A788 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_render.s b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_render.s
deleted file mode 100644
index 0b932ece48..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_38_render
-/* 35A284 E004C364 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35A29C E004C37C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 35A2A0 E004C380 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35A2A4 E004C384 AFA00014 */  sw        $zero, 0x14($sp)
-/* 35A2A8 E004C388 0C080120 */  jal       shim_queue_render_task
-/* 35A2AC E004C38C AFA20010 */   sw       $v0, 0x10($sp)
-/* 35A2B0 E004C390 8C430000 */  lw        $v1, ($v0)
-/* 35A2B4 E004C394 34630002 */  ori       $v1, $v1, 2
-/* 35A2B8 E004C398 AC430000 */  sw        $v1, ($v0)
-/* 35A2BC E004C39C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 35A2C0 E004C3A0 03E00008 */  jr        $ra
-/* 35A2C4 E004C3A4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_render.s b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_render.s
deleted file mode 100644
index cc5adf4e27..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_39_render
-/* 35BBA0 E004E1D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35BBB8 E004E1E8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 35BBBC E004E1EC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35BBC0 E004E1F0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 35BBC4 E004E1F4 0C080120 */  jal       shim_queue_render_task
-/* 35BBC8 E004E1F8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 35BBCC E004E1FC 8C430000 */  lw        $v1, ($v0)
-/* 35BBD0 E004E200 34630002 */  ori       $v1, $v1, 2
-/* 35BBD4 E004E204 AC430000 */  sw        $v1, ($v0)
-/* 35BBD8 E004E208 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 35BBDC E004E20C 03E00008 */  jr        $ra
-/* 35BBE0 E004E210 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_render.s b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_render.s
deleted file mode 100644
index 1df5da0849..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_40_render
-/* 35C294 E00502C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35C2AC E00502DC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 35C2B0 E00502E0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35C2B4 E00502E4 AFA00014 */  sw        $zero, 0x14($sp)
-/* 35C2B8 E00502E8 0C080120 */  jal       shim_queue_render_task
-/* 35C2BC E00502EC AFA20010 */   sw       $v0, 0x10($sp)
-/* 35C2C0 E00502F0 8C430000 */  lw        $v1, ($v0)
-/* 35C2C4 E00502F4 34630002 */  ori       $v1, $v1, 2
-/* 35C2C8 E00502F8 AC430000 */  sw        $v1, ($v0)
-/* 35C2CC E00502FC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 35C2D0 E0050300 03E00008 */  jr        $ra
-/* 35C2D4 E0050304 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_render.s b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_render.s
deleted file mode 100644
index c7ac461fc8..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_41_render
-/* 35CE9C E005241C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35CEB4 E0052434 27A40010 */  addiu     $a0, $sp, 0x10
-/* 35CEB8 E0052438 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35CEBC E005243C AFA00014 */  sw        $zero, 0x14($sp)
-/* 35CEC0 E0052440 0C080120 */  jal       shim_queue_render_task
-/* 35CEC4 E0052444 AFA20010 */   sw       $v0, 0x10($sp)
-/* 35CEC8 E0052448 8C430000 */  lw        $v1, ($v0)
-/* 35CECC E005244C 34630002 */  ori       $v1, $v1, 2
-/* 35CED0 E0052450 AC430000 */  sw        $v1, ($v0)
-/* 35CED4 E0052454 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 35CED8 E0052458 03E00008 */  jr        $ra
-/* 35CEDC E005245C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_render.s b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_render.s
deleted file mode 100644
index 0333e2ca7b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_43_render
-/* 35E58C E0056B8C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35E5A4 E0056BA4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 35E5A8 E0056BA8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35E5AC E0056BAC AFA00014 */  sw        $zero, 0x14($sp)
-/* 35E5B0 E0056BB0 0C080120 */  jal       shim_queue_render_task
-/* 35E5B4 E0056BB4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 35E5B8 E0056BB8 8C430000 */  lw        $v1, ($v0)
-/* 35E5BC E0056BBC 34630002 */  ori       $v1, $v1, 2
-/* 35E5C0 E0056BC0 AC430000 */  sw        $v1, ($v0)
-/* 35E5C4 E0056BC4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 35E5C8 E0056BC8 03E00008 */  jr        $ra
-/* 35E5CC E0056BCC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_render.s b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_render.s
deleted file mode 100644
index 2370bc7483..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_44_render
-/* 35EDB0 E0058490 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 35EDC8 E00584A8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 35EDCC E00584AC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35EDD0 E00584B0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 35EDD4 E00584B4 0C080120 */  jal       shim_queue_render_task
-/* 35EDD8 E00584B8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 35EDDC E00584BC 8C430000 */  lw        $v1, ($v0)
-/* 35EDE0 E00584C0 34630002 */  ori       $v1, $v1, 2
-/* 35EDE4 E00584C4 AC430000 */  sw        $v1, ($v0)
-/* 35EDE8 E00584C8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 35EDEC E00584CC 03E00008 */  jr        $ra
-/* 35EDF0 E00584D0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_render.s b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_render.s
deleted file mode 100644
index f4e437f668..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_45_render
-/* 360670 E005A3B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 360688 E005A3C8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 36068C E005A3CC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 360690 E005A3D0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 360694 E005A3D4 0C080120 */  jal       shim_queue_render_task
-/* 360698 E005A3D8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 36069C E005A3DC 8C430000 */  lw        $v1, ($v0)
-/* 3606A0 E005A3E0 34630002 */  ori       $v1, $v1, 2
-/* 3606A4 E005A3E4 AC430000 */  sw        $v1, ($v0)
-/* 3606A8 E005A3E8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3606AC E005A3EC 03E00008 */  jr        $ra
-/* 3606B0 E005A3F0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_render.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_render.s
deleted file mode 100644
index 07c23f57fc..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_46_render
-/* 3611F4 E005C2B4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 36120C E005C2CC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 361210 E005C2D0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 361214 E005C2D4 AFA00014 */  sw        $zero, 0x14($sp)
-/* 361218 E005C2D8 0C080120 */  jal       shim_queue_render_task
-/* 36121C E005C2DC AFA20010 */   sw       $v0, 0x10($sp)
-/* 361220 E005C2E0 8C430000 */  lw        $v1, ($v0)
-/* 361224 E005C2E4 34630002 */  ori       $v1, $v1, 2
-/* 361228 E005C2E8 AC430000 */  sw        $v1, ($v0)
-/* 36122C E005C2EC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 361230 E005C2F0 03E00008 */  jr        $ra
-/* 361234 E005C2F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_render.s b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_render.s
deleted file mode 100644
index 91eb92b47d..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_48_render
-/* 36356C E006040C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 363584 E0060424 27A40010 */  addiu     $a0, $sp, 0x10
-/* 363588 E0060428 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 36358C E006042C AFA00014 */  sw        $zero, 0x14($sp)
-/* 363590 E0060430 0C080120 */  jal       shim_queue_render_task
-/* 363594 E0060434 AFA20010 */   sw       $v0, 0x10($sp)
-/* 363598 E0060438 8C430000 */  lw        $v1, ($v0)
-/* 36359C E006043C 34630002 */  ori       $v1, $v1, 2
-/* 3635A0 E0060440 AC430000 */  sw        $v1, ($v0)
-/* 3635A4 E0060444 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3635A8 E0060448 03E00008 */  jr        $ra
-/* 3635AC E006044C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_render.s b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_render.s
deleted file mode 100644
index cdffe5ee52..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_49_render
-/* 3647A8 E00624A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3647C0 E00624C0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3647C4 E00624C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3647C8 E00624C8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3647CC E00624CC 0C080120 */  jal       shim_queue_render_task
-/* 3647D0 E00624D0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3647D4 E00624D4 8C430000 */  lw        $v1, ($v0)
-/* 3647D8 E00624D8 34630002 */  ori       $v1, $v1, 2
-/* 3647DC E00624DC AC430000 */  sw        $v1, ($v0)
-/* 3647E0 E00624E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3647E4 E00624E4 03E00008 */  jr        $ra
-/* 3647E8 E00624E8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_render.s b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_render.s
deleted file mode 100644
index a7d983786f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_render.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_50_render
-/* 3652EC E00643DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 365304 E00643F4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 365308 E00643F8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 36530C E00643FC AFA00014 */  sw        $zero, 0x14($sp)
-/* 365310 E0064400 0C080120 */  jal       shim_queue_render_task
-/* 365314 E0064404 AFA20010 */   sw       $v0, 0x10($sp)
-/* 365318 E0064408 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 36531C E006440C 03E00008 */  jr        $ra
-/* 365320 E0064410 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_render.s b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_render.s
deleted file mode 100644
index 7a6ea29d61..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_51_render
-/* 36675C E006672C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 366774 E0066744 27A40010 */  addiu     $a0, $sp, 0x10
-/* 366778 E0066748 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 36677C E006674C AFA00014 */  sw        $zero, 0x14($sp)
-/* 366780 E0066750 0C080120 */  jal       shim_queue_render_task
-/* 366784 E0066754 AFA20010 */   sw       $v0, 0x10($sp)
-/* 366788 E0066758 8C430000 */  lw        $v1, ($v0)
-/* 36678C E006675C 34630002 */  ori       $v1, $v1, 2
-/* 366790 E0066760 AC430000 */  sw        $v1, ($v0)
-/* 366794 E0066764 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 366798 E0066768 03E00008 */  jr        $ra
-/* 36679C E006676C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_render.s b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_render.s
deleted file mode 100644
index 32b04300e7..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_render.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 36AAC8 E00681F8 AFA20014 */  sw        $v0, 0x14($sp)
-/* 36AACC E00681FC 8C620000 */  lw        $v0, ($v1)
-/* 36AAD0 E0068200 14400003 */  bnez      $v0, .LE0068210
-/* 36AAD4 E0068204 27A40010 */   addiu    $a0, $sp, 0x10
-/* 36AAD8 E0068208 0801A085 */  j         .LE0068214
-/* 36AADC E006820C 24020001 */   addiu    $v0, $zero, 1
-.LE0068210:
-/* 36AAE0 E0068210 2402002D */  addiu     $v0, $zero, 0x2d
-.LE0068214:
-/* 36AAE4 E0068214 0C080120 */  jal       shim_queue_render_task
-/* 36AAE8 E0068218 AFA20010 */   sw       $v0, 0x10($sp)
-/* 36AAEC E006821C 8C430000 */  lw        $v1, ($v0)
-/* 36AAF0 E0068220 34630002 */  ori       $v1, $v1, 2
-/* 36AAF4 E0068224 AC430000 */  sw        $v1, ($v0)
-/* 36AAF8 E0068228 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 36AAFC E006822C 03E00008 */  jr        $ra
-/* 36AB00 E0068230 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_render.s b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_render.s
deleted file mode 100644
index 49c367576b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_53_render
-/* 36D834 E006A814 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 36D84C E006A82C 2402002D */  addiu     $v0, $zero, 0x2d
-/* 36D850 E006A830 AFA40018 */  sw        $a0, 0x18($sp)
-/* 36D854 E006A834 27A40010 */  addiu     $a0, $sp, 0x10
-/* 36D858 E006A838 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 36D85C E006A83C 0C080120 */  jal       shim_queue_render_task
-/* 36D860 E006A840 AFA20010 */   sw       $v0, 0x10($sp)
-/* 36D864 E006A844 8C430000 */  lw        $v1, ($v0)
-/* 36D868 E006A848 34630002 */  ori       $v1, $v1, 2
-/* 36D86C E006A84C AC430000 */  sw        $v1, ($v0)
-/* 36D870 E006A850 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 36D874 E006A854 03E00008 */  jr        $ra
-/* 36D878 E006A858 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_render.s b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_render.s
deleted file mode 100644
index 5d47fc6a67..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_54_render
-/* 36E770 E006C5A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 36E788 E006C5B8 24020022 */  addiu     $v0, $zero, 0x22
-/* 36E78C E006C5BC AFA40018 */  sw        $a0, 0x18($sp)
-/* 36E790 E006C5C0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 36E794 E006C5C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 36E798 E006C5C8 0C080120 */  jal       shim_queue_render_task
-/* 36E79C E006C5CC AFA20010 */   sw       $v0, 0x10($sp)
-/* 36E7A0 E006C5D0 8C430000 */  lw        $v1, ($v0)
-/* 36E7A4 E006C5D4 34630002 */  ori       $v1, $v1, 2
-/* 36E7A8 E006C5D8 AC430000 */  sw        $v1, ($v0)
-/* 36E7AC E006C5DC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 36E7B0 E006C5E0 03E00008 */  jr        $ra
-/* 36E7B4 E006C5E4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_render.s b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_render.s
deleted file mode 100644
index 662154e5cc..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_render.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 372E94 E006E704 AFA40018 */  sw        $a0, 0x18($sp)
-/* 372E98 E006E708 80430070 */  lb        $v1, 0x70($v0)
-/* 372E9C E006E70C 24020001 */  addiu     $v0, $zero, 1
-/* 372EA0 E006E710 1462000A */  bne       $v1, $v0, .LE006E73C
-/* 372EA4 E006E714 27A40010 */   addiu    $a0, $sp, 0x10
-/* 372EA8 E006E718 C4A00014 */  lwc1      $f0, 0x14($a1)
-/* 372EAC E006E71C 3C01447A */  lui       $at, 0x447a
-/* 372EB0 E006E720 44811000 */  mtc1      $at, $f2
-/* 372EB4 E006E724 00000000 */  nop
-/* 372EB8 E006E728 46020000 */  add.s     $f0, $f0, $f2
-/* 372EBC E006E72C 4600010D */  trunc.w.s $f4, $f0
-/* 372EC0 E006E730 E7A40014 */  swc1      $f4, 0x14($sp)
-/* 372EC4 E006E734 0801B9D1 */  j         .LE006E744
-/* 372EC8 E006E738 2402002D */   addiu    $v0, $zero, 0x2d
-.LE006E73C:
-/* 372ECC E006E73C AFA00014 */  sw        $zero, 0x14($sp)
-/* 372ED0 E006E740 2402002D */  addiu     $v0, $zero, 0x2d
-.LE006E744:
-/* 372ED4 E006E744 0C080120 */  jal       shim_queue_render_task
-/* 372ED8 E006E748 AC820000 */   sw       $v0, ($a0)
-/* 372EDC E006E74C 8C430000 */  lw        $v1, ($v0)
-/* 372EE0 E006E750 34630002 */  ori       $v1, $v1, 2
-/* 372EE4 E006E754 AC430000 */  sw        $v1, ($v0)
-/* 372EE8 E006E758 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 372EEC E006E75C 03E00008 */  jr        $ra
-/* 372EF0 E006E760 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_render.s b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_render.s
deleted file mode 100644
index c532344c32..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_56_render
-/* 3747A0 E00706F0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3747B8 E0070708 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3747BC E007070C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3747C0 E0070710 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3747C4 E0070714 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3747C8 E0070718 0C080120 */  jal       shim_queue_render_task
-/* 3747CC E007071C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3747D0 E0070720 8C430000 */  lw        $v1, ($v0)
-/* 3747D4 E0070724 34630002 */  ori       $v1, $v1, 2
-/* 3747D8 E0070728 AC430000 */  sw        $v1, ($v0)
-/* 3747DC E007072C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3747E0 E0070730 03E00008 */  jr        $ra
-/* 3747E4 E0070734 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_render.s b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_render.s
deleted file mode 100644
index 100ced8ba4..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_57_render
-/* 3751DC E007238C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3751F4 E00723A4 24020022 */  addiu     $v0, $zero, 0x22
-/* 3751F8 E00723A8 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3751FC E00723AC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 375200 E00723B0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 375204 E00723B4 0C080120 */  jal       shim_queue_render_task
-/* 375208 E00723B8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 37520C E00723BC 8C430000 */  lw        $v1, ($v0)
-/* 375210 E00723C0 34630002 */  ori       $v1, $v1, 2
-/* 375214 E00723C4 AC430000 */  sw        $v1, ($v0)
-/* 375218 E00723C8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 37521C E00723CC 03E00008 */  jr        $ra
-/* 375220 E00723D0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_render.s b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_render.s
deleted file mode 100644
index b0a0b70eb7..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_58_render
-/* 3769F8 E0074598 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 376A10 E00745B0 2402002D */  addiu     $v0, $zero, 0x2d
-/* 376A14 E00745B4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 376A18 E00745B8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 376A1C E00745BC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 376A20 E00745C0 0C080120 */  jal       shim_queue_render_task
-/* 376A24 E00745C4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 376A28 E00745C8 8C430000 */  lw        $v1, ($v0)
-/* 376A2C E00745CC 34630002 */  ori       $v1, $v1, 2
-/* 376A30 E00745D0 AC430000 */  sw        $v1, ($v0)
-/* 376A34 E00745D4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 376A38 E00745D8 03E00008 */  jr        $ra
-/* 376A3C E00745DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_render.s b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_render.s
deleted file mode 100644
index dbeff5090c..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_59_render
-/* 377878 E0076808 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 377890 E0076820 27A40010 */  addiu     $a0, $sp, 0x10
-/* 377894 E0076824 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 377898 E0076828 AFA00014 */  sw        $zero, 0x14($sp)
-/* 37789C E007682C 0C080120 */  jal       shim_queue_render_task
-/* 3778A0 E0076830 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3778A4 E0076834 8C430000 */  lw        $v1, ($v0)
-/* 3778A8 E0076838 34630002 */  ori       $v1, $v1, 2
-/* 3778AC E007683C AC430000 */  sw        $v1, ($v0)
-/* 3778B0 E0076840 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3778B4 E0076844 03E00008 */  jr        $ra
-/* 3778B8 E0076848 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_render.s b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_render.s
deleted file mode 100644
index 61f4a1dae1..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_render.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 37A620 E0078230 24020005 */  addiu     $v0, $zero, 5
-/* 37A624 E0078234 14620004 */  bne       $v1, $v0, .LE0078248
-/* 37A628 E0078238 27A40010 */   addiu    $a0, $sp, 0x10
-/* 37A62C E007823C 24020001 */  addiu     $v0, $zero, 1
-/* 37A630 E0078240 0801E095 */  j         .LE0078254
-/* 37A634 E0078244 AFA00014 */   sw       $zero, 0x14($sp)
-.LE0078248:
-/* 37A638 E0078248 2402FF9C */  addiu     $v0, $zero, -0x64
-/* 37A63C E007824C AFA20014 */  sw        $v0, 0x14($sp)
-/* 37A640 E0078250 2402002D */  addiu     $v0, $zero, 0x2d
-.LE0078254:
-/* 37A644 E0078254 0C080120 */  jal       shim_queue_render_task
-/* 37A648 E0078258 AFA20010 */   sw       $v0, 0x10($sp)
-/* 37A64C E007825C 8C430000 */  lw        $v1, ($v0)
-/* 37A650 E0078260 34630002 */  ori       $v1, $v1, 2
-/* 37A654 E0078264 AC430000 */  sw        $v1, ($v0)
-/* 37A658 E0078268 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 37A65C E007826C 03E00008 */  jr        $ra
-/* 37A660 E0078270 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_render.s b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_render.s
deleted file mode 100644
index 163a13ef7a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_61_render
-/* 37CD80 E007A840 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 37CD98 E007A858 27A40010 */  addiu     $a0, $sp, 0x10
-/* 37CD9C E007A85C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 37CDA0 E007A860 AFA00014 */  sw        $zero, 0x14($sp)
-/* 37CDA4 E007A864 0C080120 */  jal       shim_queue_render_task
-/* 37CDA8 E007A868 AFA20010 */   sw       $v0, 0x10($sp)
-/* 37CDAC E007A86C 8C430000 */  lw        $v1, ($v0)
-/* 37CDB0 E007A870 34630002 */  ori       $v1, $v1, 2
-/* 37CDB4 E007A874 AC430000 */  sw        $v1, ($v0)
-/* 37CDB8 E007A878 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 37CDBC E007A87C 03E00008 */  jr        $ra
-/* 37CDC0 E007A880 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_render.s b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_render.s
deleted file mode 100644
index 8c35ade947..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_62_render
-/* 37D640 E007C1B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 37D658 E007C1C8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 37D65C E007C1CC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 37D660 E007C1D0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 37D664 E007C1D4 0C080120 */  jal       shim_queue_render_task
-/* 37D668 E007C1D8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 37D66C E007C1DC 8C430000 */  lw        $v1, ($v0)
-/* 37D670 E007C1E0 34630002 */  ori       $v1, $v1, 2
-/* 37D674 E007C1E4 AC430000 */  sw        $v1, ($v0)
-/* 37D678 E007C1E8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 37D67C E007C1EC 03E00008 */  jr        $ra
-/* 37D680 E007C1F0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_render.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_render.s
deleted file mode 100644
index 0bc2bfc4ed..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_63_render
-/* 37FC28 E007E508 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 37FC40 E007E520 27A40010 */  addiu     $a0, $sp, 0x10
-/* 37FC44 E007E524 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 37FC48 E007E528 AFA00014 */  sw        $zero, 0x14($sp)
-/* 37FC4C E007E52C 0C080120 */  jal       shim_queue_render_task
-/* 37FC50 E007E530 AFA20010 */   sw       $v0, 0x10($sp)
-/* 37FC54 E007E534 8C430000 */  lw        $v1, ($v0)
-/* 37FC58 E007E538 34630002 */  ori       $v1, $v1, 2
-/* 37FC5C E007E53C AC430000 */  sw        $v1, ($v0)
-/* 37FC60 E007E540 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 37FC64 E007E544 03E00008 */  jr        $ra
-/* 37FC68 E007E548 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_render.s b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_render.s
deleted file mode 100644
index 8b952ec91e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_66_render
-/* 3892B4 E00848E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3892CC E00848FC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3892D0 E0084900 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3892D4 E0084904 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3892D8 E0084908 0C080120 */  jal       shim_queue_render_task
-/* 3892DC E008490C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3892E0 E0084910 8C430000 */  lw        $v1, ($v0)
-/* 3892E4 E0084914 34630002 */  ori       $v1, $v1, 2
-/* 3892E8 E0084918 AC430000 */  sw        $v1, ($v0)
-/* 3892EC E008491C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3892F0 E0084920 03E00008 */  jr        $ra
-/* 3892F4 E0084924 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_render.s b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_render.s
deleted file mode 100644
index a14688a604..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_render.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_68_render
-/* 38B598 E00887A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 38B5B0 E00887C0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38B5B4 E00887C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 38B5B8 E00887C8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 38B5BC E00887CC 0C080120 */  jal       shim_queue_render_task
-/* 38B5C0 E00887D0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 38B5C4 E00887D4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 38B5C8 E00887D8 03E00008 */  jr        $ra
-/* 38B5CC E00887DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_render.s b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_render.s
deleted file mode 100644
index b6d78f4567..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_69_render
-/* 38CCD4 E008A6E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 38CCEC E008A6FC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38CCF0 E008A700 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 38CCF4 E008A704 AFA00014 */  sw        $zero, 0x14($sp)
-/* 38CCF8 E008A708 0C080120 */  jal       shim_queue_render_task
-/* 38CCFC E008A70C AFA20010 */   sw       $v0, 0x10($sp)
-/* 38CD00 E008A710 8C430000 */  lw        $v1, ($v0)
-/* 38CD04 E008A714 34630002 */  ori       $v1, $v1, 2
-/* 38CD08 E008A718 AC430000 */  sw        $v1, ($v0)
-/* 38CD0C E008A71C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 38CD10 E008A720 03E00008 */  jr        $ra
-/* 38CD14 E008A724 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_render.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_render.s
deleted file mode 100644
index 3a4b4b60ea..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_70_render
-/* 38E4B8 E008C6B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 38E4D0 E008C6D0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38E4D4 E008C6D4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 38E4D8 E008C6D8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 38E4DC E008C6DC 0C080120 */  jal       shim_queue_render_task
-/* 38E4E0 E008C6E0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 38E4E4 E008C6E4 8C430000 */  lw        $v1, ($v0)
-/* 38E4E8 E008C6E8 34630002 */  ori       $v1, $v1, 2
-/* 38E4EC E008C6EC AC430000 */  sw        $v1, ($v0)
-/* 38E4F0 E008C6F0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 38E4F4 E008C6F4 03E00008 */  jr        $ra
-/* 38E4F8 E008C6F8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_render.s b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_render.s
deleted file mode 100644
index 29843df6bc..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_71_render
-/* 38F2F8 E008E498 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 38F310 E008E4B0 24020022 */  addiu     $v0, $zero, 0x22
-/* 38F314 E008E4B4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 38F318 E008E4B8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38F31C E008E4BC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 38F320 E008E4C0 0C080120 */  jal       shim_queue_render_task
-/* 38F324 E008E4C4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 38F328 E008E4C8 8C430000 */  lw        $v1, ($v0)
-/* 38F32C E008E4CC 34630002 */  ori       $v1, $v1, 2
-/* 38F330 E008E4D0 AC430000 */  sw        $v1, ($v0)
-/* 38F334 E008E4D4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 38F338 E008E4D8 03E00008 */  jr        $ra
-/* 38F33C E008E4DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_render.s b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_render.s
deleted file mode 100644
index dacb0ec9a4..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_74_render
-/* 392B90 E00942C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 392BA8 E00942D8 24020022 */  addiu     $v0, $zero, 0x22
-/* 392BAC E00942DC AFA40018 */  sw        $a0, 0x18($sp)
-/* 392BB0 E00942E0 27A40010 */  addiu     $a0, $sp, 0x10
-/* 392BB4 E00942E4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 392BB8 E00942E8 0C080120 */  jal       shim_queue_render_task
-/* 392BBC E00942EC AFA20010 */   sw       $v0, 0x10($sp)
-/* 392BC0 E00942F0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 392BC4 E00942F4 03E00008 */  jr        $ra
-/* 392BC8 E00942F8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_render.s b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_render.s
deleted file mode 100644
index bafbc0f9cb..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_render.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 395E6C E00982BC C460000C */  lwc1      $f0, 0xc($v1)
-/* 395E70 E00982C0 AFA20010 */  sw        $v0, 0x10($sp)
-/* 395E74 E00982C4 4600008D */  trunc.w.s $f2, $f0
-/* 395E78 E00982C8 E7A20014 */  swc1      $f2, 0x14($sp)
-/* 395E7C E00982CC 0C080120 */  jal       shim_queue_render_task
-/* 395E80 E00982D0 27A40010 */   addiu    $a0, $sp, 0x10
-/* 395E84 E00982D4 8C430000 */  lw        $v1, ($v0)
-/* 395E88 E00982D8 34630002 */  ori       $v1, $v1, 2
-/* 395E8C E00982DC AC430000 */  sw        $v1, ($v0)
-/* 395E90 E00982E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 395E94 E00982E4 03E00008 */  jr        $ra
-/* 395E98 E00982E8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_render.s b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_render.s
deleted file mode 100644
index fec916480b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_77_render
-/* 396948 E009A398 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 396960 E009A3B0 24020011 */  addiu     $v0, $zero, 0x11
-/* 396964 E009A3B4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 396968 E009A3B8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 39696C E009A3BC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 396970 E009A3C0 0C080120 */  jal       shim_queue_render_task
-/* 396974 E009A3C4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 396978 E009A3C8 8C430000 */  lw        $v1, ($v0)
-/* 39697C E009A3CC 34630002 */  ori       $v1, $v1, 2
-/* 396980 E009A3D0 AC430000 */  sw        $v1, ($v0)
-/* 396984 E009A3D4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 396988 E009A3D8 03E00008 */  jr        $ra
-/* 39698C E009A3DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_render.s b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_render.s
deleted file mode 100644
index 1545144c8a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_78_render
-/* 3983CC E009C1DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3983E4 E009C1F4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3983E8 E009C1F8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3983EC E009C1FC AFA00014 */  sw        $zero, 0x14($sp)
-/* 3983F0 E009C200 0C080120 */  jal       shim_queue_render_task
-/* 3983F4 E009C204 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3983F8 E009C208 8C430000 */  lw        $v1, ($v0)
-/* 3983FC E009C20C 34630002 */  ori       $v1, $v1, 2
-/* 398400 E009C210 AC430000 */  sw        $v1, ($v0)
-/* 398404 E009C214 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 398408 E009C218 03E00008 */  jr        $ra
-/* 39840C E009C21C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_render.s b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_render.s
deleted file mode 100644
index 9e00049586..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_79_render
-/* 3A02FC E009E3DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3A0314 E009E3F4 24020022 */  addiu     $v0, $zero, 0x22
-/* 3A0318 E009E3F8 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3A031C E009E3FC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3A0320 E009E400 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3A0324 E009E404 0C080120 */  jal       shim_queue_render_task
-/* 3A0328 E009E408 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3A032C E009E40C 8C430000 */  lw        $v1, ($v0)
-/* 3A0330 E009E410 34630002 */  ori       $v1, $v1, 2
-/* 3A0334 E009E414 AC430000 */  sw        $v1, ($v0)
-/* 3A0338 E009E418 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3A033C E009E41C 03E00008 */  jr        $ra
-/* 3A0340 E009E420 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_render.s b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_render.s
deleted file mode 100644
index b1578017ad..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_81_render
-/* 3A2B7C E00A21EC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3A2B94 E00A2204 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3A2B98 E00A2208 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3A2B9C E00A220C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3A2BA0 E00A2210 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3A2BA4 E00A2214 0C080120 */  jal       shim_queue_render_task
-/* 3A2BA8 E00A2218 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3A2BAC E00A221C 8C430000 */  lw        $v1, ($v0)
-/* 3A2BB0 E00A2220 34630002 */  ori       $v1, $v1, 2
-/* 3A2BB4 E00A2224 AC430000 */  sw        $v1, ($v0)
-/* 3A2BB8 E00A2228 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3A2BBC E00A222C 03E00008 */  jr        $ra
-/* 3A2BC0 E00A2230 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_render.s b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_render.s
deleted file mode 100644
index cd6ffa2aa0..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_render.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 3A3DDC E00A45FC 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3A3DE0 E00A4600 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3A3DE4 E00A4604 AFA20010 */  sw        $v0, 0x10($sp)
-/* 3A3DE8 E00A4608 8C620000 */  lw        $v0, ($v1)
-/* 3A3DEC E00A460C 28420003 */  slti      $v0, $v0, 3
-/* 3A3DF0 E00A4610 14400005 */  bnez      $v0, .LE00A4628
-/* 3A3DF4 E00A4614 27A40010 */   addiu    $a0, $sp, 0x10
-/* 3A3DF8 E00A4618 0C080120 */  jal       shim_queue_render_task
-/* 3A3DFC E00A461C 00000000 */   nop
-/* 3A3E00 E00A4620 0802918F */  j         .LE00A463C
-/* 3A3E04 E00A4624 00000000 */   nop
-.LE00A4628:
-/* 3A3E08 E00A4628 0C080120 */  jal       shim_queue_render_task
-/* 3A3E0C E00A462C 00000000 */   nop
-/* 3A3E10 E00A4630 8C430000 */  lw        $v1, ($v0)
-/* 3A3E14 E00A4634 34630002 */  ori       $v1, $v1, 2
-/* 3A3E18 E00A4638 AC430000 */  sw        $v1, ($v0)
-.LE00A463C:
-/* 3A3E1C E00A463C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3A3E20 E00A4640 03E00008 */  jr        $ra
-/* 3A3E24 E00A4644 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_render.s b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_render.s
deleted file mode 100644
index 4ae2b80c5f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_83_render
-/* 3A58A8 E00A6358 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3A58C0 E00A6370 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3A58C4 E00A6374 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3A58C8 E00A6378 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3A58CC E00A637C 0C080120 */  jal       shim_queue_render_task
-/* 3A58D0 E00A6380 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3A58D4 E00A6384 8C430000 */  lw        $v1, ($v0)
-/* 3A58D8 E00A6388 34630002 */  ori       $v1, $v1, 2
-/* 3A58DC E00A638C AC430000 */  sw        $v1, ($v0)
-/* 3A58E0 E00A6390 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3A58E4 E00A6394 03E00008 */  jr        $ra
-/* 3A58E8 E00A6398 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_render.s b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_render.s
deleted file mode 100644
index 074d50bb28..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_84_render
-/* 3A73C4 E00A82D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3A73DC E00A82EC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3A73E0 E00A82F0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3A73E4 E00A82F4 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3A73E8 E00A82F8 0C080120 */  jal       shim_queue_render_task
-/* 3A73EC E00A82FC AFA20010 */   sw       $v0, 0x10($sp)
-/* 3A73F0 E00A8300 8C430000 */  lw        $v1, ($v0)
-/* 3A73F4 E00A8304 34630002 */  ori       $v1, $v1, 2
-/* 3A73F8 E00A8308 AC430000 */  sw        $v1, ($v0)
-/* 3A73FC E00A830C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3A7400 E00A8310 03E00008 */  jr        $ra
-/* 3A7404 E00A8314 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_render.s b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_render.s
deleted file mode 100644
index 4033bbfc45..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_render.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_85_render
-/* 3AACE0 E00AA3C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3AACF8 E00AA3D8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3AACFC E00AA3DC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3AAD00 E00AA3E0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 3AAD04 E00AA3E4 0C080120 */  jal       shim_queue_render_task
-/* 3AAD08 E00AA3E8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3AAD0C E00AA3EC 8C430000 */  lw        $v1, ($v0)
-/* 3AAD10 E00AA3F0 34630002 */  ori       $v1, $v1, 2
-/* 3AAD14 E00AA3F4 AC430000 */  sw        $v1, ($v0)
-/* 3AAD18 E00AA3F8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3AAD1C E00AA3FC 03E00008 */  jr        $ra
-/* 3AAD20 E00AA400 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_render.s b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_render.s
deleted file mode 100644
index b524dc2e0b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_87_render
-/* 3B284C E00AE4FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B2864 E00AE514 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B2868 E00AE518 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B286C E00AE51C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B2870 E00AE520 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B2874 E00AE524 0C080120 */  jal       shim_queue_render_task
-/* 3B2878 E00AE528 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B287C E00AE52C 8C430000 */  lw        $v1, ($v0)
-/* 3B2880 E00AE530 34630002 */  ori       $v1, $v1, 2
-/* 3B2884 E00AE534 AC430000 */  sw        $v1, ($v0)
-/* 3B2888 E00AE538 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B288C E00AE53C 03E00008 */  jr        $ra
-/* 3B2890 E00AE540 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_render.s b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_render.s
deleted file mode 100644
index 8eaa14e68e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_88_render
-/* 3B40A8 E00B01F8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B40C0 E00B0210 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B40C4 E00B0214 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B40C8 E00B0218 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B40CC E00B021C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B40D0 E00B0220 0C080120 */  jal       shim_queue_render_task
-/* 3B40D4 E00B0224 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B40D8 E00B0228 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B40DC E00B022C 03E00008 */  jr        $ra
-/* 3B40E0 E00B0230 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_render.s b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_render.s
deleted file mode 100644
index ed53edd3b8..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_89_render
-/* 3B4BF0 E00B2460 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B4C08 E00B2478 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B4C0C E00B247C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B4C10 E00B2480 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B4C14 E00B2484 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B4C18 E00B2488 0C080120 */  jal       shim_queue_render_task
-/* 3B4C1C E00B248C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B4C20 E00B2490 8C430000 */  lw        $v1, ($v0)
-/* 3B4C24 E00B2494 34630002 */  ori       $v1, $v1, 2
-/* 3B4C28 E00B2498 AC430000 */  sw        $v1, ($v0)
-/* 3B4C2C E00B249C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B4C30 E00B24A0 03E00008 */  jr        $ra
-/* 3B4C34 E00B24A4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_render.s b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_render.s
deleted file mode 100644
index 529a0c057f..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_90_render
-/* 3B621C E00B452C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B6234 E00B4544 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B6238 E00B4548 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B623C E00B454C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B6240 E00B4550 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B6244 E00B4554 0C080120 */  jal       shim_queue_render_task
-/* 3B6248 E00B4558 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B624C E00B455C 8C430000 */  lw        $v1, ($v0)
-/* 3B6250 E00B4560 34630002 */  ori       $v1, $v1, 2
-/* 3B6254 E00B4564 AC430000 */  sw        $v1, ($v0)
-/* 3B6258 E00B4568 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B625C E00B456C 03E00008 */  jr        $ra
-/* 3B6260 E00B4570 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_render.s b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_render.s
deleted file mode 100644
index e53a09d49a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_91_render
-/* 3B73FC E00B629C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B7414 E00B62B4 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B7418 E00B62B8 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B741C E00B62BC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B7420 E00B62C0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B7424 E00B62C4 0C080120 */  jal       shim_queue_render_task
-/* 3B7428 E00B62C8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B742C E00B62CC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B7430 E00B62D0 03E00008 */  jr        $ra
-/* 3B7434 E00B62D4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_render.s b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_render.s
deleted file mode 100644
index 4ae2063e32..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_92_render
-/* 3B7D38 E00B81B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B7D50 E00B81D0 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B7D54 E00B81D4 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B7D58 E00B81D8 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B7D5C E00B81DC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B7D60 E00B81E0 0C080120 */  jal       shim_queue_render_task
-/* 3B7D64 E00B81E4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B7D68 E00B81E8 8C430000 */  lw        $v1, ($v0)
-/* 3B7D6C E00B81EC 34630002 */  ori       $v1, $v1, 2
-/* 3B7D70 E00B81F0 AC430000 */  sw        $v1, ($v0)
-/* 3B7D74 E00B81F4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B7D78 E00B81F8 03E00008 */  jr        $ra
-/* 3B7D7C E00B81FC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_render.s b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_render.s
deleted file mode 100644
index 9d5e4d6e26..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_93_render
-/* 3B91AC E00BA5DC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3B91C4 E00BA5F4 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3B91C8 E00BA5F8 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3B91CC E00BA5FC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3B91D0 E00BA600 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3B91D4 E00BA604 0C080120 */  jal       shim_queue_render_task
-/* 3B91D8 E00BA608 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3B91DC E00BA60C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3B91E0 E00BA610 03E00008 */  jr        $ra
-/* 3B91E4 E00BA614 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_render.s b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_render.s
deleted file mode 100644
index c11b169102..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_render.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-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(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)
-/* 3BA338 E00BC308 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3BA33C E00BC30C 80430070 */  lb        $v1, 0x70($v0)
-/* 3BA340 E00BC310 24020001 */  addiu     $v0, $zero, 1
-/* 3BA344 E00BC314 1462000A */  bne       $v1, $v0, .LE00BC340
-/* 3BA348 E00BC318 27A40010 */   addiu    $a0, $sp, 0x10
-/* 3BA34C E00BC31C C4A0000C */  lwc1      $f0, 0xc($a1)
-/* 3BA350 E00BC320 3C01447A */  lui       $at, 0x447a
-/* 3BA354 E00BC324 44811000 */  mtc1      $at, $f2
-/* 3BA358 E00BC328 00000000 */  nop
-/* 3BA35C E00BC32C 46020000 */  add.s     $f0, $f0, $f2
-/* 3BA360 E00BC330 4600010D */  trunc.w.s $f4, $f0
-/* 3BA364 E00BC334 E7A40014 */  swc1      $f4, 0x14($sp)
-/* 3BA368 E00BC338 0802F0D3 */  j         .LE00BC34C
-/* 3BA36C E00BC33C 2402002D */   addiu    $v0, $zero, 0x2d
-.LE00BC340:
-/* 3BA370 E00BC340 2402000A */  addiu     $v0, $zero, 0xa
-/* 3BA374 E00BC344 AFA20014 */  sw        $v0, 0x14($sp)
-/* 3BA378 E00BC348 2402002D */  addiu     $v0, $zero, 0x2d
-.LE00BC34C:
-/* 3BA37C E00BC34C 0C080120 */  jal       shim_queue_render_task
-/* 3BA380 E00BC350 AC820000 */   sw       $v0, ($a0)
-/* 3BA384 E00BC354 8C430000 */  lw        $v1, ($v0)
-/* 3BA388 E00BC358 34630002 */  ori       $v1, $v1, 2
-/* 3BA38C E00BC35C AC430000 */  sw        $v1, ($v0)
-/* 3BA390 E00BC360 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3BA394 E00BC364 03E00008 */  jr        $ra
-/* 3BA398 E00BC368 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_render.s b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_render.s
deleted file mode 100644
index 076eeae222..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_95_render
-/* 3BC4D8 E00BE578 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3BC4F0 E00BE590 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3BC4F4 E00BE594 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3BC4F8 E00BE598 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3BC4FC E00BE59C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3BC500 E00BE5A0 0C080120 */  jal       shim_queue_render_task
-/* 3BC504 E00BE5A4 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3BC508 E00BE5A8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3BC50C E00BE5AC 03E00008 */  jr        $ra
-/* 3BC510 E00BE5B0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_render.s b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_render.s
deleted file mode 100644
index 0fbb22a897..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_96_render
-/* 3BD470 E00C0710 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3BD488 E00C0728 24020028 */  addiu     $v0, $zero, 0x28
-/* 3BD48C E00C072C AFA40018 */  sw        $a0, 0x18($sp)
-/* 3BD490 E00C0730 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3BD494 E00C0734 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3BD498 E00C0738 0C080120 */  jal       shim_queue_render_task
-/* 3BD49C E00C073C AFA20010 */   sw       $v0, 0x10($sp)
-/* 3BD4A0 E00C0740 8C430000 */  lw        $v1, ($v0)
-/* 3BD4A4 E00C0744 34630002 */  ori       $v1, $v1, 2
-/* 3BD4A8 E00C0748 AC430000 */  sw        $v1, ($v0)
-/* 3BD4AC E00C074C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3BD4B0 E00C0750 03E00008 */  jr        $ra
-/* 3BD4B4 E00C0754 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_render.s b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_render.s
deleted file mode 100644
index 0114004b8e..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_97_render
-/* 3C139C E00C21CC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3C13B4 E00C21E4 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3C13B8 E00C21E8 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3C13BC E00C21EC 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3C13C0 E00C21F0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3C13C4 E00C21F4 0C080120 */  jal       shim_queue_render_task
-/* 3C13C8 E00C21F8 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3C13CC E00C21FC 8C430000 */  lw        $v1, ($v0)
-/* 3C13D0 E00C2200 34630002 */  ori       $v1, $v1, 2
-/* 3C13D4 E00C2204 AC430000 */  sw        $v1, ($v0)
-/* 3C13D8 E00C2208 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3C13DC E00C220C 03E00008 */  jr        $ra
-/* 3C13E0 E00C2210 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_render.s b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_render.s
deleted file mode 100644
index 4b9a1bafb3..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_render.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_98_render
-/* 3CB0B4 E00C42C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3CB0CC E00C42DC 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3CB0D0 E00C42E0 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3CB0D4 E00C42E4 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3CB0D8 E00C42E8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3CB0DC E00C42EC 0C080120 */  jal       shim_queue_render_task
-/* 3CB0E0 E00C42F0 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3CB0E4 E00C42F4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3CB0E8 E00C42F8 03E00008 */  jr        $ra
-/* 3CB0EC E00C42FC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_render.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_render.s
deleted file mode 100644
index c35011a99a..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_render.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_99_render
-/* 3CD148 E00C6768 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 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)
-/* 3CD160 E00C6780 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3CD164 E00C6784 AFA40018 */  sw        $a0, 0x18($sp)
-/* 3CD168 E00C6788 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3CD16C E00C678C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 3CD170 E00C6790 0C080120 */  jal       shim_queue_render_task
-/* 3CD174 E00C6794 AFA20010 */   sw       $v0, 0x10($sp)
-/* 3CD178 E00C6798 8C430000 */  lw        $v1, ($v0)
-/* 3CD17C E00C679C 34630002 */  ori       $v1, $v1, 2
-/* 3CD180 E00C67A0 AC430000 */  sw        $v1, ($v0)
-/* 3CD184 E00C67A4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 3CD188 E00C67A8 03E00008 */  jr        $ra
-/* 3CD18C E00C67AC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s
deleted file mode 100644
index da76b1689e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241BB8_844788
-/* 844788 80241BB8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 84478C 80241BBC AFB10014 */  sw        $s1, 0x14($sp)
-/* 844790 80241BC0 0080882D */  daddu     $s1, $a0, $zero
-/* 844794 80241BC4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 844798 80241BC8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 84479C 80241BCC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8447A0 80241BD0 8E30000C */  lw        $s0, 0xc($s1)
-/* 8447A4 80241BD4 8E050000 */  lw        $a1, ($s0)
-/* 8447A8 80241BD8 0C0B1EAF */  jal       evt_get_variable
-/* 8447AC 80241BDC 26100004 */   addiu    $s0, $s0, 4
-/* 8447B0 80241BE0 0220202D */  daddu     $a0, $s1, $zero
-/* 8447B4 80241BE4 8E050000 */  lw        $a1, ($s0)
-/* 8447B8 80241BE8 0C0B210B */  jal       evt_get_float_variable
-/* 8447BC 80241BEC 0040802D */   daddu    $s0, $v0, $zero
-/* 8447C0 80241BF0 0220202D */  daddu     $a0, $s1, $zero
-/* 8447C4 80241BF4 0200282D */  daddu     $a1, $s0, $zero
-/* 8447C8 80241BF8 0C0B36B0 */  jal       resolve_npc
-/* 8447CC 80241BFC 46000506 */   mov.s    $f20, $f0
-/* 8447D0 80241C00 E454007C */  swc1      $f20, 0x7c($v0)
-/* 8447D4 80241C04 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8447D8 80241C08 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8447DC 80241C0C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8447E0 80241C10 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 8447E4 80241C14 24020002 */  addiu     $v0, $zero, 2
-/* 8447E8 80241C18 03E00008 */  jr        $ra
-/* 8447EC 80241C1C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s b/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s
deleted file mode 100644
index 304cfcc6c3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_B1D760
-/* B1D760 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B1D764 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* B1D768 80240008 0080882D */  daddu     $s1, $a0, $zero
-/* B1D76C 8024000C AFB00010 */  sw        $s0, 0x10($sp)
-/* B1D770 80240010 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* B1D774 80240014 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* B1D778 80240018 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B1D77C 8024001C 8E22013C */  lw        $v0, 0x13c($s1)
-/* B1D780 80240020 C60C0028 */  lwc1      $f12, 0x28($s0)
-/* B1D784 80240024 C60E0030 */  lwc1      $f14, 0x30($s0)
-/* B1D788 80240028 C4440008 */  lwc1      $f4, 8($v0)
-/* B1D78C 8024002C 46802120 */  cvt.s.w   $f4, $f4
-/* B1D790 80240030 44062000 */  mfc1      $a2, $f4
-/* B1D794 80240034 C444000C */  lwc1      $f4, 0xc($v0)
-/* B1D798 80240038 46802120 */  cvt.s.w   $f4, $f4
-/* B1D79C 8024003C 44072000 */  mfc1      $a3, $f4
-/* B1D7A0 80240040 0C00A7B5 */  jal       dist2D
-/* B1D7A4 80240044 00000000 */   nop
-/* B1D7A8 80240048 24020001 */  addiu     $v0, $zero, 1
-/* B1D7AC 8024004C AE220084 */  sw        $v0, 0x84($s1)
-/* B1D7B0 80240050 820300B4 */  lb        $v1, 0xb4($s0)
-/* B1D7B4 80240054 2402000E */  addiu     $v0, $zero, 0xe
-/* B1D7B8 80240058 10620004 */  beq       $v1, $v0, .L8024006C
-/* B1D7BC 8024005C 46000086 */   mov.s    $f2, $f0
-/* B1D7C0 80240060 24020010 */  addiu     $v0, $zero, 0x10
-/* B1D7C4 80240064 54620001 */  bnel      $v1, $v0, .L8024006C
-/* B1D7C8 80240068 AE200084 */   sw       $zero, 0x84($s1)
-.L8024006C:
-/* B1D7CC 8024006C 8E22013C */  lw        $v0, 0x13c($s1)
-/* B1D7D0 80240070 C4400010 */  lwc1      $f0, 0x10($v0)
-/* B1D7D4 80240074 46800020 */  cvt.s.w   $f0, $f0
-/* B1D7D8 80240078 4602003E */  c.le.s    $f0, $f2
-/* B1D7DC 8024007C 00000000 */  nop
-/* B1D7E0 80240080 45030001 */  bc1tl     .L80240088
-/* B1D7E4 80240084 AE200084 */   sw       $zero, 0x84($s1)
-.L80240088:
-/* B1D7E8 80240088 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B1D7EC 8024008C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B1D7F0 80240090 8FB00010 */  lw        $s0, 0x10($sp)
-/* B1D7F4 80240094 24020002 */  addiu     $v0, $zero, 2
-/* B1D7F8 80240098 03E00008 */  jr        $ra
-/* B1D7FC 8024009C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 7c62d769ed..e9fffe8234 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -2443,7 +2443,7 @@ segments:
     vram: 0xE0040000
     subsegments:
     - [0x353300, c, effect_32]
-    - [0x353B40, data]
+    - [0x353B40]
   - [0x353BB0, bin] # effect 32 gfx
   - name: effect_33
     dir: effects
@@ -3186,7 +3186,7 @@ segments:
     vram: 0xE00EA000
     subsegments:
     - [0x3E1EE0, c, effect_117]
-    - [0x3E2930, data]
+    - [0x3E2930]
   - [0x3E2960, bin] # effect 117 gfx
   - name: effect_119
     dir: effects
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index af96d4149d..185ba7838b 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -8145,7 +8145,7 @@ mac_04_GetPlayerCoins = 0x802419D0; // type:func rom:0x8445A0
 func_802419E4_8445B4 = 0x802419E4; // type:func rom:0x8445B4
 func_80241A64_844634 = 0x80241A64; // type:func rom:0x844634
 func_80241B90_844760 = 0x80241B90; // type:func rom:0x844760
-func_80241BB8_844788 = 0x80241BB8; // type:func rom:0x844788
+mac_04_SetNpcShadowScale = 0x80241BB8; // type:func rom:0x844788
 mac_04_Call800E9894 = 0x80241C20; // type:func rom:0x8447F0
 func_80241C40_844810 = 0x80241C40; // type:func rom:0x844810
 func_80241C60_844830 = 0x80241C60; // type:func rom:0x844830